983 files changed, 34938 insertions, 26881 deletions

diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 8c716242e4..0a0160326c 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -170,12 +170,18 @@ jobs:
           mv "regression-test-project-4.0" "test_project"
 
       # Editor is quite complicated piece of software, so it is easy to introduce bug here
-      - name: Open and close editor
+      - name: Open and close editor (Vulkan)
         if: ${{ matrix.proj-test }}
         run: |
           VK_ICD_FILENAMES=$(pwd)/vk_swiftshader_icd.json DRI_PRIME=0 xvfb-run ${{ matrix.bin }} --audio-driver Dummy --editor --quit --path test_project 2>&1 | tee sanitizers_log.txt || true
           misc/scripts/check_ci_log.py sanitizers_log.txt
 
+      - name: Open and close editor (GLES3)
+        if: ${{ matrix.proj-test }}
+        run: |
+          DRI_PRIME=0 xvfb-run ${{ matrix.bin }} --audio-driver Dummy --rendering-driver opengl3 --editor --quit --path test_project 2>&1 | tee sanitizers_log.txt || true
+          misc/scripts/check_ci_log.py sanitizers_log.txt
+
       # Run test project
       - name: Run project
         if: ${{ matrix.proj-test }}
diff --git a/SConstruct b/SConstruct
index 0fd9326e1c..d0d03bd8dc 100644
--- a/SConstruct
+++ b/SConstruct
@@ -138,6 +138,7 @@ env_base.__class__.CommandNoCache = methods.CommandNoCache
 env_base.__class__.Run = methods.Run
 env_base.__class__.disable_warnings = methods.disable_warnings
 env_base.__class__.force_optimization_on_debug = methods.force_optimization_on_debug
+env_base.__class__.module_add_dependencies = methods.module_add_dependencies
 env_base.__class__.module_check_dependencies = methods.module_check_dependencies
 
 env_base["x86_libtheora_opt_gcc"] = False
@@ -337,21 +338,27 @@ for path in module_search_paths:
 
 # Add module options.
 for name, path in modules_detected.items():
+    sys.path.insert(0, path)
+    import config
+
     if env_base["modules_enabled_by_default"]:
         enabled = True
-
-        sys.path.insert(0, path)
-        import config
-
         try:
             enabled = config.is_enabled()
         except AttributeError:
             pass
-        sys.path.remove(path)
-        sys.modules.pop("config")
     else:
         enabled = False
 
+    # Add module-specific options.
+    try:
+        for opt in config.get_opts(selected_platform):
+            opts.Add(opt)
+    except AttributeError:
+        pass
+
+    sys.path.remove(path)
+    sys.modules.pop("config")
     opts.Add(BoolVariable("module_" + name + "_enabled", "Enable module '%s'" % (name,), enabled))
 
 methods.write_modules(modules_detected)
@@ -699,6 +706,7 @@ if selected_platform in platform_list:
     sys.modules.pop("detect")
 
     modules_enabled = OrderedDict()
+    env.module_dependencies = {}
     env.module_icons_paths = []
     env.doc_class_path = {}
 
@@ -710,6 +718,10 @@ if selected_platform in platform_list:
         import config
 
         if config.can_build(env, selected_platform):
+            # Disable it if a required dependency is missing.
+            if not env.module_check_dependencies(name):
+                continue
+
             config.configure(env)
             # Get doc classes paths (if present)
             try:
@@ -732,6 +744,7 @@ if selected_platform in platform_list:
         sys.modules.pop("config")
 
     env.module_list = modules_enabled
+    methods.sort_module_list(env)
 
     methods.update_version(env.module_version_string)
 
@@ -794,15 +807,6 @@ if selected_platform in platform_list:
     if env["minizip"]:
         env.Append(CPPDEFINES=["MINIZIP_ENABLED"])
 
-    editor_module_list = []
-    if env["tools"] and not env.module_check_dependencies("tools", editor_module_list):
-        print(
-            "Build option 'module_"
-            + x
-            + "_enabled=no' cannot be used with 'tools=yes' (editor), only with 'tools=no' (export template)."
-        )
-        Exit(255)
-
     if not env["verbose"]:
         methods.no_verbose(sys, env)
 
diff --git a/core/config/engine.cpp b/core/config/engine.cpp
index 1a6093869f..e1da9eb44e 100644
--- a/core/config/engine.cpp
+++ b/core/config/engine.cpp
@@ -181,6 +181,42 @@ String Engine::get_license_text() const {
 	return String(GODOT_LICENSE_TEXT);
 }
 
+String Engine::get_architecture_name() const {
+#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) || defined(_M_X64)
+	return "x86_64";
+
+#elif defined(__i386) || defined(__i386__) || defined(_M_IX86)
+	return "x86_32";
+
+#elif defined(__aarch64__) || defined(_M_ARM64)
+	return "arm64";
+
+#elif defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7S__)
+	return "armv7";
+
+#elif defined(__riscv)
+#if __riscv_xlen == 8
+	return "rv64";
+#else
+	return "riscv";
+#endif
+
+#elif defined(__powerpc__)
+#if defined(__powerpc64__)
+	return "ppc64";
+#else
+	return "ppc";
+#endif
+
+#elif defined(__wasm__)
+#if defined(__wasm64__)
+	return "wasm64";
+#elif defined(__wasm32__)
+	return "wasm32";
+#endif
+#endif
+}
+
 bool Engine::is_abort_on_gpu_errors_enabled() const {
 	return abort_on_gpu_errors;
 }
diff --git a/core/config/engine.h b/core/config/engine.h
index 68562643e7..649be23717 100644
--- a/core/config/engine.h
+++ b/core/config/engine.h
@@ -142,6 +142,8 @@ public:
 	void set_write_movie_path(const String &p_path);
 	String get_write_movie_path() const;
 
+	String get_architecture_name() const;
+
 	void set_shader_cache_path(const String &p_path);
 	String get_shader_cache_path() const;
 
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp
index 38db7f9190..26b683db82 100644
--- a/core/config/project_settings.cpp
+++ b/core/config/project_settings.cpp
@@ -1070,7 +1070,7 @@ bool ProjectSettings::is_using_datapack() const {
 	return using_datapack;
 }
 
-bool ProjectSettings::property_can_revert(const String &p_name) {
+bool ProjectSettings::_property_can_revert(const StringName &p_name) const {
 	if (!props.has(p_name)) {
 		return false;
 	}
@@ -1078,12 +1078,13 @@ bool ProjectSettings::property_can_revert(const String &p_name) {
 	return props[p_name].initial != props[p_name].variant;
 }
 
-Variant ProjectSettings::property_get_revert(const String &p_name) {
+bool ProjectSettings::_property_get_revert(const StringName &p_name, Variant &r_property) const {
 	if (!props.has(p_name)) {
-		return Variant();
+		return false;
 	}
 
-	return props[p_name].initial;
+	r_property = props[p_name].initial;
+	return true;
 }
 
 void ProjectSettings::set_setting(const String &p_setting, const Variant &p_value) {
@@ -1134,8 +1135,6 @@ void ProjectSettings::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("globalize_path", "path"), &ProjectSettings::globalize_path);
 	ClassDB::bind_method(D_METHOD("save"), &ProjectSettings::save);
 	ClassDB::bind_method(D_METHOD("load_resource_pack", "pack", "replace_files", "offset"), &ProjectSettings::_load_resource_pack, DEFVAL(true), DEFVAL(0));
-	ClassDB::bind_method(D_METHOD("property_can_revert", "name"), &ProjectSettings::property_can_revert);
-	ClassDB::bind_method(D_METHOD("property_get_revert", "name"), &ProjectSettings::property_get_revert);
 
 	ClassDB::bind_method(D_METHOD("save_custom", "file"), &ProjectSettings::_save_custom_bnd);
 }
@@ -1183,10 +1182,14 @@ ProjectSettings::ProjectSettings() {
 	GLOBAL_DEF("application/config/custom_user_dir_name", "");
 	GLOBAL_DEF("application/config/project_settings_override", "");
 
-	GLOBAL_DEF_BASIC("display/window/size/viewport_width", 1024);
+	// The default window size is tuned to:
+	// - Have a 16:9 aspect ratio,
+	// - Have both dimensions divisible by 8 to better play along with video recording,
+	// - Be displayable correctly in windowed mode on a 1366×768 display (tested on Windows 10 with default settings).
+	GLOBAL_DEF_BASIC("display/window/size/viewport_width", 1152);
 	custom_prop_info["display/window/size/viewport_width"] = PropertyInfo(Variant::INT, "display/window/size/viewport_width", PROPERTY_HINT_RANGE, "0,7680,1,or_greater"); // 8K resolution
 
-	GLOBAL_DEF_BASIC("display/window/size/viewport_height", 600);
+	GLOBAL_DEF_BASIC("display/window/size/viewport_height", 648);
 	custom_prop_info["display/window/size/viewport_height"] = PropertyInfo(Variant::INT, "display/window/size/viewport_height", PROPERTY_HINT_RANGE, "0,4320,1,or_greater"); // 8K resolution
 
 	GLOBAL_DEF_BASIC("display/window/size/resizable", true);
@@ -1198,6 +1201,9 @@ ProjectSettings::ProjectSettings() {
 	GLOBAL_DEF("display/window/size/window_height_override", 0);
 	custom_prop_info["display/window/size/window_height_override"] = PropertyInfo(Variant::INT, "display/window/size/window_height_override", PROPERTY_HINT_RANGE, "0,4320,1,or_greater"); // 8K resolution
 
+	GLOBAL_DEF("display/window/energy_saving/keep_screen_on", true);
+	GLOBAL_DEF("display/window/energy_saving/keep_screen_on.editor", false);
+
 	GLOBAL_DEF_BASIC("audio/buses/default_bus_layout", "res://default_bus_layout.tres");
 	custom_prop_info["audio/buses/default_bus_layout"] = PropertyInfo(Variant::STRING, "audio/buses/default_bus_layout", PROPERTY_HINT_FILE, "*.tres");
 	GLOBAL_DEF_RST("audio/general/2d_panning_strength", 1.0f);
diff --git a/core/config/project_settings.h b/core/config/project_settings.h
index c3992a4db2..c845120a26 100644
--- a/core/config/project_settings.h
+++ b/core/config/project_settings.h
@@ -102,6 +102,8 @@ protected:
 	bool _set(const StringName &p_name, const Variant &p_value);
 	bool _get(const StringName &p_name, Variant &r_ret) const;
 	void _get_property_list(List<PropertyInfo> *p_list) const;
+	bool _property_can_revert(const StringName &p_name) const;
+	bool _property_get_revert(const StringName &p_name, Variant &r_property) const;
 
 	static ProjectSettings *singleton;
 
@@ -147,9 +149,6 @@ public:
 	void set_ignore_value_in_docs(const String &p_name, bool p_ignore);
 	bool get_ignore_value_in_docs(const String &p_name) const;
 
-	bool property_can_revert(const String &p_name);
-	Variant property_get_revert(const String &p_name);
-
 	String get_project_data_dir_name() const;
 	String get_project_data_path() const;
 	String get_resource_path() const;
diff --git a/core/core_bind.cpp b/core/core_bind.cpp
index 56130134a0..630bd68e65 100644
--- a/core/core_bind.cpp
+++ b/core/core_bind.cpp
@@ -2270,6 +2270,10 @@ String Engine::get_license_text() const {
 	return ::Engine::get_singleton()->get_license_text();
 }
 
+String Engine::get_architecture_name() const {
+	return ::Engine::get_singleton()->get_architecture_name();
+}
+
 bool Engine::is_in_physics_frame() const {
 	return ::Engine::get_singleton()->is_in_physics_frame();
 }
@@ -2367,6 +2371,8 @@ void Engine::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_license_info"), &Engine::get_license_info);
 	ClassDB::bind_method(D_METHOD("get_license_text"), &Engine::get_license_text);
 
+	ClassDB::bind_method(D_METHOD("get_architecture_name"), &Engine::get_architecture_name);
+
 	ClassDB::bind_method(D_METHOD("is_in_physics_frame"), &Engine::is_in_physics_frame);
 
 	ClassDB::bind_method(D_METHOD("has_singleton", "name"), &Engine::has_singleton);
diff --git a/core/core_bind.h b/core/core_bind.h
index 98bf34e07d..79230bd685 100644
--- a/core/core_bind.h
+++ b/core/core_bind.h
@@ -666,6 +666,8 @@ public:
 	Dictionary get_license_info() const;
 	String get_license_text() const;
 
+	String get_architecture_name() const;
+
 	bool is_in_physics_frame() const;
 
 	bool has_singleton(const StringName &p_name) const;
diff --git a/core/extension/gdnative_interface.h b/core/extension/gdnative_interface.h
index 041a6e5112..cb2adcb562 100644
--- a/core/extension/gdnative_interface.h
+++ b/core/extension/gdnative_interface.h
@@ -222,6 +222,8 @@ typedef struct {
 
 typedef const GDNativePropertyInfo *(*GDNativeExtensionClassGetPropertyList)(GDExtensionClassInstancePtr p_instance, uint32_t *r_count);
 typedef void (*GDNativeExtensionClassFreePropertyList)(GDExtensionClassInstancePtr p_instance, const GDNativePropertyInfo *p_list);
+typedef GDNativeBool (*GDNativeExtensionClassPropertyCanRevert)(GDExtensionClassInstancePtr p_instance, const GDNativeStringNamePtr p_name);
+typedef GDNativeBool (*GDNativeExtensionClassPropertyGetRevert)(GDExtensionClassInstancePtr p_instance, const GDNativeStringNamePtr p_name, GDNativeVariantPtr r_ret);
 typedef void (*GDNativeExtensionClassNotification)(GDExtensionClassInstancePtr p_instance, int32_t p_what);
 typedef void (*GDNativeExtensionClassToString)(GDExtensionClassInstancePtr p_instance, GDNativeStringPtr p_out);
 typedef void (*GDNativeExtensionClassReference)(GDExtensionClassInstancePtr p_instance);
@@ -237,6 +239,8 @@ typedef struct {
 	GDNativeExtensionClassGet get_func;
 	GDNativeExtensionClassGetPropertyList get_property_list_func;
 	GDNativeExtensionClassFreePropertyList free_property_list_func;
+	GDNativeExtensionClassPropertyCanRevert property_can_revert_func;
+	GDNativeExtensionClassPropertyGetRevert property_get_revert_func;
 	GDNativeExtensionClassNotification notification_func;
 	GDNativeExtensionClassToString to_string_func;
 	GDNativeExtensionClassReference reference_func;
@@ -309,6 +313,9 @@ typedef const GDNativePropertyInfo *(*GDNativeExtensionScriptInstanceGetProperty
 typedef void (*GDNativeExtensionScriptInstanceFreePropertyList)(GDNativeExtensionScriptInstanceDataPtr p_instance, const GDNativePropertyInfo *p_list);
 typedef GDNativeVariantType (*GDNativeExtensionScriptInstanceGetPropertyType)(GDNativeExtensionScriptInstanceDataPtr p_instance, const GDNativeStringNamePtr p_name, GDNativeBool *r_is_valid);
 
+typedef GDNativeBool (*GDNativeExtensionScriptInstancePropertyCanRevert)(GDNativeExtensionScriptInstanceDataPtr p_instance, const GDNativeStringNamePtr p_name);
+typedef GDNativeBool (*GDNativeExtensionScriptInstancePropertyGetRevert)(GDNativeExtensionScriptInstanceDataPtr p_instance, const GDNativeStringNamePtr p_name, GDNativeVariantPtr r_ret);
+
 typedef GDNativeObjectPtr (*GDNativeExtensionScriptInstanceGetOwner)(GDNativeExtensionScriptInstanceDataPtr p_instance);
 typedef void (*GDNativeExtensionScriptInstancePropertyStateAdd)(const GDNativeStringNamePtr p_name, const GDNativeVariantPtr p_value, void *p_userdata);
 typedef void (*GDNativeExtensionScriptInstanceGetPropertyState)(GDNativeExtensionScriptInstanceDataPtr p_instance, GDNativeExtensionScriptInstancePropertyStateAdd p_add_func, void *p_userdata);
@@ -343,6 +350,9 @@ typedef struct {
 	GDNativeExtensionScriptInstanceFreePropertyList free_property_list_func;
 	GDNativeExtensionScriptInstanceGetPropertyType get_property_type_func;
 
+	GDNativeExtensionScriptInstancePropertyCanRevert property_can_revert_func;
+	GDNativeExtensionScriptInstancePropertyGetRevert property_get_revert_func;
+
 	GDNativeExtensionScriptInstanceGetOwner get_owner_func;
 	GDNativeExtensionScriptInstanceGetPropertyState get_property_state_func;
 
diff --git a/core/extension/native_extension.cpp b/core/extension/native_extension.cpp
index b69859b441..fdb4e50d90 100644
--- a/core/extension/native_extension.cpp
+++ b/core/extension/native_extension.cpp
@@ -156,6 +156,8 @@ void NativeExtension::_register_extension_class(const GDNativeExtensionClassLibr
 	extension->native_extension.get = p_extension_funcs->get_func;
 	extension->native_extension.get_property_list = p_extension_funcs->get_property_list_func;
 	extension->native_extension.free_property_list = p_extension_funcs->free_property_list_func;
+	extension->native_extension.property_can_revert = p_extension_funcs->property_can_revert_func;
+	extension->native_extension.property_get_revert = p_extension_funcs->property_get_revert_func;
 	extension->native_extension.notification = p_extension_funcs->notification_func;
 	extension->native_extension.to_string = p_extension_funcs->to_string_func;
 	extension->native_extension.reference = p_extension_funcs->reference_func;
@@ -372,7 +374,7 @@ Ref<Resource> NativeExtensionResourceLoader::load(const String &p_path, const St
 	}
 
 	if (err != OK) {
-		ERR_PRINT("Error loading GDExtension config file: " + p_path);
+		ERR_PRINT("Error loading GDExtension configuration file: " + p_path);
 		return Ref<Resource>();
 	}
 
@@ -380,7 +382,7 @@ Ref<Resource> NativeExtensionResourceLoader::load(const String &p_path, const St
 		if (r_error) {
 			*r_error = ERR_INVALID_DATA;
 		}
-		ERR_PRINT("GDExtension config file must contain 'configuration.entry_symbol' key: " + p_path);
+		ERR_PRINT("GDExtension configuration file must contain a \"configuration/entry_symbol\" key: " + p_path);
 		return Ref<Resource>();
 	}
 
@@ -413,7 +415,8 @@ Ref<Resource> NativeExtensionResourceLoader::load(const String &p_path, const St
 		if (r_error) {
 			*r_error = ERR_FILE_NOT_FOUND;
 		}
-		ERR_PRINT("No GDExtension library found for current architecture; in config file " + p_path);
+		const String os_arch = OS::get_singleton()->get_name().to_lower() + "." + Engine::get_singleton()->get_architecture_name();
+		ERR_PRINT(vformat("No GDExtension library found for current OS and architecture (%s) in configuration file: %s", os_arch, p_path));
 		return Ref<Resource>();
 	}
 
diff --git a/core/input/gamecontrollerdb.txt b/core/input/gamecontrollerdb.txt
index d751f6c9b8..f5874a3dec 100644
--- a/core/input/gamecontrollerdb.txt
+++ b/core/input/gamecontrollerdb.txt
@@ -11,7 +11,7 @@
 03000000d0160000600a000000000000,4Play Adapter,a:b1,b:b3,back:b4,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,leftstick:b14,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b15,righttrigger:b9,rightx:a3,righty:a4,start:b5,x:b0,y:b2,platform:Windows,
 03000000c82d00000031000000000000,8BitDo Adapter,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00000531000000000000,8BitDo Adapter 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
-03000000c82d00000951000000000000,8BitDo Dogbone Modkit,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b11,platform:Windows,
+03000000c82d00000951000000000000,8BitDo Dogbone,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a2,rightx:a3,righty:a5,start:b11,platform:Windows,
 03000000008000000210000000000000,8BitDo F30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
 030000003512000011ab000000000000,8BitDo F30 Arcade Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 03000000c82d00001028000000000000,8BitDo F30 Arcade Joystick,a:b0,b:b1,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Windows,
@@ -19,14 +19,15 @@
 03000000801000000900000000000000,8BitDo F30 Arcade Stick,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00001038000000000000,8BitDo F30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00000090000000000000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00001151000000000000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000151000000000000,8BitDo M30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a2,rightshoulder:b6,righttrigger:b7,rightx:a3,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00000650000000000000,8BitDo M30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b8,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00005106000000000000,8BitDo M30,a:b0,b:b1,back:b10,dpdown:+a2,dpleft:-a0,dpright:+a0,dpup:-a2,guide:b2,leftshoulder:b8,lefttrigger:b9,rightshoulder:b6,righttrigger:b7,start:b11,x:b3,y:b4,platform:Windows,
-03000000c82d00000151000000000000,8BitDo M30 Modkit,a:b0,b:b1,back:b10,dpdown:+a2,dpleft:-a0,dpright:+a0,dpup:-a2,rightshoulder:b6,righttrigger:b7,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00000310000000000000,8BitDo N30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00000451000000000000,8BitDo N30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a2,rightx:a3,righty:a5,start:b11,platform:Windows,
 03000000c82d00002028000000000000,8BitDo N30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00008010000000000000,8BitDo N30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d0000e002000000000000,8BitDo N30,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,start:b6,platform:Windows,
-03000000c82d00000451000000000000,8BitDo N30 Modkit,a:b1,b:b0,back:b10,dpdown:+a2,dpleft:-a0,dpright:+a0,dpup:-a2,start:b11,platform:Windows,
 03000000c82d00000190000000000000,8BitDo N30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00001590000000000000,8BitDo N30 Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00006528000000000000,8BitDo N30 Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
@@ -37,7 +38,8 @@
 03000000022000000090000000000000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
 03000000203800000900000000000000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00002038000000000000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
-03000000c82d00000751000000000000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00000751000000000000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a2,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00000851000000000000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a2,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00000360000000000000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00000361000000000000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00000660000000000000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
@@ -45,7 +47,7 @@
 03000000c82d00000231000000000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00000331000000000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00000431000000000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
-03000000c82d00002867000000000000,8BitDo S30 Modkit,a:b0,b:b1,dpdown:+a2,dpleft:-a0,dpright:+a0,dpup:-a2,leftshoulder:b8,lefttrigger:b9,rightshoulder:b6,righttrigger:b7,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00002867000000000000,8BitDo S30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,lefttrigger:b9,leftx:a0,lefty:a2,rightshoulder:b6,righttrigger:b7,rightx:a3,righty:a5,start:b10,x:b3,y:b4,platform:Windows,
 03000000c82d00000130000000000000,8BitDo SF30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00000060000000000000,8BitDo SF30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00000061000000000000,8BitDo SF30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Windows,
@@ -54,11 +56,11 @@
 03000000c82d00003028000000000000,8BitDo SFC30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
 030000003512000020ab000000000000,8BitDo SN30,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00000030000000000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000351000000000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a2,rightshoulder:b7,rightx:a3,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00001290000000000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d000020ab000000000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00004028000000000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00006228000000000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
-03000000c82d00000351000000000000,8BitDo SN30 Modkit,a:b1,b:b0,back:b10,dpdown:+a2,dpleft:-a0,dpright:+a0,dpup:-a2,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00000021000000000000,8BitDo SN30 Pro,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00000160000000000000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Windows,
 03000000c82d00000161000000000000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Windows,
@@ -120,6 +122,7 @@
 030000006b1400000103000000000000,Bigben PS3 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Windows,
 03000000120c0000200e000000000000,Brook Mars PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 03000000120c0000210e000000000000,Brook Mars PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000f10e000000000000,Brook PS2 Adapter,a:b1,b:b2,back:b13,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 03000000120c0000310c000000000000,Brook Super Converter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Windows,
 03000000d81d00000b00000000000000,Buffalo BSGP1601 Series,a:b5,b:b3,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b9,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b13,x:b4,y:b2,platform:Windows,
 030000005b1c00002400000000000000,Capcom Home Arcade Controller,a:b3,b:b4,back:b7,leftshoulder:b2,leftx:a0,lefty:a1,rightshoulder:b5,start:b6,x:b0,y:b1,platform:Windows,
@@ -234,14 +237,14 @@
 030000000d0f00005100000000000000,Hori Fighting Commander PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 030000000d0f00008600000000000000,Hori Fighting Commander Xbox 360,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 030000000d0f0000ba00000000000000,Hori Fighting Commander Xbox 360,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000000d0f00008800000000000000,Hori Fighting Stick mini 4 (PS3),a:b1,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b8,x:b0,y:b3,platform:Windows,
+030000000d0f00008700000000000000,Hori Fighting Stick mini 4 (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
 030000000d0f00001000000000000000,Hori Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 030000000d0f00003200000000000000,Hori Fightstick 3W,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 030000000d0f0000c000000000000000,Hori Fightstick 4,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 030000000d0f00000d00000000000000,Hori Fightstick EX2,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
 030000000d0f00003701000000000000,Hori Fightstick Mini,a:b1,b:b0,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b3,y:b2,platform:Windows,
 030000000d0f00004000000000000000,Hori Fightstick Mini 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b5,lefttrigger:b4,rightshoulder:b7,righttrigger:b6,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f00008700000000000000,Hori Fightstick Mini 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
-030000000d0f00008800000000000000,Hori Fightstick Mini 4,a:b1,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b8,x:b0,y:b3,platform:Windows,
 030000000d0f00002100000000000000,Hori Fightstick V3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 030000000d0f00002700000000000000,Hori Fightstick V3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
 030000000d0f0000a000000000000000,Hori Grip TAC4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b13,x:b0,y:b3,platform:Windows,
@@ -439,7 +442,7 @@
 03000000d9040000160f000000000000,PlayStation Controller Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
 030000004c0500003713000000000000,PlayStation Vita,a:b1,b:b2,back:b8,dpdown:b13,dpleft:b15,dpright:b14,dpup:b12,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
 03000000d62000006dca000000000000,PowerA Pro Ex,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
-0300000062060000d570000000000000,PowerA PS3 Contoller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+0300000062060000d570000000000000,PowerA PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 03000000d620000013a7000000000000,PowerA Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 030000006d04000084ca000000000000,Precision,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
 03000000d62000009557000000000000,Pro Elite PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
@@ -482,7 +485,6 @@
 03000000120c00001e0e000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 03000000120c0000a957000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 03000000120c0000aa57000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
-03000000120c0000f10e000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 03000000120c0000f21c000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 03000000120c0000f31c000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 03000000120c0000f41c000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
@@ -538,7 +540,6 @@
 03000000321500000910000000000000,Razer Raiju UE,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 03000000321500000011000000000000,Razer Raion PS4 Fightpad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 03000000321500000009000000000000,Razer Serval,+lefty:+a2,-lefty:-a1,a:b0,b:b1,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,leftx:a0,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
-03000000632500008005000000010000,Redgear,a:b2,b:b1,x:b3,y:b0,back:b8,start:b9,guide:b12,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7,platform:Mac OS X,
 03000000921200004547000000000000,Retro Bit Sega Genesis Controller Adapter,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,lefttrigger:b7,rightshoulder:b5,righttrigger:b2,start:b6,x:b3,y:b4,platform:Windows,
 03000000790000001100000000000000,Retro Controller,a:b1,b:b2,back:b8,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,leftshoulder:b6,lefttrigger:b7,rightshoulder:b4,righttrigger:b5,start:b9,x:b0,y:b3,platform:Windows,
 03000000830500006020000000000000,Retro Controller,a:b0,b:b1,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b5,rightshoulder:b8,righttrigger:b9,start:b7,x:b2,y:b3,platform:Windows,
@@ -741,11 +742,17 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000008f0e00000300000009010000,2 In 1 Joystick,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
 03000000c82d00000031000001000000,8BitDo Adapter,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
 03000000c82d00000531000000020000,8BitDo Adapter 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00000951000000010000,8BitDo Dogbone,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b11,platform:Mac OS X,
 03000000c82d00000090000001000000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c82d00001038000000010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00001251000000010000,8BitDo Lite 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00001151000000010000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00001151000000020000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000a30c00002400000006020000,8BitDo M30,a:b2,b:b1,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,guide:b9,leftshoulder:b6,lefttrigger:b5,rightshoulder:b4,righttrigger:b7,start:b8,x:b3,y:b0,platform:Mac OS X,
+03000000c82d00000151000000010000,8BitDo M30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
 03000000c82d00000650000001000000,8BitDo M30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,start:b11,x:b3,y:b4,platform:Mac OS X,
 03000000c82d00005106000000010000,8BitDo M30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b2,leftshoulder:b6,lefttrigger:a5,rightshoulder:b7,righttrigger:a4,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000451000000010000,8BitDo N30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b11,platform:Mac OS X,
 03000000c82d00001590000001000000,8BitDo N30 Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c82d00006528000000010000,8BitDo N30 Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
 030000003512000012ab000001000000,8BitDo NES30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
@@ -754,13 +761,17 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000022000000090000001000000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000203800000900000000010000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c82d00000190000001000000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000751000000010000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00000851000000010000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
 03000000c82d00000660000000010000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c82d00000660000000020000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c82d00000131000001000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c82d00000231000001000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c82d00000331000001000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c82d00000431000001000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00002867000000010000,8BitDo S30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a2,righty:a3,start:b10,x:b3,y:b4,platform:Mac OS X,
 03000000102800000900000000000000,8BitDo SFC30 Joystick,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000351000000010000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c82d00001290000001000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c82d00004028000000010000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c82d00000160000001000000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
@@ -786,6 +797,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000260900008888000088020000,Cyber Gadget GameCube Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:a5,rightx:a2,righty:a3~,start:b7,x:b2,y:b3,platform:Mac OS X,
 03000000a306000022f6000001030000,Cyborg V3 Rumble Pad PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:+a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:-a3,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Mac OS X,
 03000000791d00000103000009010000,Dual Box Wii Classic Adapter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,guide:b10,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
+030000006e0500000720000010020000,Elecom JC-W01U,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b1,platform:Mac OS X,
 030000006f0e00008401000003010000,Faceoff Premiere Wired Pro Controller for Nintendo Switch,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b13,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
 03000000151900004000000001000000,Flydigi Vader 2,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,
 03000000b40400001124000000000000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b12,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b4,paddle2:b5,paddle3:b17,rightshoulder:b7,rightstick:b13,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b2,y:b3,platform:Mac OS X,
@@ -804,6 +816,8 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000000d0f00005e00000000010000,Hori Fighting Commander 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
 030000000d0f00008400000000010000,Hori Fighting Commander PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
 030000000d0f00008500000000010000,Hori Fighting Commander PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00008800000000010000,Hori Fighting Stick mini 4 (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00008700000000010000,Hori Fighting Stick mini 4 (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
 030000000d0f00004d00000000000000,Hori Gem Pad 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
 030000000d0f00003801000008010000,Hori PC Engine Mini Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b9,platform:Mac OS X,
 030000000d0f00009200000000010000,Hori Pokken Tournament DX Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
@@ -883,6 +897,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000321500000009000000020000,Razer Serval,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Mac OS X,
 030000003215000000090000163a0000,Razer Serval,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Mac OS X,
 0300000032150000030a000000000000,Razer Wildcat,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+03000000632500008005000000010000,Redgear,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
 030000000d0f0000c100000072050000,Retro Bit Sega Genesis 6B Controller,a:b2,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,lefttrigger:b8,rightshoulder:b6,righttrigger:b7,start:b9,x:b3,y:b0,platform:Mac OS X,
 03000000921200004547000000020000,Retro Bit Sega Genesis Controller Adapter,a:b0,b:b2,dpdown:+a2,dpleft:-a0,dpright:+a0,dpup:-a2,lefttrigger:b14,rightshoulder:b10,righttrigger:b4,start:b12,x:b6,y:b8,platform:Mac OS X,
 03000000790000001100000000000000,Retro Controller,a:b1,b:b2,back:b8,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,leftshoulder:b6,lefttrigger:b7,rightshoulder:b4,righttrigger:b5,start:b9,x:b0,y:b3,platform:Mac OS X,
@@ -954,11 +969,16 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 # Linux
 030000005e0400008e02000020010000,8BitDo Adapter,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000c82d00000031000011010000,8BitDo Adapter,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00000951000000010000,8BitDo Dogbone,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b11,platform:Linux,
 03000000021000000090000011010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 03000000c82d00000090000011010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 05000000c82d00001038000000010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00001151000011010000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00001151000000010000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000151000000010000,8BitDo M30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000c82d00000650000011010000,8BitDo M30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,start:b11,x:b3,y:b4,platform:Linux,
 05000000c82d00005106000000010000,8BitDo M30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00000451000000010000,8BitDo N30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b11,platform:Linux,
 03000000c82d00001590000011010000,8BitDo N30 Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 05000000c82d00006528000000010000,8BitDo N30 Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 03000000008000000210000011010000,8BitDo NES30,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
@@ -968,12 +988,15 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000c82d00000190000011010000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 05000000203800000900000000010000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 05000000c82d00002038000000010000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000751000000010000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:a8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000c82d00000851000000010000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:a8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000c82d00000660000011010000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 05000000c82d00000660000000010000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 03000000c82d00000131000011010000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 03000000c82d00000231000011010000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 03000000c82d00000331000011010000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 03000000c82d00000431000011010000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00002867000000010000,8BitDo S30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a2,righty:a3,start:b10,x:b3,y:b4,platform:Linux,
 05000000c82d00000060000000010000,8BitDo SF30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 05000000c82d00000061000000010000,8BitDo SF30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 030000003512000012ab000010010000,8BitDo SFC30,a:b2,b:b1,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b3,y:b0,platform:Linux,
@@ -981,6 +1004,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000c82d000021ab000010010000,8BitDo SFC30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Linux,
 05000000102800000900000000010000,8BitDo SFC30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Linux,
 05000000c82d00003028000000010000,8BitDo SFC30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00000351000000010000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 03000000c82d00000160000000000000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Linux,
 03000000c82d00000160000011010000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 03000000c82d00000161000000000000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Linux,
@@ -1075,9 +1099,11 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000000d0f00005001000009040000,Hori Fighting Commander OCTA Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000000d0f00008500000010010000,Hori Fighting Commander PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000000d0f00008600000002010000,Hori Fighting Commander Xbox 360,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+030000000d0f00008800000011010000,Hori Fighting Stick mini 4 (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00008700000011010000,Hori Fighting Stick mini 4 (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,rightshoulder:b5,rightstick:b11,righttrigger:a4,start:b9,x:b0,y:b3,platform:Linux,
 030000000d0f00001000000011010000,Hori Fightstick 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
 03000000ad1b000003f5000033050000,Hori Fightstick VX,+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b8,guide:b10,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b2,y:b3,platform:Linux,
-030000000d0f00004d00000011010000,HORI Gem Pad 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00004d00000011010000,Hori Gem Pad 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 03000000ad1b000001f5000033050000,Hori Pad EX Turbo 2,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000000d0f00003801000011010000,Hori PC Engine Mini Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b9,platform:Linux,
 030000000d0f00009200000011010000,Hori Pokken Tournament DX Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
@@ -1092,7 +1118,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000000d0f0000ee00000011010000,Horipad Mini 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
 030000000d0f00006700000001010000,Horipad One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000000d0f0000c100000011010000,Horipad S,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b13,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-050000000d0f0000f600000001000000,HORIPAD Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+050000000d0f0000f600000001000000,Horipad Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
 03000000341a000005f7000010010000,HuiJia GameCube Controller Adapter,a:b1,b:b2,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b0,y:b3,platform:Linux,
 030000008f0e00001330000010010000,HuiJia SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b9,x:b3,y:b0,platform:Linux,
 03000000242e00008816000001010000,Hyperkin X91,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
@@ -1203,8 +1229,8 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 050000007e0500000620000001800000,Nintendo Switch Left Joy-Con,a:b16,b:b15,back:b4,leftshoulder:b6,leftstick:b12,leftx:a1,lefty:a0~,rightshoulder:b8,start:b9,x:b14,y:b17,platform:Linux,
 03000000d620000013a7000011010000,Nintendo Switch PowerA Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 03000000d620000011a7000011010000,Nintendo Switch PowerA Core Plus Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
-030000007e0500000920000011810000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b5,leftstick:b12,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b13,righttrigger:b8,rightx:a2,righty:a3,start:b10,x:b3,y:b2,platform:Linux,
-050000007e0500000920000001000000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+030000007e0500000920000011810000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b5,leftstick:b12,lefttrigger:b7,leftx:a0,lefty:a1,misc1:b4,rightshoulder:b6,rightstick:b13,righttrigger:b8,rightx:a2,righty:a3,start:b10,x:b3,y:b2,platform:Linux,
+050000007e0500000920000001000000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b4,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
 050000007e0500000920000001800000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b5,leftstick:b12,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b13,righttrigger:b8,rightx:a2,righty:a3,start:b10,x:b3,y:b2,platform:Linux,
 050000007e0500000720000001800000,Nintendo Switch Right Joy-Con,a:b1,b:b2,back:b9,leftshoulder:b4,leftstick:b10,leftx:a1~,lefty:a0,rightshoulder:b6,start:b8,x:b0,y:b3,platform:Linux,
 05000000010000000100000003000000,Nintendo Wii Remote,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
@@ -1243,14 +1269,14 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000004c0500003713000011010000,PlayStation Vita,a:b1,b:b2,back:b8,dpdown:b13,dpleft:b15,dpright:b14,dpup:b12,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
 03000000c62400000053000000010000,PowerA,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000c62400003a54000001010000,PowerA 1428124-01,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000d62000000140000001010000,PowerA Fusion Pro 2 Controller,a:b0,b:b1,x:b2,y:b3,back:b6,start:b7,leftstick:b9,rightstick:b10,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:a2,righttrigger:a5,platform:Linux,
+03000000d62000000140000001010000,PowerA Fusion Pro 2 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000c62400001a53000000010000,PowerA Mini Pro Ex,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000d62000006dca000011010000,PowerA Pro Ex,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 03000000c62400001a58000001010000,PowerA Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000d62000000220000001010000,PowerA Xbox One Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Linux,
 03000000d62000000228000001010000,PowerA Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000c62400001a54000001010000,PowerA Xbox One Mini Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-03000000d62000000240000001010000,PowerA Xbox One Spectra Infinity,a:b0,b:b1,x:b2,y:b3,back:b6,start:b7,leftstick:b9,rightstick:b10,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:a2,righttrigger:a5,platform:Linux,
+03000000d62000000240000001010000,PowerA Xbox One Spectra Infinity,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006d040000d2ca000011010000,Precision Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 03000000ff1100004133000010010000,PS2 Controller,a:b2,b:b1,back:b8,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Linux,
 03000000341a00003608000011010000,PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
@@ -1434,6 +1460,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 050000005e040000130b000013050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 060000005e040000120b00000b050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 050000005e040000130b000011050000,Xbox Series X Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+030000005e040000120b000007050000,Xbox Series X Controller,a:b0,b:b1,x:b2,y:b3,back:b6,guide:b8,start:b7,leftstick:b9,rightstick:b10,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,misc1:b11,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:a2,righttrigger:a5,platform:Linux,
 050000005e040000130b000007050000,Xbox Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000450c00002043000010010000,XEOX SL6556 BK,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
 05000000172700004431000029010000,XiaoMi Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b20,leftshoulder:b6,leftstick:b13,lefttrigger:a7,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a6,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Linux,
@@ -1449,18 +1476,30 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 61393962646434393836356631636132,8BitDo Arcade Stick,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b19,y:b2,platform:Android,
 64323139346131306233636562663738,8BitDo Arcade Stick,a:b0,b:b1,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b19,y:b2,platform:Android,
 64643565386136613265663236636564,8BitDo Arcade Stick,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b19,y:b2,platform:Android,
+33313433353539306634656436353432,8BitDo Dogbone,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+38426974446f20446f67626f6e65204d,8BitDo Dogbone,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b6,platform:Android,
 34343439373236623466343934376233,8BitDo FC30 Pro,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b28,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b29,righttrigger:b7,start:b5,x:b30,y:b2,platform:Android,
+38393936616436383062666232653338,8BitDo Lite SE,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38426974446f2038426974446f204c69,8BitDo Lite SE,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+39356430616562366466646636643435,8BitDo Lite SE,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
 05000000c82d000006500000ffff3f00,8BitDo M30,a:b1,b:b0,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b17,leftshoulder:b9,lefttrigger:a5,rightshoulder:b10,righttrigger:a4,start:b6,x:b3,y:b2,platform:Android,
 05000000c82d000051060000ffff3f00,8BitDo M30,a:b1,b:b0,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b17,leftshoulder:b9,lefttrigger:a4,rightshoulder:b10,righttrigger:a5,start:b6,x:b3,y:b2,platform:Android,
+32323161363037623637326438643634,8BitDo M30,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightshoulder:b9,righttrigger:b10,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 33656266353630643966653238646264,8BitDo M30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:a5,start:b10,x:b19,y:b2,platform:Android,
+38426974446f204d3330204d6f646b69,8BitDo M30,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightshoulder:b9,righttrigger:b10,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 39366630663062373237616566353437,8BitDo M30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:b18,start:b6,x:b2,y:b3,platform:Android,
 64653533313537373934323436343563,8BitDo M30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:a4,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b9,righttrigger:b10,start:b6,x:b2,y:b3,platform:Android,
 66356438346136366337386437653934,8BitDo M30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:b10,start:b18,x:b19,y:b2,platform:Android,
 66393064393162303732356665666366,8BitDo M30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:a5,start:b6,x:b2,y:b3,platform:Android,
+33663431326134333366393233616633,8BitDo N30,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b6,platform:Android,
+38426974446f204e3330204d6f646b69,8BitDo N30,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b6,platform:Android,
 05000000c82d000015900000ffff3f00,8BitDo N30 Pro 2,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
 05000000c82d000065280000ffff3f00,8BitDo N30 Pro 2,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b17,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
 050000000220000000900000ffff3f00,8BitDo NES30 Pro,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
 050000002038000009000000ffff3f00,8BitDo NES30 Pro,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38313433643131656262306631373166,8BitDo P30,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+38326536643339353865323063616339,8BitDo P30,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+38426974446f2050333020636c617373,8BitDo P30,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 35376664343164386333616535333434,8BitDo Pro 2,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b17,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b18,righttrigger:a5,rightx:a3,start:b10,x:b19,y:b2,platform:Android,
 38426974446f2038426974446f205072,8BitDo Pro 2,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
 38426974446f2050726f203200000000,8BitDo Pro 2,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
@@ -1468,12 +1507,17 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 38386464613034326435626130396565,8BitDo Receiver,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b19,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
 38426974446f2038426974446f205265,8BitDo Receiver,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b19,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
 66303230343038613365623964393766,8BitDo Receiver,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b19,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38426974446f20533330204d6f646b69,8BitDo S30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:a4,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b9,righttrigger:b10,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+66316462353561376330346462316137,8BitDo S30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:a4,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b9,righttrigger:b10,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 05000000c82d000000600000ffff3f00,8BitDo SF30 Pro,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b15,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b16,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
 05000000c82d000000610000ffff3f00,8BitDo SF30 Pro,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
 38426974646f20534633302050726f00,8BitDo SF30 Pro,a:b1,b:b0,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b16,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b17,platform:Android,
 61623334636338643233383735326439,8BitDo SFC30,a:b0,b:b1,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b3,rightshoulder:b31,start:b5,x:b30,y:b2,platform:Android,
 05000000c82d000012900000ffff3f00,8BitDo SN30,a:b1,b:b0,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b6,x:b3,y:b2,platform:Android,
 05000000c82d000062280000ffff3f00,8BitDo SN30,a:b1,b:b0,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b6,x:b3,y:b2,platform:Android,
+38316230613931613964356666353839,8BitDo SN30,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38426974446f20534e3330204d6f646b,8BitDo SN30,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+65323563303231646531383162646335,8BitDo SN30,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
 35383531346263653330306238353131,8BitDo SN30 PP,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 05000000c82d000001600000ffff3f00,8BitDo SN30 Pro,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
 36653638656632326235346264663661,8BitDo SN30 Pro Plus,a:b0,b:b1,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b19,y:b2,platform:Android,
@@ -1497,6 +1541,8 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 417374726f2063697479206d696e6920,Astro City Mini,a:b23,b:b22,back:b29,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,rightshoulder:b25,righttrigger:b26,start:b30,x:b24,y:b21,platform:Android,
 32303165626138343962363666346165,Brook Mars PS4 Controller,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
 38383337343564366131323064613561,Brook Mars PS4 Controller,a:b1,b:b19,back:b17,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+34313430343161653665353737323365,Elecom JC-W01U,a:b23,b:b24,back:b29,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b25,lefttrigger:b27,leftx:a0,lefty:a1,rightshoulder:b26,righttrigger:b28,rightx:a2,righty:a3,start:b30,x:b21,y:b22,platform:Android,
+4875694a6961204a432d573031550000,Elecom JC-W01U,a:b23,b:b24,back:b29,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b25,lefttrigger:b27,leftx:a0,lefty:a1,rightshoulder:b26,righttrigger:b28,rightx:a2,righty:a3,start:b30,x:b21,y:b22,platform:Android,
 30363230653635633863366338623265,Evo VR,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,x:b2,y:b3,platform:Android,
 05000000b404000011240000dfff3f00,Flydigi Vader 2,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,paddle1:b17,paddle2:b18,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 05000000bc20000000550000ffff3f00,GameSir G3w,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
@@ -1535,6 +1581,9 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 6d6179666c617368206c696d69746564,Mayflash GameCube Adapter,a:b22,b:b21,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:b25,leftx:a0,lefty:a1,rightshoulder:b28,righttrigger:b26,rightx:a5,righty:a2,start:b30,x:b23,y:b24,platform:Android,
 436f6e74726f6c6c6572000000000000,Mayflash N64 Adapter,a:b1,b:b19,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightx:a2,righty:a3,start:b18,platform:Android,
 65666330633838383061313633326461,Mayflash N64 Adapter,a:b1,b:b19,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightx:a2,righty:a3,start:b18,platform:Android,
+535a4d792d706f776572204c54442043,Mayflash Wii Classic Adapter,a:b23,b:b22,back:b29,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b31,leftshoulder:b27,lefttrigger:b25,leftx:a0,lefty:a1,rightshoulder:b28,righttrigger:b26,rightx:a2,righty:a3,start:b30,x:b24,y:b21,platform:Android,
+30653962643666303631376438373532,Mayflash Wii DolphinBar,a:b23,b:b24,back:b29,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b0,leftshoulder:b25,lefttrigger:b27,leftx:a0,lefty:a1,rightshoulder:b26,righttrigger:b28,rightx:a2,righty:a3,start:b30,x:b21,y:b22,platform:Android,
+484a5a204d6179666c61736820576969,Mayflash Wii DolphinBar,a:b23,b:b24,back:b29,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b0,leftshoulder:b25,lefttrigger:b27,leftx:a0,lefty:a1,rightshoulder:b26,righttrigger:b28,rightx:a2,righty:a3,start:b30,x:b21,y:b22,platform:Android,
 31323564663862633234646330373138,Mega Drive,a:b23,b:b22,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,rightshoulder:b25,righttrigger:b26,start:b30,x:b24,y:b21,platform:Android,
 37333564393261653735306132613061,Mega Drive,a:b21,b:b22,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b26,lefttrigger:b28,rightshoulder:b27,righttrigger:b23,start:b30,x:b24,y:b25,platform:Android,
 64363363336633363736393038313464,Mega Drive,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b9,x:b2,y:b3,platform:Android,
@@ -1589,10 +1638,10 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 65366465656364636137653363376531,PS4 Controller,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
 66613532303965383534396638613230,PS4 Controller,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a5,start:b18,x:b0,y:b2,platform:Android,
 050000004c050000e60c0000fffe3f00,PS5 Controller,a:b1,b:b17,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,leftstick:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:a4,rightx:a2,righty:a5,start:b16,x:b0,y:b2,platform:Android,
+32346465346533616263386539323932,PS5 Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 32633532643734376632656664383733,PS5 Controller,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a5,start:b18,x:b0,y:b2,platform:Android,
 37363764353731323963323639666565,PS5 Controller,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a5,start:b18,x:b0,y:b2,platform:Android,
 61303162353165316365336436343139,PS5 Controller,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a5,start:b18,x:b0,y:b2,platform:Android,
-32346465346533616263386539323932,PS5 Controller,a:b0,b:b1,x:b2,y:b3,leftshoulder:b9,rightshoulder:b10,lefttrigger:a4,righttrigger:a5,guide:b5,start:b6,leftstick:b7,rightstick:b8,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,back:b15,platform:Android,
 64336263393933626535303339616332,Qanba 4RAF,a:b0,b:b1,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b20,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b3,righttrigger:b9,rightx:a2,righty:a3,start:b18,x:b19,y:b2,platform:Android,
 36626666353861663864336130363137,Razer Junglecat,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 62653861643333663663383332396665,Razer Kishi,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
@@ -1669,6 +1718,10 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 05000000ac050000020000004f066d02,*,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,leftshoulder:b4,rightshoulder:b5,x:b2,y:b3,platform:iOS,
 4d466947616d65706164010000000000,MFi Extended Gamepad,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:iOS,
 4d466947616d65706164020000000000,MFi Gamepad,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,rightshoulder:b5,start:b6,x:b2,y:b3,platform:iOS,
+050000007e050000062000004f060000,Nintendo Switch Joy-Con (L),+leftx:h0.1,+lefty:h0.2,-leftx:h0.4,-lefty:h0.8,dpdown:b2,dpleft:b0,dpright:b3,dpup:b1,leftshoulder:b4,misc1:b6,rightshoulder:b5,platform:iOS,
+050000007e0500000e200000df070000,Nintendo Switch Joy-Con (L/R),a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:iOS,
+050000007e050000072000004f060000,Nintendo Switch Joy-Con (R),+rightx:h0.4,+righty:h0.8,-rightx:h0.1,-righty:h0.2,a:b1,b:b0,guide:b6,leftshoulder:b4,rightshoulder:b5,x:b3,y:b2,platform:iOS,
+050000007e05000009200000ff870000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:iOS,
 050000004c050000cc090000df070000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:iOS,
 050000004c050000cc090000df870001,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:iOS,
 050000004c050000cc090000ff070000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:iOS,
diff --git a/core/input/input.cpp b/core/input/input.cpp
index da0c6cb62a..e08647f5ea 100644
--- a/core/input/input.cpp
+++ b/core/input/input.cpp
@@ -1187,7 +1187,7 @@ Input::JoyEvent Input::_get_mapped_axis_event(const JoyDeviceMapping &mapping, J
 	return event;
 }
 
-void Input::_get_mapped_hat_events(const JoyDeviceMapping &mapping, HatDir p_hat, JoyEvent r_events[]) {
+void Input::_get_mapped_hat_events(const JoyDeviceMapping &mapping, HatDir p_hat, JoyEvent r_events[(size_t)HatDir::MAX]) {
 	for (int i = 0; i < mapping.bindings.size(); i++) {
 		const JoyBinding binding = mapping.bindings[i];
 		if (binding.inputType == TYPE_HAT && binding.input.hat.hat == p_hat) {
diff --git a/core/input/input_event.cpp b/core/input/input_event.cpp
index 3c104c2c86..8ad2193fca 100644
--- a/core/input/input_event.cpp
+++ b/core/input/input_event.cpp
@@ -816,7 +816,7 @@ String InputEventMouseMotion::to_string() {
 
 	// Work around the fact vformat can only take 5 substitutions but 7 need to be passed.
 	String mask_and_position_and_relative = vformat("button_mask=%s, position=(%s), relative=(%s)", button_mask_string, String(get_position()), String(get_relative()));
-	return vformat("InputEventMouseMotion: %s, velocity=(%s), pressure=%.2f, tilt=(%s), pen_inverted=(%d)", mask_and_position_and_relative, String(get_velocity()), get_pressure(), String(get_tilt()), get_pen_inverted());
+	return vformat("InputEventMouseMotion: %s, velocity=(%s), pressure=%.2f, tilt=(%s), pen_inverted=(%s)", mask_and_position_and_relative, String(get_velocity()), get_pressure(), String(get_tilt()), get_pen_inverted());
 }
 
 bool InputEventMouseMotion::accumulate(const Ref<InputEvent> &p_event) {
diff --git a/core/io/dir_access.h b/core/io/dir_access.h
index 22017efaa3..d5318dfb45 100644
--- a/core/io/dir_access.h
+++ b/core/io/dir_access.h
@@ -108,6 +108,8 @@ public:
 			if (da->remove(p_path) != OK) {
 				ERR_FAIL_MSG("Cannot remove file or directory: " + p_path);
 			}
+		} else {
+			ERR_FAIL_MSG("Cannot remove non-existent file or directory: " + p_path);
 		}
 	}
 
diff --git a/core/io/image.cpp b/core/io/image.cpp
index 0f20aabd7e..2d87523ca4 100644
--- a/core/io/image.cpp
+++ b/core/io/image.cpp
@@ -416,8 +416,8 @@ int Image::get_height() const {
 	return height;
 }
 
-Vector2 Image::get_size() const {
-	return Vector2(width, height);
+Vector2i Image::get_size() const {
+	return Vector2i(width, height);
 }
 
 bool Image::has_mipmaps() const {
diff --git a/core/io/image.h b/core/io/image.h
index 46820a4c08..9d415423be 100644
--- a/core/io/image.h
+++ b/core/io/image.h
@@ -209,7 +209,7 @@ private:
 public:
 	int get_width() const; ///< Get image width
 	int get_height() const; ///< Get image height
-	Vector2 get_size() const;
+	Vector2i get_size() const;
 	bool has_mipmaps() const;
 	int get_mipmap_count() const;
 
diff --git a/core/io/packed_data_container.cpp b/core/io/packed_data_container.cpp
index a456318148..2dcb86cbc6 100644
--- a/core/io/packed_data_container.cpp
+++ b/core/io/packed_data_container.cpp
@@ -353,7 +353,7 @@ Variant PackedDataContainer::_iter_get(const Variant &p_iter) {
 }
 
 void PackedDataContainer::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("_set_data"), &PackedDataContainer::_set_data);
+	ClassDB::bind_method(D_METHOD("_set_data", "data"), &PackedDataContainer::_set_data);
 	ClassDB::bind_method(D_METHOD("_get_data"), &PackedDataContainer::_get_data);
 	ClassDB::bind_method(D_METHOD("_iter_init"), &PackedDataContainer::_iter_init);
 	ClassDB::bind_method(D_METHOD("_iter_get"), &PackedDataContainer::_iter_get);
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp
index 3e595557f9..eccb397e2e 100644
--- a/core/io/resource_loader.cpp
+++ b/core/io/resource_loader.cpp
@@ -794,6 +794,8 @@ String ResourceLoader::_path_remap(const String &p_path, bool *r_translation_rem
 		// To find the path of the remapped resource, we extract the locale name after
 		// the last ':' to match the project locale.
 
+		// An extra remap may still be necessary afterwards due to the text -> binary converter on export.
+
 		String locale = TranslationServer::get_singleton()->get_locale();
 		ERR_FAIL_COND_V_MSG(locale.length() < 2, p_path, "Could not remap path '" + p_path + "' for translation as configured locale '" + locale + "' is invalid.");
 
@@ -829,12 +831,10 @@ String ResourceLoader::_path_remap(const String &p_path, bool *r_translation_rem
 
 	if (path_remaps.has(new_path)) {
 		new_path = path_remaps[new_path];
-	}
-
-	if (new_path == p_path) { // Did not remap.
+	} else {
 		// Try file remap.
 		Error err;
-		Ref<FileAccess> f = FileAccess::open(p_path + ".remap", FileAccess::READ, &err);
+		Ref<FileAccess> f = FileAccess::open(new_path + ".remap", FileAccess::READ, &err);
 		if (f.is_valid()) {
 			VariantParser::StreamFile stream;
 			stream.f = f;
diff --git a/core/math/vector3.h b/core/math/vector3.h
index 970416234d..4ce01da60e 100644
--- a/core/math/vector3.h
+++ b/core/math/vector3.h
@@ -217,16 +217,25 @@ Vector3 Vector3::lerp(const Vector3 &p_to, const real_t p_weight) const {
 }
 
 Vector3 Vector3::slerp(const Vector3 &p_to, const real_t p_weight) const {
+	// This method seems more complicated than it really is, since we write out
+	// the internals of some methods for efficiency (mainly, checking length).
 	real_t start_length_sq = length_squared();
 	real_t end_length_sq = p_to.length_squared();
 	if (unlikely(start_length_sq == 0.0f || end_length_sq == 0.0f)) {
 		// Zero length vectors have no angle, so the best we can do is either lerp or throw an error.
 		return lerp(p_to, p_weight);
 	}
+	Vector3 axis = cross(p_to);
+	real_t axis_length_sq = axis.length_squared();
+	if (unlikely(axis_length_sq == 0.0f)) {
+		// Colinear vectors have no rotation axis or angle between them, so the best we can do is lerp.
+		return lerp(p_to, p_weight);
+	}
+	axis /= Math::sqrt(axis_length_sq);
 	real_t start_length = Math::sqrt(start_length_sq);
 	real_t result_length = Math::lerp(start_length, Math::sqrt(end_length_sq), p_weight);
 	real_t angle = angle_to(p_to);
-	return rotated(cross(p_to).normalized(), angle * p_weight) * (result_length / start_length);
+	return rotated(axis, angle * p_weight) * (result_length / start_length);
 }
 
 Vector3 Vector3::cubic_interpolate(const Vector3 &p_b, const Vector3 &p_pre_a, const Vector3 &p_post_b, const real_t p_weight) const {
diff --git a/core/math/vector4.cpp b/core/math/vector4.cpp
index cc0d0dcf72..1dd5adad2b 100644
--- a/core/math/vector4.cpp
+++ b/core/math/vector4.cpp
@@ -33,6 +33,40 @@
 #include "core/math/basis.h"
 #include "core/string/print_string.h"
 
+void Vector4::set_axis(const int p_axis, const real_t p_value) {
+	ERR_FAIL_INDEX(p_axis, 4);
+	components[p_axis] = p_value;
+}
+
+real_t Vector4::get_axis(const int p_axis) const {
+	ERR_FAIL_INDEX_V(p_axis, 4, 0);
+	return operator[](p_axis);
+}
+
+Vector4::Axis Vector4::min_axis_index() const {
+	uint32_t min_index = 0;
+	real_t min_value = x;
+	for (uint32_t i = 1; i < 4; i++) {
+		if (operator[](i) <= min_value) {
+			min_index = i;
+			min_value = operator[](i);
+		}
+	}
+	return Vector4::Axis(min_index);
+}
+
+Vector4::Axis Vector4::max_axis_index() const {
+	uint32_t max_index = 0;
+	real_t max_value = x;
+	for (uint32_t i = 1; i < 4; i++) {
+		if (operator[](i) > max_value) {
+			max_index = i;
+			max_value = operator[](i);
+		}
+	}
+	return Vector4::Axis(max_index);
+}
+
 bool Vector4::is_equal_approx(const Vector4 &p_vec4) const {
 	return Math::is_equal_approx(x, p_vec4.x) && Math::is_equal_approx(y, p_vec4.y) && Math::is_equal_approx(z, p_vec4.z) && Math::is_equal_approx(w, p_vec4.w);
 }
@@ -53,6 +87,20 @@ bool Vector4::is_normalized() const {
 	return Math::is_equal_approx(length_squared(), 1, (real_t)UNIT_EPSILON); // Use less epsilon.
 }
 
+real_t Vector4::distance_to(const Vector4 &p_to) const {
+	return (p_to - *this).length();
+}
+
+real_t Vector4::distance_squared_to(const Vector4 &p_to) const {
+	return (p_to - *this).length_squared();
+}
+
+Vector4 Vector4::direction_to(const Vector4 &p_to) const {
+	Vector4 ret(p_to.x - x, p_to.y - y, p_to.z - z, p_to.w - w);
+	ret.normalize();
+	return ret;
+}
+
 Vector4 Vector4::abs() const {
 	return Vector4(Math::abs(x), Math::abs(y), Math::abs(z), Math::abs(w));
 }
@@ -81,32 +129,38 @@ Vector4 Vector4::lerp(const Vector4 &p_to, const real_t p_weight) const {
 			w + (p_weight * (p_to.w - w)));
 }
 
-Vector4 Vector4::inverse() const {
-	return Vector4(1.0f / x, 1.0f / y, 1.0f / z, 1.0f / w);
+Vector4 Vector4::cubic_interpolate(const Vector4 &p_b, const Vector4 &p_pre_a, const Vector4 &p_post_b, const real_t p_weight) const {
+	Vector4 res = *this;
+	res.x = Math::cubic_interpolate(res.x, p_b.x, p_pre_a.x, p_post_b.x, p_weight);
+	res.y = Math::cubic_interpolate(res.y, p_b.y, p_pre_a.y, p_post_b.y, p_weight);
+	res.z = Math::cubic_interpolate(res.z, p_b.z, p_pre_a.z, p_post_b.z, p_weight);
+	res.w = Math::cubic_interpolate(res.w, p_b.w, p_pre_a.w, p_post_b.w, p_weight);
+	return res;
 }
 
-Vector4::Axis Vector4::min_axis_index() const {
-	uint32_t min_index = 0;
-	real_t min_value = x;
-	for (uint32_t i = 1; i < 4; i++) {
-		if (operator[](i) <= min_value) {
-			min_index = i;
-			min_value = operator[](i);
-		}
-	}
-	return Vector4::Axis(min_index);
+Vector4 Vector4::posmod(const real_t p_mod) const {
+	return Vector4(Math::fposmod(x, p_mod), Math::fposmod(y, p_mod), Math::fposmod(z, p_mod), Math::fposmod(w, p_mod));
 }
 
-Vector4::Axis Vector4::max_axis_index() const {
-	uint32_t max_index = 0;
-	real_t max_value = x;
-	for (uint32_t i = 1; i < 4; i++) {
-		if (operator[](i) > max_value) {
-			max_index = i;
-			max_value = operator[](i);
-		}
-	}
-	return Vector4::Axis(max_index);
+Vector4 Vector4::posmodv(const Vector4 &p_modv) const {
+	return Vector4(Math::fposmod(x, p_modv.x), Math::fposmod(y, p_modv.y), Math::fposmod(z, p_modv.z), Math::fposmod(w, p_modv.w));
+}
+
+void Vector4::snap(const Vector4 &p_step) {
+	x = Math::snapped(x, p_step.x);
+	y = Math::snapped(y, p_step.y);
+	z = Math::snapped(z, p_step.z);
+	w = Math::snapped(w, p_step.w);
+}
+
+Vector4 Vector4::snapped(const Vector4 &p_step) const {
+	Vector4 v = *this;
+	v.snap(p_step);
+	return v;
+}
+
+Vector4 Vector4::inverse() const {
+	return Vector4(1.0f / x, 1.0f / y, 1.0f / z, 1.0f / w);
 }
 
 Vector4 Vector4::clamp(const Vector4 &p_min, const Vector4 &p_max) const {
diff --git a/core/math/vector4.h b/core/math/vector4.h
index 37ddb509d6..d26fe15941 100644
--- a/core/math/vector4.h
+++ b/core/math/vector4.h
@@ -62,6 +62,15 @@ struct _NO_DISCARD_ Vector4 {
 		DEV_ASSERT((unsigned int)p_axis < 4);
 		return components[p_axis];
 	}
+
+	_FORCE_INLINE_ void set_all(const real_t p_value);
+
+	void set_axis(const int p_axis, const real_t p_value);
+	real_t get_axis(const int p_axis) const;
+
+	Vector4::Axis min_axis_index() const;
+	Vector4::Axis max_axis_index() const;
+
 	_FORCE_INLINE_ real_t length_squared() const;
 	bool is_equal_approx(const Vector4 &p_vec4) const;
 	real_t length() const;
@@ -69,15 +78,22 @@ struct _NO_DISCARD_ Vector4 {
 	Vector4 normalized() const;
 	bool is_normalized() const;
 
+	real_t distance_to(const Vector4 &p_to) const;
+	real_t distance_squared_to(const Vector4 &p_to) const;
+	Vector4 direction_to(const Vector4 &p_to) const;
+
 	Vector4 abs() const;
 	Vector4 sign() const;
 	Vector4 floor() const;
 	Vector4 ceil() const;
 	Vector4 round() const;
 	Vector4 lerp(const Vector4 &p_to, const real_t p_weight) const;
+	Vector4 cubic_interpolate(const Vector4 &p_b, const Vector4 &p_pre_a, const Vector4 &p_post_b, const real_t p_weight) const;
 
-	Vector4::Axis min_axis_index() const;
-	Vector4::Axis max_axis_index() const;
+	Vector4 posmod(const real_t p_mod) const;
+	Vector4 posmodv(const Vector4 &p_modv) const;
+	void snap(const Vector4 &p_step);
+	Vector4 snapped(const Vector4 &p_step) const;
 	Vector4 clamp(const Vector4 &p_min, const Vector4 &p_max) const;
 
 	Vector4 inverse() const;
@@ -130,6 +146,10 @@ struct _NO_DISCARD_ Vector4 {
 	}
 };
 
+void Vector4::set_all(const real_t p_value) {
+	x = y = z = p_value;
+}
+
 real_t Vector4::dot(const Vector4 &p_vec4) const {
 	return x * p_vec4.x + y * p_vec4.y + z * p_vec4.z + w * p_vec4.w;
 }
@@ -193,7 +213,7 @@ Vector4 Vector4::operator/(const Vector4 &p_vec4) const {
 }
 
 Vector4 Vector4::operator-() const {
-	return Vector4(x, y, z, w);
+	return Vector4(-x, -y, -z, -w);
 }
 
 Vector4 Vector4::operator*(const real_t &s) const {
diff --git a/core/object/method_bind.cpp b/core/object/method_bind.cpp
index a4474ea53b..0edc7a90c2 100644
--- a/core/object/method_bind.cpp
+++ b/core/object/method_bind.cpp
@@ -63,7 +63,7 @@ PropertyInfo MethodBind::get_argument_info(int p_argument) const {
 
 	PropertyInfo info = _gen_argument_type_info(p_argument);
 #ifdef DEBUG_METHODS_ENABLED
-	info.name = p_argument < arg_names.size() ? String(arg_names[p_argument]) : String("arg" + itos(p_argument));
+	info.name = p_argument < arg_names.size() ? String(arg_names[p_argument]) : String("_unnamed_arg" + itos(p_argument));
 #endif
 	return info;
 }
diff --git a/core/object/object.cpp b/core/object/object.cpp
index 75dbe8872f..a95ba7992b 100644
--- a/core/object/object.cpp
+++ b/core/object/object.cpp
@@ -472,7 +472,6 @@ Variant Object::get_indexed(const Vector<StringName> &p_names, bool *r_valid) co
 
 void Object::get_property_list(List<PropertyInfo> *p_list, bool p_reversed) const {
 	if (script_instance && p_reversed) {
-		p_list->push_back(PropertyInfo(Variant::NIL, "Script Variables", PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_CATEGORY));
 		script_instance->get_property_list(p_list);
 	}
 
@@ -503,7 +502,6 @@ void Object::get_property_list(List<PropertyInfo> *p_list, bool p_reversed) cons
 	}
 
 	if (script_instance && !p_reversed) {
-		p_list->push_back(PropertyInfo(Variant::NIL, "Script Variables", PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_CATEGORY));
 		script_instance->get_property_list(p_list);
 	}
 
@@ -520,6 +518,59 @@ void Object::get_property_list(List<PropertyInfo> *p_list, bool p_reversed) cons
 void Object::_validate_property(PropertyInfo &property) const {
 }
 
+bool Object::property_can_revert(const String &p_name) const {
+	if (script_instance) {
+		if (script_instance->property_can_revert(p_name)) {
+			return true;
+		}
+	}
+
+// C style pointer casts should never trigger a compiler warning because the risk is assumed by the user, so GCC should keep quiet about it.
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wignored-qualifiers"
+#endif
+	if (_extension && _extension->property_can_revert) {
+		if (_extension->property_can_revert(_extension_instance, (const GDNativeStringNamePtr)&p_name)) {
+			return true;
+		}
+	}
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+
+	return _property_can_revertv(p_name);
+}
+
+Variant Object::property_get_revert(const String &p_name) const {
+	Variant ret;
+
+	if (script_instance) {
+		if (script_instance->property_get_revert(p_name, ret)) {
+			return ret;
+		}
+	}
+
+// C style pointer casts should never trigger a compiler warning because the risk is assumed by the user, so GCC should keep quiet about it.
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wignored-qualifiers"
+#endif
+	if (_extension && _extension->property_get_revert) {
+		if (_extension->property_get_revert(_extension_instance, (const GDNativeStringNamePtr)&p_name, (GDNativeVariantPtr)&ret)) {
+			return ret;
+		}
+	}
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+
+	if (_property_get_revertv(p_name, ret)) {
+		return ret;
+	}
+	return Variant();
+}
+
 void Object::get_method_list(List<MethodInfo> *p_list) const {
 	ClassDB::get_method_list(get_class_name(), p_list);
 	if (script_instance) {
@@ -1501,10 +1552,12 @@ void Object::_bind_methods() {
 	miget.return_val.usage |= PROPERTY_USAGE_NIL_IS_VARIANT;
 	BIND_OBJ_CORE_METHOD(miget);
 
-	MethodInfo plget("_get_property_list");
-
-	plget.return_val.type = Variant::ARRAY;
-	BIND_OBJ_CORE_METHOD(plget);
+	BIND_OBJ_CORE_METHOD(MethodInfo(Variant::ARRAY, "_get_property_list"));
+	BIND_OBJ_CORE_METHOD(MethodInfo(Variant::BOOL, "_property_can_revert", PropertyInfo(Variant::STRING_NAME, "property")));
+	MethodInfo mipgr("_property_get_revert", PropertyInfo(Variant::STRING_NAME, "property"));
+	mipgr.return_val.name = "Variant";
+	mipgr.return_val.usage |= PROPERTY_USAGE_NIL_IS_VARIANT;
+	BIND_OBJ_CORE_METHOD(mipgr);
 
 #endif
 	BIND_OBJ_CORE_METHOD(MethodInfo("_init"));
diff --git a/core/object/object.h b/core/object/object.h
index 35d0aaaa7d..154ef176d3 100644
--- a/core/object/object.h
+++ b/core/object/object.h
@@ -294,6 +294,8 @@ struct ObjectNativeExtension {
 	GDNativeExtensionClassGet get;
 	GDNativeExtensionClassGetPropertyList get_property_list;
 	GDNativeExtensionClassFreePropertyList free_property_list;
+	GDNativeExtensionClassPropertyCanRevert property_can_revert;
+	GDNativeExtensionClassPropertyGetRevert property_get_revert;
 	GDNativeExtensionClassNotification notification;
 	GDNativeExtensionClassToString to_string;
 	GDNativeExtensionClassReference reference;
@@ -469,6 +471,28 @@ protected:
 			m_inherits::_get_property_listv(p_list, p_reversed);                                                                                 \
 		}                                                                                                                                        \
 	}                                                                                                                                            \
+	_FORCE_INLINE_ bool (Object::*_get_property_can_revert() const)(const StringName &p_name) const {                                            \
+		return (bool(Object::*)(const StringName &) const) & m_class::_property_can_revert;                                                      \
+	}                                                                                                                                            \
+	virtual bool _property_can_revertv(const StringName &p_name) const override {                                                                \
+		if (m_class::_get_property_can_revert() != m_inherits::_get_property_can_revert()) {                                                     \
+			if (_property_can_revert(p_name)) {                                                                                                  \
+				return true;                                                                                                                     \
+			}                                                                                                                                    \
+		}                                                                                                                                        \
+		return m_inherits::_property_can_revertv(p_name);                                                                                        \
+	}                                                                                                                                            \
+	_FORCE_INLINE_ bool (Object::*_get_property_get_revert() const)(const StringName &p_name, Variant &) const {                                 \
+		return (bool(Object::*)(const StringName &, Variant &) const) & m_class::_property_get_revert;                                           \
+	}                                                                                                                                            \
+	virtual bool _property_get_revertv(const StringName &p_name, Variant &r_ret) const override {                                                \
+		if (m_class::_get_property_get_revert() != m_inherits::_get_property_get_revert()) {                                                     \
+			if (_property_get_revert(p_name, r_ret)) {                                                                                           \
+				return true;                                                                                                                     \
+			}                                                                                                                                    \
+		}                                                                                                                                        \
+		return m_inherits::_property_get_revertv(p_name, r_ret);                                                                                 \
+	}                                                                                                                                            \
 	_FORCE_INLINE_ void (Object::*_get_notification() const)(int) {                                                                              \
 		return (void(Object::*)(int)) & m_class::_notification;                                                                                  \
 	}                                                                                                                                            \
@@ -613,12 +637,16 @@ protected:
 	virtual bool _setv(const StringName &p_name, const Variant &p_property) { return false; };
 	virtual bool _getv(const StringName &p_name, Variant &r_property) const { return false; };
 	virtual void _get_property_listv(List<PropertyInfo> *p_list, bool p_reversed) const {};
+	virtual bool _property_can_revertv(const StringName &p_name) const { return false; };
+	virtual bool _property_get_revertv(const StringName &p_name, Variant &r_property) const { return false; };
 	virtual void _notificationv(int p_notification, bool p_reversed) {}
 
 	static void _bind_methods();
 	bool _set(const StringName &p_name, const Variant &p_property) { return false; };
 	bool _get(const StringName &p_name, Variant &r_property) const { return false; };
 	void _get_property_list(List<PropertyInfo> *p_list) const {};
+	bool _property_can_revert(const StringName &p_name) const { return false; };
+	bool _property_get_revert(const StringName &p_name, Variant &r_property) const { return false; };
 	void _notification(int p_notification) {}
 
 	_FORCE_INLINE_ static void (*_get_bind_methods())() {
@@ -633,6 +661,12 @@ protected:
 	_FORCE_INLINE_ void (Object::*_get_get_property_list() const)(List<PropertyInfo> *p_list) const {
 		return &Object::_get_property_list;
 	}
+	_FORCE_INLINE_ bool (Object::*_get_property_can_revert() const)(const StringName &p_name) const {
+		return &Object::_property_can_revert;
+	}
+	_FORCE_INLINE_ bool (Object::*_get_property_get_revert() const)(const StringName &p_name, Variant &) const {
+		return &Object::_property_get_revert;
+	}
 	_FORCE_INLINE_ void (Object::*_get_notification() const)(int) {
 		return &Object::_notification;
 	}
@@ -757,6 +791,8 @@ public:
 	Variant get_indexed(const Vector<StringName> &p_names, bool *r_valid = nullptr) const;
 
 	void get_property_list(List<PropertyInfo> *p_list, bool p_reversed = false) const;
+	bool property_can_revert(const String &p_name) const;
+	Variant property_get_revert(const String &p_name) const;
 
 	bool has_method(const StringName &p_method) const;
 	void get_method_list(List<MethodInfo> *p_list) const;
diff --git a/core/object/ref_counted.cpp b/core/object/ref_counted.cpp
index 726e2c012c..cac2400744 100644
--- a/core/object/ref_counted.cpp
+++ b/core/object/ref_counted.cpp
@@ -85,7 +85,8 @@ bool RefCounted::unreference() {
 			_get_extension()->unreference(_get_extension_instance());
 		}
 
-		die = die && _instance_binding_reference(false);
+		bool binding_ret = _instance_binding_reference(false);
+		die = die && binding_ret;
 	}
 
 	return die;
diff --git a/core/object/script_language.cpp b/core/object/script_language.cpp
index 226fd8b791..b06c2e8896 100644
--- a/core/object/script_language.cpp
+++ b/core/object/script_language.cpp
@@ -101,6 +101,31 @@ Dictionary Script::_get_script_constant_map() {
 	return ret;
 }
 
+#ifdef TOOLS_ENABLED
+
+PropertyInfo Script::get_class_category() const {
+	String path = get_path();
+	String name;
+
+	if (is_built_in()) {
+		if (get_name().is_empty()) {
+			name = TTR("Built-in script");
+		} else {
+			name = vformat("%s (%s)", get_name(), TTR("Built-in"));
+		}
+	} else {
+		if (get_name().is_empty()) {
+			name = path.get_file();
+		} else {
+			name = get_name();
+		}
+	}
+
+	return PropertyInfo(Variant::NIL, name, PROPERTY_HINT_NONE, path, PROPERTY_USAGE_CATEGORY);
+}
+
+#endif // TOOLS_ENABLED
+
 void Script::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("can_instantiate"), &Script::can_instantiate);
 	//ClassDB::bind_method(D_METHOD("instance_create","base_object"),&Script::instance_create);
diff --git a/core/object/script_language.h b/core/object/script_language.h
index c9f8a4f828..bfdedbe4a5 100644
--- a/core/object/script_language.h
+++ b/core/object/script_language.h
@@ -132,6 +132,7 @@ public:
 
 #ifdef TOOLS_ENABLED
 	virtual Vector<DocData::ClassDoc> get_documentation() const = 0;
+	virtual PropertyInfo get_class_category() const;
 #endif // TOOLS_ENABLED
 
 	virtual bool has_method(const StringName &p_method) const = 0;
@@ -170,6 +171,9 @@ public:
 	virtual void get_property_list(List<PropertyInfo> *p_properties) const = 0;
 	virtual Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid = nullptr) const = 0;
 
+	virtual bool property_can_revert(const StringName &p_name) const = 0;
+	virtual bool property_get_revert(const StringName &p_name, Variant &r_ret) const = 0;
+
 	virtual Object *get_owner() { return nullptr; }
 	virtual void get_property_state(List<Pair<StringName, Variant>> &state);
 
@@ -446,6 +450,9 @@ public:
 	virtual void get_property_list(List<PropertyInfo> *p_properties) const override;
 	virtual Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid = nullptr) const override;
 
+	virtual bool property_can_revert(const StringName &p_name) const override { return false; };
+	virtual bool property_get_revert(const StringName &p_name, Variant &r_ret) const override { return false; };
+
 	virtual void get_method_list(List<MethodInfo> *p_list) const override;
 	virtual bool has_method(const StringName &p_method) const override;
 
diff --git a/core/object/script_language_extension.h b/core/object/script_language_extension.h
index 10eacfd9f7..7e74f6a2be 100644
--- a/core/object/script_language_extension.h
+++ b/core/object/script_language_extension.h
@@ -663,6 +663,14 @@ public:
 		if (native_info->get_property_list_func) {
 			uint32_t pcount;
 			const GDNativePropertyInfo *pinfo = native_info->get_property_list_func(instance, &pcount);
+
+#ifdef TOOLS_ENABLED
+			Ref<Script> script = get_script();
+			if (script->is_valid() && pcount > 0) {
+				p_list->push_back(script->get_class_category());
+			}
+#endif // TOOLS_ENABLED
+
 			for (uint32_t i = 0; i < pcount; i++) {
 				p_list->push_back(PropertyInfo(pinfo[i]));
 			}
@@ -684,6 +692,19 @@ public:
 		return Variant::NIL;
 	}
 
+	virtual bool property_can_revert(const StringName &p_name) const override {
+		if (native_info->property_can_revert_func) {
+			return native_info->property_can_revert_func(instance, (const GDNativeStringNamePtr)&p_name);
+		}
+		return false;
+	}
+	virtual bool property_get_revert(const StringName &p_name, Variant &r_ret) const override {
+		if (native_info->property_get_revert_func) {
+			return native_info->property_get_revert_func(instance, (const GDNativeStringNamePtr)&p_name, (GDNativeVariantPtr)&r_ret);
+		}
+		return false;
+	}
+
 	virtual Object *get_owner() override {
 		if (native_info->get_owner_func) {
 			return (Object *)native_info->get_owner_func(instance);
diff --git a/core/os/memory.h b/core/os/memory.h
index 42ba9634e2..0e1afe027e 100644
--- a/core/os/memory.h
+++ b/core/os/memory.h
@@ -36,6 +36,7 @@
 
 #include <stddef.h>
 #include <new>
+#include <type_traits>
 
 #ifndef PAD_ALIGN
 #define PAD_ALIGN 16 //must always be greater than this at much
@@ -104,7 +105,7 @@ void memdelete(T *p_class) {
 	if (!predelete_handler(p_class)) {
 		return; // doesn't want to be deleted
 	}
-	if (!__has_trivial_destructor(T)) {
+	if (!std::is_trivially_destructible<T>::value) {
 		p_class->~T();
 	}
 
@@ -116,7 +117,7 @@ void memdelete_allocator(T *p_class) {
 	if (!predelete_handler(p_class)) {
 		return; // doesn't want to be deleted
 	}
-	if (!__has_trivial_destructor(T)) {
+	if (!std::is_trivially_destructible<T>::value) {
 		p_class->~T();
 	}
 
@@ -146,7 +147,7 @@ T *memnew_arr_template(size_t p_elements) {
 	ERR_FAIL_COND_V(!mem, failptr);
 	*(mem - 1) = p_elements;
 
-	if (!__has_trivial_constructor(T)) {
+	if (!std::is_trivially_constructible<T>::value) {
 		T *elems = (T *)mem;
 
 		/* call operator new */
@@ -173,7 +174,7 @@ template <typename T>
 void memdelete_arr(T *p_class) {
 	uint64_t *ptr = (uint64_t *)p_class;
 
-	if (!__has_trivial_destructor(T)) {
+	if (!std::is_trivially_destructible<T>::value) {
 		uint64_t elem_count = *(ptr - 1);
 
 		for (uint64_t i = 0; i < elem_count; i++) {
diff --git a/core/register_core_types.cpp b/core/register_core_types.cpp
index 1ae5d1c83f..9ad6b0ca68 100644
--- a/core/register_core_types.cpp
+++ b/core/register_core_types.cpp
@@ -269,6 +269,7 @@ void register_core_types() {
 	_marshalls = memnew(core_bind::Marshalls);
 	_engine_debugger = memnew(core_bind::EngineDebugger);
 
+	GDREGISTER_NATIVE_STRUCT(ObjectID, "uint64_t id = 0");
 	GDREGISTER_NATIVE_STRUCT(AudioFrame, "float left;float right");
 	GDREGISTER_NATIVE_STRUCT(ScriptLanguageExtensionProfilingInfo, "StringName signature;uint64_t call_count;uint64_t total_time;uint64_t self_time");
 
diff --git a/core/string/translation.cpp b/core/string/translation.cpp
index cba2f09022..b83b7c786f 100644
--- a/core/string/translation.cpp
+++ b/core/string/translation.cpp
@@ -141,7 +141,7 @@ void Translation::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("erase_message", "src_message", "context"), &Translation::erase_message, DEFVAL(""));
 	ClassDB::bind_method(D_METHOD("get_message_list"), &Translation::_get_message_list);
 	ClassDB::bind_method(D_METHOD("get_message_count"), &Translation::get_message_count);
-	ClassDB::bind_method(D_METHOD("_set_messages"), &Translation::_set_messages);
+	ClassDB::bind_method(D_METHOD("_set_messages", "messages"), &Translation::_set_messages);
 	ClassDB::bind_method(D_METHOD("_get_messages"), &Translation::_get_messages);
 
 	GDVIRTUAL_BIND(_get_plural_message, "src_message", "src_plural_message", "n", "context");
diff --git a/core/templates/cowdata.h b/core/templates/cowdata.h
index e760fc2176..f98b2308c9 100644
--- a/core/templates/cowdata.h
+++ b/core/templates/cowdata.h
@@ -36,6 +36,7 @@
 #include "core/templates/safe_refcount.h"
 
 #include <string.h>
+#include <type_traits>
 
 template <class T>
 class Vector;
@@ -158,6 +159,7 @@ public:
 		return _ptr[p_index];
 	}
 
+	template <bool p_ensure_zero = false>
 	Error resize(int p_size);
 
 	_FORCE_INLINE_ void remove_at(int p_index) {
@@ -204,7 +206,7 @@ void CowData<T>::_unref(void *p_data) {
 	}
 	// clean up
 
-	if (!__has_trivial_destructor(T)) {
+	if (!std::is_trivially_destructible<T>::value) {
 		uint32_t *count = _get_size();
 		T *data = (T *)(count + 1);
 
@@ -239,7 +241,7 @@ uint32_t CowData<T>::_copy_on_write() {
 		T *_data = (T *)(mem_new);
 
 		// initialize new elements
-		if (__has_trivial_copy(T)) {
+		if (std::is_trivially_copyable<T>::value) {
 			memcpy(mem_new, _ptr, current_size * sizeof(T));
 
 		} else {
@@ -257,6 +259,7 @@ uint32_t CowData<T>::_copy_on_write() {
 }
 
 template <class T>
+template <bool p_ensure_zero>
 Error CowData<T>::resize(int p_size) {
 	ERR_FAIL_COND_V(p_size < 0, ERR_INVALID_PARAMETER);
 
@@ -302,16 +305,18 @@ Error CowData<T>::resize(int p_size) {
 
 		// construct the newly created elements
 
-		if (!__has_trivial_constructor(T)) {
+		if (!std::is_trivially_constructible<T>::value) {
 			for (int i = *_get_size(); i < p_size; i++) {
 				memnew_placement(&_ptr[i], T);
 			}
+		} else if (p_ensure_zero) {
+			memset((void *)(_ptr + current_size), 0, (p_size - current_size) * sizeof(T));
 		}
 
 		*_get_size() = p_size;
 
 	} else if (p_size < current_size) {
-		if (!__has_trivial_destructor(T)) {
+		if (!std::is_trivially_destructible<T>::value) {
 			// deinitialize no longer needed elements
 			for (uint32_t i = p_size; i < *_get_size(); i++) {
 				T *t = &_ptr[i];
diff --git a/core/templates/local_vector.h b/core/templates/local_vector.h
index 8d687effcf..49690f2373 100644
--- a/core/templates/local_vector.h
+++ b/core/templates/local_vector.h
@@ -37,6 +37,7 @@
 #include "core/templates/vector.h"
 
 #include <initializer_list>
+#include <type_traits>
 
 // If tight, it grows strictly as much as needed.
 // Otherwise, it grows exponentially (the default and what you want in most cases).
@@ -67,7 +68,7 @@ public:
 			CRASH_COND_MSG(!data, "Out of memory");
 		}
 
-		if (!__has_trivial_constructor(T) && !force_trivial) {
+		if (!std::is_trivially_constructible<T>::value && !force_trivial) {
 			memnew_placement(&data[count++], T(p_elem));
 		} else {
 			data[count++] = p_elem;
@@ -80,7 +81,7 @@ public:
 		for (U i = p_index; i < count; i++) {
 			data[i] = data[i + 1];
 		}
-		if (!__has_trivial_destructor(T) && !force_trivial) {
+		if (!std::is_trivially_destructible<T>::value && !force_trivial) {
 			data[count].~T();
 		}
 	}
@@ -93,7 +94,7 @@ public:
 		if (count > p_index) {
 			data[p_index] = data[count];
 		}
-		if (!__has_trivial_destructor(T) && !force_trivial) {
+		if (!std::is_trivially_destructible<T>::value && !force_trivial) {
 			data[count].~T();
 		}
 	}
@@ -134,7 +135,7 @@ public:
 	_FORCE_INLINE_ U size() const { return count; }
 	void resize(U p_size) {
 		if (p_size < count) {
-			if (!__has_trivial_destructor(T) && !force_trivial) {
+			if (!std::is_trivially_destructible<T>::value && !force_trivial) {
 				for (U i = p_size; i < count; i++) {
 					data[i].~T();
 				}
@@ -151,7 +152,7 @@ public:
 				data = (T *)memrealloc(data, capacity * sizeof(T));
 				CRASH_COND_MSG(!data, "Out of memory");
 			}
-			if (!__has_trivial_constructor(T) && !force_trivial) {
+			if (!std::is_trivially_constructible<T>::value && !force_trivial) {
 				for (U i = count; i < p_size; i++) {
 					memnew_placement(&data[i], T);
 				}
diff --git a/core/templates/paged_array.h b/core/templates/paged_array.h
index 33d2757bec..f1ede556e6 100644
--- a/core/templates/paged_array.h
+++ b/core/templates/paged_array.h
@@ -35,6 +35,8 @@
 #include "core/os/spin_lock.h"
 #include "core/typedefs.h"
 
+#include <type_traits>
+
 // PagedArray is used mainly for filling a very large array from multiple threads efficiently and without causing major fragmentation
 
 // PageArrayPool manages central page allocation in a thread safe matter
@@ -197,7 +199,7 @@ public:
 		uint32_t page = count >> page_size_shift;
 		uint32_t offset = count & page_size_mask;
 
-		if (!__has_trivial_constructor(T)) {
+		if (!std::is_trivially_constructible<T>::value) {
 			memnew_placement(&page_data[page][offset], T(p_value));
 		} else {
 			page_data[page][offset] = p_value;
@@ -209,7 +211,7 @@ public:
 	_FORCE_INLINE_ void pop_back() {
 		ERR_FAIL_COND(count == 0);
 
-		if (!__has_trivial_destructor(T)) {
+		if (!std::is_trivially_destructible<T>::value) {
 			uint32_t page = (count - 1) >> page_size_shift;
 			uint32_t offset = (count - 1) & page_size_mask;
 			page_data[page][offset].~T();
@@ -226,7 +228,7 @@ public:
 
 	void clear() {
 		//destruct if needed
-		if (!__has_trivial_destructor(T)) {
+		if (!std::is_trivially_destructible<T>::value) {
 			for (uint64_t i = 0; i < count; i++) {
 				uint32_t page = i >> page_size_shift;
 				uint32_t offset = i & page_size_mask;
@@ -309,13 +311,13 @@ public:
 				uint32_t to_copy = MIN(page_size - new_remainder, remainder);
 
 				for (uint32_t i = 0; i < to_copy; i++) {
-					if (!__has_trivial_constructor(T)) {
+					if (!std::is_trivially_constructible<T>::value) {
 						memnew_placement(&dst_page[i + new_remainder], T(remainder_page[i + remainder - to_copy]));
 					} else {
 						dst_page[i + new_remainder] = remainder_page[i + remainder - to_copy];
 					}
 
-					if (!__has_trivial_destructor(T)) {
+					if (!std::is_trivially_destructible<T>::value) {
 						remainder_page[i + remainder - to_copy].~T();
 					}
 				}
diff --git a/core/templates/rid_owner.h b/core/templates/rid_owner.h
index 9c74b41818..320faebe98 100644
--- a/core/templates/rid_owner.h
+++ b/core/templates/rid_owner.h
@@ -79,7 +79,7 @@ class RID_Alloc : public RID_AllocBase {
 
 	const char *description = nullptr;
 
-	SpinLock spin_lock;
+	mutable SpinLock spin_lock;
 
 	_FORCE_INLINE_ RID _allocate_rid() {
 		if (THREAD_SAFE) {
@@ -220,7 +220,7 @@ public:
 		memnew_placement(mem, T(p_value));
 	}
 
-	_FORCE_INLINE_ bool owns(const RID &p_rid) {
+	_FORCE_INLINE_ bool owns(const RID &p_rid) const {
 		if (THREAD_SAFE) {
 			spin_lock.lock();
 		}
@@ -292,7 +292,7 @@ public:
 	_FORCE_INLINE_ uint32_t get_rid_count() const {
 		return alloc_count;
 	}
-	void get_owned_list(List<RID> *p_owned) {
+	void get_owned_list(List<RID> *p_owned) const {
 		if (THREAD_SAFE) {
 			spin_lock.lock();
 		}
@@ -308,7 +308,7 @@ public:
 	}
 
 	//used for fast iteration in the elements or RIDs
-	void fill_owned_buffer(RID *p_rid_buffer) {
+	void fill_owned_buffer(RID *p_rid_buffer) const {
 		if (THREAD_SAFE) {
 			spin_lock.lock();
 		}
@@ -402,7 +402,7 @@ public:
 		*ptr = p_new_ptr;
 	}
 
-	_FORCE_INLINE_ bool owns(const RID &p_rid) {
+	_FORCE_INLINE_ bool owns(const RID &p_rid) const {
 		return alloc.owns(p_rid);
 	}
 
@@ -414,11 +414,11 @@ public:
 		return alloc.get_rid_count();
 	}
 
-	_FORCE_INLINE_ void get_owned_list(List<RID> *p_owned) {
+	_FORCE_INLINE_ void get_owned_list(List<RID> *p_owned) const {
 		return alloc.get_owned_list(p_owned);
 	}
 
-	void fill_owned_buffer(RID *p_rid_buffer) {
+	void fill_owned_buffer(RID *p_rid_buffer) const {
 		alloc.fill_owned_buffer(p_rid_buffer);
 	}
 
@@ -458,7 +458,7 @@ public:
 		return alloc.get_or_null(p_rid);
 	}
 
-	_FORCE_INLINE_ bool owns(const RID &p_rid) {
+	_FORCE_INLINE_ bool owns(const RID &p_rid) const {
 		return alloc.owns(p_rid);
 	}
 
@@ -470,10 +470,10 @@ public:
 		return alloc.get_rid_count();
 	}
 
-	_FORCE_INLINE_ void get_owned_list(List<RID> *p_owned) {
+	_FORCE_INLINE_ void get_owned_list(List<RID> *p_owned) const {
 		return alloc.get_owned_list(p_owned);
 	}
-	void fill_owned_buffer(RID *p_rid_buffer) {
+	void fill_owned_buffer(RID *p_rid_buffer) const {
 		alloc.fill_owned_buffer(p_rid_buffer);
 	}
 
diff --git a/core/templates/vector.h b/core/templates/vector.h
index f3f5ed76a7..51595a75f5 100644
--- a/core/templates/vector.h
+++ b/core/templates/vector.h
@@ -89,6 +89,7 @@ public:
 	_FORCE_INLINE_ void set(int p_index, const T &p_elem) { _cowdata.set(p_index, p_elem); }
 	_FORCE_INLINE_ int size() const { return _cowdata.size(); }
 	Error resize(int p_size) { return _cowdata.resize(p_size); }
+	Error resize_zeroed(int p_size) { return _cowdata.template resize<true>(p_size); }
 	_FORCE_INLINE_ const T &operator[](int p_index) const { return _cowdata.get(p_index); }
 	Error insert(int p_pos, T p_val) { return _cowdata.insert(p_pos, p_val); }
 	int find(const T &p_val, int p_from = 0) const { return _cowdata.find(p_val, p_from); }
diff --git a/core/variant/variant_call.cpp b/core/variant/variant_call.cpp
index a774aac52f..eba12b68bb 100644
--- a/core/variant/variant_call.cpp
+++ b/core/variant/variant_call.cpp
@@ -1737,9 +1737,16 @@ static void _register_variant_builtin_methods() {
 	bind_method(Vector4, ceil, sarray(), varray());
 	bind_method(Vector4, round, sarray(), varray());
 	bind_method(Vector4, lerp, sarray("to", "weight"), varray());
+	bind_method(Vector4, cubic_interpolate, sarray("b", "pre_a", "post_b", "weight"), varray());
+	bind_method(Vector4, posmod, sarray("mod"), varray());
+	bind_method(Vector4, posmodv, sarray("modv"), varray());
+	bind_method(Vector4, snapped, sarray("step"), varray());
 	bind_method(Vector4, clamp, sarray("min", "max"), varray());
 	bind_method(Vector4, normalized, sarray(), varray());
 	bind_method(Vector4, is_normalized, sarray(), varray());
+	bind_method(Vector4, direction_to, sarray("to"), varray());
+	bind_method(Vector4, distance_to, sarray("to"), varray());
+	bind_method(Vector4, distance_squared_to, sarray("to"), varray());
 	bind_method(Vector4, dot, sarray("with"), varray());
 	bind_method(Vector4, inverse, sarray(), varray());
 	bind_method(Vector4, is_equal_approx, sarray("with"), varray());
@@ -2060,7 +2067,8 @@ static void _register_variant_builtin_methods() {
 	bind_method(PackedByteArray, remove_at, sarray("index"), varray());
 	bind_method(PackedByteArray, insert, sarray("at_index", "value"), varray());
 	bind_method(PackedByteArray, fill, sarray("value"), varray());
-	bind_method(PackedByteArray, resize, sarray("new_size"), varray());
+	bind_methodv(PackedByteArray, resize, &PackedByteArray::resize_zeroed, sarray("new_size"), varray());
+	bind_method(PackedByteArray, clear, sarray(), varray());
 	bind_method(PackedByteArray, has, sarray("value"), varray());
 	bind_method(PackedByteArray, reverse, sarray(), varray());
 	bind_method(PackedByteArray, slice, sarray("begin", "end"), varray(INT_MAX));
@@ -2124,7 +2132,8 @@ static void _register_variant_builtin_methods() {
 	bind_method(PackedInt32Array, remove_at, sarray("index"), varray());
 	bind_method(PackedInt32Array, insert, sarray("at_index", "value"), varray());
 	bind_method(PackedInt32Array, fill, sarray("value"), varray());
-	bind_method(PackedInt32Array, resize, sarray("new_size"), varray());
+	bind_methodv(PackedInt32Array, resize, &PackedInt32Array::resize_zeroed, sarray("new_size"), varray());
+	bind_method(PackedInt32Array, clear, sarray(), varray());
 	bind_method(PackedInt32Array, has, sarray("value"), varray());
 	bind_method(PackedInt32Array, reverse, sarray(), varray());
 	bind_method(PackedInt32Array, slice, sarray("begin", "end"), varray(INT_MAX));
@@ -2147,7 +2156,8 @@ static void _register_variant_builtin_methods() {
 	bind_method(PackedInt64Array, remove_at, sarray("index"), varray());
 	bind_method(PackedInt64Array, insert, sarray("at_index", "value"), varray());
 	bind_method(PackedInt64Array, fill, sarray("value"), varray());
-	bind_method(PackedInt64Array, resize, sarray("new_size"), varray());
+	bind_methodv(PackedInt64Array, resize, &PackedInt64Array::resize_zeroed, sarray("new_size"), varray());
+	bind_method(PackedInt64Array, clear, sarray(), varray());
 	bind_method(PackedInt64Array, has, sarray("value"), varray());
 	bind_method(PackedInt64Array, reverse, sarray(), varray());
 	bind_method(PackedInt64Array, slice, sarray("begin", "end"), varray(INT_MAX));
@@ -2170,7 +2180,8 @@ static void _register_variant_builtin_methods() {
 	bind_method(PackedFloat32Array, remove_at, sarray("index"), varray());
 	bind_method(PackedFloat32Array, insert, sarray("at_index", "value"), varray());
 	bind_method(PackedFloat32Array, fill, sarray("value"), varray());
-	bind_method(PackedFloat32Array, resize, sarray("new_size"), varray());
+	bind_methodv(PackedFloat32Array, resize, &PackedFloat32Array::resize_zeroed, sarray("new_size"), varray());
+	bind_method(PackedFloat32Array, clear, sarray(), varray());
 	bind_method(PackedFloat32Array, has, sarray("value"), varray());
 	bind_method(PackedFloat32Array, reverse, sarray(), varray());
 	bind_method(PackedFloat32Array, slice, sarray("begin", "end"), varray(INT_MAX));
@@ -2193,7 +2204,8 @@ static void _register_variant_builtin_methods() {
 	bind_method(PackedFloat64Array, remove_at, sarray("index"), varray());
 	bind_method(PackedFloat64Array, insert, sarray("at_index", "value"), varray());
 	bind_method(PackedFloat64Array, fill, sarray("value"), varray());
-	bind_method(PackedFloat64Array, resize, sarray("new_size"), varray());
+	bind_methodv(PackedFloat64Array, resize, &PackedFloat64Array::resize_zeroed, sarray("new_size"), varray());
+	bind_method(PackedFloat64Array, clear, sarray(), varray());
 	bind_method(PackedFloat64Array, has, sarray("value"), varray());
 	bind_method(PackedFloat64Array, reverse, sarray(), varray());
 	bind_method(PackedFloat64Array, slice, sarray("begin", "end"), varray(INT_MAX));
@@ -2217,6 +2229,7 @@ static void _register_variant_builtin_methods() {
 	bind_method(PackedStringArray, insert, sarray("at_index", "value"), varray());
 	bind_method(PackedStringArray, fill, sarray("value"), varray());
 	bind_method(PackedStringArray, resize, sarray("new_size"), varray());
+	bind_method(PackedStringArray, clear, sarray(), varray());
 	bind_method(PackedStringArray, has, sarray("value"), varray());
 	bind_method(PackedStringArray, reverse, sarray(), varray());
 	bind_method(PackedStringArray, slice, sarray("begin", "end"), varray(INT_MAX));
@@ -2240,6 +2253,7 @@ static void _register_variant_builtin_methods() {
 	bind_method(PackedVector2Array, insert, sarray("at_index", "value"), varray());
 	bind_method(PackedVector2Array, fill, sarray("value"), varray());
 	bind_method(PackedVector2Array, resize, sarray("new_size"), varray());
+	bind_method(PackedVector2Array, clear, sarray(), varray());
 	bind_method(PackedVector2Array, has, sarray("value"), varray());
 	bind_method(PackedVector2Array, reverse, sarray(), varray());
 	bind_method(PackedVector2Array, slice, sarray("begin", "end"), varray(INT_MAX));
@@ -2263,6 +2277,7 @@ static void _register_variant_builtin_methods() {
 	bind_method(PackedVector3Array, insert, sarray("at_index", "value"), varray());
 	bind_method(PackedVector3Array, fill, sarray("value"), varray());
 	bind_method(PackedVector3Array, resize, sarray("new_size"), varray());
+	bind_method(PackedVector3Array, clear, sarray(), varray());
 	bind_method(PackedVector3Array, has, sarray("value"), varray());
 	bind_method(PackedVector3Array, reverse, sarray(), varray());
 	bind_method(PackedVector3Array, slice, sarray("begin", "end"), varray(INT_MAX));
@@ -2286,6 +2301,7 @@ static void _register_variant_builtin_methods() {
 	bind_method(PackedColorArray, insert, sarray("at_index", "value"), varray());
 	bind_method(PackedColorArray, fill, sarray("value"), varray());
 	bind_method(PackedColorArray, resize, sarray("new_size"), varray());
+	bind_method(PackedColorArray, clear, sarray(), varray());
 	bind_method(PackedColorArray, has, sarray("value"), varray());
 	bind_method(PackedColorArray, reverse, sarray(), varray());
 	bind_method(PackedColorArray, slice, sarray("begin", "end"), varray(INT_MAX));
diff --git a/core/variant/variant_op.cpp b/core/variant/variant_op.cpp
index 669e18b5f7..6cca7955ae 100644
--- a/core/variant/variant_op.cpp
+++ b/core/variant/variant_op.cpp
@@ -341,6 +341,8 @@ void Variant::_register_variant_operators() {
 	register_op<OperatorEvaluatorXFormInv<Vector3, Vector3, Transform3D>>(Variant::OP_MULTIPLY, Variant::VECTOR3, Variant::TRANSFORM3D);
 	register_op<OperatorEvaluatorXForm<::AABB, Transform3D, ::AABB>>(Variant::OP_MULTIPLY, Variant::TRANSFORM3D, Variant::AABB);
 	register_op<OperatorEvaluatorXFormInv<::AABB, ::AABB, Transform3D>>(Variant::OP_MULTIPLY, Variant::AABB, Variant::TRANSFORM3D);
+	register_op<OperatorEvaluatorXForm<Plane, Transform3D, Plane>>(Variant::OP_MULTIPLY, Variant::TRANSFORM3D, Variant::PLANE);
+	register_op<OperatorEvaluatorXFormInv<Plane, Plane, Transform3D>>(Variant::OP_MULTIPLY, Variant::PLANE, Variant::TRANSFORM3D);
 	register_op<OperatorEvaluatorXForm<Vector<Vector3>, Transform3D, Vector<Vector3>>>(Variant::OP_MULTIPLY, Variant::TRANSFORM3D, Variant::PACKED_VECTOR3_ARRAY);
 	register_op<OperatorEvaluatorXFormInv<Vector<Vector3>, Vector<Vector3>, Transform3D>>(Variant::OP_MULTIPLY, Variant::PACKED_VECTOR3_ARRAY, Variant::TRANSFORM3D);
 
diff --git a/core/variant/variant_utility.cpp b/core/variant/variant_utility.cpp
index c1a0ad73b0..1f1439ab24 100644
--- a/core/variant/variant_utility.cpp
+++ b/core/variant/variant_utility.cpp
@@ -99,18 +99,105 @@ struct VariantUtilityFunctions {
 		return Math::posmod(b, r);
 	}
 
-	static inline double floor(double x) {
+	static inline Variant floor(Variant x, Callable::CallError &r_error) {
+		r_error.error = Callable::CallError::CALL_OK;
+		switch (x.get_type()) {
+			case Variant::INT: {
+				return VariantInternalAccessor<int64_t>::get(&x);
+			} break;
+			case Variant::FLOAT: {
+				return Math::floor(VariantInternalAccessor<double>::get(&x));
+			} break;
+			case Variant::VECTOR2: {
+				return VariantInternalAccessor<Vector2>::get(&x).floor();
+			} break;
+			case Variant::VECTOR3: {
+				return VariantInternalAccessor<Vector3>::get(&x).floor();
+			} break;
+			case Variant::VECTOR4: {
+				return VariantInternalAccessor<Vector4>::get(&x).floor();
+			} break;
+			default: {
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
+				return Variant();
+			}
+		}
+	}
+
+	static inline double floorf(double x) {
 		return Math::floor(x);
 	}
 
-	static inline double ceil(double x) {
+	static inline int floori(double x) {
+		return int(x);
+	}
+
+	static inline Variant ceil(Variant x, Callable::CallError &r_error) {
+		r_error.error = Callable::CallError::CALL_OK;
+		switch (x.get_type()) {
+			case Variant::INT: {
+				return VariantInternalAccessor<int64_t>::get(&x);
+			} break;
+			case Variant::FLOAT: {
+				return Math::ceil(VariantInternalAccessor<double>::get(&x));
+			} break;
+			case Variant::VECTOR2: {
+				return VariantInternalAccessor<Vector2>::get(&x).ceil();
+			} break;
+			case Variant::VECTOR3: {
+				return VariantInternalAccessor<Vector3>::get(&x).ceil();
+			} break;
+			case Variant::VECTOR4: {
+				return VariantInternalAccessor<Vector4>::get(&x).ceil();
+			} break;
+			default: {
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
+				return Variant();
+			}
+		}
+	}
+
+	static inline double ceilf(double x) {
 		return Math::ceil(x);
 	}
 
-	static inline double round(double x) {
+	static inline int ceili(double x) {
+		return int(Math::ceil(x));
+	}
+
+	static inline Variant round(Variant x, Callable::CallError &r_error) {
+		r_error.error = Callable::CallError::CALL_OK;
+		switch (x.get_type()) {
+			case Variant::INT: {
+				return VariantInternalAccessor<int64_t>::get(&x);
+			} break;
+			case Variant::FLOAT: {
+				return Math::round(VariantInternalAccessor<double>::get(&x));
+			} break;
+			case Variant::VECTOR2: {
+				return VariantInternalAccessor<Vector2>::get(&x).round();
+			} break;
+			case Variant::VECTOR3: {
+				return VariantInternalAccessor<Vector3>::get(&x).round();
+			} break;
+			case Variant::VECTOR4: {
+				return VariantInternalAccessor<Vector4>::get(&x).round();
+			} break;
+			default: {
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
+				return Variant();
+			}
+		}
+	}
+
+	static inline double roundf(double x) {
 		return Math::round(x);
 	}
 
+	static inline int roundi(double x) {
+		return int(Math::round(x));
+	}
+
 	static inline Variant abs(const Variant &x, Callable::CallError &r_error) {
 		r_error.error = Callable::CallError::CALL_OK;
 		switch (x.get_type()) {
@@ -235,7 +322,44 @@ struct VariantUtilityFunctions {
 		return Math::snapped(value, step);
 	}
 
-	static inline double lerp(double from, double to, double weight) {
+	static inline Variant lerp(const Variant &from, const Variant &to, double weight, Callable::CallError &r_error) {
+		r_error.error = Callable::CallError::CALL_OK;
+		if (from.get_type() != to.get_type()) {
+			r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
+			r_error.argument = 1;
+			return Variant();
+		}
+
+		switch (from.get_type()) {
+			case Variant::FLOAT: {
+				return lerpf(VariantInternalAccessor<double>::get(&from), to, weight);
+			} break;
+			case Variant::VECTOR2: {
+				return VariantInternalAccessor<Vector2>::get(&from).lerp(VariantInternalAccessor<Vector2>::get(&to), weight);
+			} break;
+			case Variant::VECTOR3: {
+				return VariantInternalAccessor<Vector3>::get(&from).lerp(VariantInternalAccessor<Vector3>::get(&to), weight);
+			} break;
+			case Variant::VECTOR4: {
+				return VariantInternalAccessor<Vector4>::get(&from).lerp(VariantInternalAccessor<Vector4>::get(&to), weight);
+			} break;
+			case Variant::QUATERNION: {
+				return VariantInternalAccessor<Quaternion>::get(&from).slerp(VariantInternalAccessor<Quaternion>::get(&to), weight);
+			} break;
+			case Variant::BASIS: {
+				return VariantInternalAccessor<Basis>::get(&from).slerp(VariantInternalAccessor<Basis>::get(&to), weight);
+			} break;
+			case Variant::COLOR: {
+				return VariantInternalAccessor<Color>::get(&from).lerp(VariantInternalAccessor<Color>::get(&to), weight);
+			} break;
+			default: {
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
+				return Variant();
+			}
+		}
+	}
+
+	static inline double lerpf(double from, double to, double weight) {
 		return Math::lerp(from, to, weight);
 	}
 
@@ -1252,17 +1376,24 @@ void Variant::_register_variant_utility_functions() {
 	FUNCBINDR(fmod, sarray("x", "y"), Variant::UTILITY_FUNC_TYPE_MATH);
 	FUNCBINDR(fposmod, sarray("x", "y"), Variant::UTILITY_FUNC_TYPE_MATH);
 	FUNCBINDR(posmod, sarray("x", "y"), Variant::UTILITY_FUNC_TYPE_MATH);
-	FUNCBINDR(floor, sarray("x"), Variant::UTILITY_FUNC_TYPE_MATH);
-	FUNCBINDR(ceil, sarray("x"), Variant::UTILITY_FUNC_TYPE_MATH);
-	FUNCBINDR(round, sarray("x"), Variant::UTILITY_FUNC_TYPE_MATH);
 
-	FUNCBINDVR(abs, sarray("x"), Variant::UTILITY_FUNC_TYPE_MATH);
+	FUNCBINDVR(floor, sarray("x"), Variant::UTILITY_FUNC_TYPE_MATH);
+	FUNCBINDR(floorf, sarray("x"), Variant::UTILITY_FUNC_TYPE_MATH);
+	FUNCBINDR(floori, sarray("x"), Variant::UTILITY_FUNC_TYPE_MATH);
+
+	FUNCBINDVR(ceil, sarray("x"), Variant::UTILITY_FUNC_TYPE_MATH);
+	FUNCBINDR(ceilf, sarray("x"), Variant::UTILITY_FUNC_TYPE_MATH);
+	FUNCBINDR(ceili, sarray("x"), Variant::UTILITY_FUNC_TYPE_MATH);
 
+	FUNCBINDVR(round, sarray("x"), Variant::UTILITY_FUNC_TYPE_MATH);
+	FUNCBINDR(roundf, sarray("x"), Variant::UTILITY_FUNC_TYPE_MATH);
+	FUNCBINDR(roundi, sarray("x"), Variant::UTILITY_FUNC_TYPE_MATH);
+
+	FUNCBINDVR(abs, sarray("x"), Variant::UTILITY_FUNC_TYPE_MATH);
 	FUNCBINDR(absf, sarray("x"), Variant::UTILITY_FUNC_TYPE_MATH);
 	FUNCBINDR(absi, sarray("x"), Variant::UTILITY_FUNC_TYPE_MATH);
 
 	FUNCBINDVR(sign, sarray("x"), Variant::UTILITY_FUNC_TYPE_MATH);
-
 	FUNCBINDR(signf, sarray("x"), Variant::UTILITY_FUNC_TYPE_MATH);
 	FUNCBINDR(signi, sarray("x"), Variant::UTILITY_FUNC_TYPE_MATH);
 
@@ -1280,7 +1411,8 @@ void Variant::_register_variant_utility_functions() {
 	FUNCBINDR(step_decimals, sarray("x"), Variant::UTILITY_FUNC_TYPE_MATH);
 	FUNCBINDR(snapped, sarray("x", "step"), Variant::UTILITY_FUNC_TYPE_MATH);
 
-	FUNCBINDR(lerp, sarray("from", "to", "weight"), Variant::UTILITY_FUNC_TYPE_MATH);
+	FUNCBINDVR3(lerp, sarray("from", "to", "weight"), Variant::UTILITY_FUNC_TYPE_MATH);
+	FUNCBINDR(lerpf, sarray("from", "to", "weight"), Variant::UTILITY_FUNC_TYPE_MATH);
 	FUNCBINDR(cubic_interpolate, sarray("from", "to", "pre", "post", "weight"), Variant::UTILITY_FUNC_TYPE_MATH);
 	FUNCBINDR(bezier_interpolate, sarray("start", "control_1", "control_2", "end", "t"), Variant::UTILITY_FUNC_TYPE_MATH);
 	FUNCBINDR(lerp_angle, sarray("from", "to", "weight"), Variant::UTILITY_FUNC_TYPE_MATH);
@@ -1300,12 +1432,10 @@ void Variant::_register_variant_utility_functions() {
 	FUNCBINDR(wrapf, sarray("value", "min", "max"), Variant::UTILITY_FUNC_TYPE_MATH);
 
 	FUNCBINDVARARG(max, sarray(), Variant::UTILITY_FUNC_TYPE_MATH);
-
 	FUNCBINDR(maxi, sarray("a", "b"), Variant::UTILITY_FUNC_TYPE_MATH);
 	FUNCBINDR(maxf, sarray("a", "b"), Variant::UTILITY_FUNC_TYPE_MATH);
 
 	FUNCBINDVARARG(min, sarray(), Variant::UTILITY_FUNC_TYPE_MATH);
-
 	FUNCBINDR(mini, sarray("a", "b"), Variant::UTILITY_FUNC_TYPE_MATH);
 	FUNCBINDR(minf, sarray("a", "b"), Variant::UTILITY_FUNC_TYPE_MATH);
 
diff --git a/doc/class.xsd b/doc/class.xsd
index 70c0323464..7681ddad3d 100644
--- a/doc/class.xsd
+++ b/doc/class.xsd
@@ -35,7 +35,7 @@
 												<xs:attribute type="xs:string" name="enum" use="optional" />
 											</xs:complexType>
 										</xs:element>
-										<xs:element name="argument" maxOccurs="unbounded" minOccurs="0">
+										<xs:element name="param" maxOccurs="unbounded" minOccurs="0">
 											<xs:complexType>
 												<xs:sequence>
 													<xs:sequence />
@@ -79,7 +79,7 @@
 												<xs:attribute type="xs:byte" name="number" />
 											</xs:complexType>
 										</xs:element>
-										<xs:element name="argument" maxOccurs="unbounded" minOccurs="0">
+										<xs:element name="param" maxOccurs="unbounded" minOccurs="0">
 											<xs:complexType>
 												<xs:sequence>
 													<xs:sequence />
@@ -127,7 +127,7 @@
 							<xs:element name="signal" maxOccurs="unbounded" minOccurs="0">
 								<xs:complexType>
 									<xs:sequence>
-										<xs:element name="argument" maxOccurs="unbounded" minOccurs="0">
+										<xs:element name="param" maxOccurs="unbounded" minOccurs="0">
 											<xs:complexType>
 												<xs:sequence>
 													<xs:sequence />
@@ -178,7 +178,7 @@
 												<xs:attribute type="xs:string" name="enum" use="optional" />
 											</xs:complexType>
 										</xs:element>
-										<xs:element name="argument" maxOccurs="unbounded" minOccurs="0">
+										<xs:element name="param" maxOccurs="unbounded" minOccurs="0">
 											<xs:complexType>
 												<xs:sequence>
 													<xs:sequence />
@@ -232,7 +232,7 @@
 												<xs:attribute type="xs:string" name="enum" use="optional" />
 											</xs:complexType>
 										</xs:element>
-										<xs:element name="argument" maxOccurs="unbounded" minOccurs="0">
+										<xs:element name="param" maxOccurs="unbounded" minOccurs="0">
 											<xs:complexType>
 												<xs:sequence>
 													<xs:sequence />
diff --git a/doc/classes/@GlobalScope.xml b/doc/classes/@GlobalScope.xml
index 709863b70f..e6901bbe27 100644
--- a/doc/classes/@GlobalScope.xml
+++ b/doc/classes/@GlobalScope.xml
@@ -14,9 +14,9 @@
 	<methods>
 		<method name="abs">
 			<return type="Variant" />
-			<argument index="0" name="x" type="Variant" />
+			<param index="0" name="x" type="Variant" />
 			<description>
-				Returns the absolute value of a [Variant] parameter [code]x[/code] (i.e. non-negative value). Variant types [int], [float] (real), [Vector2], [Vector2i], [Vector3] and [Vector3i] are supported.
+				Returns the absolute value of a [Variant] parameter [param x] (i.e. non-negative value). Variant types [int], [float] (real), [Vector2], [Vector2i], [Vector3] and [Vector3i] are supported.
 				[codeblock]
 				var a = abs(-1)
 				# a is 1
@@ -40,9 +40,9 @@
 		</method>
 		<method name="absf">
 			<return type="float" />
-			<argument index="0" name="x" type="float" />
+			<param index="0" name="x" type="float" />
 			<description>
-				Returns the absolute value of float parameter [code]x[/code] (i.e. positive value).
+				Returns the absolute value of float parameter [param x] (i.e. positive value).
 				[codeblock]
 				# a is 1.2
 				var a = absf(-1.2)
@@ -51,9 +51,9 @@
 		</method>
 		<method name="absi">
 			<return type="int" />
-			<argument index="0" name="x" type="int" />
+			<param index="0" name="x" type="int" />
 			<description>
-				Returns the absolute value of int parameter [code]x[/code] (i.e. positive value).
+				Returns the absolute value of int parameter [param x] (i.e. positive value).
 				[codeblock]
 				# a is 1
 				var a = absi(-1)
@@ -62,9 +62,9 @@
 		</method>
 		<method name="acos">
 			<return type="float" />
-			<argument index="0" name="x" type="float" />
+			<param index="0" name="x" type="float" />
 			<description>
-				Returns the arc cosine of [code]x[/code] in radians. Use to get the angle of cosine [code]x[/code]. [code]x[/code] must be between [code]-1.0[/code] and [code]1.0[/code] (inclusive), otherwise, [method acos] will return [constant @GDScript.NAN].
+				Returns the arc cosine of [param x] in radians. Use to get the angle of cosine [param x]. [param x] must be between [code]-1.0[/code] and [code]1.0[/code] (inclusive), otherwise, [method acos] will return [constant @GDScript.NAN].
 				[codeblock]
 				# c is 0.523599 or 30 degrees if converted with rad2deg(c)
 				var c = acos(0.866025)
@@ -73,9 +73,9 @@
 		</method>
 		<method name="asin">
 			<return type="float" />
-			<argument index="0" name="x" type="float" />
+			<param index="0" name="x" type="float" />
 			<description>
-				Returns the arc sine of [code]x[/code] in radians. Use to get the angle of sine [code]x[/code]. [code]x[/code] must be between [code]-1.0[/code] and [code]1.0[/code] (inclusive), otherwise, [method asin] will return [constant @GDScript.NAN].
+				Returns the arc sine of [param x] in radians. Use to get the angle of sine [param x]. [param x] must be between [code]-1.0[/code] and [code]1.0[/code] (inclusive), otherwise, [method asin] will return [constant @GDScript.NAN].
 				[codeblock]
 				# s is 0.523599 or 30 degrees if converted with rad2deg(s)
 				var s = asin(0.5)
@@ -84,20 +84,20 @@
 		</method>
 		<method name="atan">
 			<return type="float" />
-			<argument index="0" name="x" type="float" />
+			<param index="0" name="x" type="float" />
 			<description>
-				Returns the arc tangent of [code]x[/code] in radians. Use it to get the angle from an angle's tangent in trigonometry.
+				Returns the arc tangent of [param x] in radians. Use it to get the angle from an angle's tangent in trigonometry.
 				The method cannot know in which quadrant the angle should fall. See [method atan2] if you have both [code]y[/code] and [code]x[/code].
 				[codeblock]
 				var a = atan(0.5) # a is 0.463648
 				[/codeblock]
-				If [code]x[/code] is between [code]-PI / 2[/code] and [code]PI / 2[/code] (inclusive), [code]atan(tan(x))[/code] is equal to [code]x[/code].
+				If [param x] is between [code]-PI / 2[/code] and [code]PI / 2[/code] (inclusive), [code]atan(tan(x))[/code] is equal to [param x].
 			</description>
 		</method>
 		<method name="atan2">
 			<return type="float" />
-			<argument index="0" name="y" type="float" />
-			<argument index="1" name="x" type="float" />
+			<param index="0" name="y" type="float" />
+			<param index="1" name="x" type="float" />
 			<description>
 				Returns the arc tangent of [code]y/x[/code] in radians. Use to get the angle of tangent [code]y/x[/code]. To compute the value, the method takes into account the sign of both arguments in order to determine the quadrant.
 				Important note: The Y coordinate comes first, by convention.
@@ -108,18 +108,18 @@
 		</method>
 		<method name="bezier_interpolate">
 			<return type="float" />
-			<argument index="0" name="start" type="float" />
-			<argument index="1" name="control_1" type="float" />
-			<argument index="2" name="control_2" type="float" />
-			<argument index="3" name="end" type="float" />
-			<argument index="4" name="t" type="float" />
+			<param index="0" name="start" type="float" />
+			<param index="1" name="control_1" type="float" />
+			<param index="2" name="control_2" type="float" />
+			<param index="3" name="end" type="float" />
+			<param index="4" name="t" type="float" />
 			<description>
-				Returns the point at the given [code]t[/code] on a one-dimnesional [url=https://en.wikipedia.org/wiki/B%C3%A9zier_curve]Bezier curve[/url] defined by the given [code]control_1[/code], [code]control_2[/code], and [code]end[/code] points.
+				Returns the point at the given [param t] on a one-dimnesional [url=https://en.wikipedia.org/wiki/B%C3%A9zier_curve]Bezier curve[/url] defined by the given [param control_1], [param control_2], and [param end] points.
 			</description>
 		</method>
 		<method name="bytes2var">
 			<return type="Variant" />
-			<argument index="0" name="bytes" type="PackedByteArray" />
+			<param index="0" name="bytes" type="PackedByteArray" />
 			<description>
 				Decodes a byte array back to a [Variant] value, without decoding objects.
 				[b]Note:[/b] If you need object deserialization, see [method bytes2var_with_objects].
@@ -127,31 +127,48 @@
 		</method>
 		<method name="bytes2var_with_objects">
 			<return type="Variant" />
-			<argument index="0" name="bytes" type="PackedByteArray" />
+			<param index="0" name="bytes" type="PackedByteArray" />
 			<description>
 				Decodes a byte array back to a [Variant] value. Decoding objects is allowed.
 				[b]Warning:[/b] Deserialized object can contain code which gets executed. Do not use this option if the serialized object comes from untrusted sources to avoid potential security threats (remote code execution).
 			</description>
 		</method>
 		<method name="ceil">
-			<return type="float" />
-			<argument index="0" name="x" type="float" />
+			<return type="Variant" />
+			<param index="0" name="x" type="Variant" />
 			<description>
-				Rounds [code]x[/code] upward (towards positive infinity), returning the smallest whole number that is not less than [code]x[/code].
+				Rounds [param x] upward (towards positive infinity), returning the smallest whole number that is not less than [param x]. Supported types: [int], [float], [Vector2], [Vector3], [Vector4].
 				[codeblock]
 				var i = ceil(1.45) # i is 2.0
 				i = ceil(1.001)    # i is 2.0
 				[/codeblock]
 				See also [method floor], [method round], and [method snapped].
+				[b]Note:[/b] For better type safety, you can use [method ceilf], [method ceili], [method Vector2.ceil], [method Vector3.ceil] or [method Vector4.ceil] instead.
+			</description>
+		</method>
+		<method name="ceilf">
+			<return type="float" />
+			<param index="0" name="x" type="float" />
+			<description>
+				Rounds [param x] upward (towards positive infinity), returning the smallest whole number that is not less than [param x].
+				A type-safe version of [method ceil], specialzied in floats.
+			</description>
+		</method>
+		<method name="ceili">
+			<return type="int" />
+			<param index="0" name="x" type="float" />
+			<description>
+				Rounds [param x] upward (towards positive infinity), returning the smallest whole number that is not less than [param x].
+				A type-safe version of [method ceil] that returns integer.
 			</description>
 		</method>
 		<method name="clamp">
 			<return type="Variant" />
-			<argument index="0" name="value" type="Variant" />
-			<argument index="1" name="min" type="Variant" />
-			<argument index="2" name="max" type="Variant" />
+			<param index="0" name="value" type="Variant" />
+			<param index="1" name="min" type="Variant" />
+			<param index="2" name="max" type="Variant" />
 			<description>
-				Clamps the [Variant] [code]value[/code] and returns a value not less than [code]min[/code] and not more than [code]max[/code]. Variant types [int], [float] (real), [Vector2], [Vector2i], [Vector3] and [Vector3i] are supported.
+				Clamps the [Variant] [param value] and returns a value not less than [param min] and not more than [param max]. Variant types [int], [float] (real), [Vector2], [Vector2i], [Vector3] and [Vector3i] are supported.
 				[codeblock]
 				var a = clamp(-10, -1, 5)
 				# a is -1
@@ -175,11 +192,11 @@
 		</method>
 		<method name="clampf">
 			<return type="float" />
-			<argument index="0" name="value" type="float" />
-			<argument index="1" name="min" type="float" />
-			<argument index="2" name="max" type="float" />
+			<param index="0" name="value" type="float" />
+			<param index="1" name="min" type="float" />
+			<param index="2" name="max" type="float" />
 			<description>
-				Clamps the float [code]value[/code] and returns a value not less than [code]min[/code] and not more than [code]max[/code].
+				Clamps the float [param value] and returns a value not less than [param min] and not more than [param max].
 				[codeblock]
 				var speed = 42.1
 				# a is 20.0
@@ -193,11 +210,11 @@
 		</method>
 		<method name="clampi">
 			<return type="int" />
-			<argument index="0" name="value" type="int" />
-			<argument index="1" name="min" type="int" />
-			<argument index="2" name="max" type="int" />
+			<param index="0" name="value" type="int" />
+			<param index="1" name="min" type="int" />
+			<param index="2" name="max" type="int" />
 			<description>
-				Clamps the integer [code]value[/code] and returns a value not less than [code]min[/code] and not more than [code]max[/code].
+				Clamps the integer [param value] and returns a value not less than [param min] and not more than [param max].
 				[codeblock]
 				var speed = 42
 				# a is 20
@@ -211,9 +228,9 @@
 		</method>
 		<method name="cos">
 			<return type="float" />
-			<argument index="0" name="angle_rad" type="float" />
+			<param index="0" name="angle_rad" type="float" />
 			<description>
-				Returns the cosine of angle [code]angle_rad[/code] in radians.
+				Returns the cosine of angle [param angle_rad] in radians.
 				[codeblock]
 				cos(PI * 2)      # Returns 1.0
 				cos(PI)          # Returns -1.0
@@ -223,9 +240,9 @@
 		</method>
 		<method name="cosh">
 			<return type="float" />
-			<argument index="0" name="x" type="float" />
+			<param index="0" name="x" type="float" />
 			<description>
-				Returns the hyperbolic cosine of [code]x[/code] in radians.
+				Returns the hyperbolic cosine of [param x] in radians.
 				[codeblock]
 				# Prints 1.543081
 				print(cosh(1))
@@ -234,25 +251,25 @@
 		</method>
 		<method name="cubic_interpolate">
 			<return type="float" />
-			<argument index="0" name="from" type="float" />
-			<argument index="1" name="to" type="float" />
-			<argument index="2" name="pre" type="float" />
-			<argument index="3" name="post" type="float" />
-			<argument index="4" name="weight" type="float" />
+			<param index="0" name="from" type="float" />
+			<param index="1" name="to" type="float" />
+			<param index="2" name="pre" type="float" />
+			<param index="3" name="post" type="float" />
+			<param index="4" name="weight" type="float" />
 			<description>
-				Cubic interpolates between two values by the factor defined in [code]weight[/code] with pre and post values.
+				Cubic interpolates between two values by the factor defined in [param weight] with pre and post values.
 			</description>
 		</method>
 		<method name="db2linear">
 			<return type="float" />
-			<argument index="0" name="db" type="float" />
+			<param index="0" name="db" type="float" />
 			<description>
 				Converts from decibels to linear energy (audio).
 			</description>
 		</method>
 		<method name="deg2rad">
 			<return type="float" />
-			<argument index="0" name="deg" type="float" />
+			<param index="0" name="deg" type="float" />
 			<description>
 				Converts an angle expressed in degrees to radians.
 				[codeblock]
@@ -263,10 +280,10 @@
 		</method>
 		<method name="ease">
 			<return type="float" />
-			<argument index="0" name="x" type="float" />
-			<argument index="1" name="curve" type="float" />
+			<param index="0" name="x" type="float" />
+			<param index="1" name="curve" type="float" />
 			<description>
-				Returns an "eased" value of [code]x[/code] based on an easing function defined with [code]curve[/code]. This easing function is based on an exponent. The [code]curve[/code] can be any floating-point number, with specific values leading to the following behaviors:
+				Returns an "eased" value of [param x] based on an easing function defined with [param curve]. This easing function is based on an exponent. The [param curve] can be any floating-point number, with specific values leading to the following behaviors:
 				[codeblock]
 				- Lower than -1.0 (exclusive): Ease in-out
 				- 1.0: Linear
@@ -282,16 +299,16 @@
 		</method>
 		<method name="error_string">
 			<return type="String" />
-			<argument index="0" name="error" type="int" />
+			<param index="0" name="error" type="int" />
 			<description>
 				Returns a human-readable name for the given error code.
 			</description>
 		</method>
 		<method name="exp">
 			<return type="float" />
-			<argument index="0" name="x" type="float" />
+			<param index="0" name="x" type="float" />
 			<description>
-				The natural exponential function. It raises the mathematical constant [b]e[/b] to the power of [code]x[/code] and returns it.
+				The natural exponential function. It raises the mathematical constant [b]e[/b] to the power of [param x] and returns it.
 				[b]e[/b] has an approximate value of 2.71828, and can be obtained with [code]exp(1)[/code].
 				For exponents to other bases use the method [method pow].
 				[codeblock]
@@ -300,10 +317,10 @@
 			</description>
 		</method>
 		<method name="floor">
-			<return type="float" />
-			<argument index="0" name="x" type="float" />
+			<return type="Variant" />
+			<param index="0" name="x" type="Variant" />
 			<description>
-				Rounds [code]x[/code] downward (towards negative infinity), returning the largest whole number that is not more than [code]x[/code].
+				Rounds [param x] downward (towards negative infinity), returning the largest whole number that is not more than [param x]. Supported types: [int], [float], [Vector2], [Vector3], [Vector4].
 				[codeblock]
 				# a is 2.0
 				var a = floor(2.99)
@@ -311,15 +328,31 @@
 				a = floor(-2.99)
 				[/codeblock]
 				See also [method ceil], [method round], and [method snapped].
-				[b]Note:[/b] This method returns a float. If you need an integer, you can use [code]int(x)[/code] directly.
+				[b]Note:[/b] For better type safety, you can use [method floorf], [method floori], [method Vector2.floor], [method Vector3.floor] or [method Vector4.floor] instead.
+			</description>
+		</method>
+		<method name="floorf">
+			<return type="float" />
+			<param index="0" name="x" type="float" />
+			<description>
+				Rounds [param x] downward (towards negative infinity), returning the largest whole number that is not more than [param x].
+				A type-safe version of [method floor], specialzied in floats.
+			</description>
+		</method>
+		<method name="floori">
+			<return type="int" />
+			<param index="0" name="x" type="float" />
+			<description>
+				Rounds [param x] downward (towards negative infinity), returning the largest whole number that is not more than [param x].
+				Equivalent of doing [code]int(x)[/code].
 			</description>
 		</method>
 		<method name="fmod">
 			<return type="float" />
-			<argument index="0" name="x" type="float" />
-			<argument index="1" name="y" type="float" />
+			<param index="0" name="x" type="float" />
+			<param index="1" name="y" type="float" />
 			<description>
-				Returns the floating-point remainder of [code]x/y[/code], keeping the sign of [code]x[/code].
+				Returns the floating-point remainder of [code]x/y[/code], keeping the sign of [param x].
 				[codeblock]
 				# Remainder is 1.5
 				var remainder = fmod(7, 5.5)
@@ -329,8 +362,8 @@
 		</method>
 		<method name="fposmod">
 			<return type="float" />
-			<argument index="0" name="x" type="float" />
-			<argument index="1" name="y" type="float" />
+			<param index="0" name="x" type="float" />
+			<param index="1" name="y" type="float" />
 			<description>
 				Returns the floating-point modulus of [code]x/y[/code] that wraps equally in positive and negative.
 				[codeblock]
@@ -352,7 +385,7 @@
 		</method>
 		<method name="hash">
 			<return type="int" />
-			<argument index="0" name="variable" type="Variant" />
+			<param index="0" name="variable" type="Variant" />
 			<description>
 				Returns the integer hash of the variable passed.
 				[codeblock]
@@ -362,9 +395,9 @@
 		</method>
 		<method name="instance_from_id">
 			<return type="Object" />
-			<argument index="0" name="instance_id" type="int" />
+			<param index="0" name="instance_id" type="int" />
 			<description>
-				Returns the Object that corresponds to [code]instance_id[/code]. All Objects have a unique instance ID.
+				Returns the Object that corresponds to [param instance_id]. All Objects have a unique instance ID.
 				[codeblock]
 				var foo = "bar"
 				func _ready():
@@ -376,11 +409,11 @@
 		</method>
 		<method name="inverse_lerp">
 			<return type="float" />
-			<argument index="0" name="from" type="float" />
-			<argument index="1" name="to" type="float" />
-			<argument index="2" name="weight" type="float" />
+			<param index="0" name="from" type="float" />
+			<param index="1" name="to" type="float" />
+			<param index="2" name="weight" type="float" />
 			<description>
-				Returns an interpolation or extrapolation factor considering the range specified in [code]from[/code] and [code]to[/code], and the interpolated value specified in [code]weight[/code]. The returned value will be between [code]0.0[/code] and [code]1.0[/code] if [code]weight[/code] is between [code]from[/code] and [code]to[/code] (inclusive). If [code]weight[/code] is located outside this range, then an extrapolation factor will be returned (return value lower than [code]0.0[/code] or greater than [code]1.0[/code]).
+				Returns an interpolation or extrapolation factor considering the range specified in [param from] and [param to], and the interpolated value specified in [param weight]. The returned value will be between [code]0.0[/code] and [code]1.0[/code] if [param weight] is between [param from] and [param to] (inclusive). If [param weight] is located outside this range, then an extrapolation factor will be returned (return value lower than [code]0.0[/code] or greater than [code]1.0[/code]). Use [method clamp] on the result of [method inverse_lerp] if this is not desired.
 				[codeblock]
 				# The interpolation ratio in the `lerp()` call below is 0.75.
 				var middle = lerp(20, 30, 0.75)
@@ -389,73 +422,75 @@
 				var ratio = inverse_lerp(20, 30, 27.5)
 				# `ratio` is now 0.75.
 				[/codeblock]
-				See also [method lerp] which performs the reverse of this operation.
+				See also [method lerp] which performs the reverse of this operation, and [method range_lerp] to map a continuous series of values to another.
 			</description>
 		</method>
 		<method name="is_equal_approx">
 			<return type="bool" />
-			<argument index="0" name="a" type="float" />
-			<argument index="1" name="b" type="float" />
+			<param index="0" name="a" type="float" />
+			<param index="1" name="b" type="float" />
 			<description>
-				Returns [code]true[/code] if [code]a[/code] and [code]b[/code] are approximately equal to each other.
-				Here, approximately equal means that [code]a[/code] and [code]b[/code] are within a small internal epsilon of each other, which scales with the magnitude of the numbers.
+				Returns [code]true[/code] if [param a] and [param b] are approximately equal to each other.
+				Here, approximately equal means that [param a] and [param b] are within a small internal epsilon of each other, which scales with the magnitude of the numbers.
 				Infinity values of the same sign are considered equal.
 			</description>
 		</method>
 		<method name="is_inf">
 			<return type="bool" />
-			<argument index="0" name="x" type="float" />
+			<param index="0" name="x" type="float" />
 			<description>
-				Returns whether [code]x[/code] is an infinity value (either positive infinity or negative infinity).
+				Returns whether [param x] is an infinity value (either positive infinity or negative infinity).
 			</description>
 		</method>
 		<method name="is_instance_id_valid">
 			<return type="bool" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
-				Returns [code]true[/code] if the Object that corresponds to [code]instance_id[/code] is a valid object (e.g. has not been deleted from memory). All Objects have a unique instance ID.
+				Returns [code]true[/code] if the Object that corresponds to [param id] is a valid object (e.g. has not been deleted from memory). All Objects have a unique instance ID.
 			</description>
 		</method>
 		<method name="is_instance_valid">
 			<return type="bool" />
-			<argument index="0" name="instance" type="Variant" />
+			<param index="0" name="instance" type="Variant" />
 			<description>
-				Returns whether [code]instance[/code] is a valid object (e.g. has not been deleted from memory).
+				Returns whether [param instance] is a valid object (e.g. has not been deleted from memory).
 			</description>
 		</method>
 		<method name="is_nan">
 			<return type="bool" />
-			<argument index="0" name="x" type="float" />
+			<param index="0" name="x" type="float" />
 			<description>
-				Returns whether [code]x[/code] is a NaN ("Not a Number" or invalid) value.
+				Returns whether [param x] is a NaN ("Not a Number" or invalid) value.
 			</description>
 		</method>
 		<method name="is_zero_approx">
 			<return type="bool" />
-			<argument index="0" name="x" type="float" />
+			<param index="0" name="x" type="float" />
 			<description>
-				Returns [code]true[/code] if [code]x[/code] is zero or almost zero.
+				Returns [code]true[/code] if [param x] is zero or almost zero.
 				This method is faster than using [method is_equal_approx] with one value as zero.
 			</description>
 		</method>
 		<method name="lerp">
-			<return type="float" />
-			<argument index="0" name="from" type="float" />
-			<argument index="1" name="to" type="float" />
-			<argument index="2" name="weight" type="float" />
+			<return type="Variant" />
+			<param index="0" name="from" type="Variant" />
+			<param index="1" name="to" type="Variant" />
+			<param index="2" name="weight" type="Variant" />
 			<description>
-				Linearly interpolates between two values by the factor defined in [code]weight[/code]. To perform interpolation, [code]weight[/code] should be between [code]0.0[/code] and [code]1.0[/code] (inclusive). However, values outside this range are allowed and can be used to perform [i]extrapolation[/i].
+				Linearly interpolates between two values by the factor defined in [param weight]. To perform interpolation, [param weight] should be between [code]0.0[/code] and [code]1.0[/code] (inclusive). However, values outside this range are allowed and can be used to perform [i]extrapolation[/i]. Use [method clamp] on the result of [method lerp] if this is not desired.
+				Both [param from] and [param to] must have matching types. Supported types: [float], [Vector2], [Vector3], [Vector4], [Color], [Quaternion], [Basis].
 				[codeblock]
 				lerp(0, 4, 0.75) # Returns 3.0
 				[/codeblock]
-				See also [method inverse_lerp] which performs the reverse of this operation. To perform eased interpolation with [method lerp], combine it with [method ease] or [method smoothstep].
+				See also [method inverse_lerp] which performs the reverse of this operation. To perform eased interpolation with [method lerp], combine it with [method ease] or [method smoothstep]. See also [method range_lerp] to map a continuous series of values to another.
+				[b]Note:[/b] For better type safety, you can use [method lerpf], [method Vector2.lerp], [method Vector3.lerp], [method Vector4.lerp], [method Color.lerp], [method Quaternion.slerp] or [method Basis.slerp] instead.
 			</description>
 		</method>
 		<method name="lerp_angle">
 			<return type="float" />
-			<argument index="0" name="from" type="float" />
-			<argument index="1" name="to" type="float" />
-			<argument index="2" name="weight" type="float" />
+			<param index="0" name="from" type="float" />
+			<param index="1" name="to" type="float" />
+			<param index="2" name="weight" type="float" />
 			<description>
 				Linearly interpolates between two angles (in radians) by a normalized value.
 				Similar to [method lerp], but interpolates correctly when the angles wrap around [constant @GDScript.TAU]. To perform eased interpolation with [method lerp_angle], combine it with [method ease] or [method smoothstep].
@@ -468,12 +503,25 @@
 				    rotation = lerp_angle(min_angle, max_angle, elapsed)
 				    elapsed += delta
 				[/codeblock]
-				[b]Note:[/b] This method lerps through the shortest path between [code]from[/code] and [code]to[/code]. However, when these two angles are approximately [code]PI + k * TAU[/code] apart for any integer [code]k[/code], it's not obvious which way they lerp due to floating-point precision errors. For example, [code]lerp_angle(0, PI, weight)[/code] lerps counter-clockwise, while [code]lerp_angle(0, PI + 5 * TAU, weight)[/code] lerps clockwise.
+				[b]Note:[/b] This method lerps through the shortest path between [param from] and [param to]. However, when these two angles are approximately [code]PI + k * TAU[/code] apart for any integer [code]k[/code], it's not obvious which way they lerp due to floating-point precision errors. For example, [code]lerp_angle(0, PI, weight)[/code] lerps counter-clockwise, while [code]lerp_angle(0, PI + 5 * TAU, weight)[/code] lerps clockwise.
+			</description>
+		</method>
+		<method name="lerpf">
+			<return type="float" />
+			<param index="0" name="from" type="float" />
+			<param index="1" name="to" type="float" />
+			<param index="2" name="weight" type="float" />
+			<description>
+				Linearly interpolates between two values by the factor defined in [param weight]. To perform interpolation, [param weight] should be between [code]0.0[/code] and [code]1.0[/code] (inclusive). However, values outside this range are allowed and can be used to perform [i]extrapolation[/i].
+				[codeblock]
+				lerp(0, 4, 0.75) # Returns 3.0
+				[/codeblock]
+				See also [method inverse_lerp] which performs the reverse of this operation. To perform eased interpolation with [method lerp], combine it with [method ease] or [method smoothstep].
 			</description>
 		</method>
 		<method name="linear2db">
 			<return type="float" />
-			<argument index="0" name="lin" type="float" />
+			<param index="0" name="lin" type="float" />
 			<description>
 				Converts from linear energy to decibels (audio). This can be used to implement volume sliders that behave as expected (since volume isn't linear). Example:
 				[codeblock]
@@ -486,7 +534,7 @@
 		</method>
 		<method name="log">
 			<return type="float" />
-			<argument index="0" name="x" type="float" />
+			<param index="0" name="x" type="float" />
 			<description>
 				Natural logarithm. The amount of time needed to reach a certain level of continuous growth.
 				[b]Note:[/b] This is not the same as the "log" function on most calculators, which uses a base 10 logarithm.
@@ -507,8 +555,8 @@
 		</method>
 		<method name="maxf">
 			<return type="float" />
-			<argument index="0" name="a" type="float" />
-			<argument index="1" name="b" type="float" />
+			<param index="0" name="a" type="float" />
+			<param index="1" name="b" type="float" />
 			<description>
 				Returns the maximum of two float values.
 				[codeblock]
@@ -519,8 +567,8 @@
 		</method>
 		<method name="maxi">
 			<return type="int" />
-			<argument index="0" name="a" type="int" />
-			<argument index="1" name="b" type="int" />
+			<param index="0" name="a" type="int" />
+			<param index="1" name="b" type="int" />
 			<description>
 				Returns the maximum of two int values.
 				[codeblock]
@@ -540,8 +588,8 @@
 		</method>
 		<method name="minf">
 			<return type="float" />
-			<argument index="0" name="a" type="float" />
-			<argument index="1" name="b" type="float" />
+			<param index="0" name="a" type="float" />
+			<param index="1" name="b" type="float" />
 			<description>
 				Returns the minimum of two float values.
 				[codeblock]
@@ -552,8 +600,8 @@
 		</method>
 		<method name="mini">
 			<return type="int" />
-			<argument index="0" name="a" type="int" />
-			<argument index="1" name="b" type="int" />
+			<param index="0" name="a" type="int" />
+			<param index="1" name="b" type="int" />
 			<description>
 				Returns the minimum of two int values.
 				[codeblock]
@@ -564,12 +612,12 @@
 		</method>
 		<method name="move_toward">
 			<return type="float" />
-			<argument index="0" name="from" type="float" />
-			<argument index="1" name="to" type="float" />
-			<argument index="2" name="delta" type="float" />
+			<param index="0" name="from" type="float" />
+			<param index="1" name="to" type="float" />
+			<param index="2" name="delta" type="float" />
 			<description>
-				Moves [code]from[/code] toward [code]to[/code] by the [code]delta[/code] value.
-				Use a negative [code]delta[/code] value to move away.
+				Moves [param from] toward [param to] by the [param delta] value.
+				Use a negative [param delta] value to move away.
 				[codeblock]
 				move_toward(5, 10, 4) # Returns 9
 				move_toward(10, 5, 4) # Returns 6
@@ -579,9 +627,9 @@
 		</method>
 		<method name="nearest_po2">
 			<return type="int" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
-				Returns the nearest equal or larger power of 2 for integer [code]value[/code].
+				Returns the nearest equal or larger power of 2 for integer [param value].
 				In other words, returns the smallest value [code]a[/code] where [code]a = pow(2, n)[/code] such that [code]value &lt;= a[/code] for some non-negative integer [code]n[/code].
 				[codeblock]
 				nearest_po2(3) # Returns 4
@@ -591,15 +639,15 @@
 				nearest_po2(0) # Returns 0 (this may not be what you expect)
 				nearest_po2(-1) # Returns 0 (this may not be what you expect)
 				[/codeblock]
-				[b]Warning:[/b] Due to the way it is implemented, this function returns [code]0[/code] rather than [code]1[/code] for non-positive values of [code]value[/code] (in reality, 1 is the smallest integer power of 2).
+				[b]Warning:[/b] Due to the way it is implemented, this function returns [code]0[/code] rather than [code]1[/code] for non-positive values of [param value] (in reality, 1 is the smallest integer power of 2).
 			</description>
 		</method>
 		<method name="pingpong">
 			<return type="float" />
-			<argument index="0" name="value" type="float" />
-			<argument index="1" name="length" type="float" />
+			<param index="0" name="value" type="float" />
+			<param index="1" name="length" type="float" />
 			<description>
-				Returns the [code]value[/code] wrapped between [code]0[/code] and the [code]length[/code]. If the limit is reached, the next value the function returned is decreased to the [code]0[/code] side or increased to the [code]length[/code] side (like a triangle wave). If [code]length[/code] is less than zero, it becomes positive.
+				Returns the [param value] wrapped between [code]0[/code] and the [param length]. If the limit is reached, the next value the function returned is decreased to the [code]0[/code] side or increased to the [param length] side (like a triangle wave). If [param length] is less than zero, it becomes positive.
 				[codeblock]
 				pingpong(-3.0, 3.0) # Returns 3
 				pingpong(-2.0, 3.0) # Returns 2
@@ -616,8 +664,8 @@
 		</method>
 		<method name="posmod">
 			<return type="int" />
-			<argument index="0" name="x" type="int" />
-			<argument index="1" name="y" type="int" />
+			<param index="0" name="x" type="int" />
+			<param index="1" name="y" type="int" />
 			<description>
 				Returns the integer modulus of [code]x/y[/code] that wraps equally in positive and negative.
 				[codeblock]
@@ -638,10 +686,10 @@
 		</method>
 		<method name="pow">
 			<return type="float" />
-			<argument index="0" name="base" type="float" />
-			<argument index="1" name="exp" type="float" />
+			<param index="0" name="base" type="float" />
+			<param index="1" name="exp" type="float" />
 			<description>
-				Returns the result of [code]base[/code] raised to the power of [code]exp[/code].
+				Returns the result of [param base] raised to the power of [param exp].
 				[codeblock]
 				pow(2, 5) # Returns 32
 				[/codeblock]
@@ -726,7 +774,7 @@
 		</method>
 		<method name="rad2deg">
 			<return type="float" />
-			<argument index="0" name="rad" type="float" />
+			<param index="0" name="rad" type="float" />
 			<description>
 				Converts an angle expressed in radians to degrees.
 				[codeblock]
@@ -736,9 +784,9 @@
 		</method>
 		<method name="rand_from_seed">
 			<return type="PackedInt64Array" />
-			<argument index="0" name="seed" type="int" />
+			<param index="0" name="seed" type="int" />
 			<description>
-				Random from seed: pass a [code]seed[/code], and an array with both number and new seed is returned. "Seed" here refers to the internal state of the pseudo random number generator. The internal state of the current implementation is 64 bits.
+				Random from seed: pass a [param seed], and an array with both number and new seed is returned. "Seed" here refers to the internal state of the pseudo random number generator. The internal state of the current implementation is 64 bits.
 			</description>
 		</method>
 		<method name="randf">
@@ -752,10 +800,10 @@
 		</method>
 		<method name="randf_range">
 			<return type="float" />
-			<argument index="0" name="from" type="float" />
-			<argument index="1" name="to" type="float" />
+			<param index="0" name="from" type="float" />
+			<param index="1" name="to" type="float" />
 			<description>
-				Returns a random floating point value on the interval between [code]from[/code] and [code]to[/code] (inclusive).
+				Returns a random floating point value on the interval between [param from] and [param to] (inclusive).
 				[codeblock]
 				prints(randf_range(-10, 10), randf_range(-10, 10)) # Prints e.g. -3.844535 7.45315
 				[/codeblock]
@@ -763,10 +811,10 @@
 		</method>
 		<method name="randfn">
 			<return type="float" />
-			<argument index="0" name="mean" type="float" />
-			<argument index="1" name="deviation" type="float" />
+			<param index="0" name="mean" type="float" />
+			<param index="1" name="deviation" type="float" />
 			<description>
-				Returns a normally-distributed pseudo-random floating point value using Box-Muller transform with the specified [code]mean[/code] and a standard [code]deviation[/code]. This is also called Gaussian distribution.
+				Returns a normally-distributed pseudo-random floating point value using Box-Muller transform with the specified [param mean] and a standard [param deviation]. This is also called Gaussian distribution.
 			</description>
 		</method>
 		<method name="randi">
@@ -783,10 +831,10 @@
 		</method>
 		<method name="randi_range">
 			<return type="int" />
-			<argument index="0" name="from" type="int" />
-			<argument index="1" name="to" type="int" />
+			<param index="0" name="from" type="int" />
+			<param index="1" name="to" type="int" />
 			<description>
-				Returns a random signed 32-bit integer between [code]from[/code] and [code]to[/code] (inclusive). If [code]to[/code] is lesser than [code]from[/code], they are swapped.
+				Returns a random signed 32-bit integer between [param from] and [param to] (inclusive). If [param to] is lesser than [param from], they are swapped.
 				[codeblock]
 				print(randi_range(0, 1)) # Prints 0 or 1
 				print(randi_range(-10, 1000)) # Prints any number from -10 to 1000
@@ -801,16 +849,17 @@
 		</method>
 		<method name="range_lerp">
 			<return type="float" />
-			<argument index="0" name="value" type="float" />
-			<argument index="1" name="istart" type="float" />
-			<argument index="2" name="istop" type="float" />
-			<argument index="3" name="ostart" type="float" />
-			<argument index="4" name="ostop" type="float" />
+			<param index="0" name="value" type="float" />
+			<param index="1" name="istart" type="float" />
+			<param index="2" name="istop" type="float" />
+			<param index="3" name="ostart" type="float" />
+			<param index="4" name="ostop" type="float" />
 			<description>
-				Maps a [code]value[/code] from range [code][istart, istop][/code] to [code][ostart, ostop][/code].
+				Maps a [param value] from range [code][istart, istop][/code] to [code][ostart, ostop][/code]. See also [method lerp] and [method inverse_lerp]. If [param value] is outside [code][istart, istop][/code], then the resulting value will also be outside [code][ostart, ostop][/code]. Use [method clamp] on the result of [method range_lerp] if this is not desired.
 				[codeblock]
 				range_lerp(75, 0, 100, -1, 1) # Returns 0.5
 				[/codeblock]
+				For complex use cases where you need multiple ranges, consider using [Curve] or [Gradient] instead.
 			</description>
 		</method>
 		<method name="rid_allocate_id">
@@ -821,24 +870,43 @@
 		</method>
 		<method name="rid_from_int64">
 			<return type="RID" />
-			<argument index="0" name="base" type="int" />
+			<param index="0" name="base" type="int" />
 			<description>
 				Create a RID from an int64. This is used mainly from native extensions to build servers.
 			</description>
 		</method>
 		<method name="round">
-			<return type="float" />
-			<argument index="0" name="x" type="float" />
+			<return type="Variant" />
+			<param index="0" name="x" type="Variant" />
 			<description>
-				Rounds [code]x[/code] to the nearest whole number, with halfway cases rounded away from zero.
+				Rounds [param x] to the nearest whole number, with halfway cases rounded away from zero. Supported types: [int], [float], [Vector2], [Vector3], [Vector4].
 				[codeblock]
+				round(2.4) # Returns 2
+				round(2.5) # Returns 3
 				round(2.6) # Returns 3
 				[/codeblock]
 				See also [method floor], [method ceil], and [method snapped].
+				[b]Note:[/b] For better type safety, you can use [method roundf], [method roundi], [method Vector2.round], [method Vector3.round] or [method Vector4.round] instead.
+			</description>
+		</method>
+		<method name="roundf">
+			<return type="float" />
+			<param index="0" name="x" type="float" />
+			<description>
+				Rounds [param x] to the nearest whole number, with halfway cases rounded away from zero.
+				A type-safe version of [method round], specialzied in floats.
+			</description>
+		</method>
+		<method name="roundi">
+			<return type="int" />
+			<param index="0" name="x" type="float" />
+			<description>
+				Rounds [param x] to the nearest whole number, with halfway cases rounded away from zero.
+				A type-safe version of [method round] that returns integer.
 			</description>
 		</method>
 		<method name="seed">
-			<argument index="0" name="base" type="int" />
+			<param index="0" name="base" type="int" />
 			<description>
 				Sets seed for the random number generator.
 				[codeblock]
@@ -849,9 +917,9 @@
 		</method>
 		<method name="sign">
 			<return type="Variant" />
-			<argument index="0" name="x" type="Variant" />
+			<param index="0" name="x" type="Variant" />
 			<description>
-				Returns the sign of [code]x[/code] as same type of [Variant] as [code]x[/code] with each component being -1, 0 and 1 for each negative, zero and positive values respectivelu. Variant types [int], [float] (real), [Vector2], [Vector2i], [Vector3] and [Vector3i] are supported.
+				Returns the sign of [param x] as same type of [Variant] as [param x] with each component being -1, 0 and 1 for each negative, zero and positive values respectivelu. Variant types [int], [float] (real), [Vector2], [Vector2i], [Vector3] and [Vector3i] are supported.
 				[codeblock]
 				sign(-6.0) # Returns -1
 				sign(0.0)  # Returns 0
@@ -863,9 +931,9 @@
 		</method>
 		<method name="signf">
 			<return type="float" />
-			<argument index="0" name="x" type="float" />
+			<param index="0" name="x" type="float" />
 			<description>
-				Returns the sign of [code]x[/code] as a float: -1.0 or 1.0. Returns 0.0 if [code]x[/code] is 0.
+				Returns the sign of [param x] as a float: -1.0 or 1.0. Returns 0.0 if [param x] is 0.
 				[codeblock]
 				sign(-6.0) # Returns -1.0
 				sign(0.0)  # Returns 0.0
@@ -875,9 +943,9 @@
 		</method>
 		<method name="signi">
 			<return type="int" />
-			<argument index="0" name="x" type="int" />
+			<param index="0" name="x" type="int" />
 			<description>
-				Returns the sign of [code]x[/code] as an integer: -1 or 1. Returns 0 if [code]x[/code] is 0.
+				Returns the sign of [param x] as an integer: -1 or 1. Returns 0 if [param x] is 0.
 				[codeblock]
 				sign(-6) # Returns -1
 				sign(0)  # Returns 0
@@ -887,9 +955,9 @@
 		</method>
 		<method name="sin">
 			<return type="float" />
-			<argument index="0" name="angle_rad" type="float" />
+			<param index="0" name="angle_rad" type="float" />
 			<description>
-				Returns the sine of angle [code]angle_rad[/code] in radians.
+				Returns the sine of angle [param angle_rad] in radians.
 				[codeblock]
 				sin(0.523599)    # Returns 0.5
 				sin(deg2rad(90)) # Returns 1.0
@@ -898,9 +966,9 @@
 		</method>
 		<method name="sinh">
 			<return type="float" />
-			<argument index="0" name="x" type="float" />
+			<param index="0" name="x" type="float" />
 			<description>
-				Returns the hyperbolic sine of [code]x[/code].
+				Returns the hyperbolic sine of [param x].
 				[codeblock]
 				var a = log(2.0) # Returns 0.693147
 				sinh(a) # Returns 0.75
@@ -909,12 +977,12 @@
 		</method>
 		<method name="smoothstep">
 			<return type="float" />
-			<argument index="0" name="from" type="float" />
-			<argument index="1" name="to" type="float" />
-			<argument index="2" name="x" type="float" />
+			<param index="0" name="from" type="float" />
+			<param index="1" name="to" type="float" />
+			<param index="2" name="x" type="float" />
 			<description>
-				Returns the result of smoothly interpolating the value of [code]x[/code] between [code]0[/code] and [code]1[/code], based on the where [code]x[/code] lies with respect to the edges [code]from[/code] and [code]to[/code].
-				The return value is [code]0[/code] if [code]x &lt;= from[/code], and [code]1[/code] if [code]x &gt;= to[/code]. If [code]x[/code] lies between [code]from[/code] and [code]to[/code], the returned value follows an S-shaped curve that maps [code]x[/code] between [code]0[/code] and [code]1[/code].
+				Returns the result of smoothly interpolating the value of [param x] between [code]0[/code] and [code]1[/code], based on the where [param x] lies with respect to the edges [param from] and [param to].
+				The return value is [code]0[/code] if [code]x &lt;= from[/code], and [code]1[/code] if [code]x &gt;= to[/code]. If [param x] lies between [param from] and [param to], the returned value follows an S-shaped curve that maps [param x] between [code]0[/code] and [code]1[/code].
 				This S-shaped curve is the cubic Hermite interpolator, given by [code]f(y) = 3*y^2 - 2*y^3[/code] where [code]y = (x-from) / (to-from)[/code].
 				[codeblock]
 				smoothstep(0, 2, -5.0) # Returns 0.0
@@ -928,10 +996,10 @@
 		</method>
 		<method name="snapped">
 			<return type="float" />
-			<argument index="0" name="x" type="float" />
-			<argument index="1" name="step" type="float" />
+			<param index="0" name="x" type="float" />
+			<param index="1" name="step" type="float" />
 			<description>
-				Snaps float value [code]x[/code] to a given [code]step[/code]. This can also be used to round a floating point number to an arbitrary number of decimals.
+				Snaps float value [param x] to a given [param step]. This can also be used to round a floating point number to an arbitrary number of decimals.
 				[codeblock]
 				snapped(100, 32) # Returns 96
 				snapped(3.14159, 0.01) # Returns 3.14
@@ -941,18 +1009,18 @@
 		</method>
 		<method name="sqrt">
 			<return type="float" />
-			<argument index="0" name="x" type="float" />
+			<param index="0" name="x" type="float" />
 			<description>
-				Returns the square root of [code]x[/code], where [code]x[/code] is a non-negative number.
+				Returns the square root of [param x], where [param x] is a non-negative number.
 				[codeblock]
 				sqrt(9) # Returns 3
 				[/codeblock]
-				[b]Note:[/b] Negative values of [code]x[/code] return NaN. If you need negative inputs, use [code]System.Numerics.Complex[/code] in C#.
+				[b]Note:[/b] Negative values of [param x] return NaN. If you need negative inputs, use [code]System.Numerics.Complex[/code] in C#.
 			</description>
 		</method>
 		<method name="step_decimals">
 			<return type="int" />
-			<argument index="0" name="x" type="float" />
+			<param index="0" name="x" type="float" />
 			<description>
 				Returns the position of the first non-zero digit, after the decimal point. Note that the maximum return value is 10, which is a design decision in the implementation.
 				[codeblock]
@@ -973,7 +1041,7 @@
 		</method>
 		<method name="str2var">
 			<return type="Variant" />
-			<argument index="0" name="string" type="String" />
+			<param index="0" name="string" type="String" />
 			<description>
 				Converts a formatted string that was returned by [method var2str] to the original value.
 				[codeblock]
@@ -985,9 +1053,9 @@
 		</method>
 		<method name="tan">
 			<return type="float" />
-			<argument index="0" name="angle_rad" type="float" />
+			<param index="0" name="angle_rad" type="float" />
 			<description>
-				Returns the tangent of angle [code]angle_rad[/code] in radians.
+				Returns the tangent of angle [param angle_rad] in radians.
 				[codeblock]
 				tan(deg2rad(45)) # Returns 1
 				[/codeblock]
@@ -995,9 +1063,9 @@
 		</method>
 		<method name="tanh">
 			<return type="float" />
-			<argument index="0" name="x" type="float" />
+			<param index="0" name="x" type="float" />
 			<description>
-				Returns the hyperbolic tangent of [code]x[/code].
+				Returns the hyperbolic tangent of [param x].
 				[codeblock]
 				var a = log(2.0) # Returns 0.693147
 				tanh(a)      # Returns 0.6
@@ -1006,7 +1074,7 @@
 		</method>
 		<method name="typeof">
 			<return type="int" />
-			<argument index="0" name="variable" type="Variant" />
+			<param index="0" name="variable" type="Variant" />
 			<description>
 				Returns the internal type of the given Variant object, using the [enum Variant.Type] values.
 				[codeblock]
@@ -1022,7 +1090,7 @@
 		</method>
 		<method name="var2bytes">
 			<return type="PackedByteArray" />
-			<argument index="0" name="variable" type="Variant" />
+			<param index="0" name="variable" type="Variant" />
 			<description>
 				Encodes a [Variant] value to a byte array, without encoding objects. Deserialization can be done with [method bytes2var].
 				[b]Note:[/b] If you need object serialization, see [method var2bytes_with_objects].
@@ -1030,16 +1098,16 @@
 		</method>
 		<method name="var2bytes_with_objects">
 			<return type="PackedByteArray" />
-			<argument index="0" name="variable" type="Variant" />
+			<param index="0" name="variable" type="Variant" />
 			<description>
 				Encodes a [Variant] value to a byte array. Encoding objects is allowed (and can potentially include code). Deserialization can be done with [method bytes2var_with_objects].
 			</description>
 		</method>
 		<method name="var2str">
 			<return type="String" />
-			<argument index="0" name="variable" type="Variant" />
+			<param index="0" name="variable" type="Variant" />
 			<description>
-				Converts a Variant [code]variable[/code] to a formatted string that can later be parsed using [method str2var].
+				Converts a Variant [param variable] to a formatted string that can later be parsed using [method str2var].
 				[codeblock]
 				a = { "a": 1, "b": 2 }
 				print(var2str(a))
@@ -1055,19 +1123,19 @@
 		</method>
 		<method name="weakref">
 			<return type="Variant" />
-			<argument index="0" name="obj" type="Variant" />
+			<param index="0" name="obj" type="Variant" />
 			<description>
-				Returns a weak reference to an object, or [code]null[/code] is the argument is invalid.
+				Returns a weak reference to an object, or [code]null[/code] if the argument is invalid.
 				A weak reference to an object is not enough to keep the object alive: when the only remaining references to a referent are weak references, garbage collection is free to destroy the referent and reuse its memory for something else. However, until the object is actually destroyed the weak reference may return the object even if there are no strong references to it.
 			</description>
 		</method>
 		<method name="wrap">
 			<return type="Variant" />
-			<argument index="0" name="value" type="Variant" />
-			<argument index="1" name="min" type="Variant" />
-			<argument index="2" name="max" type="Variant" />
+			<param index="0" name="value" type="Variant" />
+			<param index="1" name="min" type="Variant" />
+			<param index="2" name="max" type="Variant" />
 			<description>
-				Wraps the [Variant] [code]value[/code] between [code]min[/code] and [code]max[/code].
+				Wraps the [Variant] [param value] between [param min] and [param max].
 				Usable for creating loop-alike behavior or infinite surfaces.
 				Variant types [int] and [float] (real) are supported. If any of the argument is [float] the result will be [float], otherwise it is [int].
 				[codeblock]
@@ -1084,11 +1152,11 @@
 		</method>
 		<method name="wrapf">
 			<return type="float" />
-			<argument index="0" name="value" type="float" />
-			<argument index="1" name="min" type="float" />
-			<argument index="2" name="max" type="float" />
+			<param index="0" name="value" type="float" />
+			<param index="1" name="min" type="float" />
+			<param index="2" name="max" type="float" />
 			<description>
-				Wraps float [code]value[/code] between [code]min[/code] and [code]max[/code].
+				Wraps float [param value] between [param min] and [param max].
 				Usable for creating loop-alike behavior or infinite surfaces.
 				[codeblock]
 				# Infinite loop between 5.0 and 9.9
@@ -1102,17 +1170,17 @@
 				# Infinite rotation (in radians)
 				angle = wrapf(angle + 0.1, -PI, PI)
 				[/codeblock]
-				[b]Note:[/b] If [code]min[/code] is [code]0[/code], this is equivalent to [method fposmod], so prefer using that instead.
+				[b]Note:[/b] If [param min] is [code]0[/code], this is equivalent to [method fposmod], so prefer using that instead.
 				[code]wrapf[/code] is more flexible than using the [method fposmod] approach by giving the user control over the minimum value.
 			</description>
 		</method>
 		<method name="wrapi">
 			<return type="int" />
-			<argument index="0" name="value" type="int" />
-			<argument index="1" name="min" type="int" />
-			<argument index="2" name="max" type="int" />
+			<param index="0" name="value" type="int" />
+			<param index="1" name="min" type="int" />
+			<param index="2" name="max" type="int" />
 			<description>
-				Wraps integer [code]value[/code] between [code]min[/code] and [code]max[/code].
+				Wraps integer [param value] between [param min] and [param max].
 				Usable for creating loop-alike behavior or infinite surfaces.
 				[codeblock]
 				# Infinite loop between 5 and 9
@@ -1209,6 +1277,7 @@
 			The [ResourceSaver] singleton.
 		</member>
 		<member name="ResourceUID" type="ResourceUID" setter="" getter="">
+			The [ResourceUID] singleton.
 		</member>
 		<member name="TextServerManager" type="TextServerManager" setter="" getter="">
 			The [TextServerManager] singleton.
diff --git a/doc/classes/AABB.xml b/doc/classes/AABB.xml
index db880efaf2..e2e4e7c61d 100644
--- a/doc/classes/AABB.xml
+++ b/doc/classes/AABB.xml
@@ -23,15 +23,15 @@
 		</constructor>
 		<constructor name="AABB">
 			<return type="AABB" />
-			<argument index="0" name="from" type="AABB" />
+			<param index="0" name="from" type="AABB" />
 			<description>
 				Constructs an [AABB] as a copy of the given [AABB].
 			</description>
 		</constructor>
 		<constructor name="AABB">
 			<return type="AABB" />
-			<argument index="0" name="position" type="Vector3" />
-			<argument index="1" name="size" type="Vector3" />
+			<param index="0" name="position" type="Vector3" />
+			<param index="1" name="size" type="Vector3" />
 			<description>
 				Constructs an [AABB] from a position and size.
 			</description>
@@ -46,14 +46,14 @@
 		</method>
 		<method name="encloses" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="with" type="AABB" />
+			<param index="0" name="with" type="AABB" />
 			<description>
 				Returns [code]true[/code] if this [AABB] completely encloses another one.
 			</description>
 		</method>
 		<method name="expand" qualifiers="const">
 			<return type="AABB" />
-			<argument index="0" name="to_point" type="Vector3" />
+			<param index="0" name="to_point" type="Vector3" />
 			<description>
 				Returns a copy of this [AABB] expanded to include a given point.
 				[b]Example:[/b]
@@ -81,7 +81,7 @@
 		</method>
 		<method name="get_endpoint" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Gets the position of the 8 endpoints of the [AABB] in space.
 			</description>
@@ -124,7 +124,7 @@
 		</method>
 		<method name="get_support" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="dir" type="Vector3" />
+			<param index="0" name="dir" type="Vector3" />
 			<description>
 				Returns the support point in a given direction. This is useful for collision detection algorithms.
 			</description>
@@ -137,9 +137,9 @@
 		</method>
 		<method name="grow" qualifiers="const">
 			<return type="AABB" />
-			<argument index="0" name="by" type="float" />
+			<param index="0" name="by" type="float" />
 			<description>
-				Returns a copy of the [AABB] grown a given amount of units towards all the sides.
+				Returns a copy of the [AABB] grown a given number of units towards all the sides.
 			</description>
 		</method>
 		<method name="has_no_surface" qualifiers="const">
@@ -156,7 +156,7 @@
 		</method>
 		<method name="has_point" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="point" type="Vector3" />
+			<param index="0" name="point" type="Vector3" />
 			<description>
 				Returns [code]true[/code] if the [AABB] contains a point. Points on the faces of the AABB are considered included, though float-point precision errors may impact the accuracy of such checks.
 				[b]Note:[/b] This method is not reliable for [AABB] with a [i]negative size[/i]. Use [method abs] to get a positive sized equivalent [AABB] to check for contained points.
@@ -164,52 +164,52 @@
 		</method>
 		<method name="intersection" qualifiers="const">
 			<return type="AABB" />
-			<argument index="0" name="with" type="AABB" />
+			<param index="0" name="with" type="AABB" />
 			<description>
 				Returns the intersection between two [AABB]. An empty AABB (size [code](0, 0, 0)[/code]) is returned on failure.
 			</description>
 		</method>
 		<method name="intersects" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="with" type="AABB" />
+			<param index="0" name="with" type="AABB" />
 			<description>
 				Returns [code]true[/code] if the [AABB] overlaps with another.
 			</description>
 		</method>
 		<method name="intersects_plane" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="plane" type="Plane" />
+			<param index="0" name="plane" type="Plane" />
 			<description>
 				Returns [code]true[/code] if the [AABB] is on both sides of a plane.
 			</description>
 		</method>
 		<method name="intersects_ray" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="from" type="Vector3" />
-			<argument index="1" name="dir" type="Vector3" />
+			<param index="0" name="from" type="Vector3" />
+			<param index="1" name="dir" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="intersects_segment" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="from" type="Vector3" />
-			<argument index="1" name="to" type="Vector3" />
+			<param index="0" name="from" type="Vector3" />
+			<param index="1" name="to" type="Vector3" />
 			<description>
-				Returns [code]true[/code] if the [AABB] intersects the line segment between [code]from[/code] and [code]to[/code].
+				Returns [code]true[/code] if the [AABB] intersects the line segment between [param from] and [param to].
 			</description>
 		</method>
 		<method name="is_equal_approx" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="aabb" type="AABB" />
+			<param index="0" name="aabb" type="AABB" />
 			<description>
-				Returns [code]true[/code] if this [AABB] and [code]aabb[/code] are approximately equal, by calling [method @GlobalScope.is_equal_approx] on each component.
+				Returns [code]true[/code] if this [AABB] and [param aabb] are approximately equal, by calling [method @GlobalScope.is_equal_approx] on each component.
 			</description>
 		</method>
 		<method name="merge" qualifiers="const">
 			<return type="AABB" />
-			<argument index="0" name="with" type="AABB" />
+			<param index="0" name="with" type="AABB" />
 			<description>
-				Returns a larger [AABB] that contains both this [AABB] and [code]with[/code].
+				Returns a larger [AABB] that contains both this [AABB] and [param with].
 			</description>
 		</method>
 	</methods>
@@ -228,7 +228,7 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="AABB" />
+			<param index="0" name="right" type="AABB" />
 			<description>
 				Returns [code]true[/code] if the vectors are not equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
@@ -236,14 +236,14 @@
 		</operator>
 		<operator name="operator *">
 			<return type="AABB" />
-			<argument index="0" name="right" type="Transform3D" />
+			<param index="0" name="right" type="Transform3D" />
 			<description>
 				Inversely transforms (multiplies) the [AABB] by the given [Transform3D] transformation matrix.
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="AABB" />
+			<param index="0" name="right" type="AABB" />
 			<description>
 				Returns [code]true[/code] if the AABBs are exactly equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
diff --git a/doc/classes/AESContext.xml b/doc/classes/AESContext.xml
index 82634f8859..69cd54a79b 100644
--- a/doc/classes/AESContext.xml
+++ b/doc/classes/AESContext.xml
@@ -94,19 +94,19 @@
 		</method>
 		<method name="start">
 			<return type="int" enum="Error" />
-			<argument index="0" name="mode" type="int" enum="AESContext.Mode" />
-			<argument index="1" name="key" type="PackedByteArray" />
-			<argument index="2" name="iv" type="PackedByteArray" default="PackedByteArray()" />
+			<param index="0" name="mode" type="int" enum="AESContext.Mode" />
+			<param index="1" name="key" type="PackedByteArray" />
+			<param index="2" name="iv" type="PackedByteArray" default="PackedByteArray()" />
 			<description>
-				Start the AES context in the given [code]mode[/code]. A [code]key[/code] of either 16 or 32 bytes must always be provided, while an [code]iv[/code] (initialization vector) of exactly 16 bytes, is only needed when [code]mode[/code] is either [constant MODE_CBC_ENCRYPT] or [constant MODE_CBC_DECRYPT].
+				Start the AES context in the given [param mode]. A [param key] of either 16 or 32 bytes must always be provided, while an [param iv] (initialization vector) of exactly 16 bytes, is only needed when [param mode] is either [constant MODE_CBC_ENCRYPT] or [constant MODE_CBC_DECRYPT].
 			</description>
 		</method>
 		<method name="update">
 			<return type="PackedByteArray" />
-			<argument index="0" name="src" type="PackedByteArray" />
+			<param index="0" name="src" type="PackedByteArray" />
 			<description>
-				Run the desired operation for this AES context. Will return a [PackedByteArray] containing the result of encrypting (or decrypting) the given [code]src[/code]. See [method start] for mode of operation.
-				[b]Note:[/b] The size of [code]src[/code] must be a multiple of 16. Apply some padding if needed.
+				Run the desired operation for this AES context. Will return a [PackedByteArray] containing the result of encrypting (or decrypting) the given [param src]. See [method start] for mode of operation.
+				[b]Note:[/b] The size of [param src] must be a multiple of 16. Apply some padding if needed.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/AStar2D.xml b/doc/classes/AStar2D.xml
index c05fb885b9..977e73e7ca 100644
--- a/doc/classes/AStar2D.xml
+++ b/doc/classes/AStar2D.xml
@@ -11,8 +11,8 @@
 	<methods>
 		<method name="_compute_cost" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="from_id" type="int" />
-			<argument index="1" name="to_id" type="int" />
+			<param index="0" name="from_id" type="int" />
+			<param index="1" name="to_id" type="int" />
 			<description>
 				Called when computing the cost between two connected points.
 				Note that this function is hidden in the default [code]AStar2D[/code] class.
@@ -20,8 +20,8 @@
 		</method>
 		<method name="_estimate_cost" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="from_id" type="int" />
-			<argument index="1" name="to_id" type="int" />
+			<param index="0" name="from_id" type="int" />
+			<param index="1" name="to_id" type="int" />
 			<description>
 				Called when estimating the cost between a point and the path's ending point.
 				Note that this function is hidden in the default [code]AStar2D[/code] class.
@@ -29,12 +29,12 @@
 		</method>
 		<method name="add_point">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="position" type="Vector2" />
-			<argument index="2" name="weight_scale" type="float" default="1.0" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="position" type="Vector2" />
+			<param index="2" name="weight_scale" type="float" default="1.0" />
 			<description>
-				Adds a new point at the given position with the given identifier. The [code]id[/code] must be 0 or larger, and the [code]weight_scale[/code] must be 0.0 or greater.
-				The [code]weight_scale[/code] is multiplied by the result of [method _compute_cost] when determining the overall cost of traveling across a segment from a neighboring point to this point. Thus, all else being equal, the algorithm prefers points with lower [code]weight_scale[/code]s to form a path.
+				Adds a new point at the given position with the given identifier. The [param id] must be 0 or larger, and the [param weight_scale] must be 0.0 or greater.
+				The [param weight_scale] is multiplied by the result of [method _compute_cost] when determining the overall cost of traveling across a segment from a neighboring point to this point. Thus, all else being equal, the algorithm prefers points with lower [param weight_scale]s to form a path.
 				[codeblocks]
 				[gdscript]
 				var astar = AStar2D.new()
@@ -45,16 +45,16 @@
 				astar.AddPoint(1, new Vector2(1, 0), 4); // Adds the point (1, 0) with weight_scale 4 and id 1
 				[/csharp]
 				[/codeblocks]
-				If there already exists a point for the given [code]id[/code], its position and weight scale are updated to the given values.
+				If there already exists a point for the given [param id], its position and weight scale are updated to the given values.
 			</description>
 		</method>
 		<method name="are_points_connected" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="to_id" type="int" />
-			<argument index="2" name="bidirectional" type="bool" default="true" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="to_id" type="int" />
+			<param index="2" name="bidirectional" type="bool" default="true" />
 			<description>
-				Returns whether there is a connection/segment between the given points. If [code]bidirectional[/code] is [code]false[/code], returns whether movement from [code]id[/code] to [code]to_id[/code] is possible through this segment.
+				Returns whether there is a connection/segment between the given points. If [param bidirectional] is [code]false[/code], returns whether movement from [param id] to [param to_id] is possible through this segment.
 			</description>
 		</method>
 		<method name="clear">
@@ -65,11 +65,11 @@
 		</method>
 		<method name="connect_points">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="to_id" type="int" />
-			<argument index="2" name="bidirectional" type="bool" default="true" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="to_id" type="int" />
+			<param index="2" name="bidirectional" type="bool" default="true" />
 			<description>
-				Creates a segment between the given points. If [code]bidirectional[/code] is [code]false[/code], only movement from [code]id[/code] to [code]to_id[/code] is allowed, not the reverse direction.
+				Creates a segment between the given points. If [param bidirectional] is [code]false[/code], only movement from [param id] to [param to_id] is allowed, not the reverse direction.
 				[codeblocks]
 				[gdscript]
 				var astar = AStar2D.new()
@@ -88,11 +88,11 @@
 		</method>
 		<method name="disconnect_points">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="to_id" type="int" />
-			<argument index="2" name="bidirectional" type="bool" default="true" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="to_id" type="int" />
+			<param index="2" name="bidirectional" type="bool" default="true" />
 			<description>
-				Deletes the segment between the given points. If [code]bidirectional[/code] is [code]false[/code], only movement from [code]id[/code] to [code]to_id[/code] is prevented, and a unidirectional segment possibly remains.
+				Deletes the segment between the given points. If [param bidirectional] is [code]false[/code], only movement from [param id] to [param to_id] is prevented, and a unidirectional segment possibly remains.
 			</description>
 		</method>
 		<method name="get_available_point_id" qualifiers="const">
@@ -103,18 +103,18 @@
 		</method>
 		<method name="get_closest_point" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="to_position" type="Vector2" />
-			<argument index="1" name="include_disabled" type="bool" default="false" />
+			<param index="0" name="to_position" type="Vector2" />
+			<param index="1" name="include_disabled" type="bool" default="false" />
 			<description>
-				Returns the ID of the closest point to [code]to_position[/code], optionally taking disabled points into account. Returns [code]-1[/code] if there are no points in the points pool.
-				[b]Note:[/b] If several points are the closest to [code]to_position[/code], the one with the smallest ID will be returned, ensuring a deterministic result.
+				Returns the ID of the closest point to [param to_position], optionally taking disabled points into account. Returns [code]-1[/code] if there are no points in the points pool.
+				[b]Note:[/b] If several points are the closest to [param to_position], the one with the smallest ID will be returned, ensuring a deterministic result.
 			</description>
 		</method>
 		<method name="get_closest_position_in_segment" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="to_position" type="Vector2" />
+			<param index="0" name="to_position" type="Vector2" />
 			<description>
-				Returns the closest position to [code]to_position[/code] that resides inside a segment between two connected points.
+				Returns the closest position to [param to_position] that resides inside a segment between two connected points.
 				[codeblocks]
 				[gdscript]
 				var astar = AStar2D.new()
@@ -136,8 +136,8 @@
 		</method>
 		<method name="get_id_path">
 			<return type="PackedInt64Array" />
-			<argument index="0" name="from_id" type="int" />
-			<argument index="1" name="to_id" type="int" />
+			<param index="0" name="from_id" type="int" />
+			<param index="1" name="to_id" type="int" />
 			<description>
 				Returns an array with the IDs of the points that form the path found by AStar2D between the given points. The array is ordered from the starting point to the ending point of the path.
 				[codeblocks]
@@ -180,7 +180,7 @@
 		</method>
 		<method name="get_point_connections">
 			<return type="PackedInt64Array" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns an array with the IDs of the points that form the connection with the given point.
 				[codeblocks]
@@ -225,8 +225,8 @@
 		</method>
 		<method name="get_point_path">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="from_id" type="int" />
-			<argument index="1" name="to_id" type="int" />
+			<param index="0" name="from_id" type="int" />
+			<param index="1" name="to_id" type="int" />
 			<description>
 				Returns an array with the points that are in the path found by AStar2D between the given points. The array is ordered from the starting point to the ending point of the path.
 				[b]Note:[/b] This method is not thread-safe. If called from a [Thread], it will return an empty [PackedVector2Array] and will print an error message.
@@ -234,68 +234,68 @@
 		</method>
 		<method name="get_point_position" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
-				Returns the position of the point associated with the given [code]id[/code].
+				Returns the position of the point associated with the given [param id].
 			</description>
 		</method>
 		<method name="get_point_weight_scale" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
-				Returns the weight scale of the point associated with the given [code]id[/code].
+				Returns the weight scale of the point associated with the given [param id].
 			</description>
 		</method>
 		<method name="has_point" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
-				Returns whether a point associated with the given [code]id[/code] exists.
+				Returns whether a point associated with the given [param id] exists.
 			</description>
 		</method>
 		<method name="is_point_disabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns whether a point is disabled or not for pathfinding. By default, all points are enabled.
 			</description>
 		</method>
 		<method name="remove_point">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
-				Removes the point associated with the given [code]id[/code] from the points pool.
+				Removes the point associated with the given [param id] from the points pool.
 			</description>
 		</method>
 		<method name="reserve_space">
 			<return type="void" />
-			<argument index="0" name="num_nodes" type="int" />
+			<param index="0" name="num_nodes" type="int" />
 			<description>
-				Reserves space internally for [code]num_nodes[/code] points, useful if you're adding a known large number of points at once, for a grid for instance. New capacity must be greater or equals to old capacity.
+				Reserves space internally for [param num_nodes] points, useful if you're adding a known large number of points at once, for a grid for instance. New capacity must be greater or equals to old capacity.
 			</description>
 		</method>
 		<method name="set_point_disabled">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="disabled" type="bool" default="true" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="disabled" type="bool" default="true" />
 			<description>
 				Disables or enables the specified point for pathfinding. Useful for making a temporary obstacle.
 			</description>
 		</method>
 		<method name="set_point_position">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="position" type="Vector2" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="position" type="Vector2" />
 			<description>
-				Sets the [code]position[/code] for the point with the given [code]id[/code].
+				Sets the [param position] for the point with the given [param id].
 			</description>
 		</method>
 		<method name="set_point_weight_scale">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="weight_scale" type="float" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="weight_scale" type="float" />
 			<description>
-				Sets the [code]weight_scale[/code] for the point with the given [code]id[/code]. The [code]weight_scale[/code] is multiplied by the result of [method _compute_cost] when determining the overall cost of traveling across a segment from a neighboring point to this point.
+				Sets the [param weight_scale] for the point with the given [param id]. The [param weight_scale] is multiplied by the result of [method _compute_cost] when determining the overall cost of traveling across a segment from a neighboring point to this point.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/AStar3D.xml b/doc/classes/AStar3D.xml
index ea4e49c173..efce94e25d 100644
--- a/doc/classes/AStar3D.xml
+++ b/doc/classes/AStar3D.xml
@@ -40,8 +40,8 @@
 	<methods>
 		<method name="_compute_cost" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="from_id" type="int" />
-			<argument index="1" name="to_id" type="int" />
+			<param index="0" name="from_id" type="int" />
+			<param index="1" name="to_id" type="int" />
 			<description>
 				Called when computing the cost between two connected points.
 				Note that this function is hidden in the default [code]AStar3D[/code] class.
@@ -49,8 +49,8 @@
 		</method>
 		<method name="_estimate_cost" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="from_id" type="int" />
-			<argument index="1" name="to_id" type="int" />
+			<param index="0" name="from_id" type="int" />
+			<param index="1" name="to_id" type="int" />
 			<description>
 				Called when estimating the cost between a point and the path's ending point.
 				Note that this function is hidden in the default [code]AStar3D[/code] class.
@@ -58,12 +58,12 @@
 		</method>
 		<method name="add_point">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="position" type="Vector3" />
-			<argument index="2" name="weight_scale" type="float" default="1.0" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="position" type="Vector3" />
+			<param index="2" name="weight_scale" type="float" default="1.0" />
 			<description>
-				Adds a new point at the given position with the given identifier. The [code]id[/code] must be 0 or larger, and the [code]weight_scale[/code] must be 0.0 or greater.
-				The [code]weight_scale[/code] is multiplied by the result of [method _compute_cost] when determining the overall cost of traveling across a segment from a neighboring point to this point. Thus, all else being equal, the algorithm prefers points with lower [code]weight_scale[/code]s to form a path.
+				Adds a new point at the given position with the given identifier. The [param id] must be 0 or larger, and the [param weight_scale] must be 0.0 or greater.
+				The [param weight_scale] is multiplied by the result of [method _compute_cost] when determining the overall cost of traveling across a segment from a neighboring point to this point. Thus, all else being equal, the algorithm prefers points with lower [param weight_scale]s to form a path.
 				[codeblocks]
 				[gdscript]
 				var astar = AStar3D.new()
@@ -74,16 +74,16 @@
 				astar.AddPoint(1, new Vector3(1, 0, 0), 4); // Adds the point (1, 0, 0) with weight_scale 4 and id 1
 				[/csharp]
 				[/codeblocks]
-				If there already exists a point for the given [code]id[/code], its position and weight scale are updated to the given values.
+				If there already exists a point for the given [param id], its position and weight scale are updated to the given values.
 			</description>
 		</method>
 		<method name="are_points_connected" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="to_id" type="int" />
-			<argument index="2" name="bidirectional" type="bool" default="true" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="to_id" type="int" />
+			<param index="2" name="bidirectional" type="bool" default="true" />
 			<description>
-				Returns whether the two given points are directly connected by a segment. If [code]bidirectional[/code] is [code]false[/code], returns whether movement from [code]id[/code] to [code]to_id[/code] is possible through this segment.
+				Returns whether the two given points are directly connected by a segment. If [param bidirectional] is [code]false[/code], returns whether movement from [param id] to [param to_id] is possible through this segment.
 			</description>
 		</method>
 		<method name="clear">
@@ -94,11 +94,11 @@
 		</method>
 		<method name="connect_points">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="to_id" type="int" />
-			<argument index="2" name="bidirectional" type="bool" default="true" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="to_id" type="int" />
+			<param index="2" name="bidirectional" type="bool" default="true" />
 			<description>
-				Creates a segment between the given points. If [code]bidirectional[/code] is [code]false[/code], only movement from [code]id[/code] to [code]to_id[/code] is allowed, not the reverse direction.
+				Creates a segment between the given points. If [param bidirectional] is [code]false[/code], only movement from [param id] to [param to_id] is allowed, not the reverse direction.
 				[codeblocks]
 				[gdscript]
 				var astar = AStar3D.new()
@@ -117,11 +117,11 @@
 		</method>
 		<method name="disconnect_points">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="to_id" type="int" />
-			<argument index="2" name="bidirectional" type="bool" default="true" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="to_id" type="int" />
+			<param index="2" name="bidirectional" type="bool" default="true" />
 			<description>
-				Deletes the segment between the given points. If [code]bidirectional[/code] is [code]false[/code], only movement from [code]id[/code] to [code]to_id[/code] is prevented, and a unidirectional segment possibly remains.
+				Deletes the segment between the given points. If [param bidirectional] is [code]false[/code], only movement from [param id] to [param to_id] is prevented, and a unidirectional segment possibly remains.
 			</description>
 		</method>
 		<method name="get_available_point_id" qualifiers="const">
@@ -132,18 +132,18 @@
 		</method>
 		<method name="get_closest_point" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="to_position" type="Vector3" />
-			<argument index="1" name="include_disabled" type="bool" default="false" />
+			<param index="0" name="to_position" type="Vector3" />
+			<param index="1" name="include_disabled" type="bool" default="false" />
 			<description>
-				Returns the ID of the closest point to [code]to_position[/code], optionally taking disabled points into account. Returns [code]-1[/code] if there are no points in the points pool.
-				[b]Note:[/b] If several points are the closest to [code]to_position[/code], the one with the smallest ID will be returned, ensuring a deterministic result.
+				Returns the ID of the closest point to [param to_position], optionally taking disabled points into account. Returns [code]-1[/code] if there are no points in the points pool.
+				[b]Note:[/b] If several points are the closest to [param to_position], the one with the smallest ID will be returned, ensuring a deterministic result.
 			</description>
 		</method>
 		<method name="get_closest_position_in_segment" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="to_position" type="Vector3" />
+			<param index="0" name="to_position" type="Vector3" />
 			<description>
-				Returns the closest position to [code]to_position[/code] that resides inside a segment between two connected points.
+				Returns the closest position to [param to_position] that resides inside a segment between two connected points.
 				[codeblocks]
 				[gdscript]
 				var astar = AStar3D.new()
@@ -165,8 +165,8 @@
 		</method>
 		<method name="get_id_path">
 			<return type="PackedInt64Array" />
-			<argument index="0" name="from_id" type="int" />
-			<argument index="1" name="to_id" type="int" />
+			<param index="0" name="from_id" type="int" />
+			<param index="1" name="to_id" type="int" />
 			<description>
 				Returns an array with the IDs of the points that form the path found by AStar3D between the given points. The array is ordered from the starting point to the ending point of the path.
 				[codeblocks]
@@ -208,7 +208,7 @@
 		</method>
 		<method name="get_point_connections">
 			<return type="PackedInt64Array" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns an array with the IDs of the points that form the connection with the given point.
 				[codeblocks]
@@ -252,8 +252,8 @@
 		</method>
 		<method name="get_point_path">
 			<return type="PackedVector3Array" />
-			<argument index="0" name="from_id" type="int" />
-			<argument index="1" name="to_id" type="int" />
+			<param index="0" name="from_id" type="int" />
+			<param index="1" name="to_id" type="int" />
 			<description>
 				Returns an array with the points that are in the path found by AStar3D between the given points. The array is ordered from the starting point to the ending point of the path.
 				[b]Note:[/b] This method is not thread-safe. If called from a [Thread], it will return an empty [PackedVector3Array] and will print an error message.
@@ -261,68 +261,68 @@
 		</method>
 		<method name="get_point_position" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
-				Returns the position of the point associated with the given [code]id[/code].
+				Returns the position of the point associated with the given [param id].
 			</description>
 		</method>
 		<method name="get_point_weight_scale" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
-				Returns the weight scale of the point associated with the given [code]id[/code].
+				Returns the weight scale of the point associated with the given [param id].
 			</description>
 		</method>
 		<method name="has_point" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
-				Returns whether a point associated with the given [code]id[/code] exists.
+				Returns whether a point associated with the given [param id] exists.
 			</description>
 		</method>
 		<method name="is_point_disabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns whether a point is disabled or not for pathfinding. By default, all points are enabled.
 			</description>
 		</method>
 		<method name="remove_point">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
-				Removes the point associated with the given [code]id[/code] from the points pool.
+				Removes the point associated with the given [param id] from the points pool.
 			</description>
 		</method>
 		<method name="reserve_space">
 			<return type="void" />
-			<argument index="0" name="num_nodes" type="int" />
+			<param index="0" name="num_nodes" type="int" />
 			<description>
-				Reserves space internally for [code]num_nodes[/code] points, useful if you're adding a known large number of points at once, for a grid for instance. New capacity must be greater or equals to old capacity.
+				Reserves space internally for [param num_nodes] points, useful if you're adding a known large number of points at once, for a grid for instance. New capacity must be greater or equals to old capacity.
 			</description>
 		</method>
 		<method name="set_point_disabled">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="disabled" type="bool" default="true" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="disabled" type="bool" default="true" />
 			<description>
 				Disables or enables the specified point for pathfinding. Useful for making a temporary obstacle.
 			</description>
 		</method>
 		<method name="set_point_position">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="position" type="Vector3" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="position" type="Vector3" />
 			<description>
-				Sets the [code]position[/code] for the point with the given [code]id[/code].
+				Sets the [param position] for the point with the given [param id].
 			</description>
 		</method>
 		<method name="set_point_weight_scale">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="weight_scale" type="float" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="weight_scale" type="float" />
 			<description>
-				Sets the [code]weight_scale[/code] for the point with the given [code]id[/code]. The [code]weight_scale[/code] is multiplied by the result of [method _compute_cost] when determining the overall cost of traveling across a segment from a neighboring point to this point.
+				Sets the [param weight_scale] for the point with the given [param id]. The [param weight_scale] is multiplied by the result of [method _compute_cost] when determining the overall cost of traveling across a segment from a neighboring point to this point.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/AcceptDialog.xml b/doc/classes/AcceptDialog.xml
index 0009c82548..c83ea8c60a 100644
--- a/doc/classes/AcceptDialog.xml
+++ b/doc/classes/AcceptDialog.xml
@@ -11,20 +11,20 @@
 	<methods>
 		<method name="add_button">
 			<return type="Button" />
-			<argument index="0" name="text" type="String" />
-			<argument index="1" name="right" type="bool" default="false" />
-			<argument index="2" name="action" type="String" default="&quot;&quot;" />
+			<param index="0" name="text" type="String" />
+			<param index="1" name="right" type="bool" default="false" />
+			<param index="2" name="action" type="String" default="&quot;&quot;" />
 			<description>
-				Adds a button with label [code]text[/code] and a custom [code]action[/code] to the dialog and returns the created button. [code]action[/code] will be passed to the [signal custom_action] signal when pressed.
-				If [code]true[/code], [code]right[/code] will place the button to the right of any sibling buttons.
+				Adds a button with label [param text] and a custom [param action] to the dialog and returns the created button. [param action] will be passed to the [signal custom_action] signal when pressed.
+				If [code]true[/code], [param right] will place the button to the right of any sibling buttons.
 				You can use [method remove_button] method to remove a button created with this method from the dialog.
 			</description>
 		</method>
 		<method name="add_cancel_button">
 			<return type="Button" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
-				Adds a button with label [code]name[/code] and a cancel action to the dialog and returns the created button.
+				Adds a button with label [param name] and a cancel action to the dialog and returns the created button.
 				You can use [method remove_button] method to remove a button created with this method from the dialog.
 			</description>
 		</method>
@@ -44,16 +44,16 @@
 		</method>
 		<method name="register_text_enter">
 			<return type="void" />
-			<argument index="0" name="line_edit" type="Control" />
+			<param index="0" name="line_edit" type="Control" />
 			<description>
 				Registers a [LineEdit] in the dialog. When the enter key is pressed, the dialog will be accepted.
 			</description>
 		</method>
 		<method name="remove_button">
 			<return type="void" />
-			<argument index="0" name="button" type="Control" />
+			<param index="0" name="button" type="Control" />
 			<description>
-				Removes the [code]button[/code] from the dialog. Does NOT free the [code]button[/code]. The [code]button[/code] must be a [Button] added with [method add_button] or [method add_cancel_button] method. After removal, pressing the [code]button[/code] will no longer emit this dialog's [signal custom_action] or [signal cancelled] signals.
+				Removes the [param button] from the dialog. Does NOT free the [param button]. The [param button] must be a [Button] added with [method add_button] or [method add_cancel_button] method. After removal, pressing the [param button] will no longer emit this dialog's [signal custom_action] or [signal cancelled] signals.
 			</description>
 		</method>
 	</methods>
@@ -92,7 +92,7 @@
 			</description>
 		</signal>
 		<signal name="custom_action">
-			<argument index="0" name="action" type="StringName" />
+			<param index="0" name="action" type="StringName" />
 			<description>
 				Emitted when a custom button is pressed. See [method add_button].
 			</description>
diff --git a/doc/classes/AnimatedSprite2D.xml b/doc/classes/AnimatedSprite2D.xml
index 638d142791..b207eda27f 100644
--- a/doc/classes/AnimatedSprite2D.xml
+++ b/doc/classes/AnimatedSprite2D.xml
@@ -14,10 +14,10 @@
 	<methods>
 		<method name="play">
 			<return type="void" />
-			<argument index="0" name="anim" type="StringName" default="&amp;&quot;&quot;" />
-			<argument index="1" name="backwards" type="bool" default="false" />
+			<param index="0" name="anim" type="StringName" default="&amp;&quot;&quot;" />
+			<param index="1" name="backwards" type="bool" default="false" />
 			<description>
-				Plays the animation named [code]anim[/code]. If no [code]anim[/code] is provided, the current animation is played. If [code]backwards[/code] is [code]true[/code], the animation will be played in reverse.
+				Plays the animation named [param anim]. If no [param anim] is provided, the current animation is played. If [code]backwards[/code] is [code]true[/code], the animation will be played in reverse.
 			</description>
 		</method>
 		<method name="stop">
diff --git a/doc/classes/AnimatedSprite3D.xml b/doc/classes/AnimatedSprite3D.xml
index 30ea2249a3..68354f092c 100644
--- a/doc/classes/AnimatedSprite3D.xml
+++ b/doc/classes/AnimatedSprite3D.xml
@@ -18,9 +18,9 @@
 		</method>
 		<method name="play">
 			<return type="void" />
-			<argument index="0" name="anim" type="StringName" default="&amp;&quot;&quot;" />
+			<param index="0" name="anim" type="StringName" default="&amp;&quot;&quot;" />
 			<description>
-				Plays the animation named [code]anim[/code]. If no [code]anim[/code] is provided, the current animation is played.
+				Plays the animation named [param anim]. If no [param anim] is provided, the current animation is played.
 			</description>
 		</method>
 		<method name="stop">
diff --git a/doc/classes/AnimatedTexture.xml b/doc/classes/AnimatedTexture.xml
index c322db9c37..5ad4c4e10a 100644
--- a/doc/classes/AnimatedTexture.xml
+++ b/doc/classes/AnimatedTexture.xml
@@ -14,22 +14,22 @@
 	<methods>
 		<method name="get_frame_delay" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="frame" type="int" />
+			<param index="0" name="frame" type="int" />
 			<description>
 				Returns the given frame's delay value.
 			</description>
 		</method>
 		<method name="get_frame_texture" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="frame" type="int" />
+			<param index="0" name="frame" type="int" />
 			<description>
 				Returns the given frame's [Texture2D].
 			</description>
 		</method>
 		<method name="set_frame_delay">
 			<return type="void" />
-			<argument index="0" name="frame" type="int" />
-			<argument index="1" name="delay" type="float" />
+			<param index="0" name="frame" type="int" />
+			<param index="1" name="delay" type="float" />
 			<description>
 				Sets an additional delay (in seconds) between this frame and the next one, that will be added to the time interval defined by [member fps]. By default, frames have no delay defined. If a delay value is defined, the final time interval between this frame and the next will be [code]1.0 / fps + delay[/code].
 				For example, for an animation with 3 frames, 2 FPS and a frame delay on the second frame of 1.2, the resulting playback will be:
@@ -43,8 +43,8 @@
 		</method>
 		<method name="set_frame_texture">
 			<return type="void" />
-			<argument index="0" name="frame" type="int" />
-			<argument index="1" name="texture" type="Texture2D" />
+			<param index="0" name="frame" type="int" />
+			<param index="1" name="texture" type="Texture2D" />
 			<description>
 				Assigns a [Texture2D] to the given frame. Frame IDs start at 0, so the first frame has ID 0, and the last frame of the animation has ID [member frames] - 1.
 				You can define any number of textures up to [constant MAX_FRAMES], but keep in mind that only frames from 0 to [member frames] - 1 will be part of the animation.
diff --git a/doc/classes/Animation.xml b/doc/classes/Animation.xml
index f40f11944d..859b4a8a5f 100644
--- a/doc/classes/Animation.xml
+++ b/doc/classes/Animation.xml
@@ -33,200 +33,200 @@
 	<methods>
 		<method name="add_track">
 			<return type="int" />
-			<argument index="0" name="type" type="int" enum="Animation.TrackType" />
-			<argument index="1" name="at_position" type="int" default="-1" />
+			<param index="0" name="type" type="int" enum="Animation.TrackType" />
+			<param index="1" name="at_position" type="int" default="-1" />
 			<description>
 				Adds a track to the Animation.
 			</description>
 		</method>
 		<method name="animation_track_get_key_animation" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
 			<description>
-				Returns the animation name at the key identified by [code]key_idx[/code]. The [code]track_idx[/code] must be the index of an Animation Track.
+				Returns the animation name at the key identified by [param key_idx]. The [param track_idx] must be the index of an Animation Track.
 			</description>
 		</method>
 		<method name="animation_track_insert_key">
 			<return type="int" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="time" type="float" />
-			<argument index="2" name="animation" type="StringName" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="time" type="float" />
+			<param index="2" name="animation" type="StringName" />
 			<description>
-				Inserts a key with value [code]animation[/code] at the given [code]time[/code] (in seconds). The [code]track_idx[/code] must be the index of an Animation Track.
+				Inserts a key with value [param animation] at the given [param time] (in seconds). The [param track_idx] must be the index of an Animation Track.
 			</description>
 		</method>
 		<method name="animation_track_set_key_animation">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
-			<argument index="2" name="animation" type="StringName" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
+			<param index="2" name="animation" type="StringName" />
 			<description>
-				Sets the key identified by [code]key_idx[/code] to value [code]animation[/code]. The [code]track_idx[/code] must be the index of an Animation Track.
+				Sets the key identified by [param key_idx] to value [param animation]. The [param track_idx] must be the index of an Animation Track.
 			</description>
 		</method>
 		<method name="audio_track_get_key_end_offset" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
 			<description>
-				Returns the end offset of the key identified by [code]key_idx[/code]. The [code]track_idx[/code] must be the index of an Audio Track.
+				Returns the end offset of the key identified by [param key_idx]. The [param track_idx] must be the index of an Audio Track.
 				End offset is the number of seconds cut off at the ending of the audio stream.
 			</description>
 		</method>
 		<method name="audio_track_get_key_start_offset" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
 			<description>
-				Returns the start offset of the key identified by [code]key_idx[/code]. The [code]track_idx[/code] must be the index of an Audio Track.
+				Returns the start offset of the key identified by [param key_idx]. The [param track_idx] must be the index of an Audio Track.
 				Start offset is the number of seconds cut off at the beginning of the audio stream.
 			</description>
 		</method>
 		<method name="audio_track_get_key_stream" qualifiers="const">
 			<return type="Resource" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
 			<description>
-				Returns the audio stream of the key identified by [code]key_idx[/code]. The [code]track_idx[/code] must be the index of an Audio Track.
+				Returns the audio stream of the key identified by [param key_idx]. The [param track_idx] must be the index of an Audio Track.
 			</description>
 		</method>
 		<method name="audio_track_insert_key">
 			<return type="int" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="time" type="float" />
-			<argument index="2" name="stream" type="Resource" />
-			<argument index="3" name="start_offset" type="float" default="0" />
-			<argument index="4" name="end_offset" type="float" default="0" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="time" type="float" />
+			<param index="2" name="stream" type="Resource" />
+			<param index="3" name="start_offset" type="float" default="0" />
+			<param index="4" name="end_offset" type="float" default="0" />
 			<description>
-				Inserts an Audio Track key at the given [code]time[/code] in seconds. The [code]track_idx[/code] must be the index of an Audio Track.
-				[code]stream[/code] is the [AudioStream] resource to play. [code]start_offset[/code] is the number of seconds cut off at the beginning of the audio stream, while [code]end_offset[/code] is at the ending.
+				Inserts an Audio Track key at the given [param time] in seconds. The [param track_idx] must be the index of an Audio Track.
+				[param stream] is the [AudioStream] resource to play. [param start_offset] is the number of seconds cut off at the beginning of the audio stream, while [param end_offset] is at the ending.
 			</description>
 		</method>
 		<method name="audio_track_set_key_end_offset">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
-			<argument index="2" name="offset" type="float" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
+			<param index="2" name="offset" type="float" />
 			<description>
-				Sets the end offset of the key identified by [code]key_idx[/code] to value [code]offset[/code]. The [code]track_idx[/code] must be the index of an Audio Track.
+				Sets the end offset of the key identified by [param key_idx] to value [param offset]. The [param track_idx] must be the index of an Audio Track.
 			</description>
 		</method>
 		<method name="audio_track_set_key_start_offset">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
-			<argument index="2" name="offset" type="float" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
+			<param index="2" name="offset" type="float" />
 			<description>
-				Sets the start offset of the key identified by [code]key_idx[/code] to value [code]offset[/code]. The [code]track_idx[/code] must be the index of an Audio Track.
+				Sets the start offset of the key identified by [param key_idx] to value [param offset]. The [param track_idx] must be the index of an Audio Track.
 			</description>
 		</method>
 		<method name="audio_track_set_key_stream">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
-			<argument index="2" name="stream" type="Resource" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
+			<param index="2" name="stream" type="Resource" />
 			<description>
-				Sets the stream of the key identified by [code]key_idx[/code] to value [code]stream[/code]. The [code]track_idx[/code] must be the index of an Audio Track.
+				Sets the stream of the key identified by [param key_idx] to value [param stream]. The [param track_idx] must be the index of an Audio Track.
 			</description>
 		</method>
 		<method name="bezier_track_get_key_handle_mode" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
 			<description>
-				Returns the handle mode of the key identified by [code]index[/code]. See [enum HandleMode] for possible values. The [code]track_idx[/code] must be the index of a Bezier Track.
+				Returns the handle mode of the key identified by [param key_idx]. See [enum HandleMode] for possible values. The [param track_idx] must be the index of a Bezier Track.
 			</description>
 		</method>
 		<method name="bezier_track_get_key_in_handle" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
 			<description>
-				Returns the in handle of the key identified by [code]key_idx[/code]. The [code]track_idx[/code] must be the index of a Bezier Track.
+				Returns the in handle of the key identified by [param key_idx]. The [param track_idx] must be the index of a Bezier Track.
 			</description>
 		</method>
 		<method name="bezier_track_get_key_out_handle" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
 			<description>
-				Returns the out handle of the key identified by [code]key_idx[/code]. The [code]track_idx[/code] must be the index of a Bezier Track.
+				Returns the out handle of the key identified by [param key_idx]. The [param track_idx] must be the index of a Bezier Track.
 			</description>
 		</method>
 		<method name="bezier_track_get_key_value" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
 			<description>
-				Returns the value of the key identified by [code]key_idx[/code]. The [code]track_idx[/code] must be the index of a Bezier Track.
+				Returns the value of the key identified by [param key_idx]. The [param track_idx] must be the index of a Bezier Track.
 			</description>
 		</method>
 		<method name="bezier_track_insert_key">
 			<return type="int" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="time" type="float" />
-			<argument index="2" name="value" type="float" />
-			<argument index="3" name="in_handle" type="Vector2" default="Vector2(0, 0)" />
-			<argument index="4" name="out_handle" type="Vector2" default="Vector2(0, 0)" />
-			<argument index="5" name="handle_mode" type="int" enum="Animation.HandleMode" default="1" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="time" type="float" />
+			<param index="2" name="value" type="float" />
+			<param index="3" name="in_handle" type="Vector2" default="Vector2(0, 0)" />
+			<param index="4" name="out_handle" type="Vector2" default="Vector2(0, 0)" />
+			<param index="5" name="handle_mode" type="int" enum="Animation.HandleMode" default="1" />
 			<description>
-				Inserts a Bezier Track key at the given [code]time[/code] in seconds. The [code]track_idx[/code] must be the index of a Bezier Track.
-				[code]in_handle[/code] is the left-side weight of the added Bezier curve point, [code]out_handle[/code] is the right-side one, while [code]value[/code] is the actual value at this point.
+				Inserts a Bezier Track key at the given [param time] in seconds. The [param track_idx] must be the index of a Bezier Track.
+				[param in_handle] is the left-side weight of the added Bezier curve point, [param out_handle] is the right-side one, while [param value] is the actual value at this point.
 			</description>
 		</method>
 		<method name="bezier_track_interpolate" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="time" type="float" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="time" type="float" />
 			<description>
-				Returns the interpolated value at the given [code]time[/code] (in seconds). The [code]track_idx[/code] must be the index of a Bezier Track.
+				Returns the interpolated value at the given [param time] (in seconds). The [param track_idx] must be the index of a Bezier Track.
 			</description>
 		</method>
 		<method name="bezier_track_set_key_handle_mode">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
-			<argument index="2" name="key_handle_mode" type="int" enum="Animation.HandleMode" />
-			<argument index="3" name="balanced_value_time_ratio" type="float" default="1.0" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
+			<param index="2" name="key_handle_mode" type="int" enum="Animation.HandleMode" />
+			<param index="3" name="balanced_value_time_ratio" type="float" default="1.0" />
 			<description>
-				Changes the handle mode of the keyframe at the given [code]index[/code]. See [enum HandleMode] for possible values. The [code]track_idx[/code] must be the index of a Bezier Track.
+				Changes the handle mode of the keyframe at the given [param key_idx]. See [enum HandleMode] for possible values. The [param track_idx] must be the index of a Bezier Track.
 			</description>
 		</method>
 		<method name="bezier_track_set_key_in_handle">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
-			<argument index="2" name="in_handle" type="Vector2" />
-			<argument index="3" name="balanced_value_time_ratio" type="float" default="1.0" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
+			<param index="2" name="in_handle" type="Vector2" />
+			<param index="3" name="balanced_value_time_ratio" type="float" default="1.0" />
 			<description>
-				Sets the in handle of the key identified by [code]key_idx[/code] to value [code]in_handle[/code]. The [code]track_idx[/code] must be the index of a Bezier Track.
+				Sets the in handle of the key identified by [param key_idx] to value [param in_handle]. The [param track_idx] must be the index of a Bezier Track.
 			</description>
 		</method>
 		<method name="bezier_track_set_key_out_handle">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
-			<argument index="2" name="out_handle" type="Vector2" />
-			<argument index="3" name="balanced_value_time_ratio" type="float" default="1.0" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
+			<param index="2" name="out_handle" type="Vector2" />
+			<param index="3" name="balanced_value_time_ratio" type="float" default="1.0" />
 			<description>
-				Sets the out handle of the key identified by [code]key_idx[/code] to value [code]out_handle[/code]. The [code]track_idx[/code] must be the index of a Bezier Track.
+				Sets the out handle of the key identified by [param key_idx] to value [param out_handle]. The [param track_idx] must be the index of a Bezier Track.
 			</description>
 		</method>
 		<method name="bezier_track_set_key_value">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
-			<argument index="2" name="value" type="float" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
+			<param index="2" name="value" type="float" />
 			<description>
-				Sets the value of the key identified by [code]key_idx[/code] to the given value. The [code]track_idx[/code] must be the index of a Bezier Track.
+				Sets the value of the key identified by [param key_idx] to the given value. The [param track_idx] must be the index of a Bezier Track.
 			</description>
 		</method>
 		<method name="blend_shape_track_insert_key">
 			<return type="int" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="time" type="float" />
-			<argument index="2" name="amount" type="float" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="time" type="float" />
+			<param index="2" name="amount" type="float" />
 			<description>
 			</description>
 		</method>
@@ -238,24 +238,24 @@
 		</method>
 		<method name="compress">
 			<return type="void" />
-			<argument index="0" name="page_size" type="int" default="8192" />
-			<argument index="1" name="fps" type="int" default="120" />
-			<argument index="2" name="split_tolerance" type="float" default="4.0" />
+			<param index="0" name="page_size" type="int" default="8192" />
+			<param index="1" name="fps" type="int" default="120" />
+			<param index="2" name="split_tolerance" type="float" default="4.0" />
 			<description>
 			</description>
 		</method>
 		<method name="copy_track">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="to_animation" type="Animation" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="to_animation" type="Animation" />
 			<description>
-				Adds a new track that is a copy of the given track from [code]to_animation[/code].
+				Adds a new track that is a copy of the given track from [param to_animation].
 			</description>
 		</method>
 		<method name="find_track" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="path" type="NodePath" />
-			<argument index="1" name="type" type="int" enum="Animation.TrackType" />
+			<param index="0" name="path" type="NodePath" />
+			<param index="1" name="type" type="int" enum="Animation.TrackType" />
 			<description>
 				Returns the index of the specified track. If the track is not found, return -1.
 			</description>
@@ -268,259 +268,259 @@
 		</method>
 		<method name="method_track_get_key_indices" qualifiers="const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="time_sec" type="float" />
-			<argument index="2" name="delta" type="float" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="time_sec" type="float" />
+			<param index="2" name="delta" type="float" />
 			<description>
 				Returns all the key indices of a method track, given a position and delta time.
 			</description>
 		</method>
 		<method name="method_track_get_name" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
 			<description>
 				Returns the method name of a method track.
 			</description>
 		</method>
 		<method name="method_track_get_params" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
 			<description>
 				Returns the arguments values to be called on a method track for a given key in a given track.
 			</description>
 		</method>
 		<method name="position_track_insert_key">
 			<return type="int" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="time" type="float" />
-			<argument index="2" name="position" type="Vector3" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="time" type="float" />
+			<param index="2" name="position" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_track">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
 			<description>
 				Removes a track by specifying the track index.
 			</description>
 		</method>
 		<method name="rotation_track_insert_key">
 			<return type="int" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="time" type="float" />
-			<argument index="2" name="rotation" type="Quaternion" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="time" type="float" />
+			<param index="2" name="rotation" type="Quaternion" />
 			<description>
 			</description>
 		</method>
 		<method name="scale_track_insert_key">
 			<return type="int" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="time" type="float" />
-			<argument index="2" name="scale" type="Vector3" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="time" type="float" />
+			<param index="2" name="scale" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="track_find_key" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="time" type="float" />
-			<argument index="2" name="exact" type="bool" default="false" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="time" type="float" />
+			<param index="2" name="exact" type="bool" default="false" />
 			<description>
 				Finds the key index by time in a given track. Optionally, only find it if the exact time is given.
 			</description>
 		</method>
 		<method name="track_get_interpolation_loop_wrap" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="track_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
 			<description>
-				Returns [code]true[/code] if the track at [code]idx[/code] wraps the interpolation loop. New tracks wrap the interpolation loop by default.
+				Returns [code]true[/code] if the track at [param track_idx] wraps the interpolation loop. New tracks wrap the interpolation loop by default.
 			</description>
 		</method>
 		<method name="track_get_interpolation_type" qualifiers="const">
 			<return type="int" enum="Animation.InterpolationType" />
-			<argument index="0" name="track_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
 			<description>
 				Returns the interpolation type of a given track.
 			</description>
 		</method>
 		<method name="track_get_key_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="track_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
 			<description>
-				Returns the amount of keys in a given track.
+				Returns the number of keys in a given track.
 			</description>
 		</method>
 		<method name="track_get_key_time" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
 			<description>
 				Returns the time at which the key is located.
 			</description>
 		</method>
 		<method name="track_get_key_transition" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
 			<description>
 				Returns the transition curve (easing) for a specific key (see the built-in math function [method @GlobalScope.ease]).
 			</description>
 		</method>
 		<method name="track_get_key_value" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
 			<description>
 				Returns the value of a given key in a given track.
 			</description>
 		</method>
 		<method name="track_get_path" qualifiers="const">
 			<return type="NodePath" />
-			<argument index="0" name="track_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
 			<description>
 				Gets the path of a track. For more information on the path format, see [method track_set_path].
 			</description>
 		</method>
 		<method name="track_get_type" qualifiers="const">
 			<return type="int" enum="Animation.TrackType" />
-			<argument index="0" name="track_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
 			<description>
 				Gets the type of a track.
 			</description>
 		</method>
 		<method name="track_insert_key">
 			<return type="int" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="time" type="float" />
-			<argument index="2" name="key" type="Variant" />
-			<argument index="3" name="transition" type="float" default="1" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="time" type="float" />
+			<param index="2" name="key" type="Variant" />
+			<param index="3" name="transition" type="float" default="1" />
 			<description>
 				Inserts a generic key in a given track. Returns the key index.
 			</description>
 		</method>
 		<method name="track_is_compressed" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="track_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="track_is_enabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="track_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
 			<description>
-				Returns [code]true[/code] if the track at index [code]idx[/code] is enabled.
+				Returns [code]true[/code] if the track at index [param track_idx] is enabled.
 			</description>
 		</method>
 		<method name="track_is_imported" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="track_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
 			<description>
 				Returns [code]true[/code] if the given track is imported. Else, return [code]false[/code].
 			</description>
 		</method>
 		<method name="track_move_down">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
 			<description>
 				Moves a track down.
 			</description>
 		</method>
 		<method name="track_move_to">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="to_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="to_idx" type="int" />
 			<description>
-				Changes the index position of track [code]idx[/code] to the one defined in [code]to_idx[/code].
+				Changes the index position of track [param track_idx] to the one defined in [param to_idx].
 			</description>
 		</method>
 		<method name="track_move_up">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
 			<description>
 				Moves a track up.
 			</description>
 		</method>
 		<method name="track_remove_key">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
 			<description>
 				Removes a key by index in a given track.
 			</description>
 		</method>
 		<method name="track_remove_key_at_time">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="time" type="float" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="time" type="float" />
 			<description>
-				Removes a key at [code]time[/code] in a given track.
+				Removes a key at [param time] in a given track.
 			</description>
 		</method>
 		<method name="track_set_enabled">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				Enables/disables the given track. Tracks are enabled by default.
 			</description>
 		</method>
 		<method name="track_set_imported">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="imported" type="bool" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="imported" type="bool" />
 			<description>
 				Sets the given track as imported or not.
 			</description>
 		</method>
 		<method name="track_set_interpolation_loop_wrap">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="interpolation" type="bool" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="interpolation" type="bool" />
 			<description>
-				If [code]true[/code], the track at [code]idx[/code] wraps the interpolation loop.
+				If [code]true[/code], the track at [param track_idx] wraps the interpolation loop.
 			</description>
 		</method>
 		<method name="track_set_interpolation_type">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="interpolation" type="int" enum="Animation.InterpolationType" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="interpolation" type="int" enum="Animation.InterpolationType" />
 			<description>
 				Sets the interpolation type of a given track.
 			</description>
 		</method>
 		<method name="track_set_key_time">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
-			<argument index="2" name="time" type="float" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
+			<param index="2" name="time" type="float" />
 			<description>
 				Sets the time of an existing key.
 			</description>
 		</method>
 		<method name="track_set_key_transition">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key_idx" type="int" />
-			<argument index="2" name="transition" type="float" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key_idx" type="int" />
+			<param index="2" name="transition" type="float" />
 			<description>
 				Sets the transition curve (easing) for a specific key (see the built-in math function [method @GlobalScope.ease]).
 			</description>
 		</method>
 		<method name="track_set_key_value">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="key" type="int" />
-			<argument index="2" name="value" type="Variant" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="key" type="int" />
+			<param index="2" name="value" type="Variant" />
 			<description>
 				Sets the value of an existing key.
 			</description>
 		</method>
 		<method name="track_set_path">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="path" type="NodePath" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="path" type="NodePath" />
 			<description>
 				Sets the path of a track. Paths must be valid scene-tree paths to a node and must be specified starting from the parent node of the node that will reproduce the animation. Tracks that control properties or bones must append their name after the path, separated by [code]":"[/code].
 				For example, [code]"character/skeleton:ankle"[/code] or [code]"character/mesh:transform/local"[/code].
@@ -528,40 +528,40 @@
 		</method>
 		<method name="track_swap">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="with_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="with_idx" type="int" />
 			<description>
-				Swaps the track [code]idx[/code]'s index position with the track [code]with_idx[/code].
+				Swaps the track [param track_idx]'s index position with the track [param with_idx].
 			</description>
 		</method>
 		<method name="value_track_get_key_indices" qualifiers="const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="time_sec" type="float" />
-			<argument index="2" name="delta" type="float" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="time_sec" type="float" />
+			<param index="2" name="delta" type="float" />
 			<description>
 				Returns all the key indices of a value track, given a position and delta time.
 			</description>
 		</method>
 		<method name="value_track_get_update_mode" qualifiers="const">
 			<return type="int" enum="Animation.UpdateMode" />
-			<argument index="0" name="track_idx" type="int" />
+			<param index="0" name="track_idx" type="int" />
 			<description>
 				Returns the update mode of a value track.
 			</description>
 		</method>
 		<method name="value_track_interpolate" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="time_sec" type="float" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="time_sec" type="float" />
 			<description>
-				Returns the interpolated value at the given time (in seconds). The [code]track_idx[/code] must be the index of a value track.
+				Returns the interpolated value at the given time (in seconds). The [param track_idx] must be the index of a value track.
 			</description>
 		</method>
 		<method name="value_track_set_update_mode">
 			<return type="void" />
-			<argument index="0" name="track_idx" type="int" />
-			<argument index="1" name="mode" type="int" enum="Animation.UpdateMode" />
+			<param index="0" name="track_idx" type="int" />
+			<param index="1" name="mode" type="int" enum="Animation.UpdateMode" />
 			<description>
 				Sets the update mode (see [enum UpdateMode]) of a value track.
 			</description>
diff --git a/doc/classes/AnimationLibrary.xml b/doc/classes/AnimationLibrary.xml
index d856c65dfc..015d306b41 100644
--- a/doc/classes/AnimationLibrary.xml
+++ b/doc/classes/AnimationLibrary.xml
@@ -9,14 +9,14 @@
 	<methods>
 		<method name="add_animation">
 			<return type="int" enum="Error" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="animation" type="Animation" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="animation" type="Animation" />
 			<description>
 			</description>
 		</method>
 		<method name="get_animation" qualifiers="const">
 			<return type="Animation" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 			</description>
 		</method>
@@ -27,20 +27,20 @@
 		</method>
 		<method name="has_animation" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_animation">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 			</description>
 		</method>
 		<method name="rename_animation">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="newname" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="newname" type="StringName" />
 			<description>
 			</description>
 		</method>
@@ -51,18 +51,18 @@
 	</members>
 	<signals>
 		<signal name="animation_added">
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 			</description>
 		</signal>
 		<signal name="animation_removed">
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 			</description>
 		</signal>
 		<signal name="animation_renamed">
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="to_name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="to_name" type="StringName" />
 			<description>
 			</description>
 		</signal>
diff --git a/doc/classes/AnimationNode.xml b/doc/classes/AnimationNode.xml
index 189e30b5f2..b856b5f208 100644
--- a/doc/classes/AnimationNode.xml
+++ b/doc/classes/AnimationNode.xml
@@ -14,95 +14,95 @@
 		<method name="_get_caption" qualifiers="virtual const">
 			<return type="String" />
 			<description>
-				Gets the text caption for this node (used by some editors).
+				When inheriting from [AnimationRootNode], implement this virtual method to override the text caption for this node.
 			</description>
 		</method>
 		<method name="_get_child_by_name" qualifiers="virtual const">
 			<return type="AnimationNode" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Gets a child node by index (used by editors inheriting from [AnimationRootNode]).
+				When inheriting from [AnimationRootNode], implement this virtual method to return a child node by its [param name].
 			</description>
 		</method>
 		<method name="_get_child_nodes" qualifiers="virtual const">
 			<return type="Dictionary" />
 			<description>
-				Gets all children nodes in order as a [code]name: node[/code] dictionary. Only useful when inheriting [AnimationRootNode].
+				When inheriting from [AnimationRootNode], implement this virtual method to return all children nodes in order as a [code]name: node[/code] dictionary.
 			</description>
 		</method>
 		<method name="_get_parameter_default_value" qualifiers="virtual const">
 			<return type="Variant" />
-			<argument index="0" name="parameter" type="StringName" />
+			<param index="0" name="parameter" type="StringName" />
 			<description>
-				Gets the default value of a parameter. Parameters are custom local memory used for your nodes, given a resource can be reused in multiple trees.
+				When inheriting from [AnimationRootNode], implement this virtual method to return the default value of a [param parameter]. Parameters are custom local memory used for your nodes, given a resource can be reused in multiple trees.
 			</description>
 		</method>
 		<method name="_get_parameter_list" qualifiers="virtual const">
 			<return type="Array" />
 			<description>
-				Gets the property information for parameter. Parameters are custom local memory used for your nodes, given a resource can be reused in multiple trees. Format is similar to [method Object.get_property_list].
+				When inheriting from [AnimationRootNode], implement this virtual method to return a list of the properties on this node. Parameters are custom local memory used for your nodes, given a resource can be reused in multiple trees. Format is similar to [method Object.get_property_list].
 			</description>
 		</method>
 		<method name="_has_filter" qualifiers="virtual const">
 			<return type="bool" />
 			<description>
-				Returns whether you want the blend tree editor to display filter editing on this node.
+				When inheriting from [AnimationRootNode], implement this virtual method to return whether the blend tree editor should display filter editing on this node.
 			</description>
 		</method>
 		<method name="_process" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="time" type="float" />
-			<argument index="1" name="seek" type="bool" />
-			<argument index="2" name="seek_root" type="bool" />
+			<param index="0" name="time" type="float" />
+			<param index="1" name="seek" type="bool" />
+			<param index="2" name="seek_root" type="bool" />
 			<description>
-				User-defined callback called when a custom node is processed. The [code]time[/code] parameter is a relative delta, unless [code]seek[/code] is [code]true[/code], in which case it is absolute.
+				When inheriting from [AnimationRootNode], implement this virtual method to run some code when this node is processed. The [param time] parameter is a relative delta, unless [param seek] is [code]true[/code], in which case it is absolute.
 				Here, call the [method blend_input], [method blend_node] or [method blend_animation] functions. You can also use [method get_parameter] and [method set_parameter] to modify local memory.
 				This function should return the time left for the current animation to finish (if unsure, pass the value from the main blend being called).
 			</description>
 		</method>
 		<method name="add_input">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Adds an input to the node. This is only useful for nodes created for use in an [AnimationNodeBlendTree].
 			</description>
 		</method>
 		<method name="blend_animation">
 			<return type="void" />
-			<argument index="0" name="animation" type="StringName" />
-			<argument index="1" name="time" type="float" />
-			<argument index="2" name="delta" type="float" />
-			<argument index="3" name="seeked" type="bool" />
-			<argument index="4" name="seek_root" type="bool" />
-			<argument index="5" name="blend" type="float" />
-			<argument index="6" name="pingponged" type="int" default="0" />
+			<param index="0" name="animation" type="StringName" />
+			<param index="1" name="time" type="float" />
+			<param index="2" name="delta" type="float" />
+			<param index="3" name="seeked" type="bool" />
+			<param index="4" name="seek_root" type="bool" />
+			<param index="5" name="blend" type="float" />
+			<param index="6" name="pingponged" type="int" default="0" />
 			<description>
-				Blend an animation by [code]blend[/code] amount (name must be valid in the linked [AnimationPlayer]). A [code]time[/code] and [code]delta[/code] may be passed, as well as whether [code]seek[/code] happened.
+				Blend an animation by [param blend] amount (name must be valid in the linked [AnimationPlayer]). A [param time] and [param delta] may be passed, as well as whether [param seeked] happened.
 			</description>
 		</method>
 		<method name="blend_input">
 			<return type="float" />
-			<argument index="0" name="input_index" type="int" />
-			<argument index="1" name="time" type="float" />
-			<argument index="2" name="seek" type="bool" />
-			<argument index="3" name="seek_root" type="bool" />
-			<argument index="4" name="blend" type="float" />
-			<argument index="5" name="filter" type="int" enum="AnimationNode.FilterAction" default="0" />
-			<argument index="6" name="sync" type="bool" default="true" />
+			<param index="0" name="input_index" type="int" />
+			<param index="1" name="time" type="float" />
+			<param index="2" name="seek" type="bool" />
+			<param index="3" name="seek_root" type="bool" />
+			<param index="4" name="blend" type="float" />
+			<param index="5" name="filter" type="int" enum="AnimationNode.FilterAction" default="0" />
+			<param index="6" name="sync" type="bool" default="true" />
 			<description>
-				Blend an input. This is only useful for nodes created for an [AnimationNodeBlendTree]. The [code]time[/code] parameter is a relative delta, unless [code]seek[/code] is [code]true[/code], in which case it is absolute. A filter mode may be optionally passed (see [enum FilterAction] for options).
+				Blend an input. This is only useful for nodes created for an [AnimationNodeBlendTree]. The [param time] parameter is a relative delta, unless [param seek] is [code]true[/code], in which case it is absolute. A filter mode may be optionally passed (see [enum FilterAction] for options).
 			</description>
 		</method>
 		<method name="blend_node">
 			<return type="float" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="node" type="AnimationNode" />
-			<argument index="2" name="time" type="float" />
-			<argument index="3" name="seek" type="bool" />
-			<argument index="4" name="seek_root" type="bool" />
-			<argument index="5" name="blend" type="float" />
-			<argument index="6" name="filter" type="int" enum="AnimationNode.FilterAction" default="0" />
-			<argument index="7" name="sync" type="bool" default="true" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="node" type="AnimationNode" />
+			<param index="2" name="time" type="float" />
+			<param index="3" name="seek" type="bool" />
+			<param index="4" name="seek_root" type="bool" />
+			<param index="5" name="blend" type="float" />
+			<param index="6" name="filter" type="int" enum="AnimationNode.FilterAction" default="0" />
+			<param index="7" name="sync" type="bool" default="true" />
 			<description>
 				Blend another animation node (in case this node contains children animation nodes). This function is only useful if you inherit from [AnimationRootNode] instead, else editors will not display your node for addition.
 			</description>
@@ -115,44 +115,44 @@
 		</method>
 		<method name="get_input_name">
 			<return type="String" />
-			<argument index="0" name="input" type="int" />
+			<param index="0" name="input" type="int" />
 			<description>
 				Gets the name of an input by index.
 			</description>
 		</method>
 		<method name="get_parameter" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Gets the value of a parameter. Parameters are custom local memory used for your nodes, given a resource can be reused in multiple trees.
 			</description>
 		</method>
 		<method name="is_path_filtered" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="path" type="NodePath" />
+			<param index="0" name="path" type="NodePath" />
 			<description>
 				Returns whether the given path is filtered.
 			</description>
 		</method>
 		<method name="remove_input">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Removes an input, call this only when inactive.
 			</description>
 		</method>
 		<method name="set_filter_path">
 			<return type="void" />
-			<argument index="0" name="path" type="NodePath" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="path" type="NodePath" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				Adds or removes a path for the filter.
 			</description>
 		</method>
 		<method name="set_parameter">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="value" type="Variant" />
 			<description>
 				Sets a custom parameter. These are used as local memory, because resources can be reused across the tree or scenes.
 			</description>
diff --git a/doc/classes/AnimationNodeBlendSpace1D.xml b/doc/classes/AnimationNodeBlendSpace1D.xml
index 7bb136308d..0f1ce127cd 100644
--- a/doc/classes/AnimationNodeBlendSpace1D.xml
+++ b/doc/classes/AnimationNodeBlendSpace1D.xml
@@ -15,11 +15,11 @@
 	<methods>
 		<method name="add_blend_point">
 			<return type="void" />
-			<argument index="0" name="node" type="AnimationRootNode" />
-			<argument index="1" name="pos" type="float" />
-			<argument index="2" name="at_index" type="int" default="-1" />
+			<param index="0" name="node" type="AnimationRootNode" />
+			<param index="1" name="pos" type="float" />
+			<param index="2" name="at_index" type="int" default="-1" />
 			<description>
-				Adds a new point that represents a [code]node[/code] on the virtual axis at a given position set by [code]pos[/code]. You can insert it at a specific index using the [code]at_index[/code] argument. If you use the default value for [code]at_index[/code], the point is inserted at the end of the blend points array.
+				Adds a new point that represents a [param node] on the virtual axis at a given position set by [param pos]. You can insert it at a specific index using the [param at_index] argument. If you use the default value for [param at_index], the point is inserted at the end of the blend points array.
 			</description>
 		</method>
 		<method name="get_blend_point_count" qualifiers="const">
@@ -30,39 +30,39 @@
 		</method>
 		<method name="get_blend_point_node" qualifiers="const">
 			<return type="AnimationRootNode" />
-			<argument index="0" name="point" type="int" />
+			<param index="0" name="point" type="int" />
 			<description>
-				Returns the [AnimationNode] referenced by the point at index [code]point[/code].
+				Returns the [AnimationNode] referenced by the point at index [param point].
 			</description>
 		</method>
 		<method name="get_blend_point_position" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="point" type="int" />
+			<param index="0" name="point" type="int" />
 			<description>
-				Returns the position of the point at index [code]point[/code].
+				Returns the position of the point at index [param point].
 			</description>
 		</method>
 		<method name="remove_blend_point">
 			<return type="void" />
-			<argument index="0" name="point" type="int" />
+			<param index="0" name="point" type="int" />
 			<description>
-				Removes the point at index [code]point[/code] from the blend axis.
+				Removes the point at index [param point] from the blend axis.
 			</description>
 		</method>
 		<method name="set_blend_point_node">
 			<return type="void" />
-			<argument index="0" name="point" type="int" />
-			<argument index="1" name="node" type="AnimationRootNode" />
+			<param index="0" name="point" type="int" />
+			<param index="1" name="node" type="AnimationRootNode" />
 			<description>
-				Changes the [AnimationNode] referenced by the point at index [code]point[/code].
+				Changes the [AnimationNode] referenced by the point at index [param point].
 			</description>
 		</method>
 		<method name="set_blend_point_position">
 			<return type="void" />
-			<argument index="0" name="point" type="int" />
-			<argument index="1" name="pos" type="float" />
+			<param index="0" name="point" type="int" />
+			<param index="1" name="pos" type="float" />
 			<description>
-				Updates the position of the point at index [code]point[/code] on the blend axis.
+				Updates the position of the point at index [param point] on the blend axis.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/AnimationNodeBlendSpace2D.xml b/doc/classes/AnimationNodeBlendSpace2D.xml
index eb2249d2d2..8d5e153b03 100644
--- a/doc/classes/AnimationNodeBlendSpace2D.xml
+++ b/doc/classes/AnimationNodeBlendSpace2D.xml
@@ -15,21 +15,21 @@
 	<methods>
 		<method name="add_blend_point">
 			<return type="void" />
-			<argument index="0" name="node" type="AnimationRootNode" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="at_index" type="int" default="-1" />
+			<param index="0" name="node" type="AnimationRootNode" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="at_index" type="int" default="-1" />
 			<description>
-				Adds a new point that represents a [code]node[/code] at the position set by [code]pos[/code]. You can insert it at a specific index using the [code]at_index[/code] argument. If you use the default value for [code]at_index[/code], the point is inserted at the end of the blend points array.
+				Adds a new point that represents a [param node] at the position set by [param pos]. You can insert it at a specific index using the [param at_index] argument. If you use the default value for [param at_index], the point is inserted at the end of the blend points array.
 			</description>
 		</method>
 		<method name="add_triangle">
 			<return type="void" />
-			<argument index="0" name="x" type="int" />
-			<argument index="1" name="y" type="int" />
-			<argument index="2" name="z" type="int" />
-			<argument index="3" name="at_index" type="int" default="-1" />
+			<param index="0" name="x" type="int" />
+			<param index="1" name="y" type="int" />
+			<param index="2" name="z" type="int" />
+			<param index="3" name="at_index" type="int" default="-1" />
 			<description>
-				Creates a new triangle using three points [code]x[/code], [code]y[/code], and [code]z[/code]. Triangles can overlap. You can insert the triangle at a specific index using the [code]at_index[/code] argument. If you use the default value for [code]at_index[/code], the point is inserted at the end of the blend points array.
+				Creates a new triangle using three points [param x], [param y], and [param z]. Triangles can overlap. You can insert the triangle at a specific index using the [param at_index] argument. If you use the default value for [param at_index], the point is inserted at the end of the blend points array.
 			</description>
 		</method>
 		<method name="get_blend_point_count" qualifiers="const">
@@ -40,16 +40,16 @@
 		</method>
 		<method name="get_blend_point_node" qualifiers="const">
 			<return type="AnimationRootNode" />
-			<argument index="0" name="point" type="int" />
+			<param index="0" name="point" type="int" />
 			<description>
-				Returns the [AnimationRootNode] referenced by the point at index [code]point[/code].
+				Returns the [AnimationRootNode] referenced by the point at index [param point].
 			</description>
 		</method>
 		<method name="get_blend_point_position" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="point" type="int" />
+			<param index="0" name="point" type="int" />
 			<description>
-				Returns the position of the point at index [code]point[/code].
+				Returns the position of the point at index [param point].
 			</description>
 		</method>
 		<method name="get_triangle_count" qualifiers="const">
@@ -60,40 +60,40 @@
 		</method>
 		<method name="get_triangle_point">
 			<return type="int" />
-			<argument index="0" name="triangle" type="int" />
-			<argument index="1" name="point" type="int" />
+			<param index="0" name="triangle" type="int" />
+			<param index="1" name="point" type="int" />
 			<description>
-				Returns the position of the point at index [code]point[/code] in the triangle of index [code]triangle[/code].
+				Returns the position of the point at index [param point] in the triangle of index [param triangle].
 			</description>
 		</method>
 		<method name="remove_blend_point">
 			<return type="void" />
-			<argument index="0" name="point" type="int" />
+			<param index="0" name="point" type="int" />
 			<description>
-				Removes the point at index [code]point[/code] from the blend space.
+				Removes the point at index [param point] from the blend space.
 			</description>
 		</method>
 		<method name="remove_triangle">
 			<return type="void" />
-			<argument index="0" name="triangle" type="int" />
+			<param index="0" name="triangle" type="int" />
 			<description>
-				Removes the triangle at index [code]triangle[/code] from the blend space.
+				Removes the triangle at index [param triangle] from the blend space.
 			</description>
 		</method>
 		<method name="set_blend_point_node">
 			<return type="void" />
-			<argument index="0" name="point" type="int" />
-			<argument index="1" name="node" type="AnimationRootNode" />
+			<param index="0" name="point" type="int" />
+			<param index="1" name="node" type="AnimationRootNode" />
 			<description>
-				Changes the [AnimationNode] referenced by the point at index [code]point[/code].
+				Changes the [AnimationNode] referenced by the point at index [param point].
 			</description>
 		</method>
 		<method name="set_blend_point_position">
 			<return type="void" />
-			<argument index="0" name="point" type="int" />
-			<argument index="1" name="pos" type="Vector2" />
+			<param index="0" name="point" type="int" />
+			<param index="1" name="pos" type="Vector2" />
 			<description>
-				Updates the position of the point at index [code]point[/code] on the blend axis.
+				Updates the position of the point at index [param point] on the blend axis.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/AnimationNodeBlendTree.xml b/doc/classes/AnimationNodeBlendTree.xml
index fcdd09f144..4c7943ece3 100644
--- a/doc/classes/AnimationNodeBlendTree.xml
+++ b/doc/classes/AnimationNodeBlendTree.xml
@@ -13,70 +13,70 @@
 	<methods>
 		<method name="add_node">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="node" type="AnimationNode" />
-			<argument index="2" name="position" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="node" type="AnimationNode" />
+			<param index="2" name="position" type="Vector2" default="Vector2(0, 0)" />
 			<description>
-				Adds an [AnimationNode] at the given [code]position[/code]. The [code]name[/code] is used to identify the created sub-node later.
+				Adds an [AnimationNode] at the given [param position]. The [param name] is used to identify the created sub-node later.
 			</description>
 		</method>
 		<method name="connect_node">
 			<return type="void" />
-			<argument index="0" name="input_node" type="StringName" />
-			<argument index="1" name="input_index" type="int" />
-			<argument index="2" name="output_node" type="StringName" />
+			<param index="0" name="input_node" type="StringName" />
+			<param index="1" name="input_index" type="int" />
+			<param index="2" name="output_node" type="StringName" />
 			<description>
-				Connects the output of an [AnimationNode] as input for another [AnimationNode], at the input port specified by [code]input_index[/code].
+				Connects the output of an [AnimationNode] as input for another [AnimationNode], at the input port specified by [param input_index].
 			</description>
 		</method>
 		<method name="disconnect_node">
 			<return type="void" />
-			<argument index="0" name="input_node" type="StringName" />
-			<argument index="1" name="input_index" type="int" />
+			<param index="0" name="input_node" type="StringName" />
+			<param index="1" name="input_index" type="int" />
 			<description>
 				Disconnects the node connected to the specified input.
 			</description>
 		</method>
 		<method name="get_node" qualifiers="const">
 			<return type="AnimationNode" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns the sub-node with the specified [code]name[/code].
+				Returns the sub-node with the specified [param name].
 			</description>
 		</method>
 		<method name="get_node_position" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns the position of the sub-node with the specified [code]name[/code].
+				Returns the position of the sub-node with the specified [param name].
 			</description>
 		</method>
 		<method name="has_node" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns [code]true[/code] if a sub-node with specified [code]name[/code] exists.
+				Returns [code]true[/code] if a sub-node with specified [param name] exists.
 			</description>
 		</method>
 		<method name="remove_node">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Removes a sub-node.
 			</description>
 		</method>
 		<method name="rename_node">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="new_name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="new_name" type="StringName" />
 			<description>
 				Changes the name of a sub-node.
 			</description>
 		</method>
 		<method name="set_node_position">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="position" type="Vector2" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="position" type="Vector2" />
 			<description>
 				Modifies the position of a sub-node.
 			</description>
diff --git a/doc/classes/AnimationNodeStateMachine.xml b/doc/classes/AnimationNodeStateMachine.xml
index 6140dd799f..0fb789875f 100644
--- a/doc/classes/AnimationNodeStateMachine.xml
+++ b/doc/classes/AnimationNodeStateMachine.xml
@@ -23,18 +23,18 @@
 	<methods>
 		<method name="add_node">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="node" type="AnimationNode" />
-			<argument index="2" name="position" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="node" type="AnimationNode" />
+			<param index="2" name="position" type="Vector2" default="Vector2(0, 0)" />
 			<description>
-				Adds a new node to the graph. The [code]position[/code] is used for display in the editor.
+				Adds a new node to the graph. The [param position] is used for display in the editor.
 			</description>
 		</method>
 		<method name="add_transition">
 			<return type="void" />
-			<argument index="0" name="from" type="StringName" />
-			<argument index="1" name="to" type="StringName" />
-			<argument index="2" name="transition" type="AnimationNodeStateMachineTransition" />
+			<param index="0" name="from" type="StringName" />
+			<param index="1" name="to" type="StringName" />
+			<param index="2" name="transition" type="AnimationNodeStateMachineTransition" />
 			<description>
 				Adds a transition between the given nodes.
 			</description>
@@ -47,28 +47,28 @@
 		</method>
 		<method name="get_node" qualifiers="const">
 			<return type="AnimationNode" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns the animation node with the given name.
 			</description>
 		</method>
 		<method name="get_node_name" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="node" type="AnimationNode" />
+			<param index="0" name="node" type="AnimationNode" />
 			<description>
 				Returns the given animation node's name.
 			</description>
 		</method>
 		<method name="get_node_position" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns the given node's coordinates. Used for display in the editor.
 			</description>
 		</method>
 		<method name="get_transition" qualifiers="const">
 			<return type="AnimationNodeStateMachineTransition" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns the given transition.
 			</description>
@@ -81,81 +81,81 @@
 		</method>
 		<method name="get_transition_from" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns the given transition's start node.
 			</description>
 		</method>
 		<method name="get_transition_to" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns the given transition's end node.
 			</description>
 		</method>
 		<method name="has_node" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns [code]true[/code] if the graph contains the given node.
 			</description>
 		</method>
 		<method name="has_transition" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="from" type="StringName" />
-			<argument index="1" name="to" type="StringName" />
+			<param index="0" name="from" type="StringName" />
+			<param index="1" name="to" type="StringName" />
 			<description>
 				Returns [code]true[/code] if there is a transition between the given nodes.
 			</description>
 		</method>
 		<method name="remove_node">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Deletes the given node from the graph.
 			</description>
 		</method>
 		<method name="remove_transition">
 			<return type="void" />
-			<argument index="0" name="from" type="StringName" />
-			<argument index="1" name="to" type="StringName" />
+			<param index="0" name="from" type="StringName" />
+			<param index="1" name="to" type="StringName" />
 			<description>
 				Deletes the transition between the two specified nodes.
 			</description>
 		</method>
 		<method name="remove_transition_by_index">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Deletes the given transition by index.
 			</description>
 		</method>
 		<method name="rename_node">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="new_name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="new_name" type="StringName" />
 			<description>
 				Renames the given node.
 			</description>
 		</method>
 		<method name="replace_node">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="node" type="AnimationNode" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="node" type="AnimationNode" />
 			<description>
 			</description>
 		</method>
 		<method name="set_graph_offset">
 			<return type="void" />
-			<argument index="0" name="offset" type="Vector2" />
+			<param index="0" name="offset" type="Vector2" />
 			<description>
 				Sets the draw offset of the graph. Used for display in the editor.
 			</description>
 		</method>
 		<method name="set_node_position">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="position" type="Vector2" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="position" type="Vector2" />
 			<description>
 				Sets the node's coordinates. Used for display in the editor.
 			</description>
diff --git a/doc/classes/AnimationNodeStateMachinePlayback.xml b/doc/classes/AnimationNodeStateMachinePlayback.xml
index 901ab569c8..8f53ef0dcf 100644
--- a/doc/classes/AnimationNodeStateMachinePlayback.xml
+++ b/doc/classes/AnimationNodeStateMachinePlayback.xml
@@ -52,7 +52,7 @@
 		</method>
 		<method name="start">
 			<return type="void" />
-			<argument index="0" name="node" type="StringName" />
+			<param index="0" name="node" type="StringName" />
 			<description>
 				Starts playing the given animation.
 			</description>
@@ -65,7 +65,7 @@
 		</method>
 		<method name="travel">
 			<return type="void" />
-			<argument index="0" name="to_node" type="StringName" />
+			<param index="0" name="to_node" type="StringName" />
 			<description>
 				Transitions from the current state to another one, following the shortest path.
 			</description>
diff --git a/doc/classes/AnimationNodeTransition.xml b/doc/classes/AnimationNodeTransition.xml
index 7e757d4640..a5de170ccd 100644
--- a/doc/classes/AnimationNodeTransition.xml
+++ b/doc/classes/AnimationNodeTransition.xml
@@ -14,27 +14,27 @@
 	<methods>
 		<method name="get_input_caption" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="input" type="int" />
+			<param index="0" name="input" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="is_input_set_as_auto_advance" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="input" type="int" />
+			<param index="0" name="input" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_input_as_auto_advance">
 			<return type="void" />
-			<argument index="0" name="input" type="int" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="input" type="int" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="set_input_caption">
 			<return type="void" />
-			<argument index="0" name="input" type="int" />
-			<argument index="1" name="caption" type="String" />
+			<param index="0" name="input" type="int" />
+			<param index="1" name="caption" type="String" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/AnimationPlayer.xml b/doc/classes/AnimationPlayer.xml
index d3c8bdac3a..d771206cc2 100644
--- a/doc/classes/AnimationPlayer.xml
+++ b/doc/classes/AnimationPlayer.xml
@@ -17,32 +17,32 @@
 	<methods>
 		<method name="add_animation_library">
 			<return type="int" enum="Error" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="library" type="AnimationLibrary" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="library" type="AnimationLibrary" />
 			<description>
-				Adds [code]library[/code] to the animation player, under the key [code]name[/code].
+				Adds [param library] to the animation player, under the key [param name].
 			</description>
 		</method>
 		<method name="advance">
 			<return type="void" />
-			<argument index="0" name="delta" type="float" />
+			<param index="0" name="delta" type="float" />
 			<description>
-				Shifts position in the animation timeline and immediately updates the animation. [code]delta[/code] is the time in seconds to shift. Events between the current frame and [code]delta[/code] are handled.
+				Shifts position in the animation timeline and immediately updates the animation. [param delta] is the time in seconds to shift. Events between the current frame and [param delta] are handled.
 			</description>
 		</method>
 		<method name="animation_get_next" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="anim_from" type="StringName" />
+			<param index="0" name="anim_from" type="StringName" />
 			<description>
-				Returns the key of the animation which is queued to play after the [code]anim_from[/code] animation.
+				Returns the key of the animation which is queued to play after the [param anim_from] animation.
 			</description>
 		</method>
 		<method name="animation_set_next">
 			<return type="void" />
-			<argument index="0" name="anim_from" type="StringName" />
-			<argument index="1" name="anim_to" type="StringName" />
+			<param index="0" name="anim_from" type="StringName" />
+			<param index="1" name="anim_to" type="StringName" />
 			<description>
-				Triggers the [code]anim_to[/code] animation when the [code]anim_from[/code] animation completes.
+				Triggers the [param anim_to] animation when the [param anim_from] animation completes.
 			</description>
 		</method>
 		<method name="clear_caches">
@@ -59,30 +59,30 @@
 		</method>
 		<method name="find_animation" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="animation" type="Animation" />
+			<param index="0" name="animation" type="Animation" />
 			<description>
-				Returns the key of [code]animation[/code] or an empty [StringName] if not found.
+				Returns the key of [param animation] or an empty [StringName] if not found.
 			</description>
 		</method>
 		<method name="find_animation_library" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="animation" type="Animation" />
+			<param index="0" name="animation" type="Animation" />
 			<description>
-				Returns the key for the [AnimationLibrary] that contains [code]animation[/code] or an empty [StringName] if not found.
+				Returns the key for the [AnimationLibrary] that contains [param animation] or an empty [StringName] if not found.
 			</description>
 		</method>
 		<method name="get_animation" qualifiers="const">
 			<return type="Animation" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns the [Animation] with key [code]name[/code] or [code]null[/code] if not found.
+				Returns the [Animation] with key [param name] or [code]null[/code] if not found.
 			</description>
 		</method>
 		<method name="get_animation_library" qualifiers="const">
 			<return type="AnimationLibrary" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns the first [AnimationLibrary] with key [code]name[/code] or [code]null[/code] if not found.
+				Returns the first [AnimationLibrary] with key [param name] or [code]null[/code] if not found.
 			</description>
 		</method>
 		<method name="get_animation_library_list" qualifiers="const">
@@ -99,8 +99,8 @@
 		</method>
 		<method name="get_blend_time" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="anim_from" type="StringName" />
-			<argument index="1" name="anim_to" type="StringName" />
+			<param index="0" name="anim_from" type="StringName" />
+			<param index="1" name="anim_to" type="StringName" />
 			<description>
 				Gets the blend time (in seconds) between two animations, referenced by their keys.
 			</description>
@@ -119,16 +119,16 @@
 		</method>
 		<method name="has_animation" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns [code]true[/code] if the [AnimationPlayer] stores an [Animation] with key [code]name[/code].
+				Returns [code]true[/code] if the [AnimationPlayer] stores an [Animation] with key [param name].
 			</description>
 		</method>
 		<method name="has_animation_library" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns [code]true[/code] if the [AnimationPlayer] stores an [AnimationLibrary] with key [code]name[/code].
+				Returns [code]true[/code] if the [AnimationPlayer] stores an [AnimationLibrary] with key [param name].
 			</description>
 		</method>
 		<method name="is_playing" qualifiers="const">
@@ -139,28 +139,28 @@
 		</method>
 		<method name="play">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" default="&quot;&quot;" />
-			<argument index="1" name="custom_blend" type="float" default="-1" />
-			<argument index="2" name="custom_speed" type="float" default="1.0" />
-			<argument index="3" name="from_end" type="bool" default="false" />
+			<param index="0" name="name" type="StringName" default="&quot;&quot;" />
+			<param index="1" name="custom_blend" type="float" default="-1" />
+			<param index="2" name="custom_speed" type="float" default="1.0" />
+			<param index="3" name="from_end" type="bool" default="false" />
 			<description>
-				Plays the animation with key [code]name[/code]. Custom blend times and speed can be set. If [code]custom_speed[/code] is negative and [code]from_end[/code] is [code]true[/code], the animation will play backwards (which is equivalent to calling [method play_backwards]).
-				The [AnimationPlayer] keeps track of its current or last played animation with [member assigned_animation]. If this method is called with that same animation [code]name[/code], or with no [code]name[/code] parameter, the assigned animation will resume playing if it was paused, or restart if it was stopped (see [method stop] for both pause and stop). If the animation was already playing, it will keep playing.
+				Plays the animation with key [param name]. Custom blend times and speed can be set. If [param custom_speed] is negative and [param from_end] is [code]true[/code], the animation will play backwards (which is equivalent to calling [method play_backwards]).
+				The [AnimationPlayer] keeps track of its current or last played animation with [member assigned_animation]. If this method is called with that same animation [param name], or with no [param name] parameter, the assigned animation will resume playing if it was paused, or restart if it was stopped (see [method stop] for both pause and stop). If the animation was already playing, it will keep playing.
 				[b]Note:[/b] The animation will be updated the next time the [AnimationPlayer] is processed. If other variables are updated at the same time this is called, they may be updated too early. To perform the update immediately, call [code]advance(0)[/code].
 			</description>
 		</method>
 		<method name="play_backwards">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" default="&quot;&quot;" />
-			<argument index="1" name="custom_blend" type="float" default="-1" />
+			<param index="0" name="name" type="StringName" default="&quot;&quot;" />
+			<param index="1" name="custom_blend" type="float" default="-1" />
 			<description>
-				Plays the animation with key [code]name[/code] in reverse.
+				Plays the animation with key [param name] in reverse.
 				This method is a shorthand for [method play] with [code]custom_speed = -1.0[/code] and [code]from_end = true[/code], so see its description for more information.
 			</description>
 		</method>
 		<method name="queue">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Queues an animation for playback once the current one is done.
 				[b]Note:[/b] If a looped animation is currently playing, the queued animation will never play unless the looped animation is stopped somehow.
@@ -168,43 +168,43 @@
 		</method>
 		<method name="remove_animation_library">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Removes the [AnimationLibrary] assosiated with the key [code]name[/code].
+				Removes the [AnimationLibrary] assosiated with the key [param name].
 			</description>
 		</method>
 		<method name="rename_animation_library">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="newname" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="newname" type="StringName" />
 			<description>
-				Moves the [AnimationLibrary] associated with the key [code]name[/code] to the key [code]newname[/code].
+				Moves the [AnimationLibrary] associated with the key [param name] to the key [param newname].
 			</description>
 		</method>
 		<method name="seek">
 			<return type="void" />
-			<argument index="0" name="seconds" type="float" />
-			<argument index="1" name="update" type="bool" default="false" />
+			<param index="0" name="seconds" type="float" />
+			<param index="1" name="update" type="bool" default="false" />
 			<description>
-				Seeks the animation to the [code]seconds[/code] point in time (in seconds). If [code]update[/code] is [code]true[/code], the animation updates too, otherwise it updates at process time. Events between the current frame and [code]seconds[/code] are skipped.
+				Seeks the animation to the [param seconds] point in time (in seconds). If [param update] is [code]true[/code], the animation updates too, otherwise it updates at process time. Events between the current frame and [param seconds] are skipped.
 				[b]Note:[/b] Seeking to the end of the animation doesn't emit [signal animation_finished]. If you want to skip animation and emit the signal, use [method advance].
 			</description>
 		</method>
 		<method name="set_blend_time">
 			<return type="void" />
-			<argument index="0" name="anim_from" type="StringName" />
-			<argument index="1" name="anim_to" type="StringName" />
-			<argument index="2" name="sec" type="float" />
+			<param index="0" name="anim_from" type="StringName" />
+			<param index="1" name="anim_to" type="StringName" />
+			<param index="2" name="sec" type="float" />
 			<description>
 				Specifies a blend time (in seconds) between two animations, referenced by their keys.
 			</description>
 		</method>
 		<method name="stop">
 			<return type="void" />
-			<argument index="0" name="reset" type="bool" default="true" />
+			<param index="0" name="reset" type="bool" default="true" />
 			<description>
-				Stops or pauses the currently playing animation. If [code]reset[/code] is [code]true[/code], the animation position is reset to [code]0[/code] and the playback speed is reset to [code]1.0[/code].
-				If [code]reset[/code] is [code]false[/code], the [member current_animation_position] will be kept and calling [method play] or [method play_backwards] without arguments or with the same animation name as [member assigned_animation] will resume the animation.
+				Stops or pauses the currently playing animation. If [param reset] is [code]true[/code], the animation position is reset to [code]0[/code] and the playback speed is reset to [code]1.0[/code].
+				If [param reset] is [code]false[/code], the [member current_animation_position] will be kept and calling [method play] or [method play_backwards] without arguments or with the same animation name as [member assigned_animation] will resume the animation.
 			</description>
 		</method>
 	</methods>
@@ -254,22 +254,22 @@
 	</members>
 	<signals>
 		<signal name="animation_changed">
-			<argument index="0" name="old_name" type="StringName" />
-			<argument index="1" name="new_name" type="StringName" />
+			<param index="0" name="old_name" type="StringName" />
+			<param index="1" name="new_name" type="StringName" />
 			<description>
 				Emitted when a queued animation plays after the previous animation finished. See [method queue].
 				[b]Note:[/b] The signal is not emitted when the animation is changed via [method play] or by an [AnimationTree].
 			</description>
 		</signal>
 		<signal name="animation_finished">
-			<argument index="0" name="anim_name" type="StringName" />
+			<param index="0" name="anim_name" type="StringName" />
 			<description>
 				Notifies when an animation finished playing.
 				[b]Note:[/b] This signal is not emitted if an animation is looping.
 			</description>
 		</signal>
 		<signal name="animation_started">
-			<argument index="0" name="anim_name" type="StringName" />
+			<param index="0" name="anim_name" type="StringName" />
 			<description>
 				Notifies when an animation starts playing.
 			</description>
diff --git a/doc/classes/AnimationTree.xml b/doc/classes/AnimationTree.xml
index 45d9152564..f2bf74f495 100644
--- a/doc/classes/AnimationTree.xml
+++ b/doc/classes/AnimationTree.xml
@@ -14,7 +14,7 @@
 	<methods>
 		<method name="advance">
 			<return type="void" />
-			<argument index="0" name="delta" type="float" />
+			<param index="0" name="delta" type="float" />
 			<description>
 				Manually advance the animations by the specified time (in seconds).
 			</description>
@@ -27,8 +27,8 @@
 		</method>
 		<method name="rename_parameter">
 			<return type="void" />
-			<argument index="0" name="old_name" type="String" />
-			<argument index="1" name="new_name" type="String" />
+			<param index="0" name="old_name" type="String" />
+			<param index="1" name="new_name" type="String" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/Area2D.xml b/doc/classes/Area2D.xml
index 1eb74768f5..c61705505e 100644
--- a/doc/classes/Area2D.xml
+++ b/doc/classes/Area2D.xml
@@ -29,7 +29,7 @@
 		</method>
 		<method name="overlaps_area" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="area" type="Node" />
+			<param index="0" name="area" type="Node" />
 			<description>
 				Returns [code]true[/code] if the given [Area2D] intersects or overlaps this [Area2D], [code]false[/code] otherwise.
 				[b]Note:[/b] The result of this test is not immediate after moving objects. For performance, the list of overlaps is updated once per frame and before the physics step. Consider using signals instead.
@@ -37,11 +37,11 @@
 		</method>
 		<method name="overlaps_body" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="body" type="Node" />
+			<param index="0" name="body" type="Node" />
 			<description>
 				Returns [code]true[/code] if the given physics body intersects or overlaps this [Area2D], [code]false[/code] otherwise.
 				[b]Note:[/b] The result of this test is not immediate after moving objects. For performance, list of overlaps is updated once per frame and before the physics step. Consider using signals instead.
-				The [code]body[/code] argument can either be a [PhysicsBody2D] or a [TileMap] instance. While TileMaps are not physics bodies themselves, they register their tiles with collision shapes as a virtual physics body.
+				The [param body] argument can either be a [PhysicsBody2D] or a [TileMap] instance. While TileMaps are not physics bodies themselves, they register their tiles with collision shapes as a virtual physics body.
 			</description>
 		</method>
 	</methods>
@@ -96,83 +96,83 @@
 	</members>
 	<signals>
 		<signal name="area_entered">
-			<argument index="0" name="area" type="Area2D" />
+			<param index="0" name="area" type="Area2D" />
 			<description>
 				Emitted when another Area2D enters this Area2D. Requires [member monitoring] to be set to [code]true[/code].
-				[code]area[/code] the other Area2D.
+				[param area] the other Area2D.
 			</description>
 		</signal>
 		<signal name="area_exited">
-			<argument index="0" name="area" type="Area2D" />
+			<param index="0" name="area" type="Area2D" />
 			<description>
 				Emitted when another Area2D exits this Area2D. Requires [member monitoring] to be set to [code]true[/code].
-				[code]area[/code] the other Area2D.
+				[param area] the other Area2D.
 			</description>
 		</signal>
 		<signal name="area_shape_entered">
-			<argument index="0" name="area_rid" type="RID" />
-			<argument index="1" name="area" type="Area2D" />
-			<argument index="2" name="area_shape_index" type="int" />
-			<argument index="3" name="local_shape_index" type="int" />
+			<param index="0" name="area_rid" type="RID" />
+			<param index="1" name="area" type="Area2D" />
+			<param index="2" name="area_shape_index" type="int" />
+			<param index="3" name="local_shape_index" type="int" />
 			<description>
 				Emitted when one of another Area2D's [Shape2D]s enters one of this Area2D's [Shape2D]s. Requires [member monitoring] to be set to [code]true[/code].
-				[code]area_rid[/code] the [RID] of the other Area2D's [CollisionObject2D] used by the [PhysicsServer2D].
-				[code]area[/code] the other Area2D.
-				[code]area_shape_index[/code] the index of the [Shape2D] of the other Area2D used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]area.shape_owner_get_owner(area.shape_find_owner(area_shape_index))[/code].
-				[code]local_shape_index[/code] the index of the [Shape2D] of this Area2D used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
+				[param area_rid] the [RID] of the other Area2D's [CollisionObject2D] used by the [PhysicsServer2D].
+				[param area] the other Area2D.
+				[param area_shape_index] the index of the [Shape2D] of the other Area2D used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]area.shape_owner_get_owner(area.shape_find_owner(area_shape_index))[/code].
+				[param local_shape_index] the index of the [Shape2D] of this Area2D used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
 			</description>
 		</signal>
 		<signal name="area_shape_exited">
-			<argument index="0" name="area_rid" type="RID" />
-			<argument index="1" name="area" type="Area2D" />
-			<argument index="2" name="area_shape_index" type="int" />
-			<argument index="3" name="local_shape_index" type="int" />
+			<param index="0" name="area_rid" type="RID" />
+			<param index="1" name="area" type="Area2D" />
+			<param index="2" name="area_shape_index" type="int" />
+			<param index="3" name="local_shape_index" type="int" />
 			<description>
 				Emitted when one of another Area2D's [Shape2D]s exits one of this Area2D's [Shape2D]s. Requires [member monitoring] to be set to [code]true[/code].
-				[code]area_rid[/code] the [RID] of the other Area2D's [CollisionObject2D] used by the [PhysicsServer2D].
-				[code]area[/code] the other Area2D.
-				[code]area_shape_index[/code] the index of the [Shape2D] of the other Area2D used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]area.shape_owner_get_owner(area.shape_find_owner(area_shape_index))[/code].
-				[code]local_shape_index[/code] the index of the [Shape2D] of this Area2D used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
+				[param area_rid] the [RID] of the other Area2D's [CollisionObject2D] used by the [PhysicsServer2D].
+				[param area] the other Area2D.
+				[param area_shape_index] the index of the [Shape2D] of the other Area2D used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]area.shape_owner_get_owner(area.shape_find_owner(area_shape_index))[/code].
+				[param local_shape_index] the index of the [Shape2D] of this Area2D used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
 			</description>
 		</signal>
 		<signal name="body_entered">
-			<argument index="0" name="body" type="Node2D" />
+			<param index="0" name="body" type="Node2D" />
 			<description>
 				Emitted when a [PhysicsBody2D] or [TileMap] enters this Area2D. Requires [member monitoring] to be set to [code]true[/code]. [TileMap]s are detected if the [TileSet] has Collision [Shape2D]s.
-				[code]body[/code] the [Node], if it exists in the tree, of the other [PhysicsBody2D] or [TileMap].
+				[param body] the [Node], if it exists in the tree, of the other [PhysicsBody2D] or [TileMap].
 			</description>
 		</signal>
 		<signal name="body_exited">
-			<argument index="0" name="body" type="Node2D" />
+			<param index="0" name="body" type="Node2D" />
 			<description>
 				Emitted when a [PhysicsBody2D] or [TileMap] exits this Area2D. Requires [member monitoring] to be set to [code]true[/code]. [TileMap]s are detected if the [TileSet] has Collision [Shape2D]s.
-				[code]body[/code] the [Node], if it exists in the tree, of the other [PhysicsBody2D] or [TileMap].
+				[param body] the [Node], if it exists in the tree, of the other [PhysicsBody2D] or [TileMap].
 			</description>
 		</signal>
 		<signal name="body_shape_entered">
-			<argument index="0" name="body_rid" type="RID" />
-			<argument index="1" name="body" type="Node2D" />
-			<argument index="2" name="body_shape_index" type="int" />
-			<argument index="3" name="local_shape_index" type="int" />
+			<param index="0" name="body_rid" type="RID" />
+			<param index="1" name="body" type="Node2D" />
+			<param index="2" name="body_shape_index" type="int" />
+			<param index="3" name="local_shape_index" type="int" />
 			<description>
 				Emitted when one of a [PhysicsBody2D] or [TileMap]'s [Shape2D]s enters one of this Area2D's [Shape2D]s. Requires [member monitoring] to be set to [code]true[/code]. [TileMap]s are detected if the [TileSet] has Collision [Shape2D]s.
-				[code]body_rid[/code] the [RID] of the [PhysicsBody2D] or [TileSet]'s [CollisionObject2D] used by the [PhysicsServer2D].
-				[code]body[/code] the [Node], if it exists in the tree, of the [PhysicsBody2D] or [TileMap].
-				[code]body_shape_index[/code] the index of the [Shape2D] of the [PhysicsBody2D] or [TileMap] used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]body.shape_owner_get_owner(body.shape_find_owner(body_shape_index))[/code].
-				[code]local_shape_index[/code] the index of the [Shape2D] of this Area2D used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
+				[param body_rid] the [RID] of the [PhysicsBody2D] or [TileSet]'s [CollisionObject2D] used by the [PhysicsServer2D].
+				[param body] the [Node], if it exists in the tree, of the [PhysicsBody2D] or [TileMap].
+				[param body_shape_index] the index of the [Shape2D] of the [PhysicsBody2D] or [TileMap] used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]body.shape_owner_get_owner(body.shape_find_owner(body_shape_index))[/code].
+				[param local_shape_index] the index of the [Shape2D] of this Area2D used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
 			</description>
 		</signal>
 		<signal name="body_shape_exited">
-			<argument index="0" name="body_rid" type="RID" />
-			<argument index="1" name="body" type="Node2D" />
-			<argument index="2" name="body_shape_index" type="int" />
-			<argument index="3" name="local_shape_index" type="int" />
+			<param index="0" name="body_rid" type="RID" />
+			<param index="1" name="body" type="Node2D" />
+			<param index="2" name="body_shape_index" type="int" />
+			<param index="3" name="local_shape_index" type="int" />
 			<description>
 				Emitted when one of a [PhysicsBody2D] or [TileMap]'s [Shape2D]s exits one of this Area2D's [Shape2D]s. Requires [member monitoring] to be set to [code]true[/code]. [TileMap]s are detected if the [TileSet] has Collision [Shape2D]s.
-				[code]body_rid[/code] the [RID] of the [PhysicsBody2D] or [TileSet]'s [CollisionObject2D] used by the [PhysicsServer2D].
-				[code]body[/code] the [Node], if it exists in the tree, of the [PhysicsBody2D] or [TileMap].
-				[code]body_shape_index[/code] the index of the [Shape2D] of the [PhysicsBody2D] or [TileMap] used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]body.shape_owner_get_owner(body.shape_find_owner(body_shape_index))[/code].
-				[code]local_shape_index[/code] the index of the [Shape2D] of this Area2D used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
+				[param body_rid] the [RID] of the [PhysicsBody2D] or [TileSet]'s [CollisionObject2D] used by the [PhysicsServer2D].
+				[param body] the [Node], if it exists in the tree, of the [PhysicsBody2D] or [TileMap].
+				[param body_shape_index] the index of the [Shape2D] of the [PhysicsBody2D] or [TileMap] used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]body.shape_owner_get_owner(body.shape_find_owner(body_shape_index))[/code].
+				[param local_shape_index] the index of the [Shape2D] of this Area2D used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
 			</description>
 		</signal>
 	</signals>
diff --git a/doc/classes/Area3D.xml b/doc/classes/Area3D.xml
index 7d14fd825b..3c50a1ac05 100644
--- a/doc/classes/Area3D.xml
+++ b/doc/classes/Area3D.xml
@@ -27,7 +27,7 @@
 		</method>
 		<method name="overlaps_area" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="area" type="Node" />
+			<param index="0" name="area" type="Node" />
 			<description>
 				Returns [code]true[/code] if the given [Area3D] intersects or overlaps this [Area3D], [code]false[/code] otherwise.
 				[b]Note:[/b] The result of this test is not immediate after moving objects. For performance, list of overlaps is updated once per frame and before the physics step. Consider using signals instead.
@@ -35,11 +35,11 @@
 		</method>
 		<method name="overlaps_body" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="body" type="Node" />
+			<param index="0" name="body" type="Node" />
 			<description>
 				Returns [code]true[/code] if the given physics body intersects or overlaps this [Area3D], [code]false[/code] otherwise.
 				[b]Note:[/b] The result of this test is not immediate after moving objects. For performance, list of overlaps is updated once per frame and before the physics step. Consider using signals instead.
-				The [code]body[/code] argument can either be a [PhysicsBody3D] or a [GridMap] instance. While GridMaps are not physics body themselves, they register their tiles with collision shapes as a virtual physics body.
+				The [param body] argument can either be a [PhysicsBody3D] or a [GridMap] instance. While GridMaps are not physics body themselves, they register their tiles with collision shapes as a virtual physics body.
 			</description>
 		</method>
 	</methods>
@@ -115,83 +115,83 @@
 	</members>
 	<signals>
 		<signal name="area_entered">
-			<argument index="0" name="area" type="Area3D" />
+			<param index="0" name="area" type="Area3D" />
 			<description>
 				Emitted when another Area3D enters this Area3D. Requires [member monitoring] to be set to [code]true[/code].
-				[code]area[/code] the other Area3D.
+				[param area] the other Area3D.
 			</description>
 		</signal>
 		<signal name="area_exited">
-			<argument index="0" name="area" type="Area3D" />
+			<param index="0" name="area" type="Area3D" />
 			<description>
 				Emitted when another Area3D exits this Area3D. Requires [member monitoring] to be set to [code]true[/code].
-				[code]area[/code] the other Area3D.
+				[param area] the other Area3D.
 			</description>
 		</signal>
 		<signal name="area_shape_entered">
-			<argument index="0" name="area_rid" type="RID" />
-			<argument index="1" name="area" type="Area3D" />
-			<argument index="2" name="area_shape_index" type="int" />
-			<argument index="3" name="local_shape_index" type="int" />
+			<param index="0" name="area_rid" type="RID" />
+			<param index="1" name="area" type="Area3D" />
+			<param index="2" name="area_shape_index" type="int" />
+			<param index="3" name="local_shape_index" type="int" />
 			<description>
 				Emitted when one of another Area3D's [Shape3D]s enters one of this Area3D's [Shape3D]s. Requires [member monitoring] to be set to [code]true[/code].
-				[code]area_rid[/code] the [RID] of the other Area3D's [CollisionObject3D] used by the [PhysicsServer3D].
-				[code]area[/code] the other Area3D.
-				[code]area_shape_index[/code] the index of the [Shape3D] of the other Area3D used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]area.shape_owner_get_owner(area.shape_find_owner(area_shape_index))[/code].
-				[code]local_shape_index[/code] the index of the [Shape3D] of this Area3D used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
+				[param area_rid] the [RID] of the other Area3D's [CollisionObject3D] used by the [PhysicsServer3D].
+				[param area] the other Area3D.
+				[param area_shape_index] the index of the [Shape3D] of the other Area3D used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]area.shape_owner_get_owner(area.shape_find_owner(area_shape_index))[/code].
+				[param local_shape_index] the index of the [Shape3D] of this Area3D used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
 			</description>
 		</signal>
 		<signal name="area_shape_exited">
-			<argument index="0" name="area_rid" type="RID" />
-			<argument index="1" name="area" type="Area3D" />
-			<argument index="2" name="area_shape_index" type="int" />
-			<argument index="3" name="local_shape_index" type="int" />
+			<param index="0" name="area_rid" type="RID" />
+			<param index="1" name="area" type="Area3D" />
+			<param index="2" name="area_shape_index" type="int" />
+			<param index="3" name="local_shape_index" type="int" />
 			<description>
 				Emitted when one of another Area3D's [Shape3D]s exits one of this Area3D's [Shape3D]s. Requires [member monitoring] to be set to [code]true[/code].
-				[code]area_rid[/code] the [RID] of the other Area3D's [CollisionObject3D] used by the [PhysicsServer3D].
-				[code]area[/code] the other Area3D.
-				[code]area_shape_index[/code] the index of the [Shape3D] of the other Area3D used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]area.shape_owner_get_owner(area.shape_find_owner(area_shape_index))[/code].
-				[code]local_shape_index[/code] the index of the [Shape3D] of this Area3D used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
+				[param area_rid] the [RID] of the other Area3D's [CollisionObject3D] used by the [PhysicsServer3D].
+				[param area] the other Area3D.
+				[param area_shape_index] the index of the [Shape3D] of the other Area3D used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]area.shape_owner_get_owner(area.shape_find_owner(area_shape_index))[/code].
+				[param local_shape_index] the index of the [Shape3D] of this Area3D used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
 			</description>
 		</signal>
 		<signal name="body_entered">
-			<argument index="0" name="body" type="Node3D" />
+			<param index="0" name="body" type="Node3D" />
 			<description>
 				Emitted when a [PhysicsBody3D] or [GridMap] enters this Area3D. Requires [member monitoring] to be set to [code]true[/code]. [GridMap]s are detected if the [MeshLibrary] has Collision [Shape3D]s.
-				[code]body[/code] the [Node], if it exists in the tree, of the other [PhysicsBody3D] or [GridMap].
+				[param body] the [Node], if it exists in the tree, of the other [PhysicsBody3D] or [GridMap].
 			</description>
 		</signal>
 		<signal name="body_exited">
-			<argument index="0" name="body" type="Node3D" />
+			<param index="0" name="body" type="Node3D" />
 			<description>
 				Emitted when a [PhysicsBody3D] or [GridMap] exits this Area3D. Requires [member monitoring] to be set to [code]true[/code]. [GridMap]s are detected if the [MeshLibrary] has Collision [Shape3D]s.
-				[code]body[/code] the [Node], if it exists in the tree, of the other [PhysicsBody3D] or [GridMap].
+				[param body] the [Node], if it exists in the tree, of the other [PhysicsBody3D] or [GridMap].
 			</description>
 		</signal>
 		<signal name="body_shape_entered">
-			<argument index="0" name="body_rid" type="RID" />
-			<argument index="1" name="body" type="Node3D" />
-			<argument index="2" name="body_shape_index" type="int" />
-			<argument index="3" name="local_shape_index" type="int" />
+			<param index="0" name="body_rid" type="RID" />
+			<param index="1" name="body" type="Node3D" />
+			<param index="2" name="body_shape_index" type="int" />
+			<param index="3" name="local_shape_index" type="int" />
 			<description>
 				Emitted when one of a [PhysicsBody3D] or [GridMap]'s [Shape3D]s enters one of this Area3D's [Shape3D]s. Requires [member monitoring] to be set to [code]true[/code]. [GridMap]s are detected if the [MeshLibrary] has Collision [Shape3D]s.
-				[code]body_rid[/code] the [RID] of the [PhysicsBody3D] or [MeshLibrary]'s [CollisionObject3D] used by the [PhysicsServer3D].
-				[code]body[/code] the [Node], if it exists in the tree, of the [PhysicsBody3D] or [GridMap].
-				[code]body_shape_index[/code] the index of the [Shape3D] of the [PhysicsBody3D] or [GridMap] used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]body.shape_owner_get_owner(body.shape_find_owner(body_shape_index))[/code].
-				[code]local_shape_index[/code] the index of the [Shape3D] of this Area3D used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
+				[param body_rid] the [RID] of the [PhysicsBody3D] or [MeshLibrary]'s [CollisionObject3D] used by the [PhysicsServer3D].
+				[param body] the [Node], if it exists in the tree, of the [PhysicsBody3D] or [GridMap].
+				[param body_shape_index] the index of the [Shape3D] of the [PhysicsBody3D] or [GridMap] used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]body.shape_owner_get_owner(body.shape_find_owner(body_shape_index))[/code].
+				[param local_shape_index] the index of the [Shape3D] of this Area3D used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
 			</description>
 		</signal>
 		<signal name="body_shape_exited">
-			<argument index="0" name="body_rid" type="RID" />
-			<argument index="1" name="body" type="Node3D" />
-			<argument index="2" name="body_shape_index" type="int" />
-			<argument index="3" name="local_shape_index" type="int" />
+			<param index="0" name="body_rid" type="RID" />
+			<param index="1" name="body" type="Node3D" />
+			<param index="2" name="body_shape_index" type="int" />
+			<param index="3" name="local_shape_index" type="int" />
 			<description>
 				Emitted when one of a [PhysicsBody3D] or [GridMap]'s [Shape3D]s enters one of this Area3D's [Shape3D]s. Requires [member monitoring] to be set to [code]true[/code]. [GridMap]s are detected if the [MeshLibrary] has Collision [Shape3D]s.
-				[code]body_rid[/code] the [RID] of the [PhysicsBody3D] or [MeshLibrary]'s [CollisionObject3D] used by the [PhysicsServer3D].
-				[code]body[/code] the [Node], if it exists in the tree, of the [PhysicsBody3D] or [GridMap].
-				[code]body_shape_index[/code] the index of the [Shape3D] of the [PhysicsBody3D] or [GridMap] used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]body.shape_owner_get_owner(body.shape_find_owner(body_shape_index))[/code].
-				[code]local_shape_index[/code] the index of the [Shape3D] of this Area3D used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
+				[param body_rid] the [RID] of the [PhysicsBody3D] or [MeshLibrary]'s [CollisionObject3D] used by the [PhysicsServer3D].
+				[param body] the [Node], if it exists in the tree, of the [PhysicsBody3D] or [GridMap].
+				[param body_shape_index] the index of the [Shape3D] of the [PhysicsBody3D] or [GridMap] used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]body.shape_owner_get_owner(body.shape_find_owner(body_shape_index))[/code].
+				[param local_shape_index] the index of the [Shape3D] of this Area3D used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
 			</description>
 		</signal>
 	</signals>
diff --git a/doc/classes/Array.xml b/doc/classes/Array.xml
index c149cdc0e4..f6d926031d 100644
--- a/doc/classes/Array.xml
+++ b/doc/classes/Array.xml
@@ -53,70 +53,70 @@
 		</constructor>
 		<constructor name="Array">
 			<return type="Array" />
-			<argument index="0" name="from" type="Array" />
+			<param index="0" name="from" type="Array" />
 			<description>
 				Constructs an [Array] as a copy of the given [Array].
 			</description>
 		</constructor>
 		<constructor name="Array">
 			<return type="Array" />
-			<argument index="0" name="from" type="PackedByteArray" />
+			<param index="0" name="from" type="PackedByteArray" />
 			<description>
 				Constructs an array from a [PackedByteArray].
 			</description>
 		</constructor>
 		<constructor name="Array">
 			<return type="Array" />
-			<argument index="0" name="from" type="PackedColorArray" />
+			<param index="0" name="from" type="PackedColorArray" />
 			<description>
 				Constructs an array from a [PackedColorArray].
 			</description>
 		</constructor>
 		<constructor name="Array">
 			<return type="Array" />
-			<argument index="0" name="from" type="PackedFloat32Array" />
+			<param index="0" name="from" type="PackedFloat32Array" />
 			<description>
 				Constructs an array from a [PackedFloat32Array].
 			</description>
 		</constructor>
 		<constructor name="Array">
 			<return type="Array" />
-			<argument index="0" name="from" type="PackedFloat64Array" />
+			<param index="0" name="from" type="PackedFloat64Array" />
 			<description>
 				Constructs an array from a [PackedFloat64Array].
 			</description>
 		</constructor>
 		<constructor name="Array">
 			<return type="Array" />
-			<argument index="0" name="from" type="PackedInt32Array" />
+			<param index="0" name="from" type="PackedInt32Array" />
 			<description>
 				Constructs an array from a [PackedInt32Array].
 			</description>
 		</constructor>
 		<constructor name="Array">
 			<return type="Array" />
-			<argument index="0" name="from" type="PackedInt64Array" />
+			<param index="0" name="from" type="PackedInt64Array" />
 			<description>
 				Constructs an array from a [PackedInt64Array].
 			</description>
 		</constructor>
 		<constructor name="Array">
 			<return type="Array" />
-			<argument index="0" name="from" type="PackedStringArray" />
+			<param index="0" name="from" type="PackedStringArray" />
 			<description>
 				Constructs an array from a [PackedStringArray].
 			</description>
 		</constructor>
 		<constructor name="Array">
 			<return type="Array" />
-			<argument index="0" name="from" type="PackedVector2Array" />
+			<param index="0" name="from" type="PackedVector2Array" />
 			<description>
 				Constructs an array from a [PackedVector2Array].
 			</description>
 		</constructor>
 		<constructor name="Array">
 			<return type="Array" />
-			<argument index="0" name="from" type="PackedVector3Array" />
+			<param index="0" name="from" type="PackedVector3Array" />
 			<description>
 				Constructs an array from a [PackedVector3Array].
 			</description>
@@ -125,7 +125,7 @@
 	<methods>
 		<method name="all" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="method" type="Callable" />
+			<param index="0" name="method" type="Callable" />
 			<description>
 				Calls the provided [Callable] on each element in the array and returns [code]true[/code] if the [Callable] returns [code]true[/code] for [i]all[/i] elements in the array. If the [Callable] returns [code]false[/code] for one array element or more, this method returns [code]false[/code].
 				The callable's method should take one [Variant] parameter (the current array element) and return a boolean value.
@@ -148,7 +148,7 @@
 		</method>
 		<method name="any" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="method" type="Callable" />
+			<param index="0" name="method" type="Callable" />
 			<description>
 				Calls the provided [Callable] on each element in the array and returns [code]true[/code] if the [Callable] returns [code]true[/code] for [i]one or more[/i] elements in the array. If the [Callable] returns [code]false[/code] for all elements in the array, this method returns [code]false[/code].
 				The callable's method should take one [Variant] parameter (the current array element) and return a boolean value.
@@ -171,14 +171,14 @@
 		</method>
 		<method name="append">
 			<return type="void" />
-			<argument index="0" name="value" type="Variant" />
+			<param index="0" name="value" type="Variant" />
 			<description>
 				Appends an element at the end of the array (alias of [method push_back]).
 			</description>
 		</method>
 		<method name="append_array">
 			<return type="void" />
-			<argument index="0" name="array" type="Array" />
+			<param index="0" name="array" type="Array" />
 			<description>
 				Appends another array at the end of this array.
 				[codeblock]
@@ -198,20 +198,20 @@
 		</method>
 		<method name="bsearch">
 			<return type="int" />
-			<argument index="0" name="value" type="Variant" />
-			<argument index="1" name="before" type="bool" default="true" />
+			<param index="0" name="value" type="Variant" />
+			<param index="1" name="before" type="bool" default="true" />
 			<description>
-				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a [code]before[/code] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array.
+				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a [param before] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array.
 				[b]Note:[/b] Calling [method bsearch] on an unsorted array results in unexpected behavior.
 			</description>
 		</method>
 		<method name="bsearch_custom">
 			<return type="int" />
-			<argument index="0" name="value" type="Variant" />
-			<argument index="1" name="func" type="Callable" />
-			<argument index="2" name="before" type="bool" default="true" />
+			<param index="0" name="value" type="Variant" />
+			<param index="1" name="func" type="Callable" />
+			<param index="2" name="before" type="bool" default="true" />
 			<description>
-				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search and a custom comparison method. Optionally, a [code]before[/code] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array. The custom method receives two arguments (an element from the array and the value searched for) and must return [code]true[/code] if the first argument is less than the second, and return [code]false[/code] otherwise.
+				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search and a custom comparison method. Optionally, a [param before] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array. The custom method receives two arguments (an element from the array and the value searched for) and must return [code]true[/code] if the first argument is less than the second, and return [code]false[/code] otherwise.
 				[b]Note:[/b] Calling [method bsearch_custom] on an unsorted array results in unexpected behavior.
 			</description>
 		</method>
@@ -223,22 +223,22 @@
 		</method>
 		<method name="count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="Variant" />
+			<param index="0" name="value" type="Variant" />
 			<description>
 				Returns the number of times an element is in the array.
 			</description>
 		</method>
 		<method name="duplicate" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="deep" type="bool" default="false" />
+			<param index="0" name="deep" type="bool" default="false" />
 			<description>
 				Returns a copy of the array.
-				If [code]deep[/code] is [code]true[/code], a deep copy is performed: all nested arrays and dictionaries are duplicated and will not be shared with the original array. If [code]false[/code], a shallow copy is made and references to the original nested arrays and dictionaries are kept, so that modifying a sub-array or dictionary in the copy will also impact those referenced in the source array.
+				If [param deep] is [code]true[/code], a deep copy is performed: all nested arrays and dictionaries are duplicated and will not be shared with the original array. If [code]false[/code], a shallow copy is made and references to the original nested arrays and dictionaries are kept, so that modifying a sub-array or dictionary in the copy will also impact those referenced in the source array.
 			</description>
 		</method>
 		<method name="erase">
 			<return type="void" />
-			<argument index="0" name="value" type="Variant" />
+			<param index="0" name="value" type="Variant" />
 			<description>
 				Removes the first occurrence of a value from the array. If the value does not exist in the array, nothing happens. To remove an element by index, use [method remove_at] instead.
 				[b]Note:[/b] This method acts in-place and doesn't return a value.
@@ -247,7 +247,7 @@
 		</method>
 		<method name="fill">
 			<return type="void" />
-			<argument index="0" name="value" type="Variant" />
+			<param index="0" name="value" type="Variant" />
 			<description>
 				Assigns the given value to all elements in the array. This can typically be used together with [method resize] to create an array with a given size and initialized elements:
 				[codeblocks]
@@ -266,7 +266,7 @@
 		</method>
 		<method name="filter" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="method" type="Callable" />
+			<param index="0" name="method" type="Callable" />
 			<description>
 				Calls the provided [Callable] on each element in the array and returns a new array with the elements for which the method returned [code]true[/code].
 				The callable's method should take one [Variant] parameter (the current array element) and return a boolean value.
@@ -283,15 +283,15 @@
 		</method>
 		<method name="find" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="what" type="Variant" />
-			<argument index="1" name="from" type="int" default="0" />
+			<param index="0" name="what" type="Variant" />
+			<param index="1" name="from" type="int" default="0" />
 			<description>
 				Searches the array for a value and returns its index or [code]-1[/code] if not found. Optionally, the initial search index can be passed.
 			</description>
 		</method>
 		<method name="find_last" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="Variant" />
+			<param index="0" name="value" type="Variant" />
 			<description>
 				Searches the array in reverse order for a value and returns its index or [code]-1[/code] if not found.
 			</description>
@@ -305,7 +305,7 @@
 		</method>
 		<method name="has" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="value" type="Variant" />
+			<param index="0" name="value" type="Variant" />
 			<description>
 				Returns [code]true[/code] if the array contains the given value.
 				[codeblocks]
@@ -352,8 +352,8 @@
 		</method>
 		<method name="insert">
 			<return type="int" />
-			<argument index="0" name="position" type="int" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="position" type="int" />
+			<param index="1" name="value" type="Variant" />
 			<description>
 				Inserts a new element at a given position in the array. The position must be valid, or at the end of the array ([code]pos == size()[/code]).
 				[b]Note:[/b] This method acts in-place and doesn't return a value.
@@ -368,7 +368,7 @@
 		</method>
 		<method name="map" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="method" type="Callable" />
+			<param index="0" name="method" type="Callable" />
 			<description>
 				Calls the provided [Callable] for each element in the array and returns a new array filled with values returned by the method.
 				The callable's method should take one [Variant] parameter (the current array element) and can return any [Variant].
@@ -397,9 +397,9 @@
 		</method>
 		<method name="pop_at">
 			<return type="Variant" />
-			<argument index="0" name="position" type="int" />
+			<param index="0" name="position" type="int" />
 			<description>
-				Removes and returns the element of the array at index [code]position[/code]. If negative, [code]position[/code] is considered relative to the end of the array. Leaves the array untouched and returns [code]null[/code] if the array is empty or if it's accessed out of bounds. An error message is printed when the array is accessed out of bounds, but not when the array is empty.
+				Removes and returns the element of the array at index [param position]. If negative, [param position] is considered relative to the end of the array. Leaves the array untouched and returns [code]null[/code] if the array is empty or if it's accessed out of bounds. An error message is printed when the array is accessed out of bounds, but not when the array is empty.
 				[b]Note:[/b] On large arrays, this method can be slower than [method pop_back] as it will reindex the array's elements that are located after the removed element. The larger the array and the lower the index of the removed element, the slower [method pop_at] will be.
 			</description>
 		</method>
@@ -418,14 +418,14 @@
 		</method>
 		<method name="push_back">
 			<return type="void" />
-			<argument index="0" name="value" type="Variant" />
+			<param index="0" name="value" type="Variant" />
 			<description>
 				Appends an element at the end of the array. See also [method push_front].
 			</description>
 		</method>
 		<method name="push_front">
 			<return type="void" />
-			<argument index="0" name="value" type="Variant" />
+			<param index="0" name="value" type="Variant" />
 			<description>
 				Adds an element at the beginning of the array. See also [method push_back].
 				[b]Note:[/b] On large arrays, this method is much slower than [method push_back] as it will reindex all the array's elements every time it's called. The larger the array, the slower [method push_front] will be.
@@ -433,11 +433,11 @@
 		</method>
 		<method name="reduce" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="method" type="Callable" />
-			<argument index="1" name="accum" type="Variant" default="null" />
+			<param index="0" name="method" type="Callable" />
+			<param index="1" name="accum" type="Variant" default="null" />
 			<description>
-				Calls the provided [Callable] for each element in array and accumulates the result in [code]accum[/code].
-				The callable's method takes two arguments: the current value of [code]accum[/code] and the current array element. If [code]accum[/code] is [code]null[/code] (default value), the iteration will start from the second element, with the first one used as initial value of [code]accum[/code].
+				Calls the provided [Callable] for each element in array and accumulates the result in [param accum].
+				The callable's method takes two arguments: the current value of [param accum] and the current array element. If [param accum] is [code]null[/code] (default value), the iteration will start from the second element, with the first one used as initial value of [param accum].
 				[codeblock]
 				func _ready():
 				    print([1, 2, 3].reduce(sum, 10)) # Prints 16.
@@ -451,7 +451,7 @@
 		</method>
 		<method name="remove_at">
 			<return type="void" />
-			<argument index="0" name="position" type="int" />
+			<param index="0" name="position" type="int" />
 			<description>
 				Removes an element from the array by index. If the index does not exist in the array, nothing happens. To remove an element by searching for its value, use [method erase] instead.
 				[b]Note:[/b] This method acts in-place and doesn't return a value.
@@ -460,7 +460,7 @@
 		</method>
 		<method name="resize">
 			<return type="int" />
-			<argument index="0" name="size" type="int" />
+			<param index="0" name="size" type="int" />
 			<description>
 				Resizes the array to contain a different number of elements. If the array size is smaller, elements are cleared, if bigger, new elements are [code]null[/code].
 			</description>
@@ -473,8 +473,8 @@
 		</method>
 		<method name="rfind" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="what" type="Variant" />
-			<argument index="1" name="from" type="int" default="-1" />
+			<param index="0" name="what" type="Variant" />
+			<param index="1" name="from" type="int" default="-1" />
 			<description>
 				Searches the array in reverse order. Optionally, a start search index can be passed. If negative, the start index is considered relative to the end of the array.
 			</description>
@@ -493,16 +493,16 @@
 		</method>
 		<method name="slice" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="begin" type="int" />
-			<argument index="1" name="end" type="int" default="2147483647" />
-			<argument index="2" name="step" type="int" default="1" />
-			<argument index="3" name="deep" type="bool" default="false" />
+			<param index="0" name="begin" type="int" />
+			<param index="1" name="end" type="int" default="2147483647" />
+			<param index="2" name="step" type="int" default="1" />
+			<param index="3" name="deep" type="bool" default="false" />
 			<description>
-				Returns the slice of the [Array], from [code]begin[/code] (inclusive) to [code]end[/code] (exclusive), as a new [Array].
-				The absolute value of [code]begin[/code] and [code]end[/code] will be clamped to the array size, so the default value for [code]end[/code] makes it slice to the size of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for [code]arr.slice(1, arr.size())[/code]).
-				If either [code]begin[/code] or [code]end[/code] are negative, they will be relative to the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for [code]arr.slice(0, arr.size() - 2)[/code]).
-				If specified, [code]step[/code] is the relative index between source elements. It can be negative, then [code]begin[/code] must be higher than [code]end[/code]. For example, [code][0, 1, 2, 3, 4, 5].slice(5, 1, -2)[/code] returns [code][5, 3][/code]).
-				If [code]deep[/code] is true, each element will be copied by value rather than by reference.
+				Returns the slice of the [Array], from [param begin] (inclusive) to [param end] (exclusive), as a new [Array].
+				The absolute value of [param begin] and [param end] will be clamped to the array size, so the default value for [param end] makes it slice to the size of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for [code]arr.slice(1, arr.size())[/code]).
+				If either [param begin] or [param end] are negative, they will be relative to the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for [code]arr.slice(0, arr.size() - 2)[/code]).
+				If specified, [param step] is the relative index between source elements. It can be negative, then [param begin] must be higher than [param end]. For example, [code][0, 1, 2, 3, 4, 5].slice(5, 1, -2)[/code] returns [code][5, 3][/code]).
+				If [param deep] is true, each element will be copied by value rather than by reference.
 			</description>
 		</method>
 		<method name="sort">
@@ -530,7 +530,7 @@
 		</method>
 		<method name="sort_custom">
 			<return type="void" />
-			<argument index="0" name="func" type="Callable" />
+			<param index="0" name="func" type="Callable" />
 			<description>
 				Sorts the array using a custom method. The custom method receives two arguments (a pair of elements from the array) and must return either [code]true[/code] or [code]false[/code]. For two elements [code]a[/code] and [code]b[/code], if the given method returns [code]true[/code], element [code]b[/code] will be after element [code]a[/code] in the array.
 				[b]Note:[/b] You cannot randomize the return value as the heapsort algorithm expects a deterministic result. Doing so will result in unexpected behavior.
@@ -560,58 +560,58 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Array" />
+			<param index="0" name="right" type="Array" />
 			<description>
-				Compares the left operand [Array] against the [code]right[/code] [Array]. Returns [code]true[/code] if the sizes or contents of the arrays are [i]not[/i] equal, [code]false[/code] otherwise.
+				Compares the left operand [Array] against the [param right] [Array]. Returns [code]true[/code] if the sizes or contents of the arrays are [i]not[/i] equal, [code]false[/code] otherwise.
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="Array" />
-			<argument index="0" name="right" type="Array" />
+			<param index="0" name="right" type="Array" />
 			<description>
-				Concatenates two [Array]s together, with the [code]right[/code] [Array] being added to the end of the [Array] specified in the left operand. For example, [code][1, 2] + [3, 4][/code] results in [code][1, 2, 3, 4][/code].
+				Concatenates two [Array]s together, with the [param right] [Array] being added to the end of the [Array] specified in the left operand. For example, [code][1, 2] + [3, 4][/code] results in [code][1, 2, 3, 4][/code].
 			</description>
 		</operator>
 		<operator name="operator &lt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="Array" />
+			<param index="0" name="right" type="Array" />
 			<description>
-				Performs a comparison for each index between the left operand [Array] and the [code]right[/code] [Array], considering the highest common index of both arrays for this comparison: Returns [code]true[/code] on the first occurrence of an element that is less, or [code]false[/code] if the element is greater. Note that depending on the type of data stored, this function may be recursive. If all elements are equal, it compares the length of both arrays and returns [code]false[/code] if the left operand [Array] has less elements, otherwise it returns [code]true[/code].
+				Performs a comparison for each index between the left operand [Array] and the [param right] [Array], considering the highest common index of both arrays for this comparison: Returns [code]true[/code] on the first occurrence of an element that is less, or [code]false[/code] if the element is greater. Note that depending on the type of data stored, this function may be recursive. If all elements are equal, it compares the length of both arrays and returns [code]false[/code] if the left operand [Array] has fewer elements, otherwise it returns [code]true[/code].
 			</description>
 		</operator>
 		<operator name="operator &lt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Array" />
+			<param index="0" name="right" type="Array" />
 			<description>
-				Performs a comparison for each index between the left operand [Array] and the [code]right[/code] [Array], considering the highest common index of both arrays for this comparison: Returns [code]true[/code] on the first occurrence of an element that is less, or [code]false[/code] if the element is greater. Note that depending on the type of data stored, this function may be recursive. If all elements are equal, it compares the length of both arrays and returns [code]true[/code] if the left operand [Array] has less or the same number of elements, otherwise it returns [code]false[/code].
+				Performs a comparison for each index between the left operand [Array] and the [param right] [Array], considering the highest common index of both arrays for this comparison: Returns [code]true[/code] on the first occurrence of an element that is less, or [code]false[/code] if the element is greater. Note that depending on the type of data stored, this function may be recursive. If all elements are equal, it compares the length of both arrays and returns [code]true[/code] if the left operand [Array] has the same number of elements or fewer, otherwise it returns [code]false[/code].
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="Array" />
+			<param index="0" name="right" type="Array" />
 			<description>
-				Compares the left operand [Array] against the [code]right[/code] [Array]. Returns [code]true[/code] if the sizes and contents of the arrays are equal, [code]false[/code] otherwise.
+				Compares the left operand [Array] against the [param right] [Array]. Returns [code]true[/code] if the sizes and contents of the arrays are equal, [code]false[/code] otherwise.
 			</description>
 		</operator>
 		<operator name="operator &gt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="Array" />
+			<param index="0" name="right" type="Array" />
 			<description>
-				Performs a comparison for each index between the left operand [Array] and the [code]right[/code] [Array], considering the highest common index of both arrays for this comparison: Returns [code]true[/code] on the first occurrence of an element that is greater, or [code]false[/code] if the element is less. Note that depending on the type of data stored, this function may be recursive. If all elements are equal, it compares the length of both arrays and returns [code]true[/code] if the [code]right[/code] [Array] has more elements, otherwise it returns [code]false[/code].
+				Performs a comparison for each index between the left operand [Array] and the [param right] [Array], considering the highest common index of both arrays for this comparison: Returns [code]true[/code] on the first occurrence of an element that is greater, or [code]false[/code] if the element is less. Note that depending on the type of data stored, this function may be recursive. If all elements are equal, it compares the length of both arrays and returns [code]true[/code] if the [param right] [Array] has more elements, otherwise it returns [code]false[/code].
 			</description>
 		</operator>
 		<operator name="operator &gt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Array" />
+			<param index="0" name="right" type="Array" />
 			<description>
-				Performs a comparison for each index between the left operand [Array] and the [code]right[/code] [Array], considering the highest common index of both arrays for this comparison: Returns [code]true[/code] on the first occurrence of an element that is greater, or [code]false[/code] if the element is less. Note that depending on the type of data stored, this function may be recursive. If all elements are equal, it compares the length of both arrays and returns [code]true[/code] if the [code]right[/code] [Array] has more or the same number of elements, otherwise it returns [code]false[/code].
+				Performs a comparison for each index between the left operand [Array] and the [param right] [Array], considering the highest common index of both arrays for this comparison: Returns [code]true[/code] on the first occurrence of an element that is greater, or [code]false[/code] if the element is less. Note that depending on the type of data stored, this function may be recursive. If all elements are equal, it compares the length of both arrays and returns [code]true[/code] if the [param right] [Array] has more or the same number of elements, otherwise it returns [code]false[/code].
 			</description>
 		</operator>
 		<operator name="operator []">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns a reference to the element of type [Variant] at the specified location. Arrays start at index 0. [code]index[/code] can be a zero or positive value to start from the beginning, or a negative value to start from the end. Out-of-bounds array access causes a run-time error, which will result in an error being printed and the project execution pausing if run from the editor.
+				Returns a reference to the element of type [Variant] at the specified location. Arrays start at index 0. [param index] can be a zero or positive value to start from the beginning, or a negative value to start from the end. Out-of-bounds array access causes a run-time error, which will result in an error being printed and the project execution pausing if run from the editor.
 			</description>
 		</operator>
 	</operators>
diff --git a/doc/classes/ArrayMesh.xml b/doc/classes/ArrayMesh.xml
index f5c799d4de..c766becce2 100644
--- a/doc/classes/ArrayMesh.xml
+++ b/doc/classes/ArrayMesh.xml
@@ -52,22 +52,22 @@
 	<methods>
 		<method name="add_blend_shape">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Adds name for a blend shape that will be added with [method add_surface_from_arrays]. Must be called before surface is added.
 			</description>
 		</method>
 		<method name="add_surface_from_arrays">
 			<return type="void" />
-			<argument index="0" name="primitive" type="int" enum="Mesh.PrimitiveType" />
-			<argument index="1" name="arrays" type="Array" />
-			<argument index="2" name="blend_shapes" type="Array" default="[]" />
-			<argument index="3" name="lods" type="Dictionary" default="{}" />
-			<argument index="4" name="compress_flags" type="int" default="0" />
+			<param index="0" name="primitive" type="int" enum="Mesh.PrimitiveType" />
+			<param index="1" name="arrays" type="Array" />
+			<param index="2" name="blend_shapes" type="Array" default="[]" />
+			<param index="3" name="lods" type="Dictionary" default="{}" />
+			<param index="4" name="compress_flags" type="int" default="0" />
 			<description>
 				Creates a new surface.
-				Surfaces are created to be rendered using a [code]primitive[/code], which may be any of the types defined in [enum Mesh.PrimitiveType]. (As a note, when using indices, it is recommended to only use points, lines, or triangles.) [method Mesh.get_surface_count] will become the [code]surf_idx[/code] for this new surface.
-				The [code]arrays[/code] argument is an array of arrays. See [enum Mesh.ArrayType] for the values used in this array. For example, [code]arrays[0][/code] is the array of vertices. That first vertex sub-array is always required; the others are optional. Adding an index array puts this function into "index mode" where the vertex and other arrays become the sources of data and the index array defines the vertex order. All sub-arrays must have the same length as the vertex array (or be an exact multiple of the vertex array's length, when multiple elements of a sub-array correspond to a single vertex) or be empty, except for [constant Mesh.ARRAY_INDEX] if it is used.
+				Surfaces are created to be rendered using a [param primitive], which may be any of the types defined in [enum Mesh.PrimitiveType]. (As a note, when using indices, it is recommended to only use points, lines, or triangles.) [method Mesh.get_surface_count] will become the [code]surf_idx[/code] for this new surface.
+				The [param arrays] argument is an array of arrays. See [enum Mesh.ArrayType] for the values used in this array. For example, [code]arrays[0][/code] is the array of vertices. That first vertex sub-array is always required; the others are optional. Adding an index array puts this function into "index mode" where the vertex and other arrays become the sources of data and the index array defines the vertex order. All sub-arrays must have the same length as the vertex array (or be an exact multiple of the vertex array's length, when multiple elements of a sub-array correspond to a single vertex) or be empty, except for [constant Mesh.ARRAY_INDEX] if it is used.
 			</description>
 		</method>
 		<method name="clear_blend_shapes">
@@ -90,15 +90,15 @@
 		</method>
 		<method name="get_blend_shape_name" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Returns the name of the blend shape at this index.
 			</description>
 		</method>
 		<method name="lightmap_unwrap">
 			<return type="int" enum="Error" />
-			<argument index="0" name="transform" type="Transform3D" />
-			<argument index="1" name="texel_size" type="float" />
+			<param index="0" name="transform" type="Transform3D" />
+			<param index="1" name="texel_size" type="float" />
 			<description>
 				Will perform a UV unwrap on the [ArrayMesh] to prepare the mesh for lightmapping.
 			</description>
@@ -111,83 +111,83 @@
 		</method>
 		<method name="set_blend_shape_name">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="name" type="StringName" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="name" type="StringName" />
 			<description>
 				Sets the name of the blend shape at this index.
 			</description>
 		</method>
 		<method name="surface_find_by_name" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Returns the index of the first surface with this name held within this [ArrayMesh]. If none are found, -1 is returned.
 			</description>
 		</method>
 		<method name="surface_get_array_index_len" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="surf_idx" type="int" />
+			<param index="0" name="surf_idx" type="int" />
 			<description>
 				Returns the length in indices of the index array in the requested surface (see [method add_surface_from_arrays]).
 			</description>
 		</method>
 		<method name="surface_get_array_len" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="surf_idx" type="int" />
+			<param index="0" name="surf_idx" type="int" />
 			<description>
 				Returns the length in vertices of the vertex array in the requested surface (see [method add_surface_from_arrays]).
 			</description>
 		</method>
 		<method name="surface_get_format" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="surf_idx" type="int" />
+			<param index="0" name="surf_idx" type="int" />
 			<description>
 				Returns the format mask of the requested surface (see [method add_surface_from_arrays]).
 			</description>
 		</method>
 		<method name="surface_get_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="surf_idx" type="int" />
+			<param index="0" name="surf_idx" type="int" />
 			<description>
 				Gets the name assigned to this surface.
 			</description>
 		</method>
 		<method name="surface_get_primitive_type" qualifiers="const">
 			<return type="int" enum="Mesh.PrimitiveType" />
-			<argument index="0" name="surf_idx" type="int" />
+			<param index="0" name="surf_idx" type="int" />
 			<description>
 				Returns the primitive type of the requested surface (see [method add_surface_from_arrays]).
 			</description>
 		</method>
 		<method name="surface_set_name">
 			<return type="void" />
-			<argument index="0" name="surf_idx" type="int" />
-			<argument index="1" name="name" type="String" />
+			<param index="0" name="surf_idx" type="int" />
+			<param index="1" name="name" type="String" />
 			<description>
 				Sets a name for a given surface.
 			</description>
 		</method>
 		<method name="surface_update_attribute_region">
 			<return type="void" />
-			<argument index="0" name="surf_idx" type="int" />
-			<argument index="1" name="offset" type="int" />
-			<argument index="2" name="data" type="PackedByteArray" />
+			<param index="0" name="surf_idx" type="int" />
+			<param index="1" name="offset" type="int" />
+			<param index="2" name="data" type="PackedByteArray" />
 			<description>
 			</description>
 		</method>
 		<method name="surface_update_skin_region">
 			<return type="void" />
-			<argument index="0" name="surf_idx" type="int" />
-			<argument index="1" name="offset" type="int" />
-			<argument index="2" name="data" type="PackedByteArray" />
+			<param index="0" name="surf_idx" type="int" />
+			<param index="1" name="offset" type="int" />
+			<param index="2" name="data" type="PackedByteArray" />
 			<description>
 			</description>
 		</method>
 		<method name="surface_update_vertex_region">
 			<return type="void" />
-			<argument index="0" name="surf_idx" type="int" />
-			<argument index="1" name="offset" type="int" />
-			<argument index="2" name="data" type="PackedByteArray" />
+			<param index="0" name="surf_idx" type="int" />
+			<param index="1" name="offset" type="int" />
+			<param index="2" name="data" type="PackedByteArray" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/ArrayOccluder3D.xml b/doc/classes/ArrayOccluder3D.xml
index 7f6bf93c8f..866427beeb 100644
--- a/doc/classes/ArrayOccluder3D.xml
+++ b/doc/classes/ArrayOccluder3D.xml
@@ -12,8 +12,8 @@
 	<methods>
 		<method name="set_arrays">
 			<return type="void" />
-			<argument index="0" name="vertices" type="PackedVector3Array" />
-			<argument index="1" name="indices" type="PackedInt32Array" />
+			<param index="0" name="vertices" type="PackedVector3Array" />
+			<param index="1" name="indices" type="PackedInt32Array" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/AudioEffectCapture.xml b/doc/classes/AudioEffectCapture.xml
index 8e02056456..c2a5ec3b45 100644
--- a/doc/classes/AudioEffectCapture.xml
+++ b/doc/classes/AudioEffectCapture.xml
@@ -13,9 +13,9 @@
 	<methods>
 		<method name="can_get_buffer" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="frames" type="int" />
+			<param index="0" name="frames" type="int" />
 			<description>
-				Returns [code]true[/code] if at least [code]frames[/code] audio frames are available to read in the internal ring buffer.
+				Returns [code]true[/code] if at least [param frames] audio frames are available to read in the internal ring buffer.
 			</description>
 		</method>
 		<method name="clear_buffer">
@@ -26,10 +26,10 @@
 		</method>
 		<method name="get_buffer">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="frames" type="int" />
+			<param index="0" name="frames" type="int" />
 			<description>
-				Gets the next [code]frames[/code] audio samples from the internal ring buffer.
-				Returns a [PackedVector2Array] containing exactly [code]frames[/code] audio samples if available, or an empty [PackedVector2Array] if insufficient data was available.
+				Gets the next [param frames] audio samples from the internal ring buffer.
+				Returns a [PackedVector2Array] containing exactly [param frames] audio samples if available, or an empty [PackedVector2Array] if insufficient data was available.
 			</description>
 		</method>
 		<method name="get_buffer_length_frames" qualifiers="const">
diff --git a/doc/classes/AudioEffectChorus.xml b/doc/classes/AudioEffectChorus.xml
index 5efba17e6a..de168cdfb0 100644
--- a/doc/classes/AudioEffectChorus.xml
+++ b/doc/classes/AudioEffectChorus.xml
@@ -12,79 +12,79 @@
 	<methods>
 		<method name="get_voice_cutoff_hz" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="voice_idx" type="int" />
+			<param index="0" name="voice_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_voice_delay_ms" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="voice_idx" type="int" />
+			<param index="0" name="voice_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_voice_depth_ms" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="voice_idx" type="int" />
+			<param index="0" name="voice_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_voice_level_db" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="voice_idx" type="int" />
+			<param index="0" name="voice_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_voice_pan" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="voice_idx" type="int" />
+			<param index="0" name="voice_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_voice_rate_hz" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="voice_idx" type="int" />
+			<param index="0" name="voice_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_voice_cutoff_hz">
 			<return type="void" />
-			<argument index="0" name="voice_idx" type="int" />
-			<argument index="1" name="cutoff_hz" type="float" />
+			<param index="0" name="voice_idx" type="int" />
+			<param index="1" name="cutoff_hz" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_voice_delay_ms">
 			<return type="void" />
-			<argument index="0" name="voice_idx" type="int" />
-			<argument index="1" name="delay_ms" type="float" />
+			<param index="0" name="voice_idx" type="int" />
+			<param index="1" name="delay_ms" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_voice_depth_ms">
 			<return type="void" />
-			<argument index="0" name="voice_idx" type="int" />
-			<argument index="1" name="depth_ms" type="float" />
+			<param index="0" name="voice_idx" type="int" />
+			<param index="1" name="depth_ms" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_voice_level_db">
 			<return type="void" />
-			<argument index="0" name="voice_idx" type="int" />
-			<argument index="1" name="level_db" type="float" />
+			<param index="0" name="voice_idx" type="int" />
+			<param index="1" name="level_db" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_voice_pan">
 			<return type="void" />
-			<argument index="0" name="voice_idx" type="int" />
-			<argument index="1" name="pan" type="float" />
+			<param index="0" name="voice_idx" type="int" />
+			<param index="1" name="pan" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_voice_rate_hz">
 			<return type="void" />
-			<argument index="0" name="voice_idx" type="int" />
-			<argument index="1" name="rate_hz" type="float" />
+			<param index="0" name="voice_idx" type="int" />
+			<param index="1" name="rate_hz" type="float" />
 			<description>
 			</description>
 		</method>
@@ -166,7 +166,7 @@
 			The voice's filter rate.
 		</member>
 		<member name="voice_count" type="int" setter="set_voice_count" getter="get_voice_count" default="2">
-			The amount of voices in the effect.
+			The number of voices in the effect.
 		</member>
 		<member name="wet" type="float" setter="set_wet" getter="get_wet" default="0.5">
 			The effect's processed signal.
diff --git a/doc/classes/AudioEffectEQ.xml b/doc/classes/AudioEffectEQ.xml
index ce5b6de3be..6e4040c16e 100644
--- a/doc/classes/AudioEffectEQ.xml
+++ b/doc/classes/AudioEffectEQ.xml
@@ -19,15 +19,15 @@
 		</method>
 		<method name="get_band_gain_db" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="band_idx" type="int" />
+			<param index="0" name="band_idx" type="int" />
 			<description>
 				Returns the band's gain at the specified index, in dB.
 			</description>
 		</method>
 		<method name="set_band_gain_db">
 			<return type="void" />
-			<argument index="0" name="band_idx" type="int" />
-			<argument index="1" name="volume_db" type="float" />
+			<param index="0" name="band_idx" type="int" />
+			<param index="1" name="volume_db" type="float" />
 			<description>
 				Sets band's gain at the specified index, in dB.
 			</description>
diff --git a/doc/classes/AudioEffectInstance.xml b/doc/classes/AudioEffectInstance.xml
index f50246d6ca..bc3d579f36 100644
--- a/doc/classes/AudioEffectInstance.xml
+++ b/doc/classes/AudioEffectInstance.xml
@@ -9,9 +9,9 @@
 	<methods>
 		<method name="_process" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="src_buffer" type="const void*" />
-			<argument index="1" name="dst_buffer" type="AudioFrame*" />
-			<argument index="2" name="frame_count" type="int" />
+			<param index="0" name="src_buffer" type="const void*" />
+			<param index="1" name="dst_buffer" type="AudioFrame*" />
+			<param index="2" name="frame_count" type="int" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/AudioEffectRecord.xml b/doc/classes/AudioEffectRecord.xml
index 32a6aea340..ff034389fc 100644
--- a/doc/classes/AudioEffectRecord.xml
+++ b/doc/classes/AudioEffectRecord.xml
@@ -27,7 +27,7 @@
 		</method>
 		<method name="set_recording_active">
 			<return type="void" />
-			<argument index="0" name="record" type="bool" />
+			<param index="0" name="record" type="bool" />
 			<description>
 				If [code]true[/code], the sound will be recorded. Note that restarting the recording will remove the previously recorded sample.
 			</description>
diff --git a/doc/classes/AudioEffectSpectrumAnalyzerInstance.xml b/doc/classes/AudioEffectSpectrumAnalyzerInstance.xml
index 08dd5a5d69..55ac78f197 100644
--- a/doc/classes/AudioEffectSpectrumAnalyzerInstance.xml
+++ b/doc/classes/AudioEffectSpectrumAnalyzerInstance.xml
@@ -9,9 +9,9 @@
 	<methods>
 		<method name="get_magnitude_for_frequency_range" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="from_hz" type="float" />
-			<argument index="1" name="to_hz" type="float" />
-			<argument index="2" name="mode" type="int" enum="AudioEffectSpectrumAnalyzerInstance.MagnitudeMode" default="1" />
+			<param index="0" name="from_hz" type="float" />
+			<param index="1" name="to_hz" type="float" />
+			<param index="2" name="mode" type="int" enum="AudioEffectSpectrumAnalyzerInstance.MagnitudeMode" default="1" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/AudioServer.xml b/doc/classes/AudioServer.xml
index 28dcd2794e..5bd1c82641 100644
--- a/doc/classes/AudioServer.xml
+++ b/doc/classes/AudioServer.xml
@@ -15,18 +15,18 @@
 	<methods>
 		<method name="add_bus">
 			<return type="void" />
-			<argument index="0" name="at_position" type="int" default="-1" />
+			<param index="0" name="at_position" type="int" default="-1" />
 			<description>
-				Adds a bus at [code]at_position[/code].
+				Adds a bus at [param at_position].
 			</description>
 		</method>
 		<method name="add_bus_effect">
 			<return type="void" />
-			<argument index="0" name="bus_idx" type="int" />
-			<argument index="1" name="effect" type="AudioEffect" />
-			<argument index="2" name="at_position" type="int" default="-1" />
+			<param index="0" name="bus_idx" type="int" />
+			<param index="1" name="effect" type="AudioEffect" />
+			<param index="2" name="at_position" type="int" default="-1" />
 			<description>
-				Adds an [AudioEffect] effect to the bus [code]bus_idx[/code] at [code]at_position[/code].
+				Adds an [AudioEffect] effect to the bus [param bus_idx] at [param at_position].
 			</description>
 		</method>
 		<method name="capture_get_device_list">
@@ -43,77 +43,77 @@
 		</method>
 		<method name="get_bus_channels" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="bus_idx" type="int" />
+			<param index="0" name="bus_idx" type="int" />
 			<description>
-				Returns the amount of channels of the bus at index [code]bus_idx[/code].
+				Returns the number of channels of the bus at index [param bus_idx].
 			</description>
 		</method>
 		<method name="get_bus_effect">
 			<return type="AudioEffect" />
-			<argument index="0" name="bus_idx" type="int" />
-			<argument index="1" name="effect_idx" type="int" />
+			<param index="0" name="bus_idx" type="int" />
+			<param index="1" name="effect_idx" type="int" />
 			<description>
-				Returns the [AudioEffect] at position [code]effect_idx[/code] in bus [code]bus_idx[/code].
+				Returns the [AudioEffect] at position [param effect_idx] in bus [param bus_idx].
 			</description>
 		</method>
 		<method name="get_bus_effect_count">
 			<return type="int" />
-			<argument index="0" name="bus_idx" type="int" />
+			<param index="0" name="bus_idx" type="int" />
 			<description>
-				Returns the number of effects on the bus at [code]bus_idx[/code].
+				Returns the number of effects on the bus at [param bus_idx].
 			</description>
 		</method>
 		<method name="get_bus_effect_instance">
 			<return type="AudioEffectInstance" />
-			<argument index="0" name="bus_idx" type="int" />
-			<argument index="1" name="effect_idx" type="int" />
-			<argument index="2" name="channel" type="int" default="0" />
+			<param index="0" name="bus_idx" type="int" />
+			<param index="1" name="effect_idx" type="int" />
+			<param index="2" name="channel" type="int" default="0" />
 			<description>
 				Returns the [AudioEffectInstance] assigned to the given bus and effect indices (and optionally channel).
 			</description>
 		</method>
 		<method name="get_bus_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="bus_name" type="StringName" />
+			<param index="0" name="bus_name" type="StringName" />
 			<description>
-				Returns the index of the bus with the name [code]bus_name[/code].
+				Returns the index of the bus with the name [param bus_name].
 			</description>
 		</method>
 		<method name="get_bus_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="bus_idx" type="int" />
+			<param index="0" name="bus_idx" type="int" />
 			<description>
-				Returns the name of the bus with the index [code]bus_idx[/code].
+				Returns the name of the bus with the index [param bus_idx].
 			</description>
 		</method>
 		<method name="get_bus_peak_volume_left_db" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="bus_idx" type="int" />
-			<argument index="1" name="channel" type="int" />
+			<param index="0" name="bus_idx" type="int" />
+			<param index="1" name="channel" type="int" />
 			<description>
-				Returns the peak volume of the left speaker at bus index [code]bus_idx[/code] and channel index [code]channel[/code].
+				Returns the peak volume of the left speaker at bus index [param bus_idx] and channel index [param channel].
 			</description>
 		</method>
 		<method name="get_bus_peak_volume_right_db" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="bus_idx" type="int" />
-			<argument index="1" name="channel" type="int" />
+			<param index="0" name="bus_idx" type="int" />
+			<param index="1" name="channel" type="int" />
 			<description>
-				Returns the peak volume of the right speaker at bus index [code]bus_idx[/code] and channel index [code]channel[/code].
+				Returns the peak volume of the right speaker at bus index [param bus_idx] and channel index [param channel].
 			</description>
 		</method>
 		<method name="get_bus_send" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="bus_idx" type="int" />
+			<param index="0" name="bus_idx" type="int" />
 			<description>
-				Returns the name of the bus that the bus at index [code]bus_idx[/code] sends to.
+				Returns the name of the bus that the bus at index [param bus_idx] sends to.
 			</description>
 		</method>
 		<method name="get_bus_volume_db" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="bus_idx" type="int" />
+			<param index="0" name="bus_idx" type="int" />
 			<description>
-				Returns the volume of the bus at index [code]bus_idx[/code] in dB.
+				Returns the volume of the bus at index [param bus_idx] in dB.
 			</description>
 		</method>
 		<method name="get_device_list">
@@ -154,31 +154,31 @@
 		</method>
 		<method name="is_bus_bypassing_effects" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="bus_idx" type="int" />
+			<param index="0" name="bus_idx" type="int" />
 			<description>
-				If [code]true[/code], the bus at index [code]bus_idx[/code] is bypassing effects.
+				If [code]true[/code], the bus at index [param bus_idx] is bypassing effects.
 			</description>
 		</method>
 		<method name="is_bus_effect_enabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="bus_idx" type="int" />
-			<argument index="1" name="effect_idx" type="int" />
+			<param index="0" name="bus_idx" type="int" />
+			<param index="1" name="effect_idx" type="int" />
 			<description>
-				If [code]true[/code], the effect at index [code]effect_idx[/code] on the bus at index [code]bus_idx[/code] is enabled.
+				If [code]true[/code], the effect at index [param effect_idx] on the bus at index [param bus_idx] is enabled.
 			</description>
 		</method>
 		<method name="is_bus_mute" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="bus_idx" type="int" />
+			<param index="0" name="bus_idx" type="int" />
 			<description>
-				If [code]true[/code], the bus at index [code]bus_idx[/code] is muted.
+				If [code]true[/code], the bus at index [param bus_idx] is muted.
 			</description>
 		</method>
 		<method name="is_bus_solo" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="bus_idx" type="int" />
+			<param index="0" name="bus_idx" type="int" />
 			<description>
-				If [code]true[/code], the bus at index [code]bus_idx[/code] is in solo mode.
+				If [code]true[/code], the bus at index [param bus_idx] is in solo mode.
 			</description>
 		</method>
 		<method name="lock">
@@ -190,104 +190,104 @@
 		</method>
 		<method name="move_bus">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="to_index" type="int" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="to_index" type="int" />
 			<description>
-				Moves the bus from index [code]index[/code] to index [code]to_index[/code].
+				Moves the bus from index [param index] to index [param to_index].
 			</description>
 		</method>
 		<method name="remove_bus">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Removes the bus at index [code]index[/code].
+				Removes the bus at index [param index].
 			</description>
 		</method>
 		<method name="remove_bus_effect">
 			<return type="void" />
-			<argument index="0" name="bus_idx" type="int" />
-			<argument index="1" name="effect_idx" type="int" />
+			<param index="0" name="bus_idx" type="int" />
+			<param index="1" name="effect_idx" type="int" />
 			<description>
-				Removes the effect at index [code]effect_idx[/code] from the bus at index [code]bus_idx[/code].
+				Removes the effect at index [param effect_idx] from the bus at index [param bus_idx].
 			</description>
 		</method>
 		<method name="set_bus_bypass_effects">
 			<return type="void" />
-			<argument index="0" name="bus_idx" type="int" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="bus_idx" type="int" />
+			<param index="1" name="enable" type="bool" />
 			<description>
-				If [code]true[/code], the bus at index [code]bus_idx[/code] is bypassing effects.
+				If [code]true[/code], the bus at index [param bus_idx] is bypassing effects.
 			</description>
 		</method>
 		<method name="set_bus_effect_enabled">
 			<return type="void" />
-			<argument index="0" name="bus_idx" type="int" />
-			<argument index="1" name="effect_idx" type="int" />
-			<argument index="2" name="enabled" type="bool" />
+			<param index="0" name="bus_idx" type="int" />
+			<param index="1" name="effect_idx" type="int" />
+			<param index="2" name="enabled" type="bool" />
 			<description>
-				If [code]true[/code], the effect at index [code]effect_idx[/code] on the bus at index [code]bus_idx[/code] is enabled.
+				If [code]true[/code], the effect at index [param effect_idx] on the bus at index [param bus_idx] is enabled.
 			</description>
 		</method>
 		<method name="set_bus_layout">
 			<return type="void" />
-			<argument index="0" name="bus_layout" type="AudioBusLayout" />
+			<param index="0" name="bus_layout" type="AudioBusLayout" />
 			<description>
 				Overwrites the currently used [AudioBusLayout].
 			</description>
 		</method>
 		<method name="set_bus_mute">
 			<return type="void" />
-			<argument index="0" name="bus_idx" type="int" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="bus_idx" type="int" />
+			<param index="1" name="enable" type="bool" />
 			<description>
-				If [code]true[/code], the bus at index [code]bus_idx[/code] is muted.
+				If [code]true[/code], the bus at index [param bus_idx] is muted.
 			</description>
 		</method>
 		<method name="set_bus_name">
 			<return type="void" />
-			<argument index="0" name="bus_idx" type="int" />
-			<argument index="1" name="name" type="String" />
+			<param index="0" name="bus_idx" type="int" />
+			<param index="1" name="name" type="String" />
 			<description>
-				Sets the name of the bus at index [code]bus_idx[/code] to [code]name[/code].
+				Sets the name of the bus at index [param bus_idx] to [param name].
 			</description>
 		</method>
 		<method name="set_bus_send">
 			<return type="void" />
-			<argument index="0" name="bus_idx" type="int" />
-			<argument index="1" name="send" type="StringName" />
+			<param index="0" name="bus_idx" type="int" />
+			<param index="1" name="send" type="StringName" />
 			<description>
-				Connects the output of the bus at [code]bus_idx[/code] to the bus named [code]send[/code].
+				Connects the output of the bus at [param bus_idx] to the bus named [param send].
 			</description>
 		</method>
 		<method name="set_bus_solo">
 			<return type="void" />
-			<argument index="0" name="bus_idx" type="int" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="bus_idx" type="int" />
+			<param index="1" name="enable" type="bool" />
 			<description>
-				If [code]true[/code], the bus at index [code]bus_idx[/code] is in solo mode.
+				If [code]true[/code], the bus at index [param bus_idx] is in solo mode.
 			</description>
 		</method>
 		<method name="set_bus_volume_db">
 			<return type="void" />
-			<argument index="0" name="bus_idx" type="int" />
-			<argument index="1" name="volume_db" type="float" />
+			<param index="0" name="bus_idx" type="int" />
+			<param index="1" name="volume_db" type="float" />
 			<description>
-				Sets the volume of the bus at index [code]bus_idx[/code] to [code]volume_db[/code].
+				Sets the volume of the bus at index [param bus_idx] to [param volume_db].
 			</description>
 		</method>
 		<method name="set_enable_tagging_used_audio_streams">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
+			<param index="0" name="enable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="swap_bus_effects">
 			<return type="void" />
-			<argument index="0" name="bus_idx" type="int" />
-			<argument index="1" name="effect_idx" type="int" />
-			<argument index="2" name="by_effect_idx" type="int" />
+			<param index="0" name="bus_idx" type="int" />
+			<param index="1" name="effect_idx" type="int" />
+			<param index="2" name="by_effect_idx" type="int" />
 			<description>
-				Swaps the position of two effects in bus [code]bus_idx[/code].
+				Swaps the position of two effects in bus [param bus_idx].
 			</description>
 		</method>
 		<method name="unlock">
diff --git a/doc/classes/AudioStreamGeneratorPlayback.xml b/doc/classes/AudioStreamGeneratorPlayback.xml
index 06c285bff7..1c02dbd3ce 100644
--- a/doc/classes/AudioStreamGeneratorPlayback.xml
+++ b/doc/classes/AudioStreamGeneratorPlayback.xml
@@ -13,9 +13,9 @@
 	<methods>
 		<method name="can_push_buffer" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="amount" type="int" />
+			<param index="0" name="amount" type="int" />
 			<description>
-				Returns [code]true[/code] if a buffer of the size [code]amount[/code] can be pushed to the audio sample data buffer without overflowing it, [code]false[/code] otherwise.
+				Returns [code]true[/code] if a buffer of the size [param amount] can be pushed to the audio sample data buffer without overflowing it, [code]false[/code] otherwise.
 			</description>
 		</method>
 		<method name="clear_buffer">
@@ -37,14 +37,14 @@
 		</method>
 		<method name="push_buffer">
 			<return type="bool" />
-			<argument index="0" name="frames" type="PackedVector2Array" />
+			<param index="0" name="frames" type="PackedVector2Array" />
 			<description>
 				Pushes several audio data frames to the buffer. This is usually more efficient than [method push_frame] in C# and compiled languages via GDExtension, but [method push_buffer] may be [i]less[/i] efficient in GDScript.
 			</description>
 		</method>
 		<method name="push_frame">
 			<return type="bool" />
-			<argument index="0" name="frame" type="Vector2" />
+			<param index="0" name="frame" type="Vector2" />
 			<description>
 				Pushes a single audio data frame to the buffer. This is usually less efficient than [method push_buffer] in C# and compiled languages via GDExtension, but [method push_frame] may be [i]more[/i] efficient in GDScript.
 			</description>
diff --git a/doc/classes/AudioStreamPlayback.xml b/doc/classes/AudioStreamPlayback.xml
index f1a1c18c1c..e80c112f16 100644
--- a/doc/classes/AudioStreamPlayback.xml
+++ b/doc/classes/AudioStreamPlayback.xml
@@ -27,21 +27,21 @@
 		</method>
 		<method name="_mix" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="buffer" type="AudioFrame*" />
-			<argument index="1" name="rate_scale" type="float" />
-			<argument index="2" name="frames" type="int" />
+			<param index="0" name="buffer" type="AudioFrame*" />
+			<param index="1" name="rate_scale" type="float" />
+			<param index="2" name="frames" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_seek" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="position" type="float" />
+			<param index="0" name="position" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="_start" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="from_pos" type="float" />
+			<param index="0" name="from_pos" type="float" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/AudioStreamPlaybackResampled.xml b/doc/classes/AudioStreamPlaybackResampled.xml
index eb41e4256e..cc2268f145 100644
--- a/doc/classes/AudioStreamPlaybackResampled.xml
+++ b/doc/classes/AudioStreamPlaybackResampled.xml
@@ -14,8 +14,8 @@
 		</method>
 		<method name="_mix_resampled" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="dst_buffer" type="AudioFrame*" />
-			<argument index="1" name="frame_count" type="int" />
+			<param index="0" name="dst_buffer" type="AudioFrame*" />
+			<param index="1" name="frame_count" type="int" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/AudioStreamPlayer.xml b/doc/classes/AudioStreamPlayer.xml
index e0bc98e208..06e183f4e2 100644
--- a/doc/classes/AudioStreamPlayer.xml
+++ b/doc/classes/AudioStreamPlayer.xml
@@ -30,14 +30,14 @@
 		</method>
 		<method name="play">
 			<return type="void" />
-			<argument index="0" name="from_position" type="float" default="0.0" />
+			<param index="0" name="from_position" type="float" default="0.0" />
 			<description>
-				Plays the audio from the given [code]from_position[/code], in seconds.
+				Plays the audio from the given [param from_position], in seconds.
 			</description>
 		</method>
 		<method name="seek">
 			<return type="void" />
-			<argument index="0" name="to_position" type="float" />
+			<param index="0" name="to_position" type="float" />
 			<description>
 				Sets the position from which audio will be played, in seconds.
 			</description>
diff --git a/doc/classes/AudioStreamPlayer2D.xml b/doc/classes/AudioStreamPlayer2D.xml
index f04f95bd72..ae86fd0e66 100644
--- a/doc/classes/AudioStreamPlayer2D.xml
+++ b/doc/classes/AudioStreamPlayer2D.xml
@@ -4,7 +4,8 @@
 		Plays positional sound in 2D space.
 	</brief_description>
 	<description>
-		Plays audio that dampens with distance from screen center.
+		Plays audio that dampens with distance from a given position.
+		By default, audio is heard from the screen center. This can be changed by adding an [AudioListener2D] node to the scene and enabling it by calling [method AudioListener2D.make_current] on it.
 		See also [AudioStreamPlayer] to play a sound non-positionally.
 		[b]Note:[/b] Hiding an [AudioStreamPlayer2D] node does not disable its audio output. To temporarily disable an [AudioStreamPlayer2D]'s audio output, set [member volume_db] to a very low value like [code]-100[/code] (which isn't audible to human hearing).
 	</description>
@@ -26,14 +27,14 @@
 		</method>
 		<method name="play">
 			<return type="void" />
-			<argument index="0" name="from_position" type="float" default="0.0" />
+			<param index="0" name="from_position" type="float" default="0.0" />
 			<description>
-				Plays the audio from the given position [code]from_position[/code], in seconds.
+				Plays the audio from the given position [param from_position], in seconds.
 			</description>
 		</method>
 		<method name="seek">
 			<return type="void" />
-			<argument index="0" name="to_position" type="float" />
+			<param index="0" name="to_position" type="float" />
 			<description>
 				Sets the position from which audio will be played, in seconds.
 			</description>
diff --git a/doc/classes/AudioStreamPlayer3D.xml b/doc/classes/AudioStreamPlayer3D.xml
index 72febf7006..02192a9b7c 100644
--- a/doc/classes/AudioStreamPlayer3D.xml
+++ b/doc/classes/AudioStreamPlayer3D.xml
@@ -5,7 +5,7 @@
 	</brief_description>
 	<description>
 		Plays a sound effect with directed sound effects, dampens with distance if needed, generates effect of hearable position in space. For greater realism, a low-pass filter is automatically applied to distant sounds. This can be disabled by setting [member attenuation_filter_cutoff_hz] to [code]20500[/code].
-		By default, audio is heard from the camera position. This can be changed by adding a [AudioListener3D] node to the scene and enabling it by calling [method AudioListener3D.make_current] on it.
+		By default, audio is heard from the camera position. This can be changed by adding an [AudioListener3D] node to the scene and enabling it by calling [method AudioListener3D.make_current] on it.
 		See also [AudioStreamPlayer] to play a sound non-positionally.
 		[b]Note:[/b] Hiding an [AudioStreamPlayer3D] node does not disable its audio output. To temporarily disable an [AudioStreamPlayer3D]'s audio output, set [member unit_db] to a very low value like [code]-100[/code] (which isn't audible to human hearing).
 	</description>
@@ -27,14 +27,14 @@
 		</method>
 		<method name="play">
 			<return type="void" />
-			<argument index="0" name="from_position" type="float" default="0.0" />
+			<param index="0" name="from_position" type="float" default="0.0" />
 			<description>
-				Plays the audio from the given position [code]from_position[/code], in seconds.
+				Plays the audio from the given position [param from_position], in seconds.
 			</description>
 		</method>
 		<method name="seek">
 			<return type="void" />
-			<argument index="0" name="to_position" type="float" />
+			<param index="0" name="to_position" type="float" />
 			<description>
 				Sets the position from which audio will be played, in seconds.
 			</description>
diff --git a/doc/classes/AudioStreamRandomizer.xml b/doc/classes/AudioStreamRandomizer.xml
index 0eb733582a..5490770b7d 100644
--- a/doc/classes/AudioStreamRandomizer.xml
+++ b/doc/classes/AudioStreamRandomizer.xml
@@ -11,52 +11,52 @@
 	<methods>
 		<method name="add_stream">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Insert a stream at the specified index.
 			</description>
 		</method>
 		<method name="get_stream" qualifiers="const">
 			<return type="AudioStream" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Returns the stream at the specified index.
 			</description>
 		</method>
 		<method name="get_stream_probability_weight" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Returns the probability weight associated with the stream at the given index.
 			</description>
 		</method>
 		<method name="move_stream">
 			<return type="void" />
-			<argument index="0" name="index_from" type="int" />
-			<argument index="1" name="index_to" type="int" />
+			<param index="0" name="index_from" type="int" />
+			<param index="1" name="index_to" type="int" />
 			<description>
 				Move a stream from one index to another.
 			</description>
 		</method>
 		<method name="remove_stream">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Remove the stream at the specified index.
 			</description>
 		</method>
 		<method name="set_stream">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="stream" type="AudioStream" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="stream" type="AudioStream" />
 			<description>
 				Set the AudioStream at the specified index.
 			</description>
 		</method>
 		<method name="set_stream_probability_weight">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="weight" type="float" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="weight" type="float" />
 			<description>
 				Set the probability weight of the stream at the specified index. The higher this value, the more likely that the randomizer will choose this stream during random playback modes.
 			</description>
diff --git a/doc/classes/AudioStreamWAV.xml b/doc/classes/AudioStreamWAV.xml
index 17595aec2f..9f057dfa45 100644
--- a/doc/classes/AudioStreamWAV.xml
+++ b/doc/classes/AudioStreamWAV.xml
@@ -12,10 +12,10 @@
 	<methods>
 		<method name="save_to_wav">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
-				Saves the AudioStreamWAV as a WAV file to [code]path[/code]. Samples with IMA ADPCM format can't be saved.
-				[b]Note:[/b] A [code].wav[/code] extension is automatically appended to [code]path[/code] if it is missing.
+				Saves the AudioStreamWAV as a WAV file to [param path]. Samples with IMA ADPCM format can't be saved.
+				[b]Note:[/b] A [code].wav[/code] extension is automatically appended to [param path] if it is missing.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/BaseButton.xml b/doc/classes/BaseButton.xml
index 13fe75a3e3..629675132a 100644
--- a/doc/classes/BaseButton.xml
+++ b/doc/classes/BaseButton.xml
@@ -17,7 +17,7 @@
 		</method>
 		<method name="_toggled" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="button_pressed" type="bool" />
+			<param index="0" name="button_pressed" type="bool" />
 			<description>
 				Called when the button is toggled (only if [member toggle_mode] is active).
 			</description>
@@ -36,7 +36,7 @@
 		</method>
 		<method name="set_pressed_no_signal">
 			<return type="void" />
-			<argument index="0" name="pressed" type="bool" />
+			<param index="0" name="pressed" type="bool" />
 			<description>
 				Changes the [member button_pressed] state of the button, without emitting [signal toggled]. Use when you just want to change the state of the button without sending the pressed event (e.g. when initializing scene). Only works if [member toggle_mode] is [code]true[/code].
 				[b]Note:[/b] This method doesn't unpress other buttons in [member button_group].
@@ -96,9 +96,9 @@
 			</description>
 		</signal>
 		<signal name="toggled">
-			<argument index="0" name="button_pressed" type="bool" />
+			<param index="0" name="button_pressed" type="bool" />
 			<description>
-				Emitted when the button was just toggled between pressed and normal states (only if [member toggle_mode] is active). The new state is contained in the [code]button_pressed[/code] argument.
+				Emitted when the button was just toggled between pressed and normal states (only if [member toggle_mode] is active). The new state is contained in the [param button_pressed] argument.
 			</description>
 		</signal>
 	</signals>
diff --git a/doc/classes/BaseMaterial3D.xml b/doc/classes/BaseMaterial3D.xml
index 16359108a4..d2425313f7 100644
--- a/doc/classes/BaseMaterial3D.xml
+++ b/doc/classes/BaseMaterial3D.xml
@@ -12,47 +12,47 @@
 	<methods>
 		<method name="get_feature" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="feature" type="int" enum="BaseMaterial3D.Feature" />
+			<param index="0" name="feature" type="int" enum="BaseMaterial3D.Feature" />
 			<description>
 				Returns [code]true[/code], if the specified [enum Feature] is enabled.
 			</description>
 		</method>
 		<method name="get_flag" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="flag" type="int" enum="BaseMaterial3D.Flags" />
+			<param index="0" name="flag" type="int" enum="BaseMaterial3D.Flags" />
 			<description>
 				Returns [code]true[/code], if the specified flag is enabled. See [enum Flags] enumerator for options.
 			</description>
 		</method>
 		<method name="get_texture" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="param" type="int" enum="BaseMaterial3D.TextureParam" />
+			<param index="0" name="param" type="int" enum="BaseMaterial3D.TextureParam" />
 			<description>
 				Returns the [Texture] associated with the specified [enum TextureParam].
 			</description>
 		</method>
 		<method name="set_feature">
 			<return type="void" />
-			<argument index="0" name="feature" type="int" enum="BaseMaterial3D.Feature" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="feature" type="int" enum="BaseMaterial3D.Feature" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				If [code]true[/code], enables the specified [enum Feature]. Many features that are available in [BaseMaterial3D]s need to be enabled before use. This way the cost for using the feature is only incurred when specified. Features can also be enabled by setting the corresponding member to [code]true[/code].
 			</description>
 		</method>
 		<method name="set_flag">
 			<return type="void" />
-			<argument index="0" name="flag" type="int" enum="BaseMaterial3D.Flags" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="flag" type="int" enum="BaseMaterial3D.Flags" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				If [code]true[/code], enables the specified flag. Flags are optional behavior that can be turned on and off. Only one flag can be enabled at a time with this function, the flag enumerators cannot be bit-masked together to enable or disable multiple flags at once. Flags can also be enabled by setting the corresponding member to [code]true[/code]. See [enum Flags] enumerator for options.
 			</description>
 		</method>
 		<method name="set_texture">
 			<return type="void" />
-			<argument index="0" name="param" type="int" enum="BaseMaterial3D.TextureParam" />
-			<argument index="1" name="texture" type="Texture2D" />
+			<param index="0" name="param" type="int" enum="BaseMaterial3D.TextureParam" />
+			<param index="1" name="texture" type="Texture2D" />
 			<description>
-				Sets the texture for the slot specified by [code]param[/code]. See [enum TextureParam] for available slots.
+				Sets the texture for the slot specified by [param param]. See [enum TextureParam] for available slots.
 			</description>
 		</method>
 	</methods>
@@ -218,24 +218,38 @@
 			Grows object vertices in the direction of their normals.
 		</member>
 		<member name="heightmap_deep_parallax" type="bool" setter="set_heightmap_deep_parallax" getter="is_heightmap_deep_parallax_enabled" default="false">
+			If [code]true[/code], uses parallax occlusion mapping to represent depth in the material instead of simple offset mapping (see [member heightmap_enabled]). This results in a more convincing depth effect, but is much more expensive on the GPU. Only enable this on materials where it makes a significant visual difference.
 		</member>
 		<member name="heightmap_enabled" type="bool" setter="set_feature" getter="get_feature" default="false">
-			If [code]true[/code], height mapping is enabled (also called "parallax mapping" or "depth mapping"). See also [member normal_enabled].
+			If [code]true[/code], height mapping is enabled (also called "parallax mapping" or "depth mapping"). See also [member normal_enabled]. Height mapping is a demanding feature on the GPU, so it should only be used on materials where it makes a significant visual difference.
 			[b]Note:[/b] Height mapping is not supported if triplanar mapping is used on the same material. The value of [member heightmap_enabled] will be ignored if [member uv1_triplanar] is enabled.
 		</member>
 		<member name="heightmap_flip_binormal" type="bool" setter="set_heightmap_deep_parallax_flip_binormal" getter="get_heightmap_deep_parallax_flip_binormal" default="false">
+			If [code]true[/code], flips the mesh's binormal vectors when interpreting the height map. If the heightmap effect looks strange when the camera moves (even with a reasonable [member heightmap_scale]), try setting this to [code]true[/code].
 		</member>
 		<member name="heightmap_flip_tangent" type="bool" setter="set_heightmap_deep_parallax_flip_tangent" getter="get_heightmap_deep_parallax_flip_tangent" default="false">
+			If [code]true[/code], flips the mesh's tangent vectors when interpreting the height map. If the heightmap effect looks strange when the camera moves (even with a reasonable [member heightmap_scale]), try setting this to [code]true[/code].
 		</member>
 		<member name="heightmap_flip_texture" type="bool" setter="set_flag" getter="get_flag" default="false">
+			If [code]true[/code], interprets the height map texture as a depth map, with brighter values appearing to be "lower" in altitude compared to darker values.
+			This can be enabled for compatibility with some materials authored for Godot 3.x. This is not necessary if the Invert import option was used to invert the depth map in Godot 3.x, in which case [member heightmap_flip_texture] should remain [code]false[/code].
 		</member>
 		<member name="heightmap_max_layers" type="int" setter="set_heightmap_deep_parallax_max_layers" getter="get_heightmap_deep_parallax_max_layers">
+			The number of layers to use for parallax occlusion mapping when the camera is up close to the material. Higher values result in a more convincing depth effect, especially in materials that have steep height changes. Higher values have a significant cost on the GPU, so it should only be increased on materials where it makes a significant visual difference.
+			[b]Note:[/b] Only effective if [member heightmap_deep_parallax] is [code]true[/code].
 		</member>
 		<member name="heightmap_min_layers" type="int" setter="set_heightmap_deep_parallax_min_layers" getter="get_heightmap_deep_parallax_min_layers">
+			The number of layers to use for parallax occlusion mapping when the camera is far away from the material. Higher values result in a more convincing depth effect, especially in materials that have steep height changes. Higher values have a significant cost on the GPU, so it should only be increased on materials where it makes a significant visual difference.
+			[b]Note:[/b] Only effective if [member heightmap_deep_parallax] is [code]true[/code].
 		</member>
-		<member name="heightmap_scale" type="float" setter="set_heightmap_scale" getter="get_heightmap_scale" default="0.05">
+		<member name="heightmap_scale" type="float" setter="set_heightmap_scale" getter="get_heightmap_scale" default="5.0">
+			The heightmap scale to use for the parallax effect (see [member heightmap_enabled]). The default value is tuned so that the highest point (value = 255) appears to be 5 cm higher than the lowest point (value = 0). Higher values result in a deeper appearance, but may result in artifacts appearing when looking at the material from oblique angles, especially when the camera moves. Negative values can be used to invert the parallax effect, but this is different from inverting the texture using [member heightmap_flip_texture] as the material will also appear to be "closer" to the camera. In most cases, [member heightmap_scale] should be kept to a positive value.
+			[b]Note:[/b] If the height map effect looks strange regardless of this value, try adjusting [member heightmap_flip_binormal] and [member heightmap_flip_tangent]. See also [member heightmap_texture] for recommendations on authoring heightmap textures, as the way the heightmap texture is authored affects how [member heightmap_scale] behaves.
 		</member>
 		<member name="heightmap_texture" type="Texture2D" setter="set_texture" getter="get_texture">
+			The texture to use as a height map. See also [member heightmap_enabled].
+			For best results, the texture should be normalized (with [member heightmap_scale] reduced to compensate). In [url=https://gimp.org]GIMP[/url], this can be done using [b]Colors &gt; Auto &gt; Equalize[/b]. If the texture only uses a small part of its available range, the parallax effect may look strange, especially when the camera moves.
+			[b]Note:[/b] To reduce memory usage and improve loading times, you may be able to use a lower-resolution heightmap texture as most heightmaps are only comprised of low-frequency data.
 		</member>
 		<member name="metallic" type="float" setter="set_metallic" getter="get_metallic" default="0.0">
 			A high value makes the material appear more like a metal. Non-metals use their albedo as the diffuse color and add diffuse to the specular reflection. With non-metals, the reflection appears on top of the albedo color. Metals use their albedo as a multiplier to the specular reflection and set the diffuse color to black resulting in a tinted reflection. Materials work better when fully metal or fully non-metal, values between [code]0[/code] and [code]1[/code] should only be used for blending between metal and non-metal sections. To alter the amount of reflection use [member roughness].
diff --git a/doc/classes/Basis.xml b/doc/classes/Basis.xml
index 0af482d654..8aa6278296 100644
--- a/doc/classes/Basis.xml
+++ b/doc/classes/Basis.xml
@@ -27,31 +27,31 @@
 		</constructor>
 		<constructor name="Basis">
 			<return type="Basis" />
-			<argument index="0" name="from" type="Basis" />
+			<param index="0" name="from" type="Basis" />
 			<description>
 				Constructs a [Basis] as a copy of the given [Basis].
 			</description>
 		</constructor>
 		<constructor name="Basis">
 			<return type="Basis" />
-			<argument index="0" name="axis" type="Vector3" />
-			<argument index="1" name="angle" type="float" />
+			<param index="0" name="axis" type="Vector3" />
+			<param index="1" name="angle" type="float" />
 			<description>
-				Constructs a pure rotation basis matrix, rotated around the given [code]axis[/code] by [code]angle[/code] (in radians). The axis must be a normalized vector.
+				Constructs a pure rotation basis matrix, rotated around the given [param axis] by [param angle] (in radians). The axis must be a normalized vector.
 			</description>
 		</constructor>
 		<constructor name="Basis">
 			<return type="Basis" />
-			<argument index="0" name="from" type="Quaternion" />
+			<param index="0" name="from" type="Quaternion" />
 			<description>
 				Constructs a pure rotation basis matrix from the given quaternion.
 			</description>
 		</constructor>
 		<constructor name="Basis">
 			<return type="Basis" />
-			<argument index="0" name="x_axis" type="Vector3" />
-			<argument index="1" name="y_axis" type="Vector3" />
-			<argument index="2" name="z_axis" type="Vector3" />
+			<param index="0" name="x_axis" type="Vector3" />
+			<param index="1" name="y_axis" type="Vector3" />
+			<param index="2" name="z_axis" type="Vector3" />
 			<description>
 				Constructs a basis matrix from 3 axis vectors (matrix columns).
 			</description>
@@ -67,21 +67,21 @@
 		</method>
 		<method name="from_euler" qualifiers="static">
 			<return type="Basis" />
-			<argument index="0" name="euler" type="Vector3" />
-			<argument index="1" name="order" type="int" default="2" />
+			<param index="0" name="euler" type="Vector3" />
+			<param index="1" name="order" type="int" default="2" />
 			<description>
 			</description>
 		</method>
 		<method name="from_scale" qualifiers="static">
 			<return type="Basis" />
-			<argument index="0" name="scale" type="Vector3" />
+			<param index="0" name="scale" type="Vector3" />
 			<description>
 				Constructs a pure scale basis matrix with no rotation or shearing. The scale values are set as the diagonal of the matrix, and the other parts of the matrix are zero.
 			</description>
 		</method>
 		<method name="get_euler" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="order" type="int" default="2" />
+			<param index="0" name="order" type="int" default="2" />
 			<description>
 				Returns the basis's rotation in the form of Euler angles (in the YXZ convention: when decomposing, first Z, then X, and Y last). The returned vector contains the rotation angles in the format (X angle, Y angle, Z angle).
 				Consider using the [method get_rotation_quaternion] method instead, which returns a [Quaternion] quaternion instead of Euler angles.
@@ -113,18 +113,18 @@
 		</method>
 		<method name="is_equal_approx" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="b" type="Basis" />
+			<param index="0" name="b" type="Basis" />
 			<description>
-				Returns [code]true[/code] if this basis and [code]b[/code] are approximately equal, by calling [code]is_equal_approx[/code] on each component.
+				Returns [code]true[/code] if this basis and [param b] are approximately equal, by calling [code]is_equal_approx[/code] on each component.
 			</description>
 		</method>
 		<method name="looking_at" qualifiers="static">
 			<return type="Basis" />
-			<argument index="0" name="target" type="Vector3" />
-			<argument index="1" name="up" type="Vector3" default="Vector3(0, 1, 0)" />
+			<param index="0" name="target" type="Vector3" />
+			<param index="1" name="up" type="Vector3" default="Vector3(0, 1, 0)" />
 			<description>
-				Creates a Basis with a rotation such that the forward axis (-Z) points towards the [code]target[/code] position.
-				The up axis (+Y) points as close to the [code]up[/code] vector as possible while staying perpendicular to the forward axis. The resulting Basis is orthonormalized. The [code]target[/code] and [code]up[/code] vectors cannot be zero, and cannot be parallel to each other.
+				Creates a Basis with a rotation such that the forward axis (-Z) points towards the [param target] position.
+				The up axis (+Y) points as close to the [param up] vector as possible while staying perpendicular to the forward axis. The resulting Basis is orthonormalized. The [param target] and [param up] vectors cannot be zero, and cannot be parallel to each other.
 			</description>
 		</method>
 		<method name="orthonormalized" qualifiers="const">
@@ -135,44 +135,44 @@
 		</method>
 		<method name="rotated" qualifiers="const">
 			<return type="Basis" />
-			<argument index="0" name="axis" type="Vector3" />
-			<argument index="1" name="angle" type="float" />
+			<param index="0" name="axis" type="Vector3" />
+			<param index="1" name="angle" type="float" />
 			<description>
-				Introduce an additional rotation around the given axis by [code]angle[/code] (in radians). The axis must be a normalized vector.
+				Introduce an additional rotation around the given axis by [param angle] (in radians). The axis must be a normalized vector.
 			</description>
 		</method>
 		<method name="scaled" qualifiers="const">
 			<return type="Basis" />
-			<argument index="0" name="scale" type="Vector3" />
+			<param index="0" name="scale" type="Vector3" />
 			<description>
 				Introduce an additional scaling specified by the given 3D scaling factor.
 			</description>
 		</method>
 		<method name="slerp" qualifiers="const">
 			<return type="Basis" />
-			<argument index="0" name="to" type="Basis" />
-			<argument index="1" name="weight" type="float" />
+			<param index="0" name="to" type="Basis" />
+			<param index="1" name="weight" type="float" />
 			<description>
 				Assuming that the matrix is a proper rotation matrix, slerp performs a spherical-linear interpolation with another rotation matrix.
 			</description>
 		</method>
 		<method name="tdotx" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="with" type="Vector3" />
+			<param index="0" name="with" type="Vector3" />
 			<description>
 				Transposed dot product with the X axis of the matrix.
 			</description>
 		</method>
 		<method name="tdoty" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="with" type="Vector3" />
+			<param index="0" name="with" type="Vector3" />
 			<description>
 				Transposed dot product with the Y axis of the matrix.
 			</description>
 		</method>
 		<method name="tdotz" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="with" type="Vector3" />
+			<param index="0" name="with" type="Vector3" />
 			<description>
 				Transposed dot product with the Z axis of the matrix.
 			</description>
@@ -225,7 +225,7 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Basis" />
+			<param index="0" name="right" type="Basis" />
 			<description>
 				Returns [code]true[/code] if the [Basis] matrices are not equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
@@ -233,35 +233,35 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Basis" />
-			<argument index="0" name="right" type="Basis" />
+			<param index="0" name="right" type="Basis" />
 			<description>
 				Composes these two basis matrices by multiplying them together. This has the effect of transforming the second basis (the child) by the first basis (the parent).
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector3" />
-			<argument index="0" name="right" type="Vector3" />
+			<param index="0" name="right" type="Vector3" />
 			<description>
 				Transforms (multiplies) the [Vector3] by the given [Basis] matrix.
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Basis" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				This operator multiplies all components of the [Basis], which scales it uniformly.
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Basis" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				This operator multiplies all components of the [Basis], which scales it uniformly.
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="Basis" />
+			<param index="0" name="right" type="Basis" />
 			<description>
 				Returns [code]true[/code] if the [Basis] matrices are exactly equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
@@ -269,7 +269,7 @@
 		</operator>
 		<operator name="operator []">
 			<return type="Vector3" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Access basis components using their index. [code]b[0][/code] is equivalent to [code]b.x[/code], [code]b[1][/code] is equivalent to [code]b.y[/code], and [code]b[2][/code] is equivalent to [code]b.z[/code].
 			</description>
diff --git a/doc/classes/BitMap.xml b/doc/classes/BitMap.xml
index f248bec15f..53fd9a7b67 100644
--- a/doc/classes/BitMap.xml
+++ b/doc/classes/BitMap.xml
@@ -17,22 +17,22 @@
 		</method>
 		<method name="create">
 			<return type="void" />
-			<argument index="0" name="size" type="Vector2" />
+			<param index="0" name="size" type="Vector2" />
 			<description>
 				Creates a bitmap with the specified size, filled with [code]false[/code].
 			</description>
 		</method>
 		<method name="create_from_image_alpha">
 			<return type="void" />
-			<argument index="0" name="image" type="Image" />
-			<argument index="1" name="threshold" type="float" default="0.1" />
+			<param index="0" name="image" type="Image" />
+			<param index="1" name="threshold" type="float" default="0.1" />
 			<description>
-				Creates a bitmap that matches the given image dimensions, every element of the bitmap is set to [code]false[/code] if the alpha value of the image at that position is equal to [code]threshold[/code] or less, and [code]true[/code] in other case.
+				Creates a bitmap that matches the given image dimensions, every element of the bitmap is set to [code]false[/code] if the alpha value of the image at that position is equal to [param threshold] or less, and [code]true[/code] in other case.
 			</description>
 		</method>
 		<method name="get_bit" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="position" type="Vector2" />
+			<param index="0" name="position" type="Vector2" />
 			<description>
 				Returns bitmap's value at the specified position.
 			</description>
@@ -46,49 +46,49 @@
 		<method name="get_true_bit_count" qualifiers="const">
 			<return type="int" />
 			<description>
-				Returns the amount of bitmap elements that are set to [code]true[/code].
+				Returns the number of bitmap elements that are set to [code]true[/code].
 			</description>
 		</method>
 		<method name="grow_mask">
 			<return type="void" />
-			<argument index="0" name="pixels" type="int" />
-			<argument index="1" name="rect" type="Rect2" />
+			<param index="0" name="pixels" type="int" />
+			<param index="1" name="rect" type="Rect2" />
 			<description>
-				Applies morphological dilation or erosion to the bitmap. If [code]pixels[/code] is positive, dilation is applied to the bitmap. If [code]pixels[/code] is negative, erosion is applied to the bitmap. [code]rect[/code] defines the area where the morphological operation is applied. Pixels located outside the [code]rect[/code] are unaffected by [method grow_mask].
+				Applies morphological dilation or erosion to the bitmap. If [param pixels] is positive, dilation is applied to the bitmap. If [param pixels] is negative, erosion is applied to the bitmap. [param rect] defines the area where the morphological operation is applied. Pixels located outside the [param rect] are unaffected by [method grow_mask].
 			</description>
 		</method>
 		<method name="opaque_to_polygons" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="rect" type="Rect2" />
-			<argument index="1" name="epsilon" type="float" default="2.0" />
+			<param index="0" name="rect" type="Rect2" />
+			<param index="1" name="epsilon" type="float" default="2.0" />
 			<description>
 				Creates an [Array] of polygons covering a rectangular portion of the bitmap. It uses a marching squares algorithm, followed by Ramer-Douglas-Peucker (RDP) reduction of the number of vertices. Each polygon is described as a [PackedVector2Array] of its vertices.
 				To get polygons covering the whole bitmap, pass:
 				[codeblock]
 				Rect2(Vector2(), get_size())
 				[/codeblock]
-				[code]epsilon[/code] is passed to RDP to control how accurately the polygons cover the bitmap: a lower [code]epsilon[/code] corresponds to more points in the polygons.
+				[param epsilon] is passed to RDP to control how accurately the polygons cover the bitmap: a lower [param epsilon] corresponds to more points in the polygons.
 			</description>
 		</method>
 		<method name="resize">
 			<return type="void" />
-			<argument index="0" name="new_size" type="Vector2" />
+			<param index="0" name="new_size" type="Vector2" />
 			<description>
-				Resizes the image to [code]new_size[/code].
+				Resizes the image to [param new_size].
 			</description>
 		</method>
 		<method name="set_bit">
 			<return type="void" />
-			<argument index="0" name="position" type="Vector2" />
-			<argument index="1" name="bit" type="bool" />
+			<param index="0" name="position" type="Vector2" />
+			<param index="1" name="bit" type="bool" />
 			<description>
 				Sets the bitmap's element at the specified position, to the specified value.
 			</description>
 		</method>
 		<method name="set_bit_rect">
 			<return type="void" />
-			<argument index="0" name="rect" type="Rect2" />
-			<argument index="1" name="bit" type="bool" />
+			<param index="0" name="rect" type="Rect2" />
+			<param index="1" name="bit" type="bool" />
 			<description>
 				Sets a rectangular portion of the bitmap to the specified value.
 			</description>
diff --git a/doc/classes/Bone2D.xml b/doc/classes/Bone2D.xml
index 1e09e90d4a..d452edd1aa 100644
--- a/doc/classes/Bone2D.xml
+++ b/doc/classes/Bone2D.xml
@@ -57,14 +57,14 @@
 		</method>
 		<method name="set_autocalculate_length_and_angle">
 			<return type="void" />
-			<argument index="0" name="auto_calculate" type="bool" />
+			<param index="0" name="auto_calculate" type="bool" />
 			<description>
 				When set to [code]true[/code], the [code]Bone2D[/code] node will attempt to automatically calculate the bone angle and length using the first child [code]Bone2D[/code] node, if one exists. If none exist, the [code]Bone2D[/code] cannot automatically calculate these values and will print a warning.
 			</description>
 		</method>
 		<method name="set_bone_angle">
 			<return type="void" />
-			<argument index="0" name="angle" type="float" />
+			<param index="0" name="angle" type="float" />
 			<description>
 				Sets the bone angle for the [code]Bone2D[/code] node. This is typically set to the rotation from the [code]Bone2D[/code] node to a child [code]Bone2D[/code] node.
 				[b]Note:[/b] This is different from the [code]Bone2D[/code]'s rotation. The bone angle is the rotation of the bone shown by the [code]Bone2D[/code] gizmo, and because [code]Bone2D[/code] bones are based on positions, this can vary from the actual rotation of the [code]Bone2D[/code] node.
@@ -72,14 +72,14 @@
 		</method>
 		<method name="set_default_length">
 			<return type="void" />
-			<argument index="0" name="default_length" type="float" />
+			<param index="0" name="default_length" type="float" />
 			<description>
 				Deprecated. Please use [code]set_length[/code] instead.
 			</description>
 		</method>
 		<method name="set_length">
 			<return type="void" />
-			<argument index="0" name="length" type="float" />
+			<param index="0" name="length" type="float" />
 			<description>
 				Sets the length of the bone in the [code]Bone2D[/code] node.
 			</description>
diff --git a/doc/classes/BoneAttachment3D.xml b/doc/classes/BoneAttachment3D.xml
index bb4b45cd48..dc3d448621 100644
--- a/doc/classes/BoneAttachment3D.xml
+++ b/doc/classes/BoneAttachment3D.xml
@@ -36,35 +36,35 @@
 		</method>
 		<method name="on_bone_pose_update">
 			<return type="void" />
-			<argument index="0" name="bone_index" type="int" />
+			<param index="0" name="bone_index" type="int" />
 			<description>
 				A function that is called automatically when the [Skeleton3D] the BoneAttachment3D node is using has a bone that has changed its pose. This function is where the BoneAttachment3D node updates its position so it is correctly bound when it is [i]not[/i] set to override the bone pose.
 			</description>
 		</method>
 		<method name="set_external_skeleton">
 			<return type="void" />
-			<argument index="0" name="external_skeleton" type="NodePath" />
+			<param index="0" name="external_skeleton" type="NodePath" />
 			<description>
 				Sets the [NodePath] to the external skeleton that the BoneAttachment3D node should use. The external [Skeleton3D] node is only used when [code]use_external_skeleton[/code] is set to [code]true[/code].
 			</description>
 		</method>
 		<method name="set_override_mode">
 			<return type="void" />
-			<argument index="0" name="override_mode" type="int" />
+			<param index="0" name="override_mode" type="int" />
 			<description>
 				Sets the override mode for the BoneAttachment3D node. The override mode defines which of the bone poses the BoneAttachment3D node will override.
 			</description>
 		</method>
 		<method name="set_override_pose">
 			<return type="void" />
-			<argument index="0" name="override_pose" type="bool" />
+			<param index="0" name="override_pose" type="bool" />
 			<description>
 				Sets whether the BoneAttachment3D node will override the bone pose of the bone it is attached to. When set to [code]true[/code], the BoneAttachment3D node can change the pose of the bone.
 			</description>
 		</method>
 		<method name="set_use_external_skeleton">
 			<return type="void" />
-			<argument index="0" name="use_external_skeleton" type="bool" />
+			<param index="0" name="use_external_skeleton" type="bool" />
 			<description>
 				Sets whether the BoneAttachment3D node will use an extenral [Skeleton3D] node rather than attenpting to use its parent node as the [Skeleton3D]. When set to [code]true[/code], the BoneAttachment3D node will use the external [Skeleton3D] node set in [code]set_external_skeleton[/code].
 			</description>
diff --git a/doc/classes/BoneMap.xml b/doc/classes/BoneMap.xml
index 371cb4fa93..f7a4845b7d 100644
--- a/doc/classes/BoneMap.xml
+++ b/doc/classes/BoneMap.xml
@@ -12,26 +12,26 @@
 	<methods>
 		<method name="find_profile_bone_name" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="skeleton_bone_name" type="StringName" />
+			<param index="0" name="skeleton_bone_name" type="StringName" />
 			<description>
-				Returns a profile bone name having [code]skeleton_bone_name[/code]. If not found, an empty [StringName] will be returned.
+				Returns a profile bone name having [param skeleton_bone_name]. If not found, an empty [StringName] will be returned.
 				In the retargeting process, the returned bone name is the bone name of the target skeleton.
 			</description>
 		</method>
 		<method name="get_skeleton_bone_name" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="profile_bone_name" type="StringName" />
+			<param index="0" name="profile_bone_name" type="StringName" />
 			<description>
-				Returns a skeleton bone name is mapped to [code]profile_bone_name[/code].
+				Returns a skeleton bone name is mapped to [param profile_bone_name].
 				In the retargeting process, the returned bone name is the bone name of the source skeleton.
 			</description>
 		</method>
 		<method name="set_skeleton_bone_name">
 			<return type="void" />
-			<argument index="0" name="profile_bone_name" type="StringName" />
-			<argument index="1" name="skeleton_bone_name" type="StringName" />
+			<param index="0" name="profile_bone_name" type="StringName" />
+			<param index="1" name="skeleton_bone_name" type="StringName" />
 			<description>
-				Maps a skeleton bone name to [code]profile_bone_name[/code].
+				Maps a skeleton bone name to [param profile_bone_name].
 				In the retargeting process, the setting bone name is the bone name of the source skeleton.
 			</description>
 		</method>
diff --git a/doc/classes/BoxContainer.xml b/doc/classes/BoxContainer.xml
index c76a178368..65ceab3e30 100644
--- a/doc/classes/BoxContainer.xml
+++ b/doc/classes/BoxContainer.xml
@@ -12,9 +12,9 @@
 	<methods>
 		<method name="add_spacer">
 			<return type="Control" />
-			<argument index="0" name="begin" type="bool" />
+			<param index="0" name="begin" type="bool" />
 			<description>
-				Adds a [Control] node to the box as a spacer. If [code]begin[/code] is [code]true[/code], it will insert the [Control] node in front of all other children.
+				Adds a [Control] node to the box as a spacer. If [param begin] is [code]true[/code], it will insert the [Control] node in front of all other children.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/ButtonGroup.xml b/doc/classes/ButtonGroup.xml
index a887404932..8bedb5a1ac 100644
--- a/doc/classes/ButtonGroup.xml
+++ b/doc/classes/ButtonGroup.xml
@@ -28,7 +28,7 @@
 	</members>
 	<signals>
 		<signal name="pressed">
-			<argument index="0" name="button" type="BaseButton" />
+			<param index="0" name="button" type="BaseButton" />
 			<description>
 				Emitted when one of the buttons of the group is pressed.
 			</description>
diff --git a/doc/classes/CPUParticles2D.xml b/doc/classes/CPUParticles2D.xml
index b0282e4107..64e9310181 100644
--- a/doc/classes/CPUParticles2D.xml
+++ b/doc/classes/CPUParticles2D.xml
@@ -13,33 +13,33 @@
 	<methods>
 		<method name="convert_from_particles">
 			<return type="void" />
-			<argument index="0" name="particles" type="Node" />
+			<param index="0" name="particles" type="Node" />
 			<description>
 				Sets this node's properties to match a given [GPUParticles2D] node with an assigned [ParticlesMaterial].
 			</description>
 		</method>
 		<method name="get_param_curve" qualifiers="const">
 			<return type="Curve" />
-			<argument index="0" name="param" type="int" enum="CPUParticles2D.Parameter" />
+			<param index="0" name="param" type="int" enum="CPUParticles2D.Parameter" />
 			<description>
 				Returns the [Curve] of the parameter specified by [enum Parameter].
 			</description>
 		</method>
 		<method name="get_param_max" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="param" type="int" enum="CPUParticles2D.Parameter" />
+			<param index="0" name="param" type="int" enum="CPUParticles2D.Parameter" />
 			<description>
 			</description>
 		</method>
 		<method name="get_param_min" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="param" type="int" enum="CPUParticles2D.Parameter" />
+			<param index="0" name="param" type="int" enum="CPUParticles2D.Parameter" />
 			<description>
 			</description>
 		</method>
 		<method name="get_particle_flag" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="particle_flag" type="int" enum="CPUParticles2D.ParticleFlags" />
+			<param index="0" name="particle_flag" type="int" enum="CPUParticles2D.ParticleFlags" />
 			<description>
 				Returns the enabled state of the given flag (see [enum ParticleFlags] for options).
 			</description>
@@ -52,30 +52,30 @@
 		</method>
 		<method name="set_param_curve">
 			<return type="void" />
-			<argument index="0" name="param" type="int" enum="CPUParticles2D.Parameter" />
-			<argument index="1" name="curve" type="Curve" />
+			<param index="0" name="param" type="int" enum="CPUParticles2D.Parameter" />
+			<param index="1" name="curve" type="Curve" />
 			<description>
 				Sets the [Curve] of the parameter specified by [enum Parameter].
 			</description>
 		</method>
 		<method name="set_param_max">
 			<return type="void" />
-			<argument index="0" name="param" type="int" enum="CPUParticles2D.Parameter" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="param" type="int" enum="CPUParticles2D.Parameter" />
+			<param index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_param_min">
 			<return type="void" />
-			<argument index="0" name="param" type="int" enum="CPUParticles2D.Parameter" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="param" type="int" enum="CPUParticles2D.Parameter" />
+			<param index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_particle_flag">
 			<return type="void" />
-			<argument index="0" name="particle_flag" type="int" enum="CPUParticles2D.ParticleFlags" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="particle_flag" type="int" enum="CPUParticles2D.ParticleFlags" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				Enables or disables the given flag (see [enum ParticleFlags] for options).
 			</description>
diff --git a/doc/classes/CPUParticles3D.xml b/doc/classes/CPUParticles3D.xml
index d8faf8e91d..bb1dcd322f 100644
--- a/doc/classes/CPUParticles3D.xml
+++ b/doc/classes/CPUParticles3D.xml
@@ -12,33 +12,33 @@
 	<methods>
 		<method name="convert_from_particles">
 			<return type="void" />
-			<argument index="0" name="particles" type="Node" />
+			<param index="0" name="particles" type="Node" />
 			<description>
 				Sets this node's properties to match a given [GPUParticles3D] node with an assigned [ParticlesMaterial].
 			</description>
 		</method>
 		<method name="get_param_curve" qualifiers="const">
 			<return type="Curve" />
-			<argument index="0" name="param" type="int" enum="CPUParticles3D.Parameter" />
+			<param index="0" name="param" type="int" enum="CPUParticles3D.Parameter" />
 			<description>
 				Returns the [Curve] of the parameter specified by [enum Parameter].
 			</description>
 		</method>
 		<method name="get_param_max" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="param" type="int" enum="CPUParticles3D.Parameter" />
+			<param index="0" name="param" type="int" enum="CPUParticles3D.Parameter" />
 			<description>
 			</description>
 		</method>
 		<method name="get_param_min" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="param" type="int" enum="CPUParticles3D.Parameter" />
+			<param index="0" name="param" type="int" enum="CPUParticles3D.Parameter" />
 			<description>
 			</description>
 		</method>
 		<method name="get_particle_flag" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="particle_flag" type="int" enum="CPUParticles3D.ParticleFlags" />
+			<param index="0" name="particle_flag" type="int" enum="CPUParticles3D.ParticleFlags" />
 			<description>
 				Returns the enabled state of the given particle flag (see [enum ParticleFlags] for options).
 			</description>
@@ -51,32 +51,32 @@
 		</method>
 		<method name="set_param_curve">
 			<return type="void" />
-			<argument index="0" name="param" type="int" enum="CPUParticles3D.Parameter" />
-			<argument index="1" name="curve" type="Curve" />
+			<param index="0" name="param" type="int" enum="CPUParticles3D.Parameter" />
+			<param index="1" name="curve" type="Curve" />
 			<description>
 				Sets the [Curve] of the parameter specified by [enum Parameter].
 			</description>
 		</method>
 		<method name="set_param_max">
 			<return type="void" />
-			<argument index="0" name="param" type="int" enum="CPUParticles3D.Parameter" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="param" type="int" enum="CPUParticles3D.Parameter" />
+			<param index="1" name="value" type="float" />
 			<description>
 				Sets the maximum value for the given parameter
 			</description>
 		</method>
 		<method name="set_param_min">
 			<return type="void" />
-			<argument index="0" name="param" type="int" enum="CPUParticles3D.Parameter" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="param" type="int" enum="CPUParticles3D.Parameter" />
+			<param index="1" name="value" type="float" />
 			<description>
 				Sets the minimum value for the given parameter
 			</description>
 		</method>
 		<method name="set_particle_flag">
 			<return type="void" />
-			<argument index="0" name="particle_flag" type="int" enum="CPUParticles3D.ParticleFlags" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="particle_flag" type="int" enum="CPUParticles3D.ParticleFlags" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				Enables or disables the given particle flag (see [enum ParticleFlags] for options).
 			</description>
diff --git a/doc/classes/Callable.xml b/doc/classes/Callable.xml
index efe3e3d091..6838bdeb70 100644
--- a/doc/classes/Callable.xml
+++ b/doc/classes/Callable.xml
@@ -44,17 +44,17 @@
 		</constructor>
 		<constructor name="Callable">
 			<return type="Callable" />
-			<argument index="0" name="from" type="Callable" />
+			<param index="0" name="from" type="Callable" />
 			<description>
 				Constructs a [Callable] as a copy of the given [Callable].
 			</description>
 		</constructor>
 		<constructor name="Callable">
 			<return type="Callable" />
-			<argument index="0" name="object" type="Object" />
-			<argument index="1" name="method" type="StringName" />
+			<param index="0" name="object" type="Object" />
+			<param index="1" name="method" type="StringName" />
 			<description>
-				Creates a new [Callable] for the method called [code]method[/code] in the specified [code]object[/code].
+				Creates a new [Callable] for the method called [param method] in the specified [param object].
 			</description>
 		</constructor>
 	</constructors>
@@ -134,14 +134,14 @@
 		</method>
 		<method name="rpc_id" qualifiers="vararg const">
 			<return type="void" />
-			<argument index="0" name="peer_id" type="int" />
+			<param index="0" name="peer_id" type="int" />
 			<description>
 				Perform an RPC (Remote Procedure Call) on a specific peer ID (see multiplayer documentation for reference). This is used for multiplayer and is normally not available unless the function being called has been marked as [i]RPC[/i]. Calling it on unsupported functions will result in an error.
 			</description>
 		</method>
 		<method name="unbind" qualifiers="const">
 			<return type="Callable" />
-			<argument index="0" name="argcount" type="int" />
+			<param index="0" name="argcount" type="int" />
 			<description>
 				Returns a copy of this [Callable] with the arguments unbound. Calling the returned [Callable] will call the method without the extra arguments that are supplied in the [Callable] on which you are calling this method.
 			</description>
@@ -150,14 +150,14 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Callable" />
+			<param index="0" name="right" type="Callable" />
 			<description>
 				Returns [code]true[/code] if both [Callable]s invoke different targets.
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="Callable" />
+			<param index="0" name="right" type="Callable" />
 			<description>
 				Returns [code]true[/code] if both [Callable]s invoke the same custom target.
 			</description>
diff --git a/doc/classes/CallbackTweener.xml b/doc/classes/CallbackTweener.xml
index 3d80d8f3ab..6e4ee0380e 100644
--- a/doc/classes/CallbackTweener.xml
+++ b/doc/classes/CallbackTweener.xml
@@ -12,7 +12,7 @@
 	<methods>
 		<method name="set_delay">
 			<return type="CallbackTweener" />
-			<argument index="0" name="delay" type="float" />
+			<param index="0" name="delay" type="float" />
 			<description>
 				Makes the callback call delayed by given time in seconds. Example:
 				[codeblock]
diff --git a/doc/classes/Camera2D.xml b/doc/classes/Camera2D.xml
index b9373676e2..edb5235b75 100644
--- a/doc/classes/Camera2D.xml
+++ b/doc/classes/Camera2D.xml
@@ -43,14 +43,14 @@
 		</method>
 		<method name="get_drag_margin" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="margin" type="int" enum="Side" />
+			<param index="0" name="margin" type="int" enum="Side" />
 			<description>
 				Returns the specified [enum Side]'s margin. See also [member drag_bottom_margin], [member drag_top_margin], [member drag_left_margin], and [member drag_right_margin].
 			</description>
 		</method>
 		<method name="get_limit" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="margin" type="int" enum="Side" />
+			<param index="0" name="margin" type="int" enum="Side" />
 			<description>
 				Returns the camera limit for the specified [enum Side]. See also [member limit_bottom], [member limit_top], [member limit_left], and [member limit_right].
 			</description>
@@ -64,16 +64,16 @@
 		</method>
 		<method name="set_drag_margin">
 			<return type="void" />
-			<argument index="0" name="margin" type="int" enum="Side" />
-			<argument index="1" name="drag_margin" type="float" />
+			<param index="0" name="margin" type="int" enum="Side" />
+			<param index="1" name="drag_margin" type="float" />
 			<description>
 				Sets the specified [enum Side]'s margin. See also [member drag_bottom_margin], [member drag_top_margin], [member drag_left_margin], and [member drag_right_margin].
 			</description>
 		</method>
 		<method name="set_limit">
 			<return type="void" />
-			<argument index="0" name="margin" type="int" enum="Side" />
-			<argument index="1" name="limit" type="int" />
+			<param index="0" name="margin" type="int" enum="Side" />
+			<param index="1" name="limit" type="int" />
 			<description>
 				Sets the camera limit for the specified [enum Side]. See also [member limit_bottom], [member limit_top], [member limit_left], and [member limit_right].
 			</description>
diff --git a/doc/classes/Camera3D.xml b/doc/classes/Camera3D.xml
index 5595abc02a..6b379e0509 100644
--- a/doc/classes/Camera3D.xml
+++ b/doc/classes/Camera3D.xml
@@ -12,9 +12,9 @@
 	<methods>
 		<method name="clear_current">
 			<return type="void" />
-			<argument index="0" name="enable_next" type="bool" default="true" />
+			<param index="0" name="enable_next" type="bool" default="true" />
 			<description>
-				If this is the current camera, remove it from being current. If [code]enable_next[/code] is [code]true[/code], request to make the next camera current, if any.
+				If this is the current camera, remove it from being current. If [param enable_next] is [code]true[/code], request to make the next camera current, if any.
 			</description>
 		</method>
 		<method name="get_camera_rid" qualifiers="const">
@@ -31,9 +31,9 @@
 		</method>
 		<method name="get_cull_mask_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
-				Returns whether or not the specified layer of the [member cull_mask] is enabled, given a [code]layer_number[/code] between 1 and 20.
+				Returns whether or not the specified layer of the [member cull_mask] is enabled, given a [param layer_number] between 1 and 20.
 			</description>
 		</method>
 		<method name="get_frustum" qualifiers="const">
@@ -50,7 +50,7 @@
 		</method>
 		<method name="is_position_behind" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="world_point" type="Vector3" />
+			<param index="0" name="world_point" type="Vector3" />
 			<description>
 				Returns [code]true[/code] if the given position is behind the camera (the blue part of the linked diagram). [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/camera3d_position_frustum.png]See this diagram[/url] for an overview of position query methods.
 				[b]Note:[/b] A position which returns [code]false[/code] may still be outside the camera's field of view.
@@ -58,7 +58,7 @@
 		</method>
 		<method name="is_position_in_frustum" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="world_point" type="Vector3" />
+			<param index="0" name="world_point" type="Vector3" />
 			<description>
 				Returns [code]true[/code] if the given position is inside the camera's frustum (the green part of the linked diagram). [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/camera3d_position_frustum.png]See this diagram[/url] for an overview of position query methods.
 			</description>
@@ -71,72 +71,72 @@
 		</method>
 		<method name="project_local_ray_normal" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="screen_point" type="Vector2" />
+			<param index="0" name="screen_point" type="Vector2" />
 			<description>
 				Returns a normal vector from the screen point location directed along the camera. Orthogonal cameras are normalized. Perspective cameras account for perspective, screen width/height, etc.
 			</description>
 		</method>
 		<method name="project_position" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="screen_point" type="Vector2" />
-			<argument index="1" name="z_depth" type="float" />
+			<param index="0" name="screen_point" type="Vector2" />
+			<param index="1" name="z_depth" type="float" />
 			<description>
-				Returns the 3D point in world space that maps to the given 2D coordinate in the [Viewport] rectangle on a plane that is the given [code]z_depth[/code] distance into the scene away from the camera.
+				Returns the 3D point in world space that maps to the given 2D coordinate in the [Viewport] rectangle on a plane that is the given [param z_depth] distance into the scene away from the camera.
 			</description>
 		</method>
 		<method name="project_ray_normal" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="screen_point" type="Vector2" />
+			<param index="0" name="screen_point" type="Vector2" />
 			<description>
 				Returns a normal vector in world space, that is the result of projecting a point on the [Viewport] rectangle by the inverse camera projection. This is useful for casting rays in the form of (origin, normal) for object intersection or picking.
 			</description>
 		</method>
 		<method name="project_ray_origin" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="screen_point" type="Vector2" />
+			<param index="0" name="screen_point" type="Vector2" />
 			<description>
 				Returns a 3D position in world space, that is the result of projecting a point on the [Viewport] rectangle by the inverse camera projection. This is useful for casting rays in the form of (origin, normal) for object intersection or picking.
 			</description>
 		</method>
 		<method name="set_cull_mask_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
-				Based on [code]value[/code], enables or disables the specified layer in the [member cull_mask], given a [code]layer_number[/code] between 1 and 20.
+				Based on [param value], enables or disables the specified layer in the [member cull_mask], given a [param layer_number] between 1 and 20.
 			</description>
 		</method>
 		<method name="set_frustum">
 			<return type="void" />
-			<argument index="0" name="size" type="float" />
-			<argument index="1" name="offset" type="Vector2" />
-			<argument index="2" name="z_near" type="float" />
-			<argument index="3" name="z_far" type="float" />
+			<param index="0" name="size" type="float" />
+			<param index="1" name="offset" type="Vector2" />
+			<param index="2" name="z_near" type="float" />
+			<param index="3" name="z_far" type="float" />
 			<description>
-				Sets the camera projection to frustum mode (see [constant PROJECTION_FRUSTUM]), by specifying a [code]size[/code], an [code]offset[/code], and the [code]z_near[/code] and [code]z_far[/code] clip planes in world space units. See also [member frustum_offset].
+				Sets the camera projection to frustum mode (see [constant PROJECTION_FRUSTUM]), by specifying a [param size], an [param offset], and the [param z_near] and [param z_far] clip planes in world space units. See also [member frustum_offset].
 			</description>
 		</method>
 		<method name="set_orthogonal">
 			<return type="void" />
-			<argument index="0" name="size" type="float" />
-			<argument index="1" name="z_near" type="float" />
-			<argument index="2" name="z_far" type="float" />
+			<param index="0" name="size" type="float" />
+			<param index="1" name="z_near" type="float" />
+			<param index="2" name="z_far" type="float" />
 			<description>
-				Sets the camera projection to orthogonal mode (see [constant PROJECTION_ORTHOGONAL]), by specifying a [code]size[/code], and the [code]z_near[/code] and [code]z_far[/code] clip planes in world space units. (As a hint, 2D games often use this projection, with values specified in pixels.)
+				Sets the camera projection to orthogonal mode (see [constant PROJECTION_ORTHOGONAL]), by specifying a [param size], and the [param z_near] and [param z_far] clip planes in world space units. (As a hint, 2D games often use this projection, with values specified in pixels.)
 			</description>
 		</method>
 		<method name="set_perspective">
 			<return type="void" />
-			<argument index="0" name="fov" type="float" />
-			<argument index="1" name="z_near" type="float" />
-			<argument index="2" name="z_far" type="float" />
+			<param index="0" name="fov" type="float" />
+			<param index="1" name="z_near" type="float" />
+			<param index="2" name="z_far" type="float" />
 			<description>
-				Sets the camera projection to perspective mode (see [constant PROJECTION_PERSPECTIVE]), by specifying a [code]fov[/code] (field of view) angle in degrees, and the [code]z_near[/code] and [code]z_far[/code] clip planes in world space units.
+				Sets the camera projection to perspective mode (see [constant PROJECTION_PERSPECTIVE]), by specifying a [param fov] (field of view) angle in degrees, and the [param z_near] and [param z_far] clip planes in world space units.
 			</description>
 		</method>
 		<method name="unproject_position" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="world_point" type="Vector3" />
+			<param index="0" name="world_point" type="Vector3" />
 			<description>
 				Returns the 2D coordinate in the [Viewport] rectangle that maps to the given 3D point in world space.
 				[b]Note:[/b] When using this to position GUI elements over a 3D viewport, use [method is_position_behind] to prevent them from appearing if the 3D point is behind the camera:
@@ -144,7 +144,7 @@
 				# This code block is part of a script that inherits from Node3D.
 				# `control` is a reference to a node inheriting from Control.
 				control.visible = not get_viewport().get_camera_3d().is_position_behind(global_transform.origin)
-				control.rect_position = get_viewport().get_camera_3d().unproject_position(global_transform.origin)
+				control.position = get_viewport().get_camera_3d().unproject_position(global_transform.origin)
 				[/codeblock]
 			</description>
 		</method>
@@ -194,7 +194,7 @@
 			The camera's projection mode. In [constant PROJECTION_PERSPECTIVE] mode, objects' Z distance from the camera's local space scales their perceived size.
 		</member>
 		<member name="size" type="float" setter="set_size" getter="get_size" default="1.0">
-			The camera's size measured as 1/2 the width or height. Only applicable in orthogonal and frustum modes. Since [member keep_aspect] locks on axis, [code]size[/code] sets the other axis' size length.
+			The camera's size in meters measured as the diameter of the width or height, depending on [member keep_aspect]. Only applicable in orthogonal and frustum modes.
 		</member>
 		<member name="v_offset" type="float" setter="set_v_offset" getter="get_v_offset" default="0.0">
 			The vertical (Y) offset of the camera viewport.
diff --git a/doc/classes/CameraServer.xml b/doc/classes/CameraServer.xml
index 1ccdee58f7..d7a9888fac 100644
--- a/doc/classes/CameraServer.xml
+++ b/doc/classes/CameraServer.xml
@@ -13,9 +13,9 @@
 	<methods>
 		<method name="add_feed">
 			<return type="void" />
-			<argument index="0" name="feed" type="CameraFeed" />
+			<param index="0" name="feed" type="CameraFeed" />
 			<description>
-				Adds the camera [code]feed[/code] to the camera server.
+				Adds the camera [param feed] to the camera server.
 			</description>
 		</method>
 		<method name="feeds">
@@ -26,9 +26,9 @@
 		</method>
 		<method name="get_feed">
 			<return type="CameraFeed" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the [CameraFeed] corresponding to the camera with the given [code]index[/code].
+				Returns the [CameraFeed] corresponding to the camera with the given [param index].
 			</description>
 		</method>
 		<method name="get_feed_count">
@@ -39,21 +39,21 @@
 		</method>
 		<method name="remove_feed">
 			<return type="void" />
-			<argument index="0" name="feed" type="CameraFeed" />
+			<param index="0" name="feed" type="CameraFeed" />
 			<description>
-				Removes the specified camera [code]feed[/code].
+				Removes the specified camera [param feed].
 			</description>
 		</method>
 	</methods>
 	<signals>
 		<signal name="camera_feed_added">
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Emitted when a [CameraFeed] is added (e.g. a webcam is plugged in).
 			</description>
 		</signal>
 		<signal name="camera_feed_removed">
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Emitted when a [CameraFeed] is removed (e.g. a webcam is unplugged).
 			</description>
diff --git a/doc/classes/CanvasItem.xml b/doc/classes/CanvasItem.xml
index 2d68ae6902..a230806c08 100644
--- a/doc/classes/CanvasItem.xml
+++ b/doc/classes/CanvasItem.xml
@@ -5,7 +5,7 @@
 	</brief_description>
 	<description>
 		Base class of anything 2D. Canvas items are laid out in a tree; children inherit and extend their parent's transform. [CanvasItem] is extended by [Control] for anything GUI-related, and by [Node2D] for anything related to the 2D engine.
-		Any [CanvasItem] can draw. For this, [method update] must be called, then [constant NOTIFICATION_DRAW] will be received on idle time to request redraw. Because of this, canvas items don't need to be redrawn on every frame, improving the performance significantly. Several functions for drawing on the [CanvasItem] are provided (see [code]draw_*[/code] functions). However, they can only be used inside the [method Object._notification], signal or [method _draw] virtual functions.
+		Any [CanvasItem] can draw. For this, [method update] is called by the engine, then [constant NOTIFICATION_DRAW] will be received on idle time to request redraw. Because of this, canvas items don't need to be redrawn on every frame, improving the performance significantly. Several functions for drawing on the [CanvasItem] are provided (see [code]draw_*[/code] functions). However, they can only be used inside [method _draw], its corresponding [method Object._notification] or methods connected to the [signal draw] signal.
 		Canvas items are drawn in tree order. By default, children are on top of their parents so a root [CanvasItem] will be drawn behind everything. This behavior can be changed on a per-item basis.
 		A [CanvasItem] can also be hidden, which will also hide its children. It provides many ways to change parameters such as modulation (for itself and its children) and self modulation (only for itself), as well as its blend mode.
 		Ultimately, a transform notification can be requested, which will notify the node that its global position changed in case the parent tree changed.
@@ -20,82 +20,83 @@
 		<method name="_draw" qualifiers="virtual">
 			<return type="void" />
 			<description>
-				Overridable function called by the engine (if defined) to draw the canvas item.
+				Called when [CanvasItem] has been requested to redraw (when [method update] is called, either manually or by the engine).
+				Corresponds to the [constant NOTIFICATION_DRAW] notification in [method Object._notification].
 			</description>
 		</method>
 		<method name="draw_animation_slice">
 			<return type="void" />
-			<argument index="0" name="animation_length" type="float" />
-			<argument index="1" name="slice_begin" type="float" />
-			<argument index="2" name="slice_end" type="float" />
-			<argument index="3" name="offset" type="float" default="0.0" />
+			<param index="0" name="animation_length" type="float" />
+			<param index="1" name="slice_begin" type="float" />
+			<param index="2" name="slice_end" type="float" />
+			<param index="3" name="offset" type="float" default="0.0" />
 			<description>
 				Subsequent drawing commands will be ignored unless they fall within the specified animation slice. This is a faster way to implement animations that loop on background rather than redrawing constantly.
 			</description>
 		</method>
 		<method name="draw_arc">
 			<return type="void" />
-			<argument index="0" name="center" type="Vector2" />
-			<argument index="1" name="radius" type="float" />
-			<argument index="2" name="start_angle" type="float" />
-			<argument index="3" name="end_angle" type="float" />
-			<argument index="4" name="point_count" type="int" />
-			<argument index="5" name="color" type="Color" />
-			<argument index="6" name="width" type="float" default="1.0" />
-			<argument index="7" name="antialiased" type="bool" default="false" />
+			<param index="0" name="center" type="Vector2" />
+			<param index="1" name="radius" type="float" />
+			<param index="2" name="start_angle" type="float" />
+			<param index="3" name="end_angle" type="float" />
+			<param index="4" name="point_count" type="int" />
+			<param index="5" name="color" type="Color" />
+			<param index="6" name="width" type="float" default="1.0" />
+			<param index="7" name="antialiased" type="bool" default="false" />
 			<description>
-				Draws a unfilled arc between the given angles. The larger the value of [code]point_count[/code], the smoother the curve. See also [method draw_circle].
+				Draws a unfilled arc between the given angles. The larger the value of [param point_count], the smoother the curve. See also [method draw_circle].
 			</description>
 		</method>
 		<method name="draw_char" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="font" type="Font" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="char" type="String" />
-			<argument index="3" name="font_size" type="int" default="16" />
-			<argument index="4" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="font" type="Font" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="char" type="String" />
+			<param index="3" name="font_size" type="int" default="16" />
+			<param index="4" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
 				Draws a string first character using a custom font.
 			</description>
 		</method>
 		<method name="draw_char_outline" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="font" type="Font" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="char" type="String" />
-			<argument index="3" name="font_size" type="int" default="16" />
-			<argument index="4" name="size" type="int" default="-1" />
-			<argument index="5" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="font" type="Font" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="char" type="String" />
+			<param index="3" name="font_size" type="int" default="16" />
+			<param index="4" name="size" type="int" default="-1" />
+			<param index="5" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
 				Draws a string first character outline using a custom font.
 			</description>
 		</method>
 		<method name="draw_circle">
 			<return type="void" />
-			<argument index="0" name="position" type="Vector2" />
-			<argument index="1" name="radius" type="float" />
-			<argument index="2" name="color" type="Color" />
+			<param index="0" name="position" type="Vector2" />
+			<param index="1" name="radius" type="float" />
+			<param index="2" name="color" type="Color" />
 			<description>
 				Draws a colored, filled circle. See also [method draw_arc], [method draw_polyline] and [method draw_polygon].
 			</description>
 		</method>
 		<method name="draw_colored_polygon">
 			<return type="void" />
-			<argument index="0" name="points" type="PackedVector2Array" />
-			<argument index="1" name="color" type="Color" />
-			<argument index="2" name="uvs" type="PackedVector2Array" default="PackedVector2Array()" />
-			<argument index="3" name="texture" type="Texture2D" default="null" />
+			<param index="0" name="points" type="PackedVector2Array" />
+			<param index="1" name="color" type="Color" />
+			<param index="2" name="uvs" type="PackedVector2Array" default="PackedVector2Array()" />
+			<param index="3" name="texture" type="Texture2D" default="null" />
 			<description>
-				Draws a colored polygon of any amount of points, convex or concave. Unlike [method draw_polygon], a single color must be specified for the whole polygon.
+				Draws a colored polygon of any number of points, convex or concave. Unlike [method draw_polygon], a single color must be specified for the whole polygon.
 			</description>
 		</method>
 		<method name="draw_dashed_line">
 			<return type="void" />
-			<argument index="0" name="from" type="Vector2" />
-			<argument index="1" name="to" type="Vector2" />
-			<argument index="2" name="color" type="Color" />
-			<argument index="3" name="width" type="float" default="1.0" />
-			<argument index="4" name="dash" type="float" default="2.0" />
+			<param index="0" name="from" type="Vector2" />
+			<param index="1" name="to" type="Vector2" />
+			<param index="2" name="color" type="Color" />
+			<param index="3" name="width" type="float" default="1.0" />
+			<param index="4" name="dash" type="float" default="2.0" />
 			<description>
 				Draws a dashed line from a 2D point to another, with a given color and width. See also [method draw_multiline] and [method draw_polyline].
 			</description>
@@ -108,184 +109,184 @@
 		</method>
 		<method name="draw_line">
 			<return type="void" />
-			<argument index="0" name="from" type="Vector2" />
-			<argument index="1" name="to" type="Vector2" />
-			<argument index="2" name="color" type="Color" />
-			<argument index="3" name="width" type="float" default="1.0" />
-			<argument index="4" name="antialiased" type="bool" default="false" />
+			<param index="0" name="from" type="Vector2" />
+			<param index="1" name="to" type="Vector2" />
+			<param index="2" name="color" type="Color" />
+			<param index="3" name="width" type="float" default="1.0" />
+			<param index="4" name="antialiased" type="bool" default="false" />
 			<description>
 				Draws a line from a 2D point to another, with a given color and width. It can be optionally antialiased. See also [method draw_multiline] and [method draw_polyline].
 			</description>
 		</method>
 		<method name="draw_mesh">
 			<return type="void" />
-			<argument index="0" name="mesh" type="Mesh" />
-			<argument index="1" name="texture" type="Texture2D" />
-			<argument index="2" name="transform" type="Transform2D" default="Transform2D(1, 0, 0, 1, 0, 0)" />
-			<argument index="3" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="mesh" type="Mesh" />
+			<param index="1" name="texture" type="Texture2D" />
+			<param index="2" name="transform" type="Transform2D" default="Transform2D(1, 0, 0, 1, 0, 0)" />
+			<param index="3" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
 				Draws a [Mesh] in 2D, using the provided texture. See [MeshInstance2D] for related documentation.
 			</description>
 		</method>
 		<method name="draw_msdf_texture_rect_region">
 			<return type="void" />
-			<argument index="0" name="texture" type="Texture2D" />
-			<argument index="1" name="rect" type="Rect2" />
-			<argument index="2" name="src_rect" type="Rect2" />
-			<argument index="3" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="4" name="outline" type="float" default="0.0" />
-			<argument index="5" name="pixel_range" type="float" default="4.0" />
+			<param index="0" name="texture" type="Texture2D" />
+			<param index="1" name="rect" type="Rect2" />
+			<param index="2" name="src_rect" type="Rect2" />
+			<param index="3" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="4" name="outline" type="float" default="0.0" />
+			<param index="5" name="pixel_range" type="float" default="4.0" />
 			<description>
 				Draws a textured rectangle region of the multi-channel signed distance field texture at a given position, optionally modulated by a color. See [member FontFile.multichannel_signed_distance_field] for more information and caveats about MSDF font rendering.
-				If [code]outline[/code] is positive, each alpha channel value of pixel in region is set to maximum value of true distance in the [code]outline[/code] radius.
-				Value of the [code]pixel_range[/code] should the same that was used during distance field texture generation.
+				If [param outline] is positive, each alpha channel value of pixel in region is set to maximum value of true distance in the [param outline] radius.
+				Value of the [param pixel_range] should the same that was used during distance field texture generation.
 			</description>
 		</method>
 		<method name="draw_multiline">
 			<return type="void" />
-			<argument index="0" name="points" type="PackedVector2Array" />
-			<argument index="1" name="color" type="Color" />
-			<argument index="2" name="width" type="float" default="1.0" />
+			<param index="0" name="points" type="PackedVector2Array" />
+			<param index="1" name="color" type="Color" />
+			<param index="2" name="width" type="float" default="1.0" />
 			<description>
-				Draws multiple disconnected lines with a uniform [code]color[/code]. When drawing large amounts of lines, this is faster than using individual [method draw_line] calls. To draw interconnected lines, use [method draw_polyline] instead.
+				Draws multiple disconnected lines with a uniform [param color]. When drawing large amounts of lines, this is faster than using individual [method draw_line] calls. To draw interconnected lines, use [method draw_polyline] instead.
 			</description>
 		</method>
 		<method name="draw_multiline_colors">
 			<return type="void" />
-			<argument index="0" name="points" type="PackedVector2Array" />
-			<argument index="1" name="colors" type="PackedColorArray" />
-			<argument index="2" name="width" type="float" default="1.0" />
+			<param index="0" name="points" type="PackedVector2Array" />
+			<param index="1" name="colors" type="PackedColorArray" />
+			<param index="2" name="width" type="float" default="1.0" />
 			<description>
-				Draws multiple disconnected lines with a uniform [code]width[/code] and segment-by-segment coloring. Colors assigned to line segments match by index between [code]points[/code] and [code]colors[/code]. When drawing large amounts of lines, this is faster than using individual [method draw_line] calls. To draw interconnected lines, use [method draw_polyline_colors] instead.
+				Draws multiple disconnected lines with a uniform [param width] and segment-by-segment coloring. Colors assigned to line segments match by index between [param points] and [param colors]. When drawing large amounts of lines, this is faster than using individual [method draw_line] calls. To draw interconnected lines, use [method draw_polyline_colors] instead.
 			</description>
 		</method>
 		<method name="draw_multiline_string" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="font" type="Font" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="text" type="String" />
-			<argument index="3" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
-			<argument index="4" name="width" type="float" default="-1" />
-			<argument index="5" name="font_size" type="int" default="16" />
-			<argument index="6" name="max_lines" type="int" default="-1" />
-			<argument index="7" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="8" name="brk_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
-			<argument index="9" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
-			<argument index="10" name="direction" type="int" enum="TextServer.Direction" default="0" />
-			<argument index="11" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
+			<param index="0" name="font" type="Font" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="text" type="String" />
+			<param index="3" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
+			<param index="4" name="width" type="float" default="-1" />
+			<param index="5" name="font_size" type="int" default="16" />
+			<param index="6" name="max_lines" type="int" default="-1" />
+			<param index="7" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="8" name="brk_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
+			<param index="9" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
+			<param index="10" name="direction" type="int" enum="TextServer.Direction" default="0" />
+			<param index="11" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
-				Breaks [code]text[/code] to the lines and draws it using the specified [code]font[/code] at the [code]position[/code] (top-left corner). The text will have its color multiplied by [code]modulate[/code]. If [code]clip_w[/code] is greater than or equal to 0, the text will be clipped if it exceeds the specified width.
+				Breaks [param text] into lines and draws it using the specified [param font] at the [param pos] (top-left corner). The text will have its color multiplied by [param modulate]. If [param width] is greater than or equal to 0, the text will be clipped if it exceeds the specified width.
 			</description>
 		</method>
 		<method name="draw_multiline_string_outline" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="font" type="Font" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="text" type="String" />
-			<argument index="3" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
-			<argument index="4" name="width" type="float" default="-1" />
-			<argument index="5" name="font_size" type="int" default="16" />
-			<argument index="6" name="max_lines" type="int" default="-1" />
-			<argument index="7" name="size" type="int" default="1" />
-			<argument index="8" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="9" name="brk_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
-			<argument index="10" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
-			<argument index="11" name="direction" type="int" enum="TextServer.Direction" default="0" />
-			<argument index="12" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
+			<param index="0" name="font" type="Font" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="text" type="String" />
+			<param index="3" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
+			<param index="4" name="width" type="float" default="-1" />
+			<param index="5" name="font_size" type="int" default="16" />
+			<param index="6" name="max_lines" type="int" default="-1" />
+			<param index="7" name="size" type="int" default="1" />
+			<param index="8" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="9" name="brk_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
+			<param index="10" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
+			<param index="11" name="direction" type="int" enum="TextServer.Direction" default="0" />
+			<param index="12" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
-				Breaks [code]text[/code] to the lines and draws text outline using the specified [code]font[/code] at the [code]position[/code] (top-left corner). The text will have its color multiplied by [code]modulate[/code]. If [code]clip_w[/code] is greater than or equal to 0, the text will be clipped if it exceeds the specified width.
+				Breaks [param text] to the lines and draws text outline using the specified [param font] at the [param pos] (top-left corner). The text will have its color multiplied by [param modulate]. If [param width] is greater than or equal to 0, the text will be clipped if it exceeds the specified width.
 			</description>
 		</method>
 		<method name="draw_multimesh">
 			<return type="void" />
-			<argument index="0" name="multimesh" type="MultiMesh" />
-			<argument index="1" name="texture" type="Texture2D" />
+			<param index="0" name="multimesh" type="MultiMesh" />
+			<param index="1" name="texture" type="Texture2D" />
 			<description>
 				Draws a [MultiMesh] in 2D with the provided texture. See [MultiMeshInstance2D] for related documentation.
 			</description>
 		</method>
 		<method name="draw_polygon">
 			<return type="void" />
-			<argument index="0" name="points" type="PackedVector2Array" />
-			<argument index="1" name="colors" type="PackedColorArray" />
-			<argument index="2" name="uvs" type="PackedVector2Array" default="PackedVector2Array()" />
-			<argument index="3" name="texture" type="Texture2D" default="null" />
+			<param index="0" name="points" type="PackedVector2Array" />
+			<param index="1" name="colors" type="PackedColorArray" />
+			<param index="2" name="uvs" type="PackedVector2Array" default="PackedVector2Array()" />
+			<param index="3" name="texture" type="Texture2D" default="null" />
 			<description>
-				Draws a solid polygon of any amount of points, convex or concave. Unlike [method draw_colored_polygon], each point's color can be changed individually. See also [method draw_polyline] and [method draw_polyline_colors].
+				Draws a solid polygon of any number of points, convex or concave. Unlike [method draw_colored_polygon], each point's color can be changed individually. See also [method draw_polyline] and [method draw_polyline_colors].
 			</description>
 		</method>
 		<method name="draw_polyline">
 			<return type="void" />
-			<argument index="0" name="points" type="PackedVector2Array" />
-			<argument index="1" name="color" type="Color" />
-			<argument index="2" name="width" type="float" default="1.0" />
-			<argument index="3" name="antialiased" type="bool" default="false" />
+			<param index="0" name="points" type="PackedVector2Array" />
+			<param index="1" name="color" type="Color" />
+			<param index="2" name="width" type="float" default="1.0" />
+			<param index="3" name="antialiased" type="bool" default="false" />
 			<description>
-				Draws interconnected line segments with a uniform [code]color[/code] and [code]width[/code] and optional antialiasing. When drawing large amounts of lines, this is faster than using individual [method draw_line] calls. To draw disconnected lines, use [method draw_multiline] instead. See also [method draw_polygon].
+				Draws interconnected line segments with a uniform [param color] and [param width] and optional antialiasing. When drawing large amounts of lines, this is faster than using individual [method draw_line] calls. To draw disconnected lines, use [method draw_multiline] instead. See also [method draw_polygon].
 			</description>
 		</method>
 		<method name="draw_polyline_colors">
 			<return type="void" />
-			<argument index="0" name="points" type="PackedVector2Array" />
-			<argument index="1" name="colors" type="PackedColorArray" />
-			<argument index="2" name="width" type="float" default="1.0" />
-			<argument index="3" name="antialiased" type="bool" default="false" />
+			<param index="0" name="points" type="PackedVector2Array" />
+			<param index="1" name="colors" type="PackedColorArray" />
+			<param index="2" name="width" type="float" default="1.0" />
+			<param index="3" name="antialiased" type="bool" default="false" />
 			<description>
-				Draws interconnected line segments with a uniform [code]width[/code] and segment-by-segment coloring, and optional antialiasing. Colors assigned to line segments match by index between [code]points[/code] and [code]colors[/code]. When drawing large amounts of lines, this is faster than using individual [method draw_line] calls. To draw disconnected lines, use [method draw_multiline_colors] instead. See also [method draw_polygon].
+				Draws interconnected line segments with a uniform [param width] and segment-by-segment coloring, and optional antialiasing. Colors assigned to line segments match by index between [param points] and [param colors]. When drawing large amounts of lines, this is faster than using individual [method draw_line] calls. To draw disconnected lines, use [method draw_multiline_colors] instead. See also [method draw_polygon].
 			</description>
 		</method>
 		<method name="draw_primitive">
 			<return type="void" />
-			<argument index="0" name="points" type="PackedVector2Array" />
-			<argument index="1" name="colors" type="PackedColorArray" />
-			<argument index="2" name="uvs" type="PackedVector2Array" />
-			<argument index="3" name="texture" type="Texture2D" default="null" />
-			<argument index="4" name="width" type="float" default="1.0" />
+			<param index="0" name="points" type="PackedVector2Array" />
+			<param index="1" name="colors" type="PackedColorArray" />
+			<param index="2" name="uvs" type="PackedVector2Array" />
+			<param index="3" name="texture" type="Texture2D" default="null" />
+			<param index="4" name="width" type="float" default="1.0" />
 			<description>
 				Draws a custom primitive. 1 point for a point, 2 points for a line, 3 points for a triangle, and 4 points for a quad. If 0 points or more than 4 points are specified, nothing will be drawn and an error message will be printed. See also [method draw_line], [method draw_polyline], [method draw_polygon], and [method draw_rect].
 			</description>
 		</method>
 		<method name="draw_rect">
 			<return type="void" />
-			<argument index="0" name="rect" type="Rect2" />
-			<argument index="1" name="color" type="Color" />
-			<argument index="2" name="filled" type="bool" default="true" />
-			<argument index="3" name="width" type="float" default="1.0" />
+			<param index="0" name="rect" type="Rect2" />
+			<param index="1" name="color" type="Color" />
+			<param index="2" name="filled" type="bool" default="true" />
+			<param index="3" name="width" type="float" default="1.0" />
 			<description>
-				Draws a rectangle. If [code]filled[/code] is [code]true[/code], the rectangle will be filled with the [code]color[/code] specified. If [code]filled[/code] is [code]false[/code], the rectangle will be drawn as a stroke with the [code]color[/code] and [code]width[/code] specified.
-				[b]Note:[/b] [code]width[/code] is only effective if [code]filled[/code] is [code]false[/code].
+				Draws a rectangle. If [param filled] is [code]true[/code], the rectangle will be filled with the [param color] specified. If [param filled] is [code]false[/code], the rectangle will be drawn as a stroke with the [param color] and [param width] specified.
+				[b]Note:[/b] [param width] is only effective if [param filled] is [code]false[/code].
 			</description>
 		</method>
 		<method name="draw_set_transform">
 			<return type="void" />
-			<argument index="0" name="position" type="Vector2" />
-			<argument index="1" name="rotation" type="float" default="0.0" />
-			<argument index="2" name="scale" type="Vector2" default="Vector2(1, 1)" />
+			<param index="0" name="position" type="Vector2" />
+			<param index="1" name="rotation" type="float" default="0.0" />
+			<param index="2" name="scale" type="Vector2" default="Vector2(1, 1)" />
 			<description>
 				Sets a custom transform for drawing via components. Anything drawn afterwards will be transformed by this.
 			</description>
 		</method>
 		<method name="draw_set_transform_matrix">
 			<return type="void" />
-			<argument index="0" name="xform" type="Transform2D" />
+			<param index="0" name="xform" type="Transform2D" />
 			<description>
 				Sets a custom transform for drawing via matrix. Anything drawn afterwards will be transformed by this.
 			</description>
 		</method>
 		<method name="draw_string" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="font" type="Font" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="text" type="String" />
-			<argument index="3" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
-			<argument index="4" name="width" type="float" default="-1" />
-			<argument index="5" name="font_size" type="int" default="16" />
-			<argument index="6" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="7" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
-			<argument index="8" name="direction" type="int" enum="TextServer.Direction" default="0" />
-			<argument index="9" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
-			<description>
-				Draws [code]text[/code] using the specified [code]font[/code] at the [code]position[/code] (bottom-left corner using the baseline of the font). The text will have its color multiplied by [code]modulate[/code]. If [code]clip_w[/code] is greater than or equal to 0, the text will be clipped if it exceeds the specified width.
+			<param index="0" name="font" type="Font" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="text" type="String" />
+			<param index="3" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
+			<param index="4" name="width" type="float" default="-1" />
+			<param index="5" name="font_size" type="int" default="16" />
+			<param index="6" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="7" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
+			<param index="8" name="direction" type="int" enum="TextServer.Direction" default="0" />
+			<param index="9" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
+			<description>
+				Draws [param text] using the specified [param font] at the [param pos] (bottom-left corner using the baseline of the font). The text will have its color multiplied by [param modulate]. If [param width] is greater than or equal to 0, the text will be clipped if it exceeds the specified width.
 				[b]Example using the default project font:[/b]
 				[codeblocks]
 				[gdscript]
@@ -310,59 +311,59 @@
 		</method>
 		<method name="draw_string_outline" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="font" type="Font" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="text" type="String" />
-			<argument index="3" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
-			<argument index="4" name="width" type="float" default="-1" />
-			<argument index="5" name="font_size" type="int" default="16" />
-			<argument index="6" name="size" type="int" default="1" />
-			<argument index="7" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="8" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
-			<argument index="9" name="direction" type="int" enum="TextServer.Direction" default="0" />
-			<argument index="10" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
+			<param index="0" name="font" type="Font" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="text" type="String" />
+			<param index="3" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
+			<param index="4" name="width" type="float" default="-1" />
+			<param index="5" name="font_size" type="int" default="16" />
+			<param index="6" name="size" type="int" default="1" />
+			<param index="7" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="8" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
+			<param index="9" name="direction" type="int" enum="TextServer.Direction" default="0" />
+			<param index="10" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
-				Draws [code]text[/code] outline using the specified [code]font[/code] at the [code]position[/code] (bottom-left corner using the baseline of the font). The text will have its color multiplied by [code]modulate[/code]. If [code]clip_w[/code] is greater than or equal to 0, the text will be clipped if it exceeds the specified width.
+				Draws [param text] outline using the specified [param font] at the [param pos] (bottom-left corner using the baseline of the font). The text will have its color multiplied by [param modulate]. If [param width] is greater than or equal to 0, the text will be clipped if it exceeds the specified width.
 			</description>
 		</method>
 		<method name="draw_style_box">
 			<return type="void" />
-			<argument index="0" name="style_box" type="StyleBox" />
-			<argument index="1" name="rect" type="Rect2" />
+			<param index="0" name="style_box" type="StyleBox" />
+			<param index="1" name="rect" type="Rect2" />
 			<description>
 				Draws a styled rectangle.
 			</description>
 		</method>
 		<method name="draw_texture">
 			<return type="void" />
-			<argument index="0" name="texture" type="Texture2D" />
-			<argument index="1" name="position" type="Vector2" />
-			<argument index="2" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="texture" type="Texture2D" />
+			<param index="1" name="position" type="Vector2" />
+			<param index="2" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
 				Draws a texture at a given position.
 			</description>
 		</method>
 		<method name="draw_texture_rect">
 			<return type="void" />
-			<argument index="0" name="texture" type="Texture2D" />
-			<argument index="1" name="rect" type="Rect2" />
-			<argument index="2" name="tile" type="bool" />
-			<argument index="3" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="4" name="transpose" type="bool" default="false" />
+			<param index="0" name="texture" type="Texture2D" />
+			<param index="1" name="rect" type="Rect2" />
+			<param index="2" name="tile" type="bool" />
+			<param index="3" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="4" name="transpose" type="bool" default="false" />
 			<description>
-				Draws a textured rectangle at a given position, optionally modulated by a color. If [code]transpose[/code] is [code]true[/code], the texture will have its X and Y coordinates swapped.
+				Draws a textured rectangle at a given position, optionally modulated by a color. If [param transpose] is [code]true[/code], the texture will have its X and Y coordinates swapped.
 			</description>
 		</method>
 		<method name="draw_texture_rect_region">
 			<return type="void" />
-			<argument index="0" name="texture" type="Texture2D" />
-			<argument index="1" name="rect" type="Rect2" />
-			<argument index="2" name="src_rect" type="Rect2" />
-			<argument index="3" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="4" name="transpose" type="bool" default="false" />
-			<argument index="5" name="clip_uv" type="bool" default="true" />
+			<param index="0" name="texture" type="Texture2D" />
+			<param index="1" name="rect" type="Rect2" />
+			<param index="2" name="src_rect" type="Rect2" />
+			<param index="3" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="4" name="transpose" type="bool" default="false" />
+			<param index="5" name="clip_uv" type="bool" default="true" />
 			<description>
-				Draws a textured rectangle region at a given position, optionally modulated by a color. If [code]transpose[/code] is [code]true[/code], the texture will have its X and Y coordinates swapped.
+				Draws a textured rectangle region at a given position, optionally modulated by a color. If [param transpose] is [code]true[/code], the texture will have its X and Y coordinates swapped.
 			</description>
 		</method>
 		<method name="force_update_transform">
@@ -465,35 +466,35 @@
 		<method name="is_visible_in_tree" qualifiers="const">
 			<return type="bool" />
 			<description>
-				Returns [code]true[/code] if the node is present in the [SceneTree], its [member visible] property is [code]true[/code] and all its antecedents are also visible. If any antecedent is hidden, this node will not be visible in the scene tree.
+				Returns [code]true[/code] if the node is present in the [SceneTree], its [member visible] property is [code]true[/code] and all its antecedents are also visible. If any antecedent is hidden, this node will not be visible in the scene tree, and is consequently not drawn (see [method _draw]).
 			</description>
 		</method>
 		<method name="make_canvas_position_local" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="screen_point" type="Vector2" />
+			<param index="0" name="screen_point" type="Vector2" />
 			<description>
-				Assigns [code]screen_point[/code] as this node's new local transform.
+				Assigns [param screen_point] as this node's new local transform.
 			</description>
 		</method>
 		<method name="make_input_local" qualifiers="const">
 			<return type="InputEvent" />
-			<argument index="0" name="event" type="InputEvent" />
+			<param index="0" name="event" type="InputEvent" />
 			<description>
-				Transformations issued by [code]event[/code]'s inputs are applied in local space instead of global space.
+				Transformations issued by [param event]'s inputs are applied in local space instead of global space.
 			</description>
 		</method>
 		<method name="set_notify_local_transform">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
+			<param index="0" name="enable" type="bool" />
 			<description>
-				If [code]enable[/code] is [code]true[/code], this node will receive [constant NOTIFICATION_LOCAL_TRANSFORM_CHANGED] when its local transform changes.
+				If [param enable] is [code]true[/code], this node will receive [constant NOTIFICATION_LOCAL_TRANSFORM_CHANGED] when its local transform changes.
 			</description>
 		</method>
 		<method name="set_notify_transform">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
+			<param index="0" name="enable" type="bool" />
 			<description>
-				If [code]enable[/code] is [code]true[/code], this node will receive [constant NOTIFICATION_TRANSFORM_CHANGED] when its global transform changes.
+				If [param enable] is [code]true[/code], this node will receive [constant NOTIFICATION_TRANSFORM_CHANGED] when its global transform changes.
 			</description>
 		</method>
 		<method name="show">
@@ -505,7 +506,7 @@
 		<method name="update">
 			<return type="void" />
 			<description>
-				Queue the [CanvasItem] for update. [constant NOTIFICATION_DRAW] will be called on idle time to request redraw.
+				Queues the [CanvasItem] to redraw. During idle time, if [CanvasItem] is visible, [constant NOTIFICATION_DRAW] is sent and [method _draw] is called. This only occurs [b]once[/b] per frame, even if this method has been called multiple times.
 			</description>
 		</method>
 	</methods>
@@ -547,7 +548,8 @@
 	<signals>
 		<signal name="draw">
 			<description>
-				Emitted when the [CanvasItem] must redraw. This can only be connected realtime, as deferred will not allow drawing.
+				Emitted when the [CanvasItem] must redraw, [i]after[/i] the related [constant NOTIFICATION_DRAW] notification, and [i]before[/i] [method _draw] is called.
+				[b]Note:[/b] Deferred connections do not allow drawing through the [code]draw_*[/code] methods.
 			</description>
 		</signal>
 		<signal name="hidden">
@@ -574,7 +576,7 @@
 			The [CanvasItem]'s local transform has changed. This notification is only received if enabled by [method set_notify_local_transform].
 		</constant>
 		<constant name="NOTIFICATION_DRAW" value="30">
-			The [CanvasItem] is requested to draw.
+			The [CanvasItem] is requested to draw (see [method _draw]).
 		</constant>
 		<constant name="NOTIFICATION_VISIBILITY_CHANGED" value="31">
 			The [CanvasItem]'s visibility has changed.
diff --git a/doc/classes/CharacterBody2D.xml b/doc/classes/CharacterBody2D.xml
index 63d493248f..95612de284 100644
--- a/doc/classes/CharacterBody2D.xml
+++ b/doc/classes/CharacterBody2D.xml
@@ -17,9 +17,9 @@
 	<methods>
 		<method name="get_floor_angle" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="up_direction" type="Vector2" default="Vector2(0, -1)" />
+			<param index="0" name="up_direction" type="Vector2" default="Vector2(0, -1)" />
 			<description>
-				Returns the floor's collision angle at the last collision point according to [code]up_direction[/code], which is [code]Vector2.UP[/code] by default. This value is always positive and only valid after calling [method move_and_slide] and when [method is_on_floor] returns [code]true[/code].
+				Returns the floor's collision angle at the last collision point according to [param up_direction], which is [code]Vector2.UP[/code] by default. This value is always positive and only valid after calling [method move_and_slide] and when [method is_on_floor] returns [code]true[/code].
 			</description>
 		</method>
 		<method name="get_floor_normal" qualifiers="const">
@@ -60,7 +60,7 @@
 		</method>
 		<method name="get_slide_collision">
 			<return type="KinematicCollision2D" />
-			<argument index="0" name="slide_idx" type="int" />
+			<param index="0" name="slide_idx" type="int" />
 			<description>
 				Returns a [KinematicCollision2D], which contains information about a collision that occurred during the last call to [method move_and_slide]. Since the body can collide several times in a single call to [method move_and_slide], you must specify the index of the collision in the range 0 to ([method get_slide_collision_count] - 1).
 				[b]Example usage:[/b]
diff --git a/doc/classes/CharacterBody3D.xml b/doc/classes/CharacterBody3D.xml
index 795bd7a429..deb93253ea 100644
--- a/doc/classes/CharacterBody3D.xml
+++ b/doc/classes/CharacterBody3D.xml
@@ -18,9 +18,9 @@
 	<methods>
 		<method name="get_floor_angle" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="up_direction" type="Vector3" default="Vector3(0, 1, 0)" />
+			<param index="0" name="up_direction" type="Vector3" default="Vector3(0, 1, 0)" />
 			<description>
-				Returns the floor's collision angle at the last collision point according to [code]up_direction[/code], which is [code]Vector3.UP[/code] by default. This value is always positive and only valid after calling [method move_and_slide] and when [method is_on_floor] returns [code]true[/code].
+				Returns the floor's collision angle at the last collision point according to [param up_direction], which is [code]Vector3.UP[/code] by default. This value is always positive and only valid after calling [method move_and_slide] and when [method is_on_floor] returns [code]true[/code].
 			</description>
 		</method>
 		<method name="get_floor_normal" qualifiers="const">
@@ -61,7 +61,7 @@
 		</method>
 		<method name="get_slide_collision">
 			<return type="KinematicCollision3D" />
-			<argument index="0" name="slide_idx" type="int" />
+			<param index="0" name="slide_idx" type="int" />
 			<description>
 				Returns a [KinematicCollision3D], which contains information about a collision that occurred during the last call to [method move_and_slide]. Since the body can collide several times in a single call to [method move_and_slide], you must specify the index of the collision in the range 0 to ([method get_slide_collision_count] - 1).
 			</description>
diff --git a/doc/classes/ClassDB.xml b/doc/classes/ClassDB.xml
index 43210de686..90ce52fdb0 100644
--- a/doc/classes/ClassDB.xml
+++ b/doc/classes/ClassDB.xml
@@ -11,142 +11,142 @@
 	<methods>
 		<method name="can_instantiate" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="class" type="StringName" />
+			<param index="0" name="class" type="StringName" />
 			<description>
-				Returns [code]true[/code] if you can instance objects from the specified [code]class[/code], [code]false[/code] in other case.
+				Returns [code]true[/code] if you can instance objects from the specified [param class], [code]false[/code] in other case.
 			</description>
 		</method>
 		<method name="class_exists" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="class" type="StringName" />
+			<param index="0" name="class" type="StringName" />
 			<description>
-				Returns whether the specified [code]class[/code] is available or not.
+				Returns whether the specified [param class] is available or not.
 			</description>
 		</method>
 		<method name="class_get_enum_constants" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="class" type="StringName" />
-			<argument index="1" name="enum" type="StringName" />
-			<argument index="2" name="no_inheritance" type="bool" default="false" />
+			<param index="0" name="class" type="StringName" />
+			<param index="1" name="enum" type="StringName" />
+			<param index="2" name="no_inheritance" type="bool" default="false" />
 			<description>
-				Returns an array with all the keys in [code]enum[/code] of [code]class[/code] or its ancestry.
+				Returns an array with all the keys in [param enum] of [param class] or its ancestry.
 			</description>
 		</method>
 		<method name="class_get_enum_list" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="class" type="StringName" />
-			<argument index="1" name="no_inheritance" type="bool" default="false" />
+			<param index="0" name="class" type="StringName" />
+			<param index="1" name="no_inheritance" type="bool" default="false" />
 			<description>
-				Returns an array with all the enums of [code]class[/code] or its ancestry.
+				Returns an array with all the enums of [param class] or its ancestry.
 			</description>
 		</method>
 		<method name="class_get_integer_constant" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="class" type="StringName" />
-			<argument index="1" name="name" type="StringName" />
+			<param index="0" name="class" type="StringName" />
+			<param index="1" name="name" type="StringName" />
 			<description>
-				Returns the value of the integer constant [code]name[/code] of [code]class[/code] or its ancestry. Always returns 0 when the constant could not be found.
+				Returns the value of the integer constant [param name] of [param class] or its ancestry. Always returns 0 when the constant could not be found.
 			</description>
 		</method>
 		<method name="class_get_integer_constant_enum" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="class" type="StringName" />
-			<argument index="1" name="name" type="StringName" />
-			<argument index="2" name="no_inheritance" type="bool" default="false" />
+			<param index="0" name="class" type="StringName" />
+			<param index="1" name="name" type="StringName" />
+			<param index="2" name="no_inheritance" type="bool" default="false" />
 			<description>
-				Returns which enum the integer constant [code]name[/code] of [code]class[/code] or its ancestry belongs to.
+				Returns which enum the integer constant [param name] of [param class] or its ancestry belongs to.
 			</description>
 		</method>
 		<method name="class_get_integer_constant_list" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="class" type="StringName" />
-			<argument index="1" name="no_inheritance" type="bool" default="false" />
+			<param index="0" name="class" type="StringName" />
+			<param index="1" name="no_inheritance" type="bool" default="false" />
 			<description>
-				Returns an array with the names all the integer constants of [code]class[/code] or its ancestry.
+				Returns an array with the names all the integer constants of [param class] or its ancestry.
 			</description>
 		</method>
 		<method name="class_get_method_list" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="class" type="StringName" />
-			<argument index="1" name="no_inheritance" type="bool" default="false" />
+			<param index="0" name="class" type="StringName" />
+			<param index="1" name="no_inheritance" type="bool" default="false" />
 			<description>
-				Returns an array with all the methods of [code]class[/code] or its ancestry if [code]no_inheritance[/code] is [code]false[/code]. Every element of the array is a [Dictionary] with the following keys: [code]args[/code], [code]default_args[/code], [code]flags[/code], [code]id[/code], [code]name[/code], [code]return: (class_name, hint, hint_string, name, type, usage)[/code].
+				Returns an array with all the methods of [param class] or its ancestry if [param no_inheritance] is [code]false[/code]. Every element of the array is a [Dictionary] with the following keys: [code]args[/code], [code]default_args[/code], [code]flags[/code], [code]id[/code], [code]name[/code], [code]return: (class_name, hint, hint_string, name, type, usage)[/code].
 				[b]Note:[/b] In exported release builds the debug info is not available, so the returned dictionaries will contain only method names.
 			</description>
 		</method>
 		<method name="class_get_property" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="object" type="Object" />
-			<argument index="1" name="property" type="StringName" />
+			<param index="0" name="object" type="Object" />
+			<param index="1" name="property" type="StringName" />
 			<description>
-				Returns the value of [code]property[/code] of [code]class[/code] or its ancestry.
+				Returns the value of [param property] of [param object] or its ancestry.
 			</description>
 		</method>
 		<method name="class_get_property_list" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="class" type="StringName" />
-			<argument index="1" name="no_inheritance" type="bool" default="false" />
+			<param index="0" name="class" type="StringName" />
+			<param index="1" name="no_inheritance" type="bool" default="false" />
 			<description>
-				Returns an array with all the properties of [code]class[/code] or its ancestry if [code]no_inheritance[/code] is [code]false[/code].
+				Returns an array with all the properties of [param class] or its ancestry if [param no_inheritance] is [code]false[/code].
 			</description>
 		</method>
 		<method name="class_get_signal" qualifiers="const">
 			<return type="Dictionary" />
-			<argument index="0" name="class" type="StringName" />
-			<argument index="1" name="signal" type="StringName" />
+			<param index="0" name="class" type="StringName" />
+			<param index="1" name="signal" type="StringName" />
 			<description>
-				Returns the [code]signal[/code] data of [code]class[/code] or its ancestry. The returned value is a [Dictionary] with the following keys: [code]args[/code], [code]default_args[/code], [code]flags[/code], [code]id[/code], [code]name[/code], [code]return: (class_name, hint, hint_string, name, type, usage)[/code].
+				Returns the [param signal] data of [param class] or its ancestry. The returned value is a [Dictionary] with the following keys: [code]args[/code], [code]default_args[/code], [code]flags[/code], [code]id[/code], [code]name[/code], [code]return: (class_name, hint, hint_string, name, type, usage)[/code].
 			</description>
 		</method>
 		<method name="class_get_signal_list" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="class" type="StringName" />
-			<argument index="1" name="no_inheritance" type="bool" default="false" />
+			<param index="0" name="class" type="StringName" />
+			<param index="1" name="no_inheritance" type="bool" default="false" />
 			<description>
-				Returns an array with all the signals of [code]class[/code] or its ancestry if [code]no_inheritance[/code] is [code]false[/code]. Every element of the array is a [Dictionary] as described in [method class_get_signal].
+				Returns an array with all the signals of [param class] or its ancestry if [param no_inheritance] is [code]false[/code]. Every element of the array is a [Dictionary] as described in [method class_get_signal].
 			</description>
 		</method>
 		<method name="class_has_enum" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="class" type="StringName" />
-			<argument index="1" name="name" type="StringName" />
-			<argument index="2" name="no_inheritance" type="bool" default="false" />
+			<param index="0" name="class" type="StringName" />
+			<param index="1" name="name" type="StringName" />
+			<param index="2" name="no_inheritance" type="bool" default="false" />
 			<description>
-				Returns whether [code]class[/code] or its ancestry has an enum called [code]name[/code] or not.
+				Returns whether [param class] or its ancestry has an enum called [param name] or not.
 			</description>
 		</method>
 		<method name="class_has_integer_constant" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="class" type="StringName" />
-			<argument index="1" name="name" type="StringName" />
+			<param index="0" name="class" type="StringName" />
+			<param index="1" name="name" type="StringName" />
 			<description>
-				Returns whether [code]class[/code] or its ancestry has an integer constant called [code]name[/code] or not.
+				Returns whether [param class] or its ancestry has an integer constant called [param name] or not.
 			</description>
 		</method>
 		<method name="class_has_method" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="class" type="StringName" />
-			<argument index="1" name="method" type="StringName" />
-			<argument index="2" name="no_inheritance" type="bool" default="false" />
+			<param index="0" name="class" type="StringName" />
+			<param index="1" name="method" type="StringName" />
+			<param index="2" name="no_inheritance" type="bool" default="false" />
 			<description>
-				Returns whether [code]class[/code] (or its ancestry if [code]no_inheritance[/code] is [code]false[/code]) has a method called [code]method[/code] or not.
+				Returns whether [param class] (or its ancestry if [param no_inheritance] is [code]false[/code]) has a method called [param method] or not.
 			</description>
 		</method>
 		<method name="class_has_signal" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="class" type="StringName" />
-			<argument index="1" name="signal" type="StringName" />
+			<param index="0" name="class" type="StringName" />
+			<param index="1" name="signal" type="StringName" />
 			<description>
-				Returns whether [code]class[/code] or its ancestry has a signal called [code]signal[/code] or not.
+				Returns whether [param class] or its ancestry has a signal called [param signal] or not.
 			</description>
 		</method>
 		<method name="class_set_property" qualifiers="const">
 			<return type="int" enum="Error" />
-			<argument index="0" name="object" type="Object" />
-			<argument index="1" name="property" type="StringName" />
-			<argument index="2" name="value" type="Variant" />
+			<param index="0" name="object" type="Object" />
+			<param index="1" name="property" type="StringName" />
+			<param index="2" name="value" type="Variant" />
 			<description>
-				Sets [code]property[/code] value of [code]class[/code] to [code]value[/code].
+				Sets [param property] value of [param object] to [param value].
 			</description>
 		</method>
 		<method name="get_class_list" qualifiers="const">
@@ -157,38 +157,38 @@
 		</method>
 		<method name="get_inheriters_from_class" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="class" type="StringName" />
+			<param index="0" name="class" type="StringName" />
 			<description>
-				Returns the names of all the classes that directly or indirectly inherit from [code]class[/code].
+				Returns the names of all the classes that directly or indirectly inherit from [param class].
 			</description>
 		</method>
 		<method name="get_parent_class" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="class" type="StringName" />
+			<param index="0" name="class" type="StringName" />
 			<description>
-				Returns the parent class of [code]class[/code].
+				Returns the parent class of [param class].
 			</description>
 		</method>
 		<method name="instantiate" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="class" type="StringName" />
+			<param index="0" name="class" type="StringName" />
 			<description>
-				Creates an instance of [code]class[/code].
+				Creates an instance of [param class].
 			</description>
 		</method>
 		<method name="is_class_enabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="class" type="StringName" />
+			<param index="0" name="class" type="StringName" />
 			<description>
-				Returns whether this [code]class[/code] is enabled or not.
+				Returns whether this [param class] is enabled or not.
 			</description>
 		</method>
 		<method name="is_parent_class" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="class" type="StringName" />
-			<argument index="1" name="inherits" type="StringName" />
+			<param index="0" name="class" type="StringName" />
+			<param index="1" name="inherits" type="StringName" />
 			<description>
-				Returns whether [code]inherits[/code] is an ancestor of [code]class[/code] or not.
+				Returns whether [param inherits] is an ancestor of [param class] or not.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/CodeEdit.xml b/doc/classes/CodeEdit.xml
index 4994ef352e..6513b1ee13 100644
--- a/doc/classes/CodeEdit.xml
+++ b/doc/classes/CodeEdit.xml
@@ -12,30 +12,30 @@
 	<methods>
 		<method name="_confirm_code_completion" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="replace" type="bool" />
+			<param index="0" name="replace" type="bool" />
 			<description>
-				Override this method to define how the selected entry should be inserted. If [code]replace[/code] is true, any existing text should be replaced.
+				Override this method to define how the selected entry should be inserted. If [param replace] is true, any existing text should be replaced.
 			</description>
 		</method>
 		<method name="_filter_code_completion_candidates" qualifiers="virtual const">
 			<return type="Array" />
-			<argument index="0" name="candidates" type="Dictionary[]" />
+			<param index="0" name="candidates" type="Dictionary[]" />
 			<description>
-				Override this method to define what items in [code]candidates[/code] should be displayed.
-				Both [code]candidates[/code] and the return is a [Array] of [Dictionary], see [method get_code_completion_option] for [Dictionary] content.
+				Override this method to define what items in [param candidates] should be displayed.
+				Both [param candidates] and the return is a [Array] of [Dictionary], see [method get_code_completion_option] for [Dictionary] content.
 			</description>
 		</method>
 		<method name="_request_code_completion" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="force" type="bool" />
+			<param index="0" name="force" type="bool" />
 			<description>
-				Override this method to define what happens when the user requests code completion. If [code]force[/code] is true, any checks should be bypassed.
+				Override this method to define what happens when the user requests code completion. If [param force] is true, any checks should be bypassed.
 			</description>
 		</method>
 		<method name="add_auto_brace_completion_pair">
 			<return type="void" />
-			<argument index="0" name="start_key" type="String" />
-			<argument index="1" name="end_key" type="String" />
+			<param index="0" name="start_key" type="String" />
+			<param index="1" name="end_key" type="String" />
 			<description>
 				Adds a brace pair.
 				Both the start and end keys must be symbols. Only the start key has to be unique.
@@ -43,12 +43,12 @@
 		</method>
 		<method name="add_code_completion_option">
 			<return type="void" />
-			<argument index="0" name="type" type="int" enum="CodeEdit.CodeCompletionKind" />
-			<argument index="1" name="display_text" type="String" />
-			<argument index="2" name="insert_text" type="String" />
-			<argument index="3" name="text_color" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="4" name="icon" type="Resource" default="null" />
-			<argument index="5" name="value" type="Variant" default="0" />
+			<param index="0" name="type" type="int" enum="CodeEdit.CodeCompletionKind" />
+			<param index="1" name="display_text" type="String" />
+			<param index="2" name="insert_text" type="String" />
+			<param index="3" name="text_color" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="4" name="icon" type="Resource" default="null" />
+			<param index="5" name="value" type="Variant" default="0" />
 			<description>
 				Submits an item to the queue of potential candidates for the autocomplete menu. Call [method update_code_completion_options] to update the list.
 				[b]Note:[/b] This list will replace all current candidates.
@@ -56,9 +56,9 @@
 		</method>
 		<method name="add_comment_delimiter">
 			<return type="void" />
-			<argument index="0" name="start_key" type="String" />
-			<argument index="1" name="end_key" type="String" />
-			<argument index="2" name="line_only" type="bool" default="false" />
+			<param index="0" name="start_key" type="String" />
+			<param index="1" name="end_key" type="String" />
+			<param index="2" name="line_only" type="bool" default="false" />
 			<description>
 				Adds a comment delimiter.
 				Both the start and end keys must be symbols. Only the start key has to be unique.
@@ -67,9 +67,9 @@
 		</method>
 		<method name="add_string_delimiter">
 			<return type="void" />
-			<argument index="0" name="start_key" type="String" />
-			<argument index="1" name="end_key" type="String" />
-			<argument index="2" name="line_only" type="bool" default="false" />
+			<param index="0" name="start_key" type="String" />
+			<param index="1" name="end_key" type="String" />
+			<param index="2" name="line_only" type="bool" default="false" />
 			<description>
 				Adds a string delimiter.
 				Both the start and end keys must be symbols. Only the start key has to be unique.
@@ -78,7 +78,7 @@
 		</method>
 		<method name="can_fold_line" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns if the given line is foldable, that is, it has indented lines right below it or a comment / string block.
 			</description>
@@ -121,9 +121,9 @@
 		</method>
 		<method name="confirm_code_completion">
 			<return type="void" />
-			<argument index="0" name="replace" type="bool" default="false" />
+			<param index="0" name="replace" type="bool" default="false" />
 			<description>
-				Inserts the selected entry into the text. If [code]replace[/code] is true, any existing text is replaced rather then merged.
+				Inserts the selected entry into the text. If [param replace] is true, any existing text is replaced rather then merged.
 			</description>
 		</method>
 		<method name="do_indent">
@@ -146,16 +146,16 @@
 		</method>
 		<method name="fold_line">
 			<return type="void" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Folds the given line, if possible (see [method can_fold_line]).
 			</description>
 		</method>
 		<method name="get_auto_brace_completion_close_key" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="open_key" type="String" />
+			<param index="0" name="open_key" type="String" />
 			<description>
-				Gets the matching auto brace close key for [code]open_key[/code].
+				Gets the matching auto brace close key for [param open_key].
 			</description>
 		</method>
 		<method name="get_bookmarked_lines" qualifiers="const">
@@ -172,9 +172,9 @@
 		</method>
 		<method name="get_code_completion_option" qualifiers="const">
 			<return type="Dictionary" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Gets the completion option at [code]index[/code]. The return [Dictionary] has the following key-values:
+				Gets the completion option at [param index]. The return [Dictionary] has the following key-values:
 				[code]kind[/code]: [enum CodeCompletionKind]
 				[code]display_text[/code]: Text that is shown on the autocomplete menu.
 				[code]insert_text[/code]: Text that is to be inserted when this item is selected.
@@ -197,32 +197,32 @@
 		</method>
 		<method name="get_delimiter_end_key" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="delimiter_index" type="int" />
+			<param index="0" name="delimiter_index" type="int" />
 			<description>
 				Gets the end key for a string or comment region index.
 			</description>
 		</method>
 		<method name="get_delimiter_end_position" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="column" type="int" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="column" type="int" />
 			<description>
-				If [code]line[/code] [code]column[/code] is in a string or comment, returns the end position of the region. If not or no end could be found, both [Vector2] values will be [code]-1[/code].
+				If [param line] [param column] is in a string or comment, returns the end position of the region. If not or no end could be found, both [Vector2] values will be [code]-1[/code].
 			</description>
 		</method>
 		<method name="get_delimiter_start_key" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="delimiter_index" type="int" />
+			<param index="0" name="delimiter_index" type="int" />
 			<description>
 				Gets the start key for a string or comment region index.
 			</description>
 		</method>
 		<method name="get_delimiter_start_position" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="column" type="int" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="column" type="int" />
 			<description>
-				If [code]line[/code] [code]column[/code] is in a string or comment, returns the start position of the region. If not or no start could be found, both [Vector2] values will be [code]-1[/code].
+				If [param line] [param column] is in a string or comment, returns the start position of the region. If not or no start could be found, both [Vector2] values will be [code]-1[/code].
 			</description>
 		</method>
 		<method name="get_executing_lines" qualifiers="const">
@@ -251,30 +251,30 @@
 		</method>
 		<method name="has_auto_brace_completion_close_key" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="close_key" type="String" />
+			<param index="0" name="close_key" type="String" />
 			<description>
-				Returns [code]true[/code] if close key [code]close_key[/code] exists.
+				Returns [code]true[/code] if close key [param close_key] exists.
 			</description>
 		</method>
 		<method name="has_auto_brace_completion_open_key" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="open_key" type="String" />
+			<param index="0" name="open_key" type="String" />
 			<description>
-				Returns [code]true[/code] if open key [code]open_key[/code] exists.
+				Returns [code]true[/code] if open key [param open_key] exists.
 			</description>
 		</method>
 		<method name="has_comment_delimiter" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="start_key" type="String" />
+			<param index="0" name="start_key" type="String" />
 			<description>
-				Returns [code]true[/code] if comment [code]start_key[/code] exists.
+				Returns [code]true[/code] if comment [param start_key] exists.
 			</description>
 		</method>
 		<method name="has_string_delimiter" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="start_key" type="String" />
+			<param index="0" name="start_key" type="String" />
 			<description>
-				Returns [code]true[/code] if string [code]start_key[/code] exists.
+				Returns [code]true[/code] if string [param start_key] exists.
 			</description>
 		</method>
 		<method name="indent_lines">
@@ -285,124 +285,124 @@
 		</method>
 		<method name="is_in_comment" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="column" type="int" default="-1" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="column" type="int" default="-1" />
 			<description>
-				Returns delimiter index if [code]line[/code] [code]column[/code] is in a comment. If [code]column[/code] is not provided, will return delimiter index if the entire [code]line[/code] is a comment. Otherwise [code]-1[/code].
+				Returns delimiter index if [param line] [param column] is in a comment. If [param column] is not provided, will return delimiter index if the entire [param line] is a comment. Otherwise [code]-1[/code].
 			</description>
 		</method>
 		<method name="is_in_string" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="column" type="int" default="-1" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="column" type="int" default="-1" />
 			<description>
-				Returns the delimiter index if [code]line[/code] [code]column[/code] is in a string. If [code]column[/code] is not provided, will return the delimiter index if the entire [code]line[/code] is a string. Otherwise [code]-1[/code].
+				Returns the delimiter index if [param line] [param column] is in a string. If [param column] is not provided, will return the delimiter index if the entire [param line] is a string. Otherwise [code]-1[/code].
 			</description>
 		</method>
 		<method name="is_line_bookmarked" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns whether the line at the specified index is bookmarked or not.
 			</description>
 		</method>
 		<method name="is_line_breakpointed" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns whether the line at the specified index is breakpointed or not.
 			</description>
 		</method>
 		<method name="is_line_executing" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns whether the line at the specified index is marked as executing or not.
 			</description>
 		</method>
 		<method name="is_line_folded" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns whether the line at the specified index is folded or not.
 			</description>
 		</method>
 		<method name="remove_comment_delimiter">
 			<return type="void" />
-			<argument index="0" name="start_key" type="String" />
+			<param index="0" name="start_key" type="String" />
 			<description>
-				Removes the comment delimiter with [code]start_key[/code].
+				Removes the comment delimiter with [param start_key].
 			</description>
 		</method>
 		<method name="remove_string_delimiter">
 			<return type="void" />
-			<argument index="0" name="start_key" type="String" />
+			<param index="0" name="start_key" type="String" />
 			<description>
-				Removes the string delimiter with [code]start_key[/code].
+				Removes the string delimiter with [param start_key].
 			</description>
 		</method>
 		<method name="request_code_completion">
 			<return type="void" />
-			<argument index="0" name="force" type="bool" default="false" />
+			<param index="0" name="force" type="bool" default="false" />
 			<description>
-				Emits [signal code_completion_requested], if [code]force[/code] is true will bypass all checks. Otherwise will check that the caret is in a word or in front of a prefix. Will ignore the request if all current options are of type file path, node path or signal.
+				Emits [signal code_completion_requested], if [param force] is true will bypass all checks. Otherwise will check that the caret is in a word or in front of a prefix. Will ignore the request if all current options are of type file path, node path or signal.
 			</description>
 		</method>
 		<method name="set_code_completion_selected_index">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Sets the current selected completion option.
 			</description>
 		</method>
 		<method name="set_code_hint">
 			<return type="void" />
-			<argument index="0" name="code_hint" type="String" />
+			<param index="0" name="code_hint" type="String" />
 			<description>
 				Sets the code hint text. Pass an empty string to clear.
 			</description>
 		</method>
 		<method name="set_code_hint_draw_below">
 			<return type="void" />
-			<argument index="0" name="draw_below" type="bool" />
+			<param index="0" name="draw_below" type="bool" />
 			<description>
 				Sets if the code hint should draw below the text.
 			</description>
 		</method>
 		<method name="set_line_as_bookmarked">
 			<return type="void" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="bookmarked" type="bool" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="bookmarked" type="bool" />
 			<description>
 				Sets the line as bookmarked.
 			</description>
 		</method>
 		<method name="set_line_as_breakpoint">
 			<return type="void" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="breakpointed" type="bool" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="breakpointed" type="bool" />
 			<description>
 				Sets the line as breakpointed.
 			</description>
 		</method>
 		<method name="set_line_as_executing">
 			<return type="void" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="executing" type="bool" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="executing" type="bool" />
 			<description>
 				Sets the line as executing.
 			</description>
 		</method>
 		<method name="set_symbol_lookup_word_as_valid">
 			<return type="void" />
-			<argument index="0" name="valid" type="bool" />
+			<param index="0" name="valid" type="bool" />
 			<description>
 				Sets the symbol emitted by [signal symbol_validate] as a valid lookup.
 			</description>
 		</method>
 		<method name="toggle_foldable_line">
 			<return type="void" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Toggle the folding of the code block at the given line.
 			</description>
@@ -415,7 +415,7 @@
 		</method>
 		<method name="unfold_line">
 			<return type="void" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Unfolds all lines that were previously folded.
 			</description>
@@ -428,9 +428,9 @@
 		</method>
 		<method name="update_code_completion_options">
 			<return type="void" />
-			<argument index="0" name="force" type="bool" />
+			<param index="0" name="force" type="bool" />
 			<description>
-				Submits all completion options added with [method add_code_completion_option]. Will try to force the autoccomplete menu to popup, if [code]force[/code] is [code]true[/code].
+				Submits all completion options added with [method add_code_completion_option]. Will try to force the autoccomplete menu to popup, if [param force] is [code]true[/code].
 				[b]Note:[/b] This will replace all current candidates.
 			</description>
 		</method>
@@ -482,7 +482,7 @@
 			Prefixes to trigger an automatic indent.
 		</member>
 		<member name="indent_size" type="int" setter="set_indent_size" getter="get_indent_size" default="4">
-			Size of tabs, if [code]indent_use_spaces[/code] is enabled the amount of spaces to use.
+			Size of tabs, if [code]indent_use_spaces[/code] is enabled the number of spaces to use.
 		</member>
 		<member name="indent_use_spaces" type="bool" setter="set_indent_using_spaces" getter="is_indent_using_spaces" default="false">
 			Use spaces instead of tabs for indentation.
@@ -501,7 +501,7 @@
 	</members>
 	<signals>
 		<signal name="breakpoint_toggled">
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Emitted when a breakpoint is added or removed from a line. If the line is moved via backspace a removed is emitted at the old line.
 			</description>
@@ -512,15 +512,15 @@
 			</description>
 		</signal>
 		<signal name="symbol_lookup">
-			<argument index="0" name="symbol" type="String" />
-			<argument index="1" name="line" type="int" />
-			<argument index="2" name="column" type="int" />
+			<param index="0" name="symbol" type="String" />
+			<param index="1" name="line" type="int" />
+			<param index="2" name="column" type="int" />
 			<description>
 				Emitted when the user has clicked on a valid symbol.
 			</description>
 		</signal>
 		<signal name="symbol_validate">
-			<argument index="0" name="symbol" type="String" />
+			<param index="0" name="symbol" type="String" />
 			<description>
 				Emitted when the user hovers over a symbol. The symbol should be validated and responded to, by calling [method set_symbol_lookup_word_as_valid].
 			</description>
diff --git a/doc/classes/CodeHighlighter.xml b/doc/classes/CodeHighlighter.xml
index b4bde1d00b..fd1f595fc6 100644
--- a/doc/classes/CodeHighlighter.xml
+++ b/doc/classes/CodeHighlighter.xml
@@ -11,10 +11,10 @@
 	<methods>
 		<method name="add_color_region">
 			<return type="void" />
-			<argument index="0" name="start_key" type="String" />
-			<argument index="1" name="end_key" type="String" />
-			<argument index="2" name="color" type="Color" />
-			<argument index="3" name="line_only" type="bool" default="false" />
+			<param index="0" name="start_key" type="String" />
+			<param index="1" name="end_key" type="String" />
+			<param index="2" name="color" type="Color" />
+			<param index="3" name="line_only" type="bool" default="false" />
 			<description>
 				Adds a color region such as comments or strings.
 				Both the start and end keys must be symbols. Only the start key has to be unique.
@@ -23,8 +23,8 @@
 		</method>
 		<method name="add_keyword_color">
 			<return type="void" />
-			<argument index="0" name="keyword" type="String" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="keyword" type="String" />
+			<param index="1" name="color" type="Color" />
 			<description>
 				Sets the color for a keyword.
 				The keyword cannot contain any symbols except '_'.
@@ -32,8 +32,8 @@
 		</method>
 		<method name="add_member_keyword_color">
 			<return type="void" />
-			<argument index="0" name="member_keyword" type="String" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="member_keyword" type="String" />
+			<param index="1" name="color" type="Color" />
 			<description>
 				Sets the color for a member keyword.
 				The member keyword cannot contain any symbols except '_'.
@@ -60,56 +60,56 @@
 		</method>
 		<method name="get_keyword_color" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="keyword" type="String" />
+			<param index="0" name="keyword" type="String" />
 			<description>
 				Returns the color for a keyword.
 			</description>
 		</method>
 		<method name="get_member_keyword_color" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="member_keyword" type="String" />
+			<param index="0" name="member_keyword" type="String" />
 			<description>
 				Returns the color for a member keyword.
 			</description>
 		</method>
 		<method name="has_color_region" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="start_key" type="String" />
+			<param index="0" name="start_key" type="String" />
 			<description>
 				Returns [code]true[/code] if the start key exists, else [code]false[/code].
 			</description>
 		</method>
 		<method name="has_keyword_color" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="keyword" type="String" />
+			<param index="0" name="keyword" type="String" />
 			<description>
 				Returns [code]true[/code] if the keyword exists, else [code]false[/code].
 			</description>
 		</method>
 		<method name="has_member_keyword_color" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="member_keyword" type="String" />
+			<param index="0" name="member_keyword" type="String" />
 			<description>
 				Returns [code]true[/code] if the member keyword exists, else [code]false[/code].
 			</description>
 		</method>
 		<method name="remove_color_region">
 			<return type="void" />
-			<argument index="0" name="start_key" type="String" />
+			<param index="0" name="start_key" type="String" />
 			<description>
 				Removes the color region that uses that start key.
 			</description>
 		</method>
 		<method name="remove_keyword_color">
 			<return type="void" />
-			<argument index="0" name="keyword" type="String" />
+			<param index="0" name="keyword" type="String" />
 			<description>
 				Removes the keyword.
 			</description>
 		</method>
 		<method name="remove_member_keyword_color">
 			<return type="void" />
-			<argument index="0" name="member_keyword" type="String" />
+			<param index="0" name="member_keyword" type="String" />
 			<description>
 				Removes the member keyword.
 			</description>
diff --git a/doc/classes/CollisionObject2D.xml b/doc/classes/CollisionObject2D.xml
index 95d99855f6..4353d97597 100644
--- a/doc/classes/CollisionObject2D.xml
+++ b/doc/classes/CollisionObject2D.xml
@@ -12,33 +12,33 @@
 	<methods>
 		<method name="_input_event" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="viewport" type="Viewport" />
-			<argument index="1" name="event" type="InputEvent" />
-			<argument index="2" name="shape_idx" type="int" />
+			<param index="0" name="viewport" type="Viewport" />
+			<param index="1" name="event" type="InputEvent" />
+			<param index="2" name="shape_idx" type="int" />
 			<description>
-				Accepts unhandled [InputEvent]s. [code]shape_idx[/code] is the child index of the clicked [Shape2D]. Connect to the [code]input_event[/code] signal to easily pick up these events.
+				Accepts unhandled [InputEvent]s. [param shape_idx] is the child index of the clicked [Shape2D]. Connect to the [code]input_event[/code] signal to easily pick up these events.
 				[b]Note:[/b] [method _input_event] requires [member input_pickable] to be [code]true[/code] and at least one [member collision_layer] bit to be set.
 			</description>
 		</method>
 		<method name="create_shape_owner">
 			<return type="int" />
-			<argument index="0" name="owner" type="Object" />
+			<param index="0" name="owner" type="Object" />
 			<description>
 				Creates a new shape owner for the given object. Returns [code]owner_id[/code] of the new owner for future reference.
 			</description>
 		</method>
 		<method name="get_collision_layer_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
-				Returns whether or not the specified layer of the [member collision_layer] is enabled, given a [code]layer_number[/code] between 1 and 32.
+				Returns whether or not the specified layer of the [member collision_layer] is enabled, given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="get_collision_mask_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
-				Returns whether or not the specified layer of the [member collision_mask] is enabled, given a [code]layer_number[/code] between 1 and 32.
+				Returns whether or not the specified layer of the [member collision_mask] is enabled, given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="get_rid" qualifiers="const">
@@ -49,9 +49,9 @@
 		</method>
 		<method name="get_shape_owner_one_way_collision_margin" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="owner_id" type="int" />
+			<param index="0" name="owner_id" type="int" />
 			<description>
-				Returns the [code]one_way_collision_margin[/code] of the shape owner identified by given [code]owner_id[/code].
+				Returns the [code]one_way_collision_margin[/code] of the shape owner identified by given [param owner_id].
 			</description>
 		</method>
 		<method name="get_shape_owners">
@@ -62,136 +62,136 @@
 		</method>
 		<method name="is_shape_owner_disabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="owner_id" type="int" />
+			<param index="0" name="owner_id" type="int" />
 			<description>
 				If [code]true[/code], the shape owner and its shapes are disabled.
 			</description>
 		</method>
 		<method name="is_shape_owner_one_way_collision_enabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="owner_id" type="int" />
+			<param index="0" name="owner_id" type="int" />
 			<description>
 				Returns [code]true[/code] if collisions for the shape owner originating from this [CollisionObject2D] will not be reported to collided with [CollisionObject2D]s.
 			</description>
 		</method>
 		<method name="remove_shape_owner">
 			<return type="void" />
-			<argument index="0" name="owner_id" type="int" />
+			<param index="0" name="owner_id" type="int" />
 			<description>
 				Removes the given shape owner.
 			</description>
 		</method>
 		<method name="set_collision_layer_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
-				Based on [code]value[/code], enables or disables the specified layer in the [member collision_layer], given a [code]layer_number[/code] between 1 and 32.
+				Based on [param value], enables or disables the specified layer in the [member collision_layer], given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="set_collision_mask_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
-				Based on [code]value[/code], enables or disables the specified layer in the [member collision_mask], given a [code]layer_number[/code] between 1 and 32.
+				Based on [param value], enables or disables the specified layer in the [member collision_mask], given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="shape_find_owner" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="shape_index" type="int" />
+			<param index="0" name="shape_index" type="int" />
 			<description>
 				Returns the [code]owner_id[/code] of the given shape.
 			</description>
 		</method>
 		<method name="shape_owner_add_shape">
 			<return type="void" />
-			<argument index="0" name="owner_id" type="int" />
-			<argument index="1" name="shape" type="Shape2D" />
+			<param index="0" name="owner_id" type="int" />
+			<param index="1" name="shape" type="Shape2D" />
 			<description>
 				Adds a [Shape2D] to the shape owner.
 			</description>
 		</method>
 		<method name="shape_owner_clear_shapes">
 			<return type="void" />
-			<argument index="0" name="owner_id" type="int" />
+			<param index="0" name="owner_id" type="int" />
 			<description>
 				Removes all shapes from the shape owner.
 			</description>
 		</method>
 		<method name="shape_owner_get_owner" qualifiers="const">
 			<return type="Object" />
-			<argument index="0" name="owner_id" type="int" />
+			<param index="0" name="owner_id" type="int" />
 			<description>
 				Returns the parent object of the given shape owner.
 			</description>
 		</method>
 		<method name="shape_owner_get_shape" qualifiers="const">
 			<return type="Shape2D" />
-			<argument index="0" name="owner_id" type="int" />
-			<argument index="1" name="shape_id" type="int" />
+			<param index="0" name="owner_id" type="int" />
+			<param index="1" name="shape_id" type="int" />
 			<description>
 				Returns the [Shape2D] with the given id from the given shape owner.
 			</description>
 		</method>
 		<method name="shape_owner_get_shape_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="owner_id" type="int" />
+			<param index="0" name="owner_id" type="int" />
 			<description>
 				Returns the number of shapes the given shape owner contains.
 			</description>
 		</method>
 		<method name="shape_owner_get_shape_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="owner_id" type="int" />
-			<argument index="1" name="shape_id" type="int" />
+			<param index="0" name="owner_id" type="int" />
+			<param index="1" name="shape_id" type="int" />
 			<description>
 				Returns the child index of the [Shape2D] with the given id from the given shape owner.
 			</description>
 		</method>
 		<method name="shape_owner_get_transform" qualifiers="const">
 			<return type="Transform2D" />
-			<argument index="0" name="owner_id" type="int" />
+			<param index="0" name="owner_id" type="int" />
 			<description>
 				Returns the shape owner's [Transform2D].
 			</description>
 		</method>
 		<method name="shape_owner_remove_shape">
 			<return type="void" />
-			<argument index="0" name="owner_id" type="int" />
-			<argument index="1" name="shape_id" type="int" />
+			<param index="0" name="owner_id" type="int" />
+			<param index="1" name="shape_id" type="int" />
 			<description>
 				Removes a shape from the given shape owner.
 			</description>
 		</method>
 		<method name="shape_owner_set_disabled">
 			<return type="void" />
-			<argument index="0" name="owner_id" type="int" />
-			<argument index="1" name="disabled" type="bool" />
+			<param index="0" name="owner_id" type="int" />
+			<param index="1" name="disabled" type="bool" />
 			<description>
 				If [code]true[/code], disables the given shape owner.
 			</description>
 		</method>
 		<method name="shape_owner_set_one_way_collision">
 			<return type="void" />
-			<argument index="0" name="owner_id" type="int" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="owner_id" type="int" />
+			<param index="1" name="enable" type="bool" />
 			<description>
-				If [code]enable[/code] is [code]true[/code], collisions for the shape owner originating from this [CollisionObject2D] will not be reported to collided with [CollisionObject2D]s.
+				If [param enable] is [code]true[/code], collisions for the shape owner originating from this [CollisionObject2D] will not be reported to collided with [CollisionObject2D]s.
 			</description>
 		</method>
 		<method name="shape_owner_set_one_way_collision_margin">
 			<return type="void" />
-			<argument index="0" name="owner_id" type="int" />
-			<argument index="1" name="margin" type="float" />
+			<param index="0" name="owner_id" type="int" />
+			<param index="1" name="margin" type="float" />
 			<description>
-				Sets the [code]one_way_collision_margin[/code] of the shape owner identified by given [code]owner_id[/code] to [code]margin[/code] pixels.
+				Sets the [code]one_way_collision_margin[/code] of the shape owner identified by given [param owner_id] to [param margin] pixels.
 			</description>
 		</method>
 		<method name="shape_owner_set_transform">
 			<return type="void" />
-			<argument index="0" name="owner_id" type="int" />
-			<argument index="1" name="transform" type="Transform2D" />
+			<param index="0" name="owner_id" type="int" />
+			<param index="1" name="transform" type="Transform2D" />
 			<description>
 				Sets the [Transform2D] of the given shape owner.
 			</description>
@@ -215,9 +215,9 @@
 	</members>
 	<signals>
 		<signal name="input_event">
-			<argument index="0" name="viewport" type="Node" />
-			<argument index="1" name="event" type="InputEvent" />
-			<argument index="2" name="shape_idx" type="int" />
+			<param index="0" name="viewport" type="Node" />
+			<param index="1" name="event" type="InputEvent" />
+			<param index="2" name="shape_idx" type="int" />
 			<description>
 				Emitted when an input event occurs. Requires [member input_pickable] to be [code]true[/code] and at least one [member collision_layer] bit to be set. See [method _input_event] for details.
 			</description>
@@ -235,15 +235,15 @@
 			</description>
 		</signal>
 		<signal name="mouse_shape_entered">
-			<argument index="0" name="shape_idx" type="int" />
+			<param index="0" name="shape_idx" type="int" />
 			<description>
-				Emitted when the mouse pointer enters any of this object's shapes or moves from one shape to another. [code]shape_idx[/code] is the child index of the newly entered [Shape2D]. Requires [member input_pickable] to be [code]true[/code] and at least one [member collision_layer] bit to be set.
+				Emitted when the mouse pointer enters any of this object's shapes or moves from one shape to another. [param shape_idx] is the child index of the newly entered [Shape2D]. Requires [member input_pickable] to be [code]true[/code] and at least one [member collision_layer] bit to be set.
 			</description>
 		</signal>
 		<signal name="mouse_shape_exited">
-			<argument index="0" name="shape_idx" type="int" />
+			<param index="0" name="shape_idx" type="int" />
 			<description>
-				Emitted when the mouse pointer exits any of this object's shapes. [code]shape_idx[/code] is the child index of the exited [Shape2D]. Requires [member input_pickable] to be [code]true[/code] and at least one [member collision_layer] bit to be set.
+				Emitted when the mouse pointer exits any of this object's shapes. [param shape_idx] is the child index of the exited [Shape2D]. Requires [member input_pickable] to be [code]true[/code] and at least one [member collision_layer] bit to be set.
 			</description>
 		</signal>
 	</signals>
diff --git a/doc/classes/CollisionObject3D.xml b/doc/classes/CollisionObject3D.xml
index 7284a7e341..f9e28824df 100644
--- a/doc/classes/CollisionObject3D.xml
+++ b/doc/classes/CollisionObject3D.xml
@@ -11,35 +11,35 @@
 	<methods>
 		<method name="_input_event" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="camera" type="Camera3D" />
-			<argument index="1" name="event" type="InputEvent" />
-			<argument index="2" name="position" type="Vector3" />
-			<argument index="3" name="normal" type="Vector3" />
-			<argument index="4" name="shape_idx" type="int" />
+			<param index="0" name="camera" type="Camera3D" />
+			<param index="1" name="event" type="InputEvent" />
+			<param index="2" name="position" type="Vector3" />
+			<param index="3" name="normal" type="Vector3" />
+			<param index="4" name="shape_idx" type="int" />
 			<description>
-				Receives unhandled [InputEvent]s. [code]position[/code] is the location in world space of the mouse pointer on the surface of the shape with index [code]shape_idx[/code] and [code]normal[/code] is the normal vector of the surface at that point. Connect to the [signal input_event] signal to easily pick up these events.
+				Receives unhandled [InputEvent]s. [param position] is the location in world space of the mouse pointer on the surface of the shape with index [param shape_idx] and [param normal] is the normal vector of the surface at that point. Connect to the [signal input_event] signal to easily pick up these events.
 				[b]Note:[/b] [method _input_event] requires [member input_ray_pickable] to be [code]true[/code] and at least one [member collision_layer] bit to be set.
 			</description>
 		</method>
 		<method name="create_shape_owner">
 			<return type="int" />
-			<argument index="0" name="owner" type="Object" />
+			<param index="0" name="owner" type="Object" />
 			<description>
 				Creates a new shape owner for the given object. Returns [code]owner_id[/code] of the new owner for future reference.
 			</description>
 		</method>
 		<method name="get_collision_layer_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
-				Returns whether or not the specified layer of the [member collision_layer] is enabled, given a [code]layer_number[/code] between 1 and 32.
+				Returns whether or not the specified layer of the [member collision_layer] is enabled, given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="get_collision_mask_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
-				Returns whether or not the specified layer of the [member collision_mask] is enabled, given a [code]layer_number[/code] between 1 and 32.
+				Returns whether or not the specified layer of the [member collision_mask] is enabled, given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="get_rid" qualifiers="const">
@@ -56,113 +56,113 @@
 		</method>
 		<method name="is_shape_owner_disabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="owner_id" type="int" />
+			<param index="0" name="owner_id" type="int" />
 			<description>
 				If [code]true[/code], the shape owner and its shapes are disabled.
 			</description>
 		</method>
 		<method name="remove_shape_owner">
 			<return type="void" />
-			<argument index="0" name="owner_id" type="int" />
+			<param index="0" name="owner_id" type="int" />
 			<description>
 				Removes the given shape owner.
 			</description>
 		</method>
 		<method name="set_collision_layer_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
-				Based on [code]value[/code], enables or disables the specified layer in the [member collision_layer], given a [code]layer_number[/code] between 1 and 32.
+				Based on [param value], enables or disables the specified layer in the [member collision_layer], given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="set_collision_mask_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
-				Based on [code]value[/code], enables or disables the specified layer in the [member collision_mask], given a [code]layer_number[/code] between 1 and 32.
+				Based on [param value], enables or disables the specified layer in the [member collision_mask], given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="shape_find_owner" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="shape_index" type="int" />
+			<param index="0" name="shape_index" type="int" />
 			<description>
 				Returns the [code]owner_id[/code] of the given shape.
 			</description>
 		</method>
 		<method name="shape_owner_add_shape">
 			<return type="void" />
-			<argument index="0" name="owner_id" type="int" />
-			<argument index="1" name="shape" type="Shape3D" />
+			<param index="0" name="owner_id" type="int" />
+			<param index="1" name="shape" type="Shape3D" />
 			<description>
 				Adds a [Shape3D] to the shape owner.
 			</description>
 		</method>
 		<method name="shape_owner_clear_shapes">
 			<return type="void" />
-			<argument index="0" name="owner_id" type="int" />
+			<param index="0" name="owner_id" type="int" />
 			<description>
 				Removes all shapes from the shape owner.
 			</description>
 		</method>
 		<method name="shape_owner_get_owner" qualifiers="const">
 			<return type="Object" />
-			<argument index="0" name="owner_id" type="int" />
+			<param index="0" name="owner_id" type="int" />
 			<description>
 				Returns the parent object of the given shape owner.
 			</description>
 		</method>
 		<method name="shape_owner_get_shape" qualifiers="const">
 			<return type="Shape3D" />
-			<argument index="0" name="owner_id" type="int" />
-			<argument index="1" name="shape_id" type="int" />
+			<param index="0" name="owner_id" type="int" />
+			<param index="1" name="shape_id" type="int" />
 			<description>
 				Returns the [Shape3D] with the given id from the given shape owner.
 			</description>
 		</method>
 		<method name="shape_owner_get_shape_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="owner_id" type="int" />
+			<param index="0" name="owner_id" type="int" />
 			<description>
 				Returns the number of shapes the given shape owner contains.
 			</description>
 		</method>
 		<method name="shape_owner_get_shape_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="owner_id" type="int" />
-			<argument index="1" name="shape_id" type="int" />
+			<param index="0" name="owner_id" type="int" />
+			<param index="1" name="shape_id" type="int" />
 			<description>
 				Returns the child index of the [Shape3D] with the given id from the given shape owner.
 			</description>
 		</method>
 		<method name="shape_owner_get_transform" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="owner_id" type="int" />
+			<param index="0" name="owner_id" type="int" />
 			<description>
 				Returns the shape owner's [Transform3D].
 			</description>
 		</method>
 		<method name="shape_owner_remove_shape">
 			<return type="void" />
-			<argument index="0" name="owner_id" type="int" />
-			<argument index="1" name="shape_id" type="int" />
+			<param index="0" name="owner_id" type="int" />
+			<param index="1" name="shape_id" type="int" />
 			<description>
 				Removes a shape from the given shape owner.
 			</description>
 		</method>
 		<method name="shape_owner_set_disabled">
 			<return type="void" />
-			<argument index="0" name="owner_id" type="int" />
-			<argument index="1" name="disabled" type="bool" />
+			<param index="0" name="owner_id" type="int" />
+			<param index="1" name="disabled" type="bool" />
 			<description>
 				If [code]true[/code], disables the given shape owner.
 			</description>
 		</method>
 		<method name="shape_owner_set_transform">
 			<return type="void" />
-			<argument index="0" name="owner_id" type="int" />
-			<argument index="1" name="transform" type="Transform3D" />
+			<param index="0" name="owner_id" type="int" />
+			<param index="1" name="transform" type="Transform3D" />
 			<description>
 				Sets the [Transform3D] of the given shape owner.
 			</description>
@@ -189,13 +189,13 @@
 	</members>
 	<signals>
 		<signal name="input_event">
-			<argument index="0" name="camera" type="Node" />
-			<argument index="1" name="event" type="InputEvent" />
-			<argument index="2" name="position" type="Vector3" />
-			<argument index="3" name="normal" type="Vector3" />
-			<argument index="4" name="shape_idx" type="int" />
+			<param index="0" name="camera" type="Node" />
+			<param index="1" name="event" type="InputEvent" />
+			<param index="2" name="position" type="Vector3" />
+			<param index="3" name="normal" type="Vector3" />
+			<param index="4" name="shape_idx" type="int" />
 			<description>
-				Emitted when the object receives an unhandled [InputEvent]. [code]position[/code] is the location in world space of the mouse pointer on the surface of the shape with index [code]shape_idx[/code] and [code]normal[/code] is the normal vector of the surface at that point.
+				Emitted when the object receives an unhandled [InputEvent]. [param position] is the location in world space of the mouse pointer on the surface of the shape with index [param shape_idx] and [param normal] is the normal vector of the surface at that point.
 			</description>
 		</signal>
 		<signal name="mouse_entered">
diff --git a/doc/classes/CollisionShape3D.xml b/doc/classes/CollisionShape3D.xml
index 521a11effd..c8423dac9e 100644
--- a/doc/classes/CollisionShape3D.xml
+++ b/doc/classes/CollisionShape3D.xml
@@ -21,7 +21,7 @@
 		</method>
 		<method name="resource_changed">
 			<return type="void" />
-			<argument index="0" name="resource" type="Resource" />
+			<param index="0" name="resource" type="Resource" />
 			<description>
 				If this method exists within a script it will be called whenever the shape resource has been modified.
 			</description>
diff --git a/doc/classes/Color.xml b/doc/classes/Color.xml
index 59ad104ad1..3a3803c1da 100644
--- a/doc/classes/Color.xml
+++ b/doc/classes/Color.xml
@@ -24,8 +24,8 @@
 		</constructor>
 		<constructor name="Color">
 			<return type="Color" />
-			<argument index="0" name="from" type="Color" />
-			<argument index="1" name="alpha" type="float" />
+			<param index="0" name="from" type="Color" />
+			<param index="1" name="alpha" type="float" />
 			<description>
 				Constructs a [Color] from an existing color, but with a custom alpha value.
 				[codeblocks]
@@ -40,31 +40,31 @@
 		</constructor>
 		<constructor name="Color">
 			<return type="Color" />
-			<argument index="0" name="from" type="Color" />
+			<param index="0" name="from" type="Color" />
 			<description>
 				Constructs a [Color] as a copy of the given [Color].
 			</description>
 		</constructor>
 		<constructor name="Color">
 			<return type="Color" />
-			<argument index="0" name="code" type="String" />
+			<param index="0" name="code" type="String" />
 			<description>
 				Constructs a [Color] either from an HTML color code or from a standardized color name. Supported color names are the same as the constants.
 			</description>
 		</constructor>
 		<constructor name="Color">
 			<return type="Color" />
-			<argument index="0" name="code" type="String" />
-			<argument index="1" name="alpha" type="float" />
+			<param index="0" name="code" type="String" />
+			<param index="1" name="alpha" type="float" />
 			<description>
-				Constructs a [Color] either from an HTML color code or from a standardized color name, with [code]alpha[/code] on the range of 0 to 1. Supported color names are the same as the constants.
+				Constructs a [Color] either from an HTML color code or from a standardized color name, with [param alpha] on the range of 0 to 1. Supported color names are the same as the constants.
 			</description>
 		</constructor>
 		<constructor name="Color">
 			<return type="Color" />
-			<argument index="0" name="r" type="float" />
-			<argument index="1" name="g" type="float" />
-			<argument index="2" name="b" type="float" />
+			<param index="0" name="r" type="float" />
+			<param index="1" name="g" type="float" />
+			<param index="2" name="b" type="float" />
 			<description>
 				Constructs a [Color] from RGB values, typically between 0 and 1. Alpha will be 1.
 				[codeblocks]
@@ -79,10 +79,10 @@
 		</constructor>
 		<constructor name="Color">
 			<return type="Color" />
-			<argument index="0" name="r" type="float" />
-			<argument index="1" name="g" type="float" />
-			<argument index="2" name="b" type="float" />
-			<argument index="3" name="a" type="float" />
+			<param index="0" name="r" type="float" />
+			<param index="1" name="g" type="float" />
+			<param index="2" name="b" type="float" />
+			<param index="3" name="a" type="float" />
 			<description>
 				Constructs a [Color] from RGBA values, typically between 0 and 1.
 				[codeblocks]
@@ -99,7 +99,7 @@
 	<methods>
 		<method name="blend" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="over" type="Color" />
+			<param index="0" name="over" type="Color" />
 			<description>
 				Returns a new color resulting from blending this color over another. If the color is opaque, the result is also opaque. The second color may have a range of alpha values.
 				[codeblocks]
@@ -118,15 +118,15 @@
 		</method>
 		<method name="clamp" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="min" type="Color" default="Color(0, 0, 0, 0)" />
-			<argument index="1" name="max" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="min" type="Color" default="Color(0, 0, 0, 0)" />
+			<param index="1" name="max" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
-				Returns a new color with all components clamped between the components of [code]min[/code] and [code]max[/code], by running [method @GlobalScope.clamp] on each component.
+				Returns a new color with all components clamped between the components of [param min] and [param max], by running [method @GlobalScope.clamp] on each component.
 			</description>
 		</method>
 		<method name="darkened" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="amount" type="float" />
+			<param index="0" name="amount" type="float" />
 			<description>
 				Returns a new color resulting from making this color darker by the specified percentage (ratio from 0 to 1).
 				[codeblocks]
@@ -143,18 +143,18 @@
 		</method>
 		<method name="find_named_color" qualifiers="static">
 			<return type="int" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="from_hsv" qualifiers="static">
 			<return type="Color" />
-			<argument index="0" name="h" type="float" />
-			<argument index="1" name="s" type="float" />
-			<argument index="2" name="v" type="float" />
-			<argument index="3" name="alpha" type="float" default="1.0" />
+			<param index="0" name="h" type="float" />
+			<param index="1" name="s" type="float" />
+			<param index="2" name="v" type="float" />
+			<param index="3" name="alpha" type="float" default="1.0" />
 			<description>
-				Constructs a color from an [url=https://en.wikipedia.org/wiki/HSL_and_HSV]HSV profile[/url]. [code]h[/code] (hue), [code]s[/code] (saturation), and [code]v[/code] (value) are typically between 0 and 1.
+				Constructs a color from an [url=https://en.wikipedia.org/wiki/HSL_and_HSV]HSV profile[/url]. [param h] (hue), [param s] (saturation), and [param v] (value) are typically between 0 and 1.
 				[codeblocks]
 				[gdscript]
 				var color = Color.from_hsv(0.58, 0.5, 0.79, 0.8)
@@ -167,12 +167,12 @@
 		</method>
 		<method name="from_ok_hsl" qualifiers="static">
 			<return type="Color" />
-			<argument index="0" name="h" type="float" />
-			<argument index="1" name="s" type="float" />
-			<argument index="2" name="l" type="float" />
-			<argument index="3" name="alpha" type="float" default="1.0" />
+			<param index="0" name="h" type="float" />
+			<param index="1" name="s" type="float" />
+			<param index="2" name="l" type="float" />
+			<param index="3" name="alpha" type="float" default="1.0" />
 			<description>
-				Constructs a color from an [url=https://bottosson.github.io/posts/colorpicker/]OK HSL profile[/url]. [code]h[/code] (hue), [code]s[/code] (saturation), and [code]v[/code] (value) are typically between 0 and 1.
+				Constructs a color from an [url=https://bottosson.github.io/posts/colorpicker/]OK HSL profile[/url]. [param h] (hue), [param s] (saturation), and [param l] (lightness) are typically between 0 and 1.
 				[codeblocks]
 				[gdscript]
 				var color = Color.from_ok_hsl(0.58, 0.5, 0.79, 0.8)
@@ -185,14 +185,14 @@
 		</method>
 		<method name="from_rgbe9995" qualifiers="static">
 			<return type="Color" />
-			<argument index="0" name="rgbe" type="int" />
+			<param index="0" name="rgbe" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="from_string" qualifiers="static">
 			<return type="Color" />
-			<argument index="0" name="str" type="String" />
-			<argument index="1" name="default" type="Color" />
+			<param index="0" name="str" type="String" />
+			<param index="1" name="default" type="Color" />
 			<description>
 			</description>
 		</method>
@@ -206,7 +206,7 @@
 		</method>
 		<method name="get_named_color" qualifiers="static">
 			<return type="Color" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 			</description>
 		</method>
@@ -217,29 +217,29 @@
 		</method>
 		<method name="get_named_color_name" qualifiers="static">
 			<return type="String" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="hex" qualifiers="static">
 			<return type="Color" />
-			<argument index="0" name="hex" type="int" />
+			<param index="0" name="hex" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="hex64" qualifiers="static">
 			<return type="Color" />
-			<argument index="0" name="hex" type="int" />
+			<param index="0" name="hex" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="html" qualifiers="static">
 			<return type="Color" />
-			<argument index="0" name="rgba" type="String" />
+			<param index="0" name="rgba" type="String" />
 			<description>
-				Returns a new color from [code]rgba[/code], an HTML hexadecimal color string. [code]rgba[/code] is not case sensitive, and may be prefixed with a '#' character.
-				[code]rgba[/code] must be a valid three-digit or six-digit hexadecimal color string, and may contain an alpha channel value. If [code]rgba[/code] does not contain an alpha channel value, an alpha channel value of 1.0 is applied.
-				If [code]rgba[/code] is invalid a Color(0.0, 0.0, 0.0, 1.0) is returned.
+				Returns a new color from [param rgba], an HTML hexadecimal color string. [param rgba] is not case sensitive, and may be prefixed with a '#' character.
+				[param rgba] must be a valid three-digit or six-digit hexadecimal color string, and may contain an alpha channel value. If [param rgba] does not contain an alpha channel value, an alpha channel value of 1.0 is applied.
+				If [param rgba] is invalid a Color(0.0, 0.0, 0.0, 1.0) is returned.
 				[b]Note:[/b] This method is not implemented in C#, but the same functionality is provided in the class constructor.
 				[codeblocks]
 				[gdscript]
@@ -255,9 +255,9 @@
 		</method>
 		<method name="html_is_valid" qualifiers="static">
 			<return type="bool" />
-			<argument index="0" name="color" type="String" />
+			<param index="0" name="color" type="String" />
 			<description>
-				Returns [code]true[/code] if [code]color[/code] is a valid HTML hexadecimal color string. [code]color[/code] is not case sensitive, and may be prefixed with a '#' character.
+				Returns [code]true[/code] if [param color] is a valid HTML hexadecimal color string. [param color] is not case sensitive, and may be prefixed with a '#' character.
 				For a string to be valid it must be three-digit or six-digit hexadecimal, and may contain an alpha channel value.
 				[codeblocks]
 				[gdscript]
@@ -297,17 +297,17 @@
 		</method>
 		<method name="is_equal_approx" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="to" type="Color" />
+			<param index="0" name="to" type="Color" />
 			<description>
-				Returns [code]true[/code] if this color and [code]color[/code] are approximately equal, by running [method @GlobalScope.is_equal_approx] on each component.
+				Returns [code]true[/code] if this color and [param to] are approximately equal, by running [method @GlobalScope.is_equal_approx] on each component.
 			</description>
 		</method>
 		<method name="lerp" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="to" type="Color" />
-			<argument index="1" name="weight" type="float" />
+			<param index="0" name="to" type="Color" />
+			<param index="1" name="weight" type="float" />
 			<description>
-				Returns the linear interpolation with another color. The interpolation factor [code]weight[/code] is between 0 and 1.
+				Returns the linear interpolation with another color. The interpolation factor [param weight] is between 0 and 1.
 				[codeblocks]
 				[gdscript]
 				var c1 = Color(1.0, 0.0, 0.0)
@@ -324,7 +324,7 @@
 		</method>
 		<method name="lightened" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="amount" type="float" />
+			<param index="0" name="amount" type="float" />
 			<description>
 				Returns a new color resulting from making this color lighter by the specified percentage (ratio from 0 to 1).
 				[codeblocks]
@@ -417,10 +417,10 @@
 		</method>
 		<method name="to_html" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="with_alpha" type="bool" default="true" />
+			<param index="0" name="with_alpha" type="bool" default="true" />
 			<description>
 				Returns the color converted to an HTML hexadecimal color string in RGBA format (ex: [code]ff34f822[/code]).
-				Setting [code]with_alpha[/code] to [code]false[/code] excludes alpha from the hexadecimal string (and uses RGB instead of RGBA format).
+				Setting [param with_alpha] to [code]false[/code] excludes alpha from the hexadecimal string (and uses RGB instead of RGBA format).
 				[codeblocks]
 				[gdscript]
 				var color = Color(1, 1, 1, 0.5)
@@ -946,7 +946,7 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Color" />
+			<param index="0" name="right" type="Color" />
 			<description>
 				Returns [code]true[/code] if the colors are not equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
@@ -954,63 +954,63 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Color" />
-			<argument index="0" name="right" type="Color" />
+			<param index="0" name="right" type="Color" />
 			<description>
 				Multiplies each component of the [Color] by the components of the given [Color].
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Color" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Multiplies each component of the [Color] by the given [float].
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Color" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Multiplies each component of the [Color] by the given [int].
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="Color" />
-			<argument index="0" name="right" type="Color" />
+			<param index="0" name="right" type="Color" />
 			<description>
 				Adds each component of the [Color] with the components of the given [Color].
 			</description>
 		</operator>
 		<operator name="operator -">
 			<return type="Color" />
-			<argument index="0" name="right" type="Color" />
+			<param index="0" name="right" type="Color" />
 			<description>
 				Subtracts each component of the [Color] by the components of the given [Color].
 			</description>
 		</operator>
 		<operator name="operator /">
 			<return type="Color" />
-			<argument index="0" name="right" type="Color" />
+			<param index="0" name="right" type="Color" />
 			<description>
 				Divides each component of the [Color] by the components of the given [Color].
 			</description>
 		</operator>
 		<operator name="operator /">
 			<return type="Color" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Divides each component of the [Color] by the given [float].
 			</description>
 		</operator>
 		<operator name="operator /">
 			<return type="Color" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Divides each component of the [Color] by the given [int].
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="Color" />
+			<param index="0" name="right" type="Color" />
 			<description>
 				Returns [code]true[/code] if the colors are exactly equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
@@ -1018,7 +1018,7 @@
 		</operator>
 		<operator name="operator []">
 			<return type="float" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Access color components using their index. [code]c[0][/code] is equivalent to [code]c.r[/code], [code]c[1][/code] is equivalent to [code]c.g[/code], [code]c[2][/code] is equivalent to [code]c.b[/code], and [code]c[3][/code] is equivalent to [code]c.a[/code].
 			</description>
diff --git a/doc/classes/ColorPicker.xml b/doc/classes/ColorPicker.xml
index cc9c5877c5..705d2282c1 100644
--- a/doc/classes/ColorPicker.xml
+++ b/doc/classes/ColorPicker.xml
@@ -13,7 +13,7 @@
 	<methods>
 		<method name="add_preset">
 			<return type="void" />
-			<argument index="0" name="color" type="Color" />
+			<param index="0" name="color" type="Color" />
 			<description>
 				Adds the given color to a list of color presets. The presets are displayed in the color picker and the user will be able to select them.
 				[b]Note:[/b] The presets list is only for [i]this[/i] color picker.
@@ -21,7 +21,7 @@
 		</method>
 		<method name="erase_preset">
 			<return type="void" />
-			<argument index="0" name="color" type="Color" />
+			<param index="0" name="color" type="Color" />
 			<description>
 				Removes the given color from the list of color presets of this color picker.
 			</description>
@@ -58,19 +58,19 @@
 	</members>
 	<signals>
 		<signal name="color_changed">
-			<argument index="0" name="color" type="Color" />
+			<param index="0" name="color" type="Color" />
 			<description>
 				Emitted when the color is changed.
 			</description>
 		</signal>
 		<signal name="preset_added">
-			<argument index="0" name="color" type="Color" />
+			<param index="0" name="color" type="Color" />
 			<description>
 				Emitted when a preset is added.
 			</description>
 		</signal>
 		<signal name="preset_removed">
-			<argument index="0" name="color" type="Color" />
+			<param index="0" name="color" type="Color" />
 			<description>
 				Emitted when a preset is removed.
 			</description>
diff --git a/doc/classes/ColorPickerButton.xml b/doc/classes/ColorPickerButton.xml
index 75a715789c..b7a0bdfb0c 100644
--- a/doc/classes/ColorPickerButton.xml
+++ b/doc/classes/ColorPickerButton.xml
@@ -39,7 +39,7 @@
 	</members>
 	<signals>
 		<signal name="color_changed">
-			<argument index="0" name="color" type="Color" />
+			<param index="0" name="color" type="Color" />
 			<description>
 				Emitted when the color changes.
 			</description>
diff --git a/doc/classes/CompressedTexture2D.xml b/doc/classes/CompressedTexture2D.xml
index 5f73b55f69..f74265b8d5 100644
--- a/doc/classes/CompressedTexture2D.xml
+++ b/doc/classes/CompressedTexture2D.xml
@@ -11,7 +11,7 @@
 	<methods>
 		<method name="load">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Loads the texture from the given path.
 			</description>
diff --git a/doc/classes/CompressedTexture3D.xml b/doc/classes/CompressedTexture3D.xml
index de7a93d788..50bd025861 100644
--- a/doc/classes/CompressedTexture3D.xml
+++ b/doc/classes/CompressedTexture3D.xml
@@ -9,7 +9,7 @@
 	<methods>
 		<method name="load">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/CompressedTextureLayered.xml b/doc/classes/CompressedTextureLayered.xml
index 03bea84ba4..547679c0f0 100644
--- a/doc/classes/CompressedTextureLayered.xml
+++ b/doc/classes/CompressedTextureLayered.xml
@@ -9,7 +9,7 @@
 	<methods>
 		<method name="load">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/ConcavePolygonShape3D.xml b/doc/classes/ConcavePolygonShape3D.xml
index 60d7e32492..6a54b4bda7 100644
--- a/doc/classes/ConcavePolygonShape3D.xml
+++ b/doc/classes/ConcavePolygonShape3D.xml
@@ -20,7 +20,7 @@
 		</method>
 		<method name="set_faces">
 			<return type="void" />
-			<argument index="0" name="faces" type="PackedVector3Array" />
+			<param index="0" name="faces" type="PackedVector3Array" />
 			<description>
 				Sets the faces (an array of triangles).
 			</description>
diff --git a/doc/classes/ConeTwistJoint3D.xml b/doc/classes/ConeTwistJoint3D.xml
index f78a5b5332..5f2ad109f2 100644
--- a/doc/classes/ConeTwistJoint3D.xml
+++ b/doc/classes/ConeTwistJoint3D.xml
@@ -13,14 +13,14 @@
 	<methods>
 		<method name="get_param" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="param" type="int" enum="ConeTwistJoint3D.Param" />
+			<param index="0" name="param" type="int" enum="ConeTwistJoint3D.Param" />
 			<description>
 			</description>
 		</method>
 		<method name="set_param">
 			<return type="void" />
-			<argument index="0" name="param" type="int" enum="ConeTwistJoint3D.Param" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="param" type="int" enum="ConeTwistJoint3D.Param" />
+			<param index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/ConfigFile.xml b/doc/classes/ConfigFile.xml
index b766981f1e..d3ad4e6e4b 100644
--- a/doc/classes/ConfigFile.xml
+++ b/doc/classes/ConfigFile.xml
@@ -100,22 +100,22 @@
 		</method>
 		<method name="erase_section">
 			<return type="void" />
-			<argument index="0" name="section" type="String" />
+			<param index="0" name="section" type="String" />
 			<description>
 				Deletes the specified section along with all the key-value pairs inside. Raises an error if the section does not exist.
 			</description>
 		</method>
 		<method name="erase_section_key">
 			<return type="void" />
-			<argument index="0" name="section" type="String" />
-			<argument index="1" name="key" type="String" />
+			<param index="0" name="section" type="String" />
+			<param index="1" name="key" type="String" />
 			<description>
 				Deletes the specified key in a section. Raises an error if either the section or the key do not exist.
 			</description>
 		</method>
 		<method name="get_section_keys" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="section" type="String" />
+			<param index="0" name="section" type="String" />
 			<description>
 				Returns an array of all defined key identifiers in the specified section. Raises an error and returns an empty array if the section does not exist.
 			</description>
@@ -128,24 +128,24 @@
 		</method>
 		<method name="get_value" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="section" type="String" />
-			<argument index="1" name="key" type="String" />
-			<argument index="2" name="default" type="Variant" default="null" />
+			<param index="0" name="section" type="String" />
+			<param index="1" name="key" type="String" />
+			<param index="2" name="default" type="Variant" default="null" />
 			<description>
-				Returns the current value for the specified section and key. If either the section or the key do not exist, the method returns the fallback [code]default[/code] value. If [code]default[/code] is not specified or set to [code]null[/code], an error is also raised.
+				Returns the current value for the specified section and key. If either the section or the key do not exist, the method returns the fallback [param default] value. If [param default] is not specified or set to [code]null[/code], an error is also raised.
 			</description>
 		</method>
 		<method name="has_section" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="section" type="String" />
+			<param index="0" name="section" type="String" />
 			<description>
 				Returns [code]true[/code] if the specified section exists.
 			</description>
 		</method>
 		<method name="has_section_key" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="section" type="String" />
-			<argument index="1" name="key" type="String" />
+			<param index="0" name="section" type="String" />
+			<param index="1" name="key" type="String" />
 			<description>
 				Returns [code]true[/code] if the specified section-key pair exists.
 			</description>
@@ -154,7 +154,7 @@
 			<return type="int" enum="Error" />
 			<returns_error number="0"/>
 			<returns_error number="12"/>
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Loads the config file specified as a parameter. The file's contents are parsed and loaded in the [ConfigFile] object which the method was called on.
 				Returns one of the [enum Error] code constants ([code]OK[/code] on success).
@@ -162,25 +162,25 @@
 		</method>
 		<method name="load_encrypted">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="key" type="PackedByteArray" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="key" type="PackedByteArray" />
 			<description>
-				Loads the encrypted config file specified as a parameter, using the provided [code]key[/code] to decrypt it. The file's contents are parsed and loaded in the [ConfigFile] object which the method was called on.
+				Loads the encrypted config file specified as a parameter, using the provided [param key] to decrypt it. The file's contents are parsed and loaded in the [ConfigFile] object which the method was called on.
 				Returns one of the [enum Error] code constants ([code]OK[/code] on success).
 			</description>
 		</method>
 		<method name="load_encrypted_pass">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="password" type="String" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="password" type="String" />
 			<description>
-				Loads the encrypted config file specified as a parameter, using the provided [code]password[/code] to decrypt it. The file's contents are parsed and loaded in the [ConfigFile] object which the method was called on.
+				Loads the encrypted config file specified as a parameter, using the provided [param password] to decrypt it. The file's contents are parsed and loaded in the [ConfigFile] object which the method was called on.
 				Returns one of the [enum Error] code constants ([code]OK[/code] on success).
 			</description>
 		</method>
 		<method name="parse">
 			<return type="int" enum="Error" />
-			<argument index="0" name="data" type="String" />
+			<param index="0" name="data" type="String" />
 			<description>
 				Parses the passed string as the contents of a config file. The string is parsed and loaded in the ConfigFile object which the method was called on.
 				Returns one of the [enum Error] code constants ([code]OK[/code] on success).
@@ -188,7 +188,7 @@
 		</method>
 		<method name="save">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Saves the contents of the [ConfigFile] object to the file specified as a parameter. The output file uses an INI-style structure.
 				Returns one of the [enum Error] code constants ([code]OK[/code] on success).
@@ -196,27 +196,27 @@
 		</method>
 		<method name="save_encrypted">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="key" type="PackedByteArray" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="key" type="PackedByteArray" />
 			<description>
-				Saves the contents of the [ConfigFile] object to the AES-256 encrypted file specified as a parameter, using the provided [code]key[/code] to encrypt it. The output file uses an INI-style structure.
+				Saves the contents of the [ConfigFile] object to the AES-256 encrypted file specified as a parameter, using the provided [param key] to encrypt it. The output file uses an INI-style structure.
 				Returns one of the [enum Error] code constants ([code]OK[/code] on success).
 			</description>
 		</method>
 		<method name="save_encrypted_pass">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="password" type="String" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="password" type="String" />
 			<description>
-				Saves the contents of the [ConfigFile] object to the AES-256 encrypted file specified as a parameter, using the provided [code]password[/code] to encrypt it. The output file uses an INI-style structure.
+				Saves the contents of the [ConfigFile] object to the AES-256 encrypted file specified as a parameter, using the provided [param password] to encrypt it. The output file uses an INI-style structure.
 				Returns one of the [enum Error] code constants ([code]OK[/code] on success).
 			</description>
 		</method>
 		<method name="set_value">
 			<return type="void" />
-			<argument index="0" name="section" type="String" />
-			<argument index="1" name="key" type="String" />
-			<argument index="2" name="value" type="Variant" />
+			<param index="0" name="section" type="String" />
+			<param index="1" name="key" type="String" />
+			<param index="2" name="value" type="Variant" />
 			<description>
 				Assigns a value to the specified key of the specified section. If either the section or the key do not exist, they are created. Passing a [code]null[/code] value deletes the specified key if it exists, and deletes the section if it ends up empty once the key has been removed.
 			</description>
diff --git a/doc/classes/Container.xml b/doc/classes/Container.xml
index 900997d119..a13e1598b2 100644
--- a/doc/classes/Container.xml
+++ b/doc/classes/Container.xml
@@ -27,8 +27,8 @@
 		</method>
 		<method name="fit_child_in_rect">
 			<return type="void" />
-			<argument index="0" name="child" type="Control" />
-			<argument index="1" name="rect" type="Rect2" />
+			<param index="0" name="child" type="Control" />
+			<param index="1" name="rect" type="Rect2" />
 			<description>
 				Fit a child control in a given rect. This is mainly a helper for creating custom container classes.
 			</description>
diff --git a/doc/classes/Control.xml b/doc/classes/Control.xml
index 9fc80e1aab..30d34e4f4d 100644
--- a/doc/classes/Control.xml
+++ b/doc/classes/Control.xml
@@ -24,10 +24,10 @@
 	<methods>
 		<method name="_can_drop_data" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="at_position" type="Vector2" />
-			<argument index="1" name="data" type="Variant" />
+			<param index="0" name="at_position" type="Vector2" />
+			<param index="1" name="data" type="Variant" />
 			<description>
-				Godot calls this method to test if [code]data[/code] from a control's [method _get_drag_data] can be dropped at [code]position[/code]. [code]position[/code] is local to this control.
+				Godot calls this method to test if [param data] from a control's [method _get_drag_data] can be dropped at [param at_position]. [param at_position] is local to this control.
 				This method should only be used to test the data. Process the data in [method _drop_data].
 				[codeblocks]
 				[gdscript]
@@ -49,10 +49,10 @@
 		</method>
 		<method name="_drop_data" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="at_position" type="Vector2" />
-			<argument index="1" name="data" type="Variant" />
+			<param index="0" name="at_position" type="Vector2" />
+			<param index="1" name="data" type="Variant" />
 			<description>
-				Godot calls this method to pass you the [code]data[/code] from a control's [method _get_drag_data] result. Godot first calls [method _can_drop_data] to test if [code]data[/code] is allowed to drop at [code]position[/code] where [code]position[/code] is local to this control.
+				Godot calls this method to pass you the [param data] from a control's [method _get_drag_data] result. Godot first calls [method _can_drop_data] to test if [param data] is allowed to drop at [param at_position] where [param at_position] is local to this control.
 				[codeblocks]
 				[gdscript]
 				func _can_drop_data(position, data):
@@ -75,9 +75,9 @@
 		</method>
 		<method name="_get_drag_data" qualifiers="virtual const">
 			<return type="Variant" />
-			<argument index="0" name="at_position" type="Vector2" />
+			<param index="0" name="at_position" type="Vector2" />
 			<description>
-				Godot calls this method to get data that can be dragged and dropped onto controls that expect drop data. Returns [code]null[/code] if there is no data to drag. Controls that want to receive drop data should implement [method _can_drop_data] and [method _drop_data]. [code]position[/code] is local to this control. Drag may be forced with [method force_drag].
+				Godot calls this method to get data that can be dragged and dropped onto controls that expect drop data. Returns [code]null[/code] if there is no data to drag. Controls that want to receive drop data should implement [method _can_drop_data] and [method _drop_data]. [param at_position] is local to this control. Drag may be forced with [method force_drag].
 				A preview that will follow the mouse that should represent the data can be set with [method set_drag_preview]. A good time to set the preview is in this method.
 				[codeblocks]
 				[gdscript]
@@ -107,7 +107,7 @@
 		</method>
 		<method name="_gui_input" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="event" type="InputEvent" />
+			<param index="0" name="event" type="InputEvent" />
 			<description>
 				Virtual method to be implemented by the user. Use this method to process and accept inputs on UI elements. See [method accept_event].
 				Example: clicking a control.
@@ -143,18 +143,18 @@
 		</method>
 		<method name="_has_point" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="position" type="Vector2" />
+			<param index="0" name="position" type="Vector2" />
 			<description>
-				Virtual method to be implemented by the user. Returns whether the given [code]point[/code] is inside this control.
+				Virtual method to be implemented by the user. Returns whether the given [param position] is inside this control.
 				If not overridden, default behavior is checking if the point is within control's Rect.
 				[b]Note:[/b] If you want to check if a point is inside the control, you can use [code]get_rect().has_point(point)[/code].
 			</description>
 		</method>
 		<method name="_make_custom_tooltip" qualifiers="virtual const">
 			<return type="Object" />
-			<argument index="0" name="for_text" type="String" />
+			<param index="0" name="for_text" type="String" />
 			<description>
-				Virtual method to be implemented by the user. Returns a [Control] node that should be used as a tooltip instead of the default one. The [code]for_text[/code] includes the contents of the [member hint_tooltip] property.
+				Virtual method to be implemented by the user. Returns a [Control] node that should be used as a tooltip instead of the default one. The [param for_text] includes the contents of the [member hint_tooltip] property.
 				The returned node must be of type [Control] or Control-derived. It can have child nodes of any type. It is freed when the tooltip disappears, so make sure you always provide a new instance (if you want to use a pre-existing node from your scene tree, you can duplicate it and pass the duplicated instance). When [code]null[/code] or a non-Control node is returned, the default tooltip will be used instead.
 				The returned node will be added as child to a [PopupPanel], so you should only provide the contents of that panel. That [PopupPanel] can be themed using [method Theme.set_stylebox] for the type [code]"TooltipPanel"[/code] (see [member hint_tooltip] for an example).
 				[b]Note:[/b] The tooltip is shrunk to minimal size. If you want to ensure it's fully visible, you might want to set its [member custom_minimum_size] to some non-zero value.
@@ -197,11 +197,11 @@
 		</method>
 		<method name="_structured_text_parser" qualifiers="virtual const">
 			<return type="Array" />
-			<argument index="0" name="args" type="Array" />
-			<argument index="1" name="text" type="String" />
+			<param index="0" name="args" type="Array" />
+			<param index="1" name="text" type="String" />
 			<description>
 				User defined BiDi algorithm override function.
-				Returns [code]Array[/code] of [code]Vector2i[/code] text ranges, in the left-to-right order. Ranges should cover full source [code]text[/code] without overlaps. BiDi algorithm will be used on each range separately.
+				Returns [code]Array[/code] of [code]Vector2i[/code] text ranges, in the left-to-right order. Ranges should cover full source [param text] without overlaps. BiDi algorithm will be used on each range separately.
 			</description>
 		</method>
 		<method name="accept_event">
@@ -212,10 +212,10 @@
 		</method>
 		<method name="add_theme_color_override">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="color" type="Color" />
 			<description>
-				Creates a local override for a theme [Color] with the specified [code]name[/code]. Local overrides always take precedence when fetching theme items for the control. An override can be removed with [method remove_theme_color_override].
+				Creates a local override for a theme [Color] with the specified [param name]. Local overrides always take precedence when fetching theme items for the control. An override can be removed with [method remove_theme_color_override].
 				See also [method get_theme_color].
 				[b]Example of overriding a label's color and resetting it later:[/b]
 				[codeblocks]
@@ -240,46 +240,46 @@
 		</method>
 		<method name="add_theme_constant_override">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="constant" type="int" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="constant" type="int" />
 			<description>
-				Creates a local override for a theme constant with the specified [code]name[/code]. Local overrides always take precedence when fetching theme items for the control. An override can be removed with [method remove_theme_constant_override].
+				Creates a local override for a theme constant with the specified [param name]. Local overrides always take precedence when fetching theme items for the control. An override can be removed with [method remove_theme_constant_override].
 				See also [method get_theme_constant].
 			</description>
 		</method>
 		<method name="add_theme_font_override">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="font" type="Font" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="font" type="Font" />
 			<description>
-				Creates a local override for a theme [Font] with the specified [code]name[/code]. Local overrides always take precedence when fetching theme items for the control. An override can be removed with [method remove_theme_font_override].
+				Creates a local override for a theme [Font] with the specified [param name]. Local overrides always take precedence when fetching theme items for the control. An override can be removed with [method remove_theme_font_override].
 				See also [method get_theme_font].
 			</description>
 		</method>
 		<method name="add_theme_font_size_override">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="font_size" type="int" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="font_size" type="int" />
 			<description>
-				Creates a local override for a theme font size with the specified [code]name[/code]. Local overrides always take precedence when fetching theme items for the control. An override can be removed with [method remove_theme_font_size_override].
+				Creates a local override for a theme font size with the specified [param name]. Local overrides always take precedence when fetching theme items for the control. An override can be removed with [method remove_theme_font_size_override].
 				See also [method get_theme_font_size].
 			</description>
 		</method>
 		<method name="add_theme_icon_override">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="texture" type="Texture2D" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="texture" type="Texture2D" />
 			<description>
-				Creates a local override for a theme icon with the specified [code]name[/code]. Local overrides always take precedence when fetching theme items for the control. An override can be removed with [method remove_theme_icon_override].
+				Creates a local override for a theme icon with the specified [param name]. Local overrides always take precedence when fetching theme items for the control. An override can be removed with [method remove_theme_icon_override].
 				See also [method get_theme_icon].
 			</description>
 		</method>
 		<method name="add_theme_stylebox_override">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="stylebox" type="StyleBox" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="stylebox" type="StyleBox" />
 			<description>
-				Creates a local override for a theme [StyleBox] with the specified [code]name[/code]. Local overrides always take precedence when fetching theme items for the control. An override can be removed with [method remove_theme_stylebox_override].
+				Creates a local override for a theme [StyleBox] with the specified [param name]. Local overrides always take precedence when fetching theme items for the control. An override can be removed with [method remove_theme_stylebox_override].
 				See also [method get_theme_stylebox].
 				[b]Example of modifying a property in a StyleBox by duplicating it:[/b]
 				[codeblocks]
@@ -334,16 +334,16 @@
 		</method>
 		<method name="force_drag">
 			<return type="void" />
-			<argument index="0" name="data" type="Variant" />
-			<argument index="1" name="preview" type="Control" />
+			<param index="0" name="data" type="Variant" />
+			<param index="1" name="preview" type="Control" />
 			<description>
-				Forces drag and bypasses [method _get_drag_data] and [method set_drag_preview] by passing [code]data[/code] and [code]preview[/code]. Drag will start even if the mouse is neither over nor pressed on this control.
+				Forces drag and bypasses [method _get_drag_data] and [method set_drag_preview] by passing [param data] and [param preview]. Drag will start even if the mouse is neither over nor pressed on this control.
 				The methods [method _can_drop_data] and [method _drop_data] must be implemented on controls that want to receive drop data.
 			</description>
 		</method>
 		<method name="get_anchor" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="side" type="int" enum="Side" />
+			<param index="0" name="side" type="int" enum="Side" />
 			<description>
 				Returns the anchor for the specified [enum Side]. A getter method for [member anchor_bottom], [member anchor_left], [member anchor_right] and [member anchor_top].
 			</description>
@@ -362,7 +362,7 @@
 		</method>
 		<method name="get_cursor_shape" qualifiers="const">
 			<return type="int" enum="Control.CursorShape" />
-			<argument index="0" name="position" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="position" type="Vector2" default="Vector2(0, 0)" />
 			<description>
 				Returns the mouse cursor shape the control displays on mouse hover. See [enum CursorShape].
 			</description>
@@ -375,7 +375,7 @@
 		</method>
 		<method name="get_focus_neighbor" qualifiers="const">
 			<return type="NodePath" />
-			<argument index="0" name="side" type="int" enum="Side" />
+			<param index="0" name="side" type="int" enum="Side" />
 			<description>
 				Returns the focus neighbor for the specified [enum Side]. A getter method for [member focus_neighbor_bottom], [member focus_neighbor_left], [member focus_neighbor_right] and [member focus_neighbor_top].
 			</description>
@@ -394,7 +394,7 @@
 		</method>
 		<method name="get_offset" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="offset" type="int" enum="Side" />
+			<param index="0" name="offset" type="int" enum="Side" />
 			<description>
 				Returns the anchor for the specified [enum Side]. A getter method for [member offset_bottom], [member offset_left], [member offset_right] and [member offset_top].
 			</description>
@@ -432,10 +432,10 @@
 		</method>
 		<method name="get_theme_color" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns a [Color] from the first matching [Theme] in the tree if that [Theme] has a color item with the specified [code]name[/code] and [code]theme_type[/code]. If [code]theme_type[/code] is omitted the class name of the current control is used as the type, or [member theme_type_variation] if it is defined. If the type is a class name its parent classes are also checked, in order of inheritance. If the type is a variation its base types are checked, in order of dependency, then the control's class name and its parent classes are checked.
+				Returns a [Color] from the first matching [Theme] in the tree if that [Theme] has a color item with the specified [param name] and [param theme_type]. If [param theme_type] is omitted the class name of the current control is used as the type, or [member theme_type_variation] if it is defined. If the type is a class name its parent classes are also checked, in order of inheritance. If the type is a variation its base types are checked, in order of dependency, then the control's class name and its parent classes are checked.
 				For the current control its local overrides are considered first (see [method add_theme_color_override]), then its assigned [member theme]. After the current control, each parent control and its assigned [member theme] are considered; controls without a [member theme] assigned are skipped. If no matching [Theme] is found in the tree, a custom project [Theme] (see [member ProjectSettings.gui/theme/custom]) and the default [Theme] are used.
 				[codeblocks]
 				[gdscript]
@@ -459,10 +459,10 @@
 		</method>
 		<method name="get_theme_constant" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns a constant from the first matching [Theme] in the tree if that [Theme] has a constant item with the specified [code]name[/code] and [code]theme_type[/code].
+				Returns a constant from the first matching [Theme] in the tree if that [Theme] has a constant item with the specified [param name] and [param theme_type].
 				See [method get_theme_color] for details.
 			</description>
 		</method>
@@ -489,43 +489,43 @@
 		</method>
 		<method name="get_theme_font" qualifiers="const">
 			<return type="Font" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns a [Font] from the first matching [Theme] in the tree if that [Theme] has a font item with the specified [code]name[/code] and [code]theme_type[/code].
+				Returns a [Font] from the first matching [Theme] in the tree if that [Theme] has a font item with the specified [param name] and [param theme_type].
 				See [method get_theme_color] for details.
 			</description>
 		</method>
 		<method name="get_theme_font_size" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns a font size from the first matching [Theme] in the tree if that [Theme] has a font size item with the specified [code]name[/code] and [code]theme_type[/code].
+				Returns a font size from the first matching [Theme] in the tree if that [Theme] has a font size item with the specified [param name] and [param theme_type].
 				See [method get_theme_color] for details.
 			</description>
 		</method>
 		<method name="get_theme_icon" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns an icon from the first matching [Theme] in the tree if that [Theme] has an icon item with the specified [code]name[/code] and [code]theme_type[/code].
+				Returns an icon from the first matching [Theme] in the tree if that [Theme] has an icon item with the specified [param name] and [param theme_type].
 				See [method get_theme_color] for details.
 			</description>
 		</method>
 		<method name="get_theme_stylebox" qualifiers="const">
 			<return type="StyleBox" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns a [StyleBox] from the first matching [Theme] in the tree if that [Theme] has a stylebox item with the specified [code]name[/code] and [code]theme_type[/code].
+				Returns a [StyleBox] from the first matching [Theme] in the tree if that [Theme] has a stylebox item with the specified [param name] and [param theme_type].
 				See [method get_theme_color] for details.
 			</description>
 		</method>
 		<method name="get_tooltip" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="at_position" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="at_position" type="Vector2" default="Vector2(0, 0)" />
 			<description>
 				Returns the tooltip, which will appear when the cursor is resting over this control. See [member hint_tooltip].
 			</description>
@@ -562,103 +562,103 @@
 		</method>
 		<method name="has_theme_color" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns [code]true[/code] if there is a matching [Theme] in the tree that has a color item with the specified [code]name[/code] and [code]theme_type[/code].
+				Returns [code]true[/code] if there is a matching [Theme] in the tree that has a color item with the specified [param name] and [param theme_type].
 				See [method get_theme_color] for details.
 			</description>
 		</method>
 		<method name="has_theme_color_override" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns [code]true[/code] if there is a local override for a theme [Color] with the specified [code]name[/code] in this [Control] node.
+				Returns [code]true[/code] if there is a local override for a theme [Color] with the specified [param name] in this [Control] node.
 				See [method add_theme_color_override].
 			</description>
 		</method>
 		<method name="has_theme_constant" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns [code]true[/code] if there is a matching [Theme] in the tree that has a constant item with the specified [code]name[/code] and [code]theme_type[/code].
+				Returns [code]true[/code] if there is a matching [Theme] in the tree that has a constant item with the specified [param name] and [param theme_type].
 				See [method get_theme_color] for details.
 			</description>
 		</method>
 		<method name="has_theme_constant_override" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns [code]true[/code] if there is a local override for a theme constant with the specified [code]name[/code] in this [Control] node.
+				Returns [code]true[/code] if there is a local override for a theme constant with the specified [param name] in this [Control] node.
 				See [method add_theme_constant_override].
 			</description>
 		</method>
 		<method name="has_theme_font" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns [code]true[/code] if there is a matching [Theme] in the tree that has a font item with the specified [code]name[/code] and [code]theme_type[/code].
+				Returns [code]true[/code] if there is a matching [Theme] in the tree that has a font item with the specified [param name] and [param theme_type].
 				See [method get_theme_color] for details.
 			</description>
 		</method>
 		<method name="has_theme_font_override" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns [code]true[/code] if there is a local override for a theme [Font] with the specified [code]name[/code] in this [Control] node.
+				Returns [code]true[/code] if there is a local override for a theme [Font] with the specified [param name] in this [Control] node.
 				See [method add_theme_font_override].
 			</description>
 		</method>
 		<method name="has_theme_font_size" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns [code]true[/code] if there is a matching [Theme] in the tree that has a font size item with the specified [code]name[/code] and [code]theme_type[/code].
+				Returns [code]true[/code] if there is a matching [Theme] in the tree that has a font size item with the specified [param name] and [param theme_type].
 				See [method get_theme_color] for details.
 			</description>
 		</method>
 		<method name="has_theme_font_size_override" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns [code]true[/code] if there is a local override for a theme font size with the specified [code]name[/code] in this [Control] node.
+				Returns [code]true[/code] if there is a local override for a theme font size with the specified [param name] in this [Control] node.
 				See [method add_theme_font_size_override].
 			</description>
 		</method>
 		<method name="has_theme_icon" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns [code]true[/code] if there is a matching [Theme] in the tree that has an icon item with the specified [code]name[/code] and [code]theme_type[/code].
+				Returns [code]true[/code] if there is a matching [Theme] in the tree that has an icon item with the specified [param name] and [param theme_type].
 				See [method get_theme_color] for details.
 			</description>
 		</method>
 		<method name="has_theme_icon_override" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns [code]true[/code] if there is a local override for a theme icon with the specified [code]name[/code] in this [Control] node.
+				Returns [code]true[/code] if there is a local override for a theme icon with the specified [param name] in this [Control] node.
 				See [method add_theme_icon_override].
 			</description>
 		</method>
 		<method name="has_theme_stylebox" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns [code]true[/code] if there is a matching [Theme] in the tree that has a stylebox item with the specified [code]name[/code] and [code]theme_type[/code].
+				Returns [code]true[/code] if there is a matching [Theme] in the tree that has a stylebox item with the specified [param name] and [param theme_type].
 				See [method get_theme_color] for details.
 			</description>
 		</method>
 		<method name="has_theme_stylebox_override" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns [code]true[/code] if there is a local override for a theme [StyleBox] with the specified [code]name[/code] in this [Control] node.
+				Returns [code]true[/code] if there is a local override for a theme [StyleBox] with the specified [param name] in this [Control] node.
 				See [method add_theme_stylebox_override].
 			</description>
 		</method>
@@ -683,44 +683,44 @@
 		</method>
 		<method name="remove_theme_color_override">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Removes a local override for a theme [Color] with the specified [code]name[/code] previously added by [method add_theme_color_override] or via the Inspector dock.
+				Removes a local override for a theme [Color] with the specified [param name] previously added by [method add_theme_color_override] or via the Inspector dock.
 			</description>
 		</method>
 		<method name="remove_theme_constant_override">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Removes a local override for a theme constant with the specified [code]name[/code] previously added by [method add_theme_constant_override] or via the Inspector dock.
+				Removes a local override for a theme constant with the specified [param name] previously added by [method add_theme_constant_override] or via the Inspector dock.
 			</description>
 		</method>
 		<method name="remove_theme_font_override">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Removes a local override for a theme [Font] with the specified [code]name[/code] previously added by [method add_theme_font_override] or via the Inspector dock.
+				Removes a local override for a theme [Font] with the specified [param name] previously added by [method add_theme_font_override] or via the Inspector dock.
 			</description>
 		</method>
 		<method name="remove_theme_font_size_override">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Removes a local override for a theme font size with the specified [code]name[/code] previously added by [method add_theme_font_size_override] or via the Inspector dock.
+				Removes a local override for a theme font size with the specified [param name] previously added by [method add_theme_font_size_override] or via the Inspector dock.
 			</description>
 		</method>
 		<method name="remove_theme_icon_override">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Removes a local override for a theme icon with the specified [code]name[/code] previously added by [method add_theme_icon_override] or via the Inspector dock.
+				Removes a local override for a theme icon with the specified [param name] previously added by [method add_theme_icon_override] or via the Inspector dock.
 			</description>
 		</method>
 		<method name="remove_theme_stylebox_override">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Removes a local override for a theme [StyleBox] with the specified [code]name[/code] previously added by [method add_theme_stylebox_override] or via the Inspector dock.
+				Removes a local override for a theme [StyleBox] with the specified [param name] previously added by [method add_theme_stylebox_override] or via the Inspector dock.
 			</description>
 		</method>
 		<method name="reset_size">
@@ -731,56 +731,56 @@
 		</method>
 		<method name="set_anchor">
 			<return type="void" />
-			<argument index="0" name="side" type="int" enum="Side" />
-			<argument index="1" name="anchor" type="float" />
-			<argument index="2" name="keep_offset" type="bool" default="false" />
-			<argument index="3" name="push_opposite_anchor" type="bool" default="true" />
+			<param index="0" name="side" type="int" enum="Side" />
+			<param index="1" name="anchor" type="float" />
+			<param index="2" name="keep_offset" type="bool" default="false" />
+			<param index="3" name="push_opposite_anchor" type="bool" default="true" />
 			<description>
-				Sets the anchor for the specified [enum Side] to [code]anchor[/code]. A setter method for [member anchor_bottom], [member anchor_left], [member anchor_right] and [member anchor_top].
-				If [code]keep_offset[/code] is [code]true[/code], offsets aren't updated after this operation.
-				If [code]push_opposite_anchor[/code] is [code]true[/code] and the opposite anchor overlaps this anchor, the opposite one will have its value overridden. For example, when setting left anchor to 1 and the right anchor has value of 0.5, the right anchor will also get value of 1. If [code]push_opposite_anchor[/code] was [code]false[/code], the left anchor would get value 0.5.
+				Sets the anchor for the specified [enum Side] to [param anchor]. A setter method for [member anchor_bottom], [member anchor_left], [member anchor_right] and [member anchor_top].
+				If [param keep_offset] is [code]true[/code], offsets aren't updated after this operation.
+				If [param push_opposite_anchor] is [code]true[/code] and the opposite anchor overlaps this anchor, the opposite one will have its value overridden. For example, when setting left anchor to 1 and the right anchor has value of 0.5, the right anchor will also get value of 1. If [param push_opposite_anchor] was [code]false[/code], the left anchor would get value 0.5.
 			</description>
 		</method>
 		<method name="set_anchor_and_offset">
 			<return type="void" />
-			<argument index="0" name="side" type="int" enum="Side" />
-			<argument index="1" name="anchor" type="float" />
-			<argument index="2" name="offset" type="float" />
-			<argument index="3" name="push_opposite_anchor" type="bool" default="false" />
+			<param index="0" name="side" type="int" enum="Side" />
+			<param index="1" name="anchor" type="float" />
+			<param index="2" name="offset" type="float" />
+			<param index="3" name="push_opposite_anchor" type="bool" default="false" />
 			<description>
 				Works the same as [method set_anchor], but instead of [code]keep_offset[/code] argument and automatic update of offset, it allows to set the offset yourself (see [method set_offset]).
 			</description>
 		</method>
 		<method name="set_anchors_and_offsets_preset">
 			<return type="void" />
-			<argument index="0" name="preset" type="int" enum="Control.LayoutPreset" />
-			<argument index="1" name="resize_mode" type="int" enum="Control.LayoutPresetMode" default="0" />
-			<argument index="2" name="margin" type="int" default="0" />
+			<param index="0" name="preset" type="int" enum="Control.LayoutPreset" />
+			<param index="1" name="resize_mode" type="int" enum="Control.LayoutPresetMode" default="0" />
+			<param index="2" name="margin" type="int" default="0" />
 			<description>
 				Sets both anchor preset and offset preset. See [method set_anchors_preset] and [method set_offsets_preset].
 			</description>
 		</method>
 		<method name="set_anchors_preset">
 			<return type="void" />
-			<argument index="0" name="preset" type="int" enum="Control.LayoutPreset" />
-			<argument index="1" name="keep_offsets" type="bool" default="false" />
+			<param index="0" name="preset" type="int" enum="Control.LayoutPreset" />
+			<param index="1" name="keep_offsets" type="bool" default="false" />
 			<description>
-				Sets the anchors to a [code]preset[/code] from [enum Control.LayoutPreset] enum. This is the code equivalent to using the Layout menu in the 2D editor.
-				If [code]keep_offsets[/code] is [code]true[/code], control's position will also be updated.
+				Sets the anchors to a [param preset] from [enum Control.LayoutPreset] enum. This is the code equivalent to using the Layout menu in the 2D editor.
+				If [param keep_offsets] is [code]true[/code], control's position will also be updated.
 			</description>
 		</method>
 		<method name="set_begin">
 			<return type="void" />
-			<argument index="0" name="position" type="Vector2" />
+			<param index="0" name="position" type="Vector2" />
 			<description>
 				Sets [member offset_left] and [member offset_top] at the same time. Equivalent of changing [member position].
 			</description>
 		</method>
 		<method name="set_drag_forwarding">
 			<return type="void" />
-			<argument index="0" name="target" type="Object" />
+			<param index="0" name="target" type="Object" />
 			<description>
-				Forwards the handling of this control's drag and drop to [code]target[/code] object.
+				Forwards the handling of this control's drag and drop to [param target] object.
 				Forwarding can be implemented in the target object similar to the methods [method _get_drag_data], [method _can_drop_data], and [method _drop_data] but with two differences:
 				1. The function name must be suffixed with [b]_fw[/b]
 				2. The function must take an extra argument that is the control doing the forwarding
@@ -843,7 +843,7 @@
 		</method>
 		<method name="set_drag_preview">
 			<return type="void" />
-			<argument index="0" name="control" type="Control" />
+			<param index="0" name="control" type="Control" />
 			<description>
 				Shows the given control at the mouse pointer. A good time to call this method is in [method _get_drag_data]. The control must not be in the scene tree. You should not free the control, and you should not keep a reference to the control beyond the duration of the drag. It will be deleted automatically after the drag has ended.
 				[codeblocks]
@@ -877,63 +877,63 @@
 		</method>
 		<method name="set_end">
 			<return type="void" />
-			<argument index="0" name="position" type="Vector2" />
+			<param index="0" name="position" type="Vector2" />
 			<description>
 				Sets [member offset_right] and [member offset_bottom] at the same time.
 			</description>
 		</method>
 		<method name="set_focus_neighbor">
 			<return type="void" />
-			<argument index="0" name="side" type="int" enum="Side" />
-			<argument index="1" name="neighbor" type="NodePath" />
+			<param index="0" name="side" type="int" enum="Side" />
+			<param index="1" name="neighbor" type="NodePath" />
 			<description>
-				Sets the anchor for the specified [enum Side] to the [Control] at [code]neighbor[/code] node path. A setter method for [member focus_neighbor_bottom], [member focus_neighbor_left], [member focus_neighbor_right] and [member focus_neighbor_top].
+				Sets the anchor for the specified [enum Side] to the [Control] at [param neighbor] node path. A setter method for [member focus_neighbor_bottom], [member focus_neighbor_left], [member focus_neighbor_right] and [member focus_neighbor_top].
 			</description>
 		</method>
 		<method name="set_global_position">
 			<return type="void" />
-			<argument index="0" name="position" type="Vector2" />
-			<argument index="1" name="keep_offsets" type="bool" default="false" />
+			<param index="0" name="position" type="Vector2" />
+			<param index="1" name="keep_offsets" type="bool" default="false" />
 			<description>
-				Sets the [member global_position] to given [code]position[/code].
-				If [code]keep_offsets[/code] is [code]true[/code], control's anchors will be updated instead of offsets.
+				Sets the [member global_position] to given [param position].
+				If [param keep_offsets] is [code]true[/code], control's anchors will be updated instead of offsets.
 			</description>
 		</method>
 		<method name="set_offset">
 			<return type="void" />
-			<argument index="0" name="side" type="int" enum="Side" />
-			<argument index="1" name="offset" type="float" />
+			<param index="0" name="side" type="int" enum="Side" />
+			<param index="1" name="offset" type="float" />
 			<description>
-				Sets the offset for the specified [enum Side] to [code]offset[/code]. A setter method for [member offset_bottom], [member offset_left], [member offset_right] and [member offset_top].
+				Sets the offset for the specified [enum Side] to [param offset]. A setter method for [member offset_bottom], [member offset_left], [member offset_right] and [member offset_top].
 			</description>
 		</method>
 		<method name="set_offsets_preset">
 			<return type="void" />
-			<argument index="0" name="preset" type="int" enum="Control.LayoutPreset" />
-			<argument index="1" name="resize_mode" type="int" enum="Control.LayoutPresetMode" default="0" />
-			<argument index="2" name="margin" type="int" default="0" />
+			<param index="0" name="preset" type="int" enum="Control.LayoutPreset" />
+			<param index="1" name="resize_mode" type="int" enum="Control.LayoutPresetMode" default="0" />
+			<param index="2" name="margin" type="int" default="0" />
 			<description>
-				Sets the offsets to a [code]preset[/code] from [enum Control.LayoutPreset] enum. This is the code equivalent to using the Layout menu in the 2D editor.
-				Use parameter [code]resize_mode[/code] with constants from [enum Control.LayoutPresetMode] to better determine the resulting size of the [Control]. Constant size will be ignored if used with presets that change size, e.g. [code]PRESET_LEFT_WIDE[/code].
-				Use parameter [code]margin[/code] to determine the gap between the [Control] and the edges.
+				Sets the offsets to a [param preset] from [enum Control.LayoutPreset] enum. This is the code equivalent to using the Layout menu in the 2D editor.
+				Use parameter [param resize_mode] with constants from [enum Control.LayoutPresetMode] to better determine the resulting size of the [Control]. Constant size will be ignored if used with presets that change size, e.g. [code]PRESET_LEFT_WIDE[/code].
+				Use parameter [param margin] to determine the gap between the [Control] and the edges.
 			</description>
 		</method>
 		<method name="set_position">
 			<return type="void" />
-			<argument index="0" name="position" type="Vector2" />
-			<argument index="1" name="keep_offsets" type="bool" default="false" />
+			<param index="0" name="position" type="Vector2" />
+			<param index="1" name="keep_offsets" type="bool" default="false" />
 			<description>
-				Sets the [member position] to given [code]position[/code].
-				If [code]keep_offsets[/code] is [code]true[/code], control's anchors will be updated instead of offsets.
+				Sets the [member position] to given [param position].
+				If [param keep_offsets] is [code]true[/code], control's anchors will be updated instead of offsets.
 			</description>
 		</method>
 		<method name="set_size">
 			<return type="void" />
-			<argument index="0" name="size" type="Vector2" />
-			<argument index="1" name="keep_offsets" type="bool" default="false" />
+			<param index="0" name="size" type="Vector2" />
+			<param index="1" name="keep_offsets" type="bool" default="false" />
 			<description>
 				Sets the size (see [member size]).
-				If [code]keep_offsets[/code] is [code]true[/code], control's anchors will be updated instead of offsets.
+				If [param keep_offsets] is [code]true[/code], control's anchors will be updated instead of offsets.
 			</description>
 		</method>
 		<method name="update_minimum_size">
@@ -944,9 +944,9 @@
 		</method>
 		<method name="warp_mouse">
 			<return type="void" />
-			<argument index="0" name="position" type="Vector2" />
+			<param index="0" name="position" type="Vector2" />
 			<description>
-				Moves the mouse cursor to [code]position[/code], relative to [member position] of this [Control].
+				Moves the mouse cursor to [param position], relative to [member position] of this [Control].
 			</description>
 		</method>
 	</methods>
@@ -1105,7 +1105,7 @@
 			</description>
 		</signal>
 		<signal name="gui_input">
-			<argument index="0" name="event" type="InputEvent" />
+			<param index="0" name="event" type="InputEvent" />
 			<description>
 				Emitted when the node receives an [InputEvent].
 			</description>
diff --git a/doc/classes/ConvexPolygonShape2D.xml b/doc/classes/ConvexPolygonShape2D.xml
index df96b50fc1..862626d9b6 100644
--- a/doc/classes/ConvexPolygonShape2D.xml
+++ b/doc/classes/ConvexPolygonShape2D.xml
@@ -13,7 +13,7 @@
 	<methods>
 		<method name="set_point_cloud">
 			<return type="void" />
-			<argument index="0" name="point_cloud" type="PackedVector2Array" />
+			<param index="0" name="point_cloud" type="PackedVector2Array" />
 			<description>
 				Based on the set of points provided, this creates and assigns the [member points] property using the convex hull algorithm. Removing all unneeded points. See [method Geometry2D.convex_hull] for details.
 			</description>
diff --git a/doc/classes/Crypto.xml b/doc/classes/Crypto.xml
index 4936fc1d85..dab2a77584 100644
--- a/doc/classes/Crypto.xml
+++ b/doc/classes/Crypto.xml
@@ -74,8 +74,8 @@
 	<methods>
 		<method name="constant_time_compare">
 			<return type="bool" />
-			<argument index="0" name="trusted" type="PackedByteArray" />
-			<argument index="1" name="received" type="PackedByteArray" />
+			<param index="0" name="trusted" type="PackedByteArray" />
+			<param index="1" name="received" type="PackedByteArray" />
 			<description>
 				Compares two [PackedByteArray]s for equality without leaking timing information in order to prevent timing attacks.
 				See [url=https://paragonie.com/blog/2015/11/preventing-timing-attacks-on-string-comparison-with-double-hmac-strategy]this blog post[/url] for more information.
@@ -83,44 +83,44 @@
 		</method>
 		<method name="decrypt">
 			<return type="PackedByteArray" />
-			<argument index="0" name="key" type="CryptoKey" />
-			<argument index="1" name="ciphertext" type="PackedByteArray" />
+			<param index="0" name="key" type="CryptoKey" />
+			<param index="1" name="ciphertext" type="PackedByteArray" />
 			<description>
-				Decrypt the given [code]ciphertext[/code] with the provided private [code]key[/code].
+				Decrypt the given [param ciphertext] with the provided private [param key].
 				[b]Note:[/b] The maximum size of accepted ciphertext is limited by the key size.
 			</description>
 		</method>
 		<method name="encrypt">
 			<return type="PackedByteArray" />
-			<argument index="0" name="key" type="CryptoKey" />
-			<argument index="1" name="plaintext" type="PackedByteArray" />
+			<param index="0" name="key" type="CryptoKey" />
+			<param index="1" name="plaintext" type="PackedByteArray" />
 			<description>
-				Encrypt the given [code]plaintext[/code] with the provided public [code]key[/code].
+				Encrypt the given [param plaintext] with the provided public [param key].
 				[b]Note:[/b] The maximum size of accepted plaintext is limited by the key size.
 			</description>
 		</method>
 		<method name="generate_random_bytes">
 			<return type="PackedByteArray" />
-			<argument index="0" name="size" type="int" />
+			<param index="0" name="size" type="int" />
 			<description>
-				Generates a [PackedByteArray] of cryptographically secure random bytes with given [code]size[/code].
+				Generates a [PackedByteArray] of cryptographically secure random bytes with given [param size].
 			</description>
 		</method>
 		<method name="generate_rsa">
 			<return type="CryptoKey" />
-			<argument index="0" name="size" type="int" />
+			<param index="0" name="size" type="int" />
 			<description>
 				Generates an RSA [CryptoKey] that can be used for creating self-signed certificates and passed to [method StreamPeerSSL.accept_stream].
 			</description>
 		</method>
 		<method name="generate_self_signed_certificate">
 			<return type="X509Certificate" />
-			<argument index="0" name="key" type="CryptoKey" />
-			<argument index="1" name="issuer_name" type="String" default="&quot;CN=myserver,O=myorganisation,C=IT&quot;" />
-			<argument index="2" name="not_before" type="String" default="&quot;20140101000000&quot;" />
-			<argument index="3" name="not_after" type="String" default="&quot;20340101000000&quot;" />
+			<param index="0" name="key" type="CryptoKey" />
+			<param index="1" name="issuer_name" type="String" default="&quot;CN=myserver,O=myorganisation,C=IT&quot;" />
+			<param index="2" name="not_before" type="String" default="&quot;20140101000000&quot;" />
+			<param index="3" name="not_after" type="String" default="&quot;20340101000000&quot;" />
 			<description>
-				Generates a self-signed [X509Certificate] from the given [CryptoKey] and [code]issuer_name[/code]. The certificate validity will be defined by [code]not_before[/code] and [code]not_after[/code] (first valid date and last valid date). The [code]issuer_name[/code] must contain at least "CN=" (common name, i.e. the domain name), "O=" (organization, i.e. your company name), "C=" (country, i.e. 2 lettered ISO-3166 code of the country the organization is based in).
+				Generates a self-signed [X509Certificate] from the given [CryptoKey] and [param issuer_name]. The certificate validity will be defined by [param not_before] and [param not_after] (first valid date and last valid date). The [param issuer_name] must contain at least "CN=" (common name, i.e. the domain name), "O=" (organization, i.e. your company name), "C=" (country, i.e. 2 lettered ISO-3166 code of the country the organization is based in).
 				A small example to generate an RSA key and a X509 self-signed certificate.
 				[codeblocks]
 				[gdscript]
@@ -142,31 +142,31 @@
 		</method>
 		<method name="hmac_digest">
 			<return type="PackedByteArray" />
-			<argument index="0" name="hash_type" type="int" enum="HashingContext.HashType" />
-			<argument index="1" name="key" type="PackedByteArray" />
-			<argument index="2" name="msg" type="PackedByteArray" />
+			<param index="0" name="hash_type" type="int" enum="HashingContext.HashType" />
+			<param index="1" name="key" type="PackedByteArray" />
+			<param index="2" name="msg" type="PackedByteArray" />
 			<description>
-				Generates an [url=https://en.wikipedia.org/wiki/HMAC]HMAC[/url] digest of [code]msg[/code] using [code]key[/code]. The [code]hash_type[/code] parameter is the hashing algorithm that is used for the inner and outer hashes.
+				Generates an [url=https://en.wikipedia.org/wiki/HMAC]HMAC[/url] digest of [param msg] using [param key]. The [param hash_type] parameter is the hashing algorithm that is used for the inner and outer hashes.
 				Currently, only [constant HashingContext.HASH_SHA256] and [constant HashingContext.HASH_SHA1] are supported.
 			</description>
 		</method>
 		<method name="sign">
 			<return type="PackedByteArray" />
-			<argument index="0" name="hash_type" type="int" enum="HashingContext.HashType" />
-			<argument index="1" name="hash" type="PackedByteArray" />
-			<argument index="2" name="key" type="CryptoKey" />
+			<param index="0" name="hash_type" type="int" enum="HashingContext.HashType" />
+			<param index="1" name="hash" type="PackedByteArray" />
+			<param index="2" name="key" type="CryptoKey" />
 			<description>
-				Sign a given [code]hash[/code] of type [code]hash_type[/code] with the provided private [code]key[/code].
+				Sign a given [param hash] of type [param hash_type] with the provided private [param key].
 			</description>
 		</method>
 		<method name="verify">
 			<return type="bool" />
-			<argument index="0" name="hash_type" type="int" enum="HashingContext.HashType" />
-			<argument index="1" name="hash" type="PackedByteArray" />
-			<argument index="2" name="signature" type="PackedByteArray" />
-			<argument index="3" name="key" type="CryptoKey" />
+			<param index="0" name="hash_type" type="int" enum="HashingContext.HashType" />
+			<param index="1" name="hash" type="PackedByteArray" />
+			<param index="2" name="signature" type="PackedByteArray" />
+			<param index="3" name="key" type="CryptoKey" />
 			<description>
-				Verify that a given [code]signature[/code] for [code]hash[/code] of type [code]hash_type[/code] against the provided public [code]key[/code].
+				Verify that a given [param signature] for [param hash] of type [param hash_type] against the provided public [param key].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/CryptoKey.xml b/doc/classes/CryptoKey.xml
index 8496c6dec1..1f502846b4 100644
--- a/doc/classes/CryptoKey.xml
+++ b/doc/classes/CryptoKey.xml
@@ -18,35 +18,35 @@
 		</method>
 		<method name="load">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="public_only" type="bool" default="false" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="public_only" type="bool" default="false" />
 			<description>
-				Loads a key from [code]path[/code]. If [code]public_only[/code] is [code]true[/code], only the public key will be loaded.
-				[b]Note:[/b] [code]path[/code] should be a "*.pub" file if [code]public_only[/code] is [code]true[/code], a "*.key" file otherwise.
+				Loads a key from [param path]. If [param public_only] is [code]true[/code], only the public key will be loaded.
+				[b]Note:[/b] [param path] should be a "*.pub" file if [param public_only] is [code]true[/code], a "*.key" file otherwise.
 			</description>
 		</method>
 		<method name="load_from_string">
 			<return type="int" enum="Error" />
-			<argument index="0" name="string_key" type="String" />
-			<argument index="1" name="public_only" type="bool" default="false" />
+			<param index="0" name="string_key" type="String" />
+			<param index="1" name="public_only" type="bool" default="false" />
 			<description>
-				Loads a key from the given [code]string[/code]. If [code]public_only[/code] is [code]true[/code], only the public key will be loaded.
+				Loads a key from the given [param string_key]. If [param public_only] is [code]true[/code], only the public key will be loaded.
 			</description>
 		</method>
 		<method name="save">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="public_only" type="bool" default="false" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="public_only" type="bool" default="false" />
 			<description>
-				Saves a key to the given [code]path[/code]. If [code]public_only[/code] is [code]true[/code], only the public key will be saved.
-				[b]Note:[/b] [code]path[/code] should be a "*.pub" file if [code]public_only[/code] is [code]true[/code], a "*.key" file otherwise.
+				Saves a key to the given [param path]. If [param public_only] is [code]true[/code], only the public key will be saved.
+				[b]Note:[/b] [param path] should be a "*.pub" file if [param public_only] is [code]true[/code], a "*.key" file otherwise.
 			</description>
 		</method>
 		<method name="save_to_string">
 			<return type="String" />
-			<argument index="0" name="public_only" type="bool" default="false" />
+			<param index="0" name="public_only" type="bool" default="false" />
 			<description>
-				Returns a string containing the key in PEM format. If [code]public_only[/code] is [code]true[/code], only the public key will be included.
+				Returns a string containing the key in PEM format. If [param public_only] is [code]true[/code], only the public key will be included.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/Curve.xml b/doc/classes/Curve.xml
index 383d33532b..ae9add995b 100644
--- a/doc/classes/Curve.xml
+++ b/doc/classes/Curve.xml
@@ -5,17 +5,18 @@
 	</brief_description>
 	<description>
 		A curve that can be saved and re-used for other objects. By default, it ranges between [code]0[/code] and [code]1[/code] on the Y axis and positions points relative to the [code]0.5[/code] Y position.
+		See also [Gradient] which is designed for color interpolation. See also [Curve2D] and [Curve3D].
 	</description>
 	<tutorials>
 	</tutorials>
 	<methods>
 		<method name="add_point">
 			<return type="int" />
-			<argument index="0" name="position" type="Vector2" />
-			<argument index="1" name="left_tangent" type="float" default="0" />
-			<argument index="2" name="right_tangent" type="float" default="0" />
-			<argument index="3" name="left_mode" type="int" enum="Curve.TangentMode" default="0" />
-			<argument index="4" name="right_mode" type="int" enum="Curve.TangentMode" default="0" />
+			<param index="0" name="position" type="Vector2" />
+			<param index="1" name="left_tangent" type="float" default="0" />
+			<param index="2" name="right_tangent" type="float" default="0" />
+			<param index="3" name="left_mode" type="int" enum="Curve.TangentMode" default="0" />
+			<param index="4" name="right_mode" type="int" enum="Curve.TangentMode" default="0" />
 			<description>
 				Adds a point to the curve. For each side, if the [code]*_mode[/code] is [constant TANGENT_LINEAR], the [code]*_tangent[/code] angle (in degrees) uses the slope of the curve halfway to the adjacent point. Allows custom assignments to the [code]*_tangent[/code] angle if [code]*_mode[/code] is set to [constant TANGENT_FREE].
 			</description>
@@ -40,106 +41,106 @@
 		</method>
 		<method name="get_point_left_mode" qualifiers="const">
 			<return type="int" enum="Curve.TangentMode" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the left [enum TangentMode] for the point at [code]index[/code].
+				Returns the left [enum TangentMode] for the point at [param index].
 			</description>
 		</method>
 		<method name="get_point_left_tangent" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the left tangent angle (in degrees) for the point at [code]index[/code].
+				Returns the left tangent angle (in degrees) for the point at [param index].
 			</description>
 		</method>
 		<method name="get_point_position" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the curve coordinates for the point at [code]index[/code].
+				Returns the curve coordinates for the point at [param index].
 			</description>
 		</method>
 		<method name="get_point_right_mode" qualifiers="const">
 			<return type="int" enum="Curve.TangentMode" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the right [enum TangentMode] for the point at [code]index[/code].
+				Returns the right [enum TangentMode] for the point at [param index].
 			</description>
 		</method>
 		<method name="get_point_right_tangent" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the right tangent angle (in degrees) for the point at [code]index[/code].
+				Returns the right tangent angle (in degrees) for the point at [param index].
 			</description>
 		</method>
 		<method name="interpolate" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="offset" type="float" />
+			<param index="0" name="offset" type="float" />
 			<description>
-				Returns the Y value for the point that would exist at the X position [code]offset[/code] along the curve.
+				Returns the Y value for the point that would exist at the X position [param offset] along the curve.
 			</description>
 		</method>
 		<method name="interpolate_baked" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="offset" type="float" />
+			<param index="0" name="offset" type="float" />
 			<description>
-				Returns the Y value for the point that would exist at the X position [code]offset[/code] along the curve using the baked cache. Bakes the curve's points if not already baked.
+				Returns the Y value for the point that would exist at the X position [param offset] along the curve using the baked cache. Bakes the curve's points if not already baked.
 			</description>
 		</method>
 		<method name="remove_point">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Removes the point at [code]index[/code] from the curve.
+				Removes the point at [param index] from the curve.
 			</description>
 		</method>
 		<method name="set_point_left_mode">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="mode" type="int" enum="Curve.TangentMode" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="mode" type="int" enum="Curve.TangentMode" />
 			<description>
-				Sets the left [enum TangentMode] for the point at [code]index[/code] to [code]mode[/code].
+				Sets the left [enum TangentMode] for the point at [param index] to [param mode].
 			</description>
 		</method>
 		<method name="set_point_left_tangent">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="tangent" type="float" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="tangent" type="float" />
 			<description>
-				Sets the left tangent angle for the point at [code]index[/code] to [code]tangent[/code].
+				Sets the left tangent angle for the point at [param index] to [param tangent].
 			</description>
 		</method>
 		<method name="set_point_offset">
 			<return type="int" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="offset" type="float" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="offset" type="float" />
 			<description>
 				Sets the offset from [code]0.5[/code].
 			</description>
 		</method>
 		<method name="set_point_right_mode">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="mode" type="int" enum="Curve.TangentMode" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="mode" type="int" enum="Curve.TangentMode" />
 			<description>
-				Sets the right [enum TangentMode] for the point at [code]index[/code] to [code]mode[/code].
+				Sets the right [enum TangentMode] for the point at [param index] to [param mode].
 			</description>
 		</method>
 		<method name="set_point_right_tangent">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="tangent" type="float" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="tangent" type="float" />
 			<description>
-				Sets the right tangent angle for the point at [code]index[/code] to [code]tangent[/code].
+				Sets the right tangent angle for the point at [param index] to [param tangent].
 			</description>
 		</method>
 		<method name="set_point_value">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="y" type="float" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="y" type="float" />
 			<description>
-				Assigns the vertical position [code]y[/code] to the point at [code]index[/code].
+				Assigns the vertical position [param y] to the point at [param index].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/Curve2D.xml b/doc/classes/Curve2D.xml
index 3bba825aaa..f15c0d74ca 100644
--- a/doc/classes/Curve2D.xml
+++ b/doc/classes/Curve2D.xml
@@ -12,13 +12,13 @@
 	<methods>
 		<method name="add_point">
 			<return type="void" />
-			<argument index="0" name="position" type="Vector2" />
-			<argument index="1" name="in" type="Vector2" default="Vector2(0, 0)" />
-			<argument index="2" name="out" type="Vector2" default="Vector2(0, 0)" />
-			<argument index="3" name="at_position" type="int" default="-1" />
+			<param index="0" name="position" type="Vector2" />
+			<param index="1" name="in" type="Vector2" default="Vector2(0, 0)" />
+			<param index="2" name="out" type="Vector2" default="Vector2(0, 0)" />
+			<param index="3" name="index" type="int" default="-1" />
 			<description>
-				Adds a point to a curve at [code]position[/code] relative to the [Curve2D]'s position, with control points [code]in[/code] and [code]out[/code].
-				If [code]at_position[/code] is given, the point is inserted before the point number [code]at_position[/code], moving that point (and every point after) after the inserted point. If [code]at_position[/code] is not given, or is an illegal value ([code]at_position &lt;0[/code] or [code]at_position &gt;= [method get_point_count][/code]), the point will be appended at the end of the point list.
+				Adds a point with the specified [param position] relative to the curve's own position, with control points [param in] and [param out]. Appends the new point at the end of the point list.
+				If [param index] is given, the new point is inserted before the existing point identified by index [param index]. Every existing point starting from [param index] is shifted further down the list of points. The index must be greater than or equal to [code]0[/code] and must not exceed the number of existing points in the line. See [member point_count].
 			</description>
 		</method>
 		<method name="clear_points">
@@ -41,107 +41,107 @@
 		</method>
 		<method name="get_closest_offset" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="to_point" type="Vector2" />
+			<param index="0" name="to_point" type="Vector2" />
 			<description>
-				Returns the closest offset to [code]to_point[/code]. This offset is meant to be used in [method interpolate_baked].
-				[code]to_point[/code] must be in this curve's local space.
+				Returns the closest offset to [param to_point]. This offset is meant to be used in [method interpolate_baked].
+				[param to_point] must be in this curve's local space.
 			</description>
 		</method>
 		<method name="get_closest_point" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="to_point" type="Vector2" />
+			<param index="0" name="to_point" type="Vector2" />
 			<description>
-				Returns the closest baked point (in curve's local space) to [code]to_point[/code].
-				[code]to_point[/code] must be in this curve's local space.
+				Returns the closest baked point (in curve's local space) to [param to_point].
+				[param to_point] must be in this curve's local space.
 			</description>
 		</method>
 		<method name="get_point_in" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the position of the control point leading to the vertex [code]idx[/code]. The returned position is relative to the vertex [code]idx[/code]. If the index is out of bounds, the function sends an error to the console, and returns [code](0, 0)[/code].
+				Returns the position of the control point leading to the vertex [param idx]. The returned position is relative to the vertex [param idx]. If the index is out of bounds, the function sends an error to the console, and returns [code](0, 0)[/code].
 			</description>
 		</method>
 		<method name="get_point_out" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the position of the control point leading out of the vertex [code]idx[/code]. The returned position is relative to the vertex [code]idx[/code]. If the index is out of bounds, the function sends an error to the console, and returns [code](0, 0)[/code].
+				Returns the position of the control point leading out of the vertex [param idx]. The returned position is relative to the vertex [param idx]. If the index is out of bounds, the function sends an error to the console, and returns [code](0, 0)[/code].
 			</description>
 		</method>
 		<method name="get_point_position" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the position of the vertex [code]idx[/code]. If the index is out of bounds, the function sends an error to the console, and returns [code](0, 0)[/code].
+				Returns the position of the vertex [param idx]. If the index is out of bounds, the function sends an error to the console, and returns [code](0, 0)[/code].
 			</description>
 		</method>
 		<method name="interpolate" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="t" type="float" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="t" type="float" />
 			<description>
-				Returns the position between the vertex [code]idx[/code] and the vertex [code]idx + 1[/code], where [code]t[/code] controls if the point is the first vertex ([code]t = 0.0[/code]), the last vertex ([code]t = 1.0[/code]), or in between. Values of [code]t[/code] outside the range ([code]0.0 &gt;= t &lt;=1[/code]) give strange, but predictable results.
-				If [code]idx[/code] is out of bounds it is truncated to the first or last vertex, and [code]t[/code] is ignored. If the curve has no points, the function sends an error to the console, and returns [code](0, 0)[/code].
+				Returns the position between the vertex [param idx] and the vertex [code]idx + 1[/code], where [param t] controls if the point is the first vertex ([code]t = 0.0[/code]), the last vertex ([code]t = 1.0[/code]), or in between. Values of [param t] outside the range ([code]0.0 &gt;= t &lt;=1[/code]) give strange, but predictable results.
+				If [param idx] is out of bounds it is truncated to the first or last vertex, and [param t] is ignored. If the curve has no points, the function sends an error to the console, and returns [code](0, 0)[/code].
 			</description>
 		</method>
 		<method name="interpolate_baked" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="offset" type="float" />
-			<argument index="1" name="cubic" type="bool" default="false" />
+			<param index="0" name="offset" type="float" />
+			<param index="1" name="cubic" type="bool" default="false" />
 			<description>
-				Returns a point within the curve at position [code]offset[/code], where [code]offset[/code] is measured as a pixel distance along the curve.
-				To do that, it finds the two cached points where the [code]offset[/code] lies between, then interpolates the values. This interpolation is cubic if [code]cubic[/code] is set to [code]true[/code], or linear if set to [code]false[/code].
+				Returns a point within the curve at position [param offset], where [param offset] is measured as a pixel distance along the curve.
+				To do that, it finds the two cached points where the [param offset] lies between, then interpolates the values. This interpolation is cubic if [param cubic] is set to [code]true[/code], or linear if set to [code]false[/code].
 				Cubic interpolation tends to follow the curves better, but linear is faster (and often, precise enough).
 			</description>
 		</method>
 		<method name="interpolatef" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="fofs" type="float" />
+			<param index="0" name="fofs" type="float" />
 			<description>
-				Returns the position at the vertex [code]fofs[/code]. It calls [method interpolate] using the integer part of [code]fofs[/code] as [code]idx[/code], and its fractional part as [code]t[/code].
+				Returns the position at the vertex [param fofs]. It calls [method interpolate] using the integer part of [param fofs] as [code]idx[/code], and its fractional part as [code]t[/code].
 			</description>
 		</method>
 		<method name="remove_point">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Deletes the point [code]idx[/code] from the curve. Sends an error to the console if [code]idx[/code] is out of bounds.
+				Deletes the point [param idx] from the curve. Sends an error to the console if [param idx] is out of bounds.
 			</description>
 		</method>
 		<method name="set_point_in">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="position" type="Vector2" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="position" type="Vector2" />
 			<description>
-				Sets the position of the control point leading to the vertex [code]idx[/code]. If the index is out of bounds, the function sends an error to the console. The position is relative to the vertex.
+				Sets the position of the control point leading to the vertex [param idx]. If the index is out of bounds, the function sends an error to the console. The position is relative to the vertex.
 			</description>
 		</method>
 		<method name="set_point_out">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="position" type="Vector2" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="position" type="Vector2" />
 			<description>
-				Sets the position of the control point leading out of the vertex [code]idx[/code]. If the index is out of bounds, the function sends an error to the console. The position is relative to the vertex.
+				Sets the position of the control point leading out of the vertex [param idx]. If the index is out of bounds, the function sends an error to the console. The position is relative to the vertex.
 			</description>
 		</method>
 		<method name="set_point_position">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="position" type="Vector2" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="position" type="Vector2" />
 			<description>
-				Sets the position for the vertex [code]idx[/code]. If the index is out of bounds, the function sends an error to the console.
+				Sets the position for the vertex [param idx]. If the index is out of bounds, the function sends an error to the console.
 			</description>
 		</method>
 		<method name="tessellate" qualifiers="const">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="max_stages" type="int" default="5" />
-			<argument index="1" name="tolerance_degrees" type="float" default="4" />
+			<param index="0" name="max_stages" type="int" default="5" />
+			<param index="1" name="tolerance_degrees" type="float" default="4" />
 			<description>
 				Returns a list of points along the curve, with a curvature controlled point density. That is, the curvier parts will have more points than the straighter parts.
 				This approximation makes straight segments between each point, then subdivides those segments until the resulting shape is similar enough.
-				[code]max_stages[/code] controls how many subdivisions a curve segment may face before it is considered approximate enough. Each subdivision splits the segment in half, so the default 5 stages may mean up to 32 subdivisions per curve segment. Increase with care!
-				[code]tolerance_degrees[/code] controls how many degrees the midpoint of a segment may deviate from the real curve, before the segment has to be subdivided.
+				[param max_stages] controls how many subdivisions a curve segment may face before it is considered approximate enough. Each subdivision splits the segment in half, so the default 5 stages may mean up to 32 subdivisions per curve segment. Increase with care!
+				[param tolerance_degrees] controls how many degrees the midpoint of a segment may deviate from the real curve, before the segment has to be subdivided.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/Curve3D.xml b/doc/classes/Curve3D.xml
index 6457d9681e..0843453820 100644
--- a/doc/classes/Curve3D.xml
+++ b/doc/classes/Curve3D.xml
@@ -12,13 +12,13 @@
 	<methods>
 		<method name="add_point">
 			<return type="void" />
-			<argument index="0" name="position" type="Vector3" />
-			<argument index="1" name="in" type="Vector3" default="Vector3(0, 0, 0)" />
-			<argument index="2" name="out" type="Vector3" default="Vector3(0, 0, 0)" />
-			<argument index="3" name="at_position" type="int" default="-1" />
+			<param index="0" name="position" type="Vector3" />
+			<param index="1" name="in" type="Vector3" default="Vector3(0, 0, 0)" />
+			<param index="2" name="out" type="Vector3" default="Vector3(0, 0, 0)" />
+			<param index="3" name="index" type="int" default="-1" />
 			<description>
-				Adds a point to a curve at [code]position[/code] relative to the [Curve3D]'s position, with control points [code]in[/code] and [code]out[/code].
-				If [code]at_position[/code] is given, the point is inserted before the point number [code]at_position[/code], moving that point (and every point after) after the inserted point. If [code]at_position[/code] is not given, or is an illegal value ([code]at_position &lt;0[/code] or [code]at_position &gt;= [method get_point_count][/code]), the point will be appended at the end of the point list.
+				Adds a point with the specified [param position] relative to the curve's own position, with control points [param in] and [param out]. Appends the new point at the end of the point list.
+				If [param index] is given, the new point is inserted before the existing point identified by index [param index]. Every existing point starting from [param index] is shifted further down the list of points. The index must be greater than or equal to [code]0[/code] and must not exceed the number of existing points in the line. See [member point_count].
 			</description>
 		</method>
 		<method name="clear_points">
@@ -54,133 +54,133 @@
 		</method>
 		<method name="get_closest_offset" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="to_point" type="Vector3" />
+			<param index="0" name="to_point" type="Vector3" />
 			<description>
-				Returns the closest offset to [code]to_point[/code]. This offset is meant to be used in [method interpolate_baked] or [method interpolate_baked_up_vector].
-				[code]to_point[/code] must be in this curve's local space.
+				Returns the closest offset to [param to_point]. This offset is meant to be used in [method interpolate_baked] or [method interpolate_baked_up_vector].
+				[param to_point] must be in this curve's local space.
 			</description>
 		</method>
 		<method name="get_closest_point" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="to_point" type="Vector3" />
+			<param index="0" name="to_point" type="Vector3" />
 			<description>
-				Returns the closest baked point (in curve's local space) to [code]to_point[/code].
-				[code]to_point[/code] must be in this curve's local space.
+				Returns the closest baked point (in curve's local space) to [param to_point].
+				[param to_point] must be in this curve's local space.
 			</description>
 		</method>
 		<method name="get_point_in" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the position of the control point leading to the vertex [code]idx[/code]. The returned position is relative to the vertex [code]idx[/code]. If the index is out of bounds, the function sends an error to the console, and returns [code](0, 0, 0)[/code].
+				Returns the position of the control point leading to the vertex [param idx]. The returned position is relative to the vertex [param idx]. If the index is out of bounds, the function sends an error to the console, and returns [code](0, 0, 0)[/code].
 			</description>
 		</method>
 		<method name="get_point_out" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the position of the control point leading out of the vertex [code]idx[/code]. The returned position is relative to the vertex [code]idx[/code]. If the index is out of bounds, the function sends an error to the console, and returns [code](0, 0, 0)[/code].
+				Returns the position of the control point leading out of the vertex [param idx]. The returned position is relative to the vertex [param idx]. If the index is out of bounds, the function sends an error to the console, and returns [code](0, 0, 0)[/code].
 			</description>
 		</method>
 		<method name="get_point_position" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the position of the vertex [code]idx[/code]. If the index is out of bounds, the function sends an error to the console, and returns [code](0, 0, 0)[/code].
+				Returns the position of the vertex [param idx]. If the index is out of bounds, the function sends an error to the console, and returns [code](0, 0, 0)[/code].
 			</description>
 		</method>
 		<method name="get_point_tilt" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the tilt angle in radians for the point [code]idx[/code]. If the index is out of bounds, the function sends an error to the console, and returns [code]0[/code].
+				Returns the tilt angle in radians for the point [param idx]. If the index is out of bounds, the function sends an error to the console, and returns [code]0[/code].
 			</description>
 		</method>
 		<method name="interpolate" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="t" type="float" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="t" type="float" />
 			<description>
-				Returns the position between the vertex [code]idx[/code] and the vertex [code]idx + 1[/code], where [code]t[/code] controls if the point is the first vertex ([code]t = 0.0[/code]), the last vertex ([code]t = 1.0[/code]), or in between. Values of [code]t[/code] outside the range ([code]0.0 &gt;= t &lt;=1[/code]) give strange, but predictable results.
-				If [code]idx[/code] is out of bounds it is truncated to the first or last vertex, and [code]t[/code] is ignored. If the curve has no points, the function sends an error to the console, and returns [code](0, 0, 0)[/code].
+				Returns the position between the vertex [param idx] and the vertex [code]idx + 1[/code], where [param t] controls if the point is the first vertex ([code]t = 0.0[/code]), the last vertex ([code]t = 1.0[/code]), or in between. Values of [param t] outside the range ([code]0.0 &gt;= t &lt;=1[/code]) give strange, but predictable results.
+				If [param idx] is out of bounds it is truncated to the first or last vertex, and [param t] is ignored. If the curve has no points, the function sends an error to the console, and returns [code](0, 0, 0)[/code].
 			</description>
 		</method>
 		<method name="interpolate_baked" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="offset" type="float" />
-			<argument index="1" name="cubic" type="bool" default="false" />
+			<param index="0" name="offset" type="float" />
+			<param index="1" name="cubic" type="bool" default="false" />
 			<description>
-				Returns a point within the curve at position [code]offset[/code], where [code]offset[/code] is measured as a distance in 3D units along the curve.
-				To do that, it finds the two cached points where the [code]offset[/code] lies between, then interpolates the values. This interpolation is cubic if [code]cubic[/code] is set to [code]true[/code], or linear if set to [code]false[/code].
+				Returns a point within the curve at position [param offset], where [param offset] is measured as a distance in 3D units along the curve.
+				To do that, it finds the two cached points where the [param offset] lies between, then interpolates the values. This interpolation is cubic if [param cubic] is set to [code]true[/code], or linear if set to [code]false[/code].
 				Cubic interpolation tends to follow the curves better, but linear is faster (and often, precise enough).
 			</description>
 		</method>
 		<method name="interpolate_baked_up_vector" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="offset" type="float" />
-			<argument index="1" name="apply_tilt" type="bool" default="false" />
+			<param index="0" name="offset" type="float" />
+			<param index="1" name="apply_tilt" type="bool" default="false" />
 			<description>
-				Returns an up vector within the curve at position [code]offset[/code], where [code]offset[/code] is measured as a distance in 3D units along the curve.
-				To do that, it finds the two cached up vectors where the [code]offset[/code] lies between, then interpolates the values. If [code]apply_tilt[/code] is [code]true[/code], an interpolated tilt is applied to the interpolated up vector.
+				Returns an up vector within the curve at position [param offset], where [param offset] is measured as a distance in 3D units along the curve.
+				To do that, it finds the two cached up vectors where the [param offset] lies between, then interpolates the values. If [param apply_tilt] is [code]true[/code], an interpolated tilt is applied to the interpolated up vector.
 				If the curve has no up vectors, the function sends an error to the console, and returns [code](0, 1, 0)[/code].
 			</description>
 		</method>
 		<method name="interpolatef" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="fofs" type="float" />
+			<param index="0" name="fofs" type="float" />
 			<description>
-				Returns the position at the vertex [code]fofs[/code]. It calls [method interpolate] using the integer part of [code]fofs[/code] as [code]idx[/code], and its fractional part as [code]t[/code].
+				Returns the position at the vertex [param fofs]. It calls [method interpolate] using the integer part of [param fofs] as [code]idx[/code], and its fractional part as [code]t[/code].
 			</description>
 		</method>
 		<method name="remove_point">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Deletes the point [code]idx[/code] from the curve. Sends an error to the console if [code]idx[/code] is out of bounds.
+				Deletes the point [param idx] from the curve. Sends an error to the console if [param idx] is out of bounds.
 			</description>
 		</method>
 		<method name="set_point_in">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="position" type="Vector3" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="position" type="Vector3" />
 			<description>
-				Sets the position of the control point leading to the vertex [code]idx[/code]. If the index is out of bounds, the function sends an error to the console. The position is relative to the vertex.
+				Sets the position of the control point leading to the vertex [param idx]. If the index is out of bounds, the function sends an error to the console. The position is relative to the vertex.
 			</description>
 		</method>
 		<method name="set_point_out">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="position" type="Vector3" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="position" type="Vector3" />
 			<description>
-				Sets the position of the control point leading out of the vertex [code]idx[/code]. If the index is out of bounds, the function sends an error to the console. The position is relative to the vertex.
+				Sets the position of the control point leading out of the vertex [param idx]. If the index is out of bounds, the function sends an error to the console. The position is relative to the vertex.
 			</description>
 		</method>
 		<method name="set_point_position">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="position" type="Vector3" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="position" type="Vector3" />
 			<description>
-				Sets the position for the vertex [code]idx[/code]. If the index is out of bounds, the function sends an error to the console.
+				Sets the position for the vertex [param idx]. If the index is out of bounds, the function sends an error to the console.
 			</description>
 		</method>
 		<method name="set_point_tilt">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="tilt" type="float" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="tilt" type="float" />
 			<description>
-				Sets the tilt angle in radians for the point [code]idx[/code]. If the index is out of bounds, the function sends an error to the console.
+				Sets the tilt angle in radians for the point [param idx]. If the index is out of bounds, the function sends an error to the console.
 				The tilt controls the rotation along the look-at axis an object traveling the path would have. In the case of a curve controlling a [PathFollow3D], this tilt is an offset over the natural tilt the [PathFollow3D] calculates.
 			</description>
 		</method>
 		<method name="tessellate" qualifiers="const">
 			<return type="PackedVector3Array" />
-			<argument index="0" name="max_stages" type="int" default="5" />
-			<argument index="1" name="tolerance_degrees" type="float" default="4" />
+			<param index="0" name="max_stages" type="int" default="5" />
+			<param index="1" name="tolerance_degrees" type="float" default="4" />
 			<description>
 				Returns a list of points along the curve, with a curvature controlled point density. That is, the curvier parts will have more points than the straighter parts.
 				This approximation makes straight segments between each point, then subdivides those segments until the resulting shape is similar enough.
-				[code]max_stages[/code] controls how many subdivisions a curve segment may face before it is considered approximate enough. Each subdivision splits the segment in half, so the default 5 stages may mean up to 32 subdivisions per curve segment. Increase with care!
-				[code]tolerance_degrees[/code] controls how many degrees the midpoint of a segment may deviate from the real curve, before the segment has to be subdivided.
+				[param max_stages] controls how many subdivisions a curve segment may face before it is considered approximate enough. Each subdivision splits the segment in half, so the default 5 stages may mean up to 32 subdivisions per curve segment. Increase with care!
+				[param tolerance_degrees] controls how many degrees the midpoint of a segment may deviate from the real curve, before the segment has to be subdivided.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/DTLSServer.xml b/doc/classes/DTLSServer.xml
index 5d8a2bc16d..9af8be99ef 100644
--- a/doc/classes/DTLSServer.xml
+++ b/doc/classes/DTLSServer.xml
@@ -148,18 +148,18 @@
 	<methods>
 		<method name="setup">
 			<return type="int" enum="Error" />
-			<argument index="0" name="key" type="CryptoKey" />
-			<argument index="1" name="certificate" type="X509Certificate" />
-			<argument index="2" name="chain" type="X509Certificate" default="null" />
+			<param index="0" name="key" type="CryptoKey" />
+			<param index="1" name="certificate" type="X509Certificate" />
+			<param index="2" name="chain" type="X509Certificate" default="null" />
 			<description>
-				Setup the DTLS server to use the given [code]private_key[/code] and provide the given [code]certificate[/code] to clients. You can pass the optional [code]chain[/code] parameter to provide additional CA chain information along with the certificate.
+				Setup the DTLS server to use the given [param key] and provide the given [param certificate] to clients. You can pass the optional [param chain] parameter to provide additional CA chain information along with the certificate.
 			</description>
 		</method>
 		<method name="take_connection">
 			<return type="PacketPeerDTLS" />
-			<argument index="0" name="udp_peer" type="PacketPeerUDP" />
+			<param index="0" name="udp_peer" type="PacketPeerUDP" />
 			<description>
-				Try to initiate the DTLS handshake with the given [code]udp_peer[/code] which must be already connected (see [method PacketPeerUDP.connect_to_host]).
+				Try to initiate the DTLS handshake with the given [param udp_peer] which must be already connected (see [method PacketPeerUDP.connect_to_host]).
 				[b]Note:[/b] You must check that the state of the return PacketPeerUDP is [constant PacketPeerDTLS.STATUS_HANDSHAKING], as it is normal that 50% of the new connections will be invalid due to cookie exchange.
 			</description>
 		</method>
diff --git a/doc/classes/Decal.xml b/doc/classes/Decal.xml
index 3322ab4c66..b9d3f1d81e 100644
--- a/doc/classes/Decal.xml
+++ b/doc/classes/Decal.xml
@@ -14,7 +14,7 @@
 	<methods>
 		<method name="get_texture" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="type" type="int" enum="Decal.DecalTexture" />
+			<param index="0" name="type" type="int" enum="Decal.DecalTexture" />
 			<description>
 				Returns the [Texture2D] associated with the specified [enum DecalTexture]. This is a convenience method, in most cases you should access the texture directly.
 				For example, instead of [code]albedo_tex = $Decal.get_texture(Decal.TEXTURE_ALBEDO)[/code], use [code]albedo_tex = $Decal.texture_albedo[/code].
@@ -35,8 +35,8 @@
 		</method>
 		<method name="set_texture">
 			<return type="void" />
-			<argument index="0" name="type" type="int" enum="Decal.DecalTexture" />
-			<argument index="1" name="texture" type="Texture2D" />
+			<param index="0" name="type" type="int" enum="Decal.DecalTexture" />
+			<param index="1" name="texture" type="Texture2D" />
 			<description>
 				Sets the [Texture2D] associated with the specified [enum DecalTexture]. This is a convenience method, in most cases you should access the texture directly.
 				For example, instead of [code]$Decal.set_texture(Decal.TEXTURE_ALBEDO, albedo_tex)[/code], use [code]$Decal.texture_albedo = albedo_tex[/code].
diff --git a/doc/classes/Dictionary.xml b/doc/classes/Dictionary.xml
index 6f2ad5205c..40b5e88fff 100644
--- a/doc/classes/Dictionary.xml
+++ b/doc/classes/Dictionary.xml
@@ -190,7 +190,7 @@
 		</constructor>
 		<constructor name="Dictionary">
 			<return type="Dictionary" />
-			<argument index="0" name="from" type="Dictionary" />
+			<param index="0" name="from" type="Dictionary" />
 			<description>
 				Constructs a [Dictionary] as a copy of the given [Dictionary].
 			</description>
@@ -205,14 +205,14 @@
 		</method>
 		<method name="duplicate" qualifiers="const">
 			<return type="Dictionary" />
-			<argument index="0" name="deep" type="bool" default="false" />
+			<param index="0" name="deep" type="bool" default="false" />
 			<description>
-				Creates a copy of the dictionary, and returns it. The [code]deep[/code] parameter causes inner dictionaries and arrays to be copied recursively, but does not apply to objects.
+				Creates a copy of the dictionary, and returns it. The [param deep] parameter causes inner dictionaries and arrays to be copied recursively, but does not apply to objects.
 			</description>
 		</method>
 		<method name="erase">
 			<return type="bool" />
-			<argument index="0" name="key" type="Variant" />
+			<param index="0" name="key" type="Variant" />
 			<description>
 				Erase a dictionary key/value pair by key. Returns [code]true[/code] if the given key was present in the dictionary, [code]false[/code] otherwise.
 				[b]Note:[/b] Don't erase elements while iterating over the dictionary. You can iterate over the [method keys] array instead.
@@ -220,15 +220,15 @@
 		</method>
 		<method name="get" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="key" type="Variant" />
-			<argument index="1" name="default" type="Variant" default="null" />
+			<param index="0" name="key" type="Variant" />
+			<param index="1" name="default" type="Variant" default="null" />
 			<description>
 				Returns the current value for the specified key in the [Dictionary]. If the key does not exist, the method returns the value of the optional default argument, or [code]null[/code] if it is omitted.
 			</description>
 		</method>
 		<method name="has" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="key" type="Variant" />
+			<param index="0" name="key" type="Variant" />
 			<description>
 				Returns [code]true[/code] if the dictionary has a given key.
 				[b]Note:[/b] This is equivalent to using the [code]in[/code] operator as follows:
@@ -251,7 +251,7 @@
 		</method>
 		<method name="has_all" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="keys" type="Array" />
+			<param index="0" name="keys" type="Array" />
 			<description>
 				Returns [code]true[/code] if the dictionary has all the keys in the given array.
 			</description>
@@ -293,10 +293,10 @@
 		</method>
 		<method name="merge">
 			<return type="void" />
-			<argument index="0" name="dictionary" type="Dictionary" />
-			<argument index="1" name="overwrite" type="bool" default="false" />
+			<param index="0" name="dictionary" type="Dictionary" />
+			<param index="1" name="overwrite" type="bool" default="false" />
 			<description>
-				Adds elements from [code]dictionary[/code] to this [Dictionary]. By default, duplicate keys will not be copied over, unless [code]overwrite[/code] is [code]true[/code].
+				Adds elements from [param dictionary] to this [Dictionary]. By default, duplicate keys will not be copied over, unless [param overwrite] is [code]true[/code].
 			</description>
 		</method>
 		<method name="size" qualifiers="const">
@@ -315,19 +315,19 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Dictionary" />
+			<param index="0" name="right" type="Dictionary" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="Dictionary" />
+			<param index="0" name="right" type="Dictionary" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator []">
 			<return type="Variant" />
-			<argument index="0" name="key" type="Variant" />
+			<param index="0" name="key" type="Variant" />
 			<description>
 			</description>
 		</operator>
diff --git a/doc/classes/Directory.xml b/doc/classes/Directory.xml
index bd16fd3936..c9a9f346a5 100644
--- a/doc/classes/Directory.xml
+++ b/doc/classes/Directory.xml
@@ -59,7 +59,7 @@
 	<methods>
 		<method name="change_dir">
 			<return type="int" enum="Error" />
-			<argument index="0" name="todir" type="String" />
+			<param index="0" name="todir" type="String" />
 			<description>
 				Changes the currently opened directory to the one passed as an argument. The argument can be relative to the current directory (e.g. [code]newdir[/code] or [code]../newdir[/code]), or an absolute path (e.g. [code]/tmp/newdir[/code] or [code]res://somedir/newdir[/code]).
 				Returns one of the [enum Error] code constants ([code]OK[/code] on success).
@@ -67,10 +67,10 @@
 		</method>
 		<method name="copy">
 			<return type="int" enum="Error" />
-			<argument index="0" name="from" type="String" />
-			<argument index="1" name="to" type="String" />
+			<param index="0" name="from" type="String" />
+			<param index="1" name="to" type="String" />
 			<description>
-				Copies the [code]from[/code] file to the [code]to[/code] destination. Both arguments should be paths to files, either relative or absolute. If the destination file exists and is not access-protected, it will be overwritten.
+				Copies the [param from] file to the [param to] destination. Both arguments should be paths to files, either relative or absolute. If the destination file exists and is not access-protected, it will be overwritten.
 				Returns one of the [enum Error] code constants ([code]OK[/code] on success).
 			</description>
 		</method>
@@ -82,7 +82,7 @@
 		</method>
 		<method name="dir_exists">
 			<return type="bool" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Returns whether the target directory exists. The argument can be relative to the current directory, or an absolute path.
 				If the [Directory] is not open, the path is relative to [code]res://[/code].
@@ -90,7 +90,7 @@
 		</method>
 		<method name="file_exists">
 			<return type="bool" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Returns whether the target file exists. The argument can be relative to the current directory, or an absolute path.
 				If the [Directory] is not open, the path is relative to [code]res://[/code].
@@ -117,7 +117,7 @@
 		</method>
 		<method name="get_drive">
 			<return type="String" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				On Windows, returns the name of the drive (partition) passed as an argument (e.g. [code]C:[/code]).
 				On macOS, returns the path to the mounted volume passed as an argument.
@@ -170,7 +170,7 @@
 		</method>
 		<method name="make_dir">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Creates a directory. The argument can be relative to the current directory, or an absolute path. The target directory should be placed in an already existing directory (to create the full path recursively, see [method make_dir_recursive]).
 				Returns one of the [enum Error] code constants ([code]OK[/code] on success).
@@ -178,7 +178,7 @@
 		</method>
 		<method name="make_dir_recursive">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Creates a target directory and all necessary intermediate directories in its path, by calling [method make_dir] recursively. The argument can be relative to the current directory, or an absolute path.
 				Returns one of the [enum Error] code constants ([code]OK[/code] on success).
@@ -186,15 +186,15 @@
 		</method>
 		<method name="open">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
-				Opens an existing directory of the filesystem. The [code]path[/code] argument can be within the project tree ([code]res://folder[/code]), the user directory ([code]user://folder[/code]) or an absolute path of the user filesystem (e.g. [code]/tmp/folder[/code] or [code]C:\tmp\folder[/code]).
+				Opens an existing directory of the filesystem. The [param path] argument can be within the project tree ([code]res://folder[/code]), the user directory ([code]user://folder[/code]) or an absolute path of the user filesystem (e.g. [code]/tmp/folder[/code] or [code]C:\tmp\folder[/code]).
 				Returns one of the [enum Error] code constants ([code]OK[/code] on success).
 			</description>
 		</method>
 		<method name="remove">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Permanently deletes the target file or an empty directory. The argument can be relative to the current directory, or an absolute path. If the target directory is not empty, the operation will fail.
 				If you don't want to delete the file/directory permanently, use [method OS.move_to_trash] instead.
@@ -203,10 +203,10 @@
 		</method>
 		<method name="rename">
 			<return type="int" enum="Error" />
-			<argument index="0" name="from" type="String" />
-			<argument index="1" name="to" type="String" />
+			<param index="0" name="from" type="String" />
+			<param index="1" name="to" type="String" />
 			<description>
-				Renames (move) the [code]from[/code] file or directory to the [code]to[/code] destination. Both arguments should be paths to files or directories, either relative or absolute. If the destination file or directory exists and is not access-protected, it will be overwritten.
+				Renames (move) the [param from] file or directory to the [param to] destination. Both arguments should be paths to files or directories, either relative or absolute. If the destination file or directory exists and is not access-protected, it will be overwritten.
 				Returns one of the [enum Error] code constants ([code]OK[/code] on success).
 			</description>
 		</method>
diff --git a/doc/classes/DisplayServer.xml b/doc/classes/DisplayServer.xml
index cec504584c..989d0cdb55 100644
--- a/doc/classes/DisplayServer.xml
+++ b/doc/classes/DisplayServer.xml
@@ -28,14 +28,14 @@
 		</method>
 		<method name="clipboard_set">
 			<return type="void" />
-			<argument index="0" name="clipboard" type="String" />
+			<param index="0" name="clipboard" type="String" />
 			<description>
 				Sets the user's clipboard content to the given string.
 			</description>
 		</method>
 		<method name="clipboard_set_primary">
 			<return type="void" />
-			<argument index="0" name="clipboard_primary" type="String" />
+			<param index="0" name="clipboard_primary" type="String" />
 			<description>
 				Sets the user's primary clipboard content to the given string.
 				[b]Note:[/b] This method is only implemented on Linux.
@@ -43,10 +43,10 @@
 		</method>
 		<method name="create_sub_window">
 			<return type="int" />
-			<argument index="0" name="mode" type="int" enum="DisplayServer.WindowMode" />
-			<argument index="1" name="vsync_mode" type="int" enum="DisplayServer.VSyncMode" />
-			<argument index="2" name="flags" type="int" />
-			<argument index="3" name="rect" type="Rect2i" default="Rect2i(0, 0, 0, 0)" />
+			<param index="0" name="mode" type="int" enum="DisplayServer.WindowMode" />
+			<param index="1" name="vsync_mode" type="int" enum="DisplayServer.VSyncMode" />
+			<param index="2" name="flags" type="int" />
+			<param index="3" name="rect" type="Rect2i" default="Rect2i(0, 0, 0, 0)" />
 			<description>
 			</description>
 		</method>
@@ -57,45 +57,45 @@
 		</method>
 		<method name="cursor_set_custom_image">
 			<return type="void" />
-			<argument index="0" name="cursor" type="Resource" />
-			<argument index="1" name="shape" type="int" enum="DisplayServer.CursorShape" default="0" />
-			<argument index="2" name="hotspot" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="cursor" type="Resource" />
+			<param index="1" name="shape" type="int" enum="DisplayServer.CursorShape" default="0" />
+			<param index="2" name="hotspot" type="Vector2" default="Vector2(0, 0)" />
 			<description>
 			</description>
 		</method>
 		<method name="cursor_set_shape">
 			<return type="void" />
-			<argument index="0" name="shape" type="int" enum="DisplayServer.CursorShape" />
+			<param index="0" name="shape" type="int" enum="DisplayServer.CursorShape" />
 			<description>
 			</description>
 		</method>
 		<method name="delete_sub_window">
 			<return type="void" />
-			<argument index="0" name="window_id" type="int" />
+			<param index="0" name="window_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="dialog_input_text">
 			<return type="int" enum="Error" />
-			<argument index="0" name="title" type="String" />
-			<argument index="1" name="description" type="String" />
-			<argument index="2" name="existing_text" type="String" />
-			<argument index="3" name="callback" type="Callable" />
+			<param index="0" name="title" type="String" />
+			<param index="1" name="description" type="String" />
+			<param index="2" name="existing_text" type="String" />
+			<param index="3" name="callback" type="Callable" />
 			<description>
 			</description>
 		</method>
 		<method name="dialog_show">
 			<return type="int" enum="Error" />
-			<argument index="0" name="title" type="String" />
-			<argument index="1" name="description" type="String" />
-			<argument index="2" name="buttons" type="PackedStringArray" />
-			<argument index="3" name="callback" type="Callable" />
+			<param index="0" name="title" type="String" />
+			<param index="1" name="description" type="String" />
+			<param index="2" name="buttons" type="PackedStringArray" />
+			<param index="3" name="callback" type="Callable" />
 			<description>
 			</description>
 		</method>
 		<method name="enable_for_stealing_focus">
 			<return type="void" />
-			<argument index="0" name="process_id" type="int" />
+			<param index="0" name="process_id" type="int" />
 			<description>
 			</description>
 		</method>
@@ -134,7 +134,7 @@
 		</method>
 		<method name="get_window_at_screen_position" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="position" type="Vector2i" />
+			<param index="0" name="position" type="Vector2i" />
 			<description>
 			</description>
 		</method>
@@ -144,231 +144,250 @@
 			</description>
 		</method>
 		<method name="global_menu_add_check_item">
-			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="label" type="String" />
-			<argument index="2" name="callback" type="Callable" />
-			<argument index="3" name="tag" type="Variant" default="null" />
-			<argument index="4" name="accelerator" type="int" enum="Key" default="0" />
-			<argument index="5" name="index" type="int" default="-1" />
-			<description>
-				Adds a new checkable item with text [code]label[/code] to the global menu with ID [code]menu_root[/code].
+			<return type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="label" type="String" />
+			<param index="2" name="callback" type="Callable" />
+			<param index="3" name="tag" type="Variant" default="null" />
+			<param index="4" name="accelerator" type="int" enum="Key" default="0" />
+			<param index="5" name="index" type="int" default="-1" />
+			<description>
+				Adds a new checkable item with text [param label] to the global menu with ID [param menu_root].
+				Returns index of the inserted item, it's not guaranteed to be the same as [param index] value.
 				[b]Note:[/b] This method is implemented on macOS.
 				[b]Supported system menu IDs:[/b]
 				[codeblock]
-				"" - Main menu (macOS).
+				"_main" - Main menu (macOS).
 				"_dock" - Dock popup menu (macOS).
 				[/codeblock]
 			</description>
 		</method>
 		<method name="global_menu_add_icon_check_item">
-			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="icon" type="Texture2D" />
-			<argument index="2" name="label" type="String" />
-			<argument index="3" name="callback" type="Callable" />
-			<argument index="4" name="tag" type="Variant" default="null" />
-			<argument index="5" name="accelerator" type="int" enum="Key" default="0" />
-			<argument index="6" name="index" type="int" default="-1" />
-			<description>
-				Adds a new checkable item with text [code]label[/code] and icon [code]icon[/code] to the global menu with ID [code]menu_root[/code].
+			<return type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="icon" type="Texture2D" />
+			<param index="2" name="label" type="String" />
+			<param index="3" name="callback" type="Callable" />
+			<param index="4" name="tag" type="Variant" default="null" />
+			<param index="5" name="accelerator" type="int" enum="Key" default="0" />
+			<param index="6" name="index" type="int" default="-1" />
+			<description>
+				Adds a new checkable item with text [param label] and icon [param icon] to the global menu with ID [param menu_root].
+				Returns index of the inserted item, it's not guaranteed to be the same as [param index] value.
 				[b]Note:[/b] This method is implemented on macOS.
 				[b]Supported system menu IDs:[/b]
 				[codeblock]
-				"" - Main menu (macOS).
+				"_main" - Main menu (macOS).
 				"_dock" - Dock popup menu (macOS).
 				[/codeblock]
 			</description>
 		</method>
 		<method name="global_menu_add_icon_item">
-			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="icon" type="Texture2D" />
-			<argument index="2" name="label" type="String" />
-			<argument index="3" name="callback" type="Callable" />
-			<argument index="4" name="tag" type="Variant" default="null" />
-			<argument index="5" name="accelerator" type="int" enum="Key" default="0" />
-			<argument index="6" name="index" type="int" default="-1" />
-			<description>
-				Adds a new item with text [code]label[/code] and icon [code]icon[/code] to the global menu with ID [code]menu_root[/code].
+			<return type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="icon" type="Texture2D" />
+			<param index="2" name="label" type="String" />
+			<param index="3" name="callback" type="Callable" />
+			<param index="4" name="tag" type="Variant" default="null" />
+			<param index="5" name="accelerator" type="int" enum="Key" default="0" />
+			<param index="6" name="index" type="int" default="-1" />
+			<description>
+				Adds a new item with text [param label] and icon [param icon] to the global menu with ID [param menu_root].
+				Returns index of the inserted item, it's not guaranteed to be the same as [param index] value.
 				[b]Note:[/b] This method is implemented on macOS.
 				[b]Supported system menu IDs:[/b]
 				[codeblock]
-				"" - Main menu (macOS).
+				"_main" - Main menu (macOS).
 				"_dock" - Dock popup menu (macOS).
 				[/codeblock]
 			</description>
 		</method>
 		<method name="global_menu_add_icon_radio_check_item">
-			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="icon" type="Texture2D" />
-			<argument index="2" name="label" type="String" />
-			<argument index="3" name="callback" type="Callable" />
-			<argument index="4" name="tag" type="Variant" default="null" />
-			<argument index="5" name="accelerator" type="int" enum="Key" default="0" />
-			<argument index="6" name="index" type="int" default="-1" />
-			<description>
-				Adds a new radio-checkable item with text [code]label[/code] and icon [code]icon[/code] to the global menu with ID [code]menu_root[/code].
+			<return type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="icon" type="Texture2D" />
+			<param index="2" name="label" type="String" />
+			<param index="3" name="callback" type="Callable" />
+			<param index="4" name="tag" type="Variant" default="null" />
+			<param index="5" name="accelerator" type="int" enum="Key" default="0" />
+			<param index="6" name="index" type="int" default="-1" />
+			<description>
+				Adds a new radio-checkable item with text [param label] and icon [param icon] to the global menu with ID [param menu_root].
+				Returns index of the inserted item, it's not guaranteed to be the same as [param index] value.
 				[b]Note:[/b] Radio-checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually. See [method global_menu_set_item_checked] for more info on how to control it.
 				[b]Note:[/b] This method is implemented on macOS.
 				[b]Supported system menu IDs:[/b]
 				[codeblock]
-				"" - Main menu (macOS).
+				"_main" - Main menu (macOS).
 				"_dock" - Dock popup menu (macOS).
 				[/codeblock]
 			</description>
 		</method>
 		<method name="global_menu_add_item">
-			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="label" type="String" />
-			<argument index="2" name="callback" type="Callable" />
-			<argument index="3" name="tag" type="Variant" default="null" />
-			<argument index="4" name="accelerator" type="int" enum="Key" default="0" />
-			<argument index="5" name="index" type="int" default="-1" />
-			<description>
-				Adds a new item with text [code]label[/code] to the global menu with ID [code]menu_root[/code].
+			<return type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="label" type="String" />
+			<param index="2" name="callback" type="Callable" />
+			<param index="3" name="tag" type="Variant" default="null" />
+			<param index="4" name="accelerator" type="int" enum="Key" default="0" />
+			<param index="5" name="index" type="int" default="-1" />
+			<description>
+				Adds a new item with text [param label] to the global menu with ID [param menu_root].
+				Returns index of the inserted item, it's not guaranteed to be the same as [param index] value.
 				[b]Note:[/b] This method is implemented on macOS.
 				[b]Supported system menu IDs:[/b]
 				[codeblock]
-				"" - Main menu (macOS).
+				"_main" - Main menu (macOS).
 				"_dock" - Dock popup menu (macOS).
 				[/codeblock]
 			</description>
 		</method>
 		<method name="global_menu_add_multistate_item">
-			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="labe" type="String" />
-			<argument index="2" name="max_states" type="int" />
-			<argument index="3" name="default_state" type="int" />
-			<argument index="4" name="callback" type="Callable" />
-			<argument index="5" name="tag" type="Variant" default="null" />
-			<argument index="6" name="accelerator" type="int" enum="Key" default="0" />
-			<argument index="7" name="index" type="int" default="-1" />
-			<description>
-				Adds a new item with text [code]label[/code] to the global menu with ID [code]menu_root[/code].
-				Contrarily to normal binary items, multistate items can have more than two states, as defined by [code]max_states[/code]. Each press or activate of the item will increase the state by one. The default value is defined by [code]default_state[/code].
+			<return type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="labe" type="String" />
+			<param index="2" name="max_states" type="int" />
+			<param index="3" name="default_state" type="int" />
+			<param index="4" name="callback" type="Callable" />
+			<param index="5" name="tag" type="Variant" default="null" />
+			<param index="6" name="accelerator" type="int" enum="Key" default="0" />
+			<param index="7" name="index" type="int" default="-1" />
+			<description>
+				Adds a new item with text [param labe] to the global menu with ID [param menu_root].
+				Contrarily to normal binary items, multistate items can have more than two states, as defined by [param max_states]. Each press or activate of the item will increase the state by one. The default value is defined by [param default_state].
+				Returns index of the inserted item, it's not guaranteed to be the same as [param index] value.
+				[b]Note:[/b] By default, there's no indication of the current item state, it should be changed manually.
 				[b]Note:[/b] This method is implemented on macOS.
 				[b]Supported system menu IDs:[/b]
 				[codeblock]
-				"" - Main menu (macOS).
+				"_main" - Main menu (macOS).
 				"_dock" - Dock popup menu (macOS).
 				[/codeblock]
 			</description>
 		</method>
 		<method name="global_menu_add_radio_check_item">
-			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="label" type="String" />
-			<argument index="2" name="callback" type="Callable" />
-			<argument index="3" name="tag" type="Variant" default="null" />
-			<argument index="4" name="accelerator" type="int" enum="Key" default="0" />
-			<argument index="5" name="index" type="int" default="-1" />
-			<description>
-				Adds a new radio-checkable item with text [code]label[/code] to the global menu with ID [code]menu_root[/code].
+			<return type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="label" type="String" />
+			<param index="2" name="callback" type="Callable" />
+			<param index="3" name="tag" type="Variant" default="null" />
+			<param index="4" name="accelerator" type="int" enum="Key" default="0" />
+			<param index="5" name="index" type="int" default="-1" />
+			<description>
+				Adds a new radio-checkable item with text [param label] to the global menu with ID [param menu_root].
+				Returns index of the inserted item, it's not guaranteed to be the same as [param index] value.
 				[b]Note:[/b] Radio-checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually. See [method global_menu_set_item_checked] for more info on how to control it.
 				[b]Note:[/b] This method is implemented on macOS.
 				[b]Supported system menu IDs:[/b]
 				[codeblock]
-				"" - Main menu (macOS).
+				"_main" - Main menu (macOS).
 				"_dock" - Dock popup menu (macOS).
 				[/codeblock]
 			</description>
 		</method>
 		<method name="global_menu_add_separator">
-			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="index" type="int" default="-1" />
+			<return type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="index" type="int" default="-1" />
 			<description>
-				Adds a separator between items to the global menu with ID [code]menu_root[/code]. Separators also occupy an index.
+				Adds a separator between items to the global menu with ID [param menu_root]. Separators also occupy an index.
+				Returns index of the inserted item, it's not guaranteed to be the same as [param index] value.
 				[b]Note:[/b] This method is implemented on macOS.
 				[b]Supported system menu IDs:[/b]
 				[codeblock]
-				"" - Main menu (macOS).
+				"_main" - Main menu (macOS).
 				"_dock" - Dock popup menu (macOS).
 				[/codeblock]
 			</description>
 		</method>
 		<method name="global_menu_add_submenu_item">
-			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="label" type="String" />
-			<argument index="2" name="submenu" type="String" />
-			<argument index="3" name="index" type="int" default="-1" />
+			<return type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="label" type="String" />
+			<param index="2" name="submenu" type="String" />
+			<param index="3" name="index" type="int" default="-1" />
 			<description>
-				Adds an item that will act as a submenu of the global menu [code]menu_root[/code]. The [code]submenu[/code] argument is the ID of the global menu root that will be shown when the item is clicked.
+				Adds an item that will act as a submenu of the global menu [param menu_root]. The [param submenu] argument is the ID of the global menu root that will be shown when the item is clicked.
+				Returns index of the inserted item, it's not guaranteed to be the same as [param index] value.
 				[b]Note:[/b] This method is implemented on macOS.
 				[b]Supported system menu IDs:[/b]
 				[codeblock]
-				"" - Main menu (macOS).
+				"_main" - Main menu (macOS).
 				"_dock" - Dock popup menu (macOS).
 				[/codeblock]
 			</description>
 		</method>
 		<method name="global_menu_clear">
 			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
+			<param index="0" name="menu_root" type="String" />
 			<description>
-				Removes all items from the global menu with ID [code]menu_root[/code].
+				Removes all items from the global menu with ID [param menu_root].
 				[b]Note:[/b] This method is implemented on macOS.
 				[b]Supported system menu IDs:[/b]
 				[codeblock]
-				"" - Main menu (macOS).
+				"_main" - Main menu (macOS).
 				"_dock" - Dock popup menu (macOS).
 				[/codeblock]
 			</description>
 		</method>
 		<method name="global_menu_get_item_accelerator" qualifiers="const">
 			<return type="int" enum="Key" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
 			<description>
-				Returns the accelerator of the item at index [code]idx[/code]. Accelerators are special combinations of keys that activate the item, no matter which control is focused.
+				Returns the accelerator of the item at index [param idx]. Accelerators are special combinations of keys that activate the item, no matter which control is focused.
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_get_item_callback" qualifiers="const">
 			<return type="Callable" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
 			<description>
-				Returns the callback of the item at index [code]idx[/code].
+				Returns the callback of the item at index [param idx].
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_get_item_icon" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
 			<description>
-				Returns the icon of the item at index [code]idx[/code].
+				Returns the icon of the item at index [param idx].
+				[b]Note:[/b] This method is implemented on macOS.
+			</description>
+		</method>
+		<method name="global_menu_get_item_indentation_level" qualifiers="const">
+			<return type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
+			<description>
+				Returns the horizontal offset of the item at the given [param idx].
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_get_item_index_from_tag" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="tag" type="Variant" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="tag" type="Variant" />
 			<description>
-				Returns the index of the item with the specified [code]tag[/code]. Index is automatically assigned to each item by the engine. Index can not be set manually.
+				Returns the index of the item with the specified [param tag]. Index is automatically assigned to each item by the engine. Index can not be set manually.
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_get_item_index_from_text" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="text" type="String" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="text" type="String" />
 			<description>
-				Returns the index of the item with the specified [code]text[/code]. Index is automatically assigned to each item by the engine. Index can not be set manually.
+				Returns the index of the item with the specified [param text]. Index is automatically assigned to each item by the engine. Index can not be set manually.
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_get_item_max_states" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
 			<description>
 				Returns number of states of an multistate item. See [method global_menu_add_multistate_item] for details.
 				[b]Note:[/b] This method is implemented on macOS.
@@ -376,8 +395,8 @@
 		</method>
 		<method name="global_menu_get_item_state" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
 			<description>
 				Returns the state of an multistate item. See [method global_menu_add_multistate_item] for details.
 				[b]Note:[/b] This method is implemented on macOS.
@@ -385,17 +404,17 @@
 		</method>
 		<method name="global_menu_get_item_submenu" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
 			<description>
-				Returns the submenu ID of the item at index [code]idx[/code]. See [method global_menu_add_submenu_item] for more info on how to add a submenu.
+				Returns the submenu ID of the item at index [param idx]. See [method global_menu_add_submenu_item] for more info on how to add a submenu.
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_get_item_tag" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
 			<description>
 				Returns the metadata of the specified item, which might be of any type. You can set it with [method global_menu_set_item_tag], which provides a simple way of assigning context data to items.
 				[b]Note:[/b] This method is implemented on macOS.
@@ -403,136 +422,146 @@
 		</method>
 		<method name="global_menu_get_item_text" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
 			<description>
-				Returns the text of the item at index [code]idx[/code].
+				Returns the text of the item at index [param idx].
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_get_item_tooltip" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
 			<description>
-				Returns the tooltip associated with the specified index index [code]idx[/code].
+				Returns the tooltip associated with the specified index index [param idx].
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_is_item_checkable" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
 			<description>
-				Returns [code]true[/code] if the item at index [code]idx[/code] is checkable in some way, i.e. if it has a checkbox or radio button.
+				Returns [code]true[/code] if the item at index [param idx] is checkable in some way, i.e. if it has a checkbox or radio button.
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_is_item_checked" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
 			<description>
-				Returns [code]true[/code] if the item at index [code]idx[/code] is checked.
+				Returns [code]true[/code] if the item at index [param idx] is checked.
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_is_item_disabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
 			<description>
-				Returns [code]true[/code] if the item at index [code]idx[/code] is disabled. When it is disabled it can't be selected, or its action invoked.
+				Returns [code]true[/code] if the item at index [param idx] is disabled. When it is disabled it can't be selected, or its action invoked.
 				See [method global_menu_set_item_disabled] for more info on how to disable an item.
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_is_item_radio_checkable" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
 			<description>
-				Returns [code]true[/code] if the item at index [code]idx[/code] has radio button-style checkability.
+				Returns [code]true[/code] if the item at index [param idx] has radio button-style checkability.
 				[b]Note:[/b] This is purely cosmetic; you must add the logic for checking/unchecking items in radio groups.
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_remove_item">
 			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
 			<description>
-				Removes the item at index [code]idx[/code] from the global menu [code]menu_root[/code].
+				Removes the item at index [param idx] from the global menu [param menu_root].
 				[b]Note:[/b] The indices of items after the removed item will be shifted by one.
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_set_item_accelerator">
 			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
-			<argument index="2" name="keycode" type="int" enum="Key" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
+			<param index="2" name="keycode" type="int" enum="Key" />
 			<description>
-				Sets the accelerator of the item at index [code]idx[/code].
+				Sets the accelerator of the item at index [param idx].
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_set_item_callback">
 			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
-			<argument index="2" name="callback" type="Callable" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
+			<param index="2" name="callback" type="Callable" />
 			<description>
-				Sets the callback of the item at index [code]idx[/code]. Callback is emitted when an item is pressed or its accelerator is activated.
+				Sets the callback of the item at index [param idx]. Callback is emitted when an item is pressed or its accelerator is activated.
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_set_item_checkable">
 			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
-			<argument index="2" name="checkable" type="bool" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
+			<param index="2" name="checkable" type="bool" />
 			<description>
-				Sets whether the item at index [code]idx[/code] has a checkbox. If [code]false[/code], sets the type of the item to plain text.
+				Sets whether the item at index [param idx] has a checkbox. If [code]false[/code], sets the type of the item to plain text.
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_set_item_checked">
 			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
-			<argument index="2" name="checked" type="bool" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
+			<param index="2" name="checked" type="bool" />
 			<description>
-				Sets the checkstate status of the item at index [code]idx[/code].
+				Sets the checkstate status of the item at index [param idx].
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_set_item_disabled">
 			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
-			<argument index="2" name="disabled" type="bool" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
+			<param index="2" name="disabled" type="bool" />
 			<description>
-				Enables/disables the item at index [code]idx[/code]. When it is disabled, it can't be selected and its action can't be invoked.
+				Enables/disables the item at index [param idx]. When it is disabled, it can't be selected and its action can't be invoked.
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_set_item_icon">
 			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
-			<argument index="2" name="icon" type="Texture2D" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
+			<param index="2" name="icon" type="Texture2D" />
 			<description>
-				Replaces the [Texture2D] icon of the specified [code]idx[/code].
+				Replaces the [Texture2D] icon of the specified [param idx].
 				[b]Note:[/b] This method is implemented on macOS.
 				[b]Note:[/b] This method is not supported by macOS "_dock" menu items.
 			</description>
 		</method>
+		<method name="global_menu_set_item_indentation_level">
+			<return type="void" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
+			<param index="2" name="level" type="int" />
+			<description>
+				Sets the horizontal offset of the item at the given [param idx].
+				[b]Note:[/b] This method is implemented on macOS.
+			</description>
+		</method>
 		<method name="global_menu_set_item_max_states">
 			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
-			<argument index="2" name="max_states" type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
+			<param index="2" name="max_states" type="int" />
 			<description>
 				Sets number of state of an multistate item. See [method global_menu_add_multistate_item] for details.
 				[b]Note:[/b] This method is implemented on macOS.
@@ -540,20 +569,20 @@
 		</method>
 		<method name="global_menu_set_item_radio_checkable">
 			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
-			<argument index="2" name="checkable" type="bool" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
+			<param index="2" name="checkable" type="bool" />
 			<description>
-				Sets the type of the item at the specified index [code]idx[/code] to radio button. If [code]false[/code], sets the type of the item to plain text
+				Sets the type of the item at the specified index [param idx] to radio button. If [code]false[/code], sets the type of the item to plain text
 				[b]Note:[/b] This is purely cosmetic; you must add the logic for checking/unchecking items in radio groups.
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_set_item_state">
 			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
-			<argument index="2" name="state" type="int" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
+			<param index="2" name="state" type="int" />
 			<description>
 				Sets the state of an multistate item. See [method global_menu_add_multistate_item] for details.
 				[b]Note:[/b] This method is implemented on macOS.
@@ -561,19 +590,19 @@
 		</method>
 		<method name="global_menu_set_item_submenu">
 			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
-			<argument index="2" name="submenu" type="String" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
+			<param index="2" name="submenu" type="String" />
 			<description>
-				Sets the submenu of the item at index [code]idx[/code]. The submenu is the ID of a global menu root that would be shown when the item is clicked.
+				Sets the submenu of the item at index [param idx]. The submenu is the ID of a global menu root that would be shown when the item is clicked.
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_set_item_tag">
 			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
-			<argument index="2" name="tag" type="Variant" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
+			<param index="2" name="tag" type="Variant" />
 			<description>
 				Sets the metadata of an item, which may be of any type. You can later get it with [method global_menu_get_item_tag], which provides a simple way of assigning context data to items.
 				[b]Note:[/b] This method is implemented on macOS.
@@ -581,27 +610,27 @@
 		</method>
 		<method name="global_menu_set_item_text">
 			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
-			<argument index="2" name="text" type="String" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
+			<param index="2" name="text" type="String" />
 			<description>
-				Sets the text of the item at index [code]idx[/code].
+				Sets the text of the item at index [param idx].
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="global_menu_set_item_tooltip">
 			<return type="void" />
-			<argument index="0" name="menu_root" type="String" />
-			<argument index="1" name="idx" type="int" />
-			<argument index="2" name="tooltip" type="String" />
+			<param index="0" name="menu_root" type="String" />
+			<param index="1" name="idx" type="int" />
+			<param index="2" name="tooltip" type="String" />
 			<description>
-				Sets the [String] tooltip of the item at the specified index [code]idx[/code].
+				Sets the [String] tooltip of the item at the specified index [param idx].
 				[b]Note:[/b] This method is implemented on macOS.
 			</description>
 		</method>
 		<method name="has_feature" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="feature" type="int" enum="DisplayServer.Feature" />
+			<param index="0" name="feature" type="int" enum="DisplayServer.Feature" />
 			<description>
 			</description>
 		</method>
@@ -624,9 +653,9 @@
 		</method>
 		<method name="keyboard_get_keycode_from_physical" qualifiers="const">
 			<return type="int" enum="Key" />
-			<argument index="0" name="keycode" type="int" enum="Key" />
+			<param index="0" name="keycode" type="int" enum="Key" />
 			<description>
-				Converts a physical (US QWERTY) [code]keycode[/code] to one in the active keyboard layout.
+				Converts a physical (US QWERTY) [param keycode] to one in the active keyboard layout.
 				[b]Note:[/b] This method is implemented on Linux, macOS and Windows.
 			</description>
 		</method>
@@ -639,23 +668,23 @@
 		</method>
 		<method name="keyboard_get_layout_language" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the ISO-639/BCP-47 language code of the keyboard layout at position [code]index[/code].
+				Returns the ISO-639/BCP-47 language code of the keyboard layout at position [param index].
 				[b]Note:[/b] This method is implemented on Linux, macOS and Windows.
 			</description>
 		</method>
 		<method name="keyboard_get_layout_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the localized name of the keyboard layout at position [code]index[/code].
+				Returns the localized name of the keyboard layout at position [param index].
 				[b]Note:[/b] This method is implemented on Linux, macOS and Windows.
 			</description>
 		</method>
 		<method name="keyboard_set_current_layout">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Sets active keyboard layout.
 				[b]Note:[/b] This method is implemented on Linux, macOS and Windows.
@@ -679,7 +708,7 @@
 		</method>
 		<method name="mouse_set_mode">
 			<return type="void" />
-			<argument index="0" name="mouse_mode" type="int" enum="DisplayServer.MouseMode" />
+			<param index="0" name="mouse_mode" type="int" enum="DisplayServer.MouseMode" />
 			<description>
 			</description>
 		</method>
@@ -690,9 +719,9 @@
 		</method>
 		<method name="screen_get_dpi" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="screen" type="int" default="-1" />
+			<param index="0" name="screen" type="int" default="-1" />
 			<description>
-				Returns the dots per inch density of the specified screen. If [code]screen[/code] is [/code]SCREEN_OF_MAIN_WINDOW[/code] (the default value), a screen with the main window will be used.
+				Returns the dots per inch density of the specified screen. If [param screen] is [constant SCREEN_OF_MAIN_WINDOW] (the default value), a screen with the main window will be used.
 				[b]Note:[/b] On macOS, returned value is inaccurate if fractional display scaling mode is used.
 				[b]Note:[/b] On Android devices, the actual screen densities are grouped into six generalized densities:
 				[codeblock]
@@ -716,21 +745,21 @@
 		</method>
 		<method name="screen_get_orientation" qualifiers="const">
 			<return type="int" enum="DisplayServer.ScreenOrientation" />
-			<argument index="0" name="screen" type="int" default="-1" />
+			<param index="0" name="screen" type="int" default="-1" />
 			<description>
 			</description>
 		</method>
 		<method name="screen_get_position" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="screen" type="int" default="-1" />
+			<param index="0" name="screen" type="int" default="-1" />
 			<description>
 			</description>
 		</method>
 		<method name="screen_get_refresh_rate" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="screen" type="int" default="-1" />
+			<param index="0" name="screen" type="int" default="-1" />
 			<description>
-				Returns the current refresh rate of the specified screen. If [code]screen[/code] is [constant SCREEN_OF_MAIN_WINDOW] (the default value), a screen with the main window will be used.
+				Returns the current refresh rate of the specified screen. If [param screen] is [constant SCREEN_OF_MAIN_WINDOW] (the default value), a screen with the main window will be used.
 				[b]Note:[/b] Returns [code]-1.0[/code] if the DisplayServer fails to find the refresh rate for the specified screen. On HTML5, [method screen_get_refresh_rate] will always return [code]-1.0[/code] as there is no way to retrieve the refresh rate on that platform.
 				To fallback to a default refresh rate if the method fails, try:
 				[codeblock]
@@ -742,7 +771,7 @@
 		</method>
 		<method name="screen_get_scale" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="screen" type="int" default="-1" />
+			<param index="0" name="screen" type="int" default="-1" />
 			<description>
 				Returns the scale factor of the specified screen by index.
 				[b]Note:[/b] On macOS returned value is [code]2.0[/code] for hiDPI (Retina) screen, and [code]1.0[/code] for all other cases.
@@ -751,13 +780,13 @@
 		</method>
 		<method name="screen_get_size" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="screen" type="int" default="-1" />
+			<param index="0" name="screen" type="int" default="-1" />
 			<description>
 			</description>
 		</method>
 		<method name="screen_get_usable_rect" qualifiers="const">
 			<return type="Rect2i" />
-			<argument index="0" name="screen" type="int" default="-1" />
+			<param index="0" name="screen" type="int" default="-1" />
 			<description>
 			</description>
 		</method>
@@ -768,32 +797,32 @@
 		</method>
 		<method name="screen_is_touchscreen" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="screen" type="int" default="-1" />
+			<param index="0" name="screen" type="int" default="-1" />
 			<description>
 			</description>
 		</method>
 		<method name="screen_set_keep_on">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
+			<param index="0" name="enable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="screen_set_orientation">
 			<return type="void" />
-			<argument index="0" name="orientation" type="int" enum="DisplayServer.ScreenOrientation" />
-			<argument index="1" name="screen" type="int" default="-1" />
+			<param index="0" name="orientation" type="int" enum="DisplayServer.ScreenOrientation" />
+			<param index="1" name="screen" type="int" default="-1" />
 			<description>
 			</description>
 		</method>
 		<method name="set_icon">
 			<return type="void" />
-			<argument index="0" name="image" type="Image" />
+			<param index="0" name="image" type="Image" />
 			<description>
 			</description>
 		</method>
 		<method name="set_native_icon">
 			<return type="void" />
-			<argument index="0" name="filename" type="String" />
+			<param index="0" name="filename" type="String" />
 			<description>
 			</description>
 		</method>
@@ -813,7 +842,7 @@
 		</method>
 		<method name="tablet_get_driver_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns the tablet driver name for the given index.
 				[b]Note:[/b] This method is implemented on Windows.
@@ -821,7 +850,7 @@
 		</method>
 		<method name="tablet_set_current_driver">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Set active tablet driver name.
 				[b]Note:[/b] This method is implemented on Windows.
@@ -840,9 +869,9 @@
 		</method>
 		<method name="tts_get_voices_for_language" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="language" type="String" />
+			<param index="0" name="language" type="String" />
 			<description>
-				Returns an [PackedStringArray] of voice identifiers for the [code]language[/code].
+				Returns an [PackedStringArray] of voice identifiers for the [param language].
 				[b]Note:[/b] This method is implemented on Android, iOS, HTML5, Linux, macOS, and Windows.
 			</description>
 		</method>
@@ -876,8 +905,8 @@
 		</method>
 		<method name="tts_set_utterance_callback">
 			<return type="void" />
-			<argument index="0" name="event" type="int" enum="DisplayServer.TTSUtteranceEvent" />
-			<argument index="1" name="callable" type="Callable" />
+			<param index="0" name="event" type="int" enum="DisplayServer.TTSUtteranceEvent" />
+			<param index="1" name="callable" type="Callable" />
 			<description>
 				Adds a callback, which is called when the utterance has started, finished, canceled or reached a text boundary.
 				- [code]TTS_UTTERANCE_STARTED[/code], [code]TTS_UTTERANCE_ENDED[/code], and [code]TTS_UTTERANCE_CANCELED[/code] callable's method should take one [int] parameter, the utterance id.
@@ -888,21 +917,21 @@
 		</method>
 		<method name="tts_speak">
 			<return type="void" />
-			<argument index="0" name="text" type="String" />
-			<argument index="1" name="voice" type="String" />
-			<argument index="2" name="volume" type="int" default="50" />
-			<argument index="3" name="pitch" type="float" default="1.0" />
-			<argument index="4" name="rate" type="float" default="1.0" />
-			<argument index="5" name="utterance_id" type="int" default="0" />
-			<argument index="6" name="interrupt" type="bool" default="false" />
-			<description>
-				Adds an utterance to the queue. If [code]interrupt[/code] is [code]true[/code], the queue is cleared first.
-				- [code]voice[/code] identifier is one of the [code]"id"[/code] values returned by [method tts_get_voices] or one of the values returned by [method tts_get_voices_for_language].
-				- [code]volume[/code] ranges from [code]0[/code] (lowest) to [code]100[/code] (highest).
-				- [code]pitch[/code] ranges from [code]0.0[/code] (lowest) to [code]2.0[/code] (highest), [code]1.0[/code] is default pitch for the current voice.
-				- [code]rate[/code] ranges from [code]0.1[/code] (lowest) to [code]10.0[/code] (highest), [code]1.0[/code] is a normal speaking rate. Other values act as a percentage relative.
-				- [code]utterance_id[/code] is passed as a parameter to the callback functions.
-				[b]Note:[/b] On Windows and Linux, utterance [code]text[/code] can use SSML markup. SSML support is engine and voice dependent. If the engine does not support SSML, you should strip out all XML markup before calling [method tts_speak].
+			<param index="0" name="text" type="String" />
+			<param index="1" name="voice" type="String" />
+			<param index="2" name="volume" type="int" default="50" />
+			<param index="3" name="pitch" type="float" default="1.0" />
+			<param index="4" name="rate" type="float" default="1.0" />
+			<param index="5" name="utterance_id" type="int" default="0" />
+			<param index="6" name="interrupt" type="bool" default="false" />
+			<description>
+				Adds an utterance to the queue. If [param interrupt] is [code]true[/code], the queue is cleared first.
+				- [param voice] identifier is one of the [code]"id"[/code] values returned by [method tts_get_voices] or one of the values returned by [method tts_get_voices_for_language].
+				- [param volume] ranges from [code]0[/code] (lowest) to [code]100[/code] (highest).
+				- [param pitch] ranges from [code]0.0[/code] (lowest) to [code]2.0[/code] (highest), [code]1.0[/code] is default pitch for the current voice.
+				- [param rate] ranges from [code]0.1[/code] (lowest) to [code]10.0[/code] (highest), [code]1.0[/code] is a normal speaking rate. Other values act as a percentage relative.
+				- [param utterance_id] is passed as a parameter to the callback functions.
+				[b]Note:[/b] On Windows and Linux, utterance [param text] can use SSML markup. SSML support is engine and voice dependent. If the engine does not support SSML, you should strip out all XML markup before calling [method tts_speak].
 				[b]Note:[/b] The granularity of pitch, rate, and volume is engine and voice dependent. Values may be truncated.
 				[b]Note:[/b] This method is implemented on Android, iOS, HTML5, Linux, macOS, and Windows.
 			</description>
@@ -928,40 +957,40 @@
 		</method>
 		<method name="virtual_keyboard_show">
 			<return type="void" />
-			<argument index="0" name="existing_text" type="String" />
-			<argument index="1" name="position" type="Rect2" default="Rect2(0, 0, 0, 0)" />
-			<argument index="2" name="multiline" type="bool" default="false" />
-			<argument index="3" name="max_length" type="int" default="-1" />
-			<argument index="4" name="cursor_start" type="int" default="-1" />
-			<argument index="5" name="cursor_end" type="int" default="-1" />
+			<param index="0" name="existing_text" type="String" />
+			<param index="1" name="position" type="Rect2" default="Rect2(0, 0, 0, 0)" />
+			<param index="2" name="type" type="int" enum="DisplayServer.VirtualKeyboardType" default="0" />
+			<param index="3" name="max_length" type="int" default="-1" />
+			<param index="4" name="cursor_start" type="int" default="-1" />
+			<param index="5" name="cursor_end" type="int" default="-1" />
 			<description>
 				Shows the virtual keyboard if the platform has one.
-				[code]existing_text[/code] parameter is useful for implementing your own [LineEdit] or [TextEdit], as it tells the virtual keyboard what text has already been typed (the virtual keyboard uses it for auto-correct and predictions).
-				[code]position[/code] parameter is the screen space [Rect2] of the edited text.
-				[code]multiline[/code] parameter needs to be set to [code]true[/code] to be able to enter multiple lines of text, as in [TextEdit].
-				[code]max_length[/code] limits the number of characters that can be entered if different from [code]-1[/code].
-				[code]cursor_start[/code] can optionally define the current text cursor position if [code]cursor_end[/code] is not set.
-				[code]cursor_start[/code] and [code]cursor_end[/code] can optionally define the current text selection.
-				[b]Note:[/b] This method is implemented on Android, iOS and UWP.
+				[param existing_text] parameter is useful for implementing your own [LineEdit] or [TextEdit], as it tells the virtual keyboard what text has already been typed (the virtual keyboard uses it for auto-correct and predictions).
+				[param position] parameter is the screen space [Rect2] of the edited text.
+				[param type] parameter allows configuring which type of virtual keyboard to show.
+				[param max_length] limits the number of characters that can be entered if different from [code]-1[/code].
+				[param cursor_start] can optionally define the current text cursor position if [param cursor_end] is not set.
+				[param cursor_start] and [param cursor_end] can optionally define the current text selection.
+				[b]Note:[/b] This method is implemented on Android, iOS and HTML5.
 			</description>
 		</method>
 		<method name="warp_mouse">
 			<return type="void" />
-			<argument index="0" name="position" type="Vector2i" />
+			<param index="0" name="position" type="Vector2i" />
 			<description>
-				Sets the mouse cursor position to the given [code]position[/code] relative to an origin at the upper left corner of the currently focused game Window Manager window.
+				Sets the mouse cursor position to the given [param position] relative to an origin at the upper left corner of the currently focused game Window Manager window.
 			</description>
 		</method>
 		<method name="window_attach_instance_id">
 			<return type="void" />
-			<argument index="0" name="instance_id" type="int" />
-			<argument index="1" name="window_id" type="int" default="0" />
+			<param index="0" name="instance_id" type="int" />
+			<param index="1" name="window_id" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="window_can_draw" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="window_id" type="int" default="0" />
+			<param index="0" name="window_id" type="int" default="0" />
 			<description>
 			</description>
 		</method>
@@ -973,47 +1002,47 @@
 		</method>
 		<method name="window_get_attached_instance_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="window_id" type="int" default="0" />
+			<param index="0" name="window_id" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="window_get_current_screen" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="window_id" type="int" default="0" />
+			<param index="0" name="window_id" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="window_get_flag" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="flag" type="int" enum="DisplayServer.WindowFlags" />
-			<argument index="1" name="window_id" type="int" default="0" />
+			<param index="0" name="flag" type="int" enum="DisplayServer.WindowFlags" />
+			<param index="1" name="window_id" type="int" default="0" />
 			<description>
-				Returns the current value of the given window's [code]flag[/code].
+				Returns the current value of the given window's [param flag].
 			</description>
 		</method>
 		<method name="window_get_max_size" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="window_id" type="int" default="0" />
+			<param index="0" name="window_id" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="window_get_min_size" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="window_id" type="int" default="0" />
+			<param index="0" name="window_id" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="window_get_mode" qualifiers="const">
 			<return type="int" enum="DisplayServer.WindowMode" />
-			<argument index="0" name="window_id" type="int" default="0" />
+			<param index="0" name="window_id" type="int" default="0" />
 			<description>
 				Returns the mode of the given window.
 			</description>
 		</method>
 		<method name="window_get_native_handle" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="handle_type" type="int" enum="DisplayServer.HandleType" />
-			<argument index="1" name="window_id" type="int" default="0" />
+			<param index="0" name="handle_type" type="int" enum="DisplayServer.HandleType" />
+			<param index="1" name="window_id" type="int" default="0" />
 			<description>
 				Returns internal structure pointers for use in plugins.
 				[b]Note:[/b] This method is implemented on Android, Linux, macOS and Windows.
@@ -1021,67 +1050,67 @@
 		</method>
 		<method name="window_get_popup_safe_rect" qualifiers="const">
 			<return type="Rect2i" />
-			<argument index="0" name="window" type="int" />
+			<param index="0" name="window" type="int" />
 			<description>
 				Returns the bounding box of control, or menu item that was used to open the popup window, in the screen coordinate system.
 			</description>
 		</method>
 		<method name="window_get_position" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="window_id" type="int" default="0" />
+			<param index="0" name="window_id" type="int" default="0" />
 			<description>
 				Returns the position of the given window to on the screen.
 			</description>
 		</method>
 		<method name="window_get_real_size" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="window_id" type="int" default="0" />
+			<param index="0" name="window_id" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="window_get_size" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="window_id" type="int" default="0" />
+			<param index="0" name="window_id" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="window_get_vsync_mode" qualifiers="const">
 			<return type="int" enum="DisplayServer.VSyncMode" />
-			<argument index="0" name="window_id" type="int" default="0" />
+			<param index="0" name="window_id" type="int" default="0" />
 			<description>
-				Returns the VSync mode of the given window.
+				Returns the V-Sync mode of the given window.
 			</description>
 		</method>
 		<method name="window_move_to_foreground">
 			<return type="void" />
-			<argument index="0" name="window_id" type="int" default="0" />
+			<param index="0" name="window_id" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="window_request_attention">
 			<return type="void" />
-			<argument index="0" name="window_id" type="int" default="0" />
+			<param index="0" name="window_id" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="window_set_current_screen">
 			<return type="void" />
-			<argument index="0" name="screen" type="int" />
-			<argument index="1" name="window_id" type="int" default="0" />
+			<param index="0" name="screen" type="int" />
+			<param index="1" name="window_id" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="window_set_drop_files_callback">
 			<return type="void" />
-			<argument index="0" name="callback" type="Callable" />
-			<argument index="1" name="window_id" type="int" default="0" />
+			<param index="0" name="callback" type="Callable" />
+			<param index="1" name="window_id" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="window_set_exclusive">
 			<return type="void" />
-			<argument index="0" name="window_id" type="int" />
-			<argument index="1" name="exclusive" type="bool" />
+			<param index="0" name="window_id" type="int" />
+			<param index="1" name="exclusive" type="bool" />
 			<description>
 				If set to [code]true[/code], this window will always stay on top of its parent window, parent window will ignore input while this window is opened.
 				[b]Note:[/b] On macOS, exclusive windows are confined to the same space (virtual desktop or screen) as the parent window.
@@ -1090,70 +1119,70 @@
 		</method>
 		<method name="window_set_flag">
 			<return type="void" />
-			<argument index="0" name="flag" type="int" enum="DisplayServer.WindowFlags" />
-			<argument index="1" name="enabled" type="bool" />
-			<argument index="2" name="window_id" type="int" default="0" />
+			<param index="0" name="flag" type="int" enum="DisplayServer.WindowFlags" />
+			<param index="1" name="enabled" type="bool" />
+			<param index="2" name="window_id" type="int" default="0" />
 			<description>
-				Enables or disables the given window's given [code]flag[/code]. See [enum WindowFlags] for possible values and their behavior.
+				Enables or disables the given window's given [param flag]. See [enum WindowFlags] for possible values and their behavior.
 			</description>
 		</method>
 		<method name="window_set_ime_active">
 			<return type="void" />
-			<argument index="0" name="active" type="bool" />
-			<argument index="1" name="window_id" type="int" default="0" />
+			<param index="0" name="active" type="bool" />
+			<param index="1" name="window_id" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="window_set_ime_position">
 			<return type="void" />
-			<argument index="0" name="position" type="Vector2i" />
-			<argument index="1" name="window_id" type="int" default="0" />
+			<param index="0" name="position" type="Vector2i" />
+			<param index="1" name="window_id" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="window_set_input_event_callback">
 			<return type="void" />
-			<argument index="0" name="callback" type="Callable" />
-			<argument index="1" name="window_id" type="int" default="0" />
+			<param index="0" name="callback" type="Callable" />
+			<param index="1" name="window_id" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="window_set_input_text_callback">
 			<return type="void" />
-			<argument index="0" name="callback" type="Callable" />
-			<argument index="1" name="window_id" type="int" default="0" />
+			<param index="0" name="callback" type="Callable" />
+			<param index="1" name="window_id" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="window_set_max_size">
 			<return type="void" />
-			<argument index="0" name="max_size" type="Vector2i" />
-			<argument index="1" name="window_id" type="int" default="0" />
+			<param index="0" name="max_size" type="Vector2i" />
+			<param index="1" name="window_id" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="window_set_min_size">
 			<return type="void" />
-			<argument index="0" name="min_size" type="Vector2i" />
-			<argument index="1" name="window_id" type="int" default="0" />
+			<param index="0" name="min_size" type="Vector2i" />
+			<param index="1" name="window_id" type="int" default="0" />
 			<description>
-				Sets the minimum size for the given window to [code]min_size[/code] (in pixels).
+				Sets the minimum size for the given window to [param min_size] (in pixels).
 				[b]Note:[/b] By default, the main window has a minimum size of [code]Vector2i(64, 64)[/code]. This prevents issues that can arise when the window is resized to a near-zero size.
 			</description>
 		</method>
 		<method name="window_set_mode">
 			<return type="void" />
-			<argument index="0" name="mode" type="int" enum="DisplayServer.WindowMode" />
-			<argument index="1" name="window_id" type="int" default="0" />
+			<param index="0" name="mode" type="int" enum="DisplayServer.WindowMode" />
+			<param index="1" name="window_id" type="int" default="0" />
 			<description>
-				Sets window mode for the given window to [code]mode[/code]. See [enum WindowMode] for possible values and how each mode behaves.
+				Sets window mode for the given window to [param mode]. See [enum WindowMode] for possible values and how each mode behaves.
 				[b]Note:[/b] Setting the window to fullscreen forcibly sets the borderless flag to [code]true[/code], so make sure to set it back to [code]false[/code] when not wanted.
 			</description>
 		</method>
 		<method name="window_set_mouse_passthrough">
 			<return type="void" />
-			<argument index="0" name="region" type="PackedVector2Array" />
-			<argument index="1" name="window_id" type="int" default="0" />
+			<param index="0" name="region" type="PackedVector2Array" />
+			<param index="1" name="window_id" type="int" default="0" />
 			<description>
 				Sets a polygonal region of the window which accepts mouse events. Mouse events outside the region will be passed through.
 				Passing an empty array will disable passthrough support (all mouse events will be intercepted by the window, which is the default behavior).
@@ -1185,64 +1214,64 @@
 		</method>
 		<method name="window_set_popup_safe_rect">
 			<return type="void" />
-			<argument index="0" name="window" type="int" />
-			<argument index="1" name="rect" type="Rect2i" />
+			<param index="0" name="window" type="int" />
+			<param index="1" name="rect" type="Rect2i" />
 			<description>
 				Sets the bounding box of control, or menu item that was used to open the popup window, in the screen coordinate system. Clicking this area will not auto-close this popup.
 			</description>
 		</method>
 		<method name="window_set_position">
 			<return type="void" />
-			<argument index="0" name="position" type="Vector2i" />
-			<argument index="1" name="window_id" type="int" default="0" />
+			<param index="0" name="position" type="Vector2i" />
+			<param index="1" name="window_id" type="int" default="0" />
 			<description>
-				Sets the position of the given window to [code]position[/code].
+				Sets the position of the given window to [param position].
 			</description>
 		</method>
 		<method name="window_set_rect_changed_callback">
 			<return type="void" />
-			<argument index="0" name="callback" type="Callable" />
-			<argument index="1" name="window_id" type="int" default="0" />
+			<param index="0" name="callback" type="Callable" />
+			<param index="1" name="window_id" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="window_set_size">
 			<return type="void" />
-			<argument index="0" name="size" type="Vector2i" />
-			<argument index="1" name="window_id" type="int" default="0" />
+			<param index="0" name="size" type="Vector2i" />
+			<param index="1" name="window_id" type="int" default="0" />
 			<description>
-				Sets the size of the given window to [code]size[/code].
+				Sets the size of the given window to [param size].
 			</description>
 		</method>
 		<method name="window_set_title">
 			<return type="void" />
-			<argument index="0" name="title" type="String" />
-			<argument index="1" name="window_id" type="int" default="0" />
+			<param index="0" name="title" type="String" />
+			<param index="1" name="window_id" type="int" default="0" />
 			<description>
-				Sets the title of the given window to [code]title[/code].
+				Sets the title of the given window to [param title].
 			</description>
 		</method>
 		<method name="window_set_transient">
 			<return type="void" />
-			<argument index="0" name="window_id" type="int" />
-			<argument index="1" name="parent_window_id" type="int" />
+			<param index="0" name="window_id" type="int" />
+			<param index="1" name="parent_window_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="window_set_vsync_mode">
 			<return type="void" />
-			<argument index="0" name="vsync_mode" type="int" enum="DisplayServer.VSyncMode" />
-			<argument index="1" name="window_id" type="int" default="0" />
+			<param index="0" name="vsync_mode" type="int" enum="DisplayServer.VSyncMode" />
+			<param index="1" name="window_id" type="int" default="0" />
 			<description>
-				Sets the VSync mode of the given window.
+				Sets the V-Sync mode of the given window.
 				See [enum DisplayServer.VSyncMode] for possible values and how they affect the behavior of your application.
 				Depending on the platform and used renderer, the engine will fall back to [constant VSYNC_ENABLED], if the desired mode is not supported.
 			</description>
 		</method>
 		<method name="window_set_window_event_callback">
 			<return type="void" />
-			<argument index="0" name="callback" type="Callable" />
-			<argument index="1" name="window_id" type="int" default="0" />
+			<param index="0" name="callback" type="Callable" />
+			<param index="1" name="window_id" type="int" default="0" />
 			<description>
 			</description>
 		</method>
@@ -1323,6 +1352,31 @@
 		</constant>
 		<constant name="SCREEN_SENSOR" value="6" enum="ScreenOrientation">
 		</constant>
+		<constant name="KEYBOARD_TYPE_DEFAULT" value="0" enum="VirtualKeyboardType">
+			Default text virtual keyboard.
+		</constant>
+		<constant name="KEYBOARD_TYPE_MULTILINE" value="1" enum="VirtualKeyboardType">
+			Multiline virtual keyboard.
+		</constant>
+		<constant name="KEYBOARD_TYPE_NUMBER" value="2" enum="VirtualKeyboardType">
+			Virtual number keypad, useful for PIN entry.
+		</constant>
+		<constant name="KEYBOARD_TYPE_NUMBER_DECIMAL" value="3" enum="VirtualKeyboardType">
+			Virtual number keypad, useful for entering fractional numbers.
+		</constant>
+		<constant name="KEYBOARD_TYPE_PHONE" value="4" enum="VirtualKeyboardType">
+			Virtual phone number keypad.
+		</constant>
+		<constant name="KEYBOARD_TYPE_EMAIL_ADDRESS" value="5" enum="VirtualKeyboardType">
+			Virtual keyboard with additional keys to assist with typing email addresses.
+		</constant>
+		<constant name="KEYBOARD_TYPE_PASSWORD" value="6" enum="VirtualKeyboardType">
+			Virtual keyboard for entering a password. On most platforms, this should disable autocomplete and autocapitalization.
+			[b]Note:[/b] This is not supported on HTML5. Instead, this behaves identically to [constant KEYBOARD_TYPE_DEFAULT].
+		</constant>
+		<constant name="KEYBOARD_TYPE_URL" value="7" enum="VirtualKeyboardType">
+			Virtual keyboard with additional keys to assist with typing URLs.
+		</constant>
 		<constant name="CURSOR_ARROW" value="0" enum="CursorShape">
 		</constant>
 		<constant name="CURSOR_IBEAM" value="1" enum="CursorShape">
diff --git a/doc/classes/EditorCommandPalette.xml b/doc/classes/EditorCommandPalette.xml
index 2cc07c7f1b..53a3fe5d19 100644
--- a/doc/classes/EditorCommandPalette.xml
+++ b/doc/classes/EditorCommandPalette.xml
@@ -27,24 +27,24 @@
 	<methods>
 		<method name="add_command">
 			<return type="void" />
-			<argument index="0" name="command_name" type="String" />
-			<argument index="1" name="key_name" type="String" />
-			<argument index="2" name="binded_callable" type="Callable" />
-			<argument index="3" name="shortcut_text" type="String" default="&quot;None&quot;" />
+			<param index="0" name="command_name" type="String" />
+			<param index="1" name="key_name" type="String" />
+			<param index="2" name="binded_callable" type="Callable" />
+			<param index="3" name="shortcut_text" type="String" default="&quot;None&quot;" />
 			<description>
 				Adds a custom command to EditorCommandPalette.
-				- [code]command_name[/code]: [String] (Name of the [b]Command[/b]. This is displayed to the user.)
-				- [code]key_name[/code]: [String] (Name of the key for a particular [b]Command[/b]. This is used to uniquely identify the [b]Command[/b].)
-				- [code]binded_callable[/code]: [Callable] (Callable of the [b]Command[/b]. This will be executed when the [b]Command[/b] is selected.)
-				- [code]shortcut_text[/code]: [String] (Shortcut text of the [b]Command[/b] if available.)
+				- [param command_name]: [String] (Name of the [b]Command[/b]. This is displayed to the user.)
+				- [param key_name]: [String] (Name of the key for a particular [b]Command[/b]. This is used to uniquely identify the [b]Command[/b].)
+				- [param binded_callable]: [Callable] (Callable of the [b]Command[/b]. This will be executed when the [b]Command[/b] is selected.)
+				- [param shortcut_text]: [String] (Shortcut text of the [b]Command[/b] if available.)
 			</description>
 		</method>
 		<method name="remove_command">
 			<return type="void" />
-			<argument index="0" name="key_name" type="String" />
+			<param index="0" name="key_name" type="String" />
 			<description>
 				Removes the custom command from EditorCommandPalette.
-				- [code]key_name[/code]: [String] (Name of the key for a particular [b]Command[/b].)
+				- [param key_name]: [String] (Name of the key for a particular [b]Command[/b].)
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/EditorDebuggerPlugin.xml b/doc/classes/EditorDebuggerPlugin.xml
index ba0a479fa7..c3e0a995c6 100644
--- a/doc/classes/EditorDebuggerPlugin.xml
+++ b/doc/classes/EditorDebuggerPlugin.xml
@@ -14,7 +14,7 @@
 	<methods>
 		<method name="has_capture">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns [code]true[/code] if a message capture with given name is present otherwise [code]false[/code].
 			</description>
@@ -39,24 +39,24 @@
 		</method>
 		<method name="register_message_capture">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="callable" type="Callable" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="callable" type="Callable" />
 			<description>
-				Registers a message capture with given [code]name[/code]. If [code]name[/code] is "my_message" then messages starting with "my_message:" will be called with the given callable.
+				Registers a message capture with given [param name]. If [param name] is "my_message" then messages starting with "my_message:" will be called with the given callable.
 				Callable must accept a message string and a data array as argument. If the message and data are valid then callable must return [code]true[/code] otherwise [code]false[/code].
 			</description>
 		</method>
 		<method name="send_message">
 			<return type="void" />
-			<argument index="0" name="message" type="String" />
-			<argument index="1" name="data" type="Array" />
+			<param index="0" name="message" type="String" />
+			<param index="1" name="data" type="Array" />
 			<description>
-				Sends a message with given [code]message[/code] and [code]data[/code] array.
+				Sends a message with given [param message] and [param data] array.
 			</description>
 		</method>
 		<method name="unregister_message_capture">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Unregisters the message capture with given name.
 			</description>
@@ -64,7 +64,7 @@
 	</methods>
 	<signals>
 		<signal name="breaked">
-			<argument index="0" name="can_debug" type="bool" />
+			<param index="0" name="can_debug" type="bool" />
 			<description>
 				Emitted when the game enters a break state.
 			</description>
diff --git a/doc/classes/EditorExportPlugin.xml b/doc/classes/EditorExportPlugin.xml
index f217fbaf48..091bac7d8e 100644
--- a/doc/classes/EditorExportPlugin.xml
+++ b/doc/classes/EditorExportPlugin.xml
@@ -12,12 +12,12 @@
 	<methods>
 		<method name="_export_begin" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="features" type="PackedStringArray" />
-			<argument index="1" name="is_debug" type="bool" />
-			<argument index="2" name="path" type="String" />
-			<argument index="3" name="flags" type="int" />
+			<param index="0" name="features" type="PackedStringArray" />
+			<param index="1" name="is_debug" type="bool" />
+			<param index="2" name="path" type="String" />
+			<param index="3" name="flags" type="int" />
 			<description>
-				Virtual method to be overridden by the user. It is called when the export starts and provides all information about the export. [code]features[/code] is the list of features for the export, [code]is_debug[/code] is [code]true[/code] for debug builds, [code]path[/code] is the target path for the exported project. [code]flags[/code] is only used when running a runnable profile, e.g. when using native run on Android.
+				Virtual method to be overridden by the user. It is called when the export starts and provides all information about the export. [param features] is the list of features for the export, [param is_debug] is [code]true[/code] for debug builds, [param path] is the target path for the exported project. [param flags] is only used when running a runnable profile, e.g. when using native run on Android.
 			</description>
 		</method>
 		<method name="_export_end" qualifiers="virtual">
@@ -28,40 +28,40 @@
 		</method>
 		<method name="_export_file" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="type" type="String" />
-			<argument index="2" name="features" type="PackedStringArray" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="type" type="String" />
+			<param index="2" name="features" type="PackedStringArray" />
 			<description>
-				Virtual method to be overridden by the user. Called for each exported file, providing arguments that can be used to identify the file. [code]path[/code] is the path of the file, [code]type[/code] is the [Resource] represented by the file (e.g. [PackedScene]) and [code]features[/code] is the list of features for the export.
+				Virtual method to be overridden by the user. Called for each exported file, providing arguments that can be used to identify the file. [param path] is the path of the file, [param type] is the [Resource] represented by the file (e.g. [PackedScene]) and [param features] is the list of features for the export.
 				Calling [method skip] inside this callback will make the file not included in the export.
 			</description>
 		</method>
 		<method name="add_file">
 			<return type="void" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="file" type="PackedByteArray" />
-			<argument index="2" name="remap" type="bool" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="file" type="PackedByteArray" />
+			<param index="2" name="remap" type="bool" />
 			<description>
-				Adds a custom file to be exported. [code]path[/code] is the virtual path that can be used to load the file, [code]file[/code] is the binary data of the file. If [code]remap[/code] is [code]true[/code], file will not be exported, but instead remapped to the given [code]path[/code].
+				Adds a custom file to be exported. [param path] is the virtual path that can be used to load the file, [param file] is the binary data of the file. If [param remap] is [code]true[/code], file will not be exported, but instead remapped to the given [param path].
 			</description>
 		</method>
 		<method name="add_ios_bundle_file">
 			<return type="void" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
-				Adds an iOS bundle file from the given [code]path[/code] to the exported project.
+				Adds an iOS bundle file from the given [param path] to the exported project.
 			</description>
 		</method>
 		<method name="add_ios_cpp_code">
 			<return type="void" />
-			<argument index="0" name="code" type="String" />
+			<param index="0" name="code" type="String" />
 			<description>
 				Adds a C++ code to the iOS export. The final code is created from the code appended by each active export plugin.
 			</description>
 		</method>
 		<method name="add_ios_embedded_framework">
 			<return type="void" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Adds a dynamic library (*.dylib, *.framework) to Linking Phase in iOS's Xcode project and embeds it into resulting binary.
 				[b]Note:[/b] For static libraries (*.a) works in same way as [code]add_ios_framework[/code].
@@ -70,47 +70,47 @@
 		</method>
 		<method name="add_ios_framework">
 			<return type="void" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Adds a static library (*.a) or dynamic library (*.dylib, *.framework) to Linking Phase in iOS's Xcode project.
 			</description>
 		</method>
 		<method name="add_ios_linker_flags">
 			<return type="void" />
-			<argument index="0" name="flags" type="String" />
+			<param index="0" name="flags" type="String" />
 			<description>
 				Adds linker flags for the iOS export.
 			</description>
 		</method>
 		<method name="add_ios_plist_content">
 			<return type="void" />
-			<argument index="0" name="plist_content" type="String" />
+			<param index="0" name="plist_content" type="String" />
 			<description>
 				Adds content for iOS Property List files.
 			</description>
 		</method>
 		<method name="add_ios_project_static_lib">
 			<return type="void" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
-				Adds a static lib from the given [code]path[/code] to the iOS project.
+				Adds a static lib from the given [param path] to the iOS project.
 			</description>
 		</method>
 		<method name="add_macos_plugin_file">
 			<return type="void" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
-				Adds file or directory matching [code]path[/code] to [code]PlugIns[/code] directory of macOS app bundle.
+				Adds file or directory matching [param path] to [code]PlugIns[/code] directory of macOS app bundle.
 				[b]Note:[/b] This is useful only for macOS exports.
 			</description>
 		</method>
 		<method name="add_shared_object">
 			<return type="void" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="tags" type="PackedStringArray" />
-			<argument index="2" name="target" type="String" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="tags" type="PackedStringArray" />
+			<param index="2" name="target" type="String" />
 			<description>
-				Adds a shared object or a directory containing only shared objects with the given [code]tags[/code] and destination [code]path[/code].
+				Adds a shared object or a directory containing only shared objects with the given [param tags] and destination [param path].
 				[b]Note:[/b] In case of macOS exports, those shared objects will be added to [code]Frameworks[/code] directory of app bundle.
 				In case of a directory code-sign will error if you place non code object in directory.
 			</description>
diff --git a/doc/classes/EditorFeatureProfile.xml b/doc/classes/EditorFeatureProfile.xml
index a6bdc294ac..e216059364 100644
--- a/doc/classes/EditorFeatureProfile.xml
+++ b/doc/classes/EditorFeatureProfile.xml
@@ -12,85 +12,85 @@
 	<methods>
 		<method name="get_feature_name">
 			<return type="String" />
-			<argument index="0" name="feature" type="int" enum="EditorFeatureProfile.Feature" />
+			<param index="0" name="feature" type="int" enum="EditorFeatureProfile.Feature" />
 			<description>
-				Returns the specified [code]feature[/code]'s human-readable name.
+				Returns the specified [param feature]'s human-readable name.
 			</description>
 		</method>
 		<method name="is_class_disabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="class_name" type="StringName" />
+			<param index="0" name="class_name" type="StringName" />
 			<description>
-				Returns [code]true[/code] if the class specified by [code]class_name[/code] is disabled. When disabled, the class won't appear in the Create New Node dialog.
+				Returns [code]true[/code] if the class specified by [param class_name] is disabled. When disabled, the class won't appear in the Create New Node dialog.
 			</description>
 		</method>
 		<method name="is_class_editor_disabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="class_name" type="StringName" />
+			<param index="0" name="class_name" type="StringName" />
 			<description>
-				Returns [code]true[/code] if editing for the class specified by [code]class_name[/code] is disabled. When disabled, the class will still appear in the Create New Node dialog but the inspector will be read-only when selecting a node that extends the class.
+				Returns [code]true[/code] if editing for the class specified by [param class_name] is disabled. When disabled, the class will still appear in the Create New Node dialog but the inspector will be read-only when selecting a node that extends the class.
 			</description>
 		</method>
 		<method name="is_class_property_disabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="class_name" type="StringName" />
-			<argument index="1" name="property" type="StringName" />
+			<param index="0" name="class_name" type="StringName" />
+			<param index="1" name="property" type="StringName" />
 			<description>
-				Returns [code]true[/code] if [code]property[/code] is disabled in the class specified by [code]class_name[/code]. When a property is disabled, it won't appear in the inspector when selecting a node that extends the class specified by [code]class_name[/code].
+				Returns [code]true[/code] if [param property] is disabled in the class specified by [param class_name]. When a property is disabled, it won't appear in the inspector when selecting a node that extends the class specified by [param class_name].
 			</description>
 		</method>
 		<method name="is_feature_disabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="feature" type="int" enum="EditorFeatureProfile.Feature" />
+			<param index="0" name="feature" type="int" enum="EditorFeatureProfile.Feature" />
 			<description>
-				Returns [code]true[/code] if the [code]feature[/code] is disabled. When a feature is disabled, it will disappear from the editor entirely.
+				Returns [code]true[/code] if the [param feature] is disabled. When a feature is disabled, it will disappear from the editor entirely.
 			</description>
 		</method>
 		<method name="load_from_file">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Loads an editor feature profile from a file. The file must follow the JSON format obtained by using the feature profile manager's [b]Export[/b] button or the [method save_to_file] method.
 			</description>
 		</method>
 		<method name="save_to_file">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Saves the editor feature profile to a file in JSON format. It can then be imported using the feature profile manager's [b]Import[/b] button or the [method load_from_file] method.
 			</description>
 		</method>
 		<method name="set_disable_class">
 			<return type="void" />
-			<argument index="0" name="class_name" type="StringName" />
-			<argument index="1" name="disable" type="bool" />
+			<param index="0" name="class_name" type="StringName" />
+			<param index="1" name="disable" type="bool" />
 			<description>
-				If [code]disable[/code] is [code]true[/code], disables the class specified by [code]class_name[/code]. When disabled, the class won't appear in the Create New Node dialog.
+				If [param disable] is [code]true[/code], disables the class specified by [param class_name]. When disabled, the class won't appear in the Create New Node dialog.
 			</description>
 		</method>
 		<method name="set_disable_class_editor">
 			<return type="void" />
-			<argument index="0" name="class_name" type="StringName" />
-			<argument index="1" name="disable" type="bool" />
+			<param index="0" name="class_name" type="StringName" />
+			<param index="1" name="disable" type="bool" />
 			<description>
-				If [code]disable[/code] is [code]true[/code], disables editing for the class specified by [code]class_name[/code]. When disabled, the class will still appear in the Create New Node dialog but the inspector will be read-only when selecting a node that extends the class.
+				If [param disable] is [code]true[/code], disables editing for the class specified by [param class_name]. When disabled, the class will still appear in the Create New Node dialog but the inspector will be read-only when selecting a node that extends the class.
 			</description>
 		</method>
 		<method name="set_disable_class_property">
 			<return type="void" />
-			<argument index="0" name="class_name" type="StringName" />
-			<argument index="1" name="property" type="StringName" />
-			<argument index="2" name="disable" type="bool" />
+			<param index="0" name="class_name" type="StringName" />
+			<param index="1" name="property" type="StringName" />
+			<param index="2" name="disable" type="bool" />
 			<description>
-				If [code]disable[/code] is [code]true[/code], disables editing for [code]property[/code] in the class specified by [code]class_name[/code]. When a property is disabled, it won't appear in the inspector when selecting a node that extends the class specified by [code]class_name[/code].
+				If [param disable] is [code]true[/code], disables editing for [param property] in the class specified by [param class_name]. When a property is disabled, it won't appear in the inspector when selecting a node that extends the class specified by [param class_name].
 			</description>
 		</method>
 		<method name="set_disable_feature">
 			<return type="void" />
-			<argument index="0" name="feature" type="int" enum="EditorFeatureProfile.Feature" />
-			<argument index="1" name="disable" type="bool" />
+			<param index="0" name="feature" type="int" enum="EditorFeatureProfile.Feature" />
+			<param index="1" name="disable" type="bool" />
 			<description>
-				If [code]disable[/code] is [code]true[/code], disables the editor feature specified in [code]feature[/code]. When a feature is disabled, it will disappear from the editor entirely.
+				If [param disable] is [code]true[/code], disables the editor feature specified in [param feature]. When a feature is disabled, it will disappear from the editor entirely.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/EditorFileDialog.xml b/doc/classes/EditorFileDialog.xml
index 6fd5abe369..891c8d7d92 100644
--- a/doc/classes/EditorFileDialog.xml
+++ b/doc/classes/EditorFileDialog.xml
@@ -10,12 +10,12 @@
 	<methods>
 		<method name="add_filter">
 			<return type="void" />
-			<argument index="0" name="filter" type="String" />
-			<argument index="1" name="description" type="String" default="&quot;&quot;" />
+			<param index="0" name="filter" type="String" />
+			<param index="1" name="description" type="String" default="&quot;&quot;" />
 			<description>
-				Adds a comma-delimited file name [code]filter[/code] option to the [EditorFileDialog] with an optional [code]description[/code], which restricts what files can be picked.
-				A [code]filter[/code] should be of the form [code]"filename.extension"[/code], where filename and extension can be [code]*[/code] to match any string. Filters starting with [code].[/code] (i.e. empty filenames) are not allowed.
-				For example, a [code]filter[/code] of [code]"*.tscn, *.scn"[/code] and a [code]description[/code] of [code]"Scenes"[/code] results in filter text "Scenes (*.tscn, *.scn)".
+				Adds a comma-delimited file name [param filter] option to the [EditorFileDialog] with an optional [param description], which restricts what files can be picked.
+				A [param filter] should be of the form [code]"filename.extension"[/code], where filename and extension can be [code]*[/code] to match any string. Filters starting with [code].[/code] (i.e. empty filenames) are not allowed.
+				For example, a [param filter] of [code]"*.tscn, *.scn"[/code] and a [param description] of [code]"Scenes"[/code] results in filter text "Scenes (*.tscn, *.scn)".
 			</description>
 		</method>
 		<method name="clear_filters">
@@ -68,19 +68,19 @@
 	</members>
 	<signals>
 		<signal name="dir_selected">
-			<argument index="0" name="dir" type="String" />
+			<param index="0" name="dir" type="String" />
 			<description>
 				Emitted when a directory is selected.
 			</description>
 		</signal>
 		<signal name="file_selected">
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Emitted when a file is selected.
 			</description>
 		</signal>
 		<signal name="files_selected">
-			<argument index="0" name="paths" type="PackedStringArray" />
+			<param index="0" name="paths" type="PackedStringArray" />
 			<description>
 				Emitted when multiple files are selected.
 			</description>
diff --git a/doc/classes/EditorFileSystem.xml b/doc/classes/EditorFileSystem.xml
index 402efba34a..e8df6ae7fe 100644
--- a/doc/classes/EditorFileSystem.xml
+++ b/doc/classes/EditorFileSystem.xml
@@ -12,7 +12,7 @@
 	<methods>
 		<method name="get_file_type" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Returns the resource type of the file, given the full path. This returns a string such as [code]"Resource"[/code] or [code]"GDScript"[/code], [i]not[/i] a file extension such as [code]".gd"[/code].
 			</description>
@@ -25,9 +25,9 @@
 		</method>
 		<method name="get_filesystem_path">
 			<return type="EditorFileSystemDirectory" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
-				Returns a view into the filesystem at [code]path[/code].
+				Returns a view into the filesystem at [param path].
 			</description>
 		</method>
 		<method name="get_scanning_progress" qualifiers="const">
@@ -44,7 +44,7 @@
 		</method>
 		<method name="reimport_files">
 			<return type="void" />
-			<argument index="0" name="files" type="PackedStringArray" />
+			<param index="0" name="files" type="PackedStringArray" />
 			<description>
 				Reimports a set of files. Call this if these files or their [code].import[/code] files were directly edited by script or an external program.
 				If the file type changed or the file was newly created, use [method update_file] or [method scan].
@@ -65,7 +65,7 @@
 		</method>
 		<method name="update_file">
 			<return type="void" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Add a file in an existing directory, or schedule file information to be updated on editor restart. Can be used to update text files saved by an external program.
 				This will not import the file. To reimport, call [method reimport_files] or [method scan] methods.
@@ -85,19 +85,19 @@
 			</description>
 		</signal>
 		<signal name="resources_reimported">
-			<argument index="0" name="resources" type="PackedStringArray" />
+			<param index="0" name="resources" type="PackedStringArray" />
 			<description>
 				Emitted if a resource is reimported.
 			</description>
 		</signal>
 		<signal name="resources_reload">
-			<argument index="0" name="resources" type="PackedStringArray" />
+			<param index="0" name="resources" type="PackedStringArray" />
 			<description>
 				Emitted if at least one resource is reloaded when the filesystem is scanned.
 			</description>
 		</signal>
 		<signal name="sources_changed">
-			<argument index="0" name="exist" type="bool" />
+			<param index="0" name="exist" type="bool" />
 			<description>
 				Emitted if the source of any imported file changed.
 			</description>
diff --git a/doc/classes/EditorFileSystemDirectory.xml b/doc/classes/EditorFileSystemDirectory.xml
index 98fea40a50..e9a0e3310c 100644
--- a/doc/classes/EditorFileSystemDirectory.xml
+++ b/doc/classes/EditorFileSystemDirectory.xml
@@ -11,23 +11,23 @@
 	<methods>
 		<method name="find_dir_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
-				Returns the index of the directory with name [code]name[/code] or [code]-1[/code] if not found.
+				Returns the index of the directory with name [param name] or [code]-1[/code] if not found.
 			</description>
 		</method>
 		<method name="find_file_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
-				Returns the index of the file with name [code]name[/code] or [code]-1[/code] if not found.
+				Returns the index of the file with name [param name] or [code]-1[/code] if not found.
 			</description>
 		</method>
 		<method name="get_file" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the name of the file at index [code]idx[/code].
+				Returns the name of the file at index [param idx].
 			</description>
 		</method>
 		<method name="get_file_count" qualifiers="const">
@@ -38,37 +38,37 @@
 		</method>
 		<method name="get_file_import_is_valid" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns [code]true[/code] if the file at index [code]idx[/code] imported properly.
+				Returns [code]true[/code] if the file at index [param idx] imported properly.
 			</description>
 		</method>
 		<method name="get_file_path" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the path to the file at index [code]idx[/code].
+				Returns the path to the file at index [param idx].
 			</description>
 		</method>
 		<method name="get_file_script_class_extends" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the base class of the script class defined in the file at index [code]idx[/code]. If the file doesn't define a script class using the [code]class_name[/code] syntax, this will return an empty string.
+				Returns the base class of the script class defined in the file at index [param idx]. If the file doesn't define a script class using the [code]class_name[/code] syntax, this will return an empty string.
 			</description>
 		</method>
 		<method name="get_file_script_class_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the name of the script class defined in the file at index [code]idx[/code]. If the file doesn't define a script class using the [code]class_name[/code] syntax, this will return an empty string.
+				Returns the name of the script class defined in the file at index [param idx]. If the file doesn't define a script class using the [code]class_name[/code] syntax, this will return an empty string.
 			</description>
 		</method>
 		<method name="get_file_type" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the resource type of the file at index [code]idx[/code]. This returns a string such as [code]"Resource"[/code] or [code]"GDScript"[/code], [i]not[/i] a file extension such as [code]".gd"[/code].
+				Returns the resource type of the file at index [param idx]. This returns a string such as [code]"Resource"[/code] or [code]"GDScript"[/code], [i]not[/i] a file extension such as [code]".gd"[/code].
 			</description>
 		</method>
 		<method name="get_name">
@@ -91,9 +91,9 @@
 		</method>
 		<method name="get_subdir">
 			<return type="EditorFileSystemDirectory" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the subdirectory at index [code]idx[/code].
+				Returns the subdirectory at index [param idx].
 			</description>
 		</method>
 		<method name="get_subdir_count" qualifiers="const">
diff --git a/doc/classes/EditorImportPlugin.xml b/doc/classes/EditorImportPlugin.xml
index 2e84d3094f..3555d2fd48 100644
--- a/doc/classes/EditorImportPlugin.xml
+++ b/doc/classes/EditorImportPlugin.xml
@@ -116,8 +116,8 @@
 	<methods>
 		<method name="_get_import_options" qualifiers="virtual const">
 			<return type="Array" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="preset_index" type="int" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="preset_index" type="int" />
 			<description>
 				Gets the options and default values for the preset at this index. Returns an Array of Dictionaries with the following keys: [code]name[/code], [code]default_value[/code], [code]property_hint[/code] (optional), [code]hint_string[/code] (optional), [code]usage[/code] (optional).
 			</description>
@@ -136,9 +136,9 @@
 		</method>
 		<method name="_get_option_visibility" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="option_name" type="StringName" />
-			<argument index="2" name="options" type="Dictionary" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="option_name" type="StringName" />
+			<param index="2" name="options" type="Dictionary" />
 			<description>
 				This method can be overridden to hide specific import options if conditions are met. This is mainly useful for hiding options that depend on others if one of them is disabled. For example:
 				[codeblocks]
@@ -174,7 +174,7 @@
 		</method>
 		<method name="_get_preset_name" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="preset_index" type="int" />
+			<param index="0" name="preset_index" type="int" />
 			<description>
 				Gets the name of the options preset at this index.
 			</description>
@@ -211,13 +211,13 @@
 		</method>
 		<method name="_import" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="source_file" type="String" />
-			<argument index="1" name="save_path" type="String" />
-			<argument index="2" name="options" type="Dictionary" />
-			<argument index="3" name="platform_variants" type="Array" />
-			<argument index="4" name="gen_files" type="Array" />
+			<param index="0" name="source_file" type="String" />
+			<param index="1" name="save_path" type="String" />
+			<param index="2" name="options" type="Dictionary" />
+			<param index="3" name="platform_variants" type="Array" />
+			<param index="4" name="gen_files" type="Array" />
 			<description>
-				Imports [code]source_file[/code] into [code]save_path[/code] with the import [code]options[/code] specified. The [code]platform_variants[/code] and [code]gen_files[/code] arrays will be modified by this function.
+				Imports [param source_file] into [param save_path] with the import [param options] specified. The [param platform_variants] and [param gen_files] arrays will be modified by this function.
 				This method must be overridden to do the actual importing work. See this class' description for an example of overriding this method.
 			</description>
 		</method>
diff --git a/doc/classes/EditorInspector.xml b/doc/classes/EditorInspector.xml
index 365e1f13a9..280a7bf34a 100644
--- a/doc/classes/EditorInspector.xml
+++ b/doc/classes/EditorInspector.xml
@@ -23,48 +23,48 @@
 			</description>
 		</signal>
 		<signal name="object_id_selected">
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Emitted when the Edit button of an [Object] has been pressed in the inspector. This is mainly used in the remote scene tree inspector.
 			</description>
 		</signal>
 		<signal name="property_deleted">
-			<argument index="0" name="property" type="String" />
+			<param index="0" name="property" type="String" />
 			<description>
 				Emitted when a property is removed from the inspector.
 			</description>
 		</signal>
 		<signal name="property_edited">
-			<argument index="0" name="property" type="String" />
+			<param index="0" name="property" type="String" />
 			<description>
 				Emitted when a property is edited in the inspector.
 			</description>
 		</signal>
 		<signal name="property_keyed">
-			<argument index="0" name="property" type="String" />
-			<argument index="1" name="value" type="Variant" />
-			<argument index="2" name="advance" type="bool" />
+			<param index="0" name="property" type="String" />
+			<param index="1" name="value" type="Variant" />
+			<param index="2" name="advance" type="bool" />
 			<description>
 				Emitted when a property is keyed in the inspector. Properties can be keyed by clicking the "key" icon next to a property when the Animation panel is toggled.
 			</description>
 		</signal>
 		<signal name="property_selected">
-			<argument index="0" name="property" type="String" />
+			<param index="0" name="property" type="String" />
 			<description>
 				Emitted when a property is selected in the inspector.
 			</description>
 		</signal>
 		<signal name="property_toggled">
-			<argument index="0" name="property" type="String" />
-			<argument index="1" name="checked" type="bool" />
+			<param index="0" name="property" type="String" />
+			<param index="1" name="checked" type="bool" />
 			<description>
 				Emitted when a boolean property is toggled in the inspector.
 				[b]Note:[/b] This signal is never emitted if the internal [code]autoclear[/code] property enabled. Since this property is always enabled in the editor inspector, this signal is never emitted by the editor itself.
 			</description>
 		</signal>
 		<signal name="resource_selected">
-			<argument index="0" name="resource" type="Resource" />
-			<argument index="1" name="path" type="String" />
+			<param index="0" name="resource" type="Resource" />
+			<param index="1" name="path" type="String" />
 			<description>
 				Emitted when a resource is selected in the inspector.
 			</description>
diff --git a/doc/classes/EditorInspectorPlugin.xml b/doc/classes/EditorInspectorPlugin.xml
index 572d5d9d84..c8a499260e 100644
--- a/doc/classes/EditorInspectorPlugin.xml
+++ b/doc/classes/EditorInspectorPlugin.xml
@@ -18,77 +18,77 @@
 	<methods>
 		<method name="_can_handle" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="object" type="Variant" />
+			<param index="0" name="object" type="Variant" />
 			<description>
 				Returns [code]true[/code] if this object can be handled by this plugin.
 			</description>
 		</method>
 		<method name="_parse_begin" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="object" type="Object" />
+			<param index="0" name="object" type="Object" />
 			<description>
-				Called to allow adding controls at the beginning of the property list for [code]object[/code].
+				Called to allow adding controls at the beginning of the property list for [param object].
 			</description>
 		</method>
 		<method name="_parse_category" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="object" type="Object" />
-			<argument index="1" name="category" type="String" />
+			<param index="0" name="object" type="Object" />
+			<param index="1" name="category" type="String" />
 			<description>
-				Called to allow adding controls at the beginning of a category in the property list for [code]object[/code].
+				Called to allow adding controls at the beginning of a category in the property list for [param object].
 			</description>
 		</method>
 		<method name="_parse_end" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="object" type="Object" />
+			<param index="0" name="object" type="Object" />
 			<description>
-				Called to allow adding controls at the end of the property list for [code]object[/code].
+				Called to allow adding controls at the end of the property list for [param object].
 			</description>
 		</method>
 		<method name="_parse_group" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="object" type="Object" />
-			<argument index="1" name="group" type="String" />
+			<param index="0" name="object" type="Object" />
+			<param index="1" name="group" type="String" />
 			<description>
-				Called to allow adding controls at the beginning of a group or a sub-group in the property list for [code]object[/code].
+				Called to allow adding controls at the beginning of a group or a sub-group in the property list for [param object].
 			</description>
 		</method>
 		<method name="_parse_property" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="object" type="Object" />
-			<argument index="1" name="type" type="int" />
-			<argument index="2" name="name" type="String" />
-			<argument index="3" name="hint_type" type="int" />
-			<argument index="4" name="hint_string" type="String" />
-			<argument index="5" name="usage_flags" type="int" />
-			<argument index="6" name="wide" type="bool" />
+			<param index="0" name="object" type="Object" />
+			<param index="1" name="type" type="int" />
+			<param index="2" name="name" type="String" />
+			<param index="3" name="hint_type" type="int" />
+			<param index="4" name="hint_string" type="String" />
+			<param index="5" name="usage_flags" type="int" />
+			<param index="6" name="wide" type="bool" />
 			<description>
-				Called to allow adding property-specific editors to the property list for [code]object[/code]. The added editor control must extend [EditorProperty]. Returning [code]true[/code] removes the built-in editor for this property, otherwise allows to insert a custom editor before the built-in one.
+				Called to allow adding property-specific editors to the property list for [param object]. The added editor control must extend [EditorProperty]. Returning [code]true[/code] removes the built-in editor for this property, otherwise allows to insert a custom editor before the built-in one.
 			</description>
 		</method>
 		<method name="add_custom_control">
 			<return type="void" />
-			<argument index="0" name="control" type="Control" />
+			<param index="0" name="control" type="Control" />
 			<description>
 				Adds a custom control, which is not necessarily a property editor.
 			</description>
 		</method>
 		<method name="add_property_editor">
 			<return type="void" />
-			<argument index="0" name="property" type="String" />
-			<argument index="1" name="editor" type="Control" />
-			<argument index="2" name="add_to_end" type="bool" default="false" />
+			<param index="0" name="property" type="String" />
+			<param index="1" name="editor" type="Control" />
+			<param index="2" name="add_to_end" type="bool" default="false" />
 			<description>
-				Adds a property editor for an individual property. The [code]editor[/code] control must extend [EditorProperty].
+				Adds a property editor for an individual property. The [param editor] control must extend [EditorProperty].
 			</description>
 		</method>
 		<method name="add_property_editor_for_multiple_properties">
 			<return type="void" />
-			<argument index="0" name="label" type="String" />
-			<argument index="1" name="properties" type="PackedStringArray" />
-			<argument index="2" name="editor" type="Control" />
+			<param index="0" name="label" type="String" />
+			<param index="1" name="properties" type="PackedStringArray" />
+			<param index="2" name="editor" type="Control" />
 			<description>
-				Adds an editor that allows modifying multiple properties. The [code]editor[/code] control must extend [EditorProperty].
+				Adds an editor that allows modifying multiple properties. The [param editor] control must extend [EditorProperty].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/EditorInterface.xml b/doc/classes/EditorInterface.xml
index cc2f33ce89..1dd53e1394 100644
--- a/doc/classes/EditorInterface.xml
+++ b/doc/classes/EditorInterface.xml
@@ -12,24 +12,24 @@
 	<methods>
 		<method name="edit_node">
 			<return type="void" />
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
 				Edits the given [Node]. The node will be also selected if it's inside the scene tree.
 			</description>
 		</method>
 		<method name="edit_resource">
 			<return type="void" />
-			<argument index="0" name="resource" type="Resource" />
+			<param index="0" name="resource" type="Resource" />
 			<description>
 				Edits the given [Resource]. If the resource is a [Script] you can also edit it with [method edit_script] to specify the line and column position.
 			</description>
 		</method>
 		<method name="edit_script">
 			<return type="void" />
-			<argument index="0" name="script" type="Script" />
-			<argument index="1" name="line" type="int" default="-1" />
-			<argument index="2" name="column" type="int" default="0" />
-			<argument index="3" name="grab_focus" type="bool" default="true" />
+			<param index="0" name="script" type="Script" />
+			<param index="1" name="line" type="int" default="-1" />
+			<param index="2" name="column" type="int" default="0" />
+			<param index="3" name="grab_focus" type="bool" default="true" />
 			<description>
 				Edits the given [Script]. The line and column on which to open the script can also be specified. The script will be open with the user-configured editor for the script's language which may be an external editor.
 			</description>
@@ -145,11 +145,11 @@
 		</method>
 		<method name="inspect_object">
 			<return type="void" />
-			<argument index="0" name="object" type="Object" />
-			<argument index="1" name="for_property" type="String" default="&quot;&quot;" />
-			<argument index="2" name="inspector_only" type="bool" default="false" />
+			<param index="0" name="object" type="Object" />
+			<param index="1" name="for_property" type="String" default="&quot;&quot;" />
+			<param index="2" name="inspector_only" type="bool" default="false" />
 			<description>
-				Shows the given property on the given [code]object[/code] in the editor's Inspector dock. If [code]inspector_only[/code] is [code]true[/code], plugins will not attempt to edit [code]object[/code].
+				Shows the given property on the given [param object] in the editor's Inspector dock. If [param inspector_only] is [code]true[/code], plugins will not attempt to edit [param object].
 			</description>
 		</method>
 		<method name="is_playing_scene" qualifiers="const">
@@ -160,22 +160,22 @@
 		</method>
 		<method name="is_plugin_enabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="plugin" type="String" />
+			<param index="0" name="plugin" type="String" />
 			<description>
-				Returns [code]true[/code] if the specified [code]plugin[/code] is enabled. The plugin name is the same as its directory name.
+				Returns [code]true[/code] if the specified [param plugin] is enabled. The plugin name is the same as its directory name.
 			</description>
 		</method>
 		<method name="make_mesh_previews">
 			<return type="Array" />
-			<argument index="0" name="meshes" type="Array" />
-			<argument index="1" name="preview_size" type="int" />
+			<param index="0" name="meshes" type="Array" />
+			<param index="1" name="preview_size" type="int" />
 			<description>
 				Returns mesh previews rendered at the given size as an [Array] of [Texture2D]s.
 			</description>
 		</method>
 		<method name="open_scene_from_path">
 			<return type="void" />
-			<argument index="0" name="scene_filepath" type="String" />
+			<param index="0" name="scene_filepath" type="String" />
 			<description>
 				Opens the scene at the given path.
 			</description>
@@ -188,7 +188,7 @@
 		</method>
 		<method name="play_custom_scene">
 			<return type="void" />
-			<argument index="0" name="scene_filepath" type="String" />
+			<param index="0" name="scene_filepath" type="String" />
 			<description>
 				Plays the scene specified by its filepath.
 			</description>
@@ -201,7 +201,7 @@
 		</method>
 		<method name="reload_scene_from_path">
 			<return type="void" />
-			<argument index="0" name="scene_filepath" type="String" />
+			<param index="0" name="scene_filepath" type="String" />
 			<description>
 				Reloads the scene at the given path.
 			</description>
@@ -214,30 +214,30 @@
 		</method>
 		<method name="save_scene_as">
 			<return type="void" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="with_preview" type="bool" default="true" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="with_preview" type="bool" default="true" />
 			<description>
-				Saves the scene as a file at [code]path[/code].
+				Saves the scene as a file at [param path].
 			</description>
 		</method>
 		<method name="select_file">
 			<return type="void" />
-			<argument index="0" name="file" type="String" />
+			<param index="0" name="file" type="String" />
 			<description>
-				Selects the file, with the path provided by [code]file[/code], in the FileSystem dock.
+				Selects the file, with the path provided by [param file], in the FileSystem dock.
 			</description>
 		</method>
 		<method name="set_main_screen_editor">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
-				Sets the editor's current main screen to the one specified in [code]name[/code]. [code]name[/code] must match the text of the tab in question exactly ([code]2D[/code], [code]3D[/code], [code]Script[/code], [code]AssetLib[/code]).
+				Sets the editor's current main screen to the one specified in [param name]. [param name] must match the text of the tab in question exactly ([code]2D[/code], [code]3D[/code], [code]Script[/code], [code]AssetLib[/code]).
 			</description>
 		</method>
 		<method name="set_plugin_enabled">
 			<return type="void" />
-			<argument index="0" name="plugin" type="String" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="plugin" type="String" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				Sets the enabled status of a plugin. The plugin name is the same as its directory name.
 			</description>
diff --git a/doc/classes/EditorNode3DGizmo.xml b/doc/classes/EditorNode3DGizmo.xml
index 2eec5310dc..9ee21fd63b 100644
--- a/doc/classes/EditorNode3DGizmo.xml
+++ b/doc/classes/EditorNode3DGizmo.xml
@@ -11,58 +11,58 @@
 	<methods>
 		<method name="_commit_handle" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="secondary" type="bool" />
-			<argument index="2" name="restore" type="Variant" />
-			<argument index="3" name="cancel" type="bool" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="secondary" type="bool" />
+			<param index="2" name="restore" type="Variant" />
+			<param index="3" name="cancel" type="bool" />
 			<description>
-				Override this method to commit a handle being edited (handles must have been previously added by [method add_handles]). This usually means creating an [UndoRedo] action for the change, using the current handle value as "do" and the [code]restore[/code] argument as "undo".
-				If the [code]cancel[/code] argument is [code]true[/code], the [code]restore[/code] value should be directly set, without any [UndoRedo] action.
-				The [code]secondary[/code] argument is [code]true[/code] when the committed handle is secondary (see [method add_handles] for more information).
+				Override this method to commit a handle being edited (handles must have been previously added by [method add_handles]). This usually means creating an [UndoRedo] action for the change, using the current handle value as "do" and the [param restore] argument as "undo".
+				If the [param cancel] argument is [code]true[/code], the [param restore] value should be directly set, without any [UndoRedo] action.
+				The [param secondary] argument is [code]true[/code] when the committed handle is secondary (see [method add_handles] for more information).
 			</description>
 		</method>
 		<method name="_commit_subgizmos" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="ids" type="PackedInt32Array" />
-			<argument index="1" name="restores" type="Transform3D[]" />
-			<argument index="2" name="cancel" type="bool" />
+			<param index="0" name="ids" type="PackedInt32Array" />
+			<param index="1" name="restores" type="Transform3D[]" />
+			<param index="2" name="cancel" type="bool" />
 			<description>
-				Override this method to commit a group of subgizmos being edited (see [method _subgizmos_intersect_ray] and [method _subgizmos_intersect_frustum]). This usually means creating an [UndoRedo] action for the change, using the current transforms as "do" and the [code]restore[/code] transforms as "undo".
-				If the [code]cancel[/code] argument is [code]true[/code], the [code]restore[/code] transforms should be directly set, without any [UndoRedo] action.
+				Override this method to commit a group of subgizmos being edited (see [method _subgizmos_intersect_ray] and [method _subgizmos_intersect_frustum]). This usually means creating an [UndoRedo] action for the change, using the current transforms as "do" and the [param restores] transforms as "undo".
+				If the [param cancel] argument is [code]true[/code], the [param restores] transforms should be directly set, without any [UndoRedo] action.
 			</description>
 		</method>
 		<method name="_get_handle_name" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="secondary" type="bool" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="secondary" type="bool" />
 			<description>
 				Override this method to return the name of an edited handle (handles must have been previously added by [method add_handles]). Handles can be named for reference to the user when editing.
-				The [code]secondary[/code] argument is [code]true[/code] when the requested handle is secondary (see [method add_handles] for more information).
+				The [param secondary] argument is [code]true[/code] when the requested handle is secondary (see [method add_handles] for more information).
 			</description>
 		</method>
 		<method name="_get_handle_value" qualifiers="virtual const">
 			<return type="Variant" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="secondary" type="bool" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="secondary" type="bool" />
 			<description>
 				Override this method to return the current value of a handle. This value will be requested at the start of an edit and used as the [code]restore[/code] argument in [method _commit_handle].
-				The [code]secondary[/code] argument is [code]true[/code] when the requested handle is secondary (see [method add_handles] for more information).
+				The [param secondary] argument is [code]true[/code] when the requested handle is secondary (see [method add_handles] for more information).
 			</description>
 		</method>
 		<method name="_get_subgizmo_transform" qualifiers="virtual const">
 			<return type="Transform3D" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Override this method to return the current transform of a subgizmo. This transform will be requested at the start of an edit and used as the [code]restore[/code] argument in [method _commit_subgizmos].
 			</description>
 		</method>
 		<method name="_is_handle_highlighted" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="secondary" type="bool" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="secondary" type="bool" />
 			<description>
 				Override this method to return [code]true[/code] whenever the given handle should be highlighted in the editor.
-				The [code]secondary[/code] argument is [code]true[/code] when the requested handle is secondary (see [method add_handles] for more information).
+				The [param secondary] argument is [code]true[/code] when the requested handle is secondary (see [method add_handles] for more information).
 			</description>
 		</method>
 		<method name="_redraw" qualifiers="virtual">
@@ -73,91 +73,91 @@
 		</method>
 		<method name="_set_handle" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="secondary" type="bool" />
-			<argument index="2" name="camera" type="Camera3D" />
-			<argument index="3" name="point" type="Vector2" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="secondary" type="bool" />
+			<param index="2" name="camera" type="Camera3D" />
+			<param index="3" name="point" type="Vector2" />
 			<description>
-				Override this method to update the node properties when the user drags a gizmo handle (previously added with [method add_handles]). The provided [code]point[/code] is the mouse position in screen coordinates and the [code]camera[/code] can be used to convert it to raycasts.
-				The [code]secondary[/code] argument is [code]true[/code] when the edited handle is secondary (see [method add_handles] for more information).
+				Override this method to update the node properties when the user drags a gizmo handle (previously added with [method add_handles]). The provided [param point] is the mouse position in screen coordinates and the [param camera] can be used to convert it to raycasts.
+				The [param secondary] argument is [code]true[/code] when the edited handle is secondary (see [method add_handles] for more information).
 			</description>
 		</method>
 		<method name="_set_subgizmo_transform" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="transform" type="Transform3D" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="transform" type="Transform3D" />
 			<description>
-				Override this method to update the node properties during subgizmo editing (see [method _subgizmos_intersect_ray] and [method _subgizmos_intersect_frustum]). The [code]transform[/code] is given in the Node3D's local coordinate system.
+				Override this method to update the node properties during subgizmo editing (see [method _subgizmos_intersect_ray] and [method _subgizmos_intersect_frustum]). The [param transform] is given in the Node3D's local coordinate system.
 			</description>
 		</method>
 		<method name="_subgizmos_intersect_frustum" qualifiers="virtual const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="camera" type="Camera3D" />
-			<argument index="1" name="frustum" type="Plane[]" />
+			<param index="0" name="camera" type="Camera3D" />
+			<param index="1" name="frustum" type="Plane[]" />
 			<description>
-				Override this method to allow selecting subgizmos using mouse drag box selection. Given a [code]camera[/code] and a [code]frustum[/code], this method should return which subgizmos are contained within the frustum. The [code]frustum[/code] argument consists of an [code]Array[/code] with all the [code]Plane[/code]s that make up the selection frustum. The returned value should contain a list of unique subgizmo identifiers, which can have any non-negative value and will be used in other virtual methods like [method _get_subgizmo_transform] or [method _commit_subgizmos].
+				Override this method to allow selecting subgizmos using mouse drag box selection. Given a [param camera] and a [param frustum], this method should return which subgizmos are contained within the frustum. The [param frustum] argument consists of an [code]Array[/code] with all the [code]Plane[/code]s that make up the selection frustum. The returned value should contain a list of unique subgizmo identifiers, which can have any non-negative value and will be used in other virtual methods like [method _get_subgizmo_transform] or [method _commit_subgizmos].
 			</description>
 		</method>
 		<method name="_subgizmos_intersect_ray" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="camera" type="Camera3D" />
-			<argument index="1" name="point" type="Vector2" />
+			<param index="0" name="camera" type="Camera3D" />
+			<param index="1" name="point" type="Vector2" />
 			<description>
-				Override this method to allow selecting subgizmos using mouse clicks. Given a [code]camera[/code] and a [code]point[/code] in screen coordinates, this method should return which subgizmo should be selected. The returned value should be a unique subgizmo identifier, which can have any non-negative value and will be used in other virtual methods like [method _get_subgizmo_transform] or [method _commit_subgizmos].
+				Override this method to allow selecting subgizmos using mouse clicks. Given a [param camera] and a [param point] in screen coordinates, this method should return which subgizmo should be selected. The returned value should be a unique subgizmo identifier, which can have any non-negative value and will be used in other virtual methods like [method _get_subgizmo_transform] or [method _commit_subgizmos].
 			</description>
 		</method>
 		<method name="add_collision_segments">
 			<return type="void" />
-			<argument index="0" name="segments" type="PackedVector3Array" />
+			<param index="0" name="segments" type="PackedVector3Array" />
 			<description>
-				Adds the specified [code]segments[/code] to the gizmo's collision shape for picking. Call this method during [method _redraw].
+				Adds the specified [param segments] to the gizmo's collision shape for picking. Call this method during [method _redraw].
 			</description>
 		</method>
 		<method name="add_collision_triangles">
 			<return type="void" />
-			<argument index="0" name="triangles" type="TriangleMesh" />
+			<param index="0" name="triangles" type="TriangleMesh" />
 			<description>
 				Adds collision triangles to the gizmo for picking. A [TriangleMesh] can be generated from a regular [Mesh] too. Call this method during [method _redraw].
 			</description>
 		</method>
 		<method name="add_handles">
 			<return type="void" />
-			<argument index="0" name="handles" type="PackedVector3Array" />
-			<argument index="1" name="material" type="Material" />
-			<argument index="2" name="ids" type="PackedInt32Array" />
-			<argument index="3" name="billboard" type="bool" default="false" />
-			<argument index="4" name="secondary" type="bool" default="false" />
-			<description>
-				Adds a list of handles (points) which can be used to edit the properties of the gizmo's Node3D. The [code]ids[/code] argument can be used to specify a custom identifier for each handle, if an empty [code]Array[/code] is passed, the ids will be assigned automatically from the [code]handles[/code] argument order.
-				The [code]secondary[/code] argument marks the added handles as secondary, meaning they will normally have less selection priority than regular handles. When the user is holding the shift key secondary handles will switch to have higher priority than regular handles. This change in priority can be used to place multiple handles at the same point while still giving the user control on their selection.
+			<param index="0" name="handles" type="PackedVector3Array" />
+			<param index="1" name="material" type="Material" />
+			<param index="2" name="ids" type="PackedInt32Array" />
+			<param index="3" name="billboard" type="bool" default="false" />
+			<param index="4" name="secondary" type="bool" default="false" />
+			<description>
+				Adds a list of handles (points) which can be used to edit the properties of the gizmo's Node3D. The [param ids] argument can be used to specify a custom identifier for each handle, if an empty [code]Array[/code] is passed, the ids will be assigned automatically from the [param handles] argument order.
+				The [param secondary] argument marks the added handles as secondary, meaning they will normally have lower selection priority than regular handles. When the user is holding the shift key secondary handles will switch to have higher priority than regular handles. This change in priority can be used to place multiple handles at the same point while still giving the user control on their selection.
 				There are virtual methods which will be called upon editing of these handles. Call this method during [method _redraw].
 			</description>
 		</method>
 		<method name="add_lines">
 			<return type="void" />
-			<argument index="0" name="lines" type="PackedVector3Array" />
-			<argument index="1" name="material" type="Material" />
-			<argument index="2" name="billboard" type="bool" default="false" />
-			<argument index="3" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="lines" type="PackedVector3Array" />
+			<param index="1" name="material" type="Material" />
+			<param index="2" name="billboard" type="bool" default="false" />
+			<param index="3" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
 				Adds lines to the gizmo (as sets of 2 points), with a given material. The lines are used for visualizing the gizmo. Call this method during [method _redraw].
 			</description>
 		</method>
 		<method name="add_mesh">
 			<return type="void" />
-			<argument index="0" name="mesh" type="Mesh" />
-			<argument index="1" name="material" type="Material" default="null" />
-			<argument index="2" name="transform" type="Transform3D" default="Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0)" />
-			<argument index="3" name="skeleton" type="SkinReference" default="null" />
+			<param index="0" name="mesh" type="Mesh" />
+			<param index="1" name="material" type="Material" default="null" />
+			<param index="2" name="transform" type="Transform3D" default="Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0)" />
+			<param index="3" name="skeleton" type="SkinReference" default="null" />
 			<description>
-				Adds a mesh to the gizmo with the specified [code]material[/code], local [code]transform[/code] and [code]skeleton[/code]. Call this method during [method _redraw].
+				Adds a mesh to the gizmo with the specified [param material], local [param transform] and [param skeleton]. Call this method during [method _redraw].
 			</description>
 		</method>
 		<method name="add_unscaled_billboard">
 			<return type="void" />
-			<argument index="0" name="material" type="Material" />
-			<argument index="1" name="default_scale" type="float" default="1" />
-			<argument index="2" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="material" type="Material" />
+			<param index="1" name="default_scale" type="float" default="1" />
+			<param index="2" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
 				Adds an unscaled billboard for visualization and selection. Call this method during [method _redraw].
 			</description>
@@ -188,23 +188,23 @@
 		</method>
 		<method name="is_subgizmo_selected" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns [code]true[/code] if the given subgizmo is currently selected. Can be used to highlight selected elements during [method _redraw].
 			</description>
 		</method>
 		<method name="set_hidden">
 			<return type="void" />
-			<argument index="0" name="hidden" type="bool" />
+			<param index="0" name="hidden" type="bool" />
 			<description>
 				Sets the gizmo's hidden state. If [code]true[/code], the gizmo will be hidden. If [code]false[/code], it will be shown.
 			</description>
 		</method>
 		<method name="set_spatial_node">
 			<return type="void" />
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
-				Sets the reference [Node3D] node for the gizmo. [code]node[/code] must inherit from [Node3D].
+				Sets the reference [Node3D] node for the gizmo. [param node] must inherit from [Node3D].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/EditorNode3DGizmoPlugin.xml b/doc/classes/EditorNode3DGizmoPlugin.xml
index d194786131..8a97dda9ae 100644
--- a/doc/classes/EditorNode3DGizmoPlugin.xml
+++ b/doc/classes/EditorNode3DGizmoPlugin.xml
@@ -19,32 +19,32 @@
 		</method>
 		<method name="_commit_handle" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="gizmo" type="EditorNode3DGizmo" />
-			<argument index="1" name="handle_id" type="int" />
-			<argument index="2" name="secondary" type="bool" />
-			<argument index="3" name="restore" type="Variant" />
-			<argument index="4" name="cancel" type="bool" />
-			<description>
-				Override this method to commit a handle being edited (handles must have been previously added by [method EditorNode3DGizmo.add_handles] during [method _redraw]). This usually means creating an [UndoRedo] action for the change, using the current handle value as "do" and the [code]restore[/code] argument as "undo".
-				If the [code]cancel[/code] argument is [code]true[/code], the [code]restore[/code] value should be directly set, without any [UndoRedo] action.
-				The [code]secondary[/code] argument is [code]true[/code] when the committed handle is secondary (see [method EditorNode3DGizmo.add_handles] for more information).
+			<param index="0" name="gizmo" type="EditorNode3DGizmo" />
+			<param index="1" name="handle_id" type="int" />
+			<param index="2" name="secondary" type="bool" />
+			<param index="3" name="restore" type="Variant" />
+			<param index="4" name="cancel" type="bool" />
+			<description>
+				Override this method to commit a handle being edited (handles must have been previously added by [method EditorNode3DGizmo.add_handles] during [method _redraw]). This usually means creating an [UndoRedo] action for the change, using the current handle value as "do" and the [param restore] argument as "undo".
+				If the [param cancel] argument is [code]true[/code], the [param restore] value should be directly set, without any [UndoRedo] action.
+				The [param secondary] argument is [code]true[/code] when the committed handle is secondary (see [method EditorNode3DGizmo.add_handles] for more information).
 				Called for this plugin's active gizmos.
 			</description>
 		</method>
 		<method name="_commit_subgizmos" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="gizmo" type="EditorNode3DGizmo" />
-			<argument index="1" name="ids" type="PackedInt32Array" />
-			<argument index="2" name="restores" type="Transform3D[]" />
-			<argument index="3" name="cancel" type="bool" />
+			<param index="0" name="gizmo" type="EditorNode3DGizmo" />
+			<param index="1" name="ids" type="PackedInt32Array" />
+			<param index="2" name="restores" type="Transform3D[]" />
+			<param index="3" name="cancel" type="bool" />
 			<description>
-				Override this method to commit a group of subgizmos being edited (see [method _subgizmos_intersect_ray] and [method _subgizmos_intersect_frustum]). This usually means creating an [UndoRedo] action for the change, using the current transforms as "do" and the [code]restore[/code] transforms as "undo".
-				If the [code]cancel[/code] argument is [code]true[/code], the [code]restore[/code] transforms should be directly set, without any [UndoRedo] action. As with all subgizmo methods, transforms are given in local space respect to the gizmo's Node3D. Called for this plugin's active gizmos.
+				Override this method to commit a group of subgizmos being edited (see [method _subgizmos_intersect_ray] and [method _subgizmos_intersect_frustum]). This usually means creating an [UndoRedo] action for the change, using the current transforms as "do" and the [param restores] transforms as "undo".
+				If the [param cancel] argument is [code]true[/code], the [param restores] transforms should be directly set, without any [UndoRedo] action. As with all subgizmo methods, transforms are given in local space respect to the gizmo's Node3D. Called for this plugin's active gizmos.
 			</description>
 		</method>
 		<method name="_create_gizmo" qualifiers="virtual const">
 			<return type="EditorNode3DGizmo" />
-			<argument index="0" name="for_node_3d" type="Node3D" />
+			<param index="0" name="for_node_3d" type="Node3D" />
 			<description>
 				Override this method to return a custom [EditorNode3DGizmo] for the spatial nodes of your choice, return [code]null[/code] for the rest of nodes. See also [method _has_gizmo].
 			</description>
@@ -57,21 +57,21 @@
 		</method>
 		<method name="_get_handle_name" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="gizmo" type="EditorNode3DGizmo" />
-			<argument index="1" name="handle_id" type="int" />
-			<argument index="2" name="secondary" type="bool" />
+			<param index="0" name="gizmo" type="EditorNode3DGizmo" />
+			<param index="1" name="handle_id" type="int" />
+			<param index="2" name="secondary" type="bool" />
 			<description>
-				Override this method to provide gizmo's handle names. The [code]secondary[/code] argument is [code]true[/code] when the requested handle is secondary (see [method EditorNode3DGizmo.add_handles] for more information). Called for this plugin's active gizmos.
+				Override this method to provide gizmo's handle names. The [param secondary] argument is [code]true[/code] when the requested handle is secondary (see [method EditorNode3DGizmo.add_handles] for more information). Called for this plugin's active gizmos.
 			</description>
 		</method>
 		<method name="_get_handle_value" qualifiers="virtual const">
 			<return type="Variant" />
-			<argument index="0" name="gizmo" type="EditorNode3DGizmo" />
-			<argument index="1" name="handle_id" type="int" />
-			<argument index="2" name="secondary" type="bool" />
+			<param index="0" name="gizmo" type="EditorNode3DGizmo" />
+			<param index="1" name="handle_id" type="int" />
+			<param index="2" name="secondary" type="bool" />
 			<description>
 				Override this method to return the current value of a handle. This value will be requested at the start of an edit and used as the [code]restore[/code] argument in [method _commit_handle].
-				The [code]secondary[/code] argument is [code]true[/code] when the requested handle is secondary (see [method EditorNode3DGizmo.add_handles] for more information).
+				The [param secondary] argument is [code]true[/code] when the requested handle is secondary (see [method EditorNode3DGizmo.add_handles] for more information).
 				Called for this plugin's active gizmos.
 			</description>
 		</method>
@@ -84,26 +84,26 @@
 		</method>
 		<method name="_get_subgizmo_transform" qualifiers="virtual const">
 			<return type="Transform3D" />
-			<argument index="0" name="gizmo" type="EditorNode3DGizmo" />
-			<argument index="1" name="subgizmo_id" type="int" />
+			<param index="0" name="gizmo" type="EditorNode3DGizmo" />
+			<param index="1" name="subgizmo_id" type="int" />
 			<description>
 				Override this method to return the current transform of a subgizmo. As with all subgizmo methods, the transform should be in local space respect to the gizmo's Node3D. This transform will be requested at the start of an edit and used in the [code]restore[/code] argument in [method _commit_subgizmos]. Called for this plugin's active gizmos.
 			</description>
 		</method>
 		<method name="_has_gizmo" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="for_node_3d" type="Node3D" />
+			<param index="0" name="for_node_3d" type="Node3D" />
 			<description>
 				Override this method to define which Node3D nodes have a gizmo from this plugin. Whenever a [Node3D] node is added to a scene this method is called, if it returns [code]true[/code] the node gets a generic [EditorNode3DGizmo] assigned and is added to this plugin's list of active gizmos.
 			</description>
 		</method>
 		<method name="_is_handle_highlighted" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="gizmo" type="EditorNode3DGizmo" />
-			<argument index="1" name="handle_id" type="int" />
-			<argument index="2" name="secondary" type="bool" />
+			<param index="0" name="gizmo" type="EditorNode3DGizmo" />
+			<param index="1" name="handle_id" type="int" />
+			<param index="2" name="secondary" type="bool" />
 			<description>
-				Override this method to return [code]true[/code] whenever to given handle should be highlighted in the editor. The [code]secondary[/code] argument is [code]true[/code] when the requested handle is secondary (see [method EditorNode3DGizmo.add_handles] for more information). Called for this plugin's active gizmos.
+				Override this method to return [code]true[/code] whenever to given handle should be highlighted in the editor. The [param secondary] argument is [code]true[/code] when the requested handle is secondary (see [method EditorNode3DGizmo.add_handles] for more information). Called for this plugin's active gizmos.
 			</description>
 		</method>
 		<method name="_is_selectable_when_hidden" qualifiers="virtual const">
@@ -114,64 +114,64 @@
 		</method>
 		<method name="_redraw" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="gizmo" type="EditorNode3DGizmo" />
+			<param index="0" name="gizmo" type="EditorNode3DGizmo" />
 			<description>
 				Override this method to add all the gizmo elements whenever a gizmo update is requested. It's common to call [method EditorNode3DGizmo.clear] at the beginning of this method and then add visual elements depending on the node's properties.
 			</description>
 		</method>
 		<method name="_set_handle" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="gizmo" type="EditorNode3DGizmo" />
-			<argument index="1" name="handle_id" type="int" />
-			<argument index="2" name="secondary" type="bool" />
-			<argument index="3" name="camera" type="Camera3D" />
-			<argument index="4" name="screen_pos" type="Vector2" />
-			<description>
-				Override this method to update the node's properties when the user drags a gizmo handle (previously added with [method EditorNode3DGizmo.add_handles]). The provided [code]point[/code] is the mouse position in screen coordinates and the [code]camera[/code] can be used to convert it to raycasts.
-				The [code]secondary[/code] argument is [code]true[/code] when the edited handle is secondary (see [method EditorNode3DGizmo.add_handles] for more information).
+			<param index="0" name="gizmo" type="EditorNode3DGizmo" />
+			<param index="1" name="handle_id" type="int" />
+			<param index="2" name="secondary" type="bool" />
+			<param index="3" name="camera" type="Camera3D" />
+			<param index="4" name="screen_pos" type="Vector2" />
+			<description>
+				Override this method to update the node's properties when the user drags a gizmo handle (previously added with [method EditorNode3DGizmo.add_handles]). The provided [param screen_pos] is the mouse position in screen coordinates and the [param camera] can be used to convert it to raycasts.
+				The [param secondary] argument is [code]true[/code] when the edited handle is secondary (see [method EditorNode3DGizmo.add_handles] for more information).
 				Called for this plugin's active gizmos.
 			</description>
 		</method>
 		<method name="_set_subgizmo_transform" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="gizmo" type="EditorNode3DGizmo" />
-			<argument index="1" name="subgizmo_id" type="int" />
-			<argument index="2" name="transform" type="Transform3D" />
+			<param index="0" name="gizmo" type="EditorNode3DGizmo" />
+			<param index="1" name="subgizmo_id" type="int" />
+			<param index="2" name="transform" type="Transform3D" />
 			<description>
-				Override this method to update the node properties during subgizmo editing (see [method _subgizmos_intersect_ray] and [method _subgizmos_intersect_frustum]). The [code]transform[/code] is given in the Node3D's local coordinate system.  Called for this plugin's active gizmos.
+				Override this method to update the node properties during subgizmo editing (see [method _subgizmos_intersect_ray] and [method _subgizmos_intersect_frustum]). The [param transform] is given in the Node3D's local coordinate system.  Called for this plugin's active gizmos.
 			</description>
 		</method>
 		<method name="_subgizmos_intersect_frustum" qualifiers="virtual const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="gizmo" type="EditorNode3DGizmo" />
-			<argument index="1" name="camera" type="Camera3D" />
-			<argument index="2" name="frustum_planes" type="Plane[]" />
+			<param index="0" name="gizmo" type="EditorNode3DGizmo" />
+			<param index="1" name="camera" type="Camera3D" />
+			<param index="2" name="frustum_planes" type="Plane[]" />
 			<description>
-				Override this method to allow selecting subgizmos using mouse drag box selection. Given a [code]camera[/code] and a [code]frustum[/code], this method should return which subgizmos are contained within the frustum. The [code]frustum[/code] argument consists of an [code]Array[/code] with all the [code]Plane[/code]s that make up the selection frustum. The returned value should contain a list of unique subgizmo identifiers, these identifiers can have any non-negative value and will be used in other virtual methods like [method _get_subgizmo_transform] or [method _commit_subgizmos].  Called for this plugin's active gizmos.
+				Override this method to allow selecting subgizmos using mouse drag box selection. Given a [param camera] and [param frustum_planes], this method should return which subgizmos are contained within the frustums. The [param frustum_planes] argument consists of an [code]Array[/code] with all the [code]Plane[/code]s that make up the selection frustum. The returned value should contain a list of unique subgizmo identifiers, these identifiers can have any non-negative value and will be used in other virtual methods like [method _get_subgizmo_transform] or [method _commit_subgizmos].  Called for this plugin's active gizmos.
 			</description>
 		</method>
 		<method name="_subgizmos_intersect_ray" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="gizmo" type="EditorNode3DGizmo" />
-			<argument index="1" name="camera" type="Camera3D" />
-			<argument index="2" name="screen_pos" type="Vector2" />
+			<param index="0" name="gizmo" type="EditorNode3DGizmo" />
+			<param index="1" name="camera" type="Camera3D" />
+			<param index="2" name="screen_pos" type="Vector2" />
 			<description>
-				Override this method to allow selecting subgizmos using mouse clicks. Given a [code]camera[/code] and a [code]point[/code] in screen coordinates, this method should return which subgizmo should be selected. The returned value should be a unique subgizmo identifier, which can have any non-negative value and will be used in other virtual methods like [method _get_subgizmo_transform] or [method _commit_subgizmos]. Called for this plugin's active gizmos.
+				Override this method to allow selecting subgizmos using mouse clicks. Given a [param camera] and a [param screen_pos] in screen coordinates, this method should return which subgizmo should be selected. The returned value should be a unique subgizmo identifier, which can have any non-negative value and will be used in other virtual methods like [method _get_subgizmo_transform] or [method _commit_subgizmos]. Called for this plugin's active gizmos.
 			</description>
 		</method>
 		<method name="add_material">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="material" type="StandardMaterial3D" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="material" type="StandardMaterial3D" />
 			<description>
 				Adds a new material to the internal material list for the plugin. It can then be accessed with [method get_material]. Should not be overridden.
 			</description>
 		</method>
 		<method name="create_handle_material">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="billboard" type="bool" default="false" />
-			<argument index="2" name="texture" type="Texture2D" default="null" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="billboard" type="bool" default="false" />
+			<param index="2" name="texture" type="Texture2D" default="null" />
 			<description>
 				Creates a handle material with its variants (selected and/or editable) and adds them to the internal material list. They can then be accessed with [method get_material] and used in [method EditorNode3DGizmo.add_handles]. Should not be overridden.
 				You can optionally provide a texture to use instead of the default icon.
@@ -179,29 +179,29 @@
 		</method>
 		<method name="create_icon_material">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="texture" type="Texture2D" />
-			<argument index="2" name="on_top" type="bool" default="false" />
-			<argument index="3" name="color" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="texture" type="Texture2D" />
+			<param index="2" name="on_top" type="bool" default="false" />
+			<param index="3" name="color" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
 				Creates an icon material with its variants (selected and/or editable) and adds them to the internal material list. They can then be accessed with [method get_material] and used in [method EditorNode3DGizmo.add_unscaled_billboard]. Should not be overridden.
 			</description>
 		</method>
 		<method name="create_material">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="color" type="Color" />
-			<argument index="2" name="billboard" type="bool" default="false" />
-			<argument index="3" name="on_top" type="bool" default="false" />
-			<argument index="4" name="use_vertex_color" type="bool" default="false" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="color" type="Color" />
+			<param index="2" name="billboard" type="bool" default="false" />
+			<param index="3" name="on_top" type="bool" default="false" />
+			<param index="4" name="use_vertex_color" type="bool" default="false" />
 			<description>
 				Creates an unshaded material with its variants (selected and/or editable) and adds them to the internal material list. They can then be accessed with [method get_material] and used in [method EditorNode3DGizmo.add_mesh] and [method EditorNode3DGizmo.add_lines]. Should not be overridden.
 			</description>
 		</method>
 		<method name="get_material">
 			<return type="StandardMaterial3D" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="gizmo" type="EditorNode3DGizmo" default="null" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="gizmo" type="EditorNode3DGizmo" default="null" />
 			<description>
 				Gets material from the internal list of materials. If an [EditorNode3DGizmo] is provided, it will try to get the corresponding variant (selected and/or editable).
 			</description>
diff --git a/doc/classes/EditorPlugin.xml b/doc/classes/EditorPlugin.xml
index 2930c2ec22..5a1037aebe 100644
--- a/doc/classes/EditorPlugin.xml
+++ b/doc/classes/EditorPlugin.xml
@@ -38,7 +38,7 @@
 		</method>
 		<method name="_edit" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="object" type="Variant" />
+			<param index="0" name="object" type="Variant" />
 			<description>
 				This function is used for plugins that edit specific object types (nodes or resources). It requests the editor to edit the given object.
 			</description>
@@ -51,7 +51,7 @@
 		</method>
 		<method name="_forward_3d_draw_over_viewport" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="viewport_control" type="Control" />
+			<param index="0" name="viewport_control" type="Control" />
 			<description>
 				Called by the engine when the 3D editor's viewport is updated. Use the [code]overlay[/code] [Control] for drawing. You can update the viewport manually by calling [method update_overlays].
 				[codeblocks]
@@ -89,7 +89,7 @@
 		</method>
 		<method name="_forward_3d_force_draw_over_viewport" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="viewport_control" type="Control" />
+			<param index="0" name="viewport_control" type="Control" />
 			<description>
 				This method is the same as [method _forward_3d_draw_over_viewport], except it draws on top of everything. Useful when you need an extra layer that shows over anything else.
 				You need to enable calling of this method by using [method set_force_draw_over_forwarding_enabled].
@@ -97,10 +97,10 @@
 		</method>
 		<method name="_forward_3d_gui_input" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="viewport_camera" type="Camera3D" />
-			<argument index="1" name="event" type="InputEvent" />
+			<param index="0" name="viewport_camera" type="Camera3D" />
+			<param index="1" name="event" type="InputEvent" />
 			<description>
-				Called when there is a root node in the current edited scene, [method _handles] is implemented and an [InputEvent] happens in the 3D viewport. Intercepts the [InputEvent], if [code]return true[/code] [EditorPlugin] consumes the [code]event[/code], otherwise forwards [code]event[/code] to other Editor classes. Example:
+				Called when there is a root node in the current edited scene, [method _handles] is implemented and an [InputEvent] happens in the 3D viewport. Intercepts the [InputEvent], if [code]return true[/code] [EditorPlugin] consumes the [param event], otherwise forwards [param event] to other Editor classes. Example:
 				[codeblocks]
 				[gdscript]
 				# Prevents the InputEvent to reach other Editor classes.
@@ -134,7 +134,7 @@
 		</method>
 		<method name="_forward_canvas_draw_over_viewport" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="viewport_control" type="Control" />
+			<param index="0" name="viewport_control" type="Control" />
 			<description>
 				Called by the engine when the 2D editor's viewport is updated. Use the [code]overlay[/code] [Control] for drawing. You can update the viewport manually by calling [method update_overlays].
 				[codeblocks]
@@ -172,7 +172,7 @@
 		</method>
 		<method name="_forward_canvas_force_draw_over_viewport" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="viewport_control" type="Control" />
+			<param index="0" name="viewport_control" type="Control" />
 			<description>
 				This method is the same as [method _forward_canvas_draw_over_viewport], except it draws on top of everything. Useful when you need an extra layer that shows over anything else.
 				You need to enable calling of this method by using [method set_force_draw_over_forwarding_enabled].
@@ -180,9 +180,9 @@
 		</method>
 		<method name="_forward_canvas_gui_input" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="event" type="InputEvent" />
+			<param index="0" name="event" type="InputEvent" />
 			<description>
-				Called when there is a root node in the current edited scene, [method _handles] is implemented and an [InputEvent] happens in the 2D viewport. Intercepts the [InputEvent], if [code]return true[/code] [EditorPlugin] consumes the [code]event[/code], otherwise forwards [code]event[/code] to other Editor classes. Example:
+				Called when there is a root node in the current edited scene, [method _handles] is implemented and an [InputEvent] happens in the 2D viewport. Intercepts the [InputEvent], if [code]return true[/code] [EditorPlugin] consumes the [param event], otherwise forwards [param event] to other Editor classes. Example:
 				[codeblocks]
 				[gdscript]
 				# Prevents the InputEvent to reach other Editor classes.
@@ -274,7 +274,7 @@
 		</method>
 		<method name="_get_window_layout" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="configuration" type="ConfigFile" />
+			<param index="0" name="configuration" type="ConfigFile" />
 			<description>
 				Override this method to provide the GUI layout of the plugin or any other data you want to be stored. This is used to save the project's editor layout when [method queue_save_layout] is called or the editor layout was changed (for example changing the position of a dock). The data is stored in the [code]editor_layout.cfg[/code] file in the editor metadata directory.
 				Use [method _set_window_layout] to restore your saved layout.
@@ -287,7 +287,7 @@
 		</method>
 		<method name="_handles" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="object" type="Variant" />
+			<param index="0" name="object" type="Variant" />
 			<description>
 				Implement this function if your plugin edits a specific type of object (Resource or Node). If you return [code]true[/code], then you will get the functions [method _edit] and [method _make_visible] called when the editor requests them. If you have declared the methods [method _forward_canvas_gui_input] and [method _forward_3d_gui_input] these will be called too.
 			</description>
@@ -322,7 +322,7 @@
 		</method>
 		<method name="_make_visible" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="visible" type="bool" />
+			<param index="0" name="visible" type="bool" />
 			<description>
 				This function will be called when the editor is requested to become visible. It is used for plugins that edit a specific object type.
 				Remember that you have to manage the visibility of all your editor controls manually.
@@ -336,7 +336,7 @@
 		</method>
 		<method name="_set_state" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="state" type="Dictionary" />
+			<param index="0" name="state" type="Dictionary" />
 			<description>
 				Restore the state saved by [method _get_state]. This method is called when the current scene tab is changed in the editor.
 				[b]Note:[/b] Your plugin must implement [method _get_plugin_name], otherwise it will not be recognized and this method will not be called.
@@ -349,9 +349,9 @@
 		</method>
 		<method name="_set_window_layout" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="configuration" type="ConfigFile" />
+			<param index="0" name="configuration" type="ConfigFile" />
 			<description>
-				Restore the plugin GUI layout and data saved by [method _get_window_layout]. This method is called for every plugin on editor startup. Use the provided [code]configuration[/code] file to read your saved data.
+				Restore the plugin GUI layout and data saved by [method _get_window_layout]. This method is called for every plugin on editor startup. Use the provided [param configuration] file to read your saved data.
 				[codeblock]
 				func _set_window_layout(configuration):
 				    $Window.position = configuration.get_value("MyPlugin", "window_position", Vector2())
@@ -361,24 +361,24 @@
 		</method>
 		<method name="add_autoload_singleton">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="path" type="String" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="path" type="String" />
 			<description>
-				Adds a script at [code]path[/code] to the Autoload list as [code]name[/code].
+				Adds a script at [param path] to the Autoload list as [param name].
 			</description>
 		</method>
 		<method name="add_control_to_bottom_panel">
 			<return type="Button" />
-			<argument index="0" name="control" type="Control" />
-			<argument index="1" name="title" type="String" />
+			<param index="0" name="control" type="Control" />
+			<param index="1" name="title" type="String" />
 			<description>
 				Adds a control to the bottom panel (together with Output, Debug, Animation, etc). Returns a reference to the button added. It's up to you to hide/show the button when needed. When your plugin is deactivated, make sure to remove your custom control with [method remove_control_from_bottom_panel] and free it with [method Node.queue_free].
 			</description>
 		</method>
 		<method name="add_control_to_container">
 			<return type="void" />
-			<argument index="0" name="container" type="int" enum="EditorPlugin.CustomControlContainer" />
-			<argument index="1" name="control" type="Control" />
+			<param index="0" name="container" type="int" enum="EditorPlugin.CustomControlContainer" />
+			<param index="1" name="control" type="Control" />
 			<description>
 				Adds a custom control to a container (see [enum CustomControlContainer]). There are many locations where custom controls can be added in the editor UI.
 				Please remember that you have to manage the visibility of your custom controls yourself (and likely hide it after adding it).
@@ -387,8 +387,8 @@
 		</method>
 		<method name="add_control_to_dock">
 			<return type="void" />
-			<argument index="0" name="slot" type="int" enum="EditorPlugin.DockSlot" />
-			<argument index="1" name="control" type="Control" />
+			<param index="0" name="slot" type="int" enum="EditorPlugin.DockSlot" />
+			<param index="1" name="control" type="Control" />
 			<description>
 				Adds the control to a specific dock slot (see [enum DockSlot] for options).
 				If the dock is repositioned and as long as the plugin is active, the editor will save the dock position on further sessions.
@@ -397,10 +397,10 @@
 		</method>
 		<method name="add_custom_type">
 			<return type="void" />
-			<argument index="0" name="type" type="String" />
-			<argument index="1" name="base" type="String" />
-			<argument index="2" name="script" type="Script" />
-			<argument index="3" name="icon" type="Texture2D" />
+			<param index="0" name="type" type="String" />
+			<param index="1" name="base" type="String" />
+			<param index="2" name="script" type="Script" />
+			<param index="3" name="icon" type="Texture2D" />
 			<description>
 				Adds a custom type, which will appear in the list of nodes or resources. An icon can be optionally passed.
 				When a given node or resource is selected, the base type will be instantiated (e.g. "Node3D", "Control", "Resource"), then the script will be loaded and set to this object.
@@ -410,14 +410,14 @@
 		</method>
 		<method name="add_debugger_plugin">
 			<return type="void" />
-			<argument index="0" name="script" type="Script" />
+			<param index="0" name="script" type="Script" />
 			<description>
 				Adds a [Script] as debugger plugin to the Debugger. The script must extend [EditorDebuggerPlugin].
 			</description>
 		</method>
 		<method name="add_export_plugin">
 			<return type="void" />
-			<argument index="0" name="plugin" type="EditorExportPlugin" />
+			<param index="0" name="plugin" type="EditorExportPlugin" />
 			<description>
 				Registers a new [EditorExportPlugin]. Export plugins are used to perform tasks when the project is being exported.
 				See [method add_inspector_plugin] for an example of how to register a plugin.
@@ -425,18 +425,18 @@
 		</method>
 		<method name="add_import_plugin">
 			<return type="void" />
-			<argument index="0" name="importer" type="EditorImportPlugin" />
-			<argument index="1" name="first_priority" type="bool" default="false" />
+			<param index="0" name="importer" type="EditorImportPlugin" />
+			<param index="1" name="first_priority" type="bool" default="false" />
 			<description>
 				Registers a new [EditorImportPlugin]. Import plugins are used to import custom and unsupported assets as a custom [Resource] type.
-				If [code]first_priority[/code] is [code]true[/code], the new import plugin is inserted first in the list and takes precedence over pre-existing plugins.
+				If [param first_priority] is [code]true[/code], the new import plugin is inserted first in the list and takes precedence over pre-existing plugins.
 				[b]Note:[/b] If you want to import custom 3D asset formats use [method add_scene_format_importer_plugin] instead.
 				See [method add_inspector_plugin] for an example of how to register a plugin.
 			</description>
 		</method>
 		<method name="add_inspector_plugin">
 			<return type="void" />
-			<argument index="0" name="plugin" type="EditorInspectorPlugin" />
+			<param index="0" name="plugin" type="EditorInspectorPlugin" />
 			<description>
 				Registers a new [EditorInspectorPlugin]. Inspector plugins are used to extend [EditorInspector] and provide custom configuration tools for your object's properties.
 				[b]Note:[/b] Always use [method remove_inspector_plugin] to remove the registered [EditorInspectorPlugin] when your [EditorPlugin] is disabled to prevent leaks and an unexpected behavior.
@@ -456,25 +456,25 @@
 		</method>
 		<method name="add_scene_format_importer_plugin">
 			<return type="void" />
-			<argument index="0" name="scene_format_importer" type="EditorSceneFormatImporter" />
-			<argument index="1" name="first_priority" type="bool" default="false" />
+			<param index="0" name="scene_format_importer" type="EditorSceneFormatImporter" />
+			<param index="1" name="first_priority" type="bool" default="false" />
 			<description>
 				Registers a new [EditorSceneFormatImporter]. Scene importers are used to import custom 3D asset formats as scenes.
-				If [code]first_priority[/code] is [code]true[/code], the new import plugin is inserted first in the list and takes precedence over pre-existing plugins.
+				If [param first_priority] is [code]true[/code], the new import plugin is inserted first in the list and takes precedence over pre-existing plugins.
 			</description>
 		</method>
 		<method name="add_scene_post_import_plugin">
 			<return type="void" />
-			<argument index="0" name="scene_import_plugin" type="EditorScenePostImportPlugin" />
-			<argument index="1" name="first_priority" type="bool" default="false" />
+			<param index="0" name="scene_import_plugin" type="EditorScenePostImportPlugin" />
+			<param index="1" name="first_priority" type="bool" default="false" />
 			<description>
 				Add a [EditorScenePostImportPlugin]. These plugins allow customizing the import process of 3D assets by adding new options to the import dialogs.
-				If [code]first_priority[/code] is [code]true[/code], the new import plugin is inserted first in the list and takes precedence over pre-existing plugins.
+				If [param first_priority] is [code]true[/code], the new import plugin is inserted first in the list and takes precedence over pre-existing plugins.
 			</description>
 		</method>
 		<method name="add_spatial_gizmo_plugin">
 			<return type="void" />
-			<argument index="0" name="plugin" type="EditorNode3DGizmoPlugin" />
+			<param index="0" name="plugin" type="EditorNode3DGizmoPlugin" />
 			<description>
 				Registers a new [EditorNode3DGizmoPlugin]. Gizmo plugins are used to add custom gizmos to the 3D preview viewport for a [Node3D].
 				See [method add_inspector_plugin] for an example of how to register a plugin.
@@ -482,30 +482,30 @@
 		</method>
 		<method name="add_tool_menu_item">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="callable" type="Callable" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="callable" type="Callable" />
 			<description>
-				Adds a custom menu item to [b]Project &gt; Tools[/b] named [code]name[/code]. When clicked, the provided [code]callable[/code] will be called.
+				Adds a custom menu item to [b]Project &gt; Tools[/b] named [param name]. When clicked, the provided [param callable] will be called.
 			</description>
 		</method>
 		<method name="add_tool_submenu_item">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="submenu" type="PopupMenu" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="submenu" type="PopupMenu" />
 			<description>
-				Adds a custom [PopupMenu] submenu under [b]Project &gt; Tools &gt;[/b] [code]name[/code]. Use [code]remove_tool_menu_item(name)[/code] on plugin clean up to remove the menu.
+				Adds a custom [PopupMenu] submenu under [b]Project &gt; Tools &gt;[/b] [param name]. Use [code]remove_tool_menu_item(name)[/code] on plugin clean up to remove the menu.
 			</description>
 		</method>
 		<method name="add_translation_parser_plugin">
 			<return type="void" />
-			<argument index="0" name="parser" type="EditorTranslationParserPlugin" />
+			<param index="0" name="parser" type="EditorTranslationParserPlugin" />
 			<description>
 				Registers a custom translation parser plugin for extracting translatable strings from custom files.
 			</description>
 		</method>
 		<method name="add_undo_redo_inspector_hook_callback">
 			<return type="void" />
-			<argument index="0" name="callable" type="Callable" />
+			<param index="0" name="callable" type="Callable" />
 			<description>
 				Hooks a callback into the undo/redo action creation when a property is modified in the inspector. This allows, for example, to save other properties that may be lost when a given property is modified.
 				The callback should have 4 arguments: [Object] [code]undo_redo[/code], [Object] [code]modified_object[/code], [String] [code]property[/code] and [Variant] [code]new_value[/code]. They are, respectively, the [UndoRedo] object used by the inspector, the currently modified object, the name of the modified property and the new value the property is about to take.
@@ -545,7 +545,7 @@
 		</method>
 		<method name="make_bottom_panel_item_visible">
 			<return type="void" />
-			<argument index="0" name="item" type="Control" />
+			<param index="0" name="item" type="Control" />
 			<description>
 				Makes a specific item in the bottom panel visible.
 			</description>
@@ -558,106 +558,106 @@
 		</method>
 		<method name="remove_autoload_singleton">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
-				Removes an Autoload [code]name[/code] from the list.
+				Removes an Autoload [param name] from the list.
 			</description>
 		</method>
 		<method name="remove_control_from_bottom_panel">
 			<return type="void" />
-			<argument index="0" name="control" type="Control" />
+			<param index="0" name="control" type="Control" />
 			<description>
 				Removes the control from the bottom panel. You have to manually [method Node.queue_free] the control.
 			</description>
 		</method>
 		<method name="remove_control_from_container">
 			<return type="void" />
-			<argument index="0" name="container" type="int" enum="EditorPlugin.CustomControlContainer" />
-			<argument index="1" name="control" type="Control" />
+			<param index="0" name="container" type="int" enum="EditorPlugin.CustomControlContainer" />
+			<param index="1" name="control" type="Control" />
 			<description>
 				Removes the control from the specified container. You have to manually [method Node.queue_free] the control.
 			</description>
 		</method>
 		<method name="remove_control_from_docks">
 			<return type="void" />
-			<argument index="0" name="control" type="Control" />
+			<param index="0" name="control" type="Control" />
 			<description>
 				Removes the control from the dock. You have to manually [method Node.queue_free] the control.
 			</description>
 		</method>
 		<method name="remove_custom_type">
 			<return type="void" />
-			<argument index="0" name="type" type="String" />
+			<param index="0" name="type" type="String" />
 			<description>
 				Removes a custom type added by [method add_custom_type].
 			</description>
 		</method>
 		<method name="remove_debugger_plugin">
 			<return type="void" />
-			<argument index="0" name="script" type="Script" />
+			<param index="0" name="script" type="Script" />
 			<description>
 				Removes the debugger plugin with given script from the Debugger.
 			</description>
 		</method>
 		<method name="remove_export_plugin">
 			<return type="void" />
-			<argument index="0" name="plugin" type="EditorExportPlugin" />
+			<param index="0" name="plugin" type="EditorExportPlugin" />
 			<description>
 				Removes an export plugin registered by [method add_export_plugin].
 			</description>
 		</method>
 		<method name="remove_import_plugin">
 			<return type="void" />
-			<argument index="0" name="importer" type="EditorImportPlugin" />
+			<param index="0" name="importer" type="EditorImportPlugin" />
 			<description>
 				Removes an import plugin registered by [method add_import_plugin].
 			</description>
 		</method>
 		<method name="remove_inspector_plugin">
 			<return type="void" />
-			<argument index="0" name="plugin" type="EditorInspectorPlugin" />
+			<param index="0" name="plugin" type="EditorInspectorPlugin" />
 			<description>
 				Removes an inspector plugin registered by [method add_import_plugin]
 			</description>
 		</method>
 		<method name="remove_scene_format_importer_plugin">
 			<return type="void" />
-			<argument index="0" name="scene_format_importer" type="EditorSceneFormatImporter" />
+			<param index="0" name="scene_format_importer" type="EditorSceneFormatImporter" />
 			<description>
 				Removes a scene format importer registered by [method add_scene_format_importer_plugin].
 			</description>
 		</method>
 		<method name="remove_scene_post_import_plugin">
 			<return type="void" />
-			<argument index="0" name="scene_import_plugin" type="EditorScenePostImportPlugin" />
+			<param index="0" name="scene_import_plugin" type="EditorScenePostImportPlugin" />
 			<description>
 				Remove the [EditorScenePostImportPlugin], added with [method add_scene_post_import_plugin].
 			</description>
 		</method>
 		<method name="remove_spatial_gizmo_plugin">
 			<return type="void" />
-			<argument index="0" name="plugin" type="EditorNode3DGizmoPlugin" />
+			<param index="0" name="plugin" type="EditorNode3DGizmoPlugin" />
 			<description>
 				Removes a gizmo plugin registered by [method add_spatial_gizmo_plugin].
 			</description>
 		</method>
 		<method name="remove_tool_menu_item">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
-				Removes a menu [code]name[/code] from [b]Project &gt; Tools[/b].
+				Removes a menu [param name] from [b]Project &gt; Tools[/b].
 			</description>
 		</method>
 		<method name="remove_translation_parser_plugin">
 			<return type="void" />
-			<argument index="0" name="parser" type="EditorTranslationParserPlugin" />
+			<param index="0" name="parser" type="EditorTranslationParserPlugin" />
 			<description>
 				Removes a custom translation parser plugin registered by [method add_translation_parser_plugin].
 			</description>
 		</method>
 		<method name="remove_undo_redo_inspector_hook_callback">
 			<return type="void" />
-			<argument index="0" name="callable" type="Callable" />
+			<param index="0" name="callable" type="Callable" />
 			<description>
 				Removes a callback previsously added by [method add_undo_redo_inspector_hook_callback].
 			</description>
@@ -683,7 +683,7 @@
 	</methods>
 	<signals>
 		<signal name="main_screen_changed">
-			<argument index="0" name="screen_name" type="String" />
+			<param index="0" name="screen_name" type="String" />
 			<description>
 				Emitted when user changes the workspace ([b]2D[/b], [b]3D[/b], [b]Script[/b], [b]AssetLib[/b]). Also works with custom screens defined by plugins.
 			</description>
@@ -693,18 +693,18 @@
 			</description>
 		</signal>
 		<signal name="resource_saved">
-			<argument index="0" name="resource" type="Resource" />
+			<param index="0" name="resource" type="Resource" />
 			<description>
 			</description>
 		</signal>
 		<signal name="scene_changed">
-			<argument index="0" name="scene_root" type="Node" />
+			<param index="0" name="scene_root" type="Node" />
 			<description>
 				Emitted when the scene is changed in the editor. The argument will return the root node of the scene that has just become active. If this scene is new and empty, the argument will be [code]null[/code].
 			</description>
 		</signal>
 		<signal name="scene_closed">
-			<argument index="0" name="filepath" type="String" />
+			<param index="0" name="filepath" type="String" />
 			<description>
 				Emitted when user closes a scene. The argument is file path to a closed scene.
 			</description>
@@ -729,7 +729,7 @@
 		</constant>
 		<constant name="CONTAINER_CANVAS_EDITOR_BOTTOM" value="8" enum="CustomControlContainer">
 		</constant>
-		<constant name="CONTAINER_PROPERTY_EDITOR_BOTTOM" value="9" enum="CustomControlContainer">
+		<constant name="CONTAINER_INSPECTOR_BOTTOM" value="9" enum="CustomControlContainer">
 		</constant>
 		<constant name="CONTAINER_PROJECT_SETTING_TAB_LEFT" value="10" enum="CustomControlContainer">
 		</constant>
diff --git a/doc/classes/EditorProperty.xml b/doc/classes/EditorProperty.xml
index 586458bd28..4a6a0e7226 100644
--- a/doc/classes/EditorProperty.xml
+++ b/doc/classes/EditorProperty.xml
@@ -17,19 +17,19 @@
 		</method>
 		<method name="add_focusable">
 			<return type="void" />
-			<argument index="0" name="control" type="Control" />
+			<param index="0" name="control" type="Control" />
 			<description>
 				If any of the controls added can gain keyboard focus, add it here. This ensures that focus will be restored if the inspector is refreshed.
 			</description>
 		</method>
 		<method name="emit_changed">
 			<return type="void" />
-			<argument index="0" name="property" type="StringName" />
-			<argument index="1" name="value" type="Variant" />
-			<argument index="2" name="field" type="StringName" default="&amp;&quot;&quot;" />
-			<argument index="3" name="changing" type="bool" default="false" />
+			<param index="0" name="property" type="StringName" />
+			<param index="1" name="value" type="Variant" />
+			<param index="2" name="field" type="StringName" default="&amp;&quot;&quot;" />
+			<param index="3" name="changing" type="bool" default="false" />
 			<description>
-				If one or several properties have changed, this must be called. [code]field[/code] is used in case your editor can modify fields separately (as an example, Vector3.x). The [code]changing[/code] argument avoids the editor requesting this property to be refreshed (leave as [code]false[/code] if unsure).
+				If one or several properties have changed, this must be called. [param field] is used in case your editor can modify fields separately (as an example, Vector3.x). The [param changing] argument avoids the editor requesting this property to be refreshed (leave as [code]false[/code] if unsure).
 			</description>
 		</method>
 		<method name="get_edited_object">
@@ -52,9 +52,9 @@
 		</method>
 		<method name="set_bottom_editor">
 			<return type="void" />
-			<argument index="0" name="editor" type="Control" />
+			<param index="0" name="editor" type="Control" />
 			<description>
-				Puts the [code]editor[/code] control below the property label. The control must be previously added using [method Node.add_child].
+				Puts the [param editor] control below the property label. The control must be previously added using [method Node.add_child].
 			</description>
 		</method>
 		<method name="update_property">
@@ -88,77 +88,77 @@
 	</members>
 	<signals>
 		<signal name="multiple_properties_changed">
-			<argument index="0" name="properties" type="PackedStringArray" />
-			<argument index="1" name="value" type="Array" />
+			<param index="0" name="properties" type="PackedStringArray" />
+			<param index="1" name="value" type="Array" />
 			<description>
 				Emit it if you want multiple properties modified at the same time. Do not use if added via [method EditorInspectorPlugin._parse_property].
 			</description>
 		</signal>
 		<signal name="object_id_selected">
-			<argument index="0" name="property" type="StringName" />
-			<argument index="1" name="id" type="int" />
+			<param index="0" name="property" type="StringName" />
+			<param index="1" name="id" type="int" />
 			<description>
 				Used by sub-inspectors. Emit it if what was selected was an Object ID.
 			</description>
 		</signal>
 		<signal name="property_can_revert_changed">
-			<argument index="0" name="property" type="StringName" />
-			<argument index="1" name="can_revert" type="bool" />
+			<param index="0" name="property" type="StringName" />
+			<param index="1" name="can_revert" type="bool" />
 			<description>
 				Emitted when the revertability (i.e., whether it has a non-default value and thus is displayed with a revert icon) of a property has changed.
 			</description>
 		</signal>
 		<signal name="property_changed">
-			<argument index="0" name="property" type="StringName" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="property" type="StringName" />
+			<param index="1" name="value" type="Variant" />
 			<description>
 				Do not emit this manually, use the [method emit_changed] method instead.
 			</description>
 		</signal>
 		<signal name="property_checked">
-			<argument index="0" name="property" type="StringName" />
-			<argument index="1" name="checked" type="bool" />
+			<param index="0" name="property" type="StringName" />
+			<param index="1" name="checked" type="bool" />
 			<description>
 				Emitted when a property was checked. Used internally.
 			</description>
 		</signal>
 		<signal name="property_deleted">
-			<argument index="0" name="property" type="StringName" />
+			<param index="0" name="property" type="StringName" />
 			<description>
 				Emitted when a property was deleted. Used internally.
 			</description>
 		</signal>
 		<signal name="property_keyed">
-			<argument index="0" name="property" type="StringName" />
+			<param index="0" name="property" type="StringName" />
 			<description>
 				Emit it if you want to add this value as an animation key (check for keying being enabled first).
 			</description>
 		</signal>
 		<signal name="property_keyed_with_value">
-			<argument index="0" name="property" type="StringName" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="property" type="StringName" />
+			<param index="1" name="value" type="Variant" />
 			<description>
 				Emit it if you want to key a property with a single value.
 			</description>
 		</signal>
 		<signal name="property_pinned">
-			<argument index="0" name="property" type="StringName" />
-			<argument index="1" name="pinned" type="bool" />
+			<param index="0" name="property" type="StringName" />
+			<param index="1" name="pinned" type="bool" />
 			<description>
 				Emit it if you want to mark (or unmark) the value of a property for being saved regardless of being equal to the default value.
 				The default value is the one the property will get when the node is just instantiated and can come from an ancestor scene in the inheritance/instancing chain, a script or a builtin class.
 			</description>
 		</signal>
 		<signal name="resource_selected">
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="resource" type="Resource" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="resource" type="Resource" />
 			<description>
 				If you want a sub-resource to be edited, emit this signal with the resource.
 			</description>
 		</signal>
 		<signal name="selected">
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="focusable_idx" type="int" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="focusable_idx" type="int" />
 			<description>
 				Emitted when selected. Used internally.
 			</description>
diff --git a/doc/classes/EditorResourceConversionPlugin.xml b/doc/classes/EditorResourceConversionPlugin.xml
index 8a4aee0eef..c40bb1d91e 100644
--- a/doc/classes/EditorResourceConversionPlugin.xml
+++ b/doc/classes/EditorResourceConversionPlugin.xml
@@ -9,7 +9,7 @@
 	<methods>
 		<method name="_convert" qualifiers="virtual const">
 			<return type="Resource" />
-			<argument index="0" name="resource" type="Resource" />
+			<param index="0" name="resource" type="Resource" />
 			<description>
 			</description>
 		</method>
@@ -20,7 +20,7 @@
 		</method>
 		<method name="_handles" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="resource" type="Resource" />
+			<param index="0" name="resource" type="Resource" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/EditorResourcePicker.xml b/doc/classes/EditorResourcePicker.xml
index aa8f75d764..c88a7b75b0 100644
--- a/doc/classes/EditorResourcePicker.xml
+++ b/doc/classes/EditorResourcePicker.xml
@@ -12,16 +12,16 @@
 	<methods>
 		<method name="_handle_menu_selected" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				This virtual method can be implemented to handle context menu items not handled by default. See [method _set_create_options].
 			</description>
 		</method>
 		<method name="_set_create_options" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="menu_node" type="Object" />
+			<param index="0" name="menu_node" type="Object" />
 			<description>
-				This virtual method is called when updating the context menu of [EditorResourcePicker]. Implement this method to override the "New ..." items with your own options. [code]menu_node[/code] is a reference to the [PopupMenu] node.
+				This virtual method is called when updating the context menu of [EditorResourcePicker]. Implement this method to override the "New ..." items with your own options. [param menu_node] is a reference to the [PopupMenu] node.
 				[b]Note:[/b] Implement [method _handle_menu_selected] to handle these custom items.
 			</description>
 		</method>
@@ -33,7 +33,7 @@
 		</method>
 		<method name="set_toggle_pressed">
 			<return type="void" />
-			<argument index="0" name="pressed" type="bool" />
+			<param index="0" name="pressed" type="bool" />
 			<description>
 				Sets the toggle mode state for the main button. Works only if [member toggle_mode] is set to [code]true[/code].
 			</description>
@@ -55,16 +55,16 @@
 	</members>
 	<signals>
 		<signal name="resource_changed">
-			<argument index="0" name="resource" type="Resource" />
+			<param index="0" name="resource" type="Resource" />
 			<description>
 				Emitted when the value of the edited resource was changed.
 			</description>
 		</signal>
 		<signal name="resource_selected">
-			<argument index="0" name="resource" type="Resource" />
-			<argument index="1" name="edit" type="bool" />
+			<param index="0" name="resource" type="Resource" />
+			<param index="1" name="edit" type="bool" />
 			<description>
-				Emitted when the resource value was set and user clicked to edit it. When [code]edit[/code] is [code]true[/code], the signal was caused by the context menu "Edit" option.
+				Emitted when the resource value was set and user clicked to edit it. When [param edit] is [code]true[/code], the signal was caused by the context menu "Edit" option.
 			</description>
 		</signal>
 	</signals>
diff --git a/doc/classes/EditorResourcePreview.xml b/doc/classes/EditorResourcePreview.xml
index 5df797f516..68ead12c03 100644
--- a/doc/classes/EditorResourcePreview.xml
+++ b/doc/classes/EditorResourcePreview.xml
@@ -12,43 +12,43 @@
 	<methods>
 		<method name="add_preview_generator">
 			<return type="void" />
-			<argument index="0" name="generator" type="EditorResourcePreviewGenerator" />
+			<param index="0" name="generator" type="EditorResourcePreviewGenerator" />
 			<description>
 				Create an own, custom preview generator.
 			</description>
 		</method>
 		<method name="check_for_invalidation">
 			<return type="void" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Check if the resource changed, if so, it will be invalidated and the corresponding signal emitted.
 			</description>
 		</method>
 		<method name="queue_edited_resource_preview">
 			<return type="void" />
-			<argument index="0" name="resource" type="Resource" />
-			<argument index="1" name="receiver" type="Object" />
-			<argument index="2" name="receiver_func" type="StringName" />
-			<argument index="3" name="userdata" type="Variant" />
+			<param index="0" name="resource" type="Resource" />
+			<param index="1" name="receiver" type="Object" />
+			<param index="2" name="receiver_func" type="StringName" />
+			<param index="3" name="userdata" type="Variant" />
 			<description>
-				Queue the [code]resource[/code] being edited for preview. Once the preview is ready, the [code]receiver[/code]'s [code]receiver_func[/code] will be called. The [code]receiver_func[/code] must take the following four arguments: [String] path, [Texture2D] preview, [Texture2D] thumbnail_preview, [Variant] userdata. [code]userdata[/code] can be anything, and will be returned when [code]receiver_func[/code] is called.
-				[b]Note:[/b] If it was not possible to create the preview the [code]receiver_func[/code] will still be called, but the preview will be null.
+				Queue the [param resource] being edited for preview. Once the preview is ready, the [param receiver]'s [param receiver_func] will be called. The [param receiver_func] must take the following four arguments: [String] path, [Texture2D] preview, [Texture2D] thumbnail_preview, [Variant] userdata. [param userdata] can be anything, and will be returned when [param receiver_func] is called.
+				[b]Note:[/b] If it was not possible to create the preview the [param receiver_func] will still be called, but the preview will be null.
 			</description>
 		</method>
 		<method name="queue_resource_preview">
 			<return type="void" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="receiver" type="Object" />
-			<argument index="2" name="receiver_func" type="StringName" />
-			<argument index="3" name="userdata" type="Variant" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="receiver" type="Object" />
+			<param index="2" name="receiver_func" type="StringName" />
+			<param index="3" name="userdata" type="Variant" />
 			<description>
-				Queue a resource file located at [code]path[/code] for preview. Once the preview is ready, the [code]receiver[/code]'s [code]receiver_func[/code] will be called. The [code]receiver_func[/code] must take the following four arguments: [String] path, [Texture2D] preview, [Texture2D] thumbnail_preview, [Variant] userdata. [code]userdata[/code] can be anything, and will be returned when [code]receiver_func[/code] is called.
-				[b]Note:[/b] If it was not possible to create the preview the [code]receiver_func[/code] will still be called, but the preview will be null.
+				Queue a resource file located at [param path] for preview. Once the preview is ready, the [param receiver]'s [param receiver_func] will be called. The [param receiver_func] must take the following four arguments: [String] path, [Texture2D] preview, [Texture2D] thumbnail_preview, [Variant] userdata. [param userdata] can be anything, and will be returned when [param receiver_func] is called.
+				[b]Note:[/b] If it was not possible to create the preview the [param receiver_func] will still be called, but the preview will be null.
 			</description>
 		</method>
 		<method name="remove_preview_generator">
 			<return type="void" />
-			<argument index="0" name="generator" type="EditorResourcePreviewGenerator" />
+			<param index="0" name="generator" type="EditorResourcePreviewGenerator" />
 			<description>
 				Removes a custom preview generator.
 			</description>
@@ -56,9 +56,9 @@
 	</methods>
 	<signals>
 		<signal name="preview_invalidated">
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
-				Emitted if a preview was invalidated (changed). [code]path[/code] corresponds to the path of the preview.
+				Emitted if a preview was invalidated (changed). [param path] corresponds to the path of the preview.
 			</description>
 		</signal>
 	</signals>
diff --git a/doc/classes/EditorResourcePreviewGenerator.xml b/doc/classes/EditorResourcePreviewGenerator.xml
index d8b4a86a97..75628beae9 100644
--- a/doc/classes/EditorResourcePreviewGenerator.xml
+++ b/doc/classes/EditorResourcePreviewGenerator.xml
@@ -18,8 +18,8 @@
 		</method>
 		<method name="_generate" qualifiers="virtual const">
 			<return type="Texture2D" />
-			<argument index="0" name="resource" type="Resource" />
-			<argument index="1" name="size" type="Vector2i" />
+			<param index="0" name="resource" type="Resource" />
+			<param index="1" name="size" type="Vector2i" />
 			<description>
 				Generate a preview from a given resource with the specified size. This must always be implemented.
 				Returning an empty texture is an OK way to fail and let another generator take care.
@@ -28,8 +28,8 @@
 		</method>
 		<method name="_generate_from_path" qualifiers="virtual const">
 			<return type="Texture2D" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="size" type="Vector2i" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="size" type="Vector2i" />
 			<description>
 				Generate a preview directly from a path with the specified size. Implementing this is optional, as default code will load and call [method _generate].
 				Returning an empty texture is an OK way to fail and let another generator take care.
@@ -45,9 +45,9 @@
 		</method>
 		<method name="_handles" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="type" type="String" />
+			<param index="0" name="type" type="String" />
 			<description>
-				Returns [code]true[/code] if your generator supports the resource of type [code]type[/code].
+				Returns [code]true[/code] if your generator supports the resource of type [param type].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/EditorSceneFormatImporter.xml b/doc/classes/EditorSceneFormatImporter.xml
index 0290d7207d..6de9c2c5dc 100644
--- a/doc/classes/EditorSceneFormatImporter.xml
+++ b/doc/classes/EditorSceneFormatImporter.xml
@@ -22,24 +22,24 @@
 		</method>
 		<method name="_get_import_options" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_option_visibility" qualifiers="virtual const">
 			<return type="Variant" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="for_animation" type="bool" />
-			<argument index="2" name="option" type="String" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="for_animation" type="bool" />
+			<param index="2" name="option" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="_import_scene" qualifiers="virtual">
 			<return type="Object" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="flags" type="int" />
-			<argument index="2" name="options" type="Dictionary" />
-			<argument index="3" name="bake_fps" type="int" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="flags" type="int" />
+			<param index="2" name="options" type="Dictionary" />
+			<param index="3" name="bake_fps" type="int" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/EditorScenePostImport.xml b/doc/classes/EditorScenePostImport.xml
index 3adf814947..395b094bf2 100644
--- a/doc/classes/EditorScenePostImport.xml
+++ b/doc/classes/EditorScenePostImport.xml
@@ -57,7 +57,7 @@
 	<methods>
 		<method name="_post_import" qualifiers="virtual">
 			<return type="Object" />
-			<argument index="0" name="scene" type="Node" />
+			<param index="0" name="scene" type="Node" />
 			<description>
 				Called after the scene was imported. This method must return the modified version of the scene.
 			</description>
diff --git a/doc/classes/EditorScenePostImportPlugin.xml b/doc/classes/EditorScenePostImportPlugin.xml
index 44d644411d..3ea0e53c01 100644
--- a/doc/classes/EditorScenePostImportPlugin.xml
+++ b/doc/classes/EditorScenePostImportPlugin.xml
@@ -11,91 +11,91 @@
 	<methods>
 		<method name="_get_import_options" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Override to add general import options. These will appear in the main import dock on the editor. Add options via [method add_import_option] and [method add_import_option_advanced].
 			</description>
 		</method>
 		<method name="_get_internal_import_options" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="category" type="int" />
+			<param index="0" name="category" type="int" />
 			<description>
 				Override to add internal import options. These will appear in the 3D scene import dialog. Add options via [method add_import_option] and [method add_import_option_advanced].
 			</description>
 		</method>
 		<method name="_get_internal_option_update_view_required" qualifiers="virtual const">
 			<return type="Variant" />
-			<argument index="0" name="category" type="int" />
-			<argument index="1" name="option" type="String" />
+			<param index="0" name="category" type="int" />
+			<param index="1" name="option" type="String" />
 			<description>
 				Return true whether updating the 3D view of the import dialog needs to be updated if an option has changed.
 			</description>
 		</method>
 		<method name="_get_internal_option_visibility" qualifiers="virtual const">
 			<return type="Variant" />
-			<argument index="0" name="category" type="int" />
-			<argument index="1" name="for_animation" type="bool" />
-			<argument index="2" name="option" type="String" />
+			<param index="0" name="category" type="int" />
+			<param index="1" name="for_animation" type="bool" />
+			<param index="2" name="option" type="String" />
 			<description>
 				Return true or false whether a given option should be visible. Return null to ignore.
 			</description>
 		</method>
 		<method name="_get_option_visibility" qualifiers="virtual const">
 			<return type="Variant" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="for_animation" type="bool" />
-			<argument index="2" name="option" type="String" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="for_animation" type="bool" />
+			<param index="2" name="option" type="String" />
 			<description>
 				Return true or false whether a given option should be visible. Return null to ignore.
 			</description>
 		</method>
 		<method name="_internal_process" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="category" type="int" />
-			<argument index="1" name="base_node" type="Node" />
-			<argument index="2" name="node" type="Node" />
-			<argument index="3" name="resource" type="Resource" />
+			<param index="0" name="category" type="int" />
+			<param index="1" name="base_node" type="Node" />
+			<param index="2" name="node" type="Node" />
+			<param index="3" name="resource" type="Resource" />
 			<description>
 				Process a specific node or resource for a given category.
 			</description>
 		</method>
 		<method name="_post_process" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="scene" type="Node" />
+			<param index="0" name="scene" type="Node" />
 			<description>
 				Post process the scene. This function is called after the final scene has been configured.
 			</description>
 		</method>
 		<method name="_pre_process" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="scene" type="Node" />
+			<param index="0" name="scene" type="Node" />
 			<description>
 				Pre Process the scene. This function is called right after the scene format loader loaded the scene and no changes have been made.
 			</description>
 		</method>
 		<method name="add_import_option">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="value" type="Variant" />
 			<description>
 				Add a specific import option (name and default value only). This function can only be called from [method _get_import_options] and [method _get_internal_import_options].
 			</description>
 		</method>
 		<method name="add_import_option_advanced">
 			<return type="void" />
-			<argument index="0" name="type" type="int" enum="Variant.Type" />
-			<argument index="1" name="name" type="String" />
-			<argument index="2" name="default_value" type="Variant" />
-			<argument index="3" name="hint" type="int" enum="PropertyHint" default="0" />
-			<argument index="4" name="hint_string" type="String" default="&quot;&quot;" />
-			<argument index="5" name="usage_flags" type="int" default="6" />
+			<param index="0" name="type" type="int" enum="Variant.Type" />
+			<param index="1" name="name" type="String" />
+			<param index="2" name="default_value" type="Variant" />
+			<param index="3" name="hint" type="int" enum="PropertyHint" default="0" />
+			<param index="4" name="hint_string" type="String" default="&quot;&quot;" />
+			<param index="5" name="usage_flags" type="int" default="6" />
 			<description>
 				Add a specific import option. This function can only be called from [method _get_import_options] and [method _get_internal_import_options].
 			</description>
 		</method>
 		<method name="get_option_value" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Query the value of an option. This function can only be called from those querying visibility, or processing.
 			</description>
diff --git a/doc/classes/EditorScript.xml b/doc/classes/EditorScript.xml
index 68ee939370..2ff8a7ba2a 100644
--- a/doc/classes/EditorScript.xml
+++ b/doc/classes/EditorScript.xml
@@ -42,9 +42,9 @@
 		</method>
 		<method name="add_root_node">
 			<return type="void" />
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
-				Adds [code]node[/code] as a child of the root node in the editor context.
+				Adds [param node] as a child of the root node in the editor context.
 				[b]Warning:[/b] The implementation of this method is currently disabled.
 			</description>
 		</method>
diff --git a/doc/classes/EditorSelection.xml b/doc/classes/EditorSelection.xml
index ff6f5f9206..9c3e87ddb0 100644
--- a/doc/classes/EditorSelection.xml
+++ b/doc/classes/EditorSelection.xml
@@ -12,7 +12,7 @@
 	<methods>
 		<method name="add_node">
 			<return type="void" />
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
 				Adds a node to the selection.
 				[b]Note:[/b] The newly selected node will not be automatically edited in the inspector. If you want to edit a node, use [method EditorInterface.edit_node].
@@ -38,7 +38,7 @@
 		</method>
 		<method name="remove_node">
 			<return type="void" />
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
 				Removes a node from the selection.
 			</description>
diff --git a/doc/classes/EditorSettings.xml b/doc/classes/EditorSettings.xml
index fea4085019..652b834f98 100644
--- a/doc/classes/EditorSettings.xml
+++ b/doc/classes/EditorSettings.xml
@@ -32,7 +32,7 @@
 	<methods>
 		<method name="add_property_info">
 			<return type="void" />
-			<argument index="0" name="info" type="Dictionary" />
+			<param index="0" name="info" type="Dictionary" />
 			<description>
 				Adds a custom property info to a property. The dictionary must contain:
 				- [code]name[/code]: [String] (the name of the property)
@@ -72,16 +72,16 @@
 		</method>
 		<method name="check_changed_settings_in_group" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="setting_prefix" type="String" />
+			<param index="0" name="setting_prefix" type="String" />
 			<description>
-				Checks if any settings with the prefix [code]setting_prefix[/code] exist in the set of changed settings. See also [method get_changed_settings].
+				Checks if any settings with the prefix [param setting_prefix] exist in the set of changed settings. See also [method get_changed_settings].
 			</description>
 		</method>
 		<method name="erase">
 			<return type="void" />
-			<argument index="0" name="property" type="String" />
+			<param index="0" name="property" type="String" />
 			<description>
-				Erases the setting whose name is specified by [code]property[/code].
+				Erases the setting whose name is specified by [param property].
 			</description>
 		</method>
 		<method name="get_changed_settings" qualifiers="const">
@@ -98,11 +98,11 @@
 		</method>
 		<method name="get_project_metadata" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="section" type="String" />
-			<argument index="1" name="key" type="String" />
-			<argument index="2" name="default" type="Variant" default="null" />
+			<param index="0" name="section" type="String" />
+			<param index="1" name="key" type="String" />
+			<param index="2" name="default" type="Variant" default="null" />
 			<description>
-				Returns project-specific metadata for the [code]section[/code] and [code]key[/code] specified. If the metadata doesn't exist, [code]default[/code] will be returned instead. See also [method set_project_metadata].
+				Returns project-specific metadata for the [param section] and [param key] specified. If the metadata doesn't exist, [param default] will be returned instead. See also [method set_project_metadata].
 			</description>
 		</method>
 		<method name="get_recent_dirs" qualifiers="const">
@@ -113,533 +113,800 @@
 		</method>
 		<method name="get_setting" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
-				Returns the value of the setting specified by [code]name[/code]. This is equivalent to using [method Object.get] on the EditorSettings instance.
+				Returns the value of the setting specified by [param name]. This is equivalent to using [method Object.get] on the EditorSettings instance.
 			</description>
 		</method>
 		<method name="has_setting" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
-				Returns [code]true[/code] if the setting specified by [code]name[/code] exists, [code]false[/code] otherwise.
+				Returns [code]true[/code] if the setting specified by [param name] exists, [code]false[/code] otherwise.
 			</description>
 		</method>
 		<method name="mark_setting_changed">
 			<return type="void" />
-			<argument index="0" name="setting" type="String" />
+			<param index="0" name="setting" type="String" />
 			<description>
 				Marks the passed editor setting as being changed, see [method get_changed_settings]. Only settings which exist (see [method has_setting]) will be accepted.
 			</description>
 		</method>
-		<method name="property_can_revert">
-			<return type="bool" />
-			<argument index="0" name="name" type="String" />
-			<description>
-				Returns [code]true[/code] if the setting specified by [code]name[/code] can have its value reverted to the default value, [code]false[/code] otherwise. When this method returns [code]true[/code], a Revert button will display next to the setting in the Editor Settings.
-			</description>
-		</method>
-		<method name="property_get_revert">
-			<return type="Variant" />
-			<argument index="0" name="name" type="String" />
-			<description>
-				Returns the default value of the setting specified by [code]name[/code]. This is the value that would be applied when clicking the Revert button in the Editor Settings.
-			</description>
-		</method>
 		<method name="set_builtin_action_override">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="actions_list" type="Array" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="actions_list" type="Array" />
 			<description>
+				Overrides the built-in editor action [param name] with the input actions defined in [param actions_list].
 			</description>
 		</method>
 		<method name="set_favorites">
 			<return type="void" />
-			<argument index="0" name="dirs" type="PackedStringArray" />
+			<param index="0" name="dirs" type="PackedStringArray" />
 			<description>
 				Sets the list of favorite files and directories for this project.
 			</description>
 		</method>
 		<method name="set_initial_value">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="value" type="Variant" />
-			<argument index="2" name="update_current" type="bool" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="value" type="Variant" />
+			<param index="2" name="update_current" type="bool" />
 			<description>
-				Sets the initial value of the setting specified by [code]name[/code] to [code]value[/code]. This is used to provide a value for the Revert button in the Editor Settings. If [code]update_current[/code] is true, the current value of the setting will be set to [code]value[/code] as well.
+				Sets the initial value of the setting specified by [param name] to [param value]. This is used to provide a value for the Revert button in the Editor Settings. If [param update_current] is true, the current value of the setting will be set to [param value] as well.
 			</description>
 		</method>
 		<method name="set_project_metadata">
 			<return type="void" />
-			<argument index="0" name="section" type="String" />
-			<argument index="1" name="key" type="String" />
-			<argument index="2" name="data" type="Variant" />
+			<param index="0" name="section" type="String" />
+			<param index="1" name="key" type="String" />
+			<param index="2" name="data" type="Variant" />
 			<description>
-				Sets project-specific metadata with the [code]section[/code], [code]key[/code] and [code]data[/code] specified. This metadata is stored outside the project folder and therefore won't be checked into version control. See also [method get_project_metadata].
+				Sets project-specific metadata with the [param section], [param key] and [param data] specified. This metadata is stored outside the project folder and therefore won't be checked into version control. See also [method get_project_metadata].
 			</description>
 		</method>
 		<method name="set_recent_dirs">
 			<return type="void" />
-			<argument index="0" name="dirs" type="PackedStringArray" />
+			<param index="0" name="dirs" type="PackedStringArray" />
 			<description>
 				Sets the list of recently visited folders in the file dialog for this project.
 			</description>
 		</method>
 		<method name="set_setting">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="value" type="Variant" />
 			<description>
-				Sets the [code]value[/code] of the setting specified by [code]name[/code]. This is equivalent to using [method Object.set] on the EditorSettings instance.
+				Sets the [param value] of the setting specified by [param name]. This is equivalent to using [method Object.set] on the EditorSettings instance.
 			</description>
 		</method>
 	</methods>
 	<members>
 		<member name="debugger/profiler_frame_history_size" type="int" setter="" getter="">
+			The size of the profiler's frame history. The default value (3600) allows seeing up to 60 seconds of profiling if the project renders at a constant 60 FPS. Higher values allow viewing longer periods of profiling in the graphs, especially when the project is running at high framerates.
 		</member>
 		<member name="docks/filesystem/always_show_folders" type="bool" setter="" getter="">
+			If [code]true[/code], displays folders in the FileSystem dock's bottom pane when split mode is enabled. If [code]false[/code], only files will be displayed in the bottom pane. Split mode can be toggled by pressing the icon next to the [code]res://[/code] folder path.
+			[b]Note:[/b] This setting has no effect when split mode is disabled (which is the default).
 		</member>
 		<member name="docks/filesystem/textfile_extensions" type="String" setter="" getter="">
+			List of file extensions to consider as editable text files in the FileSystem dock (by double-clicking on the files).
 		</member>
 		<member name="docks/filesystem/thumbnail_size" type="int" setter="" getter="">
+			The thumbnail size to use in the FileSystem dock (in pixels). See also [member filesystem/file_dialog/thumbnail_size].
 		</member>
 		<member name="docks/property_editor/auto_refresh_interval" type="float" setter="" getter="">
+			The refresh interval to use for the inspector dock's properties. The effect of this setting is mainly noticeable when adjusting gizmos in the 2D/3D editor and looking at the inspector at the same time. Lower values make the inspector more often, but take up more CPU time.
 		</member>
 		<member name="docks/property_editor/subresource_hue_tint" type="float" setter="" getter="">
+			The tint intensity to use for the subresources background in the inspector dock. The tint is used to distinguish between different subresources in the inspector. Higher values result in a more noticeable background color difference.
 		</member>
 		<member name="docks/scene_tree/auto_expand_to_selected" type="bool" setter="" getter="">
+			If [code]true[/code], the scene tree dock will automatically unfold nodes when a node that has folded parents is selected.
 		</member>
 		<member name="docks/scene_tree/start_create_dialog_fully_expanded" type="bool" setter="" getter="">
+			If [code]true[/code], the Create dialog (Create New Node/Create New Resource) will start with all its sections expanded. Otherwise, sections will be collapsed until the user starts searching (which will automatically expand sections as needed).
 		</member>
 		<member name="editors/2d/bone_color1" type="Color" setter="" getter="">
+			The "start" stop of the color gradient to use for bones in the 2D skeleton editor.
 		</member>
 		<member name="editors/2d/bone_color2" type="Color" setter="" getter="">
+			The "end" stop of the color gradient to use for bones in the 2D skeleton editor.
 		</member>
 		<member name="editors/2d/bone_ik_color" type="Color" setter="" getter="">
+			The color to use for inverse kinematics-enabled bones in the 2D skeleton editor.
 		</member>
 		<member name="editors/2d/bone_outline_color" type="Color" setter="" getter="">
+			The outline color to use for non-selected bones in the 2D skeleton editor. See also [member editors/2d/bone_selected_color].
 		</member>
 		<member name="editors/2d/bone_outline_size" type="int" setter="" getter="">
+			The outline size in the 2D skeleton editor (in pixels). See also [member editors/2d/bone_width].
 		</member>
 		<member name="editors/2d/bone_selected_color" type="Color" setter="" getter="">
+			The color to use for selected bones in the 2D skeleton editor. See also [member editors/2d/bone_outline_color].
 		</member>
 		<member name="editors/2d/bone_width" type="int" setter="" getter="">
+			The bone width in the 2D skeleton editor (in pixels). See also [member editors/2d/bone_outline_size].
 		</member>
 		<member name="editors/2d/constrain_editor_view" type="bool" setter="" getter="">
+			If [code]true[/code], prevents the 2D editor viewport from leaving the scene. Limits are calculated dynamically based on nodes present in the current scene. If [code]false[/code], the 2D editor viewport will be able to move freely, but you risk getting lost when zooming out too far. You can refocus on the scene by selecting a node then pressing [kbd]F[/kbd].
 		</member>
 		<member name="editors/2d/grid_color" type="Color" setter="" getter="">
+			The grid color to use in the 2D editor.
 		</member>
 		<member name="editors/2d/guides_color" type="Color" setter="" getter="">
+			The guides color to use in the 2D editor. Guides can be created by dragging the mouse cursor from the rulers.
 		</member>
 		<member name="editors/2d/smart_snapping_line_color" type="Color" setter="" getter="">
+			The color to use when drawing smart snapping lines in the 2D editor. The smart snapping lines will automatically display when moving 2D nodes if smart snapping is enabled in the Snapping Options menu at the top of the 2D editor viewport.
 		</member>
 		<member name="editors/2d/viewport_border_color" type="Color" setter="" getter="">
+			The color of the viewport border in the 2D editor. This border represents the viewport's size at the base resolution defined in the Project Settings. Objects placed outside this border will not be visible unless a [Camera2D] node is used, or unless the window is resized and the stretch mode is set to [code]disabled[/code].
 		</member>
 		<member name="editors/3d/default_fov" type="float" setter="" getter="">
+			The default camera field of view to use in the 3D editor (in degrees). The camera field of view can be adjusted on a per-scene basis using the [b]View[/b] menu at the top of the 3D editor. If a scene had its camera field of view adjusted using the [b]View[/b] menu, this setting is ignored in the scene in question. This setting is also ignored while a Camera3D node is being previewed in the editor.
 		</member>
 		<member name="editors/3d/default_z_far" type="float" setter="" getter="">
+			The default camera far clip distance to use in the 3D editor (in degrees). Higher values make it possible to view objects placed further away from the camera, at the cost of lower precision in the depth buffer (which can result in visible Z-fighting in the distance). The camera far clip distance can be adjusted on a per-scene basis using the [b]View[/b] menu at the top of the 3D editor. If a scene had its camera far clip distance adjusted using the [b]View[/b] menu, this setting is ignored in the scene in question. This setting is also ignored while a Camera3D node is being previewed in the editor.
 		</member>
 		<member name="editors/3d/default_z_near" type="float" setter="" getter="">
+			The default camera near clip distance to use in the 3D editor (in degrees). Lower values make it possible to view objects placed closer to the camera, at the cost of lower precision in the depth buffer (which can result in visible Z-fighting in the distance). The camera near clip distance can be adjusted on a per-scene basis using the [b]View[/b] menu at the top of the 3D editor. If a scene had its camera near clip distance adjusted using the [b]View[/b] menu, this setting is ignored in the scene in question. This setting is also ignored while a Camera3D node is being previewed in the editor.
 		</member>
 		<member name="editors/3d/freelook/freelook_activation_modifier" type="int" setter="" getter="">
+			The modifier key to use to enable freelook in the 3D editor (on top of pressing the right mouse button).
+			[b]Note:[/b] Regardless of this setting, the freelook toggle keyboard shortcut ([kbd]Shift + F[/kbd] by default) is always available.
+			[b]Note:[/b] On certain window managers on Linux, the [kbd]Alt[/kbd] key will be intercepted by the window manager when clicking a mouse button at the same time. This means Godot will not see the modifier key as being pressed.
 		</member>
 		<member name="editors/3d/freelook/freelook_base_speed" type="float" setter="" getter="">
+			The base 3D freelook speed in units per second. This can be adjusted by using the mouse wheel while in freelook mode, or by holding down the "fast" or "slow" modifier keys ([kbd]Shift[/kbd] and [kbd]Alt[/kbd] by default, respectively).
 		</member>
 		<member name="editors/3d/freelook/freelook_inertia" type="float" setter="" getter="">
+			The inertia of the 3D freelook camera. Higher values make the camera start and stop slower, which looks smoother but adds latency.
 		</member>
 		<member name="editors/3d/freelook/freelook_navigation_scheme" type="int" setter="" getter="">
+			The navigation scheme to use when freelook is enabled in the 3D editor. Some of the navigation schemes below may be more convenient when designing specific levels in the 3D editor.
+			- [b]Default:[/b] The "Freelook Forward", "Freelook Backward", "Freelook Up" and "Freelook Down" keys will move relative to the camera, taking its pitch angle into account for the movement.
+			- [b]Partially Axis-Locked:[/b] The "Freelook Forward" and "Freelook Backward" keys will move relative to the camera, taking its pitch angle into account for the movement. The "Freelook Up" and "Freelook Down" keys will move in an "absolute" manner, [i]not[/i] taking the camera's pitch angle into account for the movement.
+			- [b]Fully Axis-Locked:[/b] The "Freelook Forward", "Freelook Backward", "Freelook Up" and "Freelook Down" keys will move in an "absolute" manner, [i]not[/i] taking the camera's pitch angle into account for the movement.
+			See also [member editors/3d/navigation/navigation_scheme].
 		</member>
 		<member name="editors/3d/freelook/freelook_sensitivity" type="float" setter="" getter="">
+			The mouse sensitivity to use while freelook mode is active in the 3D editor. See also [member editors/3d/navigation_feel/orbit_sensitivity].
 		</member>
 		<member name="editors/3d/freelook/freelook_speed_zoom_link" type="bool" setter="" getter="">
+			If [code]true[/code], freelook speed is linked to the zoom value used in the camera orbit mode in the 3D editor.
 		</member>
 		<member name="editors/3d/grid_division_level_bias" type="float" setter="" getter="">
+			The grid division bias to use in the 3D editor. Negative values will cause small grid divisions to appear earlier, whereas positive values will cause small grid divisions to appear later.
 		</member>
 		<member name="editors/3d/grid_division_level_max" type="int" setter="" getter="">
+			The smallest grid division to use in the 3D editor, specified as a power of 2. The grid will not be able to get larger than [code]1 ^ grid_division_level_max[/code] units. By default, this means grid divisions cannot get smaller than 100 units each, no matter how far away the camera is from the grid.
 		</member>
 		<member name="editors/3d/grid_division_level_min" type="int" setter="" getter="">
+			The smallest grid division to use in the 3D editor, specified as a power of 2. The grid will not be able to get smaller than [code]1 ^ grid_division_level_min[/code] units. By default, this means grid divisions cannot get smaller than 1 unit each, no matter how close the camera is from the grid.
 		</member>
 		<member name="editors/3d/grid_size" type="int" setter="" getter="">
+			The grid size in units. Higher values prevent the grid from appearing "cut off" at certain angles, but make the grid more demanding to render. Depending on the camera's position, the grid may not be fully visible since a shader is used to fade it progressively.
 		</member>
 		<member name="editors/3d/grid_xy_plane" type="bool" setter="" getter="">
+			If [code]true[/code], render the grid on an XY plane. This can be useful for 3D side-scrolling games.
 		</member>
 		<member name="editors/3d/grid_xz_plane" type="bool" setter="" getter="">
+			If [code]true[/code], render the grid on an XZ plane.
 		</member>
 		<member name="editors/3d/grid_yz_plane" type="bool" setter="" getter="">
+			If [code]true[/code], render the grid on an YZ plane. This can be useful for 3D side-scrolling games.
 		</member>
 		<member name="editors/3d/navigation/emulate_3_button_mouse" type="bool" setter="" getter="">
+			If [code]true[/code], enables 3-button mouse emulation mode. This is useful on laptops when using a trackpad.
+			When 3-button mouse emulation mode is enabled, the pan, zoom and orbit modifiers can always be used in the 3D editor viewport, even when not holding down any mouse button.
+			[b]Note:[/b] No matter the orbit modifier configured in [member editors/3d/navigation/orbit_modifier], [kbd]Alt[/kbd] will always remain usable for orbiting in this mode to improve usability with graphics tablets.
 		</member>
 		<member name="editors/3d/navigation/emulate_numpad" type="bool" setter="" getter="">
+			If [code]true[/code], allows using the top row [kbd]0[/kbd]-[kbd]9[/kbd] keys to function as their equivalent numpad keys for 3D editor navigation. This should be enabled on keyboards that have no numeric keypad available.
 		</member>
 		<member name="editors/3d/navigation/invert_x_axis" type="bool" setter="" getter="">
+			If [code]true[/code], invert the horizontal mouse axis when panning or orbiting in the 3D editor. This setting does [i]not[/i] apply to freelook mode.
 		</member>
 		<member name="editors/3d/navigation/invert_y_axis" type="bool" setter="" getter="">
+			If [code]true[/code], invert the vertical mouse axis when panning, orbiting, or using freelook mode in the 3D editor.
 		</member>
 		<member name="editors/3d/navigation/navigation_scheme" type="int" setter="" getter="">
+			The navigation scheme to use in the 3D editor. Changing this setting will affect the mouse buttons that must be held down to perform certain operations in the 3D editor viewport.
+			- [b]Godot[/b] Middle mouse button to orbit, [kbd]Shift + Middle mouse button[/kbd] to pan. [kbd]Mouse wheel[/kbd] to zoom.
+			- [b]Maya:[/b] [kbd]Alt + Left mouse buttton[/kbd] to orbit. [kbd]Middle mouse button[/kbd] to pan, [kbd]Shift + Middle mouse button[/kbd] to pan 10 times faster. [kbd]Mouse wheel[/kbd] to zoom.
+			- [b]Modo:[/b] [kbd]Alt + Left mouse buttton[/kbd] to orbit. [kbd]Alt + Shift + Left mouse button[/kbd] to pan. [kbd]Ctrl + Alt + Left mouse button[/kbd] to zoom.
+			See also [member editors/3d/freelook/freelook_navigation_scheme].
+			[b]Note:[/b] On certain window managers on Linux, the [kbd]Alt[/kbd] key will be intercepted by the window manager when clicking a mouse button at the same time. This means Godot will not see the modifier key as being pressed.
 		</member>
 		<member name="editors/3d/navigation/orbit_modifier" type="int" setter="" getter="">
+			The modifier key that must be held to orbit in the 3D editor.
+			[b]Note:[/b] If [member editors/3d/navigation/emulate_3_button_mouse] is [code]true[/code], [kbd]Alt[/kbd] will always remain usable for orbiting to improve usability with graphics tablets.
+			[b]Note:[/b] On certain window managers on Linux, the [kbd]Alt[/kbd] key will be intercepted by the window manager when clicking a mouse button at the same time. This means Godot will not see the modifier key as being pressed.
 		</member>
 		<member name="editors/3d/navigation/pan_modifier" type="int" setter="" getter="">
+			The modifier key that must be held to pan in the 3D editor.
+			[b]Note:[/b] On certain window managers on Linux, the [kbd]Alt[/kbd] key will be intercepted by the window manager when clicking a mouse button at the same time. This means Godot will not see the modifier key as being pressed.
 		</member>
 		<member name="editors/3d/navigation/warped_mouse_panning" type="bool" setter="" getter="">
+			If [code]true[/code], warps the mouse around the 3D viewport while panning in the 3D editor. This makes it possible to pan over a large area without having to exit panning then mouse the mouse back constantly.
 		</member>
 		<member name="editors/3d/navigation/zoom_modifier" type="int" setter="" getter="">
+			The modifier key that must be held to zoom in the 3D editor.
+			[b]Note:[/b] On certain window managers on Linux, the [kbd]Alt[/kbd] key will be intercepted by the window manager when clicking a mouse button at the same time. This means Godot will not see the modifier key as being pressed.
 		</member>
 		<member name="editors/3d/navigation/zoom_style" type="int" setter="" getter="">
+			The mouse cursor movement direction to use when zooming by moving the mouse. This does not affect zooming with the mouse wheel.
 		</member>
 		<member name="editors/3d/navigation_feel/orbit_inertia" type="float" setter="" getter="">
+			The inertia to use when orbiting in the 3D editor. Higher values make the camera start and stop slower, which looks smoother but adds latency.
 		</member>
 		<member name="editors/3d/navigation_feel/orbit_sensitivity" type="float" setter="" getter="">
+			The mouse sensitivity to use when orbiting in the 3D editor. See also [member editors/3d/freelook/freelook_sensitivity].
 		</member>
 		<member name="editors/3d/navigation_feel/translation_inertia" type="float" setter="" getter="">
+			The inertia to use when panning in the 3D editor. Higher values make the camera start and stop slower, which looks smoother but adds latency.
 		</member>
 		<member name="editors/3d/navigation_feel/zoom_inertia" type="float" setter="" getter="">
+			The inertia to use when zooming in the 3D editor. Higher values make the camera start and stop slower, which looks smoother but adds latency.
 		</member>
 		<member name="editors/3d/primary_grid_color" type="Color" setter="" getter="">
+			The color to use for the primary 3D grid. The color's alpha channel affects the grid's opacity.
 		</member>
 		<member name="editors/3d/primary_grid_steps" type="int" setter="" getter="">
+			If set above 0, where a primary grid line should be drawn. By default, primary lines are configured to be more visible than secondary lines. This helps with measurements in the 3D editor. See also [member editors/3d/primary_grid_color] and [member editors/3d/secondary_grid_color].
 		</member>
 		<member name="editors/3d/secondary_grid_color" type="Color" setter="" getter="">
+			The color to use for the secondary 3D grid. This is generally a less visible color than [member editors/3d/primary_grid_color]. The color's alpha channel affects the grid's opacity.
 		</member>
 		<member name="editors/3d/selection_box_color" type="Color" setter="" getter="">
+			The color to use for the selection box that surrounds selected nodes in the 3D editor viewport. The color's alpha channel influences the selection box's opacity.
 		</member>
 		<member name="editors/3d_gizmos/gizmo_colors/instantiated" type="Color" setter="" getter="">
+			The color override to use for 3D editor gizmos if the [Node3D] in question is part of an instanced scene file (from the perspective of the current scene).
 		</member>
 		<member name="editors/3d_gizmos/gizmo_colors/joint" type="Color" setter="" getter="">
+			The 3D editor gizmo color for [Joint3D]s and [PhysicalBone3D]s.
 		</member>
 		<member name="editors/3d_gizmos/gizmo_colors/shape" type="Color" setter="" getter="">
+			The 3D editor gizmo color for [CollisionShape3D]s, [VehicleWheel3D]s, [RayCast3D]s and [SpringArm3D]s.
 		</member>
 		<member name="editors/animation/autorename_animation_tracks" type="bool" setter="" getter="">
+			If [code]true[/code], automatically updates animation tracks' target paths when renaming or reparenting nodes in the Scene tree dock.
 		</member>
 		<member name="editors/animation/confirm_insert_track" type="bool" setter="" getter="">
+			If [code]true[/code], display a confirmation dialog when adding a new track to an animation by pressing the "key" icon next to a property.
 		</member>
 		<member name="editors/animation/default_create_bezier_tracks" type="bool" setter="" getter="">
+			If [code]true[/code], create a Bezier track instead of a standard track when pressing the "key" icon next to a property. Bezier tracks provide more control over animation curves, but are more difficult to adjust quickly.
 		</member>
 		<member name="editors/animation/default_create_reset_tracks" type="bool" setter="" getter="">
+			If [code]true[/code], create a [code]RESET[/code] track when creating a new animation track. This track can be used to restore the animation to a "default" state.
 		</member>
 		<member name="editors/animation/onion_layers_future_color" type="Color" setter="" getter="">
+			The modulate color to use for "future" frames displayed in the animation editor's onion skinning feature.
 		</member>
 		<member name="editors/animation/onion_layers_past_color" type="Color" setter="" getter="">
+			The modulate color to use for "past" frames displayed in the animation editor's onion skinning feature.
 		</member>
 		<member name="editors/grid_map/pick_distance" type="float" setter="" getter="">
+			The maximum distance at which tiles can be placed on a GridMap, relative to the camera position (in 3D units).
 		</member>
 		<member name="editors/panning/2d_editor_pan_speed" type="int" setter="" getter="">
+			The panning speed when using the mouse wheel or touchscreen events in the 2D editor. This setting does not apply to panning by holding down the middle or right mouse buttons.
 		</member>
 		<member name="editors/panning/2d_editor_panning_scheme" type="int" setter="" getter="">
+			Controls whether the mouse wheel scroll zooms or pans in the 2D editor. See also [member editors/panning/sub_editors_panning_scheme] and [member editors/panning/animation_editors_panning_scheme].
 		</member>
 		<member name="editors/panning/animation_editors_panning_scheme" type="int" setter="" getter="">
+			Controls whether the mouse wheel scroll zooms or pans in the animation track and Bezier editors. See also [member editors/panning/2d_editor_panning_scheme] and [member editors/panning/sub_editors_panning_scheme] (which controls the animation blend tree editor's pan behavior).
 		</member>
 		<member name="editors/panning/simple_panning" type="bool" setter="" getter="">
+			If [code]true[/code], allows panning by holding down [kbd]Space[/kbd] in the 2D editor viewport (in addition to panning with the middle or right mouse buttons). If [code]false[/code], the left mouse button must be held down while holding down [kbd]Space[/kbd] to pan in the 2D editor viewport.
 		</member>
 		<member name="editors/panning/sub_editors_panning_scheme" type="int" setter="" getter="">
+			Controls whether the mouse wheel scroll zooms or pans in subeditors. The list of affected subeditors is: animation blend tree editor, [Polygon2D] editor, tileset editor, texture region editor, visual shader editor and visual script editor. See also [member editors/panning/2d_editor_panning_scheme] and [member editors/panning/animation_editors_panning_scheme].
 		</member>
 		<member name="editors/panning/warped_mouse_panning" type="bool" setter="" getter="">
+			If [code]true[/code], warps the mouse around the 2D viewport while panning in the 2D editor. This makes it possible to pan over a large area without having to exit panning then mouse the mouse back constantly.
 		</member>
 		<member name="editors/polygon_editor/point_grab_radius" type="int" setter="" getter="">
+			The radius in which points can be selected in the [Polygon2D] and [CollisionPolygon2D] editors (in pixels). Higher values make it easier to select points quickly, but can make it more difficult to select the expected point when several points are located close to each other.
 		</member>
 		<member name="editors/polygon_editor/show_previous_outline" type="bool" setter="" getter="">
+			If [code]true[/code], displays the polygon's previous shape in the 2D polygon editors with an opaque gray outline. This outline is displayed while dragging a point until the left mouse button is released.
 		</member>
 		<member name="editors/tiles_editor/display_grid" type="bool" setter="" getter="">
+			If [code]true[/code], displays a grid while the TileMap editor is active. See also [member editors/tiles_editor/grid_color].
 		</member>
 		<member name="editors/tiles_editor/grid_color" type="Color" setter="" getter="">
+			The color to use for the TileMap editor's grid.
+			[b]Note:[/b] Only effective if [member editors/tiles_editor/display_grid] is [code]true[/code].
 		</member>
 		<member name="editors/visual_editors/lines_curvature" type="float" setter="" getter="">
+			The curvature to use for connection lines in the visual script and visual shader editors. Higher values will make connection lines appear more curved, with values above [code]0.5[/code] resulting in more "angular" turns in the middle of connection lines.
 		</member>
 		<member name="editors/visual_editors/minimap_opacity" type="float" setter="" getter="">
+			The opacity of the minimap displayed in the bottom-right corner of the visual script and visual shader editors.
 		</member>
 		<member name="editors/visual_editors/visual_shader/port_preview_size" type="int" setter="" getter="">
+			The size to use for port previews in the visual shader uniforms (toggled by clicking the "eye" icon next to an output). The value is defined in pixels at 100% zoom, and will scale with zoom automatically.
 		</member>
 		<member name="filesystem/directories/autoscan_project_path" type="String" setter="" getter="">
+			The folder where projects should be scanned for (recursively), in a way similar to the project manager's [b]Scan[/b]button. This can be set to the same value as [member filesystem/directories/default_project_path] for convenience.
+			[b]Note:[/b] Setting this path to a folder with very large amounts of files/folders can slow down the project manager startup significantly. To keep the project manager quick to start up, it is recommended to set this value to a folder as "specific" as possible.
 		</member>
 		<member name="filesystem/directories/default_project_path" type="String" setter="" getter="">
+			The folder where new projects should be created by default when clicking the project manager's [b]New Project[/b] button. This can be set to the same value as [member filesystem/directories/autoscan_project_path] for convenience.
 		</member>
 		<member name="filesystem/file_dialog/display_mode" type="int" setter="" getter="">
+			The display mode to use in the editor's file dialogs.
+			- [b]Thumbnails[/b] takes more space, but displays dynamic resource thumbnails, making resources easier to preview without having to open them.
+			- [b]List[/b] is more compact but doesn't display dynamic resource thumbnails. Instead, it displays static icons based on the file extension.
 		</member>
 		<member name="filesystem/file_dialog/show_hidden_files" type="bool" setter="" getter="">
+			If [code]true[/code], display hidden files in the editor's file dialogs. Files that have names starting with [code].[/code] are considered hidden (e.g. [code].hidden_file[/code]).
 		</member>
 		<member name="filesystem/file_dialog/thumbnail_size" type="int" setter="" getter="">
+			The thumbnail size to use in the editor's file dialogs (in pixels). See also [member docks/filesystem/thumbnail_size].
 		</member>
 		<member name="filesystem/on_save/compress_binary_resources" type="bool" setter="" getter="">
+			If [code]true[/code], uses lossless compression for binary resources.
 		</member>
 		<member name="filesystem/on_save/safe_save_on_backup_then_rename" type="bool" setter="" getter="">
+			If [code]true[/code], when saving a file, the editor will rename the old file to a different name, save a new file, then only remove the old file once the new file has been saved. This makes loss of data less likely to happen if the editor or operating system exits unexpectedly while saving (e.g. due to a crash or power outage).
+			[b]Note:[/b] On Windows, this feature can interact negatively with certain antivirus programs. In this case, you may have to set this to [code]false[/code] to prevent file locking issues.
 		</member>
 		<member name="interface/editor/automatically_open_screenshots" type="bool" setter="" getter="">
+			If [code]true[/code], automatically opens screenshots with the default program associated to [code].png[/code] files after a screenshot is taken using the [b]Editor &gt; Take Screenshot[/b] action.
 		</member>
 		<member name="interface/editor/code_font" type="String" setter="" getter="">
+			The font to use for the script editor. Must be a resource of a [Font] type such as a [code].ttf[/code] or [code].otf[/code] font file.
 		</member>
 		<member name="interface/editor/code_font_contextual_ligatures" type="int" setter="" getter="">
+			The font ligatures to enable for the currently configured code font. Not all fonts include support for ligatures.
+			[b]Note:[/b] The default editor code font (Hack) does not have contextual ligatures in its font file.
 		</member>
 		<member name="interface/editor/code_font_custom_opentype_features" type="String" setter="" getter="">
+			List of custom OpenType features to use, if supported by the currently configured code font. Not all fonts include support for custom OpenType features. The string should follow the OpenType specification.
+			[b]Note:[/b] The default editor code font (Hack) does not have custom OpenType features in its font file.
 		</member>
 		<member name="interface/editor/code_font_custom_variations" type="String" setter="" getter="">
+			List of alternative characters to use, if supported by the currently configured code font. Not all fonts include support for custom variations. The string should follow the OpenType specification.
+			[b]Note:[/b] The default editor code font (Hack) does not have alternate characters in its font file.
 		</member>
 		<member name="interface/editor/code_font_size" type="int" setter="" getter="">
+			The size of the font in the script editor. This setting does not impact the font size of the Output panel (see [member run/output/font_size]).
 		</member>
 		<member name="interface/editor/custom_display_scale" type="float" setter="" getter="">
+			The custom editor scale factor to use. This can be used for displays with very high DPI where a scale factor of 200% is not sufficient.
+			[b]Note:[/b] Only effective if [member interface/editor/display_scale] is set to [b]Custom[/b].
 		</member>
 		<member name="interface/editor/debug/enable_pseudolocalization" type="bool" setter="" getter="">
+			If [code]true[/code], lengthens the editor's localizable strings and replaces their characters with accented variants. This allows spotting non-localizable strings easily, while also ensuring the UI layout doesn't break when strings are made longer (as many languages require strings to be longer).
+			This is a debugging feature and should only be enabled when working on the editor itself.
 		</member>
 		<member name="interface/editor/display_scale" type="int" setter="" getter="">
+			The display scale factor to use for the editor interface. Higher values are more suited to hiDPI/Retina displays.
+			If set to [b]Auto[/b], the editor scale is automatically determined based on the screen resolution and reported display DPI. This heuristic is not always ideal, which means you can get better results by setting the editor scale manually.
+			If set to [b]Custom[/b], the scaling value in [member interface/editor/custom_display_scale] will be used.
 		</member>
 		<member name="interface/editor/editor_language" type="String" setter="" getter="">
+			The language to use for the editor interface.
+			Translations are provided by the community. If you spot a mistake, [url=https://docs.godotengine.org/en/latest/community/contributing/editor_and_docs_localization.html]contribute to editor translations on Weblate![/url]
 		</member>
 		<member name="interface/editor/font_antialiased" type="bool" setter="" getter="">
+			If [code]true[/code], enables FreeType's font antialiasing on the editor fonts. Most fonts are not designed to look good with antialiasing disabled, so it's recommended to leave this enabled unless you're using a pixel art font.
 		</member>
 		<member name="interface/editor/font_hinting" type="int" setter="" getter="">
+			The font hinting mode to use for the editor fonts. FreeType supports the following font hinting modes:
+			- [b]None:[/b] Don't use font hinting when rasterizing the font. This results in a smooth font, but it can look blurry.
+			- [b]Light:[/b] Use hinting on the X axis only. This is a compromise between font sharpness and smoothness.
+			- [b]Normal:[/b] Use hinting on both X and Y axes. This results in a sharp font, but it doesn't look very smooth.
+			If set to [b]Auto[/b], the font hinting mode will be set to match the current operating system in use. This means the [b]Light[/b] hinting mode will be used on Windows and Linux, and the [b]None[/b] hinting mode will be used on macOS.
 		</member>
 		<member name="interface/editor/font_subpixel_positioning" type="int" setter="" getter="">
+			The subpixel positioning mode to use when rendering editor font glyphs. This affects both the main and code fonts. [b]Disabled[/b] is the fastest to render and uses the least memory. [b]Auto[/b] only uses subpixel positioning for small font sizes (where the benefit is the most noticeable). [b]One half of a pixel[/b] and [b]One quarter of a pixel[/b] force the same subpixel positioning mode for all editor fonts, regardless of their size (with [b]One quarter of a pixel[/b] being the highest-quality option).
 		</member>
 		<member name="interface/editor/low_processor_mode_sleep_usec" type="float" setter="" getter="">
+			The amount of sleeping between frames when the low-processor usage mode is enabled (in microseconds). Higher values will result in lower CPU/GPU usage, which can improve battery life on laptops. However, higher values will result in a less responsive editor. The default value is set to allow for maximum smoothness on monitors up to 144 Hz. See also [member interface/editor/unfocused_low_processor_mode_sleep_usec].
 		</member>
 		<member name="interface/editor/main_font" type="String" setter="" getter="">
+			The font to use for the editor interface. Must be a resource of a [Font] type such as a [code].ttf[/code] or [code].otf[/code] font file.
 		</member>
 		<member name="interface/editor/main_font_bold" type="String" setter="" getter="">
+			The font to use for bold text in the editor interface. Must be a resource of a [Font] type such as a [code].ttf[/code] or [code].otf[/code] font file.
 		</member>
 		<member name="interface/editor/main_font_size" type="int" setter="" getter="">
+			The size of the font in the editor interface.
 		</member>
 		<member name="interface/editor/mouse_extra_buttons_navigate_history" type="bool" setter="" getter="">
+			If [code]true[/code], the mouse's additional side buttons will be usable to navigate in the script editor's file history. Set this to [code]false[/code] if you're using the side buttons for other purposes (such as a push-to-talk button in a VoIP program).
 		</member>
 		<member name="interface/editor/save_each_scene_on_quit" type="bool" setter="" getter="">
+			If [code]true[/code], the editor will save all scenes when confirming the [b]Save[/b] action when quitting the editor or quitting to the project list. If [code]false[/code], the editor will ask to save each scene individually.
 		</member>
 		<member name="interface/editor/separate_distraction_mode" type="bool" setter="" getter="">
+			If [code]true[/code], the editor's Script tab will have a separate distraction mode setting from the 2D/3D/AssetLib tabs. If [code]false[/code], the distraction-free mode toggle is shared between all tabs.
 		</member>
 		<member name="interface/editor/show_internal_errors_in_toast_notifications" type="int" setter="" getter="">
+			If enabled, displays internal engine errors in toast notifications (toggleable by clicking the "bell" icon at the bottom of the editor). No matter the value of this setting, non-internal engine errors will always be visible in toast notifications.
+			The default [b]Auto[/b] value will only enable this if the editor was compiled with the [code]dev=yes[/code] option (the default is [code]dev=no[/code]).
 		</member>
 		<member name="interface/editor/single_window_mode" type="bool" setter="" getter="">
+			If [code]true[/code], embed modal windows such as docks inside the main editor window. When single-window mode is enabled, tooltips will also be embedded inside the main editor window, which means they can't be displayed outside of the editor window.
 		</member>
 		<member name="interface/editor/unfocused_low_processor_mode_sleep_usec" type="float" setter="" getter="">
+			When the editor window is unfocused, the amount of sleeping between frames when the low-processor usage mode is enabled (in microseconds). Higher values will result in lower CPU/GPU usage, which can improve battery life on laptops (in addition to improving the running project's performance if the editor has to redraw continuously). However, higher values will result in a less responsive editor. The default value is set to limit the editor to 20 FPS when the editor window is unfocused. See also [member interface/editor/low_processor_mode_sleep_usec].
+		</member>
+		<member name="interface/editor/use_embedded_menu" type="bool" setter="" getter="">
+			If [code]true[/code], editor main menu is using embedded [MenuBar] instead of system global menu.
+			Specific to the macOS platform.
 		</member>
 		<member name="interface/inspector/max_array_dictionary_items_per_page" type="int" setter="" getter="">
+			The number of [Array] or [Dictionary] items to display on each "page" in the inspector. Higher values allow viewing more values per page, but take more time to load. This increased load time is noticeable when selecting nodes that have array or dictionary properties in the editor.
 		</member>
 		<member name="interface/inspector/show_low_level_opentype_features" type="bool" setter="" getter="">
+			If [code]true[/code], display OpenType features marked as [code]hidden[/code] by the font file in the [Font] editor.
 		</member>
 		<member name="interface/scene_tabs/display_close_button" type="int" setter="" getter="">
+			Controls when the Close (X) button is displayed on scene tabs at the top of the editor.
 		</member>
 		<member name="interface/scene_tabs/maximum_width" type="int" setter="" getter="">
+			The maximum width of each scene tab at the top editor (in pixels).
 		</member>
 		<member name="interface/scene_tabs/show_script_button" type="bool" setter="" getter="">
+			If [code]true[/code], show a button next to each scene tab that opens the scene's "dominant" script when clicked. The "dominant" script is the one that is at the highest level in the scene's hierarchy.
 		</member>
 		<member name="interface/scene_tabs/show_thumbnail_on_hover" type="bool" setter="" getter="">
+			If [code]true[/code], display an automatically-generated thumbnail when hovering scene tabs with the mouse. Scene thumbnails are generated when saving the scene.
 		</member>
 		<member name="interface/theme/accent_color" type="Color" setter="" getter="">
+			The color to use for "highlighted" user interface elements in the editor (pressed and hovered items).
 		</member>
 		<member name="interface/theme/additional_spacing" type="float" setter="" getter="">
+			The spacing to add for buttons and list items in the editor (in pixels). Increasing this value is useful to improve usability on touch screens, at the cost of reducing the amount of usable screen real estate.
 		</member>
 		<member name="interface/theme/base_color" type="Color" setter="" getter="">
+			The base color to use for user interface elements in the editor. Secondary colors (such as darker/lighter variants) are derived from this color.
 		</member>
 		<member name="interface/theme/border_size" type="int" setter="" getter="">
+			The border size to use for interface elements (in pixels).
 		</member>
 		<member name="interface/theme/contrast" type="float" setter="" getter="">
+			The contrast factor to use when deriving the editor theme's base color (see [member interface/theme/base_color]). When using a positive values, the derived colors will be [i]darker[/i] than the base color. This contrast factor can be set to a negative value, which will make the derived colors [i]brighter[/i] than the base color. Negative contrast rates often look better for light themes.
 		</member>
 		<member name="interface/theme/corner_radius" type="int" setter="" getter="">
+			The corner radius to use for interface elements (in pixels). [code]0[/code] is square.
 		</member>
 		<member name="interface/theme/custom_theme" type="String" setter="" getter="">
+			The custom theme resource to use for the editor. Must be a Godot theme resource in [code].tres[/code] or [code].res[/code] format.
 		</member>
 		<member name="interface/theme/icon_and_font_color" type="int" setter="" getter="">
+			The icon and font color scheme to use in the editor.
+			- [b]Auto[/b] determines the color scheme to use automatically based on [member interface/theme/base_color].
+			- [b]Dark[/b] makes fonts and icons light (suitable for dark themes).
+			- [b]Light[/b] makes fonts and icons dark (suitable for light themes). Icon colors are automatically converted by the editor following [url=https://github.com/godotengine/godot/blob/master/editor/editor_themes.cpp#L135]this set of rules[/url].
 		</member>
 		<member name="interface/theme/icon_saturation" type="float" setter="" getter="">
+			The saturation to use for editor icons. Higher values result in more vibrant colors.
+			[b]Note:[/b] The default editor icon saturation was increased by 30% in Godot 4.0 and later. To get Godot 3.x's icon saturation back, set [member interface/theme/icon_saturation] to [code]0.77[/code].
 		</member>
 		<member name="interface/theme/preset" type="String" setter="" getter="">
+			The editor theme preset to use.
 		</member>
 		<member name="interface/theme/relationship_line_opacity" type="float" setter="" getter="">
+			The opacity to use when drawing relationship lines in the editor's [Tree]-based GUIs (such as the Scene tree dock).
 		</member>
 		<member name="network/debug/remote_host" type="String" setter="" getter="">
+			The address to listen to when starting the remote debugger. This can be set to [code]0.0.0.0[/code] to allow external clients to connect to the remote debugger (instead of restricting the remote debugger to connections from [code]localhost[/code]).
 		</member>
 		<member name="network/debug/remote_port" type="int" setter="" getter="">
+			The port to listen to when starting the remote debugger. Godot will try to use port numbers above the configured number if the configured number is already taken by another application.
 		</member>
 		<member name="network/http_proxy/host" type="String" setter="" getter="">
+			The host to use to contact the HTTP and HTTPS proxy in the editor (for the asset library and export template downloads). See also [member network/http_proxy/port].
+			[b]Note:[/b] Godot currently doesn't automatically use system proxy settings, so you have to enter them manually here if needed.
 		</member>
 		<member name="network/http_proxy/port" type="int" setter="" getter="">
+			The port number to use to contact the HTTP and HTTPS proxy in the editor (for the asset library and export template downloads). See also [member network/http_proxy/host].
+			[b]Note:[/b] Godot currently doesn't automatically use system proxy settings, so you have to enter them manually here if needed.
 		</member>
 		<member name="network/ssl/editor_ssl_certificates" type="String" setter="" getter="">
+			The SSL certificate bundle to use for HTTP requests made within the editor (e.g. from the AssetLib tab). If left empty, the [url=https://github.com/godotengine/godot/blob/master/thirdparty/certs/ca-certificates.crt]included Mozilla certificate bundle[/url] will be used.
 		</member>
 		<member name="project_manager/sorting_order" type="int" setter="" getter="">
+			The sorting order to use in the project manager. When changing the sorting order in the project manager, this setting is set permanently in the editor settings.
 		</member>
 		<member name="run/auto_save/save_before_running" type="bool" setter="" getter="">
+			If [code]true[/code], saves all scenes and scripts automatically before running the project. Setting this to [code]false[/code] prevents the editor from saving if there are no changes which can speed up the project startup slightly, but it makes it possible to run a project that has unsaved changes. (Unsaved changes will not be visible in the running project.)
 		</member>
 		<member name="run/output/always_clear_output_on_play" type="bool" setter="" getter="">
+			If [code]true[/code], the editor will clear the Output panel when running the project.
 		</member>
 		<member name="run/output/always_close_output_on_stop" type="bool" setter="" getter="">
+			If [code]true[/code], the editor will collapse the Output panel when stopping the project.
 		</member>
 		<member name="run/output/always_open_output_on_play" type="bool" setter="" getter="">
+			If [code]true[/code], the editor will expand the Output panel when running the project.
 		</member>
 		<member name="run/output/font_size" type="int" setter="" getter="">
+			The size of the font in the [b]Output[/b] panel at the bottom of the editor. This setting does not impact the font size of the script editor (see [member interface/editor/code_font_size]).
 		</member>
 		<member name="run/window_placement/rect" type="int" setter="" getter="">
+			The window mode to use to display the project when starting the project from the editor.
 		</member>
 		<member name="run/window_placement/rect_custom_position" type="Vector2" setter="" getter="">
+			The custom position to use when starting the project from the editor (in pixels from the top-left corner). Only effective if [member run/window_placement/rect] is set to [b]Custom Position[/b].
 		</member>
 		<member name="run/window_placement/screen" type="int" setter="" getter="">
+			The monitor to display the project on when starting the project from the editor.
 		</member>
 		<member name="text_editor/appearance/caret/caret_blink" type="bool" setter="" getter="">
+			If [code]true[/code], makes the caret blink according to [member text_editor/appearance/caret/caret_blink_speed]. Disabling this setting can improve battery life on laptops if you spend long amounts of time in the script editor, since it will reduce the frequency at which the editor needs to be redrawn.
 		</member>
 		<member name="text_editor/appearance/caret/caret_blink_speed" type="float" setter="" getter="">
+			The interval at which to blink the caret (in seconds). See also [member text_editor/appearance/caret/caret_blink].
 		</member>
 		<member name="text_editor/appearance/caret/highlight_all_occurrences" type="bool" setter="" getter="">
+			If [code]true[/code], highlights all occurrences of the currently selected text in the script editor. See also [member text_editor/theme/highlighting/word_highlighted_color].
 		</member>
 		<member name="text_editor/appearance/caret/highlight_current_line" type="bool" setter="" getter="">
+			If [code]true[/code], colors the background of the line the caret is currently on with [member text_editor/theme/highlighting/current_line_color].
 		</member>
 		<member name="text_editor/appearance/caret/type" type="int" setter="" getter="">
+			The shape of the caret to use in the script editor. [b]Line[/b] displays a vertical line to the left of the current character, whereas [b]Block[/b] displays a outline over the current character.
 		</member>
 		<member name="text_editor/appearance/guidelines/line_length_guideline_hard_column" type="int" setter="" getter="">
+			The column at which to display a subtle line as a line length guideline for scripts. This should generally be greater than [member text_editor/appearance/guidelines/line_length_guideline_soft_column].
 		</member>
 		<member name="text_editor/appearance/guidelines/line_length_guideline_soft_column" type="int" setter="" getter="">
+			The column at which to display a [i]very[/i] subtle line as a line length guideline for scripts. This should generally be lower than [member text_editor/appearance/guidelines/line_length_guideline_hard_column].
 		</member>
 		<member name="text_editor/appearance/guidelines/show_line_length_guidelines" type="bool" setter="" getter="">
+			If [code]true[/code], displays line length guidelines to help you keep line lengths in check. See also [member text_editor/appearance/guidelines/line_length_guideline_soft_column] and [member text_editor/appearance/guidelines/line_length_guideline_hard_column].
 		</member>
 		<member name="text_editor/appearance/gutters/highlight_type_safe_lines" type="bool" setter="" getter="">
+			If [code]true[/code], highlights type-safe lines by displaying their line number color with [member text_editor/theme/highlighting/safe_line_number_color] instead of [member text_editor/theme/highlighting/line_number_color]. Type-safe lines are lines of code where the type of all variables is known at compile-time. These type-safe lines will run faster in Godot 4.0 and later thanks to typed instructions.
 		</member>
 		<member name="text_editor/appearance/gutters/line_numbers_zero_padded" type="bool" setter="" getter="">
+			If [code]true[/code], displays line numbers with zero padding (e.g. [code]007[/code] instead of [code]7[/code]).
 		</member>
 		<member name="text_editor/appearance/gutters/show_bookmark_gutter" type="bool" setter="" getter="">
+			If [code]true[/code], displays a gutter at the left containing icons for bookmarks.
 		</member>
 		<member name="text_editor/appearance/gutters/show_info_gutter" type="bool" setter="" getter="">
+			If [code]true[/code], displays a gutter at the left containing icons for methods with signal connections.
 		</member>
 		<member name="text_editor/appearance/gutters/show_line_numbers" type="bool" setter="" getter="">
+			If [code]true[/code], displays line numbers in the gutter at the left.
 		</member>
 		<member name="text_editor/appearance/lines/code_folding" type="bool" setter="" getter="">
+			If [code]true[/code], displays the folding arrows next to indented code sections and allows code folding. If [code]false[/code], hides the folding arrows next to indented code sections and disallows code folding.
 		</member>
 		<member name="text_editor/appearance/lines/word_wrap" type="int" setter="" getter="">
+			If [code]true[/code], wraps long lines over multiple lines to avoid horizontal scrolling. This is a display-only feature; it does not actually insert line breaks in your scripts.
 		</member>
 		<member name="text_editor/appearance/minimap/minimap_width" type="int" setter="" getter="">
+			The width of the minimap in the script editor (in pixels).
 		</member>
 		<member name="text_editor/appearance/minimap/show_minimap" type="bool" setter="" getter="">
+			If [code]true[/code], draws an overview of the script near the scroll bar. The minimap can be left-clicked to scroll directly to a location in an "absolute" manner.
 		</member>
 		<member name="text_editor/appearance/whitespace/draw_spaces" type="bool" setter="" getter="">
+			If [code]true[/code], draws space characters as centered points.
 		</member>
 		<member name="text_editor/appearance/whitespace/draw_tabs" type="bool" setter="" getter="">
+			If [code]true[/code], draws tab characters as chevrons.
 		</member>
 		<member name="text_editor/appearance/whitespace/line_spacing" type="int" setter="" getter="">
+			The space to add between lines (in pixels). Greater line spacing can help improve readability at the cost of displaying fewer lines on screen.
 		</member>
 		<member name="text_editor/behavior/files/auto_reload_scripts_on_external_change" type="bool" setter="" getter="">
+			If [code]true[/code], automatically reloads scripts in the editor when they have been modified and saved by external editors.
 		</member>
 		<member name="text_editor/behavior/files/autosave_interval_secs" type="int" setter="" getter="">
+			If set to a value greater than [code]0[/code], automatically saves the current script following the specified interval (in seconds). This can be used to prevent data loss if the editor crashes.
 		</member>
 		<member name="text_editor/behavior/files/convert_indent_on_save" type="bool" setter="" getter="">
+			If [code]true[/code], converts indentation to match the script editor's indentation settings when saving a script. See also [member text_editor/behavior/indent/type].
 		</member>
 		<member name="text_editor/behavior/files/restore_scripts_on_load" type="bool" setter="" getter="">
+			If [code]true[/code], reopens scripts that were opened in the last session when the editor is reopened on a given project.
 		</member>
 		<member name="text_editor/behavior/files/trim_trailing_whitespace_on_save" type="bool" setter="" getter="">
+			If [code]true[/code], trims trailing whitespace when saving a script. Trailing whitespace refers to tab and space characters placed at the end of lines. Since these serve no practical purpose, they can and should be removed to make version control diffs less noisy.
 		</member>
 		<member name="text_editor/behavior/indent/auto_indent" type="bool" setter="" getter="">
+			If [code]true[/code], automatically indents code when pressing the [kbd]Enter[/kbd] key based on blocks above the new line.
 		</member>
 		<member name="text_editor/behavior/indent/size" type="int" setter="" getter="">
+			When using tab indentation, determines the length of each tab. When using space indentation, determines how many spaces are inserted when pressing [kbd]Tab[/kbd] and when automatic indentation is performed.
 		</member>
 		<member name="text_editor/behavior/indent/type" type="int" setter="" getter="">
+			The indentation style to use (tabs or spaces).
+			[b]Note:[/b] The [url=https://docs.godotengine.org/en/latest/getting_started/scripting/gdscript/gdscript_styleguide.html]GDScript style guide[/url] recommends using tabs for indentation. It is advised to change this setting only if you need to work on a project that currently uses spaces for indentation.
 		</member>
 		<member name="text_editor/behavior/navigation/drag_and_drop_selection" type="bool" setter="" getter="">
+			If [code]true[/code], allows drag-and-dropping text in the script editor to move text. Disable this if you find yourself accidentally drag-and-dropping text in the script editor.
 		</member>
 		<member name="text_editor/behavior/navigation/move_caret_on_right_click" type="bool" setter="" getter="">
+			If [code]true[/code], the caret will be moved when right-clicking somewhere in the script editor (like when left-clicking or middle-clicking). If [code]false[/code], the caret will only be moved when left-clicking or middle-clicking somewhere.
 		</member>
 		<member name="text_editor/behavior/navigation/scroll_past_end_of_file" type="bool" setter="" getter="">
+			If [code]true[/code], allows scrolling past the end of the file.
 		</member>
 		<member name="text_editor/behavior/navigation/smooth_scrolling" type="bool" setter="" getter="">
+			If [code]true[/code], allows scrolling in sub-line intervals and enables a smooth scrolling animation when using the mouse wheel to scroll.
+			[b]Note:[/b] [member text_editor/behavior/navigation/smooth_scrolling] currently behaves poorly in projects where [member ProjectSettings.physics/common/physics_ticks_per_second] has been increased significantly from its default value ([code]60[/code]). In this case, it is recommended to disable this setting.
 		</member>
 		<member name="text_editor/behavior/navigation/stay_in_script_editor_on_node_selected" type="bool" setter="" getter="">
+			If [code]true[/code], prevents automatically switching between the Script and 2D/3D screens when selecting a node in the Scene tree dock.
 		</member>
 		<member name="text_editor/behavior/navigation/v_scroll_speed" type="int" setter="" getter="">
+			The number of pixels to scroll with every mouse wheel increment. Higher values make the script scroll by faster when using the mouse wheel.
+			[b]Note:[/b] You can hold down [kbd]Alt[/kbd] while using the mouse wheel to temporarily scroll 5 times faster.
 		</member>
 		<member name="text_editor/completion/add_type_hints" type="bool" setter="" getter="">
+			If [code]true[/code], adds static typing hints such as [code]-&gt; void[/code] and [code]: int[/code] when performing method definition autocompletion.
 		</member>
 		<member name="text_editor/completion/auto_brace_complete" type="bool" setter="" getter="">
+			If [code]true[/code], automatically completes braces when making use of code completion.
 		</member>
 		<member name="text_editor/completion/code_complete_delay" type="float" setter="" getter="">
+			The delay in seconds after which autocompletion suggestions should be displayed when the user stops typing.
 		</member>
 		<member name="text_editor/completion/complete_file_paths" type="bool" setter="" getter="">
+			If [code]true[/code], provides autocompletion suggestions for file paths in methods such as [code]load()[/code] and [code]preload()[/code].
 		</member>
 		<member name="text_editor/completion/idle_parse_delay" type="float" setter="" getter="">
+			The delay in seconds after which the script editor should check for errors when the user stops typing.
 		</member>
 		<member name="text_editor/completion/put_callhint_tooltip_below_current_line" type="bool" setter="" getter="">
+			If [code]true[/code], the code completion tooltip will appear below the current line unless there is no space on screen below the current line. If [code]false[/code], the code completion tooltip will appear above the current line.
 		</member>
 		<member name="text_editor/completion/use_single_quotes" type="bool" setter="" getter="">
+			If [code]true[/code], performs string autocompletion with single quotes. If [code]false[/code], performs string autocompletion with double quotes (which matches the [url=https://docs.godotengine.org/en/latest/tutorials/scripting/gdscript/gdscript_styleguide.html]GDScript style guide[/url]).
 		</member>
 		<member name="text_editor/help/class_reference_examples" type="int" setter="" getter="">
+			Controls which multi-line code blocks should be displayed in the editor help. This setting does not affect single-line code literals in the editor help.
 		</member>
 		<member name="text_editor/help/help_font_size" type="int" setter="" getter="">
+			The font size to use for the editor help (built-in class reference).
 		</member>
 		<member name="text_editor/help/help_source_font_size" type="int" setter="" getter="">
+			The font size to use for code samples in the editor help (built-in class reference).
 		</member>
 		<member name="text_editor/help/help_title_font_size" type="int" setter="" getter="">
+			The font size to use for headings in the editor help (built-in class reference).
 		</member>
 		<member name="text_editor/help/show_help_index" type="bool" setter="" getter="">
+			If [code]true[/code], displays a table of contents at the left of the editor help (at the location where the members overview would appear when editing a script).
 		</member>
 		<member name="text_editor/script_list/show_members_overview" type="bool" setter="" getter="">
+			If [code]true[/code], displays an overview of the current script's member variables and functions at the left of the script editor. See also [member text_editor/script_list/sort_members_outline_alphabetically].
 		</member>
 		<member name="text_editor/script_list/sort_members_outline_alphabetically" type="bool" setter="" getter="">
+			If [code]true[/code], sorts the members outline (located at the left of the script editor) using alphabetical order. If [code]false[/code], sorts the members outline depending on the order in which members are found in the script.
+			[b]Note:[/b] Only effective if [member text_editor/script_list/show_members_overview] is [code]true[/code].
 		</member>
 		<member name="text_editor/theme/color_theme" type="String" setter="" getter="">
+			The syntax theme to use in the script editor.
+			You can save your own syntax theme from your current settings by using [b]File &gt; Theme &gt; Save As...[/b] at the top of the script editor. The syntax theme will then be available locally in the list of color themes.
+			You can find additional syntax themes to install in the [url=https://github.com/godotengine/godot-syntax-themes]godot-syntax-themes[/url] repository.
 		</member>
 		<member name="text_editor/theme/highlighting/background_color" type="Color" setter="" getter="">
+			The script editor's background color. If set to a translucent color, the editor theme's base color will be visible behind.
 		</member>
 		<member name="text_editor/theme/highlighting/base_type_color" type="Color" setter="" getter="">
+			The script editor's base type color (used for types like [Vector2], [Vector3], ...).
 		</member>
 		<member name="text_editor/theme/highlighting/bookmark_color" type="Color" setter="" getter="">
+			The script editor's bookmark icon color (displayed in the gutter).
 		</member>
 		<member name="text_editor/theme/highlighting/brace_mismatch_color" type="Color" setter="" getter="">
+			The script editor's brace mismatch color. Used when the caret is currently on a mismatched brace, parenthesis or bracket character.
 		</member>
 		<member name="text_editor/theme/highlighting/breakpoint_color" type="Color" setter="" getter="">
+			The script editor's breakpoint icon color (displayed in the gutter).
 		</member>
 		<member name="text_editor/theme/highlighting/caret_background_color" type="Color" setter="" getter="">
+			The script editor's caret background color.
+			[b]Note:[/b] This setting has no effect as it's currently unused.
 		</member>
 		<member name="text_editor/theme/highlighting/caret_color" type="Color" setter="" getter="">
+			The script editor's caret color.
 		</member>
 		<member name="text_editor/theme/highlighting/code_folding_color" type="Color" setter="" getter="">
+			The script editor's color for the code folding icon (displayed in the gutter).
 		</member>
 		<member name="text_editor/theme/highlighting/comment_color" type="Color" setter="" getter="">
+			The script editor's comment color.
+			[b]Note:[/b] In GDScript, unlike Python, multiline strings are not considered to be comments, and will use the string highlighting color instead.
 		</member>
 		<member name="text_editor/theme/highlighting/completion_background_color" type="Color" setter="" getter="">
+			The script editor's autocompletion box background color.
 		</member>
 		<member name="text_editor/theme/highlighting/completion_existing_color" type="Color" setter="" getter="">
+			The script editor's autocompletion box background color to highlight existing characters in the completion results. This should be a translucent color so that [member text_editor/theme/highlighting/completion_selected_color] can be seen behind.
 		</member>
 		<member name="text_editor/theme/highlighting/completion_font_color" type="Color" setter="" getter="">
+			The script editor's autocompletion box text color.
 		</member>
 		<member name="text_editor/theme/highlighting/completion_scroll_color" type="Color" setter="" getter="">
+			The script editor's autocompletion box scroll bar color.
 		</member>
 		<member name="text_editor/theme/highlighting/completion_scroll_hovered_color" type="Color" setter="" getter="">
+			The script editor's autocompletion box scroll bar color when hovered or pressed with the mouse.
 		</member>
 		<member name="text_editor/theme/highlighting/completion_selected_color" type="Color" setter="" getter="">
+			The script editor's autocompletion box background color for the currently selected line.
 		</member>
 		<member name="text_editor/theme/highlighting/control_flow_keyword_color" type="Color" setter="" getter="">
+			The script editor's control flow keyword color (used for keywords like [code]if[/code], [code]for[/code], [code]return[/code], ...).
 		</member>
 		<member name="text_editor/theme/highlighting/current_line_color" type="Color" setter="" getter="">
+			The script editor's background color for the line the caret is currently on. This should be set to a translucent color so that it can display on top of other line color modifiers such as [member text_editor/theme/highlighting/mark_color].
 		</member>
 		<member name="text_editor/theme/highlighting/engine_type_color" type="Color" setter="" getter="">
+			The script editor's engine type color ([Vector2], [Vector3], [Color], ...).
 		</member>
 		<member name="text_editor/theme/highlighting/executing_line_color" type="Color" setter="" getter="">
+			The script editor's color for the debugger's executing line icon (displayed in the gutter).
 		</member>
 		<member name="text_editor/theme/highlighting/function_color" type="Color" setter="" getter="">
+			The script editor's function call color.
+			[b]Note:[/b] When using the GDScript syntax highlighter, this is replaced by the function declaration color configured in the syntax theme for function declarations (e.g. [code]func _ready():[/code]).
 		</member>
 		<member name="text_editor/theme/highlighting/keyword_color" type="Color" setter="" getter="">
+			The script editor's non-control flow keyword color (used for keywords like [code]var[/code], [code]func[/code], some built-in methods, ...).
 		</member>
 		<member name="text_editor/theme/highlighting/line_length_guideline_color" type="Color" setter="" getter="">
+			The script editor's color for the line length guideline. The "hard" line length guideline will be drawn with this color, whereas the "soft" line length guideline will be drawn with an opacity twice as low.
 		</member>
 		<member name="text_editor/theme/highlighting/line_number_color" type="Color" setter="" getter="">
+			The script editor's color for line numbers. See also [member text_editor/theme/highlighting/safe_line_number_color].
 		</member>
 		<member name="text_editor/theme/highlighting/mark_color" type="Color" setter="" getter="">
+			The script editor's background color for lines with errors. This should be set to a translucent color so that it can display on top of other line color modifiers such as [member text_editor/theme/highlighting/current_line_color].
 		</member>
 		<member name="text_editor/theme/highlighting/member_variable_color" type="Color" setter="" getter="">
+			The script editor's color for member variables on objects (e.g. [code]self.some_property[/code]).
+			[b]Note:[/b] This color is not used for local variable declaration and access.
 		</member>
 		<member name="text_editor/theme/highlighting/number_color" type="Color" setter="" getter="">
+			The script editor's color for numbers (integer and floating-point).
 		</member>
 		<member name="text_editor/theme/highlighting/safe_line_number_color" type="Color" setter="" getter="">
+			The script editor's color for type-safe line numbers. See also [member text_editor/theme/highlighting/line_number_color].
+			[b]Note:[/b] Only displayed if [member text_editor/appearance/gutters/highlight_type_safe_lines] is [code]true[/code].
 		</member>
 		<member name="text_editor/theme/highlighting/search_result_border_color" type="Color" setter="" getter="">
+			The script editor's color for the border of search results. This border helps bring further attention to the search result. Set this color's opacity to 0 to disable the border.
 		</member>
 		<member name="text_editor/theme/highlighting/search_result_color" type="Color" setter="" getter="">
+			The script editor's background color for search results.
 		</member>
 		<member name="text_editor/theme/highlighting/selection_color" type="Color" setter="" getter="">
+			The script editor's background color for the currently selected text.
 		</member>
 		<member name="text_editor/theme/highlighting/string_color" type="Color" setter="" getter="">
+			The script editor's color for strings (single-line and multi-line).
 		</member>
 		<member name="text_editor/theme/highlighting/symbol_color" type="Color" setter="" getter="">
+			The script editor's color for operators ([code]( ) [ ] { } + - * /[/code], ...).
 		</member>
 		<member name="text_editor/theme/highlighting/text_color" type="Color" setter="" getter="">
+			The script editor's color for text not highlighted by any syntax highlighting rule.
 		</member>
 		<member name="text_editor/theme/highlighting/text_selected_color" type="Color" setter="" getter="">
+			The script editor's background color for text. This should be set to a translucent color so that it can display on top of other line color modifiers such as [member text_editor/theme/highlighting/current_line_color].
 		</member>
 		<member name="text_editor/theme/highlighting/user_type_color" type="Color" setter="" getter="">
+			The script editor's color for user-defined types (using [code]@class_name[/code]).
 		</member>
 		<member name="text_editor/theme/highlighting/word_highlighted_color" type="Color" setter="" getter="">
+			The script editor's color for words highlighted by selecting them. Only visible if [member text_editor/appearance/caret/highlight_all_occurrences] is [code]true[/code].
 		</member>
 	</members>
 	<signals>
diff --git a/doc/classes/EditorTranslationParserPlugin.xml b/doc/classes/EditorTranslationParserPlugin.xml
index 84a671a93c..bbae06899c 100644
--- a/doc/classes/EditorTranslationParserPlugin.xml
+++ b/doc/classes/EditorTranslationParserPlugin.xml
@@ -111,9 +111,9 @@
 		</method>
 		<method name="_parse_file" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="msgids" type="Array" />
-			<argument index="2" name="msgids_context_plural" type="Array" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="msgids" type="Array" />
+			<param index="2" name="msgids_context_plural" type="Array" />
 			<description>
 				Override this method to define a custom parsing logic to extract the translatable strings.
 			</description>
diff --git a/doc/classes/EditorVCSInterface.xml b/doc/classes/EditorVCSInterface.xml
index 0215d81a4e..cc75861130 100644
--- a/doc/classes/EditorVCSInterface.xml
+++ b/doc/classes/EditorVCSInterface.xml
@@ -11,14 +11,14 @@
 	<methods>
 		<method name="commit">
 			<return type="void" />
-			<argument index="0" name="msg" type="String" />
+			<param index="0" name="msg" type="String" />
 			<description>
 				Creates a version commit if the addon is initialized, else returns without doing anything. Uses the files which have been staged previously, with the commit message set to a value as provided as in the argument.
 			</description>
 		</method>
 		<method name="get_file_diff">
 			<return type="Array" />
-			<argument index="0" name="file_path" type="String" />
+			<param index="0" name="file_path" type="String" />
 			<description>
 				Returns an [Array] of [Dictionary] objects containing the diff output from the VCS in use, if a VCS addon is initialized, else returns an empty [Array] object. The diff contents also consist of some contextual lines which provide context to the observed line change in the file.
 				Each [Dictionary] object has the line diff contents under the keys:
@@ -56,7 +56,7 @@
 		</method>
 		<method name="initialize">
 			<return type="bool" />
-			<argument index="0" name="project_root_path" type="String" />
+			<param index="0" name="project_root_path" type="String" />
 			<description>
 				Initializes the VCS addon if not already. Uses the argument value as the path to the working directory of the project. Creates the initial commit if required. Returns [code]true[/code] if no failure occurs, else returns [code]false[/code].
 			</description>
@@ -81,14 +81,14 @@
 		</method>
 		<method name="stage_file">
 			<return type="void" />
-			<argument index="0" name="file_path" type="String" />
+			<param index="0" name="file_path" type="String" />
 			<description>
 				Stages the file which should be committed when [method EditorVCSInterface.commit] is called. Argument should contain the absolute path.
 			</description>
 		</method>
 		<method name="unstage_file">
 			<return type="void" />
-			<argument index="0" name="file_path" type="String" />
+			<param index="0" name="file_path" type="String" />
 			<description>
 				Unstages the file which was staged previously to be committed, so that it is no longer committed when [method EditorVCSInterface.commit] is called. Argument should contain the absolute path.
 			</description>
diff --git a/doc/classes/Engine.xml b/doc/classes/Engine.xml
index 36dfee833b..2350a1f51b 100644
--- a/doc/classes/Engine.xml
+++ b/doc/classes/Engine.xml
@@ -9,6 +9,20 @@
 	<tutorials>
 	</tutorials>
 	<methods>
+		<method name="get_architecture_name" qualifiers="const">
+			<return type="String" />
+			<description>
+				Returns the name of the CPU architecture the Godot binary was built for. Possible return values are [code]x86_64[/code], [code]x86_32[/code], [code]arm64[/code], [code]armv7[/code], [code]rv64[/code], [code]riscv[/code], [code]ppc64[/code], [code]ppc[/code], [code]wasm64[/code] and [code]wasm32[/code].
+				To detect whether the current CPU architecture is 64-bit, you can use the fact that all 64-bit architecture names have [code]64[/code] in their name:
+				[codeblock]
+				if "64" in Engine.get_architecture_name():
+				    print("Running on 64-bit CPU.")
+				else:
+				    print("Running on 32-bit CPU.")
+				[/codeblock]
+				[b]Note:[/b] [method get_architecture_name] does [i]not[/i] return the name of the host CPU architecture. For example, if running an x86_32 Godot binary on a x86_64 system, the returned value will be [code]x86_32[/code].
+			</description>
+		</method>
 		<method name="get_author_info" qualifiers="const">
 			<return type="Dictionary" />
 			<description>
@@ -96,7 +110,7 @@
 		</method>
 		<method name="get_script_language" qualifiers="const">
 			<return type="ScriptLanguage" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
@@ -107,9 +121,9 @@
 		</method>
 		<method name="get_singleton" qualifiers="const">
 			<return type="Object" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns a global singleton with given [code]name[/code]. Often used for plugins, e.g. GodotPayments.
+				Returns a global singleton with given [param name]. Often used for plugins, e.g. GodotPayments.
 			</description>
 		</method>
 		<method name="get_singleton_list" qualifiers="const">
@@ -159,9 +173,9 @@
 		</method>
 		<method name="has_singleton" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns [code]true[/code] if a singleton with given [code]name[/code] exists in global scope.
+				Returns [code]true[/code] if a singleton with given [param name] exists in global scope.
 			</description>
 		</method>
 		<method name="is_editor_hint" qualifiers="const">
@@ -186,20 +200,20 @@
 		</method>
 		<method name="register_script_language">
 			<return type="void" />
-			<argument index="0" name="language" type="ScriptLanguage" />
+			<param index="0" name="language" type="ScriptLanguage" />
 			<description>
 			</description>
 		</method>
 		<method name="register_singleton">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="instance" type="Object" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="instance" type="Object" />
 			<description>
 			</description>
 		</method>
 		<method name="unregister_singleton">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/EngineDebugger.xml b/doc/classes/EngineDebugger.xml
index cd502dce81..176bc1f135 100644
--- a/doc/classes/EngineDebugger.xml
+++ b/doc/classes/EngineDebugger.xml
@@ -11,14 +11,14 @@
 	<methods>
 		<method name="has_capture">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns [code]true[/code] if a capture with the given name is present otherwise [code]false[/code].
 			</description>
 		</method>
 		<method name="has_profiler">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns [code]true[/code] if a profiler with the given name is present otherwise [code]false[/code].
 			</description>
@@ -31,65 +31,65 @@
 		</method>
 		<method name="is_profiling">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns [code]true[/code] if a profiler with the given name is present and active otherwise [code]false[/code].
 			</description>
 		</method>
 		<method name="profiler_add_frame_data">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="data" type="Array" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="data" type="Array" />
 			<description>
-				Calls the [code]add[/code] callable of the profiler with given [code]name[/code] and [code]data[/code].
+				Calls the [code]add[/code] callable of the profiler with given [param name] and [param data].
 			</description>
 		</method>
 		<method name="profiler_enable">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="enable" type="bool" />
-			<argument index="2" name="arguments" type="Array" default="[]" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="enable" type="bool" />
+			<param index="2" name="arguments" type="Array" default="[]" />
 			<description>
-				Calls the [code]toggle[/code] callable of the profiler with given [code]name[/code] and [code]arguments[/code]. Enables/Disables the same profiler depending on [code]enable[/code] argument.
+				Calls the [code]toggle[/code] callable of the profiler with given [param name] and [param arguments]. Enables/Disables the same profiler depending on [code]enable[/code] argument.
 			</description>
 		</method>
 		<method name="register_message_capture">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="callable" type="Callable" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="callable" type="Callable" />
 			<description>
-				Registers a message capture with given [code]name[/code]. If [code]name[/code] is "my_message" then messages starting with "my_message:" will be called with the given callable.
+				Registers a message capture with given [param name]. If [param name] is "my_message" then messages starting with "my_message:" will be called with the given callable.
 				Callable must accept a message string and a data array as argument. If the message and data are valid then callable must return [code]true[/code] otherwise [code]false[/code].
 			</description>
 		</method>
 		<method name="register_profiler">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="profiler" type="EngineProfiler" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="profiler" type="EngineProfiler" />
 			<description>
-				Registers a profiler with the given [code]name[/code]. See [EngineProfiler] for more information.
+				Registers a profiler with the given [param name]. See [EngineProfiler] for more information.
 			</description>
 		</method>
 		<method name="send_message">
 			<return type="void" />
-			<argument index="0" name="message" type="String" />
-			<argument index="1" name="data" type="Array" />
+			<param index="0" name="message" type="String" />
+			<param index="1" name="data" type="Array" />
 			<description>
-				Sends a message with given [code]message[/code] and [code]data[/code] array.
+				Sends a message with given [param message] and [param data] array.
 			</description>
 		</method>
 		<method name="unregister_message_capture">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Unregisters the message capture with given [code]name[/code].
+				Unregisters the message capture with given [param name].
 			</description>
 		</method>
 		<method name="unregister_profiler">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Unregisters a profiler with given [code]name[/code].
+				Unregisters a profiler with given [param name].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/EngineProfiler.xml b/doc/classes/EngineProfiler.xml
index 752ecda867..a7a66c4564 100644
--- a/doc/classes/EngineProfiler.xml
+++ b/doc/classes/EngineProfiler.xml
@@ -12,27 +12,27 @@
 	<methods>
 		<method name="_add_frame" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="data" type="Array" />
+			<param index="0" name="data" type="Array" />
 			<description>
 				Called when data is added to profiler using [method EngineDebugger.profiler_add_frame_data].
 			</description>
 		</method>
 		<method name="_tick" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="frame_time" type="float" />
-			<argument index="1" name="process_time" type="float" />
-			<argument index="2" name="physics_time" type="float" />
-			<argument index="3" name="physics_frame_time" type="float" />
+			<param index="0" name="frame_time" type="float" />
+			<param index="1" name="process_time" type="float" />
+			<param index="2" name="physics_time" type="float" />
+			<param index="3" name="physics_frame_time" type="float" />
 			<description>
 				Called once every engine iteration when the profiler is active with information about the current frame. All time values are in seconds. Lower values represent faster processing times and are therefore considered better.
 			</description>
 		</method>
 		<method name="_toggle" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
-			<argument index="1" name="options" type="Array" />
+			<param index="0" name="enable" type="bool" />
+			<param index="1" name="options" type="Array" />
 			<description>
-				Called when the profiler is enabled/disabled, along with a set of [code]options[/code].
+				Called when the profiler is enabled/disabled, along with a set of [param options].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/Environment.xml b/doc/classes/Environment.xml
index f662a07825..864dbd423a 100644
--- a/doc/classes/Environment.xml
+++ b/doc/classes/Environment.xml
@@ -20,17 +20,17 @@
 	<methods>
 		<method name="get_glow_level" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the intensity of the glow level [code]idx[/code].
+				Returns the intensity of the glow level [param idx].
 			</description>
 		</method>
 		<method name="set_glow_level">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="intensity" type="float" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="intensity" type="float" />
 			<description>
-				Sets the intensity of the glow level [code]idx[/code]. A value above [code]0.0[/code] enables the level. Each level relies on the previous level. This means that enabling higher glow levels will slow down the glow effect rendering, even if previous levels aren't enabled.
+				Sets the intensity of the glow level [param idx]. A value above [code]0.0[/code] enables the level. Each level relies on the previous level. This means that enabling higher glow levels will slow down the glow effect rendering, even if previous levels aren't enabled.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/Expression.xml b/doc/classes/Expression.xml
index 50979c9b68..3a397f56a9 100644
--- a/doc/classes/Expression.xml
+++ b/doc/classes/Expression.xml
@@ -53,10 +53,10 @@
 	<methods>
 		<method name="execute">
 			<return type="Variant" />
-			<argument index="0" name="inputs" type="Array" default="[]" />
-			<argument index="1" name="base_instance" type="Object" default="null" />
-			<argument index="2" name="show_error" type="bool" default="true" />
-			<argument index="3" name="const_calls_only" type="bool" default="false" />
+			<param index="0" name="inputs" type="Array" default="[]" />
+			<param index="1" name="base_instance" type="Object" default="null" />
+			<param index="2" name="show_error" type="bool" default="true" />
+			<param index="3" name="const_calls_only" type="bool" default="false" />
 			<description>
 				Executes the expression that was previously parsed by [method parse] and returns the result. Before you use the returned object, you should check if the method failed by calling [method has_execute_failed].
 				If you defined input variables in [method parse], you can specify their values in the inputs array, in the same order.
@@ -76,11 +76,11 @@
 		</method>
 		<method name="parse">
 			<return type="int" enum="Error" />
-			<argument index="0" name="expression" type="String" />
-			<argument index="1" name="input_names" type="PackedStringArray" default="PackedStringArray()" />
+			<param index="0" name="expression" type="String" />
+			<param index="1" name="input_names" type="PackedStringArray" default="PackedStringArray()" />
 			<description>
 				Parses the expression and returns an [enum Error] code.
-				You can optionally specify names of variables that may appear in the expression with [code]input_names[/code], so that you can bind them when it gets executed.
+				You can optionally specify names of variables that may appear in the expression with [param input_names], so that you can bind them when it gets executed.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/File.xml b/doc/classes/File.xml
index 3a2776ff21..76c6a4871c 100644
--- a/doc/classes/File.xml
+++ b/doc/classes/File.xml
@@ -76,7 +76,7 @@
 		</method>
 		<method name="file_exists" qualifiers="static">
 			<return type="bool" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Returns [code]true[/code] if the file exists in the given path.
 				[b]Note:[/b] Many resources types are imported (e.g. textures or sound files), and their source asset will not be included in the exported game, as only the imported version is used. See [method ResourceLoader.exists] for an alternative approach that takes resource remapping into account.
@@ -115,24 +115,24 @@
 		</method>
 		<method name="get_as_text" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="skip_cr" type="bool" default="false" />
+			<param index="0" name="skip_cr" type="bool" default="false" />
 			<description>
 				Returns the whole file as a [String]. Text is interpreted as being UTF-8 encoded.
-				If [code]skip_cr[/code] is [code]true[/code], carriage return characters ([code]\r[/code], CR) will be ignored when parsing the UTF-8, so that only line feed characters ([code]\n[/code], LF) represent a new line (Unix convention).
+				If [param skip_cr] is [code]true[/code], carriage return characters ([code]\r[/code], CR) will be ignored when parsing the UTF-8, so that only line feed characters ([code]\n[/code], LF) represent a new line (Unix convention).
 			</description>
 		</method>
 		<method name="get_buffer" qualifiers="const">
 			<return type="PackedByteArray" />
-			<argument index="0" name="length" type="int" />
+			<param index="0" name="length" type="int" />
 			<description>
-				Returns next [code]length[/code] bytes of the file as a [PackedByteArray].
+				Returns next [param length] bytes of the file as a [PackedByteArray].
 			</description>
 		</method>
 		<method name="get_csv_line" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="delim" type="String" default="&quot;,&quot;" />
+			<param index="0" name="delim" type="String" default="&quot;,&quot;" />
 			<description>
-				Returns the next value of the file in CSV (Comma-Separated Values) format. You can pass a different delimiter [code]delim[/code] to use other than the default [code]","[/code] (comma). This delimiter must be one-character long, and cannot be a double quotation mark.
+				Returns the next value of the file in CSV (Comma-Separated Values) format. You can pass a different delimiter [param delim] to use other than the default [code]","[/code] (comma). This delimiter must be one-character long, and cannot be a double quotation mark.
 				Text is interpreted as being UTF-8 encoded. Text values must be enclosed in double quotes if they include the delimiter character. Double quotes within a text value can be escaped by doubling their occurrence.
 				For example, the following CSV lines are valid and will be properly parsed as two strings each:
 				[codeblock]
@@ -176,16 +176,16 @@
 		</method>
 		<method name="get_md5" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Returns an MD5 String representing the file at the given path or an empty [String] on failure.
 			</description>
 		</method>
 		<method name="get_modified_time" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="file" type="String" />
+			<param index="0" name="file" type="String" />
 			<description>
-				Returns the last time the [code]file[/code] was modified in Unix timestamp format or returns a [String] "ERROR IN [code]file[/code]". This Unix timestamp can be converted to another format using the [Time] singleton.
+				Returns the last time the [param file] was modified in Unix timestamp format or returns a [String] "ERROR IN [code]file[/code]". This Unix timestamp can be converted to another format using the [Time] singleton.
 			</description>
 		</method>
 		<method name="get_pascal_string">
@@ -221,16 +221,16 @@
 		</method>
 		<method name="get_sha256" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Returns a SHA-256 [String] representing the file at the given path or an empty [String] on failure.
 			</description>
 		</method>
 		<method name="get_var" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="allow_objects" type="bool" default="false" />
+			<param index="0" name="allow_objects" type="bool" default="false" />
 			<description>
-				Returns the next [Variant] value from the file. If [code]allow_objects[/code] is [code]true[/code], decoding objects is allowed.
+				Returns the next [Variant] value from the file. If [param allow_objects] is [code]true[/code], decoding objects is allowed.
 				[b]Warning:[/b] Deserialized objects can contain code which gets executed. Do not use this option if the serialized object comes from untrusted sources to avoid potential security threats such as remote code execution.
 			</description>
 		</method>
@@ -242,17 +242,17 @@
 		</method>
 		<method name="open">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="flags" type="int" enum="File.ModeFlags" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="flags" type="int" enum="File.ModeFlags" />
 			<description>
 				Opens the file for writing or reading, depending on the flags.
 			</description>
 		</method>
 		<method name="open_compressed">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="mode_flags" type="int" enum="File.ModeFlags" />
-			<argument index="2" name="compression_mode" type="int" enum="File.CompressionMode" default="0" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="mode_flags" type="int" enum="File.ModeFlags" />
+			<param index="2" name="compression_mode" type="int" enum="File.CompressionMode" default="0" />
 			<description>
 				Opens a compressed file for reading or writing.
 				[b]Note:[/b] [method open_compressed] can only read files that were saved by Godot, not third-party compression formats. See [url=https://github.com/godotengine/godot/issues/28999]GitHub issue #28999[/url] for a workaround.
@@ -260,9 +260,9 @@
 		</method>
 		<method name="open_encrypted">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="mode_flags" type="int" enum="File.ModeFlags" />
-			<argument index="2" name="key" type="PackedByteArray" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="mode_flags" type="int" enum="File.ModeFlags" />
+			<param index="2" name="key" type="PackedByteArray" />
 			<description>
 				Opens an encrypted file in write or read mode. You need to pass a binary key to encrypt/decrypt it.
 				[b]Note:[/b] The provided key must be 32 bytes long.
@@ -270,23 +270,23 @@
 		</method>
 		<method name="open_encrypted_with_pass">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="mode_flags" type="int" enum="File.ModeFlags" />
-			<argument index="2" name="pass" type="String" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="mode_flags" type="int" enum="File.ModeFlags" />
+			<param index="2" name="pass" type="String" />
 			<description>
 				Opens an encrypted file in write or read mode. You need to pass a password to encrypt/decrypt it.
 			</description>
 		</method>
 		<method name="seek">
 			<return type="void" />
-			<argument index="0" name="position" type="int" />
+			<param index="0" name="position" type="int" />
 			<description>
 				Changes the file reading/writing cursor to the specified position (in bytes from the beginning of the file).
 			</description>
 		</method>
 		<method name="seek_end">
 			<return type="void" />
-			<argument index="0" name="position" type="int" default="0" />
+			<param index="0" name="position" type="int" default="0" />
 			<description>
 				Changes the file reading/writing cursor to the specified position (in bytes from the end of the file).
 				[b]Note:[/b] This is an offset, so you should use negative numbers or the cursor will be at the end of the file.
@@ -294,10 +294,10 @@
 		</method>
 		<method name="store_16">
 			<return type="void" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Stores an integer as 16 bits in the file.
-				[b]Note:[/b] The [code]value[/code] should lie in the interval [code][0, 2^16 - 1][/code]. Any other value will overflow and wrap around.
+				[b]Note:[/b] The [param value] should lie in the interval [code][0, 2^16 - 1][/code]. Any other value will overflow and wrap around.
 				To store a signed integer, use [method store_64] or store a signed integer from the interval [code][-2^15, 2^15 - 1][/code] (i.e. keeping one bit for the signedness) and compute its sign manually when reading. For example:
 				[codeblocks]
 				[gdscript]
@@ -337,70 +337,70 @@
 		</method>
 		<method name="store_32">
 			<return type="void" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Stores an integer as 32 bits in the file.
-				[b]Note:[/b] The [code]value[/code] should lie in the interval [code][0, 2^32 - 1][/code]. Any other value will overflow and wrap around.
+				[b]Note:[/b] The [param value] should lie in the interval [code][0, 2^32 - 1][/code]. Any other value will overflow and wrap around.
 				To store a signed integer, use [method store_64], or convert it manually (see [method store_16] for an example).
 			</description>
 		</method>
 		<method name="store_64">
 			<return type="void" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Stores an integer as 64 bits in the file.
-				[b]Note:[/b] The [code]value[/code] must lie in the interval [code][-2^63, 2^63 - 1][/code] (i.e. be a valid [int] value).
+				[b]Note:[/b] The [param value] must lie in the interval [code][-2^63, 2^63 - 1][/code] (i.e. be a valid [int] value).
 			</description>
 		</method>
 		<method name="store_8">
 			<return type="void" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Stores an integer as 8 bits in the file.
-				[b]Note:[/b] The [code]value[/code] should lie in the interval [code][0, 255][/code]. Any other value will overflow and wrap around.
+				[b]Note:[/b] The [param value] should lie in the interval [code][0, 255][/code]. Any other value will overflow and wrap around.
 				To store a signed integer, use [method store_64], or convert it manually (see [method store_16] for an example).
 			</description>
 		</method>
 		<method name="store_buffer">
 			<return type="void" />
-			<argument index="0" name="buffer" type="PackedByteArray" />
+			<param index="0" name="buffer" type="PackedByteArray" />
 			<description>
 				Stores the given array of bytes in the file.
 			</description>
 		</method>
 		<method name="store_csv_line">
 			<return type="void" />
-			<argument index="0" name="values" type="PackedStringArray" />
-			<argument index="1" name="delim" type="String" default="&quot;,&quot;" />
+			<param index="0" name="values" type="PackedStringArray" />
+			<param index="1" name="delim" type="String" default="&quot;,&quot;" />
 			<description>
-				Store the given [PackedStringArray] in the file as a line formatted in the CSV (Comma-Separated Values) format. You can pass a different delimiter [code]delim[/code] to use other than the default [code]","[/code] (comma). This delimiter must be one-character long.
+				Store the given [PackedStringArray] in the file as a line formatted in the CSV (Comma-Separated Values) format. You can pass a different delimiter [param delim] to use other than the default [code]","[/code] (comma). This delimiter must be one-character long.
 				Text will be encoded as UTF-8.
 			</description>
 		</method>
 		<method name="store_double">
 			<return type="void" />
-			<argument index="0" name="value" type="float" />
+			<param index="0" name="value" type="float" />
 			<description>
 				Stores a floating-point number as 64 bits in the file.
 			</description>
 		</method>
 		<method name="store_float">
 			<return type="void" />
-			<argument index="0" name="value" type="float" />
+			<param index="0" name="value" type="float" />
 			<description>
 				Stores a floating-point number as 32 bits in the file.
 			</description>
 		</method>
 		<method name="store_line">
 			<return type="void" />
-			<argument index="0" name="line" type="String" />
+			<param index="0" name="line" type="String" />
 			<description>
-				Appends [code]line[/code] to the file followed by a line return character ([code]\n[/code]), encoding the text as UTF-8.
+				Appends [param line] to the file followed by a line return character ([code]\n[/code]), encoding the text as UTF-8.
 			</description>
 		</method>
 		<method name="store_pascal_string">
 			<return type="void" />
-			<argument index="0" name="string" type="String" />
+			<param index="0" name="string" type="String" />
 			<description>
 				Stores the given [String] as a line in the file in Pascal format (i.e. also store the length of the string).
 				Text will be encoded as UTF-8.
@@ -408,25 +408,25 @@
 		</method>
 		<method name="store_real">
 			<return type="void" />
-			<argument index="0" name="value" type="float" />
+			<param index="0" name="value" type="float" />
 			<description>
 				Stores a floating-point number in the file.
 			</description>
 		</method>
 		<method name="store_string">
 			<return type="void" />
-			<argument index="0" name="string" type="String" />
+			<param index="0" name="string" type="String" />
 			<description>
-				Appends [code]string[/code] to the file without a line return, encoding the text as UTF-8.
+				Appends [param string] to the file without a line return, encoding the text as UTF-8.
 				[b]Note:[/b] This method is intended to be used to write text files. The string is stored as a UTF-8 encoded buffer without string length or terminating zero, which means that it can't be loaded back easily. If you want to store a retrievable string in a binary file, consider using [method store_pascal_string] instead. For retrieving strings from a text file, you can use [code]get_buffer(length).get_string_from_utf8()[/code] (if you know the length) or [method get_as_text].
 			</description>
 		</method>
 		<method name="store_var">
 			<return type="void" />
-			<argument index="0" name="value" type="Variant" />
-			<argument index="1" name="full_objects" type="bool" default="false" />
+			<param index="0" name="value" type="Variant" />
+			<param index="1" name="full_objects" type="bool" default="false" />
 			<description>
-				Stores any Variant value in the file. If [code]full_objects[/code] is [code]true[/code], encoding objects is allowed (and can potentially include code).
+				Stores any Variant value in the file. If [param full_objects] is [code]true[/code], encoding objects is allowed (and can potentially include code).
 				[b]Note:[/b] Not all properties are included. Only properties that are configured with the [constant PROPERTY_USAGE_STORAGE] flag set will be serialized. You can add a new usage flag to a property by overriding the [method Object._get_property_list] method in your class. You can also check how property usage is configured by calling [method Object._get_property_list]. See [enum PropertyUsageFlags] for the possible usage flags.
 			</description>
 		</method>
diff --git a/doc/classes/FileDialog.xml b/doc/classes/FileDialog.xml
index f45031cea8..ba6f4ffb89 100644
--- a/doc/classes/FileDialog.xml
+++ b/doc/classes/FileDialog.xml
@@ -11,12 +11,12 @@
 	<methods>
 		<method name="add_filter">
 			<return type="void" />
-			<argument index="0" name="filter" type="String" />
-			<argument index="1" name="description" type="String" default="&quot;&quot;" />
+			<param index="0" name="filter" type="String" />
+			<param index="1" name="description" type="String" default="&quot;&quot;" />
 			<description>
-				Adds a comma-delimited file name [code]filter[/code] option to the [FileDialog] with an optional [code]description[/code], which restricts what files can be picked.
-				A [code]filter[/code] should be of the form [code]"filename.extension"[/code], where filename and extension can be [code]*[/code] to match any string. Filters starting with [code].[/code] (i.e. empty filenames) are not allowed.
-				For example, a [code]filter[/code] of [code]"*.png, *.jpg"[/code] and a [code]description[/code] of [code]"Images"[/code] results in filter text "Images (*.png, *.jpg)".
+				Adds a comma-delimited file name [param filter] option to the [FileDialog] with an optional [param description], which restricts what files can be picked.
+				A [param filter] should be of the form [code]"filename.extension"[/code], where filename and extension can be [code]*[/code] to match any string. Filters starting with [code].[/code] (i.e. empty filenames) are not allowed.
+				For example, a [param filter] of [code]"*.png, *.jpg"[/code] and a [param description] of [code]"Images"[/code] results in filter text "Images (*.png, *.jpg)".
 			</description>
 		</method>
 		<method name="clear_filters">
@@ -86,19 +86,19 @@
 	</members>
 	<signals>
 		<signal name="dir_selected">
-			<argument index="0" name="dir" type="String" />
+			<param index="0" name="dir" type="String" />
 			<description>
 				Emitted when the user selects a directory.
 			</description>
 		</signal>
 		<signal name="file_selected">
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Emitted when the user selects a file by double-clicking it or pressing the [b]OK[/b] button.
 			</description>
 		</signal>
 		<signal name="files_selected">
-			<argument index="0" name="paths" type="PackedStringArray" />
+			<param index="0" name="paths" type="PackedStringArray" />
 			<description>
 				Emitted when the user selects multiple files.
 			</description>
diff --git a/doc/classes/FileSystemDock.xml b/doc/classes/FileSystemDock.xml
index 31299deb7d..22048c6761 100644
--- a/doc/classes/FileSystemDock.xml
+++ b/doc/classes/FileSystemDock.xml
@@ -9,7 +9,7 @@
 	<methods>
 		<method name="navigate_to_path">
 			<return type="void" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
@@ -20,34 +20,34 @@
 			</description>
 		</signal>
 		<signal name="file_removed">
-			<argument index="0" name="file" type="String" />
+			<param index="0" name="file" type="String" />
 			<description>
 			</description>
 		</signal>
 		<signal name="files_moved">
-			<argument index="0" name="old_file" type="String" />
-			<argument index="1" name="new_file" type="String" />
+			<param index="0" name="old_file" type="String" />
+			<param index="1" name="new_file" type="String" />
 			<description>
 			</description>
 		</signal>
 		<signal name="folder_moved">
-			<argument index="0" name="old_folder" type="String" />
-			<argument index="1" name="new_file" type="String" />
+			<param index="0" name="old_folder" type="String" />
+			<param index="1" name="new_file" type="String" />
 			<description>
 			</description>
 		</signal>
 		<signal name="folder_removed">
-			<argument index="0" name="folder" type="String" />
+			<param index="0" name="folder" type="String" />
 			<description>
 			</description>
 		</signal>
 		<signal name="inherit">
-			<argument index="0" name="file" type="String" />
+			<param index="0" name="file" type="String" />
 			<description>
 			</description>
 		</signal>
 		<signal name="instance">
-			<argument index="0" name="files" type="PackedStringArray" />
+			<param index="0" name="files" type="PackedStringArray" />
 			<description>
 			</description>
 		</signal>
diff --git a/doc/classes/Font.xml b/doc/classes/Font.xml
index ec2776f636..ad3a16afbb 100644
--- a/doc/classes/Font.xml
+++ b/doc/classes/Font.xml
@@ -11,116 +11,116 @@
 	<methods>
 		<method name="draw_char" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="canvas_item" type="RID" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="char" type="int" />
-			<argument index="3" name="font_size" type="int" />
-			<argument index="4" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="canvas_item" type="RID" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="char" type="int" />
+			<param index="3" name="font_size" type="int" />
+			<param index="4" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
-				Draw a single Unicode character [code]char[/code] into a canvas item using the font, at a given position, with [code]modulate[/code] color. [code]position[/code] specifies the baseline, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis.
+				Draw a single Unicode character [param char] into a canvas item using the font, at a given position, with [param modulate] color. [param pos] specifies the baseline, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis.
 				[b]Note:[/b] Do not use this function to draw strings character by character, use [method draw_string] or [TextLine] instead.
 			</description>
 		</method>
 		<method name="draw_char_outline" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="canvas_item" type="RID" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="char" type="int" />
-			<argument index="3" name="font_size" type="int" />
-			<argument index="4" name="size" type="int" default="-1" />
-			<argument index="5" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="canvas_item" type="RID" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="char" type="int" />
+			<param index="3" name="font_size" type="int" />
+			<param index="4" name="size" type="int" default="-1" />
+			<param index="5" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
-				Draw a single Unicode character [code]char[/code] outline into a canvas item using the font, at a given position, with [code]modulate[/code] color and [code]size[/code] outline size. [code]position[/code] specifies the baseline, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis.
+				Draw a single Unicode character [param char] outline into a canvas item using the font, at a given position, with [param modulate] color and [param size] outline size. [param pos] specifies the baseline, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis.
 				[b]Note:[/b] Do not use this function to draw strings character by character, use [method draw_string] or [TextLine] instead.
 			</description>
 		</method>
 		<method name="draw_multiline_string" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="canvas_item" type="RID" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="text" type="String" />
-			<argument index="3" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
-			<argument index="4" name="width" type="float" default="-1" />
-			<argument index="5" name="font_size" type="int" default="16" />
-			<argument index="6" name="max_lines" type="int" default="-1" />
-			<argument index="7" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="8" name="brk_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
-			<argument index="9" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
-			<argument index="10" name="direction" type="int" enum="TextServer.Direction" default="0" />
-			<argument index="11" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
+			<param index="0" name="canvas_item" type="RID" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="text" type="String" />
+			<param index="3" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
+			<param index="4" name="width" type="float" default="-1" />
+			<param index="5" name="font_size" type="int" default="16" />
+			<param index="6" name="max_lines" type="int" default="-1" />
+			<param index="7" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="8" name="brk_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
+			<param index="9" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
+			<param index="10" name="direction" type="int" enum="TextServer.Direction" default="0" />
+			<param index="11" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
-				Breaks [code]text[/code] to the lines using rules specified by [code]flags[/code] and draws it into a canvas item using the font, at a given position, with [code]modulate[/code] color, optionally clipping the width and aligning horizontally. [code]position[/code] specifies the baseline of the first line, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis.
+				Breaks [param text] into lines using rules specified by [param brk_flags] and draws it into a canvas item using the font, at a given position, with [param modulate] color, optionally clipping the width and aligning horizontally. [param pos] specifies the baseline of the first line, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis.
 				See also [method CanvasItem.draw_multiline_string].
 			</description>
 		</method>
 		<method name="draw_multiline_string_outline" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="canvas_item" type="RID" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="text" type="String" />
-			<argument index="3" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
-			<argument index="4" name="width" type="float" default="-1" />
-			<argument index="5" name="font_size" type="int" default="16" />
-			<argument index="6" name="max_lines" type="int" default="-1" />
-			<argument index="7" name="size" type="int" default="1" />
-			<argument index="8" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="9" name="brk_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
-			<argument index="10" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
-			<argument index="11" name="direction" type="int" enum="TextServer.Direction" default="0" />
-			<argument index="12" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
+			<param index="0" name="canvas_item" type="RID" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="text" type="String" />
+			<param index="3" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
+			<param index="4" name="width" type="float" default="-1" />
+			<param index="5" name="font_size" type="int" default="16" />
+			<param index="6" name="max_lines" type="int" default="-1" />
+			<param index="7" name="size" type="int" default="1" />
+			<param index="8" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="9" name="brk_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
+			<param index="10" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
+			<param index="11" name="direction" type="int" enum="TextServer.Direction" default="0" />
+			<param index="12" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
-				Breaks [code]text[/code] to the lines using rules specified by [code]flags[/code] and draws text outline into a canvas item using the font, at a given position, with [code]modulate[/code] color and [code]size[/code] outline size, optionally clipping the width and aligning horizontally. [code]position[/code] specifies the baseline of the first line, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis.
+				Breaks [param text] to the lines using rules specified by [param brk_flags] and draws text outline into a canvas item using the font, at a given position, with [param modulate] color and [param size] outline size, optionally clipping the width and aligning horizontally. [param pos] specifies the baseline of the first line, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis.
 				See also [method CanvasItem.draw_multiline_string_outline].
 			</description>
 		</method>
 		<method name="draw_string" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="canvas_item" type="RID" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="text" type="String" />
-			<argument index="3" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
-			<argument index="4" name="width" type="float" default="-1" />
-			<argument index="5" name="font_size" type="int" default="16" />
-			<argument index="6" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="7" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
-			<argument index="8" name="direction" type="int" enum="TextServer.Direction" default="0" />
-			<argument index="9" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
+			<param index="0" name="canvas_item" type="RID" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="text" type="String" />
+			<param index="3" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
+			<param index="4" name="width" type="float" default="-1" />
+			<param index="5" name="font_size" type="int" default="16" />
+			<param index="6" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="7" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
+			<param index="8" name="direction" type="int" enum="TextServer.Direction" default="0" />
+			<param index="9" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
-				Draw [code]text[/code] into a canvas item using the font, at a given position, with [code]modulate[/code] color, optionally clipping the width and aligning horizontally. [code]position[/code] specifies the baseline, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis.
+				Draw [param text] into a canvas item using the font, at a given position, with [param modulate] color, optionally clipping the width and aligning horizontally. [param pos] specifies the baseline, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis.
 				See also [method CanvasItem.draw_string].
 			</description>
 		</method>
 		<method name="draw_string_outline" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="canvas_item" type="RID" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="text" type="String" />
-			<argument index="3" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
-			<argument index="4" name="width" type="float" default="-1" />
-			<argument index="5" name="font_size" type="int" default="16" />
-			<argument index="6" name="size" type="int" default="1" />
-			<argument index="7" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="8" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
-			<argument index="9" name="direction" type="int" enum="TextServer.Direction" default="0" />
-			<argument index="10" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
+			<param index="0" name="canvas_item" type="RID" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="text" type="String" />
+			<param index="3" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
+			<param index="4" name="width" type="float" default="-1" />
+			<param index="5" name="font_size" type="int" default="16" />
+			<param index="6" name="size" type="int" default="1" />
+			<param index="7" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="8" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
+			<param index="9" name="direction" type="int" enum="TextServer.Direction" default="0" />
+			<param index="10" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
-				Draw [code]text[/code] outline into a canvas item using the font, at a given position, with [code]modulate[/code] color and [code]size[/code] outline size, optionally clipping the width and aligning horizontally. [code]position[/code] specifies the baseline, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis.
+				Draw [param text] outline into a canvas item using the font, at a given position, with [param modulate] color and [param size] outline size, optionally clipping the width and aligning horizontally. [param pos] specifies the baseline, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis.
 				See also [method CanvasItem.draw_string_outline].
 			</description>
 		</method>
 		<method name="find_variation" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="variation_coordinates" type="Dictionary" />
-			<argument index="1" name="face_index" type="int" default="0" />
-			<argument index="2" name="strength" type="float" default="0.0" />
-			<argument index="3" name="transform" type="Transform2D" default="Transform2D(1, 0, 0, 1, 0, 0)" />
+			<param index="0" name="variation_coordinates" type="Dictionary" />
+			<param index="1" name="face_index" type="int" default="0" />
+			<param index="2" name="strength" type="float" default="0.0" />
+			<param index="3" name="transform" type="Transform2D" default="Transform2D(1, 0, 0, 1, 0, 0)" />
 			<description>
 				Returns [TextServer] RID of the font cache for specific variation.
 			</description>
 		</method>
 		<method name="get_ascent" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="font_size" type="int" default="16" />
+			<param index="0" name="font_size" type="int" default="16" />
 			<description>
 				Returns the average font ascent (number of pixels above the baseline).
 				[b]Note:[/b] Real ascent of the string is context-dependent and can be significantly different from the value returned by this function. Use it only as rough estimate (e.g. as the ascent of empty line).
@@ -128,8 +128,8 @@
 		</method>
 		<method name="get_char_size" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="char" type="int" />
-			<argument index="1" name="font_size" type="int" />
+			<param index="0" name="char" type="int" />
+			<param index="1" name="font_size" type="int" />
 			<description>
 				Returns the size of a character, optionally taking kerning into account if the next character is provided.
 				[b]Note:[/b] Do not use this function to calculate width of the string character by character, use [method get_string_size] or [TextLine] instead. The height returned is the font height (see also [method get_height]) and has no relation to the glyph height.
@@ -137,7 +137,7 @@
 		</method>
 		<method name="get_descent" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="font_size" type="int" default="16" />
+			<param index="0" name="font_size" type="int" default="16" />
 			<description>
 				Returns the average font descent (number of pixels below the baseline).
 				[b]Note:[/b] Real descent of the string is context-dependent and can be significantly different from the value returned by this function. Use it only as rough estimate (e.g. as the descent of empty line).
@@ -175,7 +175,7 @@
 		</method>
 		<method name="get_height" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="font_size" type="int" default="16" />
+			<param index="0" name="font_size" type="int" default="16" />
 			<description>
 				Returns the total average font height (ascent plus descent) in pixels.
 				[b]Note:[/b] Real height of the string is context-dependent and can be significantly different from the value returned by this function. Use it only as rough estimate (e.g. as the height of empty line).
@@ -183,15 +183,15 @@
 		</method>
 		<method name="get_multiline_string_size" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="text" type="String" />
-			<argument index="1" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
-			<argument index="2" name="width" type="float" default="-1" />
-			<argument index="3" name="font_size" type="int" default="16" />
-			<argument index="4" name="max_lines" type="int" default="-1" />
-			<argument index="5" name="brk_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
-			<argument index="6" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
-			<argument index="7" name="direction" type="int" enum="TextServer.Direction" default="0" />
-			<argument index="8" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
+			<param index="0" name="text" type="String" />
+			<param index="1" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
+			<param index="2" name="width" type="float" default="-1" />
+			<param index="3" name="font_size" type="int" default="16" />
+			<param index="4" name="max_lines" type="int" default="-1" />
+			<param index="5" name="brk_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
+			<param index="6" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
+			<param index="7" name="direction" type="int" enum="TextServer.Direction" default="0" />
+			<param index="8" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
 				Returns the size of a bounding box of a string broken into the lines, taking kerning and advance into account.
 				See also [method draw_multiline_string].
@@ -211,20 +211,20 @@
 		</method>
 		<method name="get_spacing" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="spacing" type="int" enum="TextServer.SpacingType" />
+			<param index="0" name="spacing" type="int" enum="TextServer.SpacingType" />
 			<description>
 				Returns the spacing for the given [code]type[/code] (see [enum TextServer.SpacingType]).
 			</description>
 		</method>
 		<method name="get_string_size" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="text" type="String" />
-			<argument index="1" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
-			<argument index="2" name="width" type="float" default="-1" />
-			<argument index="3" name="font_size" type="int" default="16" />
-			<argument index="4" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
-			<argument index="5" name="direction" type="int" enum="TextServer.Direction" default="0" />
-			<argument index="6" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
+			<param index="0" name="text" type="String" />
+			<param index="1" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
+			<param index="2" name="width" type="float" default="-1" />
+			<param index="3" name="font_size" type="int" default="16" />
+			<param index="4" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
+			<param index="5" name="direction" type="int" enum="TextServer.Direction" default="0" />
+			<param index="6" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
 				Returns the size of a bounding box of a single-line string, taking kerning and advance into account. See also [method get_multiline_string_size] and [method draw_string].
 				For example, to get the string size as displayed by a single-line Label, use:
@@ -256,7 +256,7 @@
 		</method>
 		<method name="get_underline_position" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="font_size" type="int" default="16" />
+			<param index="0" name="font_size" type="int" default="16" />
 			<description>
 				Returns average pixel offset of the underline below the baseline.
 				[b]Note:[/b] Real underline position of the string is context-dependent and can be significantly different from the value returned by this function. Use it only as rough estimate.
@@ -264,7 +264,7 @@
 		</method>
 		<method name="get_underline_thickness" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="font_size" type="int" default="16" />
+			<param index="0" name="font_size" type="int" default="16" />
 			<description>
 				Returns average thickness of the underline.
 				[b]Note:[/b] Real underline thickness of the string is context-dependent and can be significantly different from the value returned by this function. Use it only as rough estimate.
@@ -272,36 +272,36 @@
 		</method>
 		<method name="has_char" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="char" type="int" />
+			<param index="0" name="char" type="int" />
 			<description>
-				Returns [code]true[/code] if a Unicode [code]char[/code] is available in the font.
+				Returns [code]true[/code] if a Unicode [param char] is available in the font.
 			</description>
 		</method>
 		<method name="is_language_supported" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="language" type="String" />
+			<param index="0" name="language" type="String" />
 			<description>
 				Returns [code]true[/code], if font supports given language ([url=https://en.wikipedia.org/wiki/ISO_639-1]ISO 639[/url] code).
 			</description>
 		</method>
 		<method name="is_script_supported" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="script" type="String" />
+			<param index="0" name="script" type="String" />
 			<description>
 				Returns [code]true[/code], if font supports given script ([url=https://en.wikipedia.org/wiki/ISO_15924]ISO 15924[/url] code).
 			</description>
 		</method>
 		<method name="set_cache_capacity">
 			<return type="void" />
-			<argument index="0" name="single_line" type="int" />
-			<argument index="1" name="multi_line" type="int" />
+			<param index="0" name="single_line" type="int" />
+			<param index="1" name="multi_line" type="int" />
 			<description>
 				Sets LRU cache capacity for [code]draw_*[/code] methods.
 			</description>
 		</method>
 		<method name="set_fallbacks">
 			<return type="void" />
-			<argument index="0" name="fallbacks" type="Font[]" />
+			<param index="0" name="fallbacks" type="Font[]" />
 			<description>
 				Sets array of fallback [Font]s.
 			</description>
diff --git a/doc/classes/FontFile.xml b/doc/classes/FontFile.xml
index dc2cbdde63..0f229ea19a 100644
--- a/doc/classes/FontFile.xml
+++ b/doc/classes/FontFile.xml
@@ -39,8 +39,8 @@
 		</method>
 		<method name="clear_glyphs">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
 			<description>
 				Removes all rendered glyphs information from the cache entry.
 				[b]Note:[/b] This function will not remove textures associated with the glyphs, use [method remove_texture] to remove them manually.
@@ -48,23 +48,23 @@
 		</method>
 		<method name="clear_kerning_map">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="int" />
 			<description>
 				Removes all kerning overrides.
 			</description>
 		</method>
 		<method name="clear_size_cache">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
+			<param index="0" name="cache_index" type="int" />
 			<description>
 				Removes all font sizes from the cache entry
 			</description>
 		</method>
 		<method name="clear_textures">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
 			<description>
 				Removes all textures from font cache entry.
 				[b]Note:[/b] This function will not remove glyphs associated with the texture, use [method remove_glyph] to remove them manually.
@@ -72,8 +72,8 @@
 		</method>
 		<method name="get_cache_ascent" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="int" />
 			<description>
 				Returns the font ascent (number of pixels above the baseline).
 			</description>
@@ -86,51 +86,51 @@
 		</method>
 		<method name="get_cache_descent" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_cache_scale" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_cache_underline_position" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_cache_underline_thickness" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_embolden" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="cache_index" type="int" />
+			<param index="0" name="cache_index" type="int" />
 			<description>
 				Returns embolden strength, if is not equal to zero, emboldens the font outlines. Negative values reduce the outline thickness.
 			</description>
 		</method>
 		<method name="get_face_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="cache_index" type="int" />
+			<param index="0" name="cache_index" type="int" />
 			<description>
 				Recturns an active face index in the TrueType / OpenType collection.
 			</description>
 		</method>
 		<method name="get_glyph_advance" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Returns glyph advance (offset of the next glyph).
 				[b]Note:[/b] Advance for glyphs outlines is the same as the base glyph advance and is not saved.
@@ -138,79 +138,79 @@
 		</method>
 		<method name="get_glyph_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="size" type="int" />
-			<argument index="1" name="char" type="int" />
-			<argument index="2" name="variation_selector" type="int" />
+			<param index="0" name="size" type="int" />
+			<param index="1" name="char" type="int" />
+			<param index="2" name="variation_selector" type="int" />
 			<description>
-				Returns the glyph index of a [code]char[/code], optionally modified by the [code]variation_selector[/code].
+				Returns the glyph index of a [param char], optionally modified by the [param variation_selector].
 			</description>
 		</method>
 		<method name="get_glyph_list" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
 			<description>
 				Returns list of rendered glyphs in the cache entry.
 			</description>
 		</method>
 		<method name="get_glyph_offset" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Returns glyph offset from the baseline.
 			</description>
 		</method>
 		<method name="get_glyph_size" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Returns glyph size.
 			</description>
 		</method>
 		<method name="get_glyph_texture_idx" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Returns index of the cache texture containing the glyph.
 			</description>
 		</method>
 		<method name="get_glyph_uv_rect" qualifiers="const">
 			<return type="Rect2" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Returns rectangle in the cache texture containing the glyph.
 			</description>
 		</method>
 		<method name="get_kerning" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="glyph_pair" type="Vector2i" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="glyph_pair" type="Vector2i" />
 			<description>
 				Returns kerning for the pair of glyphs.
 			</description>
 		</method>
 		<method name="get_kerning_list" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="int" />
 			<description>
 				Returns list of the kerning overrides.
 			</description>
 		</method>
 		<method name="get_language_support_override" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="language" type="String" />
+			<param index="0" name="language" type="String" />
 			<description>
-				Returns [code]true[/code] if support override is enabled for the [code]language[/code].
+				Returns [code]true[/code] if support override is enabled for the [param language].
 			</description>
 		</method>
 		<method name="get_language_support_overrides" qualifiers="const">
@@ -221,9 +221,9 @@
 		</method>
 		<method name="get_script_support_override" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="script" type="String" />
+			<param index="0" name="script" type="String" />
 			<description>
-				Returns [code]true[/code] if support override is enabled for the [code]script[/code].
+				Returns [code]true[/code] if support override is enabled for the [param script].
 			</description>
 		</method>
 		<method name="get_script_support_overrides" qualifiers="const">
@@ -234,79 +234,79 @@
 		</method>
 		<method name="get_size_cache_list" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="cache_index" type="int" />
+			<param index="0" name="cache_index" type="int" />
 			<description>
 				Returns list of the font sizes in the cache. Each size is [code]Vector2i[/code] with font size and outline size.
 			</description>
 		</method>
 		<method name="get_texture_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
 			<description>
 				Returns number of textures used by font cache entry.
 			</description>
 		</method>
 		<method name="get_texture_image" qualifiers="const">
 			<return type="Image" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="texture_index" type="int" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="texture_index" type="int" />
 			<description>
 				Returns a copy of the font cache texture image.
 			</description>
 		</method>
 		<method name="get_texture_offsets" qualifiers="const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="texture_index" type="int" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="texture_index" type="int" />
 			<description>
 				Returns a copy of the array containing the first free pixel in the each column of texture. Should be the same size as texture width or empty.
 			</description>
 		</method>
 		<method name="get_transform" qualifiers="const">
 			<return type="Transform2D" />
-			<argument index="0" name="cache_index" type="int" />
+			<param index="0" name="cache_index" type="int" />
 			<description>
 				Returns 2D transform, applied to the font outlines, can be used for slanting, flipping and rotating glyphs.
 			</description>
 		</method>
 		<method name="get_variation_coordinates" qualifiers="const">
 			<return type="Dictionary" />
-			<argument index="0" name="cache_index" type="int" />
+			<param index="0" name="cache_index" type="int" />
 			<description>
 				Returns variation coordinates for the specified font cache entry. See [method Font.get_supported_variation_list] for more info.
 			</description>
 		</method>
 		<method name="load_bitmap_font">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
-				Loads an AngelCode BMFont (.fnt, .font) bitmap font from file [code]path[/code].
+				Loads an AngelCode BMFont (.fnt, .font) bitmap font from file [param path].
 				[b]Warning:[/b] This method should only be used in the editor or in cases when you need to load external fonts at run-time, such as fonts located at the [code]user://[/code] directory.
 			</description>
 		</method>
 		<method name="load_dynamic_font">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
-				Loads a TrueType (.ttf), OpenType (.otf), WOFF (.woff), WOFF2 (.woff2) or Type 1 (.pfb, .pfm) dynamic font from file [code]path[/code].
+				Loads a TrueType (.ttf), OpenType (.otf), WOFF (.woff), WOFF2 (.woff2) or Type 1 (.pfb, .pfm) dynamic font from file [param path].
 				[b]Warning:[/b] This method should only be used in the editor or in cases when you need to load external fonts at run-time, such as fonts located at the [code]user://[/code] directory.
 			</description>
 		</method>
 		<method name="remove_cache">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
+			<param index="0" name="cache_index" type="int" />
 			<description>
 				Removes specified font cache entry.
 			</description>
 		</method>
 		<method name="remove_glyph">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Removes specified rendered glyph information from the cache entry.
 				[b]Note:[/b] This function will not remove textures associated with the glyphs, use [method remove_texture] to remove them manually.
@@ -314,40 +314,40 @@
 		</method>
 		<method name="remove_kerning">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="glyph_pair" type="Vector2i" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="glyph_pair" type="Vector2i" />
 			<description>
 				Removes kerning override for the pair of glyphs.
 			</description>
 		</method>
 		<method name="remove_language_support_override">
 			<return type="void" />
-			<argument index="0" name="language" type="String" />
+			<param index="0" name="language" type="String" />
 			<description>
 				Remove language support override.
 			</description>
 		</method>
 		<method name="remove_script_support_override">
 			<return type="void" />
-			<argument index="0" name="script" type="String" />
+			<param index="0" name="script" type="String" />
 			<description>
 				Removes script support override.
 			</description>
 		</method>
 		<method name="remove_size_cache">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
 			<description>
 				Removes specified font size from the cache entry.
 			</description>
 		</method>
 		<method name="remove_texture">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="texture_index" type="int" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="texture_index" type="int" />
 			<description>
 				Removes specified texture from the cache entry.
 				[b]Note:[/b] This function will not remove glyphs associated with the texture. Remove them manually using [method remove_glyph].
@@ -355,85 +355,85 @@
 		</method>
 		<method name="render_glyph">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="index" type="int" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="index" type="int" />
 			<description>
 				Renders specified glyph to the font cache texture.
 			</description>
 		</method>
 		<method name="render_range">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="start" type="int" />
-			<argument index="3" name="end" type="int" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="start" type="int" />
+			<param index="3" name="end" type="int" />
 			<description>
 				Renders the range of characters to the font cache texture.
 			</description>
 		</method>
 		<method name="set_cache_ascent">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="ascent" type="float" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="ascent" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_cache_descent">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="descent" type="float" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="descent" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_cache_scale">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="scale" type="float" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="scale" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_cache_underline_position">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="underline_position" type="float" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="underline_position" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_cache_underline_thickness">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="underline_thickness" type="float" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="underline_thickness" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_embolden">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="strength" type="float" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="strength" type="float" />
 			<description>
 				Sets embolden strength, if is not equal to zero, emboldens the font outlines. Negative values reduce the outline thickness.
 			</description>
 		</method>
 		<method name="set_face_index">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="face_index" type="int" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="face_index" type="int" />
 			<description>
 				Sets an active face index in the TrueType / OpenType collection.
 			</description>
 		</method>
 		<method name="set_glyph_advance">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="glyph" type="int" />
-			<argument index="3" name="advance" type="Vector2" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="glyph" type="int" />
+			<param index="3" name="advance" type="Vector2" />
 			<description>
 				Sets glyph advance (offset of the next glyph).
 				[b]Note:[/b] Advance for glyphs outlines is the same as the base glyph advance and is not saved.
@@ -441,102 +441,102 @@
 		</method>
 		<method name="set_glyph_offset">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
-			<argument index="3" name="offset" type="Vector2" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
+			<param index="3" name="offset" type="Vector2" />
 			<description>
 				Sets glyph offset from the baseline.
 			</description>
 		</method>
 		<method name="set_glyph_size">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
-			<argument index="3" name="gl_size" type="Vector2" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
+			<param index="3" name="gl_size" type="Vector2" />
 			<description>
 				Sets glyph size.
 			</description>
 		</method>
 		<method name="set_glyph_texture_idx">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
-			<argument index="3" name="texture_idx" type="int" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
+			<param index="3" name="texture_idx" type="int" />
 			<description>
 				Sets index of the cache texture containing the glyph.
 			</description>
 		</method>
 		<method name="set_glyph_uv_rect">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
-			<argument index="3" name="uv_rect" type="Rect2" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
+			<param index="3" name="uv_rect" type="Rect2" />
 			<description>
 				Sets rectangle in the cache texture containing the glyph.
 			</description>
 		</method>
 		<method name="set_kerning">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="glyph_pair" type="Vector2i" />
-			<argument index="3" name="kerning" type="Vector2" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="glyph_pair" type="Vector2i" />
+			<param index="3" name="kerning" type="Vector2" />
 			<description>
 				Sets kerning for the pair of glyphs.
 			</description>
 		</method>
 		<method name="set_language_support_override">
 			<return type="void" />
-			<argument index="0" name="language" type="String" />
-			<argument index="1" name="supported" type="bool" />
+			<param index="0" name="language" type="String" />
+			<param index="1" name="supported" type="bool" />
 			<description>
 				Adds override for [method Font.is_language_supported].
 			</description>
 		</method>
 		<method name="set_script_support_override">
 			<return type="void" />
-			<argument index="0" name="script" type="String" />
-			<argument index="1" name="supported" type="bool" />
+			<param index="0" name="script" type="String" />
+			<param index="1" name="supported" type="bool" />
 			<description>
 				Adds override for [method Font.is_script_supported].
 			</description>
 		</method>
 		<method name="set_texture_image">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="texture_index" type="int" />
-			<argument index="3" name="image" type="Image" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="texture_index" type="int" />
+			<param index="3" name="image" type="Image" />
 			<description>
 				Sets font cache texture image.
 			</description>
 		</method>
 		<method name="set_texture_offsets">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="texture_index" type="int" />
-			<argument index="3" name="offset" type="PackedInt32Array" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="texture_index" type="int" />
+			<param index="3" name="offset" type="PackedInt32Array" />
 			<description>
 				Sets array containing the first free pixel in the each column of texture. Should be the same size as texture width or empty (for the fonts without dynamic glyph generation support).
 			</description>
 		</method>
 		<method name="set_transform">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="transform" type="Transform2D" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="transform" type="Transform2D" />
 			<description>
 				Sets 2D transform, applied to the font outlines, can be used for slanting, flipping and rotating glyphs.
 			</description>
 		</method>
 		<method name="set_variation_coordinates">
 			<return type="void" />
-			<argument index="0" name="cache_index" type="int" />
-			<argument index="1" name="variation_coordinates" type="Dictionary" />
+			<param index="0" name="cache_index" type="int" />
+			<param index="1" name="variation_coordinates" type="Dictionary" />
 			<description>
 				Sets variation coordinates for the specified font cache entry. See [method Font.get_supported_variation_list] for more info.
 			</description>
diff --git a/doc/classes/FontVariation.xml b/doc/classes/FontVariation.xml
index a1b96fb137..6aa381c2de 100644
--- a/doc/classes/FontVariation.xml
+++ b/doc/classes/FontVariation.xml
@@ -29,10 +29,10 @@
 	<methods>
 		<method name="set_spacing">
 			<return type="void" />
-			<argument index="0" name="spacing" type="int" enum="TextServer.SpacingType" />
-			<argument index="1" name="value" type="int" />
+			<param index="0" name="spacing" type="int" enum="TextServer.SpacingType" />
+			<param index="1" name="value" type="int" />
 			<description>
-				Sets the spacing for [code]type[/code] (see [enum TextServer.SpacingType]) to [code]value[/code] in pixels (not relative to the font size).
+				Sets the spacing for [code]type[/code] (see [enum TextServer.SpacingType]) to [param value] in pixels (not relative to the font size).
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/GPUParticles2D.xml b/doc/classes/GPUParticles2D.xml
index e60ab094c6..606d2456c5 100644
--- a/doc/classes/GPUParticles2D.xml
+++ b/doc/classes/GPUParticles2D.xml
@@ -20,13 +20,13 @@
 		</method>
 		<method name="emit_particle">
 			<return type="void" />
-			<argument index="0" name="xform" type="Transform2D" />
-			<argument index="1" name="velocity" type="Vector2" />
-			<argument index="2" name="color" type="Color" />
-			<argument index="3" name="custom" type="Color" />
-			<argument index="4" name="flags" type="int" />
+			<param index="0" name="xform" type="Transform2D" />
+			<param index="1" name="velocity" type="Vector2" />
+			<param index="2" name="color" type="Color" />
+			<param index="3" name="custom" type="Color" />
+			<param index="4" name="flags" type="int" />
 			<description>
-				Emits a single particle. Whether [code]xform[/code], [code]velocity[/code], [code]color[/code] and [code]custom[/code] are applied depends on the value of [code]flags[/code]. See [enum EmitFlags].
+				Emits a single particle. Whether [param xform], [param velocity], [param color] and [param custom] are applied depends on the value of [param flags]. See [enum EmitFlags].
 			</description>
 		</method>
 		<method name="restart">
diff --git a/doc/classes/GPUParticles3D.xml b/doc/classes/GPUParticles3D.xml
index b415c56154..fc7b12e64f 100644
--- a/doc/classes/GPUParticles3D.xml
+++ b/doc/classes/GPUParticles3D.xml
@@ -20,20 +20,20 @@
 		</method>
 		<method name="emit_particle">
 			<return type="void" />
-			<argument index="0" name="xform" type="Transform3D" />
-			<argument index="1" name="velocity" type="Vector3" />
-			<argument index="2" name="color" type="Color" />
-			<argument index="3" name="custom" type="Color" />
-			<argument index="4" name="flags" type="int" />
+			<param index="0" name="xform" type="Transform3D" />
+			<param index="1" name="velocity" type="Vector3" />
+			<param index="2" name="color" type="Color" />
+			<param index="3" name="custom" type="Color" />
+			<param index="4" name="flags" type="int" />
 			<description>
-				Emits a single particle. Whether [code]xform[/code], [code]velocity[/code], [code]color[/code] and [code]custom[/code] are applied depends on the value of [code]flags[/code]. See [enum EmitFlags].
+				Emits a single particle. Whether [param xform], [param velocity], [param color] and [param custom] are applied depends on the value of [param flags]. See [enum EmitFlags].
 			</description>
 		</method>
 		<method name="get_draw_pass_mesh" qualifiers="const">
 			<return type="Mesh" />
-			<argument index="0" name="pass" type="int" />
+			<param index="0" name="pass" type="int" />
 			<description>
-				Returns the [Mesh] that is drawn at index [code]pass[/code].
+				Returns the [Mesh] that is drawn at index [param pass].
 			</description>
 		</method>
 		<method name="restart">
@@ -44,10 +44,10 @@
 		</method>
 		<method name="set_draw_pass_mesh">
 			<return type="void" />
-			<argument index="0" name="pass" type="int" />
-			<argument index="1" name="mesh" type="Mesh" />
+			<param index="0" name="pass" type="int" />
+			<param index="1" name="mesh" type="Mesh" />
 			<description>
-				Sets the [Mesh] that is drawn at index [code]pass[/code].
+				Sets the [Mesh] that is drawn at index [param pass].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/GPUParticlesCollisionSDF3D.xml b/doc/classes/GPUParticlesCollisionSDF3D.xml
index c9af07288e..29adf4fbc1 100644
--- a/doc/classes/GPUParticlesCollisionSDF3D.xml
+++ b/doc/classes/GPUParticlesCollisionSDF3D.xml
@@ -13,7 +13,27 @@
 	</description>
 	<tutorials>
 	</tutorials>
+	<methods>
+		<method name="get_bake_mask_value" qualifiers="const">
+			<return type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<description>
+				Returns whether or not the specified layer of the [member bake_mask] is enabled, given a [param layer_number] between 1 and 32.
+			</description>
+		</method>
+		<method name="set_bake_mask_value">
+			<return type="void" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
+			<description>
+				Based on [param value], enables or disables the specified layer in the [member bake_mask], given a [param layer_number] between 1 and 32.
+			</description>
+		</method>
+	</methods>
 	<members>
+		<member name="bake_mask" type="int" setter="set_bake_mask" getter="get_bake_mask" default="4294967295">
+			The visual layers to account for when baking the particle collision SDF. Only [MeshInstance3D]s whose [member VisualInstance3D.layers] match with this [member bake_mask] will be included in the generated particle collision SDF. By default, all objects are taken into account for the particle collision SDF baking.
+		</member>
 		<member name="extents" type="Vector3" setter="set_extents" getter="get_extents" default="Vector3(1, 1, 1)">
 			The collision SDF's extents in 3D units. To improve SDF quality, the [member extents] should be set as small as possible while covering the parts of the scene you need.
 		</member>
diff --git a/doc/classes/Generic6DOFJoint3D.xml b/doc/classes/Generic6DOFJoint3D.xml
index b1bc411a21..5eec089a6f 100644
--- a/doc/classes/Generic6DOFJoint3D.xml
+++ b/doc/classes/Generic6DOFJoint3D.xml
@@ -11,79 +11,79 @@
 	<methods>
 		<method name="get_flag_x" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="flag" type="int" enum="Generic6DOFJoint3D.Flag" />
+			<param index="0" name="flag" type="int" enum="Generic6DOFJoint3D.Flag" />
 			<description>
 			</description>
 		</method>
 		<method name="get_flag_y" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="flag" type="int" enum="Generic6DOFJoint3D.Flag" />
+			<param index="0" name="flag" type="int" enum="Generic6DOFJoint3D.Flag" />
 			<description>
 			</description>
 		</method>
 		<method name="get_flag_z" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="flag" type="int" enum="Generic6DOFJoint3D.Flag" />
+			<param index="0" name="flag" type="int" enum="Generic6DOFJoint3D.Flag" />
 			<description>
 			</description>
 		</method>
 		<method name="get_param_x" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="param" type="int" enum="Generic6DOFJoint3D.Param" />
+			<param index="0" name="param" type="int" enum="Generic6DOFJoint3D.Param" />
 			<description>
 			</description>
 		</method>
 		<method name="get_param_y" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="param" type="int" enum="Generic6DOFJoint3D.Param" />
+			<param index="0" name="param" type="int" enum="Generic6DOFJoint3D.Param" />
 			<description>
 			</description>
 		</method>
 		<method name="get_param_z" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="param" type="int" enum="Generic6DOFJoint3D.Param" />
+			<param index="0" name="param" type="int" enum="Generic6DOFJoint3D.Param" />
 			<description>
 			</description>
 		</method>
 		<method name="set_flag_x">
 			<return type="void" />
-			<argument index="0" name="flag" type="int" enum="Generic6DOFJoint3D.Flag" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="flag" type="int" enum="Generic6DOFJoint3D.Flag" />
+			<param index="1" name="value" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="set_flag_y">
 			<return type="void" />
-			<argument index="0" name="flag" type="int" enum="Generic6DOFJoint3D.Flag" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="flag" type="int" enum="Generic6DOFJoint3D.Flag" />
+			<param index="1" name="value" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="set_flag_z">
 			<return type="void" />
-			<argument index="0" name="flag" type="int" enum="Generic6DOFJoint3D.Flag" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="flag" type="int" enum="Generic6DOFJoint3D.Flag" />
+			<param index="1" name="value" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="set_param_x">
 			<return type="void" />
-			<argument index="0" name="param" type="int" enum="Generic6DOFJoint3D.Param" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="param" type="int" enum="Generic6DOFJoint3D.Param" />
+			<param index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_param_y">
 			<return type="void" />
-			<argument index="0" name="param" type="int" enum="Generic6DOFJoint3D.Param" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="param" type="int" enum="Generic6DOFJoint3D.Param" />
+			<param index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_param_z">
 			<return type="void" />
-			<argument index="0" name="param" type="int" enum="Generic6DOFJoint3D.Param" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="param" type="int" enum="Generic6DOFJoint3D.Param" />
+			<param index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/Geometry2D.xml b/doc/classes/Geometry2D.xml
index a4cfa1ddff..80d19e22c5 100644
--- a/doc/classes/Geometry2D.xml
+++ b/doc/classes/Geometry2D.xml
@@ -11,141 +11,141 @@
 	<methods>
 		<method name="clip_polygons">
 			<return type="Array" />
-			<argument index="0" name="polygon_a" type="PackedVector2Array" />
-			<argument index="1" name="polygon_b" type="PackedVector2Array" />
+			<param index="0" name="polygon_a" type="PackedVector2Array" />
+			<param index="1" name="polygon_b" type="PackedVector2Array" />
 			<description>
-				Clips [code]polygon_a[/code] against [code]polygon_b[/code] and returns an array of clipped polygons. This performs [constant OPERATION_DIFFERENCE] between polygons. Returns an empty array if [code]polygon_b[/code] completely overlaps [code]polygon_a[/code].
-				If [code]polygon_b[/code] is enclosed by [code]polygon_a[/code], returns an outer polygon (boundary) and inner polygon (hole) which could be distinguished by calling [method is_polygon_clockwise].
+				Clips [param polygon_a] against [param polygon_b] and returns an array of clipped polygons. This performs [constant OPERATION_DIFFERENCE] between polygons. Returns an empty array if [param polygon_b] completely overlaps [param polygon_a].
+				If [param polygon_b] is enclosed by [param polygon_a], returns an outer polygon (boundary) and inner polygon (hole) which could be distinguished by calling [method is_polygon_clockwise].
 			</description>
 		</method>
 		<method name="clip_polyline_with_polygon">
 			<return type="Array" />
-			<argument index="0" name="polyline" type="PackedVector2Array" />
-			<argument index="1" name="polygon" type="PackedVector2Array" />
+			<param index="0" name="polyline" type="PackedVector2Array" />
+			<param index="1" name="polygon" type="PackedVector2Array" />
 			<description>
-				Clips [code]polyline[/code] against [code]polygon[/code] and returns an array of clipped polylines. This performs [constant OPERATION_DIFFERENCE] between the polyline and the polygon. This operation can be thought of as cutting a line with a closed shape.
+				Clips [param polyline] against [param polygon] and returns an array of clipped polylines. This performs [constant OPERATION_DIFFERENCE] between the polyline and the polygon. This operation can be thought of as cutting a line with a closed shape.
 			</description>
 		</method>
 		<method name="convex_hull">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="points" type="PackedVector2Array" />
+			<param index="0" name="points" type="PackedVector2Array" />
 			<description>
 				Given an array of [Vector2]s, returns the convex hull as a list of points in counterclockwise order. The last point is the same as the first one.
 			</description>
 		</method>
 		<method name="exclude_polygons">
 			<return type="Array" />
-			<argument index="0" name="polygon_a" type="PackedVector2Array" />
-			<argument index="1" name="polygon_b" type="PackedVector2Array" />
+			<param index="0" name="polygon_a" type="PackedVector2Array" />
+			<param index="1" name="polygon_b" type="PackedVector2Array" />
 			<description>
-				Mutually excludes common area defined by intersection of [code]polygon_a[/code] and [code]polygon_b[/code] (see [method intersect_polygons]) and returns an array of excluded polygons. This performs [constant OPERATION_XOR] between polygons. In other words, returns all but common area between polygons.
+				Mutually excludes common area defined by intersection of [param polygon_a] and [param polygon_b] (see [method intersect_polygons]) and returns an array of excluded polygons. This performs [constant OPERATION_XOR] between polygons. In other words, returns all but common area between polygons.
 				The operation may result in an outer polygon (boundary) and inner polygon (hole) produced which could be distinguished by calling [method is_polygon_clockwise].
 			</description>
 		</method>
 		<method name="get_closest_point_to_segment">
 			<return type="Vector2" />
-			<argument index="0" name="point" type="Vector2" />
-			<argument index="1" name="s1" type="Vector2" />
-			<argument index="2" name="s2" type="Vector2" />
+			<param index="0" name="point" type="Vector2" />
+			<param index="1" name="s1" type="Vector2" />
+			<param index="2" name="s2" type="Vector2" />
 			<description>
-				Returns the 2D point on the 2D segment ([code]s1[/code], [code]s2[/code]) that is closest to [code]point[/code]. The returned point will always be inside the specified segment.
+				Returns the 2D point on the 2D segment ([param s1], [param s2]) that is closest to [param point]. The returned point will always be inside the specified segment.
 			</description>
 		</method>
 		<method name="get_closest_point_to_segment_uncapped">
 			<return type="Vector2" />
-			<argument index="0" name="point" type="Vector2" />
-			<argument index="1" name="s1" type="Vector2" />
-			<argument index="2" name="s2" type="Vector2" />
+			<param index="0" name="point" type="Vector2" />
+			<param index="1" name="s1" type="Vector2" />
+			<param index="2" name="s2" type="Vector2" />
 			<description>
-				Returns the 2D point on the 2D line defined by ([code]s1[/code], [code]s2[/code]) that is closest to [code]point[/code]. The returned point can be inside the segment ([code]s1[/code], [code]s2[/code]) or outside of it, i.e. somewhere on the line extending from the segment.
+				Returns the 2D point on the 2D line defined by ([param s1], [param s2]) that is closest to [param point]. The returned point can be inside the segment ([param s1], [param s2]) or outside of it, i.e. somewhere on the line extending from the segment.
 			</description>
 		</method>
 		<method name="get_closest_points_between_segments">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="p1" type="Vector2" />
-			<argument index="1" name="q1" type="Vector2" />
-			<argument index="2" name="p2" type="Vector2" />
-			<argument index="3" name="q2" type="Vector2" />
+			<param index="0" name="p1" type="Vector2" />
+			<param index="1" name="q1" type="Vector2" />
+			<param index="2" name="p2" type="Vector2" />
+			<param index="3" name="q2" type="Vector2" />
 			<description>
-				Given the two 2D segments ([code]p1[/code], [code]q1[/code]) and ([code]p2[/code], [code]q2[/code]), finds those two points on the two segments that are closest to each other. Returns a [PackedVector2Array] that contains this point on ([code]p1[/code], [code]q1[/code]) as well the accompanying point on ([code]p2[/code], [code]q2[/code]).
+				Given the two 2D segments ([param p1], [param q1]) and ([param p2], [param q2]), finds those two points on the two segments that are closest to each other. Returns a [PackedVector2Array] that contains this point on ([param p1], [param q1]) as well the accompanying point on ([param p2], [param q2]).
 			</description>
 		</method>
 		<method name="intersect_polygons">
 			<return type="Array" />
-			<argument index="0" name="polygon_a" type="PackedVector2Array" />
-			<argument index="1" name="polygon_b" type="PackedVector2Array" />
+			<param index="0" name="polygon_a" type="PackedVector2Array" />
+			<param index="1" name="polygon_b" type="PackedVector2Array" />
 			<description>
-				Intersects [code]polygon_a[/code] with [code]polygon_b[/code] and returns an array of intersected polygons. This performs [constant OPERATION_INTERSECTION] between polygons. In other words, returns common area shared by polygons. Returns an empty array if no intersection occurs.
+				Intersects [param polygon_a] with [param polygon_b] and returns an array of intersected polygons. This performs [constant OPERATION_INTERSECTION] between polygons. In other words, returns common area shared by polygons. Returns an empty array if no intersection occurs.
 				The operation may result in an outer polygon (boundary) and inner polygon (hole) produced which could be distinguished by calling [method is_polygon_clockwise].
 			</description>
 		</method>
 		<method name="intersect_polyline_with_polygon">
 			<return type="Array" />
-			<argument index="0" name="polyline" type="PackedVector2Array" />
-			<argument index="1" name="polygon" type="PackedVector2Array" />
+			<param index="0" name="polyline" type="PackedVector2Array" />
+			<param index="1" name="polygon" type="PackedVector2Array" />
 			<description>
-				Intersects [code]polyline[/code] with [code]polygon[/code] and returns an array of intersected polylines. This performs [constant OPERATION_INTERSECTION] between the polyline and the polygon. This operation can be thought of as chopping a line with a closed shape.
+				Intersects [param polyline] with [param polygon] and returns an array of intersected polylines. This performs [constant OPERATION_INTERSECTION] between the polyline and the polygon. This operation can be thought of as chopping a line with a closed shape.
 			</description>
 		</method>
 		<method name="is_point_in_circle">
 			<return type="bool" />
-			<argument index="0" name="point" type="Vector2" />
-			<argument index="1" name="circle_position" type="Vector2" />
-			<argument index="2" name="circle_radius" type="float" />
+			<param index="0" name="point" type="Vector2" />
+			<param index="1" name="circle_position" type="Vector2" />
+			<param index="2" name="circle_radius" type="float" />
 			<description>
-				Returns [code]true[/code] if [code]point[/code] is inside the circle or if it's located exactly [i]on[/i] the circle's boundary, otherwise returns [code]false[/code].
+				Returns [code]true[/code] if [param point] is inside the circle or if it's located exactly [i]on[/i] the circle's boundary, otherwise returns [code]false[/code].
 			</description>
 		</method>
 		<method name="is_point_in_polygon">
 			<return type="bool" />
-			<argument index="0" name="point" type="Vector2" />
-			<argument index="1" name="polygon" type="PackedVector2Array" />
+			<param index="0" name="point" type="Vector2" />
+			<param index="1" name="polygon" type="PackedVector2Array" />
 			<description>
-				Returns [code]true[/code] if [code]point[/code] is inside [code]polygon[/code] or if it's located exactly [i]on[/i] polygon's boundary, otherwise returns [code]false[/code].
+				Returns [code]true[/code] if [param point] is inside [param polygon] or if it's located exactly [i]on[/i] polygon's boundary, otherwise returns [code]false[/code].
 			</description>
 		</method>
 		<method name="is_polygon_clockwise">
 			<return type="bool" />
-			<argument index="0" name="polygon" type="PackedVector2Array" />
+			<param index="0" name="polygon" type="PackedVector2Array" />
 			<description>
-				Returns [code]true[/code] if [code]polygon[/code]'s vertices are ordered in clockwise order, otherwise returns [code]false[/code].
+				Returns [code]true[/code] if [param polygon]'s vertices are ordered in clockwise order, otherwise returns [code]false[/code].
 			</description>
 		</method>
 		<method name="line_intersects_line">
 			<return type="Variant" />
-			<argument index="0" name="from_a" type="Vector2" />
-			<argument index="1" name="dir_a" type="Vector2" />
-			<argument index="2" name="from_b" type="Vector2" />
-			<argument index="3" name="dir_b" type="Vector2" />
+			<param index="0" name="from_a" type="Vector2" />
+			<param index="1" name="dir_a" type="Vector2" />
+			<param index="2" name="from_b" type="Vector2" />
+			<param index="3" name="dir_b" type="Vector2" />
 			<description>
-				Checks if the two lines ([code]from_a[/code], [code]dir_a[/code]) and ([code]from_b[/code], [code]dir_b[/code]) intersect. If yes, return the point of intersection as [Vector2]. If no intersection takes place, returns [code]null[/code].
+				Checks if the two lines ([param from_a], [param dir_a]) and ([param from_b], [param dir_b]) intersect. If yes, return the point of intersection as [Vector2]. If no intersection takes place, returns [code]null[/code].
 				[b]Note:[/b] The lines are specified using direction vectors, not end points.
 			</description>
 		</method>
 		<method name="make_atlas">
 			<return type="Dictionary" />
-			<argument index="0" name="sizes" type="PackedVector2Array" />
+			<param index="0" name="sizes" type="PackedVector2Array" />
 			<description>
 				Given an array of [Vector2]s representing tiles, builds an atlas. The returned dictionary has two keys: [code]points[/code] is an array of [Vector2] that specifies the positions of each tile, [code]size[/code] contains the overall size of the whole atlas as [Vector2].
 			</description>
 		</method>
 		<method name="merge_polygons">
 			<return type="Array" />
-			<argument index="0" name="polygon_a" type="PackedVector2Array" />
-			<argument index="1" name="polygon_b" type="PackedVector2Array" />
+			<param index="0" name="polygon_a" type="PackedVector2Array" />
+			<param index="1" name="polygon_b" type="PackedVector2Array" />
 			<description>
-				Merges (combines) [code]polygon_a[/code] and [code]polygon_b[/code] and returns an array of merged polygons. This performs [constant OPERATION_UNION] between polygons.
+				Merges (combines) [param polygon_a] and [param polygon_b] and returns an array of merged polygons. This performs [constant OPERATION_UNION] between polygons.
 				The operation may result in an outer polygon (boundary) and multiple inner polygons (holes) produced which could be distinguished by calling [method is_polygon_clockwise].
 			</description>
 		</method>
 		<method name="offset_polygon">
 			<return type="Array" />
-			<argument index="0" name="polygon" type="PackedVector2Array" />
-			<argument index="1" name="delta" type="float" />
-			<argument index="2" name="join_type" type="int" enum="Geometry2D.PolyJoinType" default="0" />
+			<param index="0" name="polygon" type="PackedVector2Array" />
+			<param index="1" name="delta" type="float" />
+			<param index="2" name="join_type" type="int" enum="Geometry2D.PolyJoinType" default="0" />
 			<description>
-				Inflates or deflates [code]polygon[/code] by [code]delta[/code] units (pixels). If [code]delta[/code] is positive, makes the polygon grow outward. If [code]delta[/code] is negative, shrinks the polygon inward. Returns an array of polygons because inflating/deflating may result in multiple discrete polygons. Returns an empty array if [code]delta[/code] is negative and the absolute value of it approximately exceeds the minimum bounding rectangle dimensions of the polygon.
-				Each polygon's vertices will be rounded as determined by [code]join_type[/code], see [enum PolyJoinType].
+				Inflates or deflates [param polygon] by [param delta] units (pixels). If [param delta] is positive, makes the polygon grow outward. If [param delta] is negative, shrinks the polygon inward. Returns an array of polygons because inflating/deflating may result in multiple discrete polygons. Returns an empty array if [param delta] is negative and the absolute value of it approximately exceeds the minimum bounding rectangle dimensions of the polygon.
+				Each polygon's vertices will be rounded as determined by [param join_type], see [enum PolyJoinType].
 				The operation may result in an outer polygon (boundary) and inner polygon (hole) produced which could be distinguished by calling [method is_polygon_clockwise].
 				[b]Note:[/b] To translate the polygon's vertices specifically, multiply them to a [Transform2D]:
 				[codeblocks]
@@ -167,59 +167,59 @@
 		</method>
 		<method name="offset_polyline">
 			<return type="Array" />
-			<argument index="0" name="polyline" type="PackedVector2Array" />
-			<argument index="1" name="delta" type="float" />
-			<argument index="2" name="join_type" type="int" enum="Geometry2D.PolyJoinType" default="0" />
-			<argument index="3" name="end_type" type="int" enum="Geometry2D.PolyEndType" default="3" />
+			<param index="0" name="polyline" type="PackedVector2Array" />
+			<param index="1" name="delta" type="float" />
+			<param index="2" name="join_type" type="int" enum="Geometry2D.PolyJoinType" default="0" />
+			<param index="3" name="end_type" type="int" enum="Geometry2D.PolyEndType" default="3" />
 			<description>
-				Inflates or deflates [code]polyline[/code] by [code]delta[/code] units (pixels), producing polygons. If [code]delta[/code] is positive, makes the polyline grow outward. Returns an array of polygons because inflating/deflating may result in multiple discrete polygons. If [code]delta[/code] is negative, returns an empty array.
-				Each polygon's vertices will be rounded as determined by [code]join_type[/code], see [enum PolyJoinType].
-				Each polygon's endpoints will be rounded as determined by [code]end_type[/code], see [enum PolyEndType].
+				Inflates or deflates [param polyline] by [param delta] units (pixels), producing polygons. If [param delta] is positive, makes the polyline grow outward. Returns an array of polygons because inflating/deflating may result in multiple discrete polygons. If [param delta] is negative, returns an empty array.
+				Each polygon's vertices will be rounded as determined by [param join_type], see [enum PolyJoinType].
+				Each polygon's endpoints will be rounded as determined by [param end_type], see [enum PolyEndType].
 				The operation may result in an outer polygon (boundary) and inner polygon (hole) produced which could be distinguished by calling [method is_polygon_clockwise].
 			</description>
 		</method>
 		<method name="point_is_inside_triangle" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="point" type="Vector2" />
-			<argument index="1" name="a" type="Vector2" />
-			<argument index="2" name="b" type="Vector2" />
-			<argument index="3" name="c" type="Vector2" />
+			<param index="0" name="point" type="Vector2" />
+			<param index="1" name="a" type="Vector2" />
+			<param index="2" name="b" type="Vector2" />
+			<param index="3" name="c" type="Vector2" />
 			<description>
-				Returns if [code]point[/code] is inside the triangle specified by [code]a[/code], [code]b[/code] and [code]c[/code].
+				Returns if [param point] is inside the triangle specified by [param a], [param b] and [param c].
 			</description>
 		</method>
 		<method name="segment_intersects_circle">
 			<return type="float" />
-			<argument index="0" name="segment_from" type="Vector2" />
-			<argument index="1" name="segment_to" type="Vector2" />
-			<argument index="2" name="circle_position" type="Vector2" />
-			<argument index="3" name="circle_radius" type="float" />
+			<param index="0" name="segment_from" type="Vector2" />
+			<param index="1" name="segment_to" type="Vector2" />
+			<param index="2" name="circle_position" type="Vector2" />
+			<param index="3" name="circle_radius" type="float" />
 			<description>
-				Given the 2D segment ([code]segment_from[/code], [code]segment_to[/code]), returns the position on the segment (as a number between 0 and 1) at which the segment hits the circle that is located at position [code]circle_position[/code] and has radius [code]circle_radius[/code]. If the segment does not intersect the circle, -1 is returned (this is also the case if the line extending the segment would intersect the circle, but the segment does not).
+				Given the 2D segment ([param segment_from], [param segment_to]), returns the position on the segment (as a number between 0 and 1) at which the segment hits the circle that is located at position [param circle_position] and has radius [param circle_radius]. If the segment does not intersect the circle, -1 is returned (this is also the case if the line extending the segment would intersect the circle, but the segment does not).
 			</description>
 		</method>
 		<method name="segment_intersects_segment">
 			<return type="Variant" />
-			<argument index="0" name="from_a" type="Vector2" />
-			<argument index="1" name="to_a" type="Vector2" />
-			<argument index="2" name="from_b" type="Vector2" />
-			<argument index="3" name="to_b" type="Vector2" />
+			<param index="0" name="from_a" type="Vector2" />
+			<param index="1" name="to_a" type="Vector2" />
+			<param index="2" name="from_b" type="Vector2" />
+			<param index="3" name="to_b" type="Vector2" />
 			<description>
-				Checks if the two segments ([code]from_a[/code], [code]to_a[/code]) and ([code]from_b[/code], [code]to_b[/code]) intersect. If yes, return the point of intersection as [Vector2]. If no intersection takes place, returns [code]null[/code].
+				Checks if the two segments ([param from_a], [param to_a]) and ([param from_b], [param to_b]) intersect. If yes, return the point of intersection as [Vector2]. If no intersection takes place, returns [code]null[/code].
 			</description>
 		</method>
 		<method name="triangulate_delaunay">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="points" type="PackedVector2Array" />
+			<param index="0" name="points" type="PackedVector2Array" />
 			<description>
-				Triangulates the area specified by discrete set of [code]points[/code] such that no point is inside the circumcircle of any resulting triangle. Returns a [PackedInt32Array] where each triangle consists of three consecutive point indices into [code]points[/code] (i.e. the returned array will have [code]n * 3[/code] elements, with [code]n[/code] being the number of found triangles). If the triangulation did not succeed, an empty [PackedInt32Array] is returned.
+				Triangulates the area specified by discrete set of [param points] such that no point is inside the circumcircle of any resulting triangle. Returns a [PackedInt32Array] where each triangle consists of three consecutive point indices into [param points] (i.e. the returned array will have [code]n * 3[/code] elements, with [code]n[/code] being the number of found triangles). If the triangulation did not succeed, an empty [PackedInt32Array] is returned.
 			</description>
 		</method>
 		<method name="triangulate_polygon">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="polygon" type="PackedVector2Array" />
+			<param index="0" name="polygon" type="PackedVector2Array" />
 			<description>
-				Triangulates the polygon specified by the points in [code]polygon[/code]. Returns a [PackedInt32Array] where each triangle consists of three consecutive point indices into [code]polygon[/code] (i.e. the returned array will have [code]n * 3[/code] elements, with [code]n[/code] being the number of found triangles). Output triangles will always be counter clockwise, and the contour will be flipped if it's clockwise. If the triangulation did not succeed, an empty [PackedInt32Array] is returned.
+				Triangulates the polygon specified by the points in [param polygon]. Returns a [PackedInt32Array] where each triangle consists of three consecutive point indices into [param polygon] (i.e. the returned array will have [code]n * 3[/code] elements, with [code]n[/code] being the number of found triangles). Output triangles will always be counter clockwise, and the contour will be flipped if it's clockwise. If the triangulation did not succeed, an empty [PackedInt32Array] is returned.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/Geometry3D.xml b/doc/classes/Geometry3D.xml
index c05d7df53f..c841842d14 100644
--- a/doc/classes/Geometry3D.xml
+++ b/doc/classes/Geometry3D.xml
@@ -11,117 +11,117 @@
 	<methods>
 		<method name="build_box_planes">
 			<return type="Array" />
-			<argument index="0" name="extents" type="Vector3" />
+			<param index="0" name="extents" type="Vector3" />
 			<description>
-				Returns an array with 6 [Plane]s that describe the sides of a box centered at the origin. The box size is defined by [code]extents[/code], which represents one (positive) corner of the box (i.e. half its actual size).
+				Returns an array with 6 [Plane]s that describe the sides of a box centered at the origin. The box size is defined by [param extents], which represents one (positive) corner of the box (i.e. half its actual size).
 			</description>
 		</method>
 		<method name="build_capsule_planes">
 			<return type="Array" />
-			<argument index="0" name="radius" type="float" />
-			<argument index="1" name="height" type="float" />
-			<argument index="2" name="sides" type="int" />
-			<argument index="3" name="lats" type="int" />
-			<argument index="4" name="axis" type="int" enum="Vector3.Axis" default="2" />
+			<param index="0" name="radius" type="float" />
+			<param index="1" name="height" type="float" />
+			<param index="2" name="sides" type="int" />
+			<param index="3" name="lats" type="int" />
+			<param index="4" name="axis" type="int" enum="Vector3.Axis" default="2" />
 			<description>
-				Returns an array of [Plane]s closely bounding a faceted capsule centered at the origin with radius [code]radius[/code] and height [code]height[/code]. The parameter [code]sides[/code] defines how many planes will be generated for the side part of the capsule, whereas [code]lats[/code] gives the number of latitudinal steps at the bottom and top of the capsule. The parameter [code]axis[/code] describes the axis along which the capsule is oriented (0 for X, 1 for Y, 2 for Z).
+				Returns an array of [Plane]s closely bounding a faceted capsule centered at the origin with radius [param radius] and height [param height]. The parameter [param sides] defines how many planes will be generated for the side part of the capsule, whereas [param lats] gives the number of latitudinal steps at the bottom and top of the capsule. The parameter [param axis] describes the axis along which the capsule is oriented (0 for X, 1 for Y, 2 for Z).
 			</description>
 		</method>
 		<method name="build_cylinder_planes">
 			<return type="Array" />
-			<argument index="0" name="radius" type="float" />
-			<argument index="1" name="height" type="float" />
-			<argument index="2" name="sides" type="int" />
-			<argument index="3" name="axis" type="int" enum="Vector3.Axis" default="2" />
+			<param index="0" name="radius" type="float" />
+			<param index="1" name="height" type="float" />
+			<param index="2" name="sides" type="int" />
+			<param index="3" name="axis" type="int" enum="Vector3.Axis" default="2" />
 			<description>
-				Returns an array of [Plane]s closely bounding a faceted cylinder centered at the origin with radius [code]radius[/code] and height [code]height[/code]. The parameter [code]sides[/code] defines how many planes will be generated for the round part of the cylinder. The parameter [code]axis[/code] describes the axis along which the cylinder is oriented (0 for X, 1 for Y, 2 for Z).
+				Returns an array of [Plane]s closely bounding a faceted cylinder centered at the origin with radius [param radius] and height [param height]. The parameter [param sides] defines how many planes will be generated for the round part of the cylinder. The parameter [param axis] describes the axis along which the cylinder is oriented (0 for X, 1 for Y, 2 for Z).
 			</description>
 		</method>
 		<method name="clip_polygon">
 			<return type="PackedVector3Array" />
-			<argument index="0" name="points" type="PackedVector3Array" />
-			<argument index="1" name="plane" type="Plane" />
+			<param index="0" name="points" type="PackedVector3Array" />
+			<param index="1" name="plane" type="Plane" />
 			<description>
-				Clips the polygon defined by the points in [code]points[/code] against the [code]plane[/code] and returns the points of the clipped polygon.
+				Clips the polygon defined by the points in [param points] against the [param plane] and returns the points of the clipped polygon.
 			</description>
 		</method>
 		<method name="get_closest_point_to_segment">
 			<return type="Vector3" />
-			<argument index="0" name="point" type="Vector3" />
-			<argument index="1" name="s1" type="Vector3" />
-			<argument index="2" name="s2" type="Vector3" />
+			<param index="0" name="point" type="Vector3" />
+			<param index="1" name="s1" type="Vector3" />
+			<param index="2" name="s2" type="Vector3" />
 			<description>
-				Returns the 3D point on the 3D segment ([code]s1[/code], [code]s2[/code]) that is closest to [code]point[/code]. The returned point will always be inside the specified segment.
+				Returns the 3D point on the 3D segment ([param s1], [param s2]) that is closest to [param point]. The returned point will always be inside the specified segment.
 			</description>
 		</method>
 		<method name="get_closest_point_to_segment_uncapped">
 			<return type="Vector3" />
-			<argument index="0" name="point" type="Vector3" />
-			<argument index="1" name="s1" type="Vector3" />
-			<argument index="2" name="s2" type="Vector3" />
+			<param index="0" name="point" type="Vector3" />
+			<param index="1" name="s1" type="Vector3" />
+			<param index="2" name="s2" type="Vector3" />
 			<description>
-				Returns the 3D point on the 3D line defined by ([code]s1[/code], [code]s2[/code]) that is closest to [code]point[/code]. The returned point can be inside the segment ([code]s1[/code], [code]s2[/code]) or outside of it, i.e. somewhere on the line extending from the segment.
+				Returns the 3D point on the 3D line defined by ([param s1], [param s2]) that is closest to [param point]. The returned point can be inside the segment ([param s1], [param s2]) or outside of it, i.e. somewhere on the line extending from the segment.
 			</description>
 		</method>
 		<method name="get_closest_points_between_segments">
 			<return type="PackedVector3Array" />
-			<argument index="0" name="p1" type="Vector3" />
-			<argument index="1" name="p2" type="Vector3" />
-			<argument index="2" name="q1" type="Vector3" />
-			<argument index="3" name="q2" type="Vector3" />
+			<param index="0" name="p1" type="Vector3" />
+			<param index="1" name="p2" type="Vector3" />
+			<param index="2" name="q1" type="Vector3" />
+			<param index="3" name="q2" type="Vector3" />
 			<description>
-				Given the two 3D segments ([code]p1[/code], [code]p2[/code]) and ([code]q1[/code], [code]q2[/code]), finds those two points on the two segments that are closest to each other. Returns a [PackedVector3Array] that contains this point on ([code]p1[/code], [code]p2[/code]) as well the accompanying point on ([code]q1[/code], [code]q2[/code]).
+				Given the two 3D segments ([param p1], [param p2]) and ([param q1], [param q2]), finds those two points on the two segments that are closest to each other. Returns a [PackedVector3Array] that contains this point on ([param p1], [param p2]) as well the accompanying point on ([param q1], [param q2]).
 			</description>
 		</method>
 		<method name="ray_intersects_triangle">
 			<return type="Variant" />
-			<argument index="0" name="from" type="Vector3" />
-			<argument index="1" name="dir" type="Vector3" />
-			<argument index="2" name="a" type="Vector3" />
-			<argument index="3" name="b" type="Vector3" />
-			<argument index="4" name="c" type="Vector3" />
+			<param index="0" name="from" type="Vector3" />
+			<param index="1" name="dir" type="Vector3" />
+			<param index="2" name="a" type="Vector3" />
+			<param index="3" name="b" type="Vector3" />
+			<param index="4" name="c" type="Vector3" />
 			<description>
-				Tests if the 3D ray starting at [code]from[/code] with the direction of [code]dir[/code] intersects the triangle specified by [code]a[/code], [code]b[/code] and [code]c[/code]. If yes, returns the point of intersection as [Vector3]. If no intersection takes place, returns [code]null[/code].
+				Tests if the 3D ray starting at [param from] with the direction of [param dir] intersects the triangle specified by [param a], [param b] and [param c]. If yes, returns the point of intersection as [Vector3]. If no intersection takes place, returns [code]null[/code].
 			</description>
 		</method>
 		<method name="segment_intersects_convex">
 			<return type="PackedVector3Array" />
-			<argument index="0" name="from" type="Vector3" />
-			<argument index="1" name="to" type="Vector3" />
-			<argument index="2" name="planes" type="Array" />
+			<param index="0" name="from" type="Vector3" />
+			<param index="1" name="to" type="Vector3" />
+			<param index="2" name="planes" type="Array" />
 			<description>
-				Given a convex hull defined though the [Plane]s in the array [code]planes[/code], tests if the segment ([code]from[/code], [code]to[/code]) intersects with that hull. If an intersection is found, returns a [PackedVector3Array] containing the point the intersection and the hull's normal. Otherwise, returns an empty array.
+				Given a convex hull defined though the [Plane]s in the array [param planes], tests if the segment ([param from], [param to]) intersects with that hull. If an intersection is found, returns a [PackedVector3Array] containing the point the intersection and the hull's normal. Otherwise, returns an empty array.
 			</description>
 		</method>
 		<method name="segment_intersects_cylinder">
 			<return type="PackedVector3Array" />
-			<argument index="0" name="from" type="Vector3" />
-			<argument index="1" name="to" type="Vector3" />
-			<argument index="2" name="height" type="float" />
-			<argument index="3" name="radius" type="float" />
+			<param index="0" name="from" type="Vector3" />
+			<param index="1" name="to" type="Vector3" />
+			<param index="2" name="height" type="float" />
+			<param index="3" name="radius" type="float" />
 			<description>
-				Checks if the segment ([code]from[/code], [code]to[/code]) intersects the cylinder with height [code]height[/code] that is centered at the origin and has radius [code]radius[/code]. If no, returns an empty [PackedVector3Array]. If an intersection takes place, the returned array contains the point of intersection and the cylinder's normal at the point of intersection.
+				Checks if the segment ([param from], [param to]) intersects the cylinder with height [param height] that is centered at the origin and has radius [param radius]. If no, returns an empty [PackedVector3Array]. If an intersection takes place, the returned array contains the point of intersection and the cylinder's normal at the point of intersection.
 			</description>
 		</method>
 		<method name="segment_intersects_sphere">
 			<return type="PackedVector3Array" />
-			<argument index="0" name="from" type="Vector3" />
-			<argument index="1" name="to" type="Vector3" />
-			<argument index="2" name="sphere_position" type="Vector3" />
-			<argument index="3" name="sphere_radius" type="float" />
+			<param index="0" name="from" type="Vector3" />
+			<param index="1" name="to" type="Vector3" />
+			<param index="2" name="sphere_position" type="Vector3" />
+			<param index="3" name="sphere_radius" type="float" />
 			<description>
-				Checks if the segment ([code]from[/code], [code]to[/code]) intersects the sphere that is located at [code]sphere_position[/code] and has radius [code]sphere_radius[/code]. If no, returns an empty [PackedVector3Array]. If yes, returns a [PackedVector3Array] containing the point of intersection and the sphere's normal at the point of intersection.
+				Checks if the segment ([param from], [param to]) intersects the sphere that is located at [param sphere_position] and has radius [param sphere_radius]. If no, returns an empty [PackedVector3Array]. If yes, returns a [PackedVector3Array] containing the point of intersection and the sphere's normal at the point of intersection.
 			</description>
 		</method>
 		<method name="segment_intersects_triangle">
 			<return type="Variant" />
-			<argument index="0" name="from" type="Vector3" />
-			<argument index="1" name="to" type="Vector3" />
-			<argument index="2" name="a" type="Vector3" />
-			<argument index="3" name="b" type="Vector3" />
-			<argument index="4" name="c" type="Vector3" />
+			<param index="0" name="from" type="Vector3" />
+			<param index="1" name="to" type="Vector3" />
+			<param index="2" name="a" type="Vector3" />
+			<param index="3" name="b" type="Vector3" />
+			<param index="4" name="c" type="Vector3" />
 			<description>
-				Tests if the segment ([code]from[/code], [code]to[/code]) intersects the triangle [code]a[/code], [code]b[/code], [code]c[/code]. If yes, returns the point of intersection as [Vector3]. If no intersection takes place, returns [code]null[/code].
+				Tests if the segment ([param from], [param to]) intersects the triangle [param a], [param b], [param c]. If yes, returns the point of intersection as [Vector3]. If no intersection takes place, returns [code]null[/code].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/GeometryInstance3D.xml b/doc/classes/GeometryInstance3D.xml
index c803f43fb0..79a60a9e62 100644
--- a/doc/classes/GeometryInstance3D.xml
+++ b/doc/classes/GeometryInstance3D.xml
@@ -9,23 +9,23 @@
 	<tutorials>
 	</tutorials>
 	<methods>
-		<method name="get_shader_instance_uniform" qualifiers="const">
+		<method name="get_instance_shader_uniform" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="uniform" type="StringName" />
+			<param index="0" name="uniform" type="StringName" />
 			<description>
 			</description>
 		</method>
 		<method name="set_custom_aabb">
 			<return type="void" />
-			<argument index="0" name="aabb" type="AABB" />
+			<param index="0" name="aabb" type="AABB" />
 			<description>
 				Overrides the bounding box of this node with a custom one. To remove it, set an [AABB] with all fields set to zero.
 			</description>
 		</method>
-		<method name="set_shader_instance_uniform">
+		<method name="set_instance_shader_uniform">
 			<return type="void" />
-			<argument index="0" name="uniform" type="StringName" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="uniform" type="StringName" />
+			<param index="1" name="value" type="Variant" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/Gradient.xml b/doc/classes/Gradient.xml
index 89c968cc9e..f081174b67 100644
--- a/doc/classes/Gradient.xml
+++ b/doc/classes/Gradient.xml
@@ -5,30 +5,31 @@
 	</brief_description>
 	<description>
 		Given a set of colors, this resource will interpolate them in order. This means that if you have color 1, color 2 and color 3, the gradient will interpolate from color 1 to color 2 and from color 2 to color 3. The gradient will initially have 2 colors (black and white), one (black) at gradient lower offset 0 and the other (white) at the gradient higher offset 1.
+		See also [Curve] which supports more complex easing methods, but does not support colors.
 	</description>
 	<tutorials>
 	</tutorials>
 	<methods>
 		<method name="add_point">
 			<return type="void" />
-			<argument index="0" name="offset" type="float" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="offset" type="float" />
+			<param index="1" name="color" type="Color" />
 			<description>
 				Adds the specified color to the end of the gradient, with the specified offset.
 			</description>
 		</method>
 		<method name="get_color">
 			<return type="Color" />
-			<argument index="0" name="point" type="int" />
+			<param index="0" name="point" type="int" />
 			<description>
-				Returns the color of the gradient color at index [code]point[/code].
+				Returns the color of the gradient color at index [param point].
 			</description>
 		</method>
 		<method name="get_offset">
 			<return type="float" />
-			<argument index="0" name="point" type="int" />
+			<param index="0" name="point" type="int" />
 			<description>
-				Returns the offset of the gradient color at index [code]point[/code].
+				Returns the offset of the gradient color at index [param point].
 			</description>
 		</method>
 		<method name="get_point_count" qualifiers="const">
@@ -39,16 +40,16 @@
 		</method>
 		<method name="interpolate">
 			<return type="Color" />
-			<argument index="0" name="offset" type="float" />
+			<param index="0" name="offset" type="float" />
 			<description>
-				Returns the interpolated color specified by [code]offset[/code].
+				Returns the interpolated color specified by [param offset].
 			</description>
 		</method>
 		<method name="remove_point">
 			<return type="void" />
-			<argument index="0" name="point" type="int" />
+			<param index="0" name="point" type="int" />
 			<description>
-				Removes the color at the index [code]point[/code].
+				Removes the color at the index [param point].
 			</description>
 		</method>
 		<method name="reverse">
@@ -59,18 +60,18 @@
 		</method>
 		<method name="set_color">
 			<return type="void" />
-			<argument index="0" name="point" type="int" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="point" type="int" />
+			<param index="1" name="color" type="Color" />
 			<description>
-				Sets the color of the gradient color at index [code]point[/code].
+				Sets the color of the gradient color at index [param point].
 			</description>
 		</method>
 		<method name="set_offset">
 			<return type="void" />
-			<argument index="0" name="point" type="int" />
-			<argument index="1" name="offset" type="float" />
+			<param index="0" name="point" type="int" />
+			<param index="1" name="offset" type="float" />
 			<description>
-				Sets the offset for the gradient color at index [code]point[/code].
+				Sets the offset for the gradient color at index [param point].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/GraphEdit.xml b/doc/classes/GraphEdit.xml
index 33145dccd0..9f9d1a7ed6 100644
--- a/doc/classes/GraphEdit.xml
+++ b/doc/classes/GraphEdit.xml
@@ -12,20 +12,20 @@
 	<methods>
 		<method name="_get_connection_line" qualifiers="virtual const">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="from" type="Vector2" />
-			<argument index="1" name="to" type="Vector2" />
+			<param index="0" name="from" type="Vector2" />
+			<param index="1" name="to" type="Vector2" />
 			<description>
 				Virtual method which can be overridden to customize how connections are drawn.
 			</description>
 		</method>
 		<method name="_is_in_input_hotzone" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="graph_node" type="Object" />
-			<argument index="1" name="slot_index" type="int" />
-			<argument index="2" name="mouse_position" type="Vector2" />
+			<param index="0" name="graph_node" type="Object" />
+			<param index="1" name="slot_index" type="int" />
+			<param index="2" name="mouse_position" type="Vector2" />
 			<description>
-				Returns whether the [code]mouse_position[/code] is in the input hot zone.
-				By default, a hot zone is a [Rect2] positioned such that its center is at [code]graph_node[/code].[method GraphNode.get_connection_input_position]([code]slot_index[/code]) (For output's case, call [method GraphNode.get_connection_output_position] instead). The hot zone's width is twice the Theme Property [code]port_grab_distance_horizontal[/code], and its height is twice the [code]port_grab_distance_vertical[/code].
+				Returns whether the [param mouse_position] is in the input hot zone.
+				By default, a hot zone is a [Rect2] positioned such that its center is at [param graph_node].[method GraphNode.get_connection_input_position]([param slot_index]) (For output's case, call [method GraphNode.get_connection_output_position] instead). The hot zone's width is twice the Theme Property [code]port_grab_distance_horizontal[/code], and its height is twice the [code]port_grab_distance_vertical[/code].
 				Below is a sample code to help get started:
 				[codeblock]
 				func _is_in_input_hotzone(graph_node, slot_index, mouse_position):
@@ -39,11 +39,11 @@
 		</method>
 		<method name="_is_in_output_hotzone" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="graph_node" type="Object" />
-			<argument index="1" name="slot_index" type="int" />
-			<argument index="2" name="mouse_position" type="Vector2" />
+			<param index="0" name="graph_node" type="Object" />
+			<param index="1" name="slot_index" type="int" />
+			<param index="2" name="mouse_position" type="Vector2" />
 			<description>
-				Returns whether the [code]mouse_position[/code] is in the output hot zone. For more information on hot zones, see [method _is_in_input_hotzone].
+				Returns whether the [param mouse_position] is in the output hot zone. For more information on hot zones, see [method _is_in_input_hotzone].
 				Below is a sample code to help get started:
 				[codeblock]
 				func _is_in_output_hotzone(graph_node, slot_index, mouse_position):
@@ -57,10 +57,10 @@
 		</method>
 		<method name="_is_node_hover_valid" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="from" type="StringName" />
-			<argument index="1" name="from_slot" type="int" />
-			<argument index="2" name="to" type="StringName" />
-			<argument index="3" name="to_slot" type="int" />
+			<param index="0" name="from" type="StringName" />
+			<param index="1" name="from_slot" type="int" />
+			<param index="2" name="to" type="StringName" />
+			<param index="3" name="to_slot" type="int" />
 			<description>
 				This virtual method can be used to insert additional error detection while the user is dragging a connection over a valid port.
 				Return [code]true[/code] if the connection is indeed valid or return [code]false[/code] if the connection is impossible. If the connection is impossible, no snapping to the port and thus no connection request to that port will happen.
@@ -80,22 +80,22 @@
 		</method>
 		<method name="add_valid_connection_type">
 			<return type="void" />
-			<argument index="0" name="from_type" type="int" />
-			<argument index="1" name="to_type" type="int" />
+			<param index="0" name="from_type" type="int" />
+			<param index="1" name="to_type" type="int" />
 			<description>
 				Makes possible the connection between two different slot types. The type is defined with the [method GraphNode.set_slot] method.
 			</description>
 		</method>
 		<method name="add_valid_left_disconnect_type">
 			<return type="void" />
-			<argument index="0" name="type" type="int" />
+			<param index="0" name="type" type="int" />
 			<description>
 				Makes possible to disconnect nodes when dragging from the slot at the left if it has the specified type.
 			</description>
 		</method>
 		<method name="add_valid_right_disconnect_type">
 			<return type="void" />
-			<argument index="0" name="type" type="int" />
+			<param index="0" name="type" type="int" />
 			<description>
 				Makes possible to disconnect nodes when dragging from the slot at the right if it has the specified type.
 			</description>
@@ -114,22 +114,22 @@
 		</method>
 		<method name="connect_node">
 			<return type="int" enum="Error" />
-			<argument index="0" name="from" type="StringName" />
-			<argument index="1" name="from_port" type="int" />
-			<argument index="2" name="to" type="StringName" />
-			<argument index="3" name="to_port" type="int" />
+			<param index="0" name="from" type="StringName" />
+			<param index="1" name="from_port" type="int" />
+			<param index="2" name="to" type="StringName" />
+			<param index="3" name="to_port" type="int" />
 			<description>
-				Create a connection between the [code]from_port[/code] slot of the [code]from[/code] GraphNode and the [code]to_port[/code] slot of the [code]to[/code] GraphNode. If the connection already exists, no connection is created.
+				Create a connection between the [param from_port] slot of the [param from] GraphNode and the [param to_port] slot of the [param to] GraphNode. If the connection already exists, no connection is created.
 			</description>
 		</method>
 		<method name="disconnect_node">
 			<return type="void" />
-			<argument index="0" name="from" type="StringName" />
-			<argument index="1" name="from_port" type="int" />
-			<argument index="2" name="to" type="StringName" />
-			<argument index="3" name="to_port" type="int" />
+			<param index="0" name="from" type="StringName" />
+			<param index="1" name="from_port" type="int" />
+			<param index="2" name="to" type="StringName" />
+			<param index="3" name="to_port" type="int" />
 			<description>
-				Removes the connection between the [code]from_port[/code] slot of the [code]from[/code] GraphNode and the [code]to_port[/code] slot of the [code]to[/code] GraphNode. If the connection does not exist, no connection is removed.
+				Removes the connection between the [param from_port] slot of the [param from] GraphNode and the [param to_port] slot of the [param to] GraphNode. If the connection does not exist, no connection is removed.
 			</description>
 		</method>
 		<method name="force_connection_drag_end">
@@ -142,10 +142,10 @@
 		</method>
 		<method name="get_connection_line">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="from" type="Vector2" />
-			<argument index="1" name="to" type="Vector2" />
+			<param index="0" name="from" type="Vector2" />
+			<param index="1" name="to" type="Vector2" />
 			<description>
-				Returns the points which would make up a connection between [code]from[/code] and [code]to[/code].
+				Returns the points which would make up a connection between [param from] and [param to].
 			</description>
 		</method>
 		<method name="get_connection_list" qualifiers="const">
@@ -163,60 +163,60 @@
 		</method>
 		<method name="is_node_connected">
 			<return type="bool" />
-			<argument index="0" name="from" type="StringName" />
-			<argument index="1" name="from_port" type="int" />
-			<argument index="2" name="to" type="StringName" />
-			<argument index="3" name="to_port" type="int" />
+			<param index="0" name="from" type="StringName" />
+			<param index="1" name="from_port" type="int" />
+			<param index="2" name="to" type="StringName" />
+			<param index="3" name="to_port" type="int" />
 			<description>
-				Returns [code]true[/code] if the [code]from_port[/code] slot of the [code]from[/code] GraphNode is connected to the [code]to_port[/code] slot of the [code]to[/code] GraphNode.
+				Returns [code]true[/code] if the [param from_port] slot of the [param from] GraphNode is connected to the [param to_port] slot of the [param to] GraphNode.
 			</description>
 		</method>
 		<method name="is_valid_connection_type" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="from_type" type="int" />
-			<argument index="1" name="to_type" type="int" />
+			<param index="0" name="from_type" type="int" />
+			<param index="1" name="to_type" type="int" />
 			<description>
 				Returns whether it's possible to connect slots of the specified types.
 			</description>
 		</method>
 		<method name="remove_valid_connection_type">
 			<return type="void" />
-			<argument index="0" name="from_type" type="int" />
-			<argument index="1" name="to_type" type="int" />
+			<param index="0" name="from_type" type="int" />
+			<param index="1" name="to_type" type="int" />
 			<description>
 				Makes it not possible to connect between two different slot types. The type is defined with the [method GraphNode.set_slot] method.
 			</description>
 		</method>
 		<method name="remove_valid_left_disconnect_type">
 			<return type="void" />
-			<argument index="0" name="type" type="int" />
+			<param index="0" name="type" type="int" />
 			<description>
 				Removes the possibility to disconnect nodes when dragging from the slot at the left if it has the specified type.
 			</description>
 		</method>
 		<method name="remove_valid_right_disconnect_type">
 			<return type="void" />
-			<argument index="0" name="type" type="int" />
+			<param index="0" name="type" type="int" />
 			<description>
 				Removes the possibility to disconnect nodes when dragging from the slot at the right if it has the specified type.
 			</description>
 		</method>
 		<method name="set_connection_activity">
 			<return type="void" />
-			<argument index="0" name="from" type="StringName" />
-			<argument index="1" name="from_port" type="int" />
-			<argument index="2" name="to" type="StringName" />
-			<argument index="3" name="to_port" type="int" />
-			<argument index="4" name="amount" type="float" />
+			<param index="0" name="from" type="StringName" />
+			<param index="1" name="from_port" type="int" />
+			<param index="2" name="to" type="StringName" />
+			<param index="3" name="to_port" type="int" />
+			<param index="4" name="amount" type="float" />
 			<description>
-				Sets the coloration of the connection between [code]from[/code]'s [code]from_port[/code] and [code]to[/code]'s [code]to_port[/code] with the color provided in the [theme_item activity] theme property.
+				Sets the coloration of the connection between [param from]'s [param from_port] and [param to]'s [param to_port] with the color provided in the [theme_item activity] theme property.
 			</description>
 		</method>
 		<method name="set_selected">
 			<return type="void" />
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
-				Sets the specified [code]node[/code] as the one selected.
+				Sets the specified [param node] as the one selected.
 			</description>
 		</method>
 	</methods>
@@ -284,34 +284,34 @@
 			</description>
 		</signal>
 		<signal name="connection_drag_started">
-			<argument index="0" name="from" type="String" />
-			<argument index="1" name="slot" type="String" />
-			<argument index="2" name="is_output" type="bool" />
+			<param index="0" name="from" type="String" />
+			<param index="1" name="slot" type="int" />
+			<param index="2" name="is_output" type="bool" />
 			<description>
 				Emitted at the beginning of a connection drag.
 			</description>
 		</signal>
 		<signal name="connection_from_empty">
-			<argument index="0" name="to" type="StringName" />
-			<argument index="1" name="to_slot" type="int" />
-			<argument index="2" name="release_position" type="Vector2" />
+			<param index="0" name="to" type="StringName" />
+			<param index="1" name="to_slot" type="int" />
+			<param index="2" name="release_position" type="Vector2" />
 			<description>
 				Emitted when user dragging connection from input port into empty space of the graph.
 			</description>
 		</signal>
 		<signal name="connection_request">
-			<argument index="0" name="from" type="StringName" />
-			<argument index="1" name="from_slot" type="int" />
-			<argument index="2" name="to" type="StringName" />
-			<argument index="3" name="to_slot" type="int" />
+			<param index="0" name="from" type="StringName" />
+			<param index="1" name="from_slot" type="int" />
+			<param index="2" name="to" type="StringName" />
+			<param index="3" name="to_slot" type="int" />
 			<description>
-				Emitted to the GraphEdit when the connection between the [code]from_slot[/code] slot of the [code]from[/code] GraphNode and the [code]to_slot[/code] slot of the [code]to[/code] GraphNode is attempted to be created.
+				Emitted to the GraphEdit when the connection between the [param from_slot] slot of the [param from] GraphNode and the [param to_slot] slot of the [param to] GraphNode is attempted to be created.
 			</description>
 		</signal>
 		<signal name="connection_to_empty">
-			<argument index="0" name="from" type="StringName" />
-			<argument index="1" name="from_slot" type="int" />
-			<argument index="2" name="release_position" type="Vector2" />
+			<param index="0" name="from" type="StringName" />
+			<param index="1" name="from_slot" type="int" />
+			<param index="2" name="release_position" type="Vector2" />
 			<description>
 				Emitted when user dragging connection from output port into empty space of the graph.
 			</description>
@@ -322,18 +322,18 @@
 			</description>
 		</signal>
 		<signal name="delete_nodes_request">
-			<argument index="0" name="nodes" type="StringName[]" />
+			<param index="0" name="nodes" type="StringName[]" />
 			<description>
 				Emitted when a GraphNode is attempted to be removed from the GraphEdit. Provides a list of node names to be removed (all selected nodes, excluding nodes without closing button).
 			</description>
 		</signal>
 		<signal name="disconnection_request">
-			<argument index="0" name="from" type="StringName" />
-			<argument index="1" name="from_slot" type="int" />
-			<argument index="2" name="to" type="StringName" />
-			<argument index="3" name="to_slot" type="int" />
+			<param index="0" name="from" type="StringName" />
+			<param index="1" name="from_slot" type="int" />
+			<param index="2" name="to" type="StringName" />
+			<param index="3" name="to_slot" type="int" />
 			<description>
-				Emitted to the GraphEdit when the connection between [code]from_slot[/code] slot of [code]from[/code] GraphNode and [code]to_slot[/code] slot of [code]to[/code] GraphNode is attempted to be removed.
+				Emitted to the GraphEdit when the connection between [param from_slot] slot of [param from] GraphNode and [param to_slot] slot of [param to] GraphNode is attempted to be removed.
 			</description>
 		</signal>
 		<signal name="duplicate_nodes_request">
@@ -347,12 +347,12 @@
 			</description>
 		</signal>
 		<signal name="node_deselected">
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
 			</description>
 		</signal>
 		<signal name="node_selected">
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
 				Emitted when a GraphNode is selected.
 			</description>
@@ -363,13 +363,13 @@
 			</description>
 		</signal>
 		<signal name="popup_request">
-			<argument index="0" name="position" type="Vector2" />
+			<param index="0" name="position" type="Vector2" />
 			<description>
-				Emitted when a popup is requested. Happens on right-clicking in the GraphEdit. [code]position[/code] is the position of the mouse pointer when the signal is sent.
+				Emitted when a popup is requested. Happens on right-clicking in the GraphEdit. [param position] is the position of the mouse pointer when the signal is sent.
 			</description>
 		</signal>
 		<signal name="scroll_offset_changed">
-			<argument index="0" name="offset" type="Vector2" />
+			<param index="0" name="offset" type="Vector2" />
 			<description>
 				Emitted when the scroll offset is changed by the user. It will not be emitted when changed in code.
 			</description>
diff --git a/doc/classes/GraphNode.xml b/doc/classes/GraphNode.xml
index 36dbae1d74..009c329ee2 100644
--- a/doc/classes/GraphNode.xml
+++ b/doc/classes/GraphNode.xml
@@ -19,16 +19,16 @@
 		</method>
 		<method name="clear_slot">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Disables input and output slot whose index is [code]idx[/code].
+				Disables input and output slot whose index is [param idx].
 			</description>
 		</method>
 		<method name="get_connection_input_color">
 			<return type="Color" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the [Color] of the input connection [code]idx[/code].
+				Returns the [Color] of the input connection [param idx].
 			</description>
 		</method>
 		<method name="get_connection_input_count">
@@ -39,30 +39,30 @@
 		</method>
 		<method name="get_connection_input_height">
 			<return type="int" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the height of the input connection [code]idx[/code].
+				Returns the height of the input connection [param idx].
 			</description>
 		</method>
 		<method name="get_connection_input_position">
 			<return type="Vector2" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the position of the input connection [code]idx[/code].
+				Returns the position of the input connection [param idx].
 			</description>
 		</method>
 		<method name="get_connection_input_type">
 			<return type="int" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the type of the input connection [code]idx[/code].
+				Returns the type of the input connection [param idx].
 			</description>
 		</method>
 		<method name="get_connection_output_color">
 			<return type="Color" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the [Color] of the output connection [code]idx[/code].
+				Returns the [Color] of the output connection [param idx].
 			</description>
 		</method>
 		<method name="get_connection_output_count">
@@ -73,150 +73,150 @@
 		</method>
 		<method name="get_connection_output_height">
 			<return type="int" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the height of the output connection [code]idx[/code].
+				Returns the height of the output connection [param idx].
 			</description>
 		</method>
 		<method name="get_connection_output_position">
 			<return type="Vector2" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the position of the output connection [code]idx[/code].
+				Returns the position of the output connection [param idx].
 			</description>
 		</method>
 		<method name="get_connection_output_type">
 			<return type="int" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the type of the output connection [code]idx[/code].
+				Returns the type of the output connection [param idx].
 			</description>
 		</method>
 		<method name="get_slot_color_left" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the left (input) [Color] of the slot [code]idx[/code].
+				Returns the left (input) [Color] of the slot [param idx].
 			</description>
 		</method>
 		<method name="get_slot_color_right" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the right (output) [Color] of the slot [code]idx[/code].
+				Returns the right (output) [Color] of the slot [param idx].
 			</description>
 		</method>
 		<method name="get_slot_type_left" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the left (input) type of the slot [code]idx[/code].
+				Returns the left (input) type of the slot [param idx].
 			</description>
 		</method>
 		<method name="get_slot_type_right" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the right (output) type of the slot [code]idx[/code].
+				Returns the right (output) type of the slot [param idx].
 			</description>
 		</method>
 		<method name="is_slot_draw_stylebox" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns true if the background [StyleBox] of the slot [code]idx[/code] is drawn.
+				Returns true if the background [StyleBox] of the slot [param idx] is drawn.
 			</description>
 		</method>
 		<method name="is_slot_enabled_left" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns [code]true[/code] if left (input) side of the slot [code]idx[/code] is enabled.
+				Returns [code]true[/code] if left (input) side of the slot [param idx] is enabled.
 			</description>
 		</method>
 		<method name="is_slot_enabled_right" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns [code]true[/code] if right (output) side of the slot [code]idx[/code] is enabled.
+				Returns [code]true[/code] if right (output) side of the slot [param idx] is enabled.
 			</description>
 		</method>
 		<method name="set_slot">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="enable_left" type="bool" />
-			<argument index="2" name="type_left" type="int" />
-			<argument index="3" name="color_left" type="Color" />
-			<argument index="4" name="enable_right" type="bool" />
-			<argument index="5" name="type_right" type="int" />
-			<argument index="6" name="color_right" type="Color" />
-			<argument index="7" name="custom_left" type="Texture2D" default="null" />
-			<argument index="8" name="custom_right" type="Texture2D" default="null" />
-			<argument index="9" name="enable" type="bool" default="true" />
-			<description>
-				Sets properties of the slot with ID [code]idx[/code].
-				If [code]enable_left[/code]/[code]right[/code], a port will appear and the slot will be able to be connected from this side.
-				[code]type_left[/code]/[code]right[/code] is an arbitrary type of the port. Only ports with the same type values can be connected.
-				[code]color_left[/code]/[code]right[/code] is the tint of the port's icon on this side.
-				[code]custom_left[/code]/[code]right[/code] is a custom texture for this side's port.
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="enable_left" type="bool" />
+			<param index="2" name="type_left" type="int" />
+			<param index="3" name="color_left" type="Color" />
+			<param index="4" name="enable_right" type="bool" />
+			<param index="5" name="type_right" type="int" />
+			<param index="6" name="color_right" type="Color" />
+			<param index="7" name="custom_left" type="Texture2D" default="null" />
+			<param index="8" name="custom_right" type="Texture2D" default="null" />
+			<param index="9" name="enable" type="bool" default="true" />
+			<description>
+				Sets properties of the slot with ID [param idx].
+				If [param enable_left]/[param enable_right], a port will appear and the slot will be able to be connected from this side.
+				[param type_left]/[param type_right] is an arbitrary type of the port. Only ports with the same type values can be connected.
+				[param color_left]/[param color_right] is the tint of the port's icon on this side.
+				[param custom_left]/[param custom_right] is a custom texture for this side's port.
 				[b]Note:[/b] This method only sets properties of the slot. To create the slot, add a [Control]-derived child to the GraphNode.
 				Individual properties can be set using one of the [code]set_slot_*[/code] methods. You must enable at least one side of the slot to do so.
 			</description>
 		</method>
 		<method name="set_slot_color_left">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="color_left" type="Color" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="color_left" type="Color" />
 			<description>
-				Sets the [Color] of the left (input) side of the slot [code]idx[/code] to [code]color_left[/code].
+				Sets the [Color] of the left (input) side of the slot [param idx] to [param color_left].
 			</description>
 		</method>
 		<method name="set_slot_color_right">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="color_right" type="Color" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="color_right" type="Color" />
 			<description>
-				Sets the [Color] of the right (output) side of the slot [code]idx[/code] to [code]color_right[/code].
+				Sets the [Color] of the right (output) side of the slot [param idx] to [param color_right].
 			</description>
 		</method>
 		<method name="set_slot_draw_stylebox">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="draw_stylebox" type="bool" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="draw_stylebox" type="bool" />
 			<description>
-				Toggles the background [StyleBox] of the slot [code]idx[/code].
+				Toggles the background [StyleBox] of the slot [param idx].
 			</description>
 		</method>
 		<method name="set_slot_enabled_left">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="enable_left" type="bool" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="enable_left" type="bool" />
 			<description>
-				Toggles the left (input) side of the slot [code]idx[/code]. If [code]enable_left[/code] is [code]true[/code], a port will appear on the left side and the slot will be able to be connected from this side.
+				Toggles the left (input) side of the slot [param idx]. If [param enable_left] is [code]true[/code], a port will appear on the left side and the slot will be able to be connected from this side.
 			</description>
 		</method>
 		<method name="set_slot_enabled_right">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="enable_right" type="bool" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="enable_right" type="bool" />
 			<description>
-				Toggles the right (output) side of the slot [code]idx[/code]. If [code]enable_right[/code] is [code]true[/code], a port will appear on the right side and the slot will be able to be connected from this side.
+				Toggles the right (output) side of the slot [param idx]. If [param enable_right] is [code]true[/code], a port will appear on the right side and the slot will be able to be connected from this side.
 			</description>
 		</method>
 		<method name="set_slot_type_left">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="type_left" type="int" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="type_left" type="int" />
 			<description>
-				Sets the left (input) type of the slot [code]idx[/code] to [code]type_left[/code].
+				Sets the left (input) type of the slot [param idx] to [param type_left].
 			</description>
 		</method>
 		<method name="set_slot_type_right">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="type_right" type="int" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="type_right" type="int" />
 			<description>
-				Sets the right (output) type of the slot [code]idx[/code] to [code]type_right[/code].
+				Sets the right (output) type of the slot [param idx] to [param type_right].
 			</description>
 		</method>
 	</methods>
@@ -260,8 +260,8 @@
 			</description>
 		</signal>
 		<signal name="dragged">
-			<argument index="0" name="from" type="Vector2" />
-			<argument index="1" name="to" type="Vector2" />
+			<param index="0" name="from" type="Vector2" />
+			<param index="1" name="to" type="Vector2" />
 			<description>
 				Emitted when the GraphNode is dragged.
 			</description>
@@ -277,13 +277,13 @@
 			</description>
 		</signal>
 		<signal name="resize_request">
-			<argument index="0" name="new_minsize" type="Vector2" />
+			<param index="0" name="new_minsize" type="Vector2" />
 			<description>
 				Emitted when the GraphNode is requested to be resized. Happens on dragging the resizer handle (see [member resizable]).
 			</description>
 		</signal>
 		<signal name="slot_updated">
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Emitted when any GraphNode's slot is updated.
 			</description>
@@ -321,6 +321,9 @@
 		<theme_item name="separation" data_type="constant" type="int" default="2">
 			The vertical distance between ports.
 		</theme_item>
+		<theme_item name="title_h_offset" data_type="constant" type="int" default="0">
+			Horizontal offset of the title text.
+		</theme_item>
 		<theme_item name="title_offset" data_type="constant" type="int" default="26">
 			Vertical offset of the title text.
 		</theme_item>
diff --git a/doc/classes/HMACContext.xml b/doc/classes/HMACContext.xml
index f2b946cab7..52d4fce28f 100644
--- a/doc/classes/HMACContext.xml
+++ b/doc/classes/HMACContext.xml
@@ -62,17 +62,17 @@
 		</method>
 		<method name="start">
 			<return type="int" enum="Error" />
-			<argument index="0" name="hash_type" type="int" enum="HashingContext.HashType" />
-			<argument index="1" name="key" type="PackedByteArray" />
+			<param index="0" name="hash_type" type="int" enum="HashingContext.HashType" />
+			<param index="1" name="key" type="PackedByteArray" />
 			<description>
 				Initializes the HMACContext. This method cannot be called again on the same HMACContext until [method finish] has been called.
 			</description>
 		</method>
 		<method name="update">
 			<return type="int" enum="Error" />
-			<argument index="0" name="data" type="PackedByteArray" />
+			<param index="0" name="data" type="PackedByteArray" />
 			<description>
-				Updates the message to be HMACed. This can be called multiple times before [method finish] is called to append [code]data[/code] to the message, but cannot be called until [method start] has been called.
+				Updates the message to be HMACed. This can be called multiple times before [method finish] is called to append [param data] to the message, but cannot be called until [method start] has been called.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/HTTPClient.xml b/doc/classes/HTTPClient.xml
index 5a9d12d01b..97178bc94d 100644
--- a/doc/classes/HTTPClient.xml
+++ b/doc/classes/HTTPClient.xml
@@ -4,7 +4,8 @@
 		Low-level hyper-text transfer protocol client.
 	</brief_description>
 	<description>
-		Hyper-text transfer protocol client (sometimes called "User Agent"). Used to make HTTP requests to download web content, upload files and other data or to communicate with various services, among other use cases. [b]See the [HTTPRequest] node for a higher-level alternative.[/b]
+		Hyper-text transfer protocol client (sometimes called "User Agent"). Used to make HTTP requests to download web content, upload files and other data or to communicate with various services, among other use cases.
+		See the [HTTPRequest] node for a higher-level alternative.
 		[b]Note:[/b] This client only needs to connect to a host once (see [method connect_to_host]) to send multiple requests. Because of this, methods that take URLs usually take just the part after the host instead of the full URL, as the client is already connected to a host. See [method request] for a full example and to get started.
 		A [HTTPClient] should be reused between multiple requests or to connect to different hosts instead of creating one client per request. Supports SSL and SSL server certificate verification. HTTP status codes in the 2xx range indicate success, 3xx redirection (i.e. "try again, but over here"), 4xx something was wrong with the request, and 5xx something went wrong on the server's side.
 		For more information on HTTP, see https://developer.mozilla.org/en-US/docs/Web/HTTP (or read RFC 2616 to get it straight from the source: https://tools.ietf.org/html/rfc2616).
@@ -27,15 +28,15 @@
 		</method>
 		<method name="connect_to_host">
 			<return type="int" enum="Error" />
-			<argument index="0" name="host" type="String" />
-			<argument index="1" name="port" type="int" default="-1" />
-			<argument index="2" name="use_ssl" type="bool" default="false" />
-			<argument index="3" name="verify_host" type="bool" default="true" />
+			<param index="0" name="host" type="String" />
+			<param index="1" name="port" type="int" default="-1" />
+			<param index="2" name="use_ssl" type="bool" default="false" />
+			<param index="3" name="verify_host" type="bool" default="true" />
 			<description>
 				Connects to a host. This needs to be done before any requests are sent.
 				The host should not have http:// prepended but will strip the protocol identifier if provided.
-				If no [code]port[/code] is specified (or [code]-1[/code] is used), it is automatically set to 80 for HTTP and 443 for HTTPS (if [code]use_ssl[/code] is enabled).
-				[code]verify_host[/code] will check the SSL identity of the host if set to [code]true[/code].
+				If no [param port] is specified (or [code]-1[/code] is used), it is automatically set to 80 for HTTP and 443 for HTTPS (if [param use_ssl] is enabled).
+				[param verify_host] will check the SSL identity of the host if set to [code]true[/code].
 			</description>
 		</method>
 		<method name="get_response_body_length" qualifiers="const">
@@ -96,7 +97,7 @@
 		</method>
 		<method name="query_string_from_dict">
 			<return type="String" />
-			<argument index="0" name="fields" type="Dictionary" />
+			<param index="0" name="fields" type="Dictionary" />
 			<description>
 				Generates a GET/POST application/x-www-form-urlencoded style query string from a provided dictionary, e.g.:
 				[codeblocks]
@@ -134,10 +135,10 @@
 		</method>
 		<method name="request">
 			<return type="int" enum="Error" />
-			<argument index="0" name="method" type="int" enum="HTTPClient.Method" />
-			<argument index="1" name="url" type="String" />
-			<argument index="2" name="headers" type="PackedStringArray" />
-			<argument index="3" name="body" type="String" default="&quot;&quot;" />
+			<param index="0" name="method" type="int" enum="HTTPClient.Method" />
+			<param index="1" name="url" type="String" />
+			<param index="2" name="headers" type="PackedStringArray" />
+			<param index="3" name="body" type="String" default="&quot;&quot;" />
 			<description>
 				Sends a request to the connected host.
 				The URL parameter is usually just the part after the host, so for [code]https://somehost.com/index.php[/code], it is [code]/index.php[/code]. When sending requests to an HTTP proxy server, it should be an absolute URL. For [constant HTTPClient.METHOD_OPTIONS] requests, [code]*[/code] is also allowed. For [constant HTTPClient.METHOD_CONNECT] requests, it should be the authority component ([code]host:port[/code]).
@@ -157,15 +158,15 @@
 				var result = new HTTPClient().Request(HTTPClient.Method.Post, "index.php", headers, queryString);
 				[/csharp]
 				[/codeblocks]
-				[b]Note:[/b] The [code]request_data[/code] parameter is ignored if [code]method[/code] is [constant HTTPClient.METHOD_GET]. This is because GET methods can't contain request data. As a workaround, you can pass request data as a query string in the URL. See [method String.uri_encode] for an example.
+				[b]Note:[/b] The [param body] parameter is ignored if [param method] is [constant HTTPClient.METHOD_GET]. This is because GET methods can't contain request data. As a workaround, you can pass request data as a query string in the URL. See [method String.uri_encode] for an example.
 			</description>
 		</method>
 		<method name="request_raw">
 			<return type="int" enum="Error" />
-			<argument index="0" name="method" type="int" enum="HTTPClient.Method" />
-			<argument index="1" name="url" type="String" />
-			<argument index="2" name="headers" type="PackedStringArray" />
-			<argument index="3" name="body" type="PackedByteArray" />
+			<param index="0" name="method" type="int" enum="HTTPClient.Method" />
+			<param index="1" name="url" type="String" />
+			<param index="2" name="headers" type="PackedStringArray" />
+			<param index="3" name="body" type="PackedByteArray" />
 			<description>
 				Sends a raw request to the connected host.
 				The URL parameter is usually just the part after the host, so for [code]https://somehost.com/index.php[/code], it is [code]/index.php[/code]. When sending requests to an HTTP proxy server, it should be an absolute URL. For [constant HTTPClient.METHOD_OPTIONS] requests, [code]*[/code] is also allowed. For [constant HTTPClient.METHOD_CONNECT] requests, it should be the authority component ([code]host:port[/code]).
@@ -175,20 +176,20 @@
 		</method>
 		<method name="set_http_proxy">
 			<return type="void" />
-			<argument index="0" name="host" type="String" />
-			<argument index="1" name="port" type="int" />
+			<param index="0" name="host" type="String" />
+			<param index="1" name="port" type="int" />
 			<description>
 				Sets the proxy server for HTTP requests.
-				The proxy server is unset if [code]host[/code] is empty or [code]port[/code] is -1.
+				The proxy server is unset if [param host] is empty or [param port] is -1.
 			</description>
 		</method>
 		<method name="set_https_proxy">
 			<return type="void" />
-			<argument index="0" name="host" type="String" />
-			<argument index="1" name="port" type="int" />
+			<param index="0" name="host" type="String" />
+			<param index="1" name="port" type="int" />
 			<description>
 				Sets the proxy server for HTTPS requests.
-				The proxy server is unset if [code]host[/code] is empty or [code]port[/code] is -1.
+				The proxy server is unset if [param host] is empty or [param port] is -1.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/HTTPRequest.xml b/doc/classes/HTTPRequest.xml
index 3d2e9449e2..4b098bf585 100644
--- a/doc/classes/HTTPRequest.xml
+++ b/doc/classes/HTTPRequest.xml
@@ -176,7 +176,7 @@
 		<method name="get_downloaded_bytes" qualifiers="const">
 			<return type="int" />
 			<description>
-				Returns the amount of bytes this HTTPRequest downloaded.
+				Returns the number of bytes this HTTPRequest downloaded.
 			</description>
 		</method>
 		<method name="get_http_client_status" qualifiers="const">
@@ -187,25 +187,25 @@
 		</method>
 		<method name="request">
 			<return type="int" enum="Error" />
-			<argument index="0" name="url" type="String" />
-			<argument index="1" name="custom_headers" type="PackedStringArray" default="PackedStringArray()" />
-			<argument index="2" name="ssl_validate_domain" type="bool" default="true" />
-			<argument index="3" name="method" type="int" enum="HTTPClient.Method" default="0" />
-			<argument index="4" name="request_data" type="String" default="&quot;&quot;" />
+			<param index="0" name="url" type="String" />
+			<param index="1" name="custom_headers" type="PackedStringArray" default="PackedStringArray()" />
+			<param index="2" name="ssl_validate_domain" type="bool" default="true" />
+			<param index="3" name="method" type="int" enum="HTTPClient.Method" default="0" />
+			<param index="4" name="request_data" type="String" default="&quot;&quot;" />
 			<description>
 				Creates request on the underlying [HTTPClient]. If there is no configuration errors, it tries to connect using [method HTTPClient.connect_to_host] and passes parameters onto [method HTTPClient.request].
 				Returns [constant OK] if request is successfully created. (Does not imply that the server has responded), [constant ERR_UNCONFIGURED] if not in the tree, [constant ERR_BUSY] if still processing previous request, [constant ERR_INVALID_PARAMETER] if given string is not a valid URL format, or [constant ERR_CANT_CONNECT] if not using thread and the [HTTPClient] cannot connect to host.
-				[b]Note:[/b] When [code]method[/code] is [constant HTTPClient.METHOD_GET], the payload sent via [code]request_data[/code] might be ignored by the server or even cause the server to reject the request (check [url=https://datatracker.ietf.org/doc/html/rfc7231#section-4.3.1]RFC 7231 section 4.3.1[/url] for more details). As a workaround, you can send data as a query string in the URL (see [method String.uri_encode] for an example).
+				[b]Note:[/b] When [param method] is [constant HTTPClient.METHOD_GET], the payload sent via [param request_data] might be ignored by the server or even cause the server to reject the request (check [url=https://datatracker.ietf.org/doc/html/rfc7231#section-4.3.1]RFC 7231 section 4.3.1[/url] for more details). As a workaround, you can send data as a query string in the URL (see [method String.uri_encode] for an example).
 				[b]Note:[/b] It's recommended to use transport encryption (SSL/TLS) and to avoid sending sensitive information (such as login credentials) in HTTP GET URL parameters. Consider using HTTP POST requests or HTTP headers for such information instead.
 			</description>
 		</method>
 		<method name="request_raw">
 			<return type="int" enum="Error" />
-			<argument index="0" name="url" type="String" />
-			<argument index="1" name="custom_headers" type="PackedStringArray" default="PackedStringArray()" />
-			<argument index="2" name="ssl_validate_domain" type="bool" default="true" />
-			<argument index="3" name="method" type="int" enum="HTTPClient.Method" default="0" />
-			<argument index="4" name="request_data_raw" type="PackedByteArray" default="PackedByteArray()" />
+			<param index="0" name="url" type="String" />
+			<param index="1" name="custom_headers" type="PackedStringArray" default="PackedStringArray()" />
+			<param index="2" name="ssl_validate_domain" type="bool" default="true" />
+			<param index="3" name="method" type="int" enum="HTTPClient.Method" default="0" />
+			<param index="4" name="request_data_raw" type="PackedByteArray" default="PackedByteArray()" />
 			<description>
 				Creates request on the underlying [HTTPClient] using a raw array of bytes for the request body. If there is no configuration errors, it tries to connect using [method HTTPClient.connect_to_host] and passes parameters onto [method HTTPClient.request].
 				Returns [constant OK] if request is successfully created. (Does not imply that the server has responded), [constant ERR_UNCONFIGURED] if not in the tree, [constant ERR_BUSY] if still processing previous request, [constant ERR_INVALID_PARAMETER] if given string is not a valid URL format, or [constant ERR_CANT_CONNECT] if not using thread and the [HTTPClient] cannot connect to host.
@@ -213,20 +213,20 @@
 		</method>
 		<method name="set_http_proxy">
 			<return type="void" />
-			<argument index="0" name="host" type="String" />
-			<argument index="1" name="port" type="int" />
+			<param index="0" name="host" type="String" />
+			<param index="1" name="port" type="int" />
 			<description>
 				Sets the proxy server for HTTP requests.
-				The proxy server is unset if [code]host[/code] is empty or [code]port[/code] is -1.
+				The proxy server is unset if [param host] is empty or [param port] is -1.
 			</description>
 		</method>
 		<method name="set_https_proxy">
 			<return type="void" />
-			<argument index="0" name="host" type="String" />
-			<argument index="1" name="port" type="int" />
+			<param index="0" name="host" type="String" />
+			<param index="1" name="port" type="int" />
 			<description>
 				Sets the proxy server for HTTPS requests.
-				The proxy server is unset if [code]host[/code] is empty or [code]port[/code] is -1.
+				The proxy server is unset if [param host] is empty or [param port] is -1.
 			</description>
 		</method>
 	</methods>
@@ -259,10 +259,10 @@
 	</members>
 	<signals>
 		<signal name="request_completed">
-			<argument index="0" name="result" type="int" />
-			<argument index="1" name="response_code" type="int" />
-			<argument index="2" name="headers" type="PackedStringArray" />
-			<argument index="3" name="body" type="PackedByteArray" />
+			<param index="0" name="result" type="int" />
+			<param index="1" name="response_code" type="int" />
+			<param index="2" name="headers" type="PackedStringArray" />
+			<param index="3" name="body" type="PackedByteArray" />
 			<description>
 				Emitted when a request is completed.
 			</description>
diff --git a/doc/classes/HashingContext.xml b/doc/classes/HashingContext.xml
index c126efcfbb..6e3092e618 100644
--- a/doc/classes/HashingContext.xml
+++ b/doc/classes/HashingContext.xml
@@ -69,16 +69,16 @@
 		</method>
 		<method name="start">
 			<return type="int" enum="Error" />
-			<argument index="0" name="type" type="int" enum="HashingContext.HashType" />
+			<param index="0" name="type" type="int" enum="HashingContext.HashType" />
 			<description>
-				Starts a new hash computation of the given [code]type[/code] (e.g. [constant HASH_SHA256] to start computation of a SHA-256).
+				Starts a new hash computation of the given [param type] (e.g. [constant HASH_SHA256] to start computation of a SHA-256).
 			</description>
 		</method>
 		<method name="update">
 			<return type="int" enum="Error" />
-			<argument index="0" name="chunk" type="PackedByteArray" />
+			<param index="0" name="chunk" type="PackedByteArray" />
 			<description>
-				Updates the computation with the given [code]chunk[/code] of data.
+				Updates the computation with the given [param chunk] of data.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/HingeJoint3D.xml b/doc/classes/HingeJoint3D.xml
index eb1d1d5eca..d2547434e7 100644
--- a/doc/classes/HingeJoint3D.xml
+++ b/doc/classes/HingeJoint3D.xml
@@ -11,30 +11,30 @@
 	<methods>
 		<method name="get_flag" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="flag" type="int" enum="HingeJoint3D.Flag" />
+			<param index="0" name="flag" type="int" enum="HingeJoint3D.Flag" />
 			<description>
 				Returns the value of the specified flag.
 			</description>
 		</method>
 		<method name="get_param" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="param" type="int" enum="HingeJoint3D.Param" />
+			<param index="0" name="param" type="int" enum="HingeJoint3D.Param" />
 			<description>
 				Returns the value of the specified parameter.
 			</description>
 		</method>
 		<method name="set_flag">
 			<return type="void" />
-			<argument index="0" name="flag" type="int" enum="HingeJoint3D.Flag" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="flag" type="int" enum="HingeJoint3D.Flag" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				If [code]true[/code], enables the specified flag.
 			</description>
 		</method>
 		<method name="set_param">
 			<return type="void" />
-			<argument index="0" name="param" type="int" enum="HingeJoint3D.Param" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="param" type="int" enum="HingeJoint3D.Param" />
+			<param index="1" name="value" type="float" />
 			<description>
 				Sets the value of the specified parameter.
 			</description>
diff --git a/doc/classes/IP.xml b/doc/classes/IP.xml
index 569f7fe570..e476a86a49 100644
--- a/doc/classes/IP.xml
+++ b/doc/classes/IP.xml
@@ -11,16 +11,16 @@
 	<methods>
 		<method name="clear_cache">
 			<return type="void" />
-			<argument index="0" name="hostname" type="String" default="&quot;&quot;" />
+			<param index="0" name="hostname" type="String" default="&quot;&quot;" />
 			<description>
-				Removes all of a [code]hostname[/code]'s cached references. If no [code]hostname[/code] is given, all cached IP addresses are removed.
+				Removes all of a [param hostname]'s cached references. If no [param hostname] is given, all cached IP addresses are removed.
 			</description>
 		</method>
 		<method name="erase_resolve_item">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
-				Removes a given item [code]id[/code] from the queue. This should be used to free a queue after it has completed to enable more queries to happen.
+				Removes a given item [param id] from the queue. This should be used to free a queue after it has completed to enable more queries to happen.
 			</description>
 		</method>
 		<method name="get_local_addresses" qualifiers="const">
@@ -46,47 +46,47 @@
 		</method>
 		<method name="get_resolve_item_address" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
-				Returns a queued hostname's IP address, given its queue [code]id[/code]. Returns an empty string on error or if resolution hasn't happened yet (see [method get_resolve_item_status]).
+				Returns a queued hostname's IP address, given its queue [param id]. Returns an empty string on error or if resolution hasn't happened yet (see [method get_resolve_item_status]).
 			</description>
 		</method>
 		<method name="get_resolve_item_addresses" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns resolved addresses, or an empty array if an error happened or resolution didn't happen yet (see [method get_resolve_item_status]).
 			</description>
 		</method>
 		<method name="get_resolve_item_status" qualifiers="const">
 			<return type="int" enum="IP.ResolverStatus" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
-				Returns a queued hostname's status as a [enum ResolverStatus] constant, given its queue [code]id[/code].
+				Returns a queued hostname's status as a [enum ResolverStatus] constant, given its queue [param id].
 			</description>
 		</method>
 		<method name="resolve_hostname">
 			<return type="String" />
-			<argument index="0" name="host" type="String" />
-			<argument index="1" name="ip_type" type="int" enum="IP.Type" default="3" />
+			<param index="0" name="host" type="String" />
+			<param index="1" name="ip_type" type="int" enum="IP.Type" default="3" />
 			<description>
-				Returns a given hostname's IPv4 or IPv6 address when resolved (blocking-type method). The address type returned depends on the [enum Type] constant given as [code]ip_type[/code].
+				Returns a given hostname's IPv4 or IPv6 address when resolved (blocking-type method). The address type returned depends on the [enum Type] constant given as [param ip_type].
 			</description>
 		</method>
 		<method name="resolve_hostname_addresses">
 			<return type="Array" />
-			<argument index="0" name="host" type="String" />
-			<argument index="1" name="ip_type" type="int" enum="IP.Type" default="3" />
+			<param index="0" name="host" type="String" />
+			<param index="1" name="ip_type" type="int" enum="IP.Type" default="3" />
 			<description>
-				Resolves a given hostname in a blocking way. Addresses are returned as an [Array] of IPv4 or IPv6 addresses depending on [code]ip_type[/code].
+				Resolves a given hostname in a blocking way. Addresses are returned as an [Array] of IPv4 or IPv6 addresses depending on [param ip_type].
 			</description>
 		</method>
 		<method name="resolve_hostname_queue_item">
 			<return type="int" />
-			<argument index="0" name="host" type="String" />
-			<argument index="1" name="ip_type" type="int" enum="IP.Type" default="3" />
+			<param index="0" name="host" type="String" />
+			<param index="1" name="ip_type" type="int" enum="IP.Type" default="3" />
 			<description>
-				Creates a queue item to resolve a hostname to an IPv4 or IPv6 address depending on the [enum Type] constant given as [code]ip_type[/code]. Returns the queue ID if successful, or [constant RESOLVER_INVALID_ID] on error.
+				Creates a queue item to resolve a hostname to an IPv4 or IPv6 address depending on the [enum Type] constant given as [param ip_type]. Returns the queue ID if successful, or [constant RESOLVER_INVALID_ID] on error.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/Image.xml b/doc/classes/Image.xml
index a927345e79..b138a55ea3 100644
--- a/doc/classes/Image.xml
+++ b/doc/classes/Image.xml
@@ -14,53 +14,53 @@
 	<methods>
 		<method name="adjust_bcs">
 			<return type="void" />
-			<argument index="0" name="brightness" type="float" />
-			<argument index="1" name="contrast" type="float" />
-			<argument index="2" name="saturation" type="float" />
+			<param index="0" name="brightness" type="float" />
+			<param index="1" name="contrast" type="float" />
+			<param index="2" name="saturation" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="blend_rect">
 			<return type="void" />
-			<argument index="0" name="src" type="Image" />
-			<argument index="1" name="src_rect" type="Rect2i" />
-			<argument index="2" name="dst" type="Vector2i" />
+			<param index="0" name="src" type="Image" />
+			<param index="1" name="src_rect" type="Rect2i" />
+			<param index="2" name="dst" type="Vector2i" />
 			<description>
-				Alpha-blends [code]src_rect[/code] from [code]src[/code] image to this image at coordinates [code]dest[/code], clipped accordingly to both image bounds. This image and [code]src[/code] image [b]must[/b] have the same format. [code]src_rect[/code] with not positive size is treated as empty.
+				Alpha-blends [param src_rect] from [param src] image to this image at coordinates [param dst], clipped accordingly to both image bounds. This image and [param src] image [b]must[/b] have the same format. [param src_rect] with not positive size is treated as empty.
 			</description>
 		</method>
 		<method name="blend_rect_mask">
 			<return type="void" />
-			<argument index="0" name="src" type="Image" />
-			<argument index="1" name="mask" type="Image" />
-			<argument index="2" name="src_rect" type="Rect2i" />
-			<argument index="3" name="dst" type="Vector2i" />
+			<param index="0" name="src" type="Image" />
+			<param index="1" name="mask" type="Image" />
+			<param index="2" name="src_rect" type="Rect2i" />
+			<param index="3" name="dst" type="Vector2i" />
 			<description>
-				Alpha-blends [code]src_rect[/code] from [code]src[/code] image to this image using [code]mask[/code] image at coordinates [code]dst[/code], clipped accordingly to both image bounds. Alpha channels are required for both [code]src[/code] and [code]mask[/code]. [code]dst[/code] pixels and [code]src[/code] pixels will blend if the corresponding mask pixel's alpha value is not 0. This image and [code]src[/code] image [b]must[/b] have the same format. [code]src[/code] image and [code]mask[/code] image [b]must[/b] have the same size (width and height) but they can have different formats. [code]src_rect[/code] with not positive size is treated as empty.
+				Alpha-blends [param src_rect] from [param src] image to this image using [param mask] image at coordinates [param dst], clipped accordingly to both image bounds. Alpha channels are required for both [param src] and [param mask]. [param dst] pixels and [param src] pixels will blend if the corresponding mask pixel's alpha value is not 0. This image and [param src] image [b]must[/b] have the same format. [param src] image and [param mask] image [b]must[/b] have the same size (width and height) but they can have different formats. [param src_rect] with not positive size is treated as empty.
 			</description>
 		</method>
 		<method name="blit_rect">
 			<return type="void" />
-			<argument index="0" name="src" type="Image" />
-			<argument index="1" name="src_rect" type="Rect2i" />
-			<argument index="2" name="dst" type="Vector2i" />
+			<param index="0" name="src" type="Image" />
+			<param index="1" name="src_rect" type="Rect2i" />
+			<param index="2" name="dst" type="Vector2i" />
 			<description>
-				Copies [code]src_rect[/code] from [code]src[/code] image to this image at coordinates [code]dst[/code], clipped accordingly to both image bounds. This image and [code]src[/code] image [b]must[/b] have the same format. [code]src_rect[/code] with not positive size is treated as empty.
+				Copies [param src_rect] from [param src] image to this image at coordinates [param dst], clipped accordingly to both image bounds. This image and [param src] image [b]must[/b] have the same format. [param src_rect] with not positive size is treated as empty.
 			</description>
 		</method>
 		<method name="blit_rect_mask">
 			<return type="void" />
-			<argument index="0" name="src" type="Image" />
-			<argument index="1" name="mask" type="Image" />
-			<argument index="2" name="src_rect" type="Rect2i" />
-			<argument index="3" name="dst" type="Vector2i" />
+			<param index="0" name="src" type="Image" />
+			<param index="1" name="mask" type="Image" />
+			<param index="2" name="src_rect" type="Rect2i" />
+			<param index="3" name="dst" type="Vector2i" />
 			<description>
-				Blits [code]src_rect[/code] area from [code]src[/code] image to this image at the coordinates given by [code]dst[/code], clipped accordingly to both image bounds. [code]src[/code] pixel is copied onto [code]dst[/code] if the corresponding [code]mask[/code] pixel's alpha value is not 0. This image and [code]src[/code] image [b]must[/b] have the same format. [code]src[/code] image and [code]mask[/code] image [b]must[/b] have the same size (width and height) but they can have different formats. [code]src_rect[/code] with not positive size is treated as empty.
+				Blits [param src_rect] area from [param src] image to this image at the coordinates given by [param dst], clipped accordingly to both image bounds. [param src] pixel is copied onto [param dst] if the corresponding [param mask] pixel's alpha value is not 0. This image and [param src] image [b]must[/b] have the same format. [param src] image and [param mask] image [b]must[/b] have the same size (width and height) but they can have different formats. [param src_rect] with not positive size is treated as empty.
 			</description>
 		</method>
 		<method name="bump_map_to_normal_map">
 			<return type="void" />
-			<argument index="0" name="bump_scale" type="float" default="1.0" />
+			<param index="0" name="bump_scale" type="float" default="1.0" />
 			<description>
 				Converts a bump map to a normal map. A bump map provides a height offset per-pixel, while a normal map provides a normal direction per pixel.
 			</description>
@@ -73,25 +73,25 @@
 		</method>
 		<method name="compress">
 			<return type="int" enum="Error" />
-			<argument index="0" name="mode" type="int" enum="Image.CompressMode" />
-			<argument index="1" name="source" type="int" enum="Image.CompressSource" default="0" />
-			<argument index="2" name="lossy_quality" type="float" default="0.7" />
+			<param index="0" name="mode" type="int" enum="Image.CompressMode" />
+			<param index="1" name="source" type="int" enum="Image.CompressSource" default="0" />
+			<param index="2" name="lossy_quality" type="float" default="0.7" />
 			<description>
 				Compresses the image to use less memory. Can not directly access pixel data while the image is compressed. Returns error if the chosen compression mode is not available. See [enum CompressMode] and [enum CompressSource] constants.
 			</description>
 		</method>
 		<method name="compress_from_channels">
 			<return type="int" enum="Error" />
-			<argument index="0" name="mode" type="int" enum="Image.CompressMode" />
-			<argument index="1" name="channels" type="int" enum="Image.UsedChannels" />
-			<argument index="2" name="lossy_quality" type="float" default="0.7" />
+			<param index="0" name="mode" type="int" enum="Image.CompressMode" />
+			<param index="1" name="channels" type="int" enum="Image.UsedChannels" />
+			<param index="2" name="lossy_quality" type="float" default="0.7" />
 			<description>
 			</description>
 		</method>
 		<method name="compute_image_metrics">
 			<return type="Dictionary" />
-			<argument index="0" name="compared_image" type="Image" />
-			<argument index="1" name="use_luma" type="bool" />
+			<param index="0" name="compared_image" type="Image" />
+			<param index="1" name="use_luma" type="bool" />
 			<description>
 				Compute image metrics on the current image and the compared image.
 				The dictionary contains [code]max[/code], [code]mean[/code], [code]mean_squared[/code], [code]root_mean_squared[/code] and [code]peak_snr[/code].
@@ -99,45 +99,45 @@
 		</method>
 		<method name="convert">
 			<return type="void" />
-			<argument index="0" name="format" type="int" enum="Image.Format" />
+			<param index="0" name="format" type="int" enum="Image.Format" />
 			<description>
 				Converts the image's format. See [enum Format] constants.
 			</description>
 		</method>
 		<method name="copy_from">
 			<return type="void" />
-			<argument index="0" name="src" type="Image" />
+			<param index="0" name="src" type="Image" />
 			<description>
-				Copies [code]src[/code] image to this image.
+				Copies [param src] image to this image.
 			</description>
 		</method>
 		<method name="create">
 			<return type="void" />
-			<argument index="0" name="width" type="int" />
-			<argument index="1" name="height" type="int" />
-			<argument index="2" name="use_mipmaps" type="bool" />
-			<argument index="3" name="format" type="int" enum="Image.Format" />
+			<param index="0" name="width" type="int" />
+			<param index="1" name="height" type="int" />
+			<param index="2" name="use_mipmaps" type="bool" />
+			<param index="3" name="format" type="int" enum="Image.Format" />
 			<description>
-				Creates an empty image of given size and format. See [enum Format] constants. If [code]use_mipmaps[/code] is [code]true[/code] then generate mipmaps for this image. See the [method generate_mipmaps].
+				Creates an empty image of given size and format. See [enum Format] constants. If [param use_mipmaps] is [code]true[/code] then generate mipmaps for this image. See the [method generate_mipmaps].
 			</description>
 		</method>
 		<method name="create_from_data">
 			<return type="void" />
-			<argument index="0" name="width" type="int" />
-			<argument index="1" name="height" type="int" />
-			<argument index="2" name="use_mipmaps" type="bool" />
-			<argument index="3" name="format" type="int" enum="Image.Format" />
-			<argument index="4" name="data" type="PackedByteArray" />
+			<param index="0" name="width" type="int" />
+			<param index="1" name="height" type="int" />
+			<param index="2" name="use_mipmaps" type="bool" />
+			<param index="3" name="format" type="int" enum="Image.Format" />
+			<param index="4" name="data" type="PackedByteArray" />
 			<description>
-				Creates a new image of given size and format. See [enum Format] constants. Fills the image with the given raw data. If [code]use_mipmaps[/code] is [code]true[/code] then loads mipmaps for this image from [code]data[/code]. See [method generate_mipmaps].
+				Creates a new image of given size and format. See [enum Format] constants. Fills the image with the given raw data. If [param use_mipmaps] is [code]true[/code] then loads mipmaps for this image from [param data]. See [method generate_mipmaps].
 			</description>
 		</method>
 		<method name="crop">
 			<return type="void" />
-			<argument index="0" name="width" type="int" />
-			<argument index="1" name="height" type="int" />
+			<param index="0" name="width" type="int" />
+			<param index="1" name="height" type="int" />
 			<description>
-				Crops the image to the given [code]width[/code] and [code]height[/code]. If the specified size is larger than the current size, the extra area is filled with black pixels.
+				Crops the image to the given [param width] and [param height]. If the specified size is larger than the current size, the extra area is filled with black pixels.
 			</description>
 		</method>
 		<method name="decompress">
@@ -155,23 +155,23 @@
 		</method>
 		<method name="detect_used_channels" qualifiers="const">
 			<return type="int" enum="Image.UsedChannels" />
-			<argument index="0" name="source" type="int" enum="Image.CompressSource" default="0" />
+			<param index="0" name="source" type="int" enum="Image.CompressSource" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="fill">
 			<return type="void" />
-			<argument index="0" name="color" type="Color" />
+			<param index="0" name="color" type="Color" />
 			<description>
-				Fills the image with [code]color[/code].
+				Fills the image with [param color].
 			</description>
 		</method>
 		<method name="fill_rect">
 			<return type="void" />
-			<argument index="0" name="rect" type="Rect2i" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="rect" type="Rect2i" />
+			<param index="1" name="color" type="Color" />
 			<description>
-				Fills [code]rect[/code] with [code]color[/code].
+				Fills [param rect] with [param color].
 			</description>
 		</method>
 		<method name="fix_alpha_edges">
@@ -194,7 +194,7 @@
 		</method>
 		<method name="generate_mipmaps">
 			<return type="int" enum="Error" />
-			<argument index="0" name="renormalize" type="bool" default="false" />
+			<param index="0" name="renormalize" type="bool" default="false" />
 			<description>
 				Generates mipmaps for the image. Mipmaps are precalculated lower-resolution copies of the image that are automatically used if the image needs to be scaled down when rendered. They help improve image quality and performance when rendering. This method returns an error if the image is compressed, in a custom format, or if the image's width/height is [code]0[/code].
 				[b]Note:[/b] Mipmap generation is done on the CPU, is single-threaded and is [i]always[/i] done on the main thread. This means generating mipmaps will result in noticeable stuttering during gameplay, even if [method generate_mipmaps] is called from a [Thread].
@@ -220,15 +220,15 @@
 		</method>
 		<method name="get_mipmap_offset" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="mipmap" type="int" />
+			<param index="0" name="mipmap" type="int" />
 			<description>
-				Returns the offset where the image's mipmap with index [code]mipmap[/code] is stored in the [code]data[/code] dictionary.
+				Returns the offset where the image's mipmap with index [param mipmap] is stored in the [code]data[/code] dictionary.
 			</description>
 		</method>
 		<method name="get_pixel" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="x" type="int" />
-			<argument index="1" name="y" type="int" />
+			<param index="0" name="x" type="int" />
+			<param index="1" name="y" type="int" />
 			<description>
 				Returns the color of the pixel at [code](x, y)[/code].
 				This is the same as [method get_pixelv], but with two integer arguments instead of a [Vector2i] argument.
@@ -236,21 +236,21 @@
 		</method>
 		<method name="get_pixelv" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="point" type="Vector2i" />
+			<param index="0" name="point" type="Vector2i" />
 			<description>
-				Returns the color of the pixel at [code]point[/code].
+				Returns the color of the pixel at [param point].
 				This is the same as [method get_pixel], but with a [Vector2i] argument instead of two integer arguments.
 			</description>
 		</method>
 		<method name="get_rect" qualifiers="const">
 			<return type="Image" />
-			<argument index="0" name="rect" type="Rect2i" />
+			<param index="0" name="rect" type="Rect2i" />
 			<description>
-				Returns a new image that is a copy of the image's area specified with [code]rect[/code].
+				Returns a new image that is a copy of the image's area specified with [param rect].
 			</description>
 		</method>
 		<method name="get_size" qualifiers="const">
-			<return type="Vector2" />
+			<return type="Vector2i" />
 			<description>
 				Returns the image's size (width and height).
 			</description>
@@ -293,16 +293,16 @@
 		</method>
 		<method name="load">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
-				Loads an image from file [code]path[/code]. See [url=$DOCS_URL/tutorials/assets_pipeline/importing_images.html#supported-image-formats]Supported image formats[/url] for a list of supported image formats and limitations.
+				Loads an image from file [param path]. See [url=$DOCS_URL/tutorials/assets_pipeline/importing_images.html#supported-image-formats]Supported image formats[/url] for a list of supported image formats and limitations.
 				[b]Warning:[/b] This method should only be used in the editor or in cases when you need to load external images at run-time, such as images located at the [code]user://[/code] directory, and may not work in exported projects.
 				See also [ImageTexture] description for usage examples.
 			</description>
 		</method>
 		<method name="load_bmp_from_buffer">
 			<return type="int" enum="Error" />
-			<argument index="0" name="buffer" type="PackedByteArray" />
+			<param index="0" name="buffer" type="PackedByteArray" />
 			<description>
 				Loads an image from the binary contents of a BMP file.
 				[b]Note:[/b] Godot's BMP module doesn't support 16-bit per pixel images. Only 1-bit, 4-bit, 8-bit, 24-bit, and 32-bit per pixel images are supported.
@@ -310,35 +310,35 @@
 		</method>
 		<method name="load_from_file" qualifiers="static">
 			<return type="Image" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Creates a new [Image] and loads data from the specified file.
 			</description>
 		</method>
 		<method name="load_jpg_from_buffer">
 			<return type="int" enum="Error" />
-			<argument index="0" name="buffer" type="PackedByteArray" />
+			<param index="0" name="buffer" type="PackedByteArray" />
 			<description>
 				Loads an image from the binary contents of a JPEG file.
 			</description>
 		</method>
 		<method name="load_png_from_buffer">
 			<return type="int" enum="Error" />
-			<argument index="0" name="buffer" type="PackedByteArray" />
+			<param index="0" name="buffer" type="PackedByteArray" />
 			<description>
 				Loads an image from the binary contents of a PNG file.
 			</description>
 		</method>
 		<method name="load_tga_from_buffer">
 			<return type="int" enum="Error" />
-			<argument index="0" name="buffer" type="PackedByteArray" />
+			<param index="0" name="buffer" type="PackedByteArray" />
 			<description>
 				Loads an image from the binary contents of a TGA file.
 			</description>
 		</method>
 		<method name="load_webp_from_buffer">
 			<return type="int" enum="Error" />
-			<argument index="0" name="buffer" type="PackedByteArray" />
+			<param index="0" name="buffer" type="PackedByteArray" />
 			<description>
 				Loads an image from the binary contents of a WebP file.
 			</description>
@@ -357,19 +357,19 @@
 		</method>
 		<method name="resize">
 			<return type="void" />
-			<argument index="0" name="width" type="int" />
-			<argument index="1" name="height" type="int" />
-			<argument index="2" name="interpolation" type="int" enum="Image.Interpolation" default="1" />
+			<param index="0" name="width" type="int" />
+			<param index="1" name="height" type="int" />
+			<param index="2" name="interpolation" type="int" enum="Image.Interpolation" default="1" />
 			<description>
-				Resizes the image to the given [code]width[/code] and [code]height[/code]. New pixels are calculated using the [code]interpolation[/code] mode defined via [enum Interpolation] constants.
+				Resizes the image to the given [param width] and [param height]. New pixels are calculated using the [param interpolation] mode defined via [enum Interpolation] constants.
 			</description>
 		</method>
 		<method name="resize_to_po2">
 			<return type="void" />
-			<argument index="0" name="square" type="bool" default="false" />
-			<argument index="1" name="interpolation" type="int" enum="Image.Interpolation" default="1" />
+			<param index="0" name="square" type="bool" default="false" />
+			<param index="1" name="interpolation" type="int" enum="Image.Interpolation" default="1" />
 			<description>
-				Resizes the image to the nearest power of 2 for the width and height. If [code]square[/code] is [code]true[/code] then set width and height to be the same. New pixels are calculated using the [code]interpolation[/code] mode defined via [enum Interpolation] constants.
+				Resizes the image to the nearest power of 2 for the width and height. If [param square] is [code]true[/code] then set width and height to be the same. New pixels are calculated using the [param interpolation] mode defined via [enum Interpolation] constants.
 			</description>
 		</method>
 		<method name="rgbe_to_srgb">
@@ -386,50 +386,50 @@
 		</method>
 		<method name="rotate_90">
 			<return type="void" />
-			<argument index="0" name="direction" type="int" enum="ClockDirection" />
+			<param index="0" name="direction" type="int" enum="ClockDirection" />
 			<description>
-				Rotates the image in the specified [code]direction[/code] by [code]90[/code] degrees. The width and height of the image must be greater than [code]1[/code]. If the width and height are not equal, the image will be resized.
+				Rotates the image in the specified [param direction] by [code]90[/code] degrees. The width and height of the image must be greater than [code]1[/code]. If the width and height are not equal, the image will be resized.
 			</description>
 		</method>
 		<method name="save_exr" qualifiers="const">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="grayscale" type="bool" default="false" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="grayscale" type="bool" default="false" />
 			<description>
-				Saves the image as an EXR file to [code]path[/code]. If [code]grayscale[/code] is [code]true[/code] and the image has only one channel, it will be saved explicitly as monochrome rather than one red channel. This function will return [constant ERR_UNAVAILABLE] if Godot was compiled without the TinyEXR module.
+				Saves the image as an EXR file to [param path]. If [param grayscale] is [code]true[/code] and the image has only one channel, it will be saved explicitly as monochrome rather than one red channel. This function will return [constant ERR_UNAVAILABLE] if Godot was compiled without the TinyEXR module.
 				[b]Note:[/b] The TinyEXR module is disabled in non-editor builds, which means [method save_exr] will return [constant ERR_UNAVAILABLE] when it is called from an exported project.
 			</description>
 		</method>
 		<method name="save_exr_to_buffer" qualifiers="const">
 			<return type="PackedByteArray" />
-			<argument index="0" name="grayscale" type="bool" default="false" />
+			<param index="0" name="grayscale" type="bool" default="false" />
 			<description>
-				Saves the image as an EXR file to a byte array. If [code]grayscale[/code] is [code]true[/code] and the image has only one channel, it will be saved explicitly as monochrome rather than one red channel. This function will return an empty byte array if Godot was compiled without the TinyEXR module.
+				Saves the image as an EXR file to a byte array. If [param grayscale] is [code]true[/code] and the image has only one channel, it will be saved explicitly as monochrome rather than one red channel. This function will return an empty byte array if Godot was compiled without the TinyEXR module.
 				[b]Note:[/b] The TinyEXR module is disabled in non-editor builds, which means [method save_exr] will return an empty byte array when it is called from an exported project.
 			</description>
 		</method>
 		<method name="save_jpg" qualifiers="const">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="quality" type="float" default="0.75" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="quality" type="float" default="0.75" />
 			<description>
-				Saves the image as a JPEG file to [code]path[/code] with the specified [code]quality[/code] between [code]0.01[/code] and [code]1.0[/code] (inclusive). Higher [code]quality[/code] values result in better-looking output at the cost of larger file sizes. Recommended [code]quality[/code] values are between [code]0.75[/code] and [code]0.90[/code]. Even at quality [code]1.00[/code], JPEG compression remains lossy.
+				Saves the image as a JPEG file to [param path] with the specified [param quality] between [code]0.01[/code] and [code]1.0[/code] (inclusive). Higher [param quality] values result in better-looking output at the cost of larger file sizes. Recommended [param quality] values are between [code]0.75[/code] and [code]0.90[/code]. Even at quality [code]1.00[/code], JPEG compression remains lossy.
 				[b]Note:[/b] JPEG does not save an alpha channel. If the [Image] contains an alpha channel, the image will still be saved, but the resulting JPEG file won't contain the alpha channel.
 			</description>
 		</method>
 		<method name="save_jpg_to_buffer" qualifiers="const">
 			<return type="PackedByteArray" />
-			<argument index="0" name="quality" type="float" default="0.75" />
+			<param index="0" name="quality" type="float" default="0.75" />
 			<description>
-				Saves the image as a JPEG file to a byte array with the specified [code]quality[/code] between [code]0.01[/code] and [code]1.0[/code] (inclusive). Higher [code]quality[/code] values result in better-looking output at the cost of larger byte array sizes (and therefore memory usage). Recommended [code]quality[/code] values are between [code]0.75[/code] and [code]0.90[/code]. Even at quality [code]1.00[/code], JPEG compression remains lossy.
+				Saves the image as a JPEG file to a byte array with the specified [param quality] between [code]0.01[/code] and [code]1.0[/code] (inclusive). Higher [param quality] values result in better-looking output at the cost of larger byte array sizes (and therefore memory usage). Recommended [param quality] values are between [code]0.75[/code] and [code]0.90[/code]. Even at quality [code]1.00[/code], JPEG compression remains lossy.
 				[b]Note:[/b] JPEG does not save an alpha channel. If the [Image] contains an alpha channel, the image will still be saved, but the resulting byte array won't contain the alpha channel.
 			</description>
 		</method>
 		<method name="save_png" qualifiers="const">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
-				Saves the image as a PNG file to the file at [code]path[/code].
+				Saves the image as a PNG file to the file at [param path].
 			</description>
 		</method>
 		<method name="save_png_to_buffer" qualifiers="const">
@@ -440,28 +440,28 @@
 		</method>
 		<method name="save_webp" qualifiers="const">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="lossy" type="bool" default="false" />
-			<argument index="2" name="quality" type="float" default="0.75" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="lossy" type="bool" default="false" />
+			<param index="2" name="quality" type="float" default="0.75" />
 			<description>
-				Saves the image as a WebP (Web Picture) file to the file at [code]path[/code]. By default it will save lossless. If [code]lossy[/code] is true, the image will be saved lossy, using the [code]quality[/code] setting between 0.0 and 1.0 (inclusive).
+				Saves the image as a WebP (Web Picture) file to the file at [param path]. By default it will save lossless. If [param lossy] is true, the image will be saved lossy, using the [param quality] setting between 0.0 and 1.0 (inclusive).
 			</description>
 		</method>
 		<method name="save_webp_to_buffer" qualifiers="const">
 			<return type="PackedByteArray" />
-			<argument index="0" name="lossy" type="bool" default="false" />
-			<argument index="1" name="quality" type="float" default="0.75" />
+			<param index="0" name="lossy" type="bool" default="false" />
+			<param index="1" name="quality" type="float" default="0.75" />
 			<description>
-				Saves the image as a WebP (Web Picture) file to a byte array. By default it will save lossless. If [code]lossy[/code] is true, the image will be saved lossy, using the [code]quality[/code] setting between 0.0 and 1.0 (inclusive).
+				Saves the image as a WebP (Web Picture) file to a byte array. By default it will save lossless. If [param lossy] is true, the image will be saved lossy, using the [param quality] setting between 0.0 and 1.0 (inclusive).
 			</description>
 		</method>
 		<method name="set_pixel">
 			<return type="void" />
-			<argument index="0" name="x" type="int" />
-			<argument index="1" name="y" type="int" />
-			<argument index="2" name="color" type="Color" />
+			<param index="0" name="x" type="int" />
+			<param index="1" name="y" type="int" />
+			<param index="2" name="color" type="Color" />
 			<description>
-				Sets the [Color] of the pixel at [code](x, y)[/code] to [code]color[/code]. Example:
+				Sets the [Color] of the pixel at [code](x, y)[/code] to [param color]. Example:
 				[codeblocks]
 				[gdscript]
 				var img_width = 10
@@ -485,10 +485,10 @@
 		</method>
 		<method name="set_pixelv">
 			<return type="void" />
-			<argument index="0" name="point" type="Vector2i" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="point" type="Vector2i" />
+			<param index="1" name="color" type="Color" />
 			<description>
-				Sets the [Color] of the pixel at [code]point[/code] to [code]color[/code]. Example:
+				Sets the [Color] of the pixel at [param point] to [param color]. Example:
 				[codeblocks]
 				[gdscript]
 				var img_width = 10
diff --git a/doc/classes/ImageTexture.xml b/doc/classes/ImageTexture.xml
index 084bf7e809..c750b540a4 100644
--- a/doc/classes/ImageTexture.xml
+++ b/doc/classes/ImageTexture.xml
@@ -31,7 +31,7 @@
 	<methods>
 		<method name="create_from_image" qualifiers="static">
 			<return type="ImageTexture" />
-			<argument index="0" name="image" type="Image" />
+			<param index="0" name="image" type="Image" />
 			<description>
 				Creates a new [ImageTexture] and initializes it by allocating and setting the data from an [Image].
 			</description>
@@ -44,7 +44,7 @@
 		</method>
 		<method name="set_image">
 			<return type="void" />
-			<argument index="0" name="image" type="Image" />
+			<param index="0" name="image" type="Image" />
 			<description>
 				Replaces the texture's data with a new [Image]. This will re-allocate new memory for the texture.
 				If you want to update the image, but don't need to change its parameters (format, size), use [method update] instead for better performance.
@@ -52,14 +52,14 @@
 		</method>
 		<method name="set_size_override">
 			<return type="void" />
-			<argument index="0" name="size" type="Vector2i" />
+			<param index="0" name="size" type="Vector2i" />
 			<description>
 				Resizes the texture to the specified dimensions.
 			</description>
 		</method>
 		<method name="update">
 			<return type="void" />
-			<argument index="0" name="image" type="Image" />
+			<param index="0" name="image" type="Image" />
 			<description>
 				Replaces the texture's data with a new [Image].
 				[b]Note:[/b] The texture has to be created using [method create_from_image] or initialized first with the [method set_image] method before it can be updated. The new image dimensions, format, and mipmaps configuration should match the existing texture's image configuration.
diff --git a/doc/classes/ImageTexture3D.xml b/doc/classes/ImageTexture3D.xml
index b2068504eb..958c5f90f1 100644
--- a/doc/classes/ImageTexture3D.xml
+++ b/doc/classes/ImageTexture3D.xml
@@ -9,18 +9,18 @@
 	<methods>
 		<method name="create">
 			<return type="int" enum="Error" />
-			<argument index="0" name="format" type="int" enum="Image.Format" />
-			<argument index="1" name="width" type="int" />
-			<argument index="2" name="height" type="int" />
-			<argument index="3" name="depth" type="int" />
-			<argument index="4" name="use_mipmaps" type="bool" />
-			<argument index="5" name="data" type="Image[]" />
+			<param index="0" name="format" type="int" enum="Image.Format" />
+			<param index="1" name="width" type="int" />
+			<param index="2" name="height" type="int" />
+			<param index="3" name="depth" type="int" />
+			<param index="4" name="use_mipmaps" type="bool" />
+			<param index="5" name="data" type="Image[]" />
 			<description>
 			</description>
 		</method>
 		<method name="update">
 			<return type="void" />
-			<argument index="0" name="data" type="Image[]" />
+			<param index="0" name="data" type="Image[]" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/ImageTextureLayered.xml b/doc/classes/ImageTextureLayered.xml
index c574e5c9c1..c0ad19ddd7 100644
--- a/doc/classes/ImageTextureLayered.xml
+++ b/doc/classes/ImageTextureLayered.xml
@@ -9,14 +9,14 @@
 	<methods>
 		<method name="create_from_images">
 			<return type="int" enum="Error" />
-			<argument index="0" name="images" type="Array" />
+			<param index="0" name="images" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="update_layer">
 			<return type="void" />
-			<argument index="0" name="image" type="Image" />
-			<argument index="1" name="layer" type="int" />
+			<param index="0" name="image" type="Image" />
+			<param index="1" name="layer" type="int" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/ImmediateMesh.xml b/doc/classes/ImmediateMesh.xml
index d12d5de184..a6d2e3e249 100644
--- a/doc/classes/ImmediateMesh.xml
+++ b/doc/classes/ImmediateMesh.xml
@@ -17,22 +17,22 @@
 		</method>
 		<method name="surface_add_vertex">
 			<return type="void" />
-			<argument index="0" name="vertex" type="Vector3" />
+			<param index="0" name="vertex" type="Vector3" />
 			<description>
 				Add a 3D vertex using the current attributes previously set.
 			</description>
 		</method>
 		<method name="surface_add_vertex_2d">
 			<return type="void" />
-			<argument index="0" name="vertex" type="Vector2" />
+			<param index="0" name="vertex" type="Vector2" />
 			<description>
 				Add a 2D vertex using the current attributes previously set.
 			</description>
 		</method>
 		<method name="surface_begin">
 			<return type="void" />
-			<argument index="0" name="primitive" type="int" enum="Mesh.PrimitiveType" />
-			<argument index="1" name="material" type="Material" default="null" />
+			<param index="0" name="primitive" type="int" enum="Mesh.PrimitiveType" />
+			<param index="1" name="material" type="Material" default="null" />
 			<description>
 				Begin a new surface.
 			</description>
@@ -45,35 +45,35 @@
 		</method>
 		<method name="surface_set_color">
 			<return type="void" />
-			<argument index="0" name="color" type="Color" />
+			<param index="0" name="color" type="Color" />
 			<description>
 				Set the color attribute that will be pushed with the next vertex.
 			</description>
 		</method>
 		<method name="surface_set_normal">
 			<return type="void" />
-			<argument index="0" name="normal" type="Vector3" />
+			<param index="0" name="normal" type="Vector3" />
 			<description>
 				Set the normal attribute that will be pushed with the next vertex.
 			</description>
 		</method>
 		<method name="surface_set_tangent">
 			<return type="void" />
-			<argument index="0" name="tangent" type="Plane" />
+			<param index="0" name="tangent" type="Plane" />
 			<description>
 				Set the tangent attribute that will be pushed with the next vertex.
 			</description>
 		</method>
 		<method name="surface_set_uv">
 			<return type="void" />
-			<argument index="0" name="uv" type="Vector2" />
+			<param index="0" name="uv" type="Vector2" />
 			<description>
 				Set the UV attribute that will be pushed with the next vertex.
 			</description>
 		</method>
 		<method name="surface_set_uv2">
 			<return type="void" />
-			<argument index="0" name="uv2" type="Vector2" />
+			<param index="0" name="uv2" type="Vector2" />
 			<description>
 				Set the UV2 attribute that will be pushed with the next vertex.
 			</description>
diff --git a/doc/classes/ImporterMesh.xml b/doc/classes/ImporterMesh.xml
index 201c0ddd38..e15cfcd2c0 100644
--- a/doc/classes/ImporterMesh.xml
+++ b/doc/classes/ImporterMesh.xml
@@ -13,24 +13,24 @@
 	<methods>
 		<method name="add_blend_shape">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Adds name for a blend shape that will be added with [method add_surface]. Must be called before surface is added.
 			</description>
 		</method>
 		<method name="add_surface">
 			<return type="void" />
-			<argument index="0" name="primitive" type="int" enum="Mesh.PrimitiveType" />
-			<argument index="1" name="arrays" type="Array" />
-			<argument index="2" name="blend_shapes" type="Array" default="[]" />
-			<argument index="3" name="lods" type="Dictionary" default="{}" />
-			<argument index="4" name="material" type="Material" default="null" />
-			<argument index="5" name="name" type="String" default="&quot;&quot;" />
-			<argument index="6" name="flags" type="int" default="0" />
+			<param index="0" name="primitive" type="int" enum="Mesh.PrimitiveType" />
+			<param index="1" name="arrays" type="Array" />
+			<param index="2" name="blend_shapes" type="Array" default="[]" />
+			<param index="3" name="lods" type="Dictionary" default="{}" />
+			<param index="4" name="material" type="Material" default="null" />
+			<param index="5" name="name" type="String" default="&quot;&quot;" />
+			<param index="6" name="flags" type="int" default="0" />
 			<description>
 				Creates a new surface, analogous to [method ArrayMesh.add_surface_from_arrays].
-				Surfaces are created to be rendered using a [code]primitive[/code], which may be any of the types defined in [enum Mesh.PrimitiveType]. (As a note, when using indices, it is recommended to only use points, lines, or triangles.) [method Mesh.get_surface_count] will become the [code]surf_idx[/code] for this new surface.
-				The [code]arrays[/code] argument is an array of arrays. See [enum Mesh.ArrayType] for the values used in this array. For example, [code]arrays[0][/code] is the array of vertices. That first vertex sub-array is always required; the others are optional. Adding an index array puts this function into "index mode" where the vertex and other arrays become the sources of data and the index array defines the vertex order. All sub-arrays must have the same length as the vertex array (or be an exact multiple of the vertex array's length, when multiple elements of a sub-array correspond to a single vertex) or be empty, except for [constant Mesh.ARRAY_INDEX] if it is used.
+				Surfaces are created to be rendered using a [param primitive], which may be any of the types defined in [enum Mesh.PrimitiveType]. (As a note, when using indices, it is recommended to only use points, lines, or triangles.) [method Mesh.get_surface_count] will become the [code]surf_idx[/code] for this new surface.
+				The [param arrays] argument is an array of arrays. See [enum Mesh.ArrayType] for the values used in this array. For example, [code]arrays[0][/code] is the array of vertices. That first vertex sub-array is always required; the others are optional. Adding an index array puts this function into "index mode" where the vertex and other arrays become the sources of data and the index array defines the vertex order. All sub-arrays must have the same length as the vertex array (or be an exact multiple of the vertex array's length, when multiple elements of a sub-array correspond to a single vertex) or be empty, except for [constant Mesh.ARRAY_INDEX] if it is used.
 			</description>
 		</method>
 		<method name="clear">
@@ -41,11 +41,11 @@
 		</method>
 		<method name="generate_lods">
 			<return type="void" />
-			<argument index="0" name="normal_merge_angle" type="float" />
-			<argument index="1" name="normal_split_angle" type="float" />
+			<param index="0" name="normal_merge_angle" type="float" />
+			<param index="1" name="normal_split_angle" type="float" />
 			<description>
 				Generates all lods for this ImporterMesh.
-				[code]normal_merge_angle[/code] and [code]normal_split_angle[/code] are in degrees and used in the same way as the importer settings in [code]lods[/code]. As a good default, use 25 and 60 respectively.
+				[param normal_merge_angle] and [param normal_split_angle] are in degrees and used in the same way as the importer settings in [code]lods[/code]. As a good default, use 25 and 60 respectively.
 				The number of generated lods can be accessed using [method get_surface_lod_count], and each LOD is available in [method get_surface_lod_size] and [method get_surface_lod_indices].
 			</description>
 		</method>
@@ -63,7 +63,7 @@
 		</method>
 		<method name="get_blend_shape_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="blend_shape_idx" type="int" />
+			<param index="0" name="blend_shape_idx" type="int" />
 			<description>
 				Returns the name of the blend shape at this index.
 			</description>
@@ -76,24 +76,24 @@
 		</method>
 		<method name="get_mesh">
 			<return type="ArrayMesh" />
-			<argument index="0" name="base_mesh" type="ArrayMesh" default="null" />
+			<param index="0" name="base_mesh" type="ArrayMesh" default="null" />
 			<description>
 				Returns the mesh data represented by this [ImporterMesh] as a usable [ArrayMesh].
 				This method caches the returned mesh, and subsequent calls will return the cached data until [method clear] is called.
-				If not yet cached and [code]base_mesh[/code] is provided, [code]base_mesh[/code] will be used and mutated.
+				If not yet cached and [param base_mesh] is provided, [param base_mesh] will be used and mutated.
 			</description>
 		</method>
 		<method name="get_surface_arrays" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="surface_idx" type="int" />
+			<param index="0" name="surface_idx" type="int" />
 			<description>
 				Returns the arrays for the vertices, normals, uvs, etc. that make up the requested surface. See [method add_surface].
 			</description>
 		</method>
 		<method name="get_surface_blend_shape_arrays" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="surface_idx" type="int" />
-			<argument index="1" name="blend_shape_idx" type="int" />
+			<param index="0" name="surface_idx" type="int" />
+			<param index="1" name="blend_shape_idx" type="int" />
 			<description>
 				Returns a single set of blend shape arrays for the requested blend shape index for a surface.
 			</description>
@@ -101,86 +101,86 @@
 		<method name="get_surface_count" qualifiers="const">
 			<return type="int" />
 			<description>
-				Returns the amount of surfaces that the mesh holds.
+				Returns the number of surfaces that the mesh holds.
 			</description>
 		</method>
 		<method name="get_surface_format" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="surface_idx" type="int" />
+			<param index="0" name="surface_idx" type="int" />
 			<description>
 				Returns the format of the surface that the mesh holds.
 			</description>
 		</method>
 		<method name="get_surface_lod_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="surface_idx" type="int" />
+			<param index="0" name="surface_idx" type="int" />
 			<description>
-				Returns the amount of lods that the mesh holds on a given surface.
+				Returns the number of lods that the mesh holds on a given surface.
 			</description>
 		</method>
 		<method name="get_surface_lod_indices" qualifiers="const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="surface_idx" type="int" />
-			<argument index="1" name="lod_idx" type="int" />
+			<param index="0" name="surface_idx" type="int" />
+			<param index="1" name="lod_idx" type="int" />
 			<description>
 				Returns the index buffer of a lod for a surface.
 			</description>
 		</method>
 		<method name="get_surface_lod_size" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="surface_idx" type="int" />
-			<argument index="1" name="lod_idx" type="int" />
+			<param index="0" name="surface_idx" type="int" />
+			<param index="1" name="lod_idx" type="int" />
 			<description>
 				Returns the screen ratio which activates a lod for a surface.
 			</description>
 		</method>
 		<method name="get_surface_material" qualifiers="const">
 			<return type="Material" />
-			<argument index="0" name="surface_idx" type="int" />
+			<param index="0" name="surface_idx" type="int" />
 			<description>
 				Returns a [Material] in a given surface. Surface is rendered using this material.
 			</description>
 		</method>
 		<method name="get_surface_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="surface_idx" type="int" />
+			<param index="0" name="surface_idx" type="int" />
 			<description>
 				Gets the name assigned to this surface.
 			</description>
 		</method>
 		<method name="get_surface_primitive_type">
 			<return type="int" enum="Mesh.PrimitiveType" />
-			<argument index="0" name="surface_idx" type="int" />
+			<param index="0" name="surface_idx" type="int" />
 			<description>
 				Returns the primitive type of the requested surface (see [method add_surface]).
 			</description>
 		</method>
 		<method name="set_blend_shape_mode">
 			<return type="void" />
-			<argument index="0" name="mode" type="int" enum="Mesh.BlendShapeMode" />
+			<param index="0" name="mode" type="int" enum="Mesh.BlendShapeMode" />
 			<description>
 				Sets the blend shape mode to one of [enum Mesh.BlendShapeMode].
 			</description>
 		</method>
 		<method name="set_lightmap_size_hint">
 			<return type="void" />
-			<argument index="0" name="size" type="Vector2i" />
+			<param index="0" name="size" type="Vector2i" />
 			<description>
 				Sets the size hint of this mesh for lightmap-unwrapping in UV-space.
 			</description>
 		</method>
 		<method name="set_surface_material">
 			<return type="void" />
-			<argument index="0" name="surface_idx" type="int" />
-			<argument index="1" name="material" type="Material" />
+			<param index="0" name="surface_idx" type="int" />
+			<param index="1" name="material" type="Material" />
 			<description>
 				Sets a [Material] for a given surface. Surface will be rendered using this material.
 			</description>
 		</method>
 		<method name="set_surface_name">
 			<return type="void" />
-			<argument index="0" name="surface_idx" type="int" />
-			<argument index="1" name="name" type="String" />
+			<param index="0" name="surface_idx" type="int" />
+			<param index="1" name="name" type="String" />
 			<description>
 				Sets a name for a given surface.
 			</description>
diff --git a/doc/classes/Input.xml b/doc/classes/Input.xml
index 796a80873f..90da000586 100644
--- a/doc/classes/Input.xml
+++ b/doc/classes/Input.xml
@@ -14,8 +14,8 @@
 	<methods>
 		<method name="action_press">
 			<return type="void" />
-			<argument index="0" name="action" type="StringName" />
-			<argument index="1" name="strength" type="float" default="1.0" />
+			<param index="0" name="action" type="StringName" />
+			<param index="1" name="strength" type="float" default="1.0" />
 			<description>
 				This will simulate pressing the specified action.
 				The strength can be used for non-boolean actions, it's ranged between 0 and 1 representing the intensity of the given action.
@@ -24,15 +24,15 @@
 		</method>
 		<method name="action_release">
 			<return type="void" />
-			<argument index="0" name="action" type="StringName" />
+			<param index="0" name="action" type="StringName" />
 			<description>
 				If the specified action is already pressed, this will release it.
 			</description>
 		</method>
 		<method name="add_joy_mapping">
 			<return type="void" />
-			<argument index="0" name="mapping" type="String" />
-			<argument index="1" name="update_existing" type="bool" default="false" />
+			<param index="0" name="mapping" type="String" />
+			<param index="1" name="update_existing" type="bool" default="false" />
 			<description>
 				Adds a new mapping entry (in SDL2 format) to the mapping database. Optionally update already connected devices.
 			</description>
@@ -54,26 +54,26 @@
 		</method>
 		<method name="get_action_raw_strength" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="action" type="StringName" />
-			<argument index="1" name="exact_match" type="bool" default="false" />
+			<param index="0" name="action" type="StringName" />
+			<param index="1" name="exact_match" type="bool" default="false" />
 			<description>
 				Returns a value between 0 and 1 representing the raw intensity of the given action, ignoring the action's deadzone. In most cases, you should use [method get_action_strength] instead.
-				If [code]exact_match[/code] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
+				If [param exact_match] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
 			</description>
 		</method>
 		<method name="get_action_strength" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="action" type="StringName" />
-			<argument index="1" name="exact_match" type="bool" default="false" />
+			<param index="0" name="action" type="StringName" />
+			<param index="1" name="exact_match" type="bool" default="false" />
 			<description>
 				Returns a value between 0 and 1 representing the intensity of the given action. In a joypad, for example, the further away the axis (analog sticks or L2, R2 triggers) is from the dead zone, the closer the value will be to 1. If the action is mapped to a control that has no axis as the keyboard, the value returned will be 0 or 1.
-				If [code]exact_match[/code] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
+				If [param exact_match] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
 			</description>
 		</method>
 		<method name="get_axis" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="negative_action" type="StringName" />
-			<argument index="1" name="positive_action" type="StringName" />
+			<param index="0" name="negative_action" type="StringName" />
+			<param index="1" name="positive_action" type="StringName" />
 			<description>
 				Get axis input by specifying two actions, one negative and one positive.
 				This is a shorthand for writing [code]Input.get_action_strength("positive_action") - Input.get_action_strength("negative_action")[/code].
@@ -107,36 +107,36 @@
 		</method>
 		<method name="get_joy_axis" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="device" type="int" />
-			<argument index="1" name="axis" type="int" enum="JoyAxis" />
+			<param index="0" name="device" type="int" />
+			<param index="1" name="axis" type="int" enum="JoyAxis" />
 			<description>
 				Returns the current value of the joypad axis at given index (see [enum JoyAxis]).
 			</description>
 		</method>
 		<method name="get_joy_guid" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="device" type="int" />
+			<param index="0" name="device" type="int" />
 			<description>
 				Returns a SDL2-compatible device GUID on platforms that use gamepad remapping. Returns [code]"Default Gamepad"[/code] otherwise.
 			</description>
 		</method>
 		<method name="get_joy_name">
 			<return type="String" />
-			<argument index="0" name="device" type="int" />
+			<param index="0" name="device" type="int" />
 			<description>
 				Returns the name of the joypad at the specified device index.
 			</description>
 		</method>
 		<method name="get_joy_vibration_duration">
 			<return type="float" />
-			<argument index="0" name="device" type="int" />
+			<param index="0" name="device" type="int" />
 			<description>
 				Returns the duration of the current vibration effect in seconds.
 			</description>
 		</method>
 		<method name="get_joy_vibration_strength">
 			<return type="Vector2" />
-			<argument index="0" name="device" type="int" />
+			<param index="0" name="device" type="int" />
 			<description>
 				Returns the strength of the joypad vibration: x is the strength of the weak motor, and y is the strength of the strong motor.
 			</description>
@@ -162,11 +162,11 @@
 		</method>
 		<method name="get_vector" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="negative_x" type="StringName" />
-			<argument index="1" name="positive_x" type="StringName" />
-			<argument index="2" name="negative_y" type="StringName" />
-			<argument index="3" name="positive_y" type="StringName" />
-			<argument index="4" name="deadzone" type="float" default="-1.0" />
+			<param index="0" name="negative_x" type="StringName" />
+			<param index="1" name="positive_x" type="StringName" />
+			<param index="2" name="negative_y" type="StringName" />
+			<param index="3" name="positive_y" type="StringName" />
+			<param index="4" name="deadzone" type="float" default="-1.0" />
 			<description>
 				Gets an input vector by specifying four actions for the positive and negative X and Y axes.
 				This method is useful when getting vector input, such as from a joystick, directional pad, arrows, or WASD. The vector has its length limited to 1 and has a circular deadzone, which is useful for using vector input as movement.
@@ -175,31 +175,31 @@
 		</method>
 		<method name="is_action_just_pressed" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="action" type="StringName" />
-			<argument index="1" name="exact_match" type="bool" default="false" />
+			<param index="0" name="action" type="StringName" />
+			<param index="1" name="exact_match" type="bool" default="false" />
 			<description>
 				Returns [code]true[/code] when the user starts pressing the action event, meaning it's [code]true[/code] only on the frame that the user pressed down the button.
 				This is useful for code that needs to run only once when an action is pressed, instead of every frame while it's pressed.
-				If [code]exact_match[/code] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
+				If [param exact_match] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
 				[b]Note:[/b] Due to keyboard ghosting, [method is_action_just_pressed] may return [code]false[/code] even if one of the action's keys is pressed. See [url=$DOCS_URL/tutorials/inputs/input_examples.html#keyboard-events]Input examples[/url] in the documentation for more information.
 			</description>
 		</method>
 		<method name="is_action_just_released" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="action" type="StringName" />
-			<argument index="1" name="exact_match" type="bool" default="false" />
+			<param index="0" name="action" type="StringName" />
+			<param index="1" name="exact_match" type="bool" default="false" />
 			<description>
 				Returns [code]true[/code] when the user stops pressing the action event, meaning it's [code]true[/code] only on the frame that the user released the button.
-				If [code]exact_match[/code] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
+				If [param exact_match] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
 			</description>
 		</method>
 		<method name="is_action_pressed" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="action" type="StringName" />
-			<argument index="1" name="exact_match" type="bool" default="false" />
+			<param index="0" name="action" type="StringName" />
+			<param index="1" name="exact_match" type="bool" default="false" />
 			<description>
 				Returns [code]true[/code] if you are pressing the action event. Note that if an action has multiple buttons assigned and more than one of them is pressed, releasing one button will release the action, even if some other button assigned to this action is still pressed.
-				If [code]exact_match[/code] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
+				If [param exact_match] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
 				[b]Note:[/b] Due to keyboard ghosting, [method is_action_pressed] may return [code]false[/code] even if one of the action's keys is pressed. See [url=$DOCS_URL/tutorials/inputs/input_examples.html#keyboard-events]Input examples[/url] in the documentation for more information.
 			</description>
 		</method>
@@ -211,22 +211,22 @@
 		</method>
 		<method name="is_joy_button_pressed" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="device" type="int" />
-			<argument index="1" name="button" type="int" enum="JoyButton" />
+			<param index="0" name="device" type="int" />
+			<param index="1" name="button" type="int" enum="JoyButton" />
 			<description>
 				Returns [code]true[/code] if you are pressing the joypad button (see [enum JoyButton]).
 			</description>
 		</method>
 		<method name="is_joy_known">
 			<return type="bool" />
-			<argument index="0" name="device" type="int" />
+			<param index="0" name="device" type="int" />
 			<description>
 				Returns [code]true[/code] if the system knows the specified device. This means that it sets all button and axis indices. Unknown joypads are not expected to match these constants, but you can still retrieve events from them.
 			</description>
 		</method>
 		<method name="is_key_pressed" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="keycode" type="int" enum="Key" />
+			<param index="0" name="keycode" type="int" enum="Key" />
 			<description>
 				Returns [code]true[/code] if you are pressing the key in the current keyboard layout. You can pass a [enum Key] constant.
 				[method is_key_pressed] is only recommended over [method is_physical_key_pressed] in non-game applications. This ensures that shortcut keys behave as expected depending on the user's keyboard layout, as keyboard shortcuts are generally dependent on the keyboard layout in non-game applications. If in doubt, use [method is_physical_key_pressed].
@@ -235,14 +235,14 @@
 		</method>
 		<method name="is_mouse_button_pressed" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="button" type="int" enum="MouseButton" />
+			<param index="0" name="button" type="int" enum="MouseButton" />
 			<description>
 				Returns [code]true[/code] if you are pressing the mouse button specified with [enum MouseButton].
 			</description>
 		</method>
 		<method name="is_physical_key_pressed" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="keycode" type="int" enum="Key" />
+			<param index="0" name="keycode" type="int" enum="Key" />
 			<description>
 				Returns [code]true[/code] if you are pressing the key in the physical location on the 101/102-key US QWERTY keyboard. You can pass a [enum Key] constant.
 				[method is_physical_key_pressed] is recommended over [method is_key_pressed] for in-game actions, as it will make [kbd]W[/kbd]/[kbd]A[/kbd]/[kbd]S[/kbd]/[kbd]D[/kbd] layouts work regardless of the user's keyboard layout. [method is_physical_key_pressed] will also ensure that the top row number keys work on any keyboard layout. If in doubt, use [method is_physical_key_pressed].
@@ -251,7 +251,7 @@
 		</method>
 		<method name="parse_input_event">
 			<return type="void" />
-			<argument index="0" name="event" type="InputEvent" />
+			<param index="0" name="event" type="InputEvent" />
 			<description>
 				Feeds an [InputEvent] to the game. Can be used to artificially trigger input events from code. Also generates [method Node._input] calls.
 				Example:
@@ -273,14 +273,14 @@
 		</method>
 		<method name="remove_joy_mapping">
 			<return type="void" />
-			<argument index="0" name="guid" type="String" />
+			<param index="0" name="guid" type="String" />
 			<description>
 				Removes all mappings from the internal database that match the given GUID.
 			</description>
 		</method>
 		<method name="set_accelerometer">
 			<return type="void" />
-			<argument index="0" name="value" type="Vector3" />
+			<param index="0" name="value" type="Vector3" />
 			<description>
 				Sets the acceleration value of the accelerometer sensor. Can be used for debugging on devices without a hardware sensor, for example in an editor on a PC.
 				[b]Note:[/b] This value can be immediately overwritten by the hardware sensor value on Android and iOS.
@@ -288,20 +288,20 @@
 		</method>
 		<method name="set_custom_mouse_cursor">
 			<return type="void" />
-			<argument index="0" name="image" type="Resource" />
-			<argument index="1" name="shape" type="int" enum="Input.CursorShape" default="0" />
-			<argument index="2" name="hotspot" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="image" type="Resource" />
+			<param index="1" name="shape" type="int" enum="Input.CursorShape" default="0" />
+			<param index="2" name="hotspot" type="Vector2" default="Vector2(0, 0)" />
 			<description>
 				Sets a custom mouse cursor image, which is only visible inside the game window. The hotspot can also be specified. Passing [code]null[/code] to the image parameter resets to the system cursor. See [enum CursorShape] for the list of shapes.
-				[code]image[/code]'s size must be lower than 256×256.
-				[code]hotspot[/code] must be within [code]image[/code]'s size.
+				[param image]'s size must be lower than 256×256.
+				[param hotspot] must be within [param image]'s size.
 				[b]Note:[/b] [AnimatedTexture]s aren't supported as custom mouse cursors. If using an [AnimatedTexture], only the first frame will be displayed.
 				[b]Note:[/b] Only images imported with the [b]Lossless[/b], [b]Lossy[/b] or [b]Uncompressed[/b] compression modes are supported. The [b]Video RAM[/b] compression mode can't be used for custom cursors.
 			</description>
 		</method>
 		<method name="set_default_cursor_shape">
 			<return type="void" />
-			<argument index="0" name="shape" type="int" enum="Input.CursorShape" default="0" />
+			<param index="0" name="shape" type="int" enum="Input.CursorShape" default="0" />
 			<description>
 				Sets the default cursor shape to be used in the viewport instead of [constant CURSOR_ARROW].
 				[b]Note:[/b] If you want to change the default cursor shape for [Control]'s nodes, use [member Control.mouse_default_cursor_shape] instead.
@@ -310,7 +310,7 @@
 		</method>
 		<method name="set_gravity">
 			<return type="void" />
-			<argument index="0" name="value" type="Vector3" />
+			<param index="0" name="value" type="Vector3" />
 			<description>
 				Sets the gravity value of the accelerometer sensor. Can be used for debugging on devices without a hardware sensor, for example in an editor on a PC.
 				[b]Note:[/b] This value can be immediately overwritten by the hardware sensor value on Android and iOS.
@@ -318,7 +318,7 @@
 		</method>
 		<method name="set_gyroscope">
 			<return type="void" />
-			<argument index="0" name="value" type="Vector3" />
+			<param index="0" name="value" type="Vector3" />
 			<description>
 				Sets the value of the rotation rate of the gyroscope sensor. Can be used for debugging on devices without a hardware sensor, for example in an editor on a PC.
 				[b]Note:[/b] This value can be immediately overwritten by the hardware sensor value on Android and iOS.
@@ -326,7 +326,7 @@
 		</method>
 		<method name="set_magnetometer">
 			<return type="void" />
-			<argument index="0" name="value" type="Vector3" />
+			<param index="0" name="value" type="Vector3" />
 			<description>
 				Sets the value of the magnetic field of the magnetometer sensor. Can be used for debugging on devices without a hardware sensor, for example in an editor on a PC.
 				[b]Note:[/b] This value can be immediately overwritten by the hardware sensor value on Android and iOS.
@@ -334,25 +334,25 @@
 		</method>
 		<method name="start_joy_vibration">
 			<return type="void" />
-			<argument index="0" name="device" type="int" />
-			<argument index="1" name="weak_magnitude" type="float" />
-			<argument index="2" name="strong_magnitude" type="float" />
-			<argument index="3" name="duration" type="float" default="0" />
+			<param index="0" name="device" type="int" />
+			<param index="1" name="weak_magnitude" type="float" />
+			<param index="2" name="strong_magnitude" type="float" />
+			<param index="3" name="duration" type="float" default="0" />
 			<description>
-				Starts to vibrate the joypad. Joypads usually come with two rumble motors, a strong and a weak one. [code]weak_magnitude[/code] is the strength of the weak motor (between 0 and 1) and [code]strong_magnitude[/code] is the strength of the strong motor (between 0 and 1). [code]duration[/code] is the duration of the effect in seconds (a duration of 0 will try to play the vibration indefinitely).
+				Starts to vibrate the joypad. Joypads usually come with two rumble motors, a strong and a weak one. [param weak_magnitude] is the strength of the weak motor (between 0 and 1) and [param strong_magnitude] is the strength of the strong motor (between 0 and 1). [param duration] is the duration of the effect in seconds (a duration of 0 will try to play the vibration indefinitely).
 				[b]Note:[/b] Not every hardware is compatible with long effect durations; it is recommended to restart an effect if it has to be played for more than a few seconds.
 			</description>
 		</method>
 		<method name="stop_joy_vibration">
 			<return type="void" />
-			<argument index="0" name="device" type="int" />
+			<param index="0" name="device" type="int" />
 			<description>
 				Stops the vibration of the joypad.
 			</description>
 		</method>
 		<method name="vibrate_handheld">
 			<return type="void" />
-			<argument index="0" name="duration_ms" type="int" default="500" />
+			<param index="0" name="duration_ms" type="int" default="500" />
 			<description>
 				Vibrate handheld devices.
 				[b]Note:[/b] This method is implemented on Android, iOS, and HTML5.
@@ -363,7 +363,7 @@
 		</method>
 		<method name="warp_mouse">
 			<return type="void" />
-			<argument index="0" name="position" type="Vector2" />
+			<param index="0" name="position" type="Vector2" />
 			<description>
 				Sets the mouse position to the specified vector, provided in pixels and relative to an origin at the upper left corner of the currently focused Window Manager game window.
 				Mouse position is clipped to the limits of the screen resolution, or to the limits of the game window if [enum MouseMode] is set to [code]MOUSE_MODE_CONFINED[/code] or [code]MOUSE_MODE_CONFINED_HIDDEN[/code].
@@ -382,8 +382,8 @@
 	</members>
 	<signals>
 		<signal name="joy_connection_changed">
-			<argument index="0" name="device" type="int" />
-			<argument index="1" name="connected" type="bool" />
+			<param index="0" name="device" type="int" />
+			<param index="1" name="connected" type="bool" />
 			<description>
 				Emitted when a joypad device has been connected or disconnected.
 			</description>
diff --git a/doc/classes/InputEvent.xml b/doc/classes/InputEvent.xml
index 230ad04b33..043ccdca36 100644
--- a/doc/classes/InputEvent.xml
+++ b/doc/classes/InputEvent.xml
@@ -15,7 +15,7 @@
 	<methods>
 		<method name="accumulate">
 			<return type="bool" />
-			<argument index="0" name="with_event" type="InputEvent" />
+			<param index="0" name="with_event" type="InputEvent" />
 			<description>
 				Returns [code]true[/code] if the given input event and this input event can be added together (only for events of type [InputEventMouseMotion]).
 				The given input event's position, global position and speed will be copied. The resulting [code]relative[/code] is a sum of both events. Both events' modifiers have to be identical.
@@ -29,40 +29,40 @@
 		</method>
 		<method name="get_action_strength" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="action" type="StringName" />
-			<argument index="1" name="exact_match" type="bool" default="false" />
+			<param index="0" name="action" type="StringName" />
+			<param index="1" name="exact_match" type="bool" default="false" />
 			<description>
 				Returns a value between 0.0 and 1.0 depending on the given actions' state. Useful for getting the value of events of type [InputEventJoypadMotion].
-				If [code]exact_match[/code] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
+				If [param exact_match] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
 			</description>
 		</method>
 		<method name="is_action" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="action" type="StringName" />
-			<argument index="1" name="exact_match" type="bool" default="false" />
+			<param index="0" name="action" type="StringName" />
+			<param index="1" name="exact_match" type="bool" default="false" />
 			<description>
 				Returns [code]true[/code] if this input event matches a pre-defined action of any type.
-				If [code]exact_match[/code] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
+				If [param exact_match] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
 			</description>
 		</method>
 		<method name="is_action_pressed" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="action" type="StringName" />
-			<argument index="1" name="allow_echo" type="bool" default="false" />
-			<argument index="2" name="exact_match" type="bool" default="false" />
+			<param index="0" name="action" type="StringName" />
+			<param index="1" name="allow_echo" type="bool" default="false" />
+			<param index="2" name="exact_match" type="bool" default="false" />
 			<description>
-				Returns [code]true[/code] if the given action is being pressed (and is not an echo event for [InputEventKey] events, unless [code]allow_echo[/code] is [code]true[/code]). Not relevant for events of type [InputEventMouseMotion] or [InputEventScreenDrag].
-				If [code]exact_match[/code] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
+				Returns [code]true[/code] if the given action is being pressed (and is not an echo event for [InputEventKey] events, unless [param allow_echo] is [code]true[/code]). Not relevant for events of type [InputEventMouseMotion] or [InputEventScreenDrag].
+				If [param exact_match] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
 				[b]Note:[/b] Due to keyboard ghosting, [method is_action_pressed] may return [code]false[/code] even if one of the action's keys is pressed. See [url=$DOCS_URL/tutorials/inputs/input_examples.html#keyboard-events]Input examples[/url] in the documentation for more information.
 			</description>
 		</method>
 		<method name="is_action_released" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="action" type="StringName" />
-			<argument index="1" name="exact_match" type="bool" default="false" />
+			<param index="0" name="action" type="StringName" />
+			<param index="1" name="exact_match" type="bool" default="false" />
 			<description>
 				Returns [code]true[/code] if the given action is released (i.e. not pressed). Not relevant for events of type [InputEventMouseMotion] or [InputEventScreenDrag].
-				If [code]exact_match[/code] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
+				If [param exact_match] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
 			</description>
 		</method>
 		<method name="is_action_type" qualifiers="const">
@@ -79,11 +79,11 @@
 		</method>
 		<method name="is_match" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="event" type="InputEvent" />
-			<argument index="1" name="exact_match" type="bool" default="true" />
+			<param index="0" name="event" type="InputEvent" />
+			<param index="1" name="exact_match" type="bool" default="true" />
 			<description>
-				Returns [code]true[/code] if the specified [code]event[/code] matches this event. Only valid for action events i.e key ([InputEventKey]), button ([InputEventMouseButton] or [InputEventJoypadButton]), axis [InputEventJoypadMotion] or action ([InputEventAction]) events.
-				If [code]exact_match[/code] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
+				Returns [code]true[/code] if the specified [param event] matches this event. Only valid for action events i.e key ([InputEventKey]), button ([InputEventMouseButton] or [InputEventJoypadButton]), axis [InputEventJoypadMotion] or action ([InputEventAction]) events.
+				If [param exact_match] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
 			</description>
 		</method>
 		<method name="is_pressed" qualifiers="const">
@@ -95,10 +95,10 @@
 		</method>
 		<method name="xformed_by" qualifiers="const">
 			<return type="InputEvent" />
-			<argument index="0" name="xform" type="Transform2D" />
-			<argument index="1" name="local_ofs" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="xform" type="Transform2D" />
+			<param index="1" name="local_ofs" type="Vector2" default="Vector2(0, 0)" />
 			<description>
-				Returns a copy of the given input event which has been offset by [code]local_ofs[/code] and transformed by [code]xform[/code]. Relevant for events of type [InputEventMouseButton], [InputEventMouseMotion], [InputEventScreenTouch], [InputEventScreenDrag], [InputEventMagnifyGesture] and [InputEventPanGesture].
+				Returns a copy of the given input event which has been offset by [param local_ofs] and transformed by [param xform]. Relevant for events of type [InputEventMouseButton], [InputEventMouseMotion], [InputEventScreenTouch], [InputEventScreenDrag], [InputEventMagnifyGesture] and [InputEventPanGesture].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/InputMap.xml b/doc/classes/InputMap.xml
index eb708432b4..d60abd7975 100644
--- a/doc/classes/InputMap.xml
+++ b/doc/classes/InputMap.xml
@@ -12,37 +12,37 @@
 	<methods>
 		<method name="action_add_event">
 			<return type="void" />
-			<argument index="0" name="action" type="StringName" />
-			<argument index="1" name="event" type="InputEvent" />
+			<param index="0" name="action" type="StringName" />
+			<param index="1" name="event" type="InputEvent" />
 			<description>
 				Adds an [InputEvent] to an action. This [InputEvent] will trigger the action.
 			</description>
 		</method>
 		<method name="action_erase_event">
 			<return type="void" />
-			<argument index="0" name="action" type="StringName" />
-			<argument index="1" name="event" type="InputEvent" />
+			<param index="0" name="action" type="StringName" />
+			<param index="1" name="event" type="InputEvent" />
 			<description>
 				Removes an [InputEvent] from an action.
 			</description>
 		</method>
 		<method name="action_erase_events">
 			<return type="void" />
-			<argument index="0" name="action" type="StringName" />
+			<param index="0" name="action" type="StringName" />
 			<description>
 				Removes all events from an action.
 			</description>
 		</method>
 		<method name="action_get_deadzone">
 			<return type="float" />
-			<argument index="0" name="action" type="StringName" />
+			<param index="0" name="action" type="StringName" />
 			<description>
 				Returns a deadzone value for the action.
 			</description>
 		</method>
 		<method name="action_get_events">
 			<return type="Array" />
-			<argument index="0" name="action" type="StringName" />
+			<param index="0" name="action" type="StringName" />
 			<description>
 				Returns an array of [InputEvent]s associated with a given action.
 				[b]Note:[/b] When used in the editor (e.g. a tool script or [EditorPlugin]), this method will return events for the editor action. If you want to access your project's input binds from the editor, read the [code]input/*[/code] settings from [ProjectSettings].
@@ -50,44 +50,44 @@
 		</method>
 		<method name="action_has_event">
 			<return type="bool" />
-			<argument index="0" name="action" type="StringName" />
-			<argument index="1" name="event" type="InputEvent" />
+			<param index="0" name="action" type="StringName" />
+			<param index="1" name="event" type="InputEvent" />
 			<description>
 				Returns [code]true[/code] if the action has the given [InputEvent] associated with it.
 			</description>
 		</method>
 		<method name="action_set_deadzone">
 			<return type="void" />
-			<argument index="0" name="action" type="StringName" />
-			<argument index="1" name="deadzone" type="float" />
+			<param index="0" name="action" type="StringName" />
+			<param index="1" name="deadzone" type="float" />
 			<description>
 				Sets a deadzone value for the action.
 			</description>
 		</method>
 		<method name="add_action">
 			<return type="void" />
-			<argument index="0" name="action" type="StringName" />
-			<argument index="1" name="deadzone" type="float" default="0.5" />
+			<param index="0" name="action" type="StringName" />
+			<param index="1" name="deadzone" type="float" default="0.5" />
 			<description>
-				Adds an empty action to the [InputMap] with a configurable [code]deadzone[/code].
+				Adds an empty action to the [InputMap] with a configurable [param deadzone].
 				An [InputEvent] can then be added to this action with [method action_add_event].
 			</description>
 		</method>
 		<method name="erase_action">
 			<return type="void" />
-			<argument index="0" name="action" type="StringName" />
+			<param index="0" name="action" type="StringName" />
 			<description>
 				Removes an action from the [InputMap].
 			</description>
 		</method>
 		<method name="event_is_action" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="event" type="InputEvent" />
-			<argument index="1" name="action" type="StringName" />
-			<argument index="2" name="exact_match" type="bool" default="false" />
+			<param index="0" name="event" type="InputEvent" />
+			<param index="1" name="action" type="StringName" />
+			<param index="2" name="exact_match" type="bool" default="false" />
 			<description>
 				Returns [code]true[/code] if the given event is part of an existing action. This method ignores keyboard modifiers if the given [InputEvent] is not pressed (for proper release detection). See [method action_has_event] if you don't want this behavior.
-				If [code]exact_match[/code] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
+				If [param exact_match] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
 			</description>
 		</method>
 		<method name="get_actions">
@@ -98,7 +98,7 @@
 		</method>
 		<method name="has_action" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="action" type="StringName" />
+			<param index="0" name="action" type="StringName" />
 			<description>
 				Returns [code]true[/code] if the [InputMap] has a registered action with the given name.
 			</description>
diff --git a/doc/classes/InstancePlaceholder.xml b/doc/classes/InstancePlaceholder.xml
index d22028d478..c62d786d8f 100644
--- a/doc/classes/InstancePlaceholder.xml
+++ b/doc/classes/InstancePlaceholder.xml
@@ -12,10 +12,11 @@
 	<methods>
 		<method name="create_instance">
 			<return type="Node" />
-			<argument index="0" name="replace" type="bool" default="false" />
-			<argument index="1" name="custom_scene" type="PackedScene" default="null" />
+			<param index="0" name="replace" type="bool" default="false" />
+			<param index="1" name="custom_scene" type="PackedScene" default="null" />
 			<description>
-				Not thread-safe. Use [method Object.call_deferred] if calling from a thread.
+				Call this method to actually load in the node. The created node will be placed as a sibling [i]above[/i] the [InstancePlaceholder] in the scene tree. The [Node]'s reference is also returned for convenience.
+				[b]Note:[/b] [method create_instance] is not thread-safe. Use [method Object.call_deferred] if calling from a thread.
 			</description>
 		</method>
 		<method name="get_instance_path" qualifiers="const">
@@ -26,8 +27,10 @@
 		</method>
 		<method name="get_stored_values">
 			<return type="Dictionary" />
-			<argument index="0" name="with_order" type="bool" default="false" />
+			<param index="0" name="with_order" type="bool" default="false" />
 			<description>
+				Returns the list of properties that will be applied to the node when [method create_instance] is called.
+				If [param with_order] is [code]true[/code], a key named [code].order[/code] (note the leading period) is added to the dictionary. This [code].order[/code] key is an [Array] of [String] property names specifying the order in which properties will be applied (with index 0 being the first).
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/ItemList.xml b/doc/classes/ItemList.xml
index 15c97b0838..75a0e1cef7 100644
--- a/doc/classes/ItemList.xml
+++ b/doc/classes/ItemList.xml
@@ -15,20 +15,20 @@
 	<methods>
 		<method name="add_icon_item">
 			<return type="int" />
-			<argument index="0" name="icon" type="Texture2D" />
-			<argument index="1" name="selectable" type="bool" default="true" />
+			<param index="0" name="icon" type="Texture2D" />
+			<param index="1" name="selectable" type="bool" default="true" />
 			<description>
 				Adds an item to the item list with no text, only an icon. Returns the index of an added item.
 			</description>
 		</method>
 		<method name="add_item">
 			<return type="int" />
-			<argument index="0" name="text" type="String" />
-			<argument index="1" name="icon" type="Texture2D" default="null" />
-			<argument index="2" name="selectable" type="bool" default="true" />
+			<param index="0" name="text" type="String" />
+			<param index="1" name="icon" type="Texture2D" default="null" />
+			<param index="2" name="selectable" type="bool" default="true" />
 			<description>
 				Adds an item to the item list with specified text. Returns the index of an added item.
-				Specify an [code]icon[/code], or use [code]null[/code] as the [code]icon[/code] for a list item with no icon.
+				Specify an [param icon], or use [code]null[/code] as the [param icon] for a list item with no icon.
 				If selectable is [code]true[/code], the list item will be selectable.
 			</description>
 		</method>
@@ -40,7 +40,7 @@
 		</method>
 		<method name="deselect">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Ensures the item associated with the specified index is not selected.
 			</description>
@@ -59,79 +59,79 @@
 		</method>
 		<method name="get_item_at_position" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="position" type="Vector2" />
-			<argument index="1" name="exact" type="bool" default="false" />
+			<param index="0" name="position" type="Vector2" />
+			<param index="1" name="exact" type="bool" default="false" />
 			<description>
-				Returns the item index at the given [code]position[/code].
-				When there is no item at that point, -1 will be returned if [code]exact[/code] is [code]true[/code], and the closest item index will be returned otherwise.
+				Returns the item index at the given [param position].
+				When there is no item at that point, -1 will be returned if [param exact] is [code]true[/code], and the closest item index will be returned otherwise.
 			</description>
 		</method>
 		<method name="get_item_custom_bg_color" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the custom background color of the item specified by [code]idx[/code] index.
+				Returns the custom background color of the item specified by [param idx] index.
 			</description>
 		</method>
 		<method name="get_item_custom_fg_color" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the custom foreground color of the item specified by [code]idx[/code] index.
+				Returns the custom foreground color of the item specified by [param idx] index.
 			</description>
 		</method>
 		<method name="get_item_icon" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns the icon associated with the specified index.
 			</description>
 		</method>
 		<method name="get_item_icon_modulate" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns a [Color] modulating item's icon at the specified index.
 			</description>
 		</method>
 		<method name="get_item_icon_region" qualifiers="const">
 			<return type="Rect2" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns the region of item's icon used. The whole icon will be used if the region has no area.
 			</description>
 		</method>
 		<method name="get_item_language" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns item's text language code.
 			</description>
 		</method>
 		<method name="get_item_metadata" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns the metadata value of the specified index.
 			</description>
 		</method>
 		<method name="get_item_text" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns the text associated with the specified index.
 			</description>
 		</method>
 		<method name="get_item_text_direction" qualifiers="const">
 			<return type="int" enum="Control.TextDirection" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns item's text base writing direction.
 			</description>
 		</method>
 		<method name="get_item_tooltip" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns the tooltip hint associated with the specified index.
 			</description>
@@ -157,58 +157,58 @@
 		</method>
 		<method name="is_item_disabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns [code]true[/code] if the item at the specified index is disabled.
 			</description>
 		</method>
 		<method name="is_item_icon_transposed" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns [code]true[/code] if the item icon will be drawn transposed, i.e. the X and Y axes are swapped.
 			</description>
 		</method>
 		<method name="is_item_selectable" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns [code]true[/code] if the item at the specified index is selectable.
 			</description>
 		</method>
 		<method name="is_item_tooltip_enabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns [code]true[/code] if the tooltip is enabled for specified item index.
 			</description>
 		</method>
 		<method name="is_selected" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns [code]true[/code] if the item at the specified index is currently selected.
 			</description>
 		</method>
 		<method name="move_item">
 			<return type="void" />
-			<argument index="0" name="from_idx" type="int" />
-			<argument index="1" name="to_idx" type="int" />
+			<param index="0" name="from_idx" type="int" />
+			<param index="1" name="to_idx" type="int" />
 			<description>
-				Moves item from index [code]from_idx[/code] to [code]to_idx[/code].
+				Moves item from index [param from_idx] to [param to_idx].
 			</description>
 		</method>
 		<method name="remove_item">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Removes the item specified by [code]idx[/code] index from the list.
+				Removes the item specified by [param idx] index from the list.
 			</description>
 		</method>
 		<method name="select">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="single" type="bool" default="true" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="single" type="bool" default="true" />
 			<description>
 				Select the item at the specified index.
 				[b]Note:[/b] This method does not trigger the item selection signal.
@@ -216,24 +216,24 @@
 		</method>
 		<method name="set_item_custom_bg_color">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="custom_bg_color" type="Color" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="custom_bg_color" type="Color" />
 			<description>
-				Sets the background color of the item specified by [code]idx[/code] index to the specified [Color].
+				Sets the background color of the item specified by [param idx] index to the specified [Color].
 			</description>
 		</method>
 		<method name="set_item_custom_fg_color">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="custom_fg_color" type="Color" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="custom_fg_color" type="Color" />
 			<description>
-				Sets the foreground color of the item specified by [code]idx[/code] index to the specified [Color].
+				Sets the foreground color of the item specified by [param idx] index to the specified [Color].
 			</description>
 		</method>
 		<method name="set_item_disabled">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="disabled" type="bool" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="disabled" type="bool" />
 			<description>
 				Disables (or enables) the item at the specified index.
 				Disabled items cannot be selected and do not trigger activation signals (when double-clicking or pressing [kbd]Enter[/kbd]).
@@ -241,88 +241,88 @@
 		</method>
 		<method name="set_item_icon">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="icon" type="Texture2D" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="icon" type="Texture2D" />
 			<description>
 				Sets (or replaces) the icon's [Texture2D] associated with the specified index.
 			</description>
 		</method>
 		<method name="set_item_icon_modulate">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="modulate" type="Color" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="modulate" type="Color" />
 			<description>
 				Sets a modulating [Color] of the item associated with the specified index.
 			</description>
 		</method>
 		<method name="set_item_icon_region">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="rect" type="Rect2" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="rect" type="Rect2" />
 			<description>
 				Sets the region of item's icon used. The whole icon will be used if the region has no area.
 			</description>
 		</method>
 		<method name="set_item_icon_transposed">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="transposed" type="bool" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="transposed" type="bool" />
 			<description>
 				Sets whether the item icon will be drawn transposed.
 			</description>
 		</method>
 		<method name="set_item_language">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="language" type="String" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="language" type="String" />
 			<description>
 				Sets language code of item's text used for line-breaking and text shaping algorithms, if left empty current locale is used instead.
 			</description>
 		</method>
 		<method name="set_item_metadata">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="metadata" type="Variant" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="metadata" type="Variant" />
 			<description>
 				Sets a value (of any type) to be stored with the item associated with the specified index.
 			</description>
 		</method>
 		<method name="set_item_selectable">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="selectable" type="bool" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="selectable" type="bool" />
 			<description>
 				Allows or disallows selection of the item associated with the specified index.
 			</description>
 		</method>
 		<method name="set_item_text">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="text" type="String" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="text" type="String" />
 			<description>
 				Sets text of the item associated with the specified index.
 			</description>
 		</method>
 		<method name="set_item_text_direction">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="direction" type="int" enum="Control.TextDirection" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="direction" type="int" enum="Control.TextDirection" />
 			<description>
 				Sets item's text base writing direction.
 			</description>
 		</method>
 		<method name="set_item_tooltip">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="tooltip" type="String" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="tooltip" type="String" />
 			<description>
 				Sets the tooltip hint for the item associated with the specified index.
 			</description>
 		</method>
 		<method name="set_item_tooltip_enabled">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				Sets whether the tooltip hint is enabled for specified item index.
 			</description>
@@ -385,37 +385,37 @@
 	</members>
 	<signals>
 		<signal name="empty_clicked">
-			<argument index="0" name="at_position" type="Vector2" />
-			<argument index="1" name="mouse_button_index" type="int" />
+			<param index="0" name="at_position" type="Vector2" />
+			<param index="1" name="mouse_button_index" type="int" />
 			<description>
 				Triggered when any mouse click is issued within the rect of the list but on empty space.
 			</description>
 		</signal>
 		<signal name="item_activated">
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Triggered when specified list item is activated via double-clicking or by pressing [kbd]Enter[/kbd].
 			</description>
 		</signal>
 		<signal name="item_clicked">
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="at_position" type="Vector2" />
-			<argument index="2" name="mouse_button_index" type="int" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="at_position" type="Vector2" />
+			<param index="2" name="mouse_button_index" type="int" />
 			<description>
 				Triggered when specified list item has been clicked with any mouse button.
 				The click position is also provided to allow appropriate popup of context menus at the correct location.
 			</description>
 		</signal>
 		<signal name="item_selected">
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Triggered when specified item has been selected.
 				[member allow_reselect] must be enabled to reselect an item.
 			</description>
 		</signal>
 		<signal name="multi_selected">
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="selected" type="bool" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="selected" type="bool" />
 			<description>
 				Triggered when a multiple selection is altered on a list allowing multiple selection.
 			</description>
@@ -445,7 +445,7 @@
 		<theme_item name="font_selected_color" data_type="color" type="Color" default="Color(1, 1, 1, 1)">
 			Text [Color] used when the item is selected.
 		</theme_item>
-		<theme_item name="guide_color" data_type="color" type="Color" default="Color(0, 0, 0, 0.1)">
+		<theme_item name="guide_color" data_type="color" type="Color" default="Color(0.7, 0.7, 0.7, 0.25)">
 			[Color] of the guideline. The guideline is a line drawn between each row of items.
 		</theme_item>
 		<theme_item name="h_separation" data_type="constant" type="int" default="4">
diff --git a/doc/classes/JSON.xml b/doc/classes/JSON.xml
index 9650701c49..49ebb55a52 100644
--- a/doc/classes/JSON.xml
+++ b/doc/classes/JSON.xml
@@ -50,23 +50,23 @@
 		</method>
 		<method name="parse">
 			<return type="int" enum="Error" />
-			<argument index="0" name="json_string" type="String" />
+			<param index="0" name="json_string" type="String" />
 			<description>
-				Attempts to parse the [code]json_string[/code] provided.
+				Attempts to parse the [param json_string] provided.
 				Returns an [enum Error]. If the parse was successful, it returns [code]OK[/code] and the result can be retrieved using [method get_data]. If unsuccessful, use [method get_error_line] and [method get_error_message] for identifying the source of the failure.
 			</description>
 		</method>
 		<method name="stringify">
 			<return type="String" />
-			<argument index="0" name="data" type="Variant" />
-			<argument index="1" name="indent" type="String" default="&quot;&quot;" />
-			<argument index="2" name="sort_keys" type="bool" default="true" />
-			<argument index="3" name="full_precision" type="bool" default="false" />
+			<param index="0" name="data" type="Variant" />
+			<param index="1" name="indent" type="String" default="&quot;&quot;" />
+			<param index="2" name="sort_keys" type="bool" default="true" />
+			<param index="3" name="full_precision" type="bool" default="false" />
 			<description>
 				Converts a [Variant] var to JSON text and returns the result. Useful for serializing data to store or send over the network.
 				[b]Note:[/b] The JSON specification does not define integer or float types, but only a [i]number[/i] type. Therefore, converting a Variant to JSON text will convert all numerical values to [float] types.
-				[b]Note:[/b] If [code]full_precision[/code] is true, when stringifying floats, the unreliable digits are stringified in addition to the reliable digits to guarantee exact decoding.
-				The [code]indent[/code] parameter controls if and how something is indented, the string used for this parameter will be used where there should be an indent in the output, even spaces like [code]"   "[/code] will work. [code]\t[/code] and [code]\n[/code] can also be used for a tab indent, or to make a newline for each indent respectively.
+				[b]Note:[/b] If [param full_precision] is [code]true[/code], when stringifying floats, the unreliable digits are stringified in addition to the reliable digits to guarantee exact decoding.
+				The [param indent] parameter controls if and how something is indented, the string used for this parameter will be used where there should be an indent in the output, even spaces like [code]"   "[/code] will work. [code]\t[/code] and [code]\n[/code] can also be used for a tab indent, or to make a newline for each indent respectively.
 				[b]Example output:[/b]
 				[codeblock]
 				## JSON.stringify(my_dictionary)
diff --git a/doc/classes/JSONRPC.xml b/doc/classes/JSONRPC.xml
index cfe39d38a7..8af4ed1f26 100644
--- a/doc/classes/JSONRPC.xml
+++ b/doc/classes/JSONRPC.xml
@@ -11,68 +11,68 @@
 	<methods>
 		<method name="make_notification">
 			<return type="Dictionary" />
-			<argument index="0" name="method" type="String" />
-			<argument index="1" name="params" type="Variant" />
+			<param index="0" name="method" type="String" />
+			<param index="1" name="params" type="Variant" />
 			<description>
 				Returns a dictionary in the form of a JSON-RPC notification. Notifications are one-shot messages which do not expect a response.
-				- [code]method[/code]: Name of the method being called.
-				- [code]params[/code]: An array or dictionary of parameters being passed to the method.
+				- [param method]: Name of the method being called.
+				- [param params]: An array or dictionary of parameters being passed to the method.
 			</description>
 		</method>
 		<method name="make_request">
 			<return type="Dictionary" />
-			<argument index="0" name="method" type="String" />
-			<argument index="1" name="params" type="Variant" />
-			<argument index="2" name="id" type="Variant" />
+			<param index="0" name="method" type="String" />
+			<param index="1" name="params" type="Variant" />
+			<param index="2" name="id" type="Variant" />
 			<description>
 				Returns a dictionary in the form of a JSON-RPC request. Requests are sent to a server with the expectation of a response. The ID field is used for the server to specify which exact request it is responding to.
-				- [code]method[/code]: Name of the method being called.
-				- [code]params[/code]: An array or dictionary of parameters being passed to the method.
-				- [code]id[/code]: Uniquely identifies this request. The server is expected to send a response with the same ID.
+				- [param method]: Name of the method being called.
+				- [param params]: An array or dictionary of parameters being passed to the method.
+				- [param id]: Uniquely identifies this request. The server is expected to send a response with the same ID.
 			</description>
 		</method>
 		<method name="make_response">
 			<return type="Dictionary" />
-			<argument index="0" name="result" type="Variant" />
-			<argument index="1" name="id" type="Variant" />
+			<param index="0" name="result" type="Variant" />
+			<param index="1" name="id" type="Variant" />
 			<description>
 				When a server has received and processed a request, it is expected to send a response. If you did not want a response then you need to have sent a Notification instead.
-				- [code]result[/code]: The return value of the function which was called.
-				- [code]id[/code]: The ID of the request this response is targeted to.
+				- [param result]: The return value of the function which was called.
+				- [param id]: The ID of the request this response is targeted to.
 			</description>
 		</method>
 		<method name="make_response_error" qualifiers="const">
 			<return type="Dictionary" />
-			<argument index="0" name="code" type="int" />
-			<argument index="1" name="message" type="String" />
-			<argument index="2" name="id" type="Variant" default="null" />
+			<param index="0" name="code" type="int" />
+			<param index="1" name="message" type="String" />
+			<param index="2" name="id" type="Variant" default="null" />
 			<description>
 				Creates a response which indicates a previous reply has failed in some way.
-				- [code]code[/code]: The error code corresponding to what kind of error this is. See the [enum ErrorCode] constants.
-				- [code]message[/code]: A custom message about this error.
-				- [code]id[/code]: The request this error is a response to.
+				- [param code]: The error code corresponding to what kind of error this is. See the [enum ErrorCode] constants.
+				- [param message]: A custom message about this error.
+				- [param id]: The request this error is a response to.
 			</description>
 		</method>
 		<method name="process_action">
 			<return type="Variant" />
-			<argument index="0" name="action" type="Variant" />
-			<argument index="1" name="recurse" type="bool" default="false" />
+			<param index="0" name="action" type="Variant" />
+			<param index="1" name="recurse" type="bool" default="false" />
 			<description>
 				Given a Dictionary which takes the form of a JSON-RPC request: unpack the request and run it. Methods are resolved by looking at the field called "method" and looking for an equivalently named function in the JSONRPC object. If one is found that method is called.
 				To add new supported methods extend the JSONRPC class and call [method process_action] on your subclass.
-				[code]action[/code]: The action to be run, as a Dictionary in the form of a JSON-RPC request or notification.
+				[param action]: The action to be run, as a Dictionary in the form of a JSON-RPC request or notification.
 			</description>
 		</method>
 		<method name="process_string">
 			<return type="String" />
-			<argument index="0" name="action" type="String" />
+			<param index="0" name="action" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="set_scope">
 			<return type="void" />
-			<argument index="0" name="scope" type="String" />
-			<argument index="1" name="target" type="Object" />
+			<param index="0" name="scope" type="String" />
+			<param index="1" name="target" type="Object" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/JavaClassWrapper.xml b/doc/classes/JavaClassWrapper.xml
index fdfac2748b..d44a63938c 100644
--- a/doc/classes/JavaClassWrapper.xml
+++ b/doc/classes/JavaClassWrapper.xml
@@ -9,7 +9,7 @@
 	<methods>
 		<method name="wrap">
 			<return type="JavaClass" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/JavaScript.xml b/doc/classes/JavaScript.xml
index 864028f3a6..21eb80155e 100644
--- a/doc/classes/JavaScript.xml
+++ b/doc/classes/JavaScript.xml
@@ -13,44 +13,44 @@
 	<methods>
 		<method name="create_callback">
 			<return type="JavaScriptObject" />
-			<argument index="0" name="callable" type="Callable" />
+			<param index="0" name="callable" type="Callable" />
 			<description>
 				Creates a reference to a [Callable] that can be used as a callback by JavaScript. The reference must be kept until the callback happens, or it won't be called at all. See [JavaScriptObject] for usage.
 			</description>
 		</method>
 		<method name="create_object" qualifiers="vararg">
 			<return type="Variant" />
-			<argument index="0" name="object" type="String" />
+			<param index="0" name="object" type="String" />
 			<description>
-				Creates a new JavaScript object using the [code]new[/code] constructor. The [code]object[/code] must a valid property of the JavaScript [code]window[/code]. See [JavaScriptObject] for usage.
+				Creates a new JavaScript object using the [code]new[/code] constructor. The [param object] must a valid property of the JavaScript [code]window[/code]. See [JavaScriptObject] for usage.
 			</description>
 		</method>
 		<method name="download_buffer">
 			<return type="void" />
-			<argument index="0" name="buffer" type="PackedByteArray" />
-			<argument index="1" name="name" type="String" />
-			<argument index="2" name="mime" type="String" default="&quot;application/octet-stream&quot;" />
+			<param index="0" name="buffer" type="PackedByteArray" />
+			<param index="1" name="name" type="String" />
+			<param index="2" name="mime" type="String" default="&quot;application/octet-stream&quot;" />
 			<description>
-				Prompts the user to download a file containing the specified [code]buffer[/code]. The file will have the given [code]name[/code] and [code]mime[/code] type.
-				[b]Note:[/b] The browser may override the [url=https://en.wikipedia.org/wiki/Media_type]MIME type[/url] provided based on the file [code]name[/code]'s extension.
+				Prompts the user to download a file containing the specified [param buffer]. The file will have the given [param name] and [param mime] type.
+				[b]Note:[/b] The browser may override the [url=https://en.wikipedia.org/wiki/Media_type]MIME type[/url] provided based on the file [param name]'s extension.
 				[b]Note:[/b] Browsers might block the download if [method download_buffer] is not being called from a user interaction (e.g. button click).
 				[b]Note:[/b] Browsers might ask the user for permission or block the download if multiple download requests are made in a quick succession.
 			</description>
 		</method>
 		<method name="eval">
 			<return type="Variant" />
-			<argument index="0" name="code" type="String" />
-			<argument index="1" name="use_global_execution_context" type="bool" default="false" />
+			<param index="0" name="code" type="String" />
+			<param index="1" name="use_global_execution_context" type="bool" default="false" />
 			<description>
-				Execute the string [code]code[/code] as JavaScript code within the browser window. This is a call to the actual global JavaScript function [code]eval()[/code].
-				If [code]use_global_execution_context[/code] is [code]true[/code], the code will be evaluated in the global execution context. Otherwise, it is evaluated in the execution context of a function within the engine's runtime environment.
+				Execute the string [param code] as JavaScript code within the browser window. This is a call to the actual global JavaScript function [code]eval()[/code].
+				If [param use_global_execution_context] is [code]true[/code], the code will be evaluated in the global execution context. Otherwise, it is evaluated in the execution context of a function within the engine's runtime environment.
 			</description>
 		</method>
 		<method name="get_interface">
 			<return type="JavaScriptObject" />
-			<argument index="0" name="interface" type="String" />
+			<param index="0" name="interface" type="String" />
 			<description>
-				Returns an interface to a JavaScript object that can be used by scripts. The [code]interface[/code] must be a valid property of the JavaScript [code]window[/code]. The callback must accept a single [Array] argument, which will contain the JavaScript [code]arguments[/code]. See [JavaScriptObject] for usage.
+				Returns an interface to a JavaScript object that can be used by scripts. The [param interface] must be a valid property of the JavaScript [code]window[/code]. The callback must accept a single [Array] argument, which will contain the JavaScript [code]arguments[/code]. See [JavaScriptObject] for usage.
 			</description>
 		</method>
 		<method name="pwa_needs_update" qualifiers="const">
diff --git a/doc/classes/KinematicCollision2D.xml b/doc/classes/KinematicCollision2D.xml
index 1f3f0dbb6d..e991856de5 100644
--- a/doc/classes/KinematicCollision2D.xml
+++ b/doc/classes/KinematicCollision2D.xml
@@ -12,9 +12,9 @@
 	<methods>
 		<method name="get_angle" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="up_direction" type="Vector2" default="Vector2(0, -1)" />
+			<param index="0" name="up_direction" type="Vector2" default="Vector2(0, -1)" />
 			<description>
-				Returns the collision angle according to [code]up_direction[/code], which is [code]Vector2.UP[/code] by default. This value is always positive.
+				Returns the collision angle according to [param up_direction], which is [constant Vector2.UP] by default. This value is always positive.
 			</description>
 		</method>
 		<method name="get_collider" qualifiers="const">
@@ -53,6 +53,12 @@
 				Returns the colliding body's velocity.
 			</description>
 		</method>
+		<method name="get_depth" qualifiers="const">
+			<return type="float" />
+			<description>
+				Returns the colliding body's length of overlap along the collision normal.
+			</description>
+		</method>
 		<method name="get_local_shape" qualifiers="const">
 			<return type="Object" />
 			<description>
diff --git a/doc/classes/KinematicCollision3D.xml b/doc/classes/KinematicCollision3D.xml
index 6327d48d38..6b0a806e5c 100644
--- a/doc/classes/KinematicCollision3D.xml
+++ b/doc/classes/KinematicCollision3D.xml
@@ -12,50 +12,50 @@
 	<methods>
 		<method name="get_angle" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="collision_index" type="int" default="0" />
-			<argument index="1" name="up_direction" type="Vector3" default="Vector3(0, 1, 0)" />
+			<param index="0" name="collision_index" type="int" default="0" />
+			<param index="1" name="up_direction" type="Vector3" default="Vector3(0, 1, 0)" />
 			<description>
-				Returns the collision angle according to [code]up_direction[/code], which is [code]Vector3.UP[/code] by default. This value is always positive.
+				Returns the collision angle according to [param up_direction], which is [constant Vector3.UP] by default. This value is always positive.
 			</description>
 		</method>
 		<method name="get_collider" qualifiers="const">
 			<return type="Object" />
-			<argument index="0" name="collision_index" type="int" default="0" />
+			<param index="0" name="collision_index" type="int" default="0" />
 			<description>
 				Returns the colliding body's attached [Object] given a collision index (the deepest collision by default).
 			</description>
 		</method>
 		<method name="get_collider_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="collision_index" type="int" default="0" />
+			<param index="0" name="collision_index" type="int" default="0" />
 			<description>
 				Returns the unique instance ID of the colliding body's attached [Object] given a collision index (the deepest collision by default). See [method Object.get_instance_id].
 			</description>
 		</method>
 		<method name="get_collider_rid" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="collision_index" type="int" default="0" />
+			<param index="0" name="collision_index" type="int" default="0" />
 			<description>
 				Returns the colliding body's [RID] used by the [PhysicsServer3D] given a collision index (the deepest collision by default).
 			</description>
 		</method>
 		<method name="get_collider_shape" qualifiers="const">
 			<return type="Object" />
-			<argument index="0" name="collision_index" type="int" default="0" />
+			<param index="0" name="collision_index" type="int" default="0" />
 			<description>
 				Returns the colliding body's shape given a collision index (the deepest collision by default).
 			</description>
 		</method>
 		<method name="get_collider_shape_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="collision_index" type="int" default="0" />
+			<param index="0" name="collision_index" type="int" default="0" />
 			<description>
 				Returns the colliding body's shape index given a collision index (the deepest collision by default). See [CollisionObject3D].
 			</description>
 		</method>
 		<method name="get_collider_velocity" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="collision_index" type="int" default="0" />
+			<param index="0" name="collision_index" type="int" default="0" />
 			<description>
 				Returns the colliding body's velocity given a collision index (the deepest collision by default).
 			</description>
@@ -66,23 +66,29 @@
 				Returns the number of detected collisions.
 			</description>
 		</method>
+		<method name="get_depth" qualifiers="const">
+			<return type="float" />
+			<description>
+				Returns the colliding body's length of overlap along the collision normal.
+			</description>
+		</method>
 		<method name="get_local_shape" qualifiers="const">
 			<return type="Object" />
-			<argument index="0" name="collision_index" type="int" default="0" />
+			<param index="0" name="collision_index" type="int" default="0" />
 			<description>
 				Returns the moving object's colliding shape given a collision index (the deepest collision by default).
 			</description>
 		</method>
 		<method name="get_normal" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="collision_index" type="int" default="0" />
+			<param index="0" name="collision_index" type="int" default="0" />
 			<description>
 				Returns the colliding body's shape's normal at the point of collision given a collision index (the deepest collision by default).
 			</description>
 		</method>
 		<method name="get_position" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="collision_index" type="int" default="0" />
+			<param index="0" name="collision_index" type="int" default="0" />
 			<description>
 				Returns the point of collision in global coordinates given a collision index (the deepest collision by default).
 			</description>
diff --git a/doc/classes/Label.xml b/doc/classes/Label.xml
index 1ebf770f7e..239eea099b 100644
--- a/doc/classes/Label.xml
+++ b/doc/classes/Label.xml
@@ -14,16 +14,16 @@
 		<method name="get_line_count" qualifiers="const">
 			<return type="int" />
 			<description>
-				Returns the amount of lines of text the Label has.
+				Returns the number of lines of text the Label has.
 			</description>
 		</method>
 		<method name="get_line_height" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="line" type="int" default="-1" />
+			<param index="0" name="line" type="int" default="-1" />
 			<description>
-				Returns the height of the line [code]line[/code].
-				If [code]line[/code] is set to [code]-1[/code], returns the biggest line height.
-				If there're no lines returns font size in pixels.
+				Returns the height of the line [param line].
+				If [param line] is set to [code]-1[/code], returns the biggest line height.
+				If there are no lines, returns font size in pixels.
 			</description>
 		</method>
 		<method name="get_total_character_count" qualifiers="const">
@@ -62,7 +62,7 @@
 		</member>
 		<member name="mouse_filter" type="int" setter="set_mouse_filter" getter="get_mouse_filter" overrides="Control" enum="Control.MouseFilter" default="2" />
 		<member name="percent_visible" type="float" setter="set_percent_visible" getter="get_percent_visible" default="1.0">
-			Limits the amount of visible characters. If you set [code]percent_visible[/code] to 0.5, only up to half of the text's characters will display on screen. Useful to animate the text in a dialog box.
+			Limits the number of visible characters. If you set [code]percent_visible[/code] to 0.5, only up to half of the text's characters will display on screen. Useful to animate the text in a dialog box.
 			[b]Note:[/b] Setting this property updates [member visible_characters] based on current [method get_total_character_count].
 		</member>
 		<member name="size_flags_vertical" type="int" setter="set_v_size_flags" getter="get_v_size_flags" overrides="Control" default="4" />
diff --git a/doc/classes/Label3D.xml b/doc/classes/Label3D.xml
index 5ba0a2d79a..b741dc6e64 100644
--- a/doc/classes/Label3D.xml
+++ b/doc/classes/Label3D.xml
@@ -17,15 +17,15 @@
 		</method>
 		<method name="get_draw_flag" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="flag" type="int" enum="Label3D.DrawFlags" />
+			<param index="0" name="flag" type="int" enum="Label3D.DrawFlags" />
 			<description>
 				Returns the value of the specified flag.
 			</description>
 		</method>
 		<method name="set_draw_flag">
 			<return type="void" />
-			<argument index="0" name="flag" type="int" enum="Label3D.DrawFlags" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="flag" type="int" enum="Label3D.DrawFlags" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				If [code]true[/code], the specified flag will be enabled. See [enum Label3D.DrawFlags] for a list of flags.
 			</description>
@@ -53,8 +53,9 @@
 		<member name="font" type="Font" setter="set_font" getter="get_font">
 			Font configuration used to display text.
 		</member>
-		<member name="font_size" type="int" setter="set_font_size" getter="get_font_size" default="16">
-			Font size of the [Label3D]'s text.
+		<member name="font_size" type="int" setter="set_font_size" getter="get_font_size" default="32">
+			Font size of the [Label3D]'s text. To make the font look more detailed when up close, increase [member font_size] while decreasing [member pixel_size] at the same time.
+			Higher font sizes require more time to render new characters, which can cause stuttering during gameplay.
 		</member>
 		<member name="horizontal_alignment" type="int" setter="set_horizontal_alignment" getter="get_horizontal_alignment" enum="HorizontalAlignment" default="1">
 			Controls the text's horizontal alignment. Supports left, center, right, and fill, or justify. Set it to one of the [enum HorizontalAlignment] constants.
@@ -82,11 +83,11 @@
 			[b]Note:[/b] This only applies if [member alpha_cut] is set to [constant ALPHA_CUT_DISABLED] (default value).
 			[b]Note:[/b] This only applies to sorting of transparent objects. This will not impact how transparent objects are sorted relative to opaque objects. This is because opaque objects are not sorted, while transparent objects are sorted from back to front (subject to priority).
 		</member>
-		<member name="outline_size" type="int" setter="set_outline_size" getter="get_outline_size" default="0">
+		<member name="outline_size" type="int" setter="set_outline_size" getter="get_outline_size" default="12">
 			Text outline size.
 		</member>
-		<member name="pixel_size" type="float" setter="set_pixel_size" getter="get_pixel_size" default="0.01">
-			The size of one pixel's width on the label to scale it in 3D.
+		<member name="pixel_size" type="float" setter="set_pixel_size" getter="get_pixel_size" default="0.005">
+			The size of one pixel's width on the label to scale it in 3D. To make the font look more detailed when up close, increase [member font_size] while decreasing [member pixel_size] at the same time.
 		</member>
 		<member name="render_priority" type="int" setter="set_render_priority" getter="get_render_priority" default="0">
 			Sets the render priority for the text. Higher priority objects will be sorted in front of lower priority objects.
@@ -138,7 +139,7 @@
 			Represents the size of the [enum DrawFlags] enum.
 		</constant>
 		<constant name="ALPHA_CUT_DISABLED" value="0" enum="AlphaCutMode">
-			This mode performs standard alpha blending. It can display translucent areas, but transparency sorting issues may be visible when multiple transparent materials are overlapping.
+			This mode performs standard alpha blending. It can display translucent areas, but transparency sorting issues may be visible when multiple transparent materials are overlapping. [member GeometryInstance3D.cast_shadow] has no effect when this transparency mode is used; the [Label3D] will never cast shadows.
 		</constant>
 		<constant name="ALPHA_CUT_DISCARD" value="1" enum="AlphaCutMode">
 			This mode only allows fully transparent or fully opaque pixels. Harsh edges will be visible unless some form of screen-space antialiasing is enabled (see [member ProjectSettings.rendering/anti_aliasing/quality/screen_space_aa]). This mode is also known as [i]alpha testing[/i] or [i]1-bit transparency[/i].
diff --git a/doc/classes/Light2D.xml b/doc/classes/Light2D.xml
index 32bf6a67a9..00815758a1 100644
--- a/doc/classes/Light2D.xml
+++ b/doc/classes/Light2D.xml
@@ -18,7 +18,7 @@
 		</method>
 		<method name="set_height">
 			<return type="void" />
-			<argument index="0" name="height" type="float" />
+			<param index="0" name="height" type="float" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/Light3D.xml b/doc/classes/Light3D.xml
index 0ebd83c882..80ff83ec46 100644
--- a/doc/classes/Light3D.xml
+++ b/doc/classes/Light3D.xml
@@ -13,15 +13,15 @@
 	<methods>
 		<method name="get_param" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="param" type="int" enum="Light3D.Param" />
+			<param index="0" name="param" type="int" enum="Light3D.Param" />
 			<description>
 				Returns the value of the specified [enum Light3D.Param] parameter.
 			</description>
 		</method>
 		<method name="set_param">
 			<return type="void" />
-			<argument index="0" name="param" type="int" enum="Light3D.Param" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="param" type="int" enum="Light3D.Param" />
+			<param index="1" name="value" type="float" />
 			<description>
 				Sets the value of the specified [enum Light3D.Param] parameter.
 			</description>
@@ -37,13 +37,12 @@
 			[b]Note:[/b] Only effective for [OmniLight3D] and [SpotLight3D].
 		</member>
 		<member name="distance_fade_length" type="float" setter="set_distance_fade_length" getter="get_distance_fade_length" default="10.0">
-			Distance over which the light fades. The light's energy is progressively reduced over this distance and is completely invisible at the end.
+			Distance over which the light and its shadow fades. The light's energy and shadow's opacity is progressively reduced over this distance and is completely invisible at the end.
 			[b]Note:[/b] Only effective for [OmniLight3D] and [SpotLight3D].
 		</member>
 		<member name="distance_fade_shadow" type="float" setter="set_distance_fade_shadow" getter="get_distance_fade_shadow" default="50.0">
 			The distance from the camera at which the light's shadow cuts off (in 3D units). Set this to a value lower than [member distance_fade_begin] + [member distance_fade_length] to further improve performance, as shadow rendering is often more expensive than light rendering itself.
 			[b]Note:[/b] Only effective for [OmniLight3D] and [SpotLight3D], and only when [member shadow_enabled] is [code]true[/code].
-			[b]Note:[/b] Due to a rendering engine limitation, shadows will be disabled instantly instead of fading smoothly according to [member distance_fade_length]. This may result in visible pop-in depending on the scene topography.
 		</member>
 		<member name="editor_only" type="bool" setter="set_editor_only" getter="is_editor_only" default="false">
 			If [code]true[/code], the light only appears in the editor and will not be visible at runtime.
@@ -95,6 +94,9 @@
 		<member name="shadow_normal_bias" type="float" setter="set_param" getter="get_param" default="1.0">
 			Offsets the lookup into the shadow map by the object's normal. This can be used to reduce self-shadowing artifacts without using [member shadow_bias]. In practice, this value should be tweaked along with [member shadow_bias] to reduce artifacts as much as possible.
 		</member>
+		<member name="shadow_opacity" type="float" setter="set_param" getter="get_param" default="1.0">
+			The opacity to use when rendering the light's shadow map. Values lower than [code]1.0[/code] make the light appear through shadows. This can be used to fake global illumination at a low performance cost.
+		</member>
 		<member name="shadow_reverse_cull_face" type="bool" setter="set_shadow_reverse_cull_face" getter="get_shadow_reverse_cull_face" default="false">
 			If [code]true[/code], reverses the backface culling of the mesh. This can be useful when you have a flat mesh that has a light behind it. If you need to cast a shadow on both sides of the mesh, set the mesh to use double-sided shadows with [constant GeometryInstance3D.SHADOW_CASTING_SETTING_DOUBLE_SIDED].
 		</member>
@@ -150,15 +152,19 @@
 		<constant name="PARAM_SHADOW_PANCAKE_SIZE" value="15" enum="Param">
 			Constant for accessing [member DirectionalLight3D.directional_shadow_pancake_size].
 		</constant>
-		<constant name="PARAM_SHADOW_BLUR" value="16" enum="Param">
+		<constant name="PARAM_SHADOW_OPACITY" value="16" enum="Param">
+			Constant for accessing [member shadow_opacity].
+		</constant>
+		<constant name="PARAM_SHADOW_BLUR" value="17" enum="Param">
 			Constant for accessing [member shadow_blur].
 		</constant>
-		<constant name="PARAM_SHADOW_VOLUMETRIC_FOG_FADE" value="17" enum="Param">
+		<constant name="PARAM_SHADOW_VOLUMETRIC_FOG_FADE" value="18" enum="Param">
+			Constant for accessing [member shadow_fog_fade].
 		</constant>
-		<constant name="PARAM_TRANSMITTANCE_BIAS" value="18" enum="Param">
+		<constant name="PARAM_TRANSMITTANCE_BIAS" value="19" enum="Param">
 			Constant for accessing [member shadow_transmittance_bias].
 		</constant>
-		<constant name="PARAM_MAX" value="19" enum="Param">
+		<constant name="PARAM_MAX" value="20" enum="Param">
 			Represents the size of the [enum Param] enum.
 		</constant>
 		<constant name="BAKE_DISABLED" value="0" enum="BakeMode">
diff --git a/doc/classes/LightmapGIData.xml b/doc/classes/LightmapGIData.xml
index 13f44150d7..d24b2c6871 100644
--- a/doc/classes/LightmapGIData.xml
+++ b/doc/classes/LightmapGIData.xml
@@ -11,10 +11,10 @@
 	<methods>
 		<method name="add_user">
 			<return type="void" />
-			<argument index="0" name="path" type="NodePath" />
-			<argument index="1" name="uv_scale" type="Rect2" />
-			<argument index="2" name="slice_index" type="int" />
-			<argument index="3" name="sub_instance" type="int" />
+			<param index="0" name="path" type="NodePath" />
+			<param index="1" name="uv_scale" type="Rect2" />
+			<param index="2" name="slice_index" type="int" />
+			<param index="3" name="sub_instance" type="int" />
 			<description>
 				Adds an object that is considered baked within this [LightmapGIData].
 			</description>
@@ -33,9 +33,9 @@
 		</method>
 		<method name="get_user_path" qualifiers="const">
 			<return type="NodePath" />
-			<argument index="0" name="user_idx" type="int" />
+			<param index="0" name="user_idx" type="int" />
 			<description>
-				Returns the [NodePath] of the baked object at index [code]user_idx[/code].
+				Returns the [NodePath] of the baked object at index [param user_idx].
 			</description>
 		</method>
 		<method name="is_using_spherical_harmonics" qualifiers="const">
@@ -46,9 +46,9 @@
 		</method>
 		<method name="set_uses_spherical_harmonics">
 			<return type="void" />
-			<argument index="0" name="uses_spherical_harmonics" type="bool" />
+			<param index="0" name="uses_spherical_harmonics" type="bool" />
 			<description>
-				If [code]uses_spherical_harmonics[/code] is [code]true[/code], tells the engine to treat the lightmap data as if it was baked with directional information.
+				If [param uses_spherical_harmonics] is [code]true[/code], tells the engine to treat the lightmap data as if it was baked with directional information.
 				[b]Note:[/b] Changing this value on already baked lightmaps will not cause them to be baked again. This means the material appearance will look incorrect until lightmaps are baked again, in which case the value set here is discarded as the entire [LightmapGIData] resource is replaced by the lightmapper.
 			</description>
 		</method>
diff --git a/doc/classes/Line2D.xml b/doc/classes/Line2D.xml
index e2cc43bb75..4547c3589f 100644
--- a/doc/classes/Line2D.xml
+++ b/doc/classes/Line2D.xml
@@ -13,11 +13,11 @@
 	<methods>
 		<method name="add_point">
 			<return type="void" />
-			<argument index="0" name="position" type="Vector2" />
-			<argument index="1" name="at_position" type="int" default="-1" />
+			<param index="0" name="position" type="Vector2" />
+			<param index="1" name="index" type="int" default="-1" />
 			<description>
-				Adds a point at the [code]position[/code]. Appends the point at the end of the line.
-				If [code]at_position[/code] is given, the point is inserted before the point number [code]at_position[/code], moving that point (and every point after) after the inserted point. If [code]at_position[/code] is not given, or is an illegal value ([code]at_position &lt; 0[/code] or [code]at_position &gt;= [method get_point_count][/code]), the point will be appended at the end of the point list.
+				Adds a point with the specified [param position] relative to the line's own position. Appends the new point at the end of the point list.
+				If [param index] is given, the new point is inserted before the existing point identified by index [param index]. Every existing point starting from [param index] is shifted further down the list of points. The index must be greater than or equal to [code]0[/code] and must not exceed the number of existing points in the line. See [method get_point_count].
 			</description>
 		</method>
 		<method name="clear_points">
@@ -29,29 +29,29 @@
 		<method name="get_point_count" qualifiers="const">
 			<return type="int" />
 			<description>
-				Returns the Line2D's amount of points.
+				Returns the number of points in the line.
 			</description>
 		</method>
 		<method name="get_point_position" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="i" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns point [code]i[/code]'s position.
+				Returns the position of the point at index [param index].
 			</description>
 		</method>
 		<method name="remove_point">
 			<return type="void" />
-			<argument index="0" name="i" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Removes the point at index [code]i[/code] from the line.
+				Removes the point at index [param index] from the line.
 			</description>
 		</method>
 		<method name="set_point_position">
 			<return type="void" />
-			<argument index="0" name="i" type="int" />
-			<argument index="1" name="position" type="Vector2" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="position" type="Vector2" />
 			<description>
-				Overwrites the position in point [code]i[/code] with the supplied [code]position[/code].
+				Overwrites the position of the point at index [param index] with the supplied [param position].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/LineEdit.xml b/doc/classes/LineEdit.xml
index 84471bafc0..20703f680c 100644
--- a/doc/classes/LineEdit.xml
+++ b/doc/classes/LineEdit.xml
@@ -45,10 +45,10 @@
 		</method>
 		<method name="delete_text">
 			<return type="void" />
-			<argument index="0" name="from_column" type="int" />
-			<argument index="1" name="to_column" type="int" />
+			<param index="0" name="from_column" type="int" />
+			<param index="1" name="to_column" type="int" />
 			<description>
-				Deletes a section of the [member text] going from position [code]from_column[/code] to [code]to_column[/code]. Both parameters should be within the text's length.
+				Deletes a section of the [member text] going from position [param from_column] to [param to_column]. Both parameters should be within the text's length.
 			</description>
 		</method>
 		<method name="deselect">
@@ -90,9 +90,9 @@
 		</method>
 		<method name="insert_text_at_caret">
 			<return type="void" />
-			<argument index="0" name="text" type="String" />
+			<param index="0" name="text" type="String" />
 			<description>
-				Inserts [code]text[/code] at the caret. If the resulting value is longer than [member max_length], nothing happens.
+				Inserts [param text] at the caret. If the resulting value is longer than [member max_length], nothing happens.
 			</description>
 		</method>
 		<method name="is_menu_visible" qualifiers="const">
@@ -103,17 +103,17 @@
 		</method>
 		<method name="menu_option">
 			<return type="void" />
-			<argument index="0" name="option" type="int" />
+			<param index="0" name="option" type="int" />
 			<description>
 				Executes a given action as defined in the [enum MenuItems] enum.
 			</description>
 		</method>
 		<method name="select">
 			<return type="void" />
-			<argument index="0" name="from" type="int" default="0" />
-			<argument index="1" name="to" type="int" default="-1" />
+			<param index="0" name="from" type="int" default="0" />
+			<param index="1" name="to" type="int" default="-1" />
 			<description>
-				Selects characters inside [LineEdit] between [code]from[/code] and [code]to[/code]. By default, [code]from[/code] is at the beginning and [code]to[/code] at the end.
+				Selects characters inside [LineEdit] between [param from] and [param to]. By default, [param from] is at the beginning and [param to] at the end.
 				[codeblocks]
 				[gdscript]
 				text = "Welcome"
@@ -183,7 +183,7 @@
 			Language code used for line-breaking and text shaping algorithms, if left empty current locale is used instead.
 		</member>
 		<member name="max_length" type="int" setter="set_max_length" getter="get_max_length" default="0">
-			Maximum amount of characters that can be entered inside the [LineEdit]. If [code]0[/code], there is no limit.
+			Maximum number of characters that can be entered inside the [LineEdit]. If [code]0[/code], there is no limit.
 			When a limit is defined, characters that would exceed [member max_length] are truncated. This happens both for existing [member text] contents when setting the max length, or for new text inserted in the [LineEdit], including pasting. If any input text is truncated, the [signal text_change_rejected] signal is emitted with the truncated substring as parameter.
 			[b]Example:[/b]
 			[codeblocks]
@@ -221,8 +221,8 @@
 		<member name="secret" type="bool" setter="set_secret" getter="is_secret" default="false">
 			If [code]true[/code], every character is replaced with the secret character (see [member secret_character]).
 		</member>
-		<member name="secret_character" type="String" setter="set_secret_character" getter="get_secret_character" default="&quot;*&quot;">
-			The character to use to mask secret input (defaults to "*"). Only a single character can be used as the secret character.
+		<member name="secret_character" type="String" setter="set_secret_character" getter="get_secret_character" default="&quot;•&quot;">
+			The character to use to mask secret input (defaults to "•"). Only a single character can be used as the secret character.
 		</member>
 		<member name="selecting_enabled" type="bool" setter="set_selecting_enabled" getter="is_selecting_enabled" default="true">
 			If [code]false[/code], it's impossible to select the text using mouse nor keyboard.
@@ -246,22 +246,25 @@
 		<member name="virtual_keyboard_enabled" type="bool" setter="set_virtual_keyboard_enabled" getter="is_virtual_keyboard_enabled" default="true">
 			If [code]true[/code], the native virtual keyboard is shown when focused on platforms that support it.
 		</member>
+		<member name="virtual_keyboard_type" type="int" setter="set_virtual_keyboard_type" getter="get_virtual_keyboard_type" enum="LineEdit.VirtualKeyboardType" default="0">
+			Specifies the type of virtual keyboard to show.
+		</member>
 	</members>
 	<signals>
 		<signal name="text_change_rejected">
-			<argument index="0" name="rejected_substring" type="String" />
+			<param index="0" name="rejected_substring" type="String" />
 			<description>
 				Emitted when appending text that overflows the [member max_length]. The appended text is truncated to fit [member max_length], and the part that couldn't fit is passed as the [code]rejected_substring[/code] argument.
 			</description>
 		</signal>
 		<signal name="text_changed">
-			<argument index="0" name="new_text" type="String" />
+			<param index="0" name="new_text" type="String" />
 			<description>
 				Emitted when the text changes.
 			</description>
 		</signal>
 		<signal name="text_submitted">
-			<argument index="0" name="new_text" type="String" />
+			<param index="0" name="new_text" type="String" />
 			<description>
 				Emitted when the user presses [constant KEY_ENTER] on the [LineEdit].
 			</description>
@@ -356,6 +359,31 @@
 		<constant name="MENU_MAX" value="28" enum="MenuItems">
 			Represents the size of the [enum MenuItems] enum.
 		</constant>
+		<constant name="KEYBOARD_TYPE_DEFAULT" value="0" enum="VirtualKeyboardType">
+			Default text virtual keyboard.
+		</constant>
+		<constant name="KEYBOARD_TYPE_MULTILINE" value="1" enum="VirtualKeyboardType">
+			Multiline virtual keyboard.
+		</constant>
+		<constant name="KEYBOARD_TYPE_NUMBER" value="2" enum="VirtualKeyboardType">
+			Virtual number keypad, useful for PIN entry.
+		</constant>
+		<constant name="KEYBOARD_TYPE_NUMBER_DECIMAL" value="3" enum="VirtualKeyboardType">
+			Virtual number keypad, useful for entering fractional numbers.
+		</constant>
+		<constant name="KEYBOARD_TYPE_PHONE" value="4" enum="VirtualKeyboardType">
+			Virtual phone number keypad.
+		</constant>
+		<constant name="KEYBOARD_TYPE_EMAIL_ADDRESS" value="5" enum="VirtualKeyboardType">
+			Virtual keyboard with additional keys to assist with typing email addresses.
+		</constant>
+		<constant name="KEYBOARD_TYPE_PASSWORD" value="6" enum="VirtualKeyboardType">
+			Virtual keyboard for entering a password. On most platforms, this should disable autocomplete and autocapitalization.
+			[b]Note:[/b] This is not supported on HTML5. Instead, this behaves identically to [constant KEYBOARD_TYPE_DEFAULT].
+		</constant>
+		<constant name="KEYBOARD_TYPE_URL" value="7" enum="VirtualKeyboardType">
+			Virtual keyboard with additional keys to assist with typing URLs.
+		</constant>
 	</constants>
 	<theme_items>
 		<theme_item name="caret_color" data_type="color" type="Color" default="Color(0.95, 0.95, 0.95, 1)">
@@ -389,7 +417,7 @@
 			The caret's width in pixels. Greater values can be used to improve accessibility by ensuring the caret is easily visible, or to ensure consistency with a large font size.
 		</theme_item>
 		<theme_item name="minimum_character_width" data_type="constant" type="int" default="4">
-			Minimum horizontal space for the text (not counting the clear button and content margins). This value is measured in count of 'M' characters (i.e. this amount of 'M' characters can be displayed without scrolling).
+			Minimum horizontal space for the text (not counting the clear button and content margins). This value is measured in count of 'M' characters (i.e. this number of 'M' characters can be displayed without scrolling).
 		</theme_item>
 		<theme_item name="outline_size" data_type="constant" type="int" default="0">
 			The size of the text outline.
diff --git a/doc/classes/MainLoop.xml b/doc/classes/MainLoop.xml
index 2cf41b750a..674adb1772 100644
--- a/doc/classes/MainLoop.xml
+++ b/doc/classes/MainLoop.xml
@@ -74,15 +74,15 @@
 		</method>
 		<method name="_physics_process" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="delta" type="float" />
+			<param index="0" name="delta" type="float" />
 			<description>
-				Called each physics frame with the time since the last physics frame as argument ([code]delta[/code], in seconds). Equivalent to [method Node._physics_process].
+				Called each physics frame with the time since the last physics frame as argument ([param delta], in seconds). Equivalent to [method Node._physics_process].
 				If implemented, the method must return a boolean value. [code]true[/code] ends the main loop, while [code]false[/code] lets it proceed to the next frame.
 			</description>
 		</method>
 		<method name="_process" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="delta" type="float" />
+			<param index="0" name="delta" type="float" />
 			<description>
 				Called each process (idle) frame with the time since the last process frame as argument (in seconds). Equivalent to [method Node._process].
 				If implemented, the method must return a boolean value. [code]true[/code] ends the main loop, while [code]false[/code] lets it proceed to the next frame.
@@ -91,8 +91,8 @@
 	</methods>
 	<signals>
 		<signal name="on_request_permissions_result">
-			<argument index="0" name="permission" type="String" />
-			<argument index="1" name="granted" type="bool" />
+			<param index="0" name="permission" type="String" />
+			<param index="1" name="granted" type="bool" />
 			<description>
 				Emitted when a user responds to a permission request.
 			</description>
diff --git a/doc/classes/Marshalls.xml b/doc/classes/Marshalls.xml
index b66a1b9190..102e4b75ed 100644
--- a/doc/classes/Marshalls.xml
+++ b/doc/classes/Marshalls.xml
@@ -11,47 +11,47 @@
 	<methods>
 		<method name="base64_to_raw">
 			<return type="PackedByteArray" />
-			<argument index="0" name="base64_str" type="String" />
+			<param index="0" name="base64_str" type="String" />
 			<description>
-				Returns a decoded [PackedByteArray] corresponding to the Base64-encoded string [code]base64_str[/code].
+				Returns a decoded [PackedByteArray] corresponding to the Base64-encoded string [param base64_str].
 			</description>
 		</method>
 		<method name="base64_to_utf8">
 			<return type="String" />
-			<argument index="0" name="base64_str" type="String" />
+			<param index="0" name="base64_str" type="String" />
 			<description>
-				Returns a decoded string corresponding to the Base64-encoded string [code]base64_str[/code].
+				Returns a decoded string corresponding to the Base64-encoded string [param base64_str].
 			</description>
 		</method>
 		<method name="base64_to_variant">
 			<return type="Variant" />
-			<argument index="0" name="base64_str" type="String" />
-			<argument index="1" name="allow_objects" type="bool" default="false" />
+			<param index="0" name="base64_str" type="String" />
+			<param index="1" name="allow_objects" type="bool" default="false" />
 			<description>
-				Returns a decoded [Variant] corresponding to the Base64-encoded string [code]base64_str[/code]. If [code]allow_objects[/code] is [code]true[/code], decoding objects is allowed.
+				Returns a decoded [Variant] corresponding to the Base64-encoded string [param base64_str]. If [param allow_objects] is [code]true[/code], decoding objects is allowed.
 				[b]Warning:[/b] Deserialized objects can contain code which gets executed. Do not use this option if the serialized object comes from untrusted sources to avoid potential security threats such as remote code execution.
 			</description>
 		</method>
 		<method name="raw_to_base64">
 			<return type="String" />
-			<argument index="0" name="array" type="PackedByteArray" />
+			<param index="0" name="array" type="PackedByteArray" />
 			<description>
 				Returns a Base64-encoded string of a given [PackedByteArray].
 			</description>
 		</method>
 		<method name="utf8_to_base64">
 			<return type="String" />
-			<argument index="0" name="utf8_str" type="String" />
+			<param index="0" name="utf8_str" type="String" />
 			<description>
-				Returns a Base64-encoded string of the UTF-8 string [code]utf8_str[/code].
+				Returns a Base64-encoded string of the UTF-8 string [param utf8_str].
 			</description>
 		</method>
 		<method name="variant_to_base64">
 			<return type="String" />
-			<argument index="0" name="variant" type="Variant" />
-			<argument index="1" name="full_objects" type="bool" default="false" />
+			<param index="0" name="variant" type="Variant" />
+			<param index="1" name="full_objects" type="bool" default="false" />
 			<description>
-				Returns a Base64-encoded string of the [Variant] [code]variant[/code]. If [code]full_objects[/code] is [code]true[/code], encoding objects is allowed (and can potentially include code).
+				Returns a Base64-encoded string of the [Variant] [param variant]. If [param full_objects] is [code]true[/code], encoding objects is allowed (and can potentially include code).
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/MenuBar.xml b/doc/classes/MenuBar.xml
new file mode 100644
index 0000000000..3ef0572e9f
--- /dev/null
+++ b/doc/classes/MenuBar.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="MenuBar" inherits="Control" version="4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+	<brief_description>
+		A horizontal menu bar, which displays [PopupMenu]s or system global menu.
+	</brief_description>
+	<description>
+		New items can be created by adding [PopupMenu] nodes to his node.
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+		<method name="get_menu_count" qualifiers="const">
+			<return type="int" />
+			<description>
+				Returns number of menu items.
+			</description>
+		</method>
+		<method name="get_menu_popup" qualifiers="const">
+			<return type="PopupMenu" />
+			<param index="0" name="menu" type="int" />
+			<description>
+				Returns [PopupMenu] associated with menu item.
+			</description>
+		</method>
+		<method name="get_menu_title" qualifiers="const">
+			<return type="String" />
+			<param index="0" name="menu" type="int" />
+			<description>
+				Returns menu item title.
+			</description>
+		</method>
+		<method name="get_menu_tooltip" qualifiers="const">
+			<return type="String" />
+			<param index="0" name="menu" type="int" />
+			<description>
+				Returns menu item tooltip.
+			</description>
+		</method>
+		<method name="is_menu_disabled" qualifiers="const">
+			<return type="bool" />
+			<param index="0" name="menu" type="int" />
+			<description>
+				Returns [code]true[/code], if menu item is disabled.
+			</description>
+		</method>
+		<method name="is_menu_hidden" qualifiers="const">
+			<return type="bool" />
+			<param index="0" name="menu" type="int" />
+			<description>
+				Returns [code]true[/code], if menu item is hidden.
+			</description>
+		</method>
+		<method name="is_native_menu" qualifiers="const">
+			<return type="bool" />
+			<description>
+				Returns [code]true[/code], if system global menu is supported and used by this [MenuBar].
+			</description>
+		</method>
+		<method name="set_disable_shortcuts">
+			<return type="void" />
+			<param index="0" name="disabled" type="bool" />
+			<description>
+				If [code]true[/code], shortcuts are disabled and cannot be used to trigger the button.
+			</description>
+		</method>
+		<method name="set_menu_disabled">
+			<return type="void" />
+			<param index="0" name="menu" type="int" />
+			<param index="1" name="disabled" type="bool" />
+			<description>
+				If [code]true[/code], menu item is disabled.
+			</description>
+		</method>
+		<method name="set_menu_hidden">
+			<return type="void" />
+			<param index="0" name="menu" type="int" />
+			<param index="1" name="hidden" type="bool" />
+			<description>
+				If [code]true[/code], menu item is hidden.
+			</description>
+		</method>
+		<method name="set_menu_title">
+			<return type="void" />
+			<param index="0" name="menu" type="int" />
+			<param index="1" name="title" type="String" />
+			<description>
+				Sets menu item title.
+			</description>
+		</method>
+		<method name="set_menu_tooltip">
+			<return type="void" />
+			<param index="0" name="menu" type="int" />
+			<param index="1" name="tooltip" type="String" />
+			<description>
+				Sets menu item tooltip.
+			</description>
+		</method>
+	</methods>
+	<members>
+		<member name="flat" type="bool" setter="set_flat" getter="is_flat" default="false">
+			Flat [MenuBar] don't display item decoration.
+		</member>
+		<member name="language" type="String" setter="set_language" getter="get_language" default="&quot;&quot;">
+			Language code used for line-breaking and text shaping algorithms, if left empty current locale is used instead.
+		</member>
+		<member name="prefer_global_menu" type="bool" setter="set_prefer_global_menu" getter="is_prefer_global_menu" default="true">
+			If [code]true[/code], [MenuBar] will use system global menu when supported.
+		</member>
+		<member name="shortcut_context" type="Node" setter="set_shortcut_context" getter="get_shortcut_context">
+			The [Node] which must be a parent of the focused GUI [Control] for the shortcut to be activated. If [code]null[/code], the shortcut can be activated when any control is focused (a global shortcut). This allows shortcuts to be accepted only when the user has a certain area of the GUI focused.
+		</member>
+		<member name="start_index" type="int" setter="set_start_index" getter="get_start_index" default="-1">
+			Position in the global menu to insert first [MenuBar] item at.
+		</member>
+		<member name="switch_on_hover" type="bool" setter="set_switch_on_hover" getter="is_switch_on_hover" default="true">
+			If [code]true[/code], when the cursor hovers above menu item, it will close the current [PopupMenu] and open the other one.
+		</member>
+		<member name="text_direction" type="int" setter="set_text_direction" getter="get_text_direction" enum="Control.TextDirection" default="0">
+			Base text writing direction.
+		</member>
+	</members>
+	<theme_items>
+		<theme_item name="font_color" data_type="color" type="Color" default="Color(0.875, 0.875, 0.875, 1)">
+			Default text [Color] of the menu item.
+		</theme_item>
+		<theme_item name="font_disabled_color" data_type="color" type="Color" default="Color(0.875, 0.875, 0.875, 0.5)">
+			Text [Color] used when the menu item is disabled.
+		</theme_item>
+		<theme_item name="font_focus_color" data_type="color" type="Color" default="Color(0.95, 0.95, 0.95, 1)">
+			Text [Color] used when the menu item is focused. Only replaces the normal text color of the menu item. Disabled, hovered, and pressed states take precedence over this color.
+		</theme_item>
+		<theme_item name="font_hover_color" data_type="color" type="Color" default="Color(0.95, 0.95, 0.95, 1)">
+			Text [Color] used when the menu item is being hovered.
+		</theme_item>
+		<theme_item name="font_hover_pressed_color" data_type="color" type="Color" default="Color(1, 1, 1, 1)">
+			Text [Color] used when the menu item is being hovered and pressed.
+		</theme_item>
+		<theme_item name="font_outline_color" data_type="color" type="Color" default="Color(1, 1, 1, 1)">
+			The tint of text outline of the menu item.
+		</theme_item>
+		<theme_item name="font_pressed_color" data_type="color" type="Color" default="Color(1, 1, 1, 1)">
+			Text [Color] used when the menu item is being pressed.
+		</theme_item>
+		<theme_item name="h_separation" data_type="constant" type="int" default="4">
+			The horizontal space between menu items.
+		</theme_item>
+		<theme_item name="outline_size" data_type="constant" type="int" default="0">
+			The size of the text outline.
+		</theme_item>
+		<theme_item name="font" data_type="font" type="Font">
+			[Font] of the menu item's text.
+		</theme_item>
+		<theme_item name="font_size" data_type="font_size" type="int">
+			Font size of the menu item's text.
+		</theme_item>
+		<theme_item name="disabled" data_type="style" type="StyleBox">
+			[StyleBox] used when the menu item is disabled.
+		</theme_item>
+		<theme_item name="focus" data_type="style" type="StyleBox">
+			[StyleBox] used when the menu item is focused. The [code]focus[/code] [StyleBox] is displayed [i]over[/i] the base [StyleBox], so a partially transparent [StyleBox] should be used to ensure the base [StyleBox] remains visible. A [StyleBox] that represents an outline or an underline works well for this purpose. To disable the focus visual effect, assign a [StyleBoxEmpty] resource. Note that disabling the focus visual effect will harm keyboard/controller navigation usability, so this is not recommended for accessibility reasons.
+		</theme_item>
+		<theme_item name="hover" data_type="style" type="StyleBox">
+			[StyleBox] used when the menu item is being hovered.
+		</theme_item>
+		<theme_item name="normal" data_type="style" type="StyleBox">
+			Default [StyleBox] for the menu item.
+		</theme_item>
+		<theme_item name="pressed" data_type="style" type="StyleBox">
+			[StyleBox] used when the menu item is being pressed.
+		</theme_item>
+	</theme_items>
+</class>
diff --git a/doc/classes/MenuButton.xml b/doc/classes/MenuButton.xml
index bec567b3ef..8baa724292 100644
--- a/doc/classes/MenuButton.xml
+++ b/doc/classes/MenuButton.xml
@@ -20,7 +20,7 @@
 		</method>
 		<method name="set_disable_shortcuts">
 			<return type="void" />
-			<argument index="0" name="disabled" type="bool" />
+			<param index="0" name="disabled" type="bool" />
 			<description>
 				If [code]true[/code], shortcuts are disabled and cannot be used to trigger the button.
 			</description>
diff --git a/doc/classes/Mesh.xml b/doc/classes/Mesh.xml
index 48fa2754d5..8e98efa6fc 100644
--- a/doc/classes/Mesh.xml
+++ b/doc/classes/Mesh.xml
@@ -25,7 +25,7 @@
 		</method>
 		<method name="_get_blend_shape_name" qualifiers="virtual const">
 			<return type="StringName" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
@@ -36,79 +36,79 @@
 		</method>
 		<method name="_set_blend_shape_name" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="name" type="StringName" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="name" type="StringName" />
 			<description>
 			</description>
 		</method>
 		<method name="_surface_get_array_index_len" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_surface_get_array_len" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_surface_get_arrays" qualifiers="virtual const">
 			<return type="Array" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_surface_get_blend_shape_arrays" qualifiers="virtual const">
 			<return type="Array" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_surface_get_format" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_surface_get_lods" qualifiers="virtual const">
 			<return type="Dictionary" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_surface_get_material" qualifiers="virtual const">
 			<return type="Material" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_surface_get_primitive_type" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_surface_set_material" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="material" type="Material" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="material" type="Material" />
 			<description>
 			</description>
 		</method>
 		<method name="create_convex_shape" qualifiers="const">
 			<return type="Shape3D" />
-			<argument index="0" name="clean" type="bool" default="true" />
-			<argument index="1" name="simplify" type="bool" default="false" />
+			<param index="0" name="clean" type="bool" default="true" />
+			<param index="1" name="simplify" type="bool" default="false" />
 			<description>
 				Calculate a [ConvexPolygonShape3D] from the mesh.
-				If [code]clean[/code] is [code]true[/code] (default), duplicate and interior vertices are removed automatically. You can set it to [code]false[/code] to make the process faster if not needed.
-				If [code]simplify[/code] is [code]true[/code], the geometry can be further simplified to reduce the amount of vertices. Disabled by default.
+				If [param clean] is [code]true[/code] (default), duplicate and interior vertices are removed automatically. You can set it to [code]false[/code] to make the process faster if not needed.
+				If [param simplify] is [code]true[/code], the geometry can be further simplified to reduce the number of vertices. Disabled by default.
 			</description>
 		</method>
 		<method name="create_outline" qualifiers="const">
 			<return type="Mesh" />
-			<argument index="0" name="margin" type="float" />
+			<param index="0" name="margin" type="float" />
 			<description>
 				Calculate an outline mesh at a defined offset (margin) from the original mesh.
 				[b]Note:[/b] This method typically returns the vertices in reverse order (e.g. clockwise to counterclockwise).
@@ -142,34 +142,34 @@
 		<method name="get_surface_count" qualifiers="const">
 			<return type="int" />
 			<description>
-				Returns the amount of surfaces that the [Mesh] holds.
+				Returns the number of surfaces that the [Mesh] holds.
 			</description>
 		</method>
 		<method name="surface_get_arrays" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="surf_idx" type="int" />
+			<param index="0" name="surf_idx" type="int" />
 			<description>
 				Returns the arrays for the vertices, normals, uvs, etc. that make up the requested surface (see [method ArrayMesh.add_surface_from_arrays]).
 			</description>
 		</method>
 		<method name="surface_get_blend_shape_arrays" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="surf_idx" type="int" />
+			<param index="0" name="surf_idx" type="int" />
 			<description>
 				Returns the blend shape arrays for the requested surface.
 			</description>
 		</method>
 		<method name="surface_get_material" qualifiers="const">
 			<return type="Material" />
-			<argument index="0" name="surf_idx" type="int" />
+			<param index="0" name="surf_idx" type="int" />
 			<description>
 				Returns a [Material] in a given surface. Surface is rendered using this material.
 			</description>
 		</method>
 		<method name="surface_set_material">
 			<return type="void" />
-			<argument index="0" name="surf_idx" type="int" />
-			<argument index="1" name="material" type="Material" />
+			<param index="0" name="surf_idx" type="int" />
+			<param index="1" name="material" type="Material" />
 			<description>
 				Sets a [Material] for a given surface. Surface will be rendered using this material.
 			</description>
diff --git a/doc/classes/MeshDataTool.xml b/doc/classes/MeshDataTool.xml
index 0042bb20d8..b46f080a10 100644
--- a/doc/classes/MeshDataTool.xml
+++ b/doc/classes/MeshDataTool.xml
@@ -59,15 +59,15 @@
 		</method>
 		<method name="commit_to_surface">
 			<return type="int" enum="Error" />
-			<argument index="0" name="mesh" type="ArrayMesh" />
+			<param index="0" name="mesh" type="ArrayMesh" />
 			<description>
 				Adds a new surface to specified [Mesh] with edited data.
 			</description>
 		</method>
 		<method name="create_from_surface">
 			<return type="int" enum="Error" />
-			<argument index="0" name="mesh" type="ArrayMesh" />
-			<argument index="1" name="surface" type="int" />
+			<param index="0" name="mesh" type="ArrayMesh" />
+			<param index="1" name="surface" type="int" />
 			<description>
 				Uses specified surface of given [Mesh] to populate data for MeshDataTool.
 				Requires [Mesh] with primitive type [constant Mesh.PRIMITIVE_TRIANGLES].
@@ -81,22 +81,22 @@
 		</method>
 		<method name="get_edge_faces" qualifiers="const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns array of faces that touch given edge.
 			</description>
 		</method>
 		<method name="get_edge_meta" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns meta information assigned to given edge.
 			</description>
 		</method>
 		<method name="get_edge_vertex" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="vertex" type="int" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="vertex" type="int" />
 			<description>
 				Returns index of specified vertex connected to given edge.
 				Vertex argument can only be 0 or 1 because edges are comprised of two vertices.
@@ -110,8 +110,8 @@
 		</method>
 		<method name="get_face_edge" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="edge" type="int" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="edge" type="int" />
 			<description>
 				Returns specified edge associated with given face.
 				Edge argument must be either 0, 1, or 2 because a face only has three edges.
@@ -119,22 +119,22 @@
 		</method>
 		<method name="get_face_meta" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns the metadata associated with the given face.
 			</description>
 		</method>
 		<method name="get_face_normal" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Calculates and returns the face normal of the given face.
 			</description>
 		</method>
 		<method name="get_face_vertex" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="vertex" type="int" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="vertex" type="int" />
 			<description>
 				Returns the specified vertex of the given face.
 				Vertex argument must be either 0, 1, or 2 because faces contain three vertices.
@@ -155,21 +155,21 @@
 		</method>
 		<method name="get_vertex" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns the vertex at given index.
 			</description>
 		</method>
 		<method name="get_vertex_bones" qualifiers="const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns the bones of the given vertex.
 			</description>
 		</method>
 		<method name="get_vertex_color" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns the color of the given vertex.
 			</description>
@@ -182,151 +182,151 @@
 		</method>
 		<method name="get_vertex_edges" qualifiers="const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns an array of edges that share the given vertex.
 			</description>
 		</method>
 		<method name="get_vertex_faces" qualifiers="const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns an array of faces that share the given vertex.
 			</description>
 		</method>
 		<method name="get_vertex_meta" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns the metadata associated with the given vertex.
 			</description>
 		</method>
 		<method name="get_vertex_normal" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns the normal of the given vertex.
 			</description>
 		</method>
 		<method name="get_vertex_tangent" qualifiers="const">
 			<return type="Plane" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns the tangent of the given vertex.
 			</description>
 		</method>
 		<method name="get_vertex_uv" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns the UV of the given vertex.
 			</description>
 		</method>
 		<method name="get_vertex_uv2" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns the UV2 of the given vertex.
 			</description>
 		</method>
 		<method name="get_vertex_weights" qualifiers="const">
 			<return type="PackedFloat32Array" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns bone weights of the given vertex.
 			</description>
 		</method>
 		<method name="set_edge_meta">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="meta" type="Variant" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="meta" type="Variant" />
 			<description>
 				Sets the metadata of the given edge.
 			</description>
 		</method>
 		<method name="set_face_meta">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="meta" type="Variant" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="meta" type="Variant" />
 			<description>
 				Sets the metadata of the given face.
 			</description>
 		</method>
 		<method name="set_material">
 			<return type="void" />
-			<argument index="0" name="material" type="Material" />
+			<param index="0" name="material" type="Material" />
 			<description>
 				Sets the material to be used by newly-constructed [Mesh].
 			</description>
 		</method>
 		<method name="set_vertex">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="vertex" type="Vector3" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="vertex" type="Vector3" />
 			<description>
 				Sets the position of the given vertex.
 			</description>
 		</method>
 		<method name="set_vertex_bones">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="bones" type="PackedInt32Array" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="bones" type="PackedInt32Array" />
 			<description>
 				Sets the bones of the given vertex.
 			</description>
 		</method>
 		<method name="set_vertex_color">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="color" type="Color" />
 			<description>
 				Sets the color of the given vertex.
 			</description>
 		</method>
 		<method name="set_vertex_meta">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="meta" type="Variant" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="meta" type="Variant" />
 			<description>
 				Sets the metadata associated with the given vertex.
 			</description>
 		</method>
 		<method name="set_vertex_normal">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="normal" type="Vector3" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="normal" type="Vector3" />
 			<description>
 				Sets the normal of the given vertex.
 			</description>
 		</method>
 		<method name="set_vertex_tangent">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="tangent" type="Plane" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="tangent" type="Plane" />
 			<description>
 				Sets the tangent of the given vertex.
 			</description>
 		</method>
 		<method name="set_vertex_uv">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="uv" type="Vector2" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="uv" type="Vector2" />
 			<description>
 				Sets the UV of the given vertex.
 			</description>
 		</method>
 		<method name="set_vertex_uv2">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="uv2" type="Vector2" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="uv2" type="Vector2" />
 			<description>
 				Sets the UV2 of the given vertex.
 			</description>
 		</method>
 		<method name="set_vertex_weights">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="weights" type="PackedFloat32Array" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="weights" type="PackedFloat32Array" />
 			<description>
 				Sets the bone weights of the given vertex.
 			</description>
diff --git a/doc/classes/MeshInstance3D.xml b/doc/classes/MeshInstance3D.xml
index 24f1f9918b..618503c8df 100644
--- a/doc/classes/MeshInstance3D.xml
+++ b/doc/classes/MeshInstance3D.xml
@@ -15,12 +15,12 @@
 	<methods>
 		<method name="create_convex_collision">
 			<return type="void" />
-			<argument index="0" name="clean" type="bool" default="true" />
-			<argument index="1" name="simplify" type="bool" default="false" />
+			<param index="0" name="clean" type="bool" default="true" />
+			<param index="1" name="simplify" type="bool" default="false" />
 			<description>
 				This helper creates a [StaticBody3D] child node with a [ConvexPolygonShape3D] collision shape calculated from the mesh geometry. It's mainly used for testing.
-				If [code]clean[/code] is [code]true[/code] (default), duplicate and interior vertices are removed automatically. You can set it to [code]false[/code] to make the process faster if not needed.
-				If [code]simplify[/code] is [code]true[/code], the geometry can be further simplified to reduce the amount of vertices. Disabled by default.
+				If [param clean] is [code]true[/code] (default), duplicate and interior vertices are removed automatically. You can set it to [code]false[/code] to make the process faster if not needed.
+				If [param simplify] is [code]true[/code], the geometry can be further simplified to reduce the number of vertices. Disabled by default.
 			</description>
 		</method>
 		<method name="create_debug_tangents">
@@ -43,13 +43,13 @@
 		</method>
 		<method name="find_blend_shape_by_name">
 			<return type="int" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 			</description>
 		</method>
 		<method name="get_active_material" qualifiers="const">
 			<return type="Material" />
-			<argument index="0" name="surface" type="int" />
+			<param index="0" name="surface" type="int" />
 			<description>
 				Returns the [Material] that will be used by the [Mesh] when drawing. This can return the [member GeometryInstance3D.material_override], the surface override [Material] defined in this [MeshInstance3D], or the surface [Material] defined in the [Mesh]. For example, if [member GeometryInstance3D.material_override] is used, all surfaces will return the override material.
 			</description>
@@ -61,13 +61,13 @@
 		</method>
 		<method name="get_blend_shape_value" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="blend_shape_idx" type="int" />
+			<param index="0" name="blend_shape_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_surface_override_material" qualifiers="const">
 			<return type="Material" />
-			<argument index="0" name="surface" type="int" />
+			<param index="0" name="surface" type="int" />
 			<description>
 				Returns the override [Material] for the specified surface of the [Mesh] resource.
 			</description>
@@ -80,15 +80,15 @@
 		</method>
 		<method name="set_blend_shape_value">
 			<return type="void" />
-			<argument index="0" name="blend_shape_idx" type="int" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="blend_shape_idx" type="int" />
+			<param index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_surface_override_material">
 			<return type="void" />
-			<argument index="0" name="surface" type="int" />
-			<argument index="1" name="material" type="Material" />
+			<param index="0" name="surface" type="int" />
+			<param index="1" name="material" type="Material" />
 			<description>
 				Sets the override [Material] for the specified surface of the [Mesh] resource. This material is associated with this [MeshInstance3D] rather than with the [Mesh] resource.
 			</description>
diff --git a/doc/classes/MeshLibrary.xml b/doc/classes/MeshLibrary.xml
index 6b25441a16..85e57dd0f3 100644
--- a/doc/classes/MeshLibrary.xml
+++ b/doc/classes/MeshLibrary.xml
@@ -19,7 +19,7 @@
 		</method>
 		<method name="create_item">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Creates a new item in the library with the given ID.
 				You can get an unused ID from [method get_last_unused_item_id].
@@ -27,7 +27,7 @@
 		</method>
 		<method name="find_item_by_name" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Returns the first item with the given name.
 			</description>
@@ -40,49 +40,49 @@
 		</method>
 		<method name="get_item_mesh" qualifiers="const">
 			<return type="Mesh" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns the item's mesh.
 			</description>
 		</method>
 		<method name="get_item_mesh_transform" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns the transform applied to the item's mesh.
 			</description>
 		</method>
 		<method name="get_item_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns the item's name.
 			</description>
 		</method>
 		<method name="get_item_navmesh" qualifiers="const">
 			<return type="NavigationMesh" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns the item's navigation mesh.
 			</description>
 		</method>
 		<method name="get_item_navmesh_transform" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns the transform applied to the item's navigation mesh.
 			</description>
 		</method>
 		<method name="get_item_preview" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				When running in the editor, returns a generated item preview (a 3D rendering in isometric perspective). When used in a running project, returns the manually-defined item preview which can be set using [method set_item_preview]. Returns an empty [Texture2D] if no preview was manually set in a running project.
 			</description>
 		</method>
 		<method name="get_item_shapes" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns an item's collision shapes.
 				The array consists of each [Shape3D] followed by its [Transform3D].
@@ -96,31 +96,31 @@
 		</method>
 		<method name="remove_item">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Removes the item.
 			</description>
 		</method>
 		<method name="set_item_mesh">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="mesh" type="Mesh" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="mesh" type="Mesh" />
 			<description>
 				Sets the item's mesh.
 			</description>
 		</method>
 		<method name="set_item_mesh_transform">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="mesh_transform" type="Transform3D" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="mesh_transform" type="Transform3D" />
 			<description>
 				Sets the transform to apply to the item's mesh.
 			</description>
 		</method>
 		<method name="set_item_name">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="name" type="String" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="name" type="String" />
 			<description>
 				Sets the item's name.
 				This name is shown in the editor. It can also be used to look up the item later using [method find_item_by_name].
@@ -128,32 +128,32 @@
 		</method>
 		<method name="set_item_navmesh">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="navmesh" type="NavigationMesh" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="navmesh" type="NavigationMesh" />
 			<description>
 				Sets the item's navigation mesh.
 			</description>
 		</method>
 		<method name="set_item_navmesh_transform">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="navmesh" type="Transform3D" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="navmesh" type="Transform3D" />
 			<description>
 				Sets the transform to apply to the item's navigation mesh.
 			</description>
 		</method>
 		<method name="set_item_preview">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="texture" type="Texture2D" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="texture" type="Texture2D" />
 			<description>
 				Sets a texture to use as the item's preview icon in the editor.
 			</description>
 		</method>
 		<method name="set_item_shapes">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="shapes" type="Array" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="shapes" type="Array" />
 			<description>
 				Sets an item's collision shapes.
 				The array should consist of [Shape3D] objects, each followed by a [Transform3D] that will be applied to it. For shapes that should not have a transform, use [constant Transform3D.IDENTITY].
diff --git a/doc/classes/MethodTweener.xml b/doc/classes/MethodTweener.xml
index b22341e0a1..7e042b5eb6 100644
--- a/doc/classes/MethodTweener.xml
+++ b/doc/classes/MethodTweener.xml
@@ -12,21 +12,21 @@
 	<methods>
 		<method name="set_delay">
 			<return type="MethodTweener" />
-			<argument index="0" name="delay" type="float" />
+			<param index="0" name="delay" type="float" />
 			<description>
 				Sets the time in seconds after which the [MethodTweener] will start interpolating. By default there's no delay.
 			</description>
 		</method>
 		<method name="set_ease">
 			<return type="MethodTweener" />
-			<argument index="0" name="ease" type="int" enum="Tween.EaseType" />
+			<param index="0" name="ease" type="int" enum="Tween.EaseType" />
 			<description>
 				Sets the type of used easing from [enum Tween.EaseType]. If not set, the default easing is used from the [Tween] that contains this Tweener.
 			</description>
 		</method>
 		<method name="set_trans">
 			<return type="MethodTweener" />
-			<argument index="0" name="trans" type="int" enum="Tween.TransitionType" />
+			<param index="0" name="trans" type="int" enum="Tween.TransitionType" />
 			<description>
 				Sets the type of used transition from [enum Tween.TransitionType]. If not set, the default transition is used from the [Tween] that contains this Tweener.
 			</description>
diff --git a/doc/classes/MovieWriter.xml b/doc/classes/MovieWriter.xml
index d47e52d7c0..f2509ad2b2 100644
--- a/doc/classes/MovieWriter.xml
+++ b/doc/classes/MovieWriter.xml
@@ -29,9 +29,9 @@
 		</method>
 		<method name="_handles_file" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
-				Called when the engine determines whether this [MovieWriter] is able to handle the file at [code]path[/code]. Must return [code]true[/code] if this [MovieWriter] is able to handle the given file path, [code]false[/code] otherwise. Typically, [method _handles_file] is overridden as follows to allow the user to record a file at any path with a given file extension:
+				Called when the engine determines whether this [MovieWriter] is able to handle the file at [param path]. Must return [code]true[/code] if this [MovieWriter] is able to handle the given file path, [code]false[/code] otherwise. Typically, [method _handles_file] is overridden as follows to allow the user to record a file at any path with a given file extension:
 				[codeblock]
 				func _handles_file(path):
 				    # Allows specifying an output file with a `.mkv` file extension (case-insensitive),
@@ -42,11 +42,11 @@
 		</method>
 		<method name="_write_begin" qualifiers="virtual">
 			<return type="int" enum="Error" />
-			<argument index="0" name="movie_size" type="Vector2i" />
-			<argument index="1" name="fps" type="int" />
-			<argument index="2" name="base_path" type="String" />
+			<param index="0" name="movie_size" type="Vector2i" />
+			<param index="1" name="fps" type="int" />
+			<param index="2" name="base_path" type="String" />
 			<description>
-				Called once before the engine starts writing video and audio data. [code]movie_size[/code] is the width and height of the video to save. [code]fps[/code] is the number of frames per second specified in the project settings or using the [code]--fixed-fps &lt;fps&gt;[/code] command line argument.
+				Called once before the engine starts writing video and audio data. [param movie_size] is the width and height of the video to save. [param fps] is the number of frames per second specified in the project settings or using the [code]--fixed-fps &lt;fps&gt;[/code] command line argument.
 			</description>
 		</method>
 		<method name="_write_end" qualifiers="virtual">
@@ -58,15 +58,15 @@
 		</method>
 		<method name="_write_frame" qualifiers="virtual">
 			<return type="int" enum="Error" />
-			<argument index="0" name="frame_image" type="Image" />
-			<argument index="1" name="audio_frame_block" type="const void*" />
+			<param index="0" name="frame_image" type="Image" />
+			<param index="1" name="audio_frame_block" type="const void*" />
 			<description>
-				Called at the end of every rendered frame. The [code]frame_image[/code] and [code]audio_frame_block[/code] function arguments should be written to.
+				Called at the end of every rendered frame. The [param frame_image] and [param audio_frame_block] function arguments should be written to.
 			</description>
 		</method>
 		<method name="add_writer" qualifiers="static">
 			<return type="void" />
-			<argument index="0" name="writer" type="MovieWriter" />
+			<param index="0" name="writer" type="MovieWriter" />
 			<description>
 				Adds a writer to be usable by the engine. The supported file extensions can be set by overriding [method _handles_file].
 				[b]Note:[/b] [method add_writer] must be called early enough in the engine initialization to work, as movie writing is designed to start at the same time as the rest of the engine.
diff --git a/doc/classes/MultiMesh.xml b/doc/classes/MultiMesh.xml
index 9d8f1e1e5d..bae2335cfb 100644
--- a/doc/classes/MultiMesh.xml
+++ b/doc/classes/MultiMesh.xml
@@ -22,45 +22,45 @@
 		</method>
 		<method name="get_instance_color" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="instance" type="int" />
+			<param index="0" name="instance" type="int" />
 			<description>
 				Gets a specific instance's color.
 			</description>
 		</method>
 		<method name="get_instance_custom_data" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="instance" type="int" />
+			<param index="0" name="instance" type="int" />
 			<description>
 				Returns the custom data that has been set for a specific instance.
 			</description>
 		</method>
 		<method name="get_instance_transform" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="instance" type="int" />
+			<param index="0" name="instance" type="int" />
 			<description>
 				Returns the [Transform3D] of a specific instance.
 			</description>
 		</method>
 		<method name="get_instance_transform_2d" qualifiers="const">
 			<return type="Transform2D" />
-			<argument index="0" name="instance" type="int" />
+			<param index="0" name="instance" type="int" />
 			<description>
 				Returns the [Transform2D] of a specific instance.
 			</description>
 		</method>
 		<method name="set_instance_color">
 			<return type="void" />
-			<argument index="0" name="instance" type="int" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="instance" type="int" />
+			<param index="1" name="color" type="Color" />
 			<description>
 				Sets the color of a specific instance by [i]multiplying[/i] the mesh's existing vertex colors.
-				For the color to take effect, ensure that [member use_colors] is [code]true[/code] on the [MultiMesh] and [member BaseMaterial3D.vertex_color_use_as_albedo] is [code]true[/code] on the material.
+				For the color to take effect, ensure that [member use_colors] is [code]true[/code] on the [MultiMesh] and [member BaseMaterial3D.vertex_color_use_as_albedo] is [code]true[/code] on the material. If the color doesn't look as expected, make sure the material's albedo color is set to pure white ([code]Color(1, 1, 1)[/code]).
 			</description>
 		</method>
 		<method name="set_instance_custom_data">
 			<return type="void" />
-			<argument index="0" name="instance" type="int" />
-			<argument index="1" name="custom_data" type="Color" />
+			<param index="0" name="instance" type="int" />
+			<param index="1" name="custom_data" type="Color" />
 			<description>
 				Sets custom data for a specific instance. Although [Color] is used, it is just a container for 4 floating point numbers.
 				For the custom data to be used, ensure that [member use_custom_data] is [code]true[/code].
@@ -68,16 +68,16 @@
 		</method>
 		<method name="set_instance_transform">
 			<return type="void" />
-			<argument index="0" name="instance" type="int" />
-			<argument index="1" name="transform" type="Transform3D" />
+			<param index="0" name="instance" type="int" />
+			<param index="1" name="transform" type="Transform3D" />
 			<description>
 				Sets the [Transform3D] for a specific instance.
 			</description>
 		</method>
 		<method name="set_instance_transform_2d">
 			<return type="void" />
-			<argument index="0" name="instance" type="int" />
-			<argument index="1" name="transform" type="Transform2D" />
+			<param index="0" name="instance" type="int" />
+			<param index="1" name="transform" type="Transform2D" />
 			<description>
 				Sets the [Transform2D] for a specific instance.
 			</description>
diff --git a/doc/classes/MultiMeshInstance3D.xml b/doc/classes/MultiMeshInstance3D.xml
index 52cc9cb65f..70fbf235e2 100644
--- a/doc/classes/MultiMeshInstance3D.xml
+++ b/doc/classes/MultiMeshInstance3D.xml
@@ -5,7 +5,7 @@
 	</brief_description>
 	<description>
 		[MultiMeshInstance3D] is a specialized node to instance [GeometryInstance3D]s based on a [MultiMesh] resource.
-		This is useful to optimize the rendering of a high amount of instances of a given mesh (for example trees in a forest or grass strands).
+		This is useful to optimize the rendering of a high number of instances of a given mesh (for example trees in a forest or grass strands).
 	</description>
 	<tutorials>
 		<link title="Animating thousands of fish with MultiMeshInstance">$DOCS_URL/tutorials/performance/vertex_animation/animating_thousands_of_fish.html</link>
diff --git a/doc/classes/MultiplayerAPI.xml b/doc/classes/MultiplayerAPI.xml
index 06658bf004..3ce6ce41b4 100644
--- a/doc/classes/MultiplayerAPI.xml
+++ b/doc/classes/MultiplayerAPI.xml
@@ -57,19 +57,19 @@
 		</method>
 		<method name="object_configuration_add">
 			<return type="int" enum="Error" />
-			<argument index="0" name="object" type="Object" />
-			<argument index="1" name="configuration" type="Variant" />
+			<param index="0" name="object" type="Object" />
+			<param index="1" name="configuration" type="Variant" />
 			<description>
-				Notifies the MultiplayerAPI of a new [code]configuration[/code] for the given [code]object[/code]. This method is used internally by [SceneTree] to configure the root path for this MultiplayerAPI (passing [code]null[/code] and a valid [NodePath] as [code]configuration[/code]). This method can be further used by MultiplayerAPI implementations to provide additional features, refer to specific implementation (e.g. [SceneMultiplayer]) for details on how they use it.
+				Notifies the MultiplayerAPI of a new [param configuration] for the given [param object]. This method is used internally by [SceneTree] to configure the root path for this MultiplayerAPI (passing [code]null[/code] and a valid [NodePath] as [param configuration]). This method can be further used by MultiplayerAPI implementations to provide additional features, refer to specific implementation (e.g. [SceneMultiplayer]) for details on how they use it.
 				[b]Note:[/b] This method is mostly relevant when extending or overriding the MultiplayerAPI behavior via [MultiplayerAPIExtension].
 			</description>
 		</method>
 		<method name="object_configuration_remove">
 			<return type="int" enum="Error" />
-			<argument index="0" name="object" type="Object" />
-			<argument index="1" name="configuration" type="Variant" />
+			<param index="0" name="object" type="Object" />
+			<param index="1" name="configuration" type="Variant" />
 			<description>
-				Notifies the MultiplayerAPI to remove a [code]configuration[/code] for the given [code]object[/code]. This method is used internally by [SceneTree] to configure the root path for this MultiplayerAPI (passing [code]null[/code] and an empty [NodePath] as [code]configuration[/code]). This method can be further used by MultiplayerAPI implementations to provide additional features, refer to specific implementation (e.g. [SceneMultiplayer]) for details on how they use it.
+				Notifies the MultiplayerAPI to remove a [param configuration] for the given [param object]. This method is used internally by [SceneTree] to configure the root path for this MultiplayerAPI (passing [code]null[/code] and an empty [NodePath] as [param configuration]). This method can be further used by MultiplayerAPI implementations to provide additional features, refer to specific implementation (e.g. [SceneMultiplayer]) for details on how they use it.
 				[b]Note:[/b] This method is mostly relevant when extending or overriding the MultiplayerAPI behavior via [MultiplayerAPIExtension].
 			</description>
 		</method>
@@ -82,18 +82,18 @@
 		</method>
 		<method name="rpc">
 			<return type="int" enum="Error" />
-			<argument index="0" name="peer" type="int" />
-			<argument index="1" name="object" type="Object" />
-			<argument index="2" name="method" type="StringName" />
-			<argument index="3" name="arguments" type="Array" default="[]" />
+			<param index="0" name="peer" type="int" />
+			<param index="1" name="object" type="Object" />
+			<param index="2" name="method" type="StringName" />
+			<param index="3" name="arguments" type="Array" default="[]" />
 			<description>
-				Sends an RPC to the target [code]peer[/code]. The given [code]method[/code] will be called on the remote [code]object[/code] with the provided [code]arguments[/code]. The RPC may also be called locally depending on the implementation and RPC configuration. See [method Node.rpc] and [method Node.rpc_config].
+				Sends an RPC to the target [param peer]. The given [param method] will be called on the remote [param object] with the provided [param arguments]. The RPC may also be called locally depending on the implementation and RPC configuration. See [method Node.rpc] and [method Node.rpc_config].
 				[b]Note:[/b] Prefer using [method Node.rpc], [method Node.rpc_id], or [code]my_method.rpc(peer, arg1, arg2, ...)[/code] (in GDScript), since they are faster. This method is mostly useful in conjunction with [MultiplayerAPIExtension] when augmenting or replacing the multiplayer capabilities.
 			</description>
 		</method>
 		<method name="set_default_interface" qualifiers="static">
 			<return type="void" />
-			<argument index="0" name="interface_name" type="StringName" />
+			<param index="0" name="interface_name" type="StringName" />
 			<description>
 				Sets the default MultiplayerAPI implementation class. This method can be used by modules and extensions to configure which implementation will be used by [SceneTree] when the engine starts.
 			</description>
@@ -116,13 +116,13 @@
 			</description>
 		</signal>
 		<signal name="peer_connected">
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Emitted when this MultiplayerAPI's [member multiplayer_peer] connects with a new peer. ID is the peer ID of the new peer. Clients get notified when other clients connect to the same server. Upon connecting to a server, a client also receives this signal for the server (with ID being 1).
 			</description>
 		</signal>
 		<signal name="peer_disconnected">
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Emitted when this MultiplayerAPI's [member multiplayer_peer] disconnects from a peer. Clients get notified when other clients disconnect from the same server.
 			</description>
diff --git a/doc/classes/MultiplayerAPIExtension.xml b/doc/classes/MultiplayerAPIExtension.xml
index c369977d57..e67970cc89 100644
--- a/doc/classes/MultiplayerAPIExtension.xml
+++ b/doc/classes/MultiplayerAPIExtension.xml
@@ -100,16 +100,16 @@
 		</method>
 		<method name="_object_configuration_add" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="object" type="Object" />
-			<argument index="1" name="configuration" type="Variant" />
+			<param index="0" name="object" type="Object" />
+			<param index="1" name="configuration" type="Variant" />
 			<description>
 				Callback for [method MultiplayerAPI.object_configuration_add].
 			</description>
 		</method>
 		<method name="_object_configuration_remove" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="object" type="Object" />
-			<argument index="1" name="configuration" type="Variant" />
+			<param index="0" name="object" type="Object" />
+			<param index="1" name="configuration" type="Variant" />
 			<description>
 				Callback for [method MultiplayerAPI.object_configuration_remove].
 			</description>
@@ -122,17 +122,17 @@
 		</method>
 		<method name="_rpc" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="peer" type="int" />
-			<argument index="1" name="object" type="Object" />
-			<argument index="2" name="method" type="StringName" />
-			<argument index="3" name="args" type="Array" />
+			<param index="0" name="peer" type="int" />
+			<param index="1" name="object" type="Object" />
+			<param index="2" name="method" type="StringName" />
+			<param index="3" name="args" type="Array" />
 			<description>
 				Callback for [method MultiplayerAPI.rpc].
 			</description>
 		</method>
 		<method name="_set_multiplayer_peer" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="multiplayer_peer" type="MultiplayerPeer" />
+			<param index="0" name="multiplayer_peer" type="MultiplayerPeer" />
 			<description>
 				Called when the [member MultiplayerAPI.multiplayer_peer] is set.
 			</description>
diff --git a/doc/classes/MultiplayerPeer.xml b/doc/classes/MultiplayerPeer.xml
index 6dde40f018..0f57ff9e55 100644
--- a/doc/classes/MultiplayerPeer.xml
+++ b/doc/classes/MultiplayerPeer.xml
@@ -45,10 +45,10 @@
 		</method>
 		<method name="set_target_peer">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Sets the peer to which packets will be sent.
-				The [code]id[/code] can be one of: [constant TARGET_PEER_BROADCAST] to send to all connected peers, [constant TARGET_PEER_SERVER] to send to the peer acting as server, a valid peer ID to send to that specific peer, a negative peer ID to send to all peers except that one. By default, the target peer is [constant TARGET_PEER_BROADCAST].
+				The [param id] can be one of: [constant TARGET_PEER_BROADCAST] to send to all connected peers, [constant TARGET_PEER_SERVER] to send to the peer acting as server, a valid peer ID to send to that specific peer, a negative peer ID to send to all peers except that one. By default, the target peer is [constant TARGET_PEER_BROADCAST].
 			</description>
 		</method>
 	</methods>
@@ -76,13 +76,13 @@
 			</description>
 		</signal>
 		<signal name="peer_connected">
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Emitted by the server when a client connects.
 			</description>
 		</signal>
 		<signal name="peer_disconnected">
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Emitted by the server when a client disconnects.
 			</description>
diff --git a/doc/classes/MultiplayerPeerExtension.xml b/doc/classes/MultiplayerPeerExtension.xml
index f837171e2f..3a193abd7d 100644
--- a/doc/classes/MultiplayerPeerExtension.xml
+++ b/doc/classes/MultiplayerPeerExtension.xml
@@ -29,10 +29,10 @@
 		</method>
 		<method name="_get_packet" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="r_buffer" type="const uint8_t **" />
-			<argument index="1" name="r_buffer_size" type="int32_t*" />
+			<param index="0" name="r_buffer" type="const uint8_t **" />
+			<param index="1" name="r_buffer_size" type="int32_t*" />
 			<description>
-				Called when a packet needs to be received by the [MultiplayerAPI], with [code]p_buffer_size[/code] being the size of the binary [code]p_buffer[/code] in bytes.
+				Called when a packet needs to be received by the [MultiplayerAPI], with [param r_buffer_size] being the size of the binary [param r_buffer] in bytes.
 			</description>
 		</method>
 		<method name="_get_packet_peer" qualifiers="virtual const">
@@ -85,43 +85,43 @@
 		</method>
 		<method name="_put_packet" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="p_buffer" type="const uint8_t*" />
-			<argument index="1" name="p_buffer_size" type="int" />
+			<param index="0" name="p_buffer" type="const uint8_t*" />
+			<param index="1" name="p_buffer_size" type="int" />
 			<description>
-				Called when a packet needs to be sent by the [MultiplayerAPI], with [code]p_buffer_size[/code] being the size of the binary [code]p_buffer[/code] in bytes.
+				Called when a packet needs to be sent by the [MultiplayerAPI], with [param p_buffer_size] being the size of the binary [param p_buffer] in bytes.
 			</description>
 		</method>
 		<method name="_put_packet_script" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="p_buffer" type="PackedByteArray" />
+			<param index="0" name="p_buffer" type="PackedByteArray" />
 			<description>
 				Called when a packet needs to be sent by the [MultiplayerAPI], if [method _put_packet] isn't implemented. Use this when extending this class via GDScript.
 			</description>
 		</method>
 		<method name="_set_refuse_new_connections" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="p_enable" type="bool" />
+			<param index="0" name="p_enable" type="bool" />
 			<description>
 				Called when the "refuse new connections" status is set on this [MultiplayerPeer] (see [member MultiplayerPeer.refuse_new_connections]).
 			</description>
 		</method>
 		<method name="_set_target_peer" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="p_peer" type="int" />
+			<param index="0" name="p_peer" type="int" />
 			<description>
 				Called when the target peer to use is set for this [MultiplayerPeer] (see [method MultiplayerPeer.set_target_peer]).
 			</description>
 		</method>
 		<method name="_set_transfer_channel" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="p_channel" type="int" />
+			<param index="0" name="p_channel" type="int" />
 			<description>
 				Called when the channel to use is set for this [MultiplayerPeer] (see [member MultiplayerPeer.transfer_channel]).
 			</description>
 		</method>
 		<method name="_set_transfer_mode" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="p_mode" type="int" />
+			<param index="0" name="p_mode" type="int" />
 			<description>
 				Called when the transfer mode is set on this [MultiplayerPeer] (see [member MultiplayerPeer.transfer_mode]).
 			</description>
diff --git a/doc/classes/NativeExtension.xml b/doc/classes/NativeExtension.xml
index e5e11c1c95..50f976ca6f 100644
--- a/doc/classes/NativeExtension.xml
+++ b/doc/classes/NativeExtension.xml
@@ -19,7 +19,7 @@
 		</method>
 		<method name="initialize_library">
 			<return type="void" />
-			<argument index="0" name="level" type="int" enum="NativeExtension.InitializationLevel" />
+			<param index="0" name="level" type="int" enum="NativeExtension.InitializationLevel" />
 			<description>
 			</description>
 		</method>
@@ -30,8 +30,8 @@
 		</method>
 		<method name="open_library">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="entry_symbol" type="String" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="entry_symbol" type="String" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/NativeExtensionManager.xml b/doc/classes/NativeExtensionManager.xml
index 10c9e32cf2..7d6eefa94f 100644
--- a/doc/classes/NativeExtensionManager.xml
+++ b/doc/classes/NativeExtensionManager.xml
@@ -9,7 +9,7 @@
 	<methods>
 		<method name="get_extension">
 			<return type="NativeExtension" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
@@ -20,25 +20,25 @@
 		</method>
 		<method name="is_extension_loaded" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="load_extension">
 			<return type="int" enum="NativeExtensionManager.LoadStatus" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="reload_extension">
 			<return type="int" enum="NativeExtensionManager.LoadStatus" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="unload_extension">
 			<return type="int" enum="NativeExtensionManager.LoadStatus" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/NavigationAgent2D.xml b/doc/classes/NavigationAgent2D.xml
index 058f1032cb..30ad13ec93 100644
--- a/doc/classes/NavigationAgent2D.xml
+++ b/doc/classes/NavigationAgent2D.xml
@@ -36,9 +36,9 @@
 		</method>
 		<method name="get_navigation_layer_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
-				Returns whether or not the specified layer of the [member navigation_layers] bitmask is enabled, given a [code]layer_number[/code] between 1 and 32.
+				Returns whether or not the specified layer of the [member navigation_layers] bitmask is enabled, given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="get_navigation_map" qualifiers="const">
@@ -85,29 +85,29 @@
 		</method>
 		<method name="set_navigation_layer_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
-				Based on [code]value[/code], enables or disables the specified layer in the [member navigation_layers] bitmask, given a [code]layer_number[/code] between 1 and 32.
+				Based on [param value], enables or disables the specified layer in the [member navigation_layers] bitmask, given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="set_navigation_map">
 			<return type="void" />
-			<argument index="0" name="navigation_map" type="RID" />
+			<param index="0" name="navigation_map" type="RID" />
 			<description>
 				Sets the [RID] of the navigation map this NavigationAgent node should use and also updates the [code]agent[/code] on the NavigationServer.
 			</description>
 		</method>
 		<method name="set_target_location">
 			<return type="void" />
-			<argument index="0" name="location" type="Vector2" />
+			<param index="0" name="location" type="Vector2" />
 			<description>
 				Sets the user desired final location. This will clear the current navigation path.
 			</description>
 		</method>
 		<method name="set_velocity">
 			<return type="void" />
-			<argument index="0" name="velocity" type="Vector2" />
+			<param index="0" name="velocity" type="Vector2" />
 			<description>
 				Sends the passed in velocity to the collision avoidance algorithm. It will adjust the velocity to avoid collisions. Once the adjustment to the velocity is complete, it will emit the [signal velocity_computed] signal.
 			</description>
@@ -163,7 +163,7 @@
 			</description>
 		</signal>
 		<signal name="velocity_computed">
-			<argument index="0" name="safe_velocity" type="Vector3" />
+			<param index="0" name="safe_velocity" type="Vector3" />
 			<description>
 				Notifies when the collision avoidance velocity is calculated. Emitted by [method set_velocity].
 			</description>
diff --git a/doc/classes/NavigationAgent3D.xml b/doc/classes/NavigationAgent3D.xml
index c689ddc345..22c468cb6b 100644
--- a/doc/classes/NavigationAgent3D.xml
+++ b/doc/classes/NavigationAgent3D.xml
@@ -36,9 +36,9 @@
 		</method>
 		<method name="get_navigation_layer_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
-				Returns whether or not the specified layer of the [member navigation_layers] bitmask is enabled, given a [code]layer_number[/code] between 1 and 32.
+				Returns whether or not the specified layer of the [member navigation_layers] bitmask is enabled, given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="get_navigation_map" qualifiers="const">
@@ -85,29 +85,29 @@
 		</method>
 		<method name="set_navigation_layer_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
-				Based on [code]value[/code], enables or disables the specified layer in the [member navigation_layers] bitmask, given a [code]layer_number[/code] between 1 and 32.
+				Based on [param value], enables or disables the specified layer in the [member navigation_layers] bitmask, given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="set_navigation_map">
 			<return type="void" />
-			<argument index="0" name="navigation_map" type="RID" />
+			<param index="0" name="navigation_map" type="RID" />
 			<description>
 				Sets the [RID] of the navigation map this NavigationAgent node should use and also updates the [code]agent[/code] on the NavigationServer.
 			</description>
 		</method>
 		<method name="set_target_location">
 			<return type="void" />
-			<argument index="0" name="location" type="Vector3" />
+			<param index="0" name="location" type="Vector3" />
 			<description>
 				Sets the user desired final location. This will clear the current navigation path.
 			</description>
 		</method>
 		<method name="set_velocity">
 			<return type="void" />
-			<argument index="0" name="velocity" type="Vector3" />
+			<param index="0" name="velocity" type="Vector3" />
 			<description>
 				Sends the passed in velocity to the collision avoidance algorithm. It will adjust the velocity to avoid collisions. Once the adjustment to the velocity is complete, it will emit the [signal velocity_computed] signal.
 			</description>
@@ -169,7 +169,7 @@
 			</description>
 		</signal>
 		<signal name="velocity_computed">
-			<argument index="0" name="safe_velocity" type="Vector3" />
+			<param index="0" name="safe_velocity" type="Vector3" />
 			<description>
 				Notifies when the collision avoidance velocity is calculated. Emitted by [method set_velocity].
 			</description>
diff --git a/doc/classes/NavigationMesh.xml b/doc/classes/NavigationMesh.xml
index 33d2535ca2..c86bc47e04 100644
--- a/doc/classes/NavigationMesh.xml
+++ b/doc/classes/NavigationMesh.xml
@@ -12,7 +12,7 @@
 	<methods>
 		<method name="add_polygon">
 			<return type="void" />
-			<argument index="0" name="polygon" type="PackedInt32Array" />
+			<param index="0" name="polygon" type="PackedInt32Array" />
 			<description>
 				Adds a polygon using the indices of the vertices you get when calling [method get_vertices].
 			</description>
@@ -25,22 +25,22 @@
 		</method>
 		<method name="create_from_mesh">
 			<return type="void" />
-			<argument index="0" name="mesh" type="Mesh" />
+			<param index="0" name="mesh" type="Mesh" />
 			<description>
 				Initializes the navigation mesh by setting the vertices and indices according to a [Mesh].
-				[b]Note:[/b] The given [code]mesh[/code] must be of type [constant Mesh.PRIMITIVE_TRIANGLES] and have an index array.
+				[b]Note:[/b] The given [param mesh] must be of type [constant Mesh.PRIMITIVE_TRIANGLES] and have an index array.
 			</description>
 		</method>
 		<method name="get_collision_mask_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
-				Returns whether or not the specified layer of the [member geometry_collision_mask] is enabled, given a [code]layer_number[/code] between 1 and 32.
+				Returns whether or not the specified layer of the [member geometry_collision_mask] is enabled, given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="get_polygon">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns a [PackedInt32Array] containing the indices of the vertices of a created polygon.
 			</description>
@@ -59,15 +59,15 @@
 		</method>
 		<method name="set_collision_mask_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
-				Based on [code]value[/code], enables or disables the specified layer in the [member geometry_collision_mask], given a [code]layer_number[/code] between 1 and 32.
+				Based on [param value], enables or disables the specified layer in the [member geometry_collision_mask], given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="set_vertices">
 			<return type="void" />
-			<argument index="0" name="vertices" type="PackedVector3Array" />
+			<param index="0" name="vertices" type="PackedVector3Array" />
 			<description>
 				Sets the vertices that can be then indexed to create polygons with the [method add_polygon] method.
 			</description>
diff --git a/doc/classes/NavigationMeshGenerator.xml b/doc/classes/NavigationMeshGenerator.xml
index 612ce54d34..4c337db90f 100644
--- a/doc/classes/NavigationMeshGenerator.xml
+++ b/doc/classes/NavigationMeshGenerator.xml
@@ -6,7 +6,7 @@
 	<description>
 		This class is responsible for creating and clearing 3D navigation meshes used as [NavigationMesh] resources inside [NavigationRegion3D]. The [NavigationMeshGenerator] has very limited to no use for 2D as the navigation mesh baking process expects 3D node types and 3D source geometry to parse.
 		The entire navigation mesh baking is best done in a separate thread as the voxelization, collision tests and mesh optimization steps involved are very performance and time hungry operations.
-		Navigation mesh baking happens in multiple steps and the result depends on 3D source geometry and properties of the [NavigationMesh] resource. In the first step, starting from a root node and depending on [NavigationMesh] properties all valid 3D source geometry nodes are collected from the [SceneTree]. Second, all collected nodes are parsed for their relevant 3D geometry data and a combined 3D mesh is build. Due to the many different types of parsable objects, from normal [MeshInstance3D]s to [CSGShape3D]s or various [CollisionObject3D]s, some operations to collect geometry data can trigger [RenderingServer] and [PhysicsServer3D] synchronizations. Server synchronization can have a negative effect on baking time or framerate as it often involves [Mutex] locking for thread security. Many parsable objects and the continuous synchronization with other threaded Servers can increase the baking time significantly. On the other hand only a few but very large and complex objects will take some time to prepare for the Servers which can noticeably stall the next frame render. As a general rule the total amount of parsable objects and their individual size and complexity should be balanced to avoid framerate issues or very long baking times. The combined mesh is then passed to the Recast Navigation Object to test the source geometry for walkable terrain suitable to [NavigationMesh] agent properties by creating a voxel world around the meshes bounding area.
+		Navigation mesh baking happens in multiple steps and the result depends on 3D source geometry and properties of the [NavigationMesh] resource. In the first step, starting from a root node and depending on [NavigationMesh] properties all valid 3D source geometry nodes are collected from the [SceneTree]. Second, all collected nodes are parsed for their relevant 3D geometry data and a combined 3D mesh is build. Due to the many different types of parsable objects, from normal [MeshInstance3D]s to [CSGShape3D]s or various [CollisionObject3D]s, some operations to collect geometry data can trigger [RenderingServer] and [PhysicsServer3D] synchronizations. Server synchronization can have a negative effect on baking time or framerate as it often involves [Mutex] locking for thread security. Many parsable objects and the continuous synchronization with other threaded Servers can increase the baking time significantly. On the other hand only a few but very large and complex objects will take some time to prepare for the Servers which can noticeably stall the next frame render. As a general rule the total number of parsable objects and their individual size and complexity should be balanced to avoid framerate issues or very long baking times. The combined mesh is then passed to the Recast Navigation Object to test the source geometry for walkable terrain suitable to [NavigationMesh] agent properties by creating a voxel world around the meshes bounding area.
 		The finalized navigation mesh is then returned and stored inside the [NavigationMesh] for use as a resource inside [NavigationRegion3D] nodes.
 		[b]Note:[/b] Using meshes to not only define walkable surfaces but also obstruct navigation baking does not always work. The navigation baking has no concept of what is a geometry "inside" when dealing with mesh source geometry and this is intentional. Depending on current baking parameters, as soon as the obstructing mesh is large enough to fit a navigation mesh area inside, the baking will generate navigation mesh areas that are inside the obstructing source geometry mesh.
 	</description>
@@ -15,17 +15,17 @@
 	<methods>
 		<method name="bake">
 			<return type="void" />
-			<argument index="0" name="nav_mesh" type="NavigationMesh" />
-			<argument index="1" name="root_node" type="Node" />
+			<param index="0" name="nav_mesh" type="NavigationMesh" />
+			<param index="1" name="root_node" type="Node" />
 			<description>
-				Bakes navigation data to the provided [code]nav_mesh[/code] by parsing child nodes under the provided [code]root_node[/code] or a specific group of nodes for potential source geometry. The parse behavior can be controlled with the [member NavigationMesh.geometry_parsed_geometry_type] and [member NavigationMesh.geometry_source_geometry_mode] properties on the [NavigationMesh] resource.
+				Bakes navigation data to the provided [param nav_mesh] by parsing child nodes under the provided [param root_node] or a specific group of nodes for potential source geometry. The parse behavior can be controlled with the [member NavigationMesh.geometry_parsed_geometry_type] and [member NavigationMesh.geometry_source_geometry_mode] properties on the [NavigationMesh] resource.
 			</description>
 		</method>
 		<method name="clear">
 			<return type="void" />
-			<argument index="0" name="nav_mesh" type="NavigationMesh" />
+			<param index="0" name="nav_mesh" type="NavigationMesh" />
 			<description>
-				Removes all polygons and vertices from the provided [code]nav_mesh[/code] resource.
+				Removes all polygons and vertices from the provided [param nav_mesh] resource.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/NavigationPolygon.xml b/doc/classes/NavigationPolygon.xml
index 0a2ceeedc5..19466c171f 100644
--- a/doc/classes/NavigationPolygon.xml
+++ b/doc/classes/NavigationPolygon.xml
@@ -48,22 +48,22 @@
 	<methods>
 		<method name="add_outline">
 			<return type="void" />
-			<argument index="0" name="outline" type="PackedVector2Array" />
+			<param index="0" name="outline" type="PackedVector2Array" />
 			<description>
 				Appends a [PackedVector2Array] that contains the vertices of an outline to the internal array that contains all the outlines. You have to call [method make_polygons_from_outlines] in order for this array to be converted to polygons that the engine will use.
 			</description>
 		</method>
 		<method name="add_outline_at_index">
 			<return type="void" />
-			<argument index="0" name="outline" type="PackedVector2Array" />
-			<argument index="1" name="index" type="int" />
+			<param index="0" name="outline" type="PackedVector2Array" />
+			<param index="1" name="index" type="int" />
 			<description>
 				Adds a [PackedVector2Array] that contains the vertices of an outline to the internal array that contains all the outlines at a fixed position. You have to call [method make_polygons_from_outlines] in order for this array to be converted to polygons that the engine will use.
 			</description>
 		</method>
 		<method name="add_polygon">
 			<return type="void" />
-			<argument index="0" name="polygon" type="PackedInt32Array" />
+			<param index="0" name="polygon" type="PackedInt32Array" />
 			<description>
 				Adds a polygon using the indices of the vertices you get when calling [method get_vertices].
 			</description>
@@ -88,7 +88,7 @@
 		</method>
 		<method name="get_outline" qualifiers="const">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns a [PackedVector2Array] containing the vertices of an outline that was created in the editor or by script.
 			</description>
@@ -101,7 +101,7 @@
 		</method>
 		<method name="get_polygon">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns a [PackedInt32Array] containing the indices of the vertices of a created polygon.
 			</description>
@@ -126,22 +126,22 @@
 		</method>
 		<method name="remove_outline">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Removes an outline created in the editor or by script. You have to call [method make_polygons_from_outlines] for the polygons to update.
 			</description>
 		</method>
 		<method name="set_outline">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="outline" type="PackedVector2Array" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="outline" type="PackedVector2Array" />
 			<description>
 				Changes an outline created in the editor or by script. You have to call [method make_polygons_from_outlines] for the polygons to update.
 			</description>
 		</method>
 		<method name="set_vertices">
 			<return type="void" />
-			<argument index="0" name="vertices" type="PackedVector2Array" />
+			<param index="0" name="vertices" type="PackedVector2Array" />
 			<description>
 				Sets the vertices that can be then indexed to create polygons with the [method add_polygon] method.
 			</description>
diff --git a/doc/classes/NavigationRegion2D.xml b/doc/classes/NavigationRegion2D.xml
index 75b6544827..89f7dcb4af 100644
--- a/doc/classes/NavigationRegion2D.xml
+++ b/doc/classes/NavigationRegion2D.xml
@@ -16,9 +16,9 @@
 	<methods>
 		<method name="get_navigation_layer_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
-				Returns whether or not the specified layer of the [member navigation_layers] bitmask is enabled, given a [code]layer_number[/code] between 1 and 32.
+				Returns whether or not the specified layer of the [member navigation_layers] bitmask is enabled, given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="get_region_rid" qualifiers="const">
@@ -29,10 +29,10 @@
 		</method>
 		<method name="set_navigation_layer_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
-				Based on [code]value[/code], enables or disables the specified layer in the [member navigation_layers] bitmask, given a [code]layer_number[/code] between 1 and 32.
+				Based on [param value], enables or disables the specified layer in the [member navigation_layers] bitmask, given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/NavigationRegion3D.xml b/doc/classes/NavigationRegion3D.xml
index f5824a24fd..1e096515be 100644
--- a/doc/classes/NavigationRegion3D.xml
+++ b/doc/classes/NavigationRegion3D.xml
@@ -16,16 +16,16 @@
 	<methods>
 		<method name="bake_navigation_mesh">
 			<return type="void" />
-			<argument index="0" name="on_thread" type="bool" default="true" />
+			<param index="0" name="on_thread" type="bool" default="true" />
 			<description>
-				Bakes the [NavigationMesh]. If [code]on_thread[/code] is set to [code]true[/code] (default), the baking is done on a separate thread. Baking on separate thread is useful because navigation baking is not a cheap operation. When it is completed, it automatically sets the new [NavigationMesh]. Please note that baking on separate thread may be very slow if geometry is parsed from meshes as async access to each mesh involves heavy synchronization. Also, please note that baking on a separate thread is automatically disabled on operating systems that cannot use threads (such as HTML5 with threads disabled).
+				Bakes the [NavigationMesh]. If [param on_thread] is set to [code]true[/code] (default), the baking is done on a separate thread. Baking on separate thread is useful because navigation baking is not a cheap operation. When it is completed, it automatically sets the new [NavigationMesh]. Please note that baking on separate thread may be very slow if geometry is parsed from meshes as async access to each mesh involves heavy synchronization. Also, please note that baking on a separate thread is automatically disabled on operating systems that cannot use threads (such as HTML5 with threads disabled).
 			</description>
 		</method>
 		<method name="get_navigation_layer_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
-				Returns whether or not the specified layer of the [member navigation_layers] bitmask is enabled, given a [code]layer_number[/code] between 1 and 32.
+				Returns whether or not the specified layer of the [member navigation_layers] bitmask is enabled, given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="get_region_rid" qualifiers="const">
@@ -36,10 +36,10 @@
 		</method>
 		<method name="set_navigation_layer_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
-				Based on [code]value[/code], enables or disables the specified layer in the [member navigation_layers] bitmask, given a [code]layer_number[/code] between 1 and 32.
+				Based on [param value], enables or disables the specified layer in the [member navigation_layers] bitmask, given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/NavigationServer2D.xml b/doc/classes/NavigationServer2D.xml
index 36379d2531..e4e9a7fea9 100644
--- a/doc/classes/NavigationServer2D.xml
+++ b/doc/classes/NavigationServer2D.xml
@@ -25,104 +25,104 @@
 		</method>
 		<method name="agent_get_map" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="agent" type="RID" />
+			<param index="0" name="agent" type="RID" />
 			<description>
-				Returns the navigation map [RID] the requested [code]agent[/code] is currently assigned to.
+				Returns the navigation map [RID] the requested [param agent] is currently assigned to.
 			</description>
 		</method>
 		<method name="agent_is_map_changed" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="agent" type="RID" />
+			<param index="0" name="agent" type="RID" />
 			<description>
 				Returns true if the map got changed the previous frame.
 			</description>
 		</method>
 		<method name="agent_set_callback" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="agent" type="RID" />
-			<argument index="1" name="receiver" type="Object" />
-			<argument index="2" name="method" type="StringName" />
-			<argument index="3" name="userdata" type="Variant" default="null" />
+			<param index="0" name="agent" type="RID" />
+			<param index="1" name="receiver" type="Object" />
+			<param index="2" name="method" type="StringName" />
+			<param index="3" name="userdata" type="Variant" default="null" />
 			<description>
-				Callback called at the end of the RVO process. If a callback is created manually and the agent is placed on a navigation map it will calculate avoidance for the agent and dispatch the calculated [code]safe_velocity[/code] to the [code]receiver[/code] object with a signal to the chosen [code]method[/code] name.
-				[b]Note:[/b] Created callbacks are always processed independently of the SceneTree state as long as the agent is on a navigation map and not freed. To disable the dispatch of a callback from an agent use [method agent_set_callback] again with a [code]null[/code] object as the [code]receiver[/code].
+				Callback called at the end of the RVO process. If a callback is created manually and the agent is placed on a navigation map it will calculate avoidance for the agent and dispatch the calculated [code]safe_velocity[/code] to the [param receiver] object with a signal to the chosen [param method] name.
+				[b]Note:[/b] Created callbacks are always processed independently of the SceneTree state as long as the agent is on a navigation map and not freed. To disable the dispatch of a callback from an agent use [method agent_set_callback] again with a [code]null[/code] object as the [param receiver].
 			</description>
 		</method>
 		<method name="agent_set_map" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="agent" type="RID" />
-			<argument index="1" name="map" type="RID" />
+			<param index="0" name="agent" type="RID" />
+			<param index="1" name="map" type="RID" />
 			<description>
 				Puts the agent in the map.
 			</description>
 		</method>
 		<method name="agent_set_max_neighbors" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="agent" type="RID" />
-			<argument index="1" name="count" type="int" />
+			<param index="0" name="agent" type="RID" />
+			<param index="1" name="count" type="int" />
 			<description>
 				Sets the maximum number of other agents the agent takes into account in the navigation. The larger this number, the longer the running time of the simulation. If the number is too low, the simulation will not be safe.
 			</description>
 		</method>
 		<method name="agent_set_max_speed" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="agent" type="RID" />
-			<argument index="1" name="max_speed" type="float" />
+			<param index="0" name="agent" type="RID" />
+			<param index="1" name="max_speed" type="float" />
 			<description>
 				Sets the maximum speed of the agent. Must be positive.
 			</description>
 		</method>
 		<method name="agent_set_neighbor_dist" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="agent" type="RID" />
-			<argument index="1" name="dist" type="float" />
+			<param index="0" name="agent" type="RID" />
+			<param index="1" name="dist" type="float" />
 			<description>
 				Sets the maximum distance to other agents this agent takes into account in the navigation. The larger this number, the longer the running time of the simulation. If the number is too low, the simulation will not be safe.
 			</description>
 		</method>
 		<method name="agent_set_position" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="agent" type="RID" />
-			<argument index="1" name="position" type="Vector2" />
+			<param index="0" name="agent" type="RID" />
+			<param index="1" name="position" type="Vector2" />
 			<description>
 				Sets the position of the agent in world space.
 			</description>
 		</method>
 		<method name="agent_set_radius" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="agent" type="RID" />
-			<argument index="1" name="radius" type="float" />
+			<param index="0" name="agent" type="RID" />
+			<param index="1" name="radius" type="float" />
 			<description>
 				Sets the radius of the agent.
 			</description>
 		</method>
 		<method name="agent_set_target_velocity" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="agent" type="RID" />
-			<argument index="1" name="target_velocity" type="Vector2" />
+			<param index="0" name="agent" type="RID" />
+			<param index="1" name="target_velocity" type="Vector2" />
 			<description>
 				Sets the new target velocity.
 			</description>
 		</method>
 		<method name="agent_set_time_horizon" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="agent" type="RID" />
-			<argument index="1" name="time" type="float" />
+			<param index="0" name="agent" type="RID" />
+			<param index="1" name="time" type="float" />
 			<description>
 				The minimal amount of time for which the agent's velocities that are computed by the simulation are safe with respect to other agents. The larger this number, the sooner this agent will respond to the presence of other agents, but the less freedom this agent has in choosing its velocities. Must be positive.
 			</description>
 		</method>
 		<method name="agent_set_velocity" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="agent" type="RID" />
-			<argument index="1" name="velocity" type="Vector2" />
+			<param index="0" name="agent" type="RID" />
+			<param index="1" name="velocity" type="Vector2" />
 			<description>
 				Sets the current velocity of the agent.
 			</description>
 		</method>
 		<method name="free_rid" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="rid" type="RID" />
+			<param index="0" name="rid" type="RID" />
 			<description>
 				Destroys the given RID.
 			</description>
@@ -141,9 +141,9 @@
 		</method>
 		<method name="map_force_update">
 			<return type="void" />
-			<argument index="0" name="map" type="RID" />
+			<param index="0" name="map" type="RID" />
 			<description>
-				This function immediately forces synchronization of the specified navigation [code]map[/code] [RID]. By default navigation maps are only synchronized at the end of each physics frame. This function can be used to immediately (re)calculate all the navigation meshes and region connections of the navigation map. This makes it possible to query a navigation path for a changed map immediately and in the same frame (multiple times if needed).
+				This function immediately forces synchronization of the specified navigation [param map] [RID]. By default navigation maps are only synchronized at the end of each physics frame. This function can be used to immediately (re)calculate all the navigation meshes and region connections of the navigation map. This makes it possible to query a navigation path for a changed map immediately and in the same frame (multiple times if needed).
 				Due to technical restrictions the current NavigationServer command queue will be flushed. This means all already queued update commands for this physics frame will be executed, even those intended for other maps, regions and agents not part of the specified map. The expensive computation of the navigation meshes and region connections of a map will only be done for the specified map. Other maps will receive the normal synchronization at the end of the physics frame. Should the specified map receive changes after the forced update it will update again as well when the other maps receive their update.
 				Avoidance processing and dispatch of the [code]safe_velocity[/code] signals is untouched by this function and continues to happen for all maps and agents at the end of the physics frame.
 				[b]Note:[/b] With great power comes great responsibility. This function should only be used by users that really know what they are doing and have a good reason for it. Forcing an immediate update of a navigation map requires locking the NavigationServer and flushing the entire NavigationServer command queue. Not only can this severely impact the performance of a game but it can also introduce bugs if used inappropriately without much foresight.
@@ -151,86 +151,86 @@
 		</method>
 		<method name="map_get_agents" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="map" type="RID" />
+			<param index="0" name="map" type="RID" />
 			<description>
-				Returns all navigation agents [RID]s that are currently assigned to the requested navigation [code]map[/code].
+				Returns all navigation agents [RID]s that are currently assigned to the requested navigation [param map].
 			</description>
 		</method>
 		<method name="map_get_cell_size" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="map" type="RID" />
+			<param index="0" name="map" type="RID" />
 			<description>
 				Returns the map cell size.
 			</description>
 		</method>
 		<method name="map_get_closest_point" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="map" type="RID" />
-			<argument index="1" name="to_point" type="Vector2" />
+			<param index="0" name="map" type="RID" />
+			<param index="1" name="to_point" type="Vector2" />
 			<description>
-				Returns the point closest to the provided [code]to_point[/code] on the navigation mesh surface.
+				Returns the point closest to the provided [param to_point] on the navigation mesh surface.
 			</description>
 		</method>
 		<method name="map_get_closest_point_owner" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="map" type="RID" />
-			<argument index="1" name="to_point" type="Vector2" />
+			<param index="0" name="map" type="RID" />
+			<param index="1" name="to_point" type="Vector2" />
 			<description>
 				Returns the owner region RID for the point returned by [method map_get_closest_point].
 			</description>
 		</method>
 		<method name="map_get_edge_connection_margin" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="map" type="RID" />
+			<param index="0" name="map" type="RID" />
 			<description>
 				Returns the edge connection margin of the map. The edge connection margin is a distance used to connect two regions.
 			</description>
 		</method>
 		<method name="map_get_path" qualifiers="const">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="map" type="RID" />
-			<argument index="1" name="origin" type="Vector2" />
-			<argument index="2" name="destination" type="Vector2" />
-			<argument index="3" name="optimize" type="bool" />
-			<argument index="4" name="navigation_layers" type="int" default="1" />
+			<param index="0" name="map" type="RID" />
+			<param index="1" name="origin" type="Vector2" />
+			<param index="2" name="destination" type="Vector2" />
+			<param index="3" name="optimize" type="bool" />
+			<param index="4" name="navigation_layers" type="int" default="1" />
 			<description>
-				Returns the navigation path to reach the destination from the origin. [code]navigation_layers[/code] is a bitmask of all region navigation layers that are allowed to be in the path.
+				Returns the navigation path to reach the destination from the origin. [param navigation_layers] is a bitmask of all region navigation layers that are allowed to be in the path.
 			</description>
 		</method>
 		<method name="map_get_regions" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="map" type="RID" />
+			<param index="0" name="map" type="RID" />
 			<description>
-				Returns all navigation regions [RID]s that are currently assigned to the requested navigation [code]map[/code].
+				Returns all navigation regions [RID]s that are currently assigned to the requested navigation [param map].
 			</description>
 		</method>
 		<method name="map_is_active" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="nap" type="RID" />
+			<param index="0" name="map" type="RID" />
 			<description>
 				Returns true if the map is active.
 			</description>
 		</method>
 		<method name="map_set_active" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="map" type="RID" />
-			<argument index="1" name="active" type="bool" />
+			<param index="0" name="map" type="RID" />
+			<param index="1" name="active" type="bool" />
 			<description>
 				Sets the map active.
 			</description>
 		</method>
 		<method name="map_set_cell_size" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="map" type="RID" />
-			<argument index="1" name="cell_size" type="float" />
+			<param index="0" name="map" type="RID" />
+			<param index="1" name="cell_size" type="float" />
 			<description>
 				Set the map cell size used to weld the navigation mesh polygons.
 			</description>
 		</method>
 		<method name="map_set_edge_connection_margin" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="map" type="RID" />
-			<argument index="1" name="margin" type="float" />
+			<param index="0" name="map" type="RID" />
+			<param index="1" name="margin" type="float" />
 			<description>
 				Set the map edge connection margin used to weld the compatible region edges.
 			</description>
@@ -243,117 +243,117 @@
 		</method>
 		<method name="region_get_connection_pathway_end" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="region" type="RID" />
-			<argument index="1" name="connection" type="int" />
+			<param index="0" name="region" type="RID" />
+			<param index="1" name="connection" type="int" />
 			<description>
-				Returns the ending point of a connection door. [code]connection[/code] is an index between 0 and the return value of [method region_get_connections_count].
+				Returns the ending point of a connection door. [param connection] is an index between 0 and the return value of [method region_get_connections_count].
 			</description>
 		</method>
 		<method name="region_get_connection_pathway_start" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="region" type="RID" />
-			<argument index="1" name="connection" type="int" />
+			<param index="0" name="region" type="RID" />
+			<param index="1" name="connection" type="int" />
 			<description>
-				Returns the starting point of a connection door. [code]connection[/code] is an index between 0 and the return value of [method region_get_connections_count].
+				Returns the starting point of a connection door. [param connection] is an index between 0 and the return value of [method region_get_connections_count].
 			</description>
 		</method>
 		<method name="region_get_connections_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="region" type="RID" />
+			<param index="0" name="region" type="RID" />
 			<description>
-				Returns how many connections this [code]region[/code] has with other regions in the map.
+				Returns how many connections this [param region] has with other regions in the map.
 			</description>
 		</method>
 		<method name="region_get_enter_cost" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="region" type="RID" />
+			<param index="0" name="region" type="RID" />
 			<description>
-				Returns the [code]enter_cost[/code] of this [code]region[/code].
+				Returns the [code]enter_cost[/code] of this [param region].
 			</description>
 		</method>
 		<method name="region_get_map" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="region" type="RID" />
+			<param index="0" name="region" type="RID" />
 			<description>
-				Returns the navigation map [RID] the requested [code]region[/code] is currently assigned to.
+				Returns the navigation map [RID] the requested [param region] is currently assigned to.
 			</description>
 		</method>
 		<method name="region_get_navigation_layers" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="region" type="RID" />
+			<param index="0" name="region" type="RID" />
 			<description>
 				Returns the region's navigation layers.
 			</description>
 		</method>
 		<method name="region_get_travel_cost" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="region" type="RID" />
+			<param index="0" name="region" type="RID" />
 			<description>
-				Returns the [code]travel_cost[/code] of this [code]region[/code].
+				Returns the [code]travel_cost[/code] of this [param region].
 			</description>
 		</method>
 		<method name="region_owns_point" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="region" type="RID" />
-			<argument index="1" name="point" type="Vector2" />
+			<param index="0" name="region" type="RID" />
+			<param index="1" name="point" type="Vector2" />
 			<description>
-				Returns [code]true[/code] if the provided [code]point[/code] in world space is currently owned by the provided navigation [code]region[/code]. Owned in this context means that one of the region's navigation mesh polygon faces has a possible position at the closest distance to this point compared to all other navigation meshes from other navigation regions that are also registered on the navigation map of the provided region.
+				Returns [code]true[/code] if the provided [param point] in world space is currently owned by the provided navigation [param region]. Owned in this context means that one of the region's navigation mesh polygon faces has a possible position at the closest distance to this point compared to all other navigation meshes from other navigation regions that are also registered on the navigation map of the provided region.
 				If multiple navigation meshes have positions at equal distance the navigation region whose polygons are processed first wins the ownership. Polygons are processed in the same order that navigation regions were registered on the NavigationServer.
 				[b]Note:[/b] If navigation meshes from different navigation regions overlap (which should be avoided in general) the result might not be what is expected.
 			</description>
 		</method>
 		<method name="region_set_enter_cost" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="region" type="RID" />
-			<argument index="1" name="enter_cost" type="float" />
+			<param index="0" name="region" type="RID" />
+			<param index="1" name="enter_cost" type="float" />
 			<description>
-				Sets the [code]enter_cost[/code] for this [code]region[/code].
+				Sets the [param enter_cost] for this [param region].
 			</description>
 		</method>
 		<method name="region_set_map" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="region" type="RID" />
-			<argument index="1" name="map" type="RID" />
+			<param index="0" name="region" type="RID" />
+			<param index="1" name="map" type="RID" />
 			<description>
 				Sets the map for the region.
 			</description>
 		</method>
 		<method name="region_set_navigation_layers" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="region" type="RID" />
-			<argument index="1" name="navigation_layers" type="int" />
+			<param index="0" name="region" type="RID" />
+			<param index="1" name="navigation_layers" type="int" />
 			<description>
 				Set the region's navigation layers. This allows selecting regions from a path request (when using [method NavigationServer2D.map_get_path]).
 			</description>
 		</method>
 		<method name="region_set_navpoly" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="region" type="RID" />
-			<argument index="1" name="nav_poly" type="NavigationPolygon" />
+			<param index="0" name="region" type="RID" />
+			<param index="1" name="nav_poly" type="NavigationPolygon" />
 			<description>
 				Sets the navigation mesh for the region.
 			</description>
 		</method>
 		<method name="region_set_transform" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="region" type="RID" />
-			<argument index="1" name="transform" type="Transform2D" />
+			<param index="0" name="region" type="RID" />
+			<param index="1" name="transform" type="Transform2D" />
 			<description>
 				Sets the global transformation for the region.
 			</description>
 		</method>
 		<method name="region_set_travel_cost" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="region" type="RID" />
-			<argument index="1" name="travel_cost" type="float" />
+			<param index="0" name="region" type="RID" />
+			<param index="1" name="travel_cost" type="float" />
 			<description>
-				Sets the [code]travel_cost[/code] for this [code]region[/code].
+				Sets the [param travel_cost] for this [param region].
 			</description>
 		</method>
 	</methods>
 	<signals>
 		<signal name="map_changed">
-			<argument index="0" name="map" type="RID" />
+			<param index="0" name="map" type="RID" />
 			<description>
 				Emitted when a navigation map is updated, when a region moves or is modified.
 			</description>
diff --git a/doc/classes/NavigationServer3D.xml b/doc/classes/NavigationServer3D.xml
index 8600c2643a..7c6b828aa9 100644
--- a/doc/classes/NavigationServer3D.xml
+++ b/doc/classes/NavigationServer3D.xml
@@ -25,104 +25,104 @@
 		</method>
 		<method name="agent_get_map" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="agent" type="RID" />
+			<param index="0" name="agent" type="RID" />
 			<description>
-				Returns the navigation map [RID] the requested [code]agent[/code] is currently assigned to.
+				Returns the navigation map [RID] the requested [param agent] is currently assigned to.
 			</description>
 		</method>
 		<method name="agent_is_map_changed" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="agent" type="RID" />
+			<param index="0" name="agent" type="RID" />
 			<description>
 				Returns true if the map got changed the previous frame.
 			</description>
 		</method>
 		<method name="agent_set_callback" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="agent" type="RID" />
-			<argument index="1" name="receiver" type="Object" />
-			<argument index="2" name="method" type="StringName" />
-			<argument index="3" name="userdata" type="Variant" default="null" />
+			<param index="0" name="agent" type="RID" />
+			<param index="1" name="receiver" type="Object" />
+			<param index="2" name="method" type="StringName" />
+			<param index="3" name="userdata" type="Variant" default="null" />
 			<description>
-				Callback called at the end of the RVO process. If a callback is created manually and the agent is placed on a navigation map it will calculate avoidance for the agent and dispatch the calculated [code]safe_velocity[/code] to the [code]receiver[/code] object with a signal to the chosen [code]method[/code] name.
-				[b]Note:[/b] Created callbacks are always processed independently of the SceneTree state as long as the agent is on a navigation map and not freed. To disable the dispatch of a callback from an agent use [method agent_set_callback] again with a [code]null[/code] object as the [code]receiver[/code].
+				Callback called at the end of the RVO process. If a callback is created manually and the agent is placed on a navigation map it will calculate avoidance for the agent and dispatch the calculated [code]safe_velocity[/code] to the [param receiver] object with a signal to the chosen [param method] name.
+				[b]Note:[/b] Created callbacks are always processed independently of the SceneTree state as long as the agent is on a navigation map and not freed. To disable the dispatch of a callback from an agent use [method agent_set_callback] again with a [code]null[/code] object as the [param receiver].
 			</description>
 		</method>
 		<method name="agent_set_map" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="agent" type="RID" />
-			<argument index="1" name="map" type="RID" />
+			<param index="0" name="agent" type="RID" />
+			<param index="1" name="map" type="RID" />
 			<description>
 				Puts the agent in the map.
 			</description>
 		</method>
 		<method name="agent_set_max_neighbors" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="agent" type="RID" />
-			<argument index="1" name="count" type="int" />
+			<param index="0" name="agent" type="RID" />
+			<param index="1" name="count" type="int" />
 			<description>
 				Sets the maximum number of other agents the agent takes into account in the navigation. The larger this number, the longer the running time of the simulation. If the number is too low, the simulation will not be safe.
 			</description>
 		</method>
 		<method name="agent_set_max_speed" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="agent" type="RID" />
-			<argument index="1" name="max_speed" type="float" />
+			<param index="0" name="agent" type="RID" />
+			<param index="1" name="max_speed" type="float" />
 			<description>
 				Sets the maximum speed of the agent. Must be positive.
 			</description>
 		</method>
 		<method name="agent_set_neighbor_dist" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="agent" type="RID" />
-			<argument index="1" name="dist" type="float" />
+			<param index="0" name="agent" type="RID" />
+			<param index="1" name="dist" type="float" />
 			<description>
 				Sets the maximum distance to other agents this agent takes into account in the navigation. The larger this number, the longer the running time of the simulation. If the number is too low, the simulation will not be safe.
 			</description>
 		</method>
 		<method name="agent_set_position" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="agent" type="RID" />
-			<argument index="1" name="position" type="Vector3" />
+			<param index="0" name="agent" type="RID" />
+			<param index="1" name="position" type="Vector3" />
 			<description>
 				Sets the position of the agent in world space.
 			</description>
 		</method>
 		<method name="agent_set_radius" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="agent" type="RID" />
-			<argument index="1" name="radius" type="float" />
+			<param index="0" name="agent" type="RID" />
+			<param index="1" name="radius" type="float" />
 			<description>
 				Sets the radius of the agent.
 			</description>
 		</method>
 		<method name="agent_set_target_velocity" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="agent" type="RID" />
-			<argument index="1" name="target_velocity" type="Vector3" />
+			<param index="0" name="agent" type="RID" />
+			<param index="1" name="target_velocity" type="Vector3" />
 			<description>
 				Sets the new target velocity.
 			</description>
 		</method>
 		<method name="agent_set_time_horizon" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="agent" type="RID" />
-			<argument index="1" name="time" type="float" />
+			<param index="0" name="agent" type="RID" />
+			<param index="1" name="time" type="float" />
 			<description>
 				The minimal amount of time for which the agent's velocities that are computed by the simulation are safe with respect to other agents. The larger this number, the sooner this agent will respond to the presence of other agents, but the less freedom this agent has in choosing its velocities. Must be positive.
 			</description>
 		</method>
 		<method name="agent_set_velocity" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="agent" type="RID" />
-			<argument index="1" name="velocity" type="Vector3" />
+			<param index="0" name="agent" type="RID" />
+			<param index="1" name="velocity" type="Vector3" />
 			<description>
 				Sets the current velocity of the agent.
 			</description>
 		</method>
 		<method name="free_rid" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="rid" type="RID" />
+			<param index="0" name="rid" type="RID" />
 			<description>
 				Destroys the given RID.
 			</description>
@@ -141,9 +141,9 @@
 		</method>
 		<method name="map_force_update">
 			<return type="void" />
-			<argument index="0" name="map" type="RID" />
+			<param index="0" name="map" type="RID" />
 			<description>
-				This function immediately forces synchronization of the specified navigation [code]map[/code] [RID]. By default navigation maps are only synchronized at the end of each physics frame. This function can be used to immediately (re)calculate all the navigation meshes and region connections of the navigation map. This makes it possible to query a navigation path for a changed map immediately and in the same frame (multiple times if needed).
+				This function immediately forces synchronization of the specified navigation [param map] [RID]. By default navigation maps are only synchronized at the end of each physics frame. This function can be used to immediately (re)calculate all the navigation meshes and region connections of the navigation map. This makes it possible to query a navigation path for a changed map immediately and in the same frame (multiple times if needed).
 				Due to technical restrictions the current NavigationServer command queue will be flushed. This means all already queued update commands for this physics frame will be executed, even those intended for other maps, regions and agents not part of the specified map. The expensive computation of the navigation meshes and region connections of a map will only be done for the specified map. Other maps will receive the normal synchronization at the end of the physics frame. Should the specified map receive changes after the forced update it will update again as well when the other maps receive their update.
 				Avoidance processing and dispatch of the [code]safe_velocity[/code] signals is untouched by this function and continues to happen for all maps and agents at the end of the physics frame.
 				[b]Note:[/b] With great power comes great responsibility. This function should only be used by users that really know what they are doing and have a good reason for it. Forcing an immediate update of a navigation map requires locking the NavigationServer and flushing the entire NavigationServer command queue. Not only can this severely impact the performance of a game but it can also introduce bugs if used inappropriately without much foresight.
@@ -151,126 +151,126 @@
 		</method>
 		<method name="map_get_agents" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="map" type="RID" />
+			<param index="0" name="map" type="RID" />
 			<description>
-				Returns all navigation agents [RID]s that are currently assigned to the requested navigation [code]map[/code].
+				Returns all navigation agents [RID]s that are currently assigned to the requested navigation [param map].
 			</description>
 		</method>
 		<method name="map_get_cell_size" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="map" type="RID" />
+			<param index="0" name="map" type="RID" />
 			<description>
 				Returns the map cell size.
 			</description>
 		</method>
 		<method name="map_get_closest_point" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="map" type="RID" />
-			<argument index="1" name="to_point" type="Vector3" />
+			<param index="0" name="map" type="RID" />
+			<param index="1" name="to_point" type="Vector3" />
 			<description>
-				Returns the point closest to the provided [code]point[/code] on the navigation mesh surface.
+				Returns the point closest to the provided [param to_point] on the navigation mesh surface.
 			</description>
 		</method>
 		<method name="map_get_closest_point_normal" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="map" type="RID" />
-			<argument index="1" name="to_point" type="Vector3" />
+			<param index="0" name="map" type="RID" />
+			<param index="1" name="to_point" type="Vector3" />
 			<description>
 				Returns the normal for the point returned by [method map_get_closest_point].
 			</description>
 		</method>
 		<method name="map_get_closest_point_owner" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="map" type="RID" />
-			<argument index="1" name="to_point" type="Vector3" />
+			<param index="0" name="map" type="RID" />
+			<param index="1" name="to_point" type="Vector3" />
 			<description>
 				Returns the owner region RID for the point returned by [method map_get_closest_point].
 			</description>
 		</method>
 		<method name="map_get_closest_point_to_segment" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="map" type="RID" />
-			<argument index="1" name="start" type="Vector3" />
-			<argument index="2" name="end" type="Vector3" />
-			<argument index="3" name="use_collision" type="bool" default="false" />
+			<param index="0" name="map" type="RID" />
+			<param index="1" name="start" type="Vector3" />
+			<param index="2" name="end" type="Vector3" />
+			<param index="3" name="use_collision" type="bool" default="false" />
 			<description>
 				Returns the closest point between the navigation surface and the segment.
 			</description>
 		</method>
 		<method name="map_get_edge_connection_margin" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="map" type="RID" />
+			<param index="0" name="map" type="RID" />
 			<description>
 				Returns the edge connection margin of the map. This distance is the minimum vertex distance needed to connect two edges from different regions.
 			</description>
 		</method>
 		<method name="map_get_path" qualifiers="const">
 			<return type="PackedVector3Array" />
-			<argument index="0" name="map" type="RID" />
-			<argument index="1" name="origin" type="Vector3" />
-			<argument index="2" name="destination" type="Vector3" />
-			<argument index="3" name="optimize" type="bool" />
-			<argument index="4" name="navigation_layers" type="int" default="1" />
+			<param index="0" name="map" type="RID" />
+			<param index="1" name="origin" type="Vector3" />
+			<param index="2" name="destination" type="Vector3" />
+			<param index="3" name="optimize" type="bool" />
+			<param index="4" name="navigation_layers" type="int" default="1" />
 			<description>
-				Returns the navigation path to reach the destination from the origin. [code]navigation_layers[/code] is a bitmask of all region navigation layers that are allowed to be in the path.
+				Returns the navigation path to reach the destination from the origin. [param navigation_layers] is a bitmask of all region navigation layers that are allowed to be in the path.
 			</description>
 		</method>
 		<method name="map_get_regions" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="map" type="RID" />
+			<param index="0" name="map" type="RID" />
 			<description>
-				Returns all navigation regions [RID]s that are currently assigned to the requested navigation [code]map[/code].
+				Returns all navigation regions [RID]s that are currently assigned to the requested navigation [param map].
 			</description>
 		</method>
 		<method name="map_get_up" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="map" type="RID" />
+			<param index="0" name="map" type="RID" />
 			<description>
 				Returns the map's up direction.
 			</description>
 		</method>
 		<method name="map_is_active" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="nap" type="RID" />
+			<param index="0" name="map" type="RID" />
 			<description>
 				Returns true if the map is active.
 			</description>
 		</method>
 		<method name="map_set_active" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="map" type="RID" />
-			<argument index="1" name="active" type="bool" />
+			<param index="0" name="map" type="RID" />
+			<param index="1" name="active" type="bool" />
 			<description>
 				Sets the map active.
 			</description>
 		</method>
 		<method name="map_set_cell_size" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="map" type="RID" />
-			<argument index="1" name="cell_size" type="float" />
+			<param index="0" name="map" type="RID" />
+			<param index="1" name="cell_size" type="float" />
 			<description>
 				Set the map cell size used to weld the navigation mesh polygons.
 			</description>
 		</method>
 		<method name="map_set_edge_connection_margin" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="map" type="RID" />
-			<argument index="1" name="margin" type="float" />
+			<param index="0" name="map" type="RID" />
+			<param index="1" name="margin" type="float" />
 			<description>
 				Set the map edge connection margin used to weld the compatible region edges.
 			</description>
 		</method>
 		<method name="map_set_up" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="map" type="RID" />
-			<argument index="1" name="up" type="Vector3" />
+			<param index="0" name="map" type="RID" />
+			<param index="1" name="up" type="Vector3" />
 			<description>
 				Sets the map up direction.
 			</description>
 		</method>
 		<method name="process">
 			<return type="void" />
-			<argument index="0" name="delta_time" type="float" />
+			<param index="0" name="delta_time" type="float" />
 			<description>
 				Process the collision avoidance agents.
 				The result of this process is needed by the physics server, so this must be called in the main thread.
@@ -279,8 +279,8 @@
 		</method>
 		<method name="region_bake_navmesh" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="mesh" type="NavigationMesh" />
-			<argument index="1" name="node" type="Node" />
+			<param index="0" name="mesh" type="NavigationMesh" />
+			<param index="1" name="node" type="Node" />
 			<description>
 				Bakes the navigation mesh.
 			</description>
@@ -293,116 +293,116 @@
 		</method>
 		<method name="region_get_connection_pathway_end" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="region" type="RID" />
-			<argument index="1" name="connection" type="int" />
+			<param index="0" name="region" type="RID" />
+			<param index="1" name="connection" type="int" />
 			<description>
-				Returns the ending point of a connection door. [code]connection[/code] is an index between 0 and the return value of [method region_get_connections_count].
+				Returns the ending point of a connection door. [param connection] is an index between 0 and the return value of [method region_get_connections_count].
 			</description>
 		</method>
 		<method name="region_get_connection_pathway_start" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="region" type="RID" />
-			<argument index="1" name="connection" type="int" />
+			<param index="0" name="region" type="RID" />
+			<param index="1" name="connection" type="int" />
 			<description>
-				Returns the starting point of a connection door. [code]connection[/code] is an index between 0 and the return value of [method region_get_connections_count].
+				Returns the starting point of a connection door. [param connection] is an index between 0 and the return value of [method region_get_connections_count].
 			</description>
 		</method>
 		<method name="region_get_connections_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="region" type="RID" />
+			<param index="0" name="region" type="RID" />
 			<description>
-				Returns how many connections this [code]region[/code] has with other regions in the map.
+				Returns how many connections this [param region] has with other regions in the map.
 			</description>
 		</method>
 		<method name="region_get_enter_cost" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="region" type="RID" />
+			<param index="0" name="region" type="RID" />
 			<description>
-				Returns the [code]enter_cost[/code] of this [code]region[/code].
+				Returns the [code]enter_cost[/code] of this [param region].
 			</description>
 		</method>
 		<method name="region_get_map" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="region" type="RID" />
+			<param index="0" name="region" type="RID" />
 			<description>
-				Returns the navigation map [RID] the requested [code]region[/code] is currently assigned to.
+				Returns the navigation map [RID] the requested [param region] is currently assigned to.
 			</description>
 		</method>
 		<method name="region_get_navigation_layers" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="region" type="RID" />
+			<param index="0" name="region" type="RID" />
 			<description>
 				Returns the region's navigation layers.
 			</description>
 		</method>
 		<method name="region_get_travel_cost" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="region" type="RID" />
+			<param index="0" name="region" type="RID" />
 			<description>
-				Returns the [code]travel_cost[/code] of this [code]region[/code].
+				Returns the [code]travel_cost[/code] of this [param region].
 			</description>
 		</method>
 		<method name="region_owns_point" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="region" type="RID" />
-			<argument index="1" name="point" type="Vector3" />
+			<param index="0" name="region" type="RID" />
+			<param index="1" name="point" type="Vector3" />
 			<description>
-				Returns [code]true[/code] if the provided [code]point[/code] in world space is currently owned by the provided navigation [code]region[/code]. Owned in this context means that one of the region's navigation mesh polygon faces has a possible position at the closest distance to this point compared to all other navigation meshes from other navigation regions that are also registered on the navigation map of the provided region.
+				Returns [code]true[/code] if the provided [param point] in world space is currently owned by the provided navigation [param region]. Owned in this context means that one of the region's navigation mesh polygon faces has a possible position at the closest distance to this point compared to all other navigation meshes from other navigation regions that are also registered on the navigation map of the provided region.
 				If multiple navigation meshes have positions at equal distance the navigation region whose polygons are processed first wins the ownership. Polygons are processed in the same order that navigation regions were registered on the NavigationServer.
 				[b]Note:[/b] If navigation meshes from different navigation regions overlap (which should be avoided in general) the result might not be what is expected.
 			</description>
 		</method>
 		<method name="region_set_enter_cost" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="region" type="RID" />
-			<argument index="1" name="enter_cost" type="float" />
+			<param index="0" name="region" type="RID" />
+			<param index="1" name="enter_cost" type="float" />
 			<description>
-				Sets the [code]enter_cost[/code] for this [code]region[/code].
+				Sets the [param enter_cost] for this [param region].
 			</description>
 		</method>
 		<method name="region_set_map" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="region" type="RID" />
-			<argument index="1" name="map" type="RID" />
+			<param index="0" name="region" type="RID" />
+			<param index="1" name="map" type="RID" />
 			<description>
 				Sets the map for the region.
 			</description>
 		</method>
 		<method name="region_set_navigation_layers" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="region" type="RID" />
-			<argument index="1" name="navigation_layers" type="int" />
+			<param index="0" name="region" type="RID" />
+			<param index="1" name="navigation_layers" type="int" />
 			<description>
 				Set the region's navigation layers. This allows selecting regions from a path request (when using [method NavigationServer3D.map_get_path]).
 			</description>
 		</method>
 		<method name="region_set_navmesh" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="region" type="RID" />
-			<argument index="1" name="nav_mesh" type="NavigationMesh" />
+			<param index="0" name="region" type="RID" />
+			<param index="1" name="nav_mesh" type="NavigationMesh" />
 			<description>
 				Sets the navigation mesh for the region.
 			</description>
 		</method>
 		<method name="region_set_transform" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="region" type="RID" />
-			<argument index="1" name="transform" type="Transform3D" />
+			<param index="0" name="region" type="RID" />
+			<param index="1" name="transform" type="Transform3D" />
 			<description>
 				Sets the global transformation for the region.
 			</description>
 		</method>
 		<method name="region_set_travel_cost" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="region" type="RID" />
-			<argument index="1" name="travel_cost" type="float" />
+			<param index="0" name="region" type="RID" />
+			<param index="1" name="travel_cost" type="float" />
 			<description>
-				Sets the [code]travel_cost[/code] for this [code]region[/code].
+				Sets the [param travel_cost] for this [param region].
 			</description>
 		</method>
 		<method name="set_active" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="active" type="bool" />
+			<param index="0" name="active" type="bool" />
 			<description>
 				Control activation of this server.
 			</description>
@@ -410,7 +410,7 @@
 	</methods>
 	<signals>
 		<signal name="map_changed">
-			<argument index="0" name="map" type="RID" />
+			<param index="0" name="map" type="RID" />
 			<description>
 				Emitted when a navigation map is updated, when a region moves or is modified.
 			</description>
diff --git a/doc/classes/NinePatchRect.xml b/doc/classes/NinePatchRect.xml
index 863686926a..1592718c4b 100644
--- a/doc/classes/NinePatchRect.xml
+++ b/doc/classes/NinePatchRect.xml
@@ -11,17 +11,17 @@
 	<methods>
 		<method name="get_patch_margin" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="margin" type="int" enum="Side" />
+			<param index="0" name="margin" type="int" enum="Side" />
 			<description>
 				Returns the size of the margin on the specified [enum Side].
 			</description>
 		</method>
 		<method name="set_patch_margin">
 			<return type="void" />
-			<argument index="0" name="margin" type="int" enum="Side" />
-			<argument index="1" name="value" type="int" />
+			<param index="0" name="margin" type="int" enum="Side" />
+			<param index="1" name="value" type="int" />
 			<description>
-				Sets the size of the margin on the specified [enum Side] to [code]value[/code] pixels.
+				Sets the size of the margin on the specified [enum Side] to [param value] pixels.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/Node.xml b/doc/classes/Node.xml
index 8cc8498609..d38a724d39 100644
--- a/doc/classes/Node.xml
+++ b/doc/classes/Node.xml
@@ -46,7 +46,7 @@
 		</method>
 		<method name="_input" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="event" type="InputEvent" />
+			<param index="0" name="event" type="InputEvent" />
 			<description>
 				Called when there is an input event. The input event propagates up through the node tree until a node consumes it.
 				It is only called if input processing is enabled, which is done automatically if this method is overridden, and can be toggled with [method set_process_input].
@@ -57,9 +57,9 @@
 		</method>
 		<method name="_physics_process" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="delta" type="float" />
+			<param index="0" name="delta" type="float" />
 			<description>
-				Called during the physics processing step of the main loop. Physics processing means that the frame rate is synced to the physics, i.e. the [code]delta[/code] variable should be constant. [code]delta[/code] is in seconds.
+				Called during the physics processing step of the main loop. Physics processing means that the frame rate is synced to the physics, i.e. the [param delta] variable should be constant. [param delta] is in seconds.
 				It is only called if physics processing is enabled, which is done automatically if this method is overridden, and can be toggled with [method set_physics_process].
 				Corresponds to the [constant NOTIFICATION_PHYSICS_PROCESS] notification in [method Object._notification].
 				[b]Note:[/b] This method is only called if the node is present in the scene tree (i.e. if it's not an orphan).
@@ -67,9 +67,9 @@
 		</method>
 		<method name="_process" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="delta" type="float" />
+			<param index="0" name="delta" type="float" />
 			<description>
-				Called during the processing step of the main loop. Processing happens at every frame and as fast as possible, so the [code]delta[/code] time since the previous frame is not constant. [code]delta[/code] is in seconds.
+				Called during the processing step of the main loop. Processing happens at every frame and as fast as possible, so the [param delta] time since the previous frame is not constant. [param delta] is in seconds.
 				It is only called if processing is enabled, which is done automatically if this method is overridden, and can be toggled with [method set_process].
 				Corresponds to the [constant NOTIFICATION_PROCESS] notification in [method Object._notification].
 				[b]Note:[/b] This method is only called if the node is present in the scene tree (i.e. if it's not an orphan).
@@ -86,7 +86,7 @@
 		</method>
 		<method name="_shortcut_input" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="event" type="InputEvent" />
+			<param index="0" name="event" type="InputEvent" />
 			<description>
 				Called when an [InputEventKey] or [InputEventShortcut] hasn't been consumed by [method _input] or any GUI [Control] item. The input event propagates up through the node tree until a node consumes it.
 				It is only called if shortcut processing is enabled, which is done automatically if this method is overridden, and can be toggled with [method set_process_shortcut_input].
@@ -97,7 +97,7 @@
 		</method>
 		<method name="_unhandled_input" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="event" type="InputEvent" />
+			<param index="0" name="event" type="InputEvent" />
 			<description>
 				Called when an [InputEvent] hasn't been consumed by [method _input] or any GUI [Control] item. The input event propagates up through the node tree until a node consumes it.
 				It is only called if unhandled input processing is enabled, which is done automatically if this method is overridden, and can be toggled with [method set_process_unhandled_input].
@@ -108,7 +108,7 @@
 		</method>
 		<method name="_unhandled_key_input" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="event" type="InputEvent" />
+			<param index="0" name="event" type="InputEvent" />
 			<description>
 				Called when an [InputEventKey] or [InputEventShortcut] hasn't been consumed by [method _input] or any GUI [Control] item. The input event propagates up through the node tree until a node consumes it.
 				It is only called if unhandled key input processing is enabled, which is done automatically if this method is overridden, and can be toggled with [method set_process_unhandled_key_input].
@@ -120,13 +120,13 @@
 		</method>
 		<method name="add_child">
 			<return type="void" />
-			<argument index="0" name="node" type="Node" />
-			<argument index="1" name="legible_unique_name" type="bool" default="false" />
-			<argument index="2" name="internal" type="int" enum="Node.InternalMode" default="0" />
+			<param index="0" name="node" type="Node" />
+			<param index="1" name="legible_unique_name" type="bool" default="false" />
+			<param index="2" name="internal" type="int" enum="Node.InternalMode" default="0" />
 			<description>
 				Adds a child node. Nodes can have any number of children, but every child must have a unique name. Child nodes are automatically deleted when the parent node is deleted, so an entire scene can be removed by deleting its topmost node.
-				If [code]legible_unique_name[/code] is [code]true[/code], the child node will have a human-readable name based on the name of the node being instantiated instead of its type.
-				If [code]internal[/code] is different than [constant INTERNAL_MODE_DISABLED], the child will be added as internal node. Such nodes are ignored by methods like [method get_children], unless their parameter [code]include_internal[/code] is [code]true[/code].The intended usage is to hide the internal nodes from the user, so the user won't accidentally delete or modify them. Used by some GUI nodes, e.g. [ColorPicker]. See [enum InternalMode] for available modes.
+				If [param legible_unique_name] is [code]true[/code], the child node will have a human-readable name based on the name of the node being instantiated instead of its type.
+				If [param internal] is different than [constant INTERNAL_MODE_DISABLED], the child will be added as internal node. Such nodes are ignored by methods like [method get_children], unless their parameter [code]include_internal[/code] is [code]true[/code].The intended usage is to hide the internal nodes from the user, so the user won't accidentally delete or modify them. Used by some GUI nodes, e.g. [ColorPicker]. See [enum InternalMode] for available modes.
 				[b]Note:[/b] If the child node already has a parent, the function will fail. Use [method remove_child] first to remove the node from its current parent. For example:
 				[codeblocks]
 				[gdscript]
@@ -150,22 +150,22 @@
 		</method>
 		<method name="add_sibling">
 			<return type="void" />
-			<argument index="0" name="sibling" type="Node" />
-			<argument index="1" name="legible_unique_name" type="bool" default="false" />
+			<param index="0" name="sibling" type="Node" />
+			<param index="1" name="legible_unique_name" type="bool" default="false" />
 			<description>
-				Adds a [code]sibling[/code] node to current's node parent, at the same level as that node, right below it.
-				If [code]legible_unique_name[/code] is [code]true[/code], the child node will have a human-readable name based on the name of the node being instantiated instead of its type.
+				Adds a [param sibling] node to current's node parent, at the same level as that node, right below it.
+				If [param legible_unique_name] is [code]true[/code], the child node will have a human-readable name based on the name of the node being instantiated instead of its type.
 				Use [method add_child] instead of this method if you don't need the child node to be added below a specific node in the list of children.
 				[b]Note:[/b] If this node is internal, the new sibling will be internal too (see [code]internal[/code] parameter in [method add_child]).
 			</description>
 		</method>
 		<method name="add_to_group">
 			<return type="void" />
-			<argument index="0" name="group" type="StringName" />
-			<argument index="1" name="persistent" type="bool" default="false" />
+			<param index="0" name="group" type="StringName" />
+			<param index="1" name="persistent" type="bool" default="false" />
 			<description>
 				Adds the node to a group. Groups are helpers to name and organize a subset of nodes, for example "enemies" or "collectables". A node can be in any number of groups. Nodes can be assigned a group at any time, but will not be added until they are inside the scene tree (see [method is_inside_tree]). See notes in the description, and the group methods in [SceneTree].
-				The [code]persistent[/code] option is used when packing node to [PackedScene] and saving to file. Non-persistent groups aren't stored.
+				The [param persistent] option is used when packing node to [PackedScene] and saving to file. Non-persistent groups aren't stored.
 				[b]Note:[/b] For performance reasons, the order of node groups is [i]not[/i] guaranteed. The order of node groups should not be relied upon as it can vary across project runs.
 			</description>
 		</method>
@@ -186,23 +186,23 @@
 		</method>
 		<method name="duplicate" qualifiers="const">
 			<return type="Node" />
-			<argument index="0" name="flags" type="int" default="15" />
+			<param index="0" name="flags" type="int" default="15" />
 			<description>
 				Duplicates the node, returning a new node.
-				You can fine-tune the behavior using the [code]flags[/code] (see [enum DuplicateFlags]).
+				You can fine-tune the behavior using the [param flags] (see [enum DuplicateFlags]).
 				[b]Note:[/b] It will not work properly if the node contains a script with constructor arguments (i.e. needs to supply arguments to [method Object._init] method). In that case, the node will be duplicated without a script.
 			</description>
 		</method>
 		<method name="find_child" qualifiers="const">
 			<return type="Node" />
-			<argument index="0" name="pattern" type="String" />
-			<argument index="1" name="recursive" type="bool" default="true" />
-			<argument index="2" name="owned" type="bool" default="true" />
-			<description>
-				Finds the first descendant of this node whose name matches [code]pattern[/code] as in [method String.match].
-				[code]pattern[/code] does not match against the full path, just against individual node names. It is case-sensitive, with [code]"*"[/code] matching zero or more characters and [code]"?"[/code] matching any single character except [code]"."[/code]).
-				If [code]recursive[/code] is [code]true[/code], all child nodes are included, even if deeply nested. Nodes are checked in tree order, so this node's first direct child is checked first, then its own direct children, etc., before moving to the second direct child, and so on. If [code]recursive[/code] is [code]false[/code], only this node's direct children are matched.
-				If [code]owned[/code] is [code]true[/code], this method only finds nodes who have an assigned [member Node.owner]. This is especially important for scenes instantiated through a script, because those scenes don't have an owner.
+			<param index="0" name="pattern" type="String" />
+			<param index="1" name="recursive" type="bool" default="true" />
+			<param index="2" name="owned" type="bool" default="true" />
+			<description>
+				Finds the first descendant of this node whose name matches [param pattern] as in [method String.match].
+				[param pattern] does not match against the full path, just against individual node names. It is case-sensitive, with [code]"*"[/code] matching zero or more characters and [code]"?"[/code] matching any single character except [code]"."[/code]).
+				If [param recursive] is [code]true[/code], all child nodes are included, even if deeply nested. Nodes are checked in tree order, so this node's first direct child is checked first, then its own direct children, etc., before moving to the second direct child, and so on. If [param recursive] is [code]false[/code], only this node's direct children are matched.
+				If [param owned] is [code]true[/code], this method only finds nodes who have an assigned [member Node.owner]. This is especially important for scenes instantiated through a script, because those scenes don't have an owner.
 				Returns [code]null[/code] if no matching [Node] is found.
 				[b]Note:[/b] As this method walks through all the descendants of the node, it is the slowest way to get a reference to another node. Whenever possible, consider using [method get_node] with unique names instead (see [member unique_name_in_owner]), or caching the node references into variable.
 				[b]Note:[/b] To find all descendant nodes matching a pattern or a class type, see [method find_children].
@@ -210,16 +210,16 @@
 		</method>
 		<method name="find_children" qualifiers="const">
 			<return type="Node[]" />
-			<argument index="0" name="pattern" type="String" />
-			<argument index="1" name="type" type="String" default="&quot;&quot;" />
-			<argument index="2" name="recursive" type="bool" default="true" />
-			<argument index="3" name="owned" type="bool" default="true" />
-			<description>
-				Finds descendants of this node whose name matches [code]pattern[/code] as in [method String.match], and/or type matches [code]type[/code] as in [method Object.is_class].
-				[code]pattern[/code] does not match against the full path, just against individual node names. It is case-sensitive, with [code]"*"[/code] matching zero or more characters and [code]"?"[/code] matching any single character except [code]"."[/code]).
-				[code]type[/code] will check equality or inheritance, and is case-sensitive. [code]"Object"[/code] will match a node whose type is [code]"Node"[/code] but not the other way around.
-				If [code]recursive[/code] is [code]true[/code], all child nodes are included, even if deeply nested. Nodes are checked in tree order, so this node's first direct child is checked first, then its own direct children, etc., before moving to the second direct child, and so on. If [code]recursive[/code] is [code]false[/code], only this node's direct children are matched.
-				If [code]owned[/code] is [code]true[/code], this method only finds nodes who have an assigned [member Node.owner]. This is especially important for scenes instantiated through a script, because those scenes don't have an owner.
+			<param index="0" name="pattern" type="String" />
+			<param index="1" name="type" type="String" default="&quot;&quot;" />
+			<param index="2" name="recursive" type="bool" default="true" />
+			<param index="3" name="owned" type="bool" default="true" />
+			<description>
+				Finds descendants of this node whose name matches [param pattern] as in [method String.match], and/or type matches [param type] as in [method Object.is_class].
+				[param pattern] does not match against the full path, just against individual node names. It is case-sensitive, with [code]"*"[/code] matching zero or more characters and [code]"?"[/code] matching any single character except [code]"."[/code]).
+				[param type] will check equality or inheritance, and is case-sensitive. [code]"Object"[/code] will match a node whose type is [code]"Node"[/code] but not the other way around.
+				If [param recursive] is [code]true[/code], all child nodes are included, even if deeply nested. Nodes are checked in tree order, so this node's first direct child is checked first, then its own direct children, etc., before moving to the second direct child, and so on. If [param recursive] is [code]false[/code], only this node's direct children are matched.
+				If [param owned] is [code]true[/code], this method only finds nodes who have an assigned [member Node.owner]. This is especially important for scenes instantiated through a script, because those scenes don't have an owner.
 				Returns an empty array if no matching nodes are found.
 				[b]Note:[/b] As this method walks through all the descendants of the node, it is the slowest way to get references to other nodes. Whenever possible, consider caching the node references into variables.
 				[b]Note:[/b] If you only want to find the first descendant node that matches a pattern, see [method find_child].
@@ -227,38 +227,38 @@
 		</method>
 		<method name="find_parent" qualifiers="const">
 			<return type="Node" />
-			<argument index="0" name="pattern" type="String" />
+			<param index="0" name="pattern" type="String" />
 			<description>
-				Finds the first parent of the current node whose name matches [code]pattern[/code] as in [method String.match].
-				[code]pattern[/code] does not match against the full path, just against individual node names. It is case-sensitive, with [code]"*"[/code] matching zero or more characters and [code]"?"[/code] matching any single character except [code]"."[/code]).
+				Finds the first parent of the current node whose name matches [param pattern] as in [method String.match].
+				[param pattern] does not match against the full path, just against individual node names. It is case-sensitive, with [code]"*"[/code] matching zero or more characters and [code]"?"[/code] matching any single character except [code]"."[/code]).
 				[b]Note:[/b] As this method walks upwards in the scene tree, it can be slow in large, deeply nested scene trees. Whenever possible, consider using [method get_node] with unique names instead (see [member unique_name_in_owner]), or caching the node references into variable.
 			</description>
 		</method>
 		<method name="get_child" qualifiers="const">
 			<return type="Node" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="include_internal" type="bool" default="false" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="include_internal" type="bool" default="false" />
 			<description>
 				Returns a child node by its index (see [method get_child_count]). This method is often used for iterating all children of a node.
 				Negative indices access the children from the last one.
-				If [code]include_internal[/code] is [code]true[/code], internal children are skipped (see [code]internal[/code] parameter in [method add_child]).
+				If [param include_internal] is [code]true[/code], internal children are skipped (see [code]internal[/code] parameter in [method add_child]).
 				To access a child node via its name, use [method get_node].
 			</description>
 		</method>
 		<method name="get_child_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="include_internal" type="bool" default="false" />
+			<param index="0" name="include_internal" type="bool" default="false" />
 			<description>
 				Returns the number of child nodes.
-				If [code]include_internal[/code] is [code]false[/code], internal children aren't counted (see [code]internal[/code] parameter in [method add_child]).
+				If [param include_internal] is [code]false[/code], internal children aren't counted (see [code]internal[/code] parameter in [method add_child]).
 			</description>
 		</method>
 		<method name="get_children" qualifiers="const">
 			<return type="Node[]" />
-			<argument index="0" name="include_internal" type="bool" default="false" />
+			<param index="0" name="include_internal" type="bool" default="false" />
 			<description>
 				Returns an array of references to node's children.
-				If [code]include_internal[/code] is [code]false[/code], the returned array won't include internal children (see [code]internal[/code] parameter in [method add_child]).
+				If [param include_internal] is [code]false[/code], the returned array won't include internal children (see [code]internal[/code] parameter in [method add_child]).
 			</description>
 		</method>
 		<method name="get_groups" qualifiers="const">
@@ -278,10 +278,10 @@
 		</method>
 		<method name="get_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="include_internal" type="bool" default="false" />
+			<param index="0" name="include_internal" type="bool" default="false" />
 			<description>
 				Returns the node's order in the scene tree branch. For example, if called on the first child node the position is [code]0[/code].
-				If [code]include_internal[/code] is [code]false[/code], the index won't take internal children into account, i.e. first non-internal child will have index of 0 (see [code]internal[/code] parameter in [method add_child]).
+				If [param include_internal] is [code]false[/code], the index won't take internal children into account, i.e. first non-internal child will have index of 0 (see [code]internal[/code] parameter in [method add_child]).
 			</description>
 		</method>
 		<method name="get_multiplayer_authority" qualifiers="const">
@@ -292,7 +292,7 @@
 		</method>
 		<method name="get_node" qualifiers="const">
 			<return type="Node" />
-			<argument index="0" name="path" type="NodePath" />
+			<param index="0" name="path" type="NodePath" />
 			<description>
 				Fetches a node. The [NodePath] can be either a relative path (from the current node) or an absolute path (in the scene tree) to a node. If the path does not exist, [code]null[/code] is returned and an error is logged. Attempts to access methods on the return value will result in an "Attempt to call &lt;method&gt; on a null instance." error.
 				[b]Note:[/b] Fetching absolute paths only works when the node is inside the scene tree (see [method is_inside_tree]).
@@ -326,7 +326,7 @@
 		</method>
 		<method name="get_node_and_resource">
 			<return type="Array" />
-			<argument index="0" name="path" type="NodePath" />
+			<param index="0" name="path" type="NodePath" />
 			<description>
 				Fetches a node and one of its resources as specified by the [NodePath]'s subname (e.g. [code]Area2D/CollisionShape2D:shape[/code]). If several nested resources are specified in the [NodePath], the last one will be fetched.
 				The return value is an array of size 3: the first index points to the [Node] (or [code]null[/code] if not found), the second index points to the [Resource] (or [code]null[/code] if not found), and the third index is the remaining [NodePath], if any.
@@ -347,9 +347,9 @@
 		</method>
 		<method name="get_node_or_null" qualifiers="const">
 			<return type="Node" />
-			<argument index="0" name="path" type="NodePath" />
+			<param index="0" name="path" type="NodePath" />
 			<description>
-				Similar to [method get_node], but does not log an error if [code]path[/code] does not point to a valid [Node].
+				Similar to [method get_node], but does not log an error if [param path] does not point to a valid [Node].
 			</description>
 		</method>
 		<method name="get_parent" qualifiers="const">
@@ -366,9 +366,9 @@
 		</method>
 		<method name="get_path_to" qualifiers="const">
 			<return type="NodePath" />
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
-				Returns the relative [NodePath] from this node to the specified [code]node[/code]. Both nodes must be in the same scene or the function will fail.
+				Returns the relative [NodePath] from this node to the specified [param node]. Both nodes must be in the same scene or the function will fail.
 			</description>
 		</method>
 		<method name="get_physics_process_delta_time" qualifiers="const">
@@ -403,21 +403,21 @@
 		</method>
 		<method name="has_node" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="path" type="NodePath" />
+			<param index="0" name="path" type="NodePath" />
 			<description>
 				Returns [code]true[/code] if the node that the [NodePath] points to exists.
 			</description>
 		</method>
 		<method name="has_node_and_resource" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="path" type="NodePath" />
+			<param index="0" name="path" type="NodePath" />
 			<description>
 				Returns [code]true[/code] if the [NodePath] points to a valid node and its subname points to a valid resource, e.g. [code]Area2D/CollisionShape2D:shape[/code]. Properties with a non-[Resource] type (e.g. nodes or primitive math types) are not considered resources.
 			</description>
 		</method>
 		<method name="is_ancestor_of" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
 				Returns [code]true[/code] if the given node is a direct or indirect child of the current node.
 			</description>
@@ -430,21 +430,21 @@
 		</method>
 		<method name="is_editable_instance" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
-				Returns [code]true[/code] if [code]node[/code] has editable children enabled relative to this node. This method is only intended for use with editor tooling.
+				Returns [code]true[/code] if [param node] has editable children enabled relative to this node. This method is only intended for use with editor tooling.
 			</description>
 		</method>
 		<method name="is_greater_than" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
 				Returns [code]true[/code] if the given node occurs later in the scene hierarchy than the current node.
 			</description>
 		</method>
 		<method name="is_in_group" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="group" type="StringName" />
+			<param index="0" name="group" type="StringName" />
 			<description>
 				Returns [code]true[/code] if this node is in the specified group. See notes in the description, and the group methods in [SceneTree].
 			</description>
@@ -511,8 +511,8 @@
 		</method>
 		<method name="move_child">
 			<return type="void" />
-			<argument index="0" name="child_node" type="Node" />
-			<argument index="1" name="to_position" type="int" />
+			<param index="0" name="child_node" type="Node" />
+			<param index="1" name="to_position" type="int" />
 			<description>
 				Moves a child node to a different position (order) among the other children. Since calls, signals, etc are performed by tree order, changing the order of children nodes may be useful.
 				[b]Note:[/b] Internal children can only be moved within their expected "internal range" (see [code]internal[/code] parameter in [method add_child]).
@@ -557,16 +557,16 @@
 		</method>
 		<method name="propagate_call">
 			<return type="void" />
-			<argument index="0" name="method" type="StringName" />
-			<argument index="1" name="args" type="Array" default="[]" />
-			<argument index="2" name="parent_first" type="bool" default="false" />
+			<param index="0" name="method" type="StringName" />
+			<param index="1" name="args" type="Array" default="[]" />
+			<param index="2" name="parent_first" type="bool" default="false" />
 			<description>
-				Calls the given method (if present) with the arguments given in [code]args[/code] on this node and recursively on all its children. If the [code]parent_first[/code] argument is [code]true[/code], the method will be called on the current node first, then on all its children. If [code]parent_first[/code] is [code]false[/code], the children will be called first.
+				Calls the given method (if present) with the arguments given in [param args] on this node and recursively on all its children. If the [param parent_first] argument is [code]true[/code], the method will be called on the current node first, then on all its children. If [param parent_first] is [code]false[/code], the children will be called first.
 			</description>
 		</method>
 		<method name="propagate_notification">
 			<return type="void" />
-			<argument index="0" name="what" type="int" />
+			<param index="0" name="what" type="int" />
 			<description>
 				Notifies the current node and all its children recursively by calling [method Object.notification] on all of them.
 			</description>
@@ -591,7 +591,7 @@
 		</method>
 		<method name="remove_child">
 			<return type="void" />
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
 				Removes a child node. The node is NOT deleted and must be deleted manually.
 				[b]Note:[/b] This function may set the [member owner] of the removed Node (or its descendants) to be [code]null[/code], if that [member owner] is no longer a parent or ancestor.
@@ -599,18 +599,18 @@
 		</method>
 		<method name="remove_from_group">
 			<return type="void" />
-			<argument index="0" name="group" type="StringName" />
+			<param index="0" name="group" type="StringName" />
 			<description>
 				Removes a node from a group. See notes in the description, and the group methods in [SceneTree].
 			</description>
 		</method>
 		<method name="replace_by">
 			<return type="void" />
-			<argument index="0" name="node" type="Node" />
-			<argument index="1" name="keep_groups" type="bool" default="false" />
+			<param index="0" name="node" type="Node" />
+			<param index="1" name="keep_groups" type="bool" default="false" />
 			<description>
 				Replaces a node in a scene by the given one. Subscriptions that pass through this node will be lost.
-				If [code]keep_groups[/code] is [code]true[/code], the [code]node[/code] is added to the same groups that the replaced node is in.
+				If [param keep_groups] is [code]true[/code], the [param node] is added to the same groups that the replaced node is in.
 				[b]Note:[/b] The given node will become the new parent of any child nodes that the replaced node had.
 				[b]Note:[/b] The replaced node is not automatically freed, so you either need to keep it in a variable for later use or free it using [method Object.free].
 			</description>
@@ -623,18 +623,18 @@
 		</method>
 		<method name="rpc" qualifiers="vararg">
 			<return type="int" enum="Error" />
-			<argument index="0" name="method" type="StringName" />
+			<param index="0" name="method" type="StringName" />
 			<description>
-				Sends a remote procedure call request for the given [code]method[/code] to peers on the network (and locally), optionally sending all additional arguments as arguments to the method called by the RPC. The call request will only be received by nodes with the same [NodePath], including the exact same node name. Behaviour depends on the RPC configuration for the given method, see [method rpc_config]. Methods are not exposed to RPCs by default. Returns [code]null[/code].
+				Sends a remote procedure call request for the given [param method] to peers on the network (and locally), optionally sending all additional arguments as arguments to the method called by the RPC. The call request will only be received by nodes with the same [NodePath], including the exact same node name. Behaviour depends on the RPC configuration for the given method, see [method rpc_config]. Methods are not exposed to RPCs by default. Returns [code]null[/code].
 				[b]Note:[/b] You can only safely use RPCs on clients after you received the [code]connected_to_server[/code] signal from the [MultiplayerAPI]. You also need to keep track of the connection state, either by the [MultiplayerAPI] signals like [code]server_disconnected[/code] or by checking [code]get_multiplayer().peer.get_connection_status() == CONNECTION_CONNECTED[/code].
 			</description>
 		</method>
 		<method name="rpc_config">
 			<return type="void" />
-			<argument index="0" name="method" type="StringName" />
-			<argument index="1" name="config" type="Variant" />
+			<param index="0" name="method" type="StringName" />
+			<param index="1" name="config" type="Variant" />
 			<description>
-				Changes the RPC mode for the given [code]method[/code] with the given [code]config[/code] which should be [code]null[/code] (to disable) or a [Dictionary] in the form:
+				Changes the RPC mode for the given [param method] with the given [param config] which should be [code]null[/code] (to disable) or a [Dictionary] in the form:
 				[codeblock]
 				{
 				    rpc_mode = MultiplayerAPI.RPCMode,
@@ -648,45 +648,45 @@
 		</method>
 		<method name="rpc_id" qualifiers="vararg">
 			<return type="int" enum="Error" />
-			<argument index="0" name="peer_id" type="int" />
-			<argument index="1" name="method" type="StringName" />
+			<param index="0" name="peer_id" type="int" />
+			<param index="1" name="method" type="StringName" />
 			<description>
-				Sends a [method rpc] to a specific peer identified by [code]peer_id[/code] (see [method MultiplayerPeer.set_target_peer]). Returns [code]null[/code].
+				Sends a [method rpc] to a specific peer identified by [param peer_id] (see [method MultiplayerPeer.set_target_peer]). Returns [code]null[/code].
 			</description>
 		</method>
 		<method name="set_display_folded">
 			<return type="void" />
-			<argument index="0" name="fold" type="bool" />
+			<param index="0" name="fold" type="bool" />
 			<description>
 				Sets the folded state of the node in the Scene dock. This method is only intended for use with editor tooling.
 			</description>
 		</method>
 		<method name="set_editable_instance">
 			<return type="void" />
-			<argument index="0" name="node" type="Node" />
-			<argument index="1" name="is_editable" type="bool" />
+			<param index="0" name="node" type="Node" />
+			<param index="1" name="is_editable" type="bool" />
 			<description>
-				Sets the editable children state of [code]node[/code] relative to this node. This method is only intended for use with editor tooling.
+				Sets the editable children state of [param node] relative to this node. This method is only intended for use with editor tooling.
 			</description>
 		</method>
 		<method name="set_multiplayer_authority">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="recursive" type="bool" default="true" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="recursive" type="bool" default="true" />
 			<description>
-				Sets the node's multiplayer authority to the peer with the given peer ID. The multiplayer authority is the peer that has authority over the node on the network. Useful in conjunction with [method rpc_config] and the [MultiplayerAPI]. Inherited from the parent node by default, which ultimately defaults to peer ID 1 (the server). If [code]recursive[/code], the given peer is recursively set as the authority for all children of this node.
+				Sets the node's multiplayer authority to the peer with the given peer ID. The multiplayer authority is the peer that has authority over the node on the network. Useful in conjunction with [method rpc_config] and the [MultiplayerAPI]. Inherited from the parent node by default, which ultimately defaults to peer ID 1 (the server). If [param recursive], the given peer is recursively set as the authority for all children of this node.
 			</description>
 		</method>
 		<method name="set_physics_process">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
+			<param index="0" name="enable" type="bool" />
 			<description>
 				Enables or disables physics (i.e. fixed framerate) processing. When a node is being processed, it will receive a [constant NOTIFICATION_PHYSICS_PROCESS] at a fixed (usually 60 FPS, see [member Engine.physics_ticks_per_second] to change) interval (and the [method _physics_process] callback will be called if exists). Enabled automatically if [method _physics_process] is overridden. Any calls to this before [method _ready] will be ignored.
 			</description>
 		</method>
 		<method name="set_physics_process_internal">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
+			<param index="0" name="enable" type="bool" />
 			<description>
 				Enables or disables internal physics for this node. Internal physics processing happens in isolation from the normal [method _physics_process] calls and is used by some nodes internally to guarantee proper functioning even if the node is paused or physics processing is disabled for scripting ([method set_physics_process]). Only useful for advanced uses to manipulate built-in nodes' behavior.
 				[b]Warning:[/b] Built-in Nodes rely on the internal processing for their own logic, so changing this value from your code may lead to unexpected behavior. Script access to this internal logic is provided for specific advanced uses, but is unsafe and not supported.
@@ -694,21 +694,21 @@
 		</method>
 		<method name="set_process">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
+			<param index="0" name="enable" type="bool" />
 			<description>
 				Enables or disables processing. When a node is being processed, it will receive a [constant NOTIFICATION_PROCESS] on every drawn frame (and the [method _process] callback will be called if exists). Enabled automatically if [method _process] is overridden. Any calls to this before [method _ready] will be ignored.
 			</description>
 		</method>
 		<method name="set_process_input">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
+			<param index="0" name="enable" type="bool" />
 			<description>
 				Enables or disables input processing. This is not required for GUI controls! Enabled automatically if [method _input] is overridden. Any calls to this before [method _ready] will be ignored.
 			</description>
 		</method>
 		<method name="set_process_internal">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
+			<param index="0" name="enable" type="bool" />
 			<description>
 				Enables or disabled internal processing for this node. Internal processing happens in isolation from the normal [method _process] calls and is used by some nodes internally to guarantee proper functioning even if the node is paused or processing is disabled for scripting ([method set_process]). Only useful for advanced uses to manipulate built-in nodes' behavior.
 				[b]Warning:[/b] Built-in Nodes rely on the internal processing for their own logic, so changing this value from your code may lead to unexpected behavior. Script access to this internal logic is provided for specific advanced uses, but is unsafe and not supported.
@@ -716,28 +716,28 @@
 		</method>
 		<method name="set_process_shortcut_input">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
+			<param index="0" name="enable" type="bool" />
 			<description>
 				Enables shortcut processing. Enabled automatically if [method _shortcut_input] is overridden. Any calls to this before [method _ready] will be ignored.
 			</description>
 		</method>
 		<method name="set_process_unhandled_input">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
+			<param index="0" name="enable" type="bool" />
 			<description>
 				Enables unhandled input processing. This is not required for GUI controls! It enables the node to receive all input that was not previously handled (usually by a [Control]). Enabled automatically if [method _unhandled_input] is overridden. Any calls to this before [method _ready] will be ignored.
 			</description>
 		</method>
 		<method name="set_process_unhandled_key_input">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
+			<param index="0" name="enable" type="bool" />
 			<description>
 				Enables unhandled key input processing. Enabled automatically if [method _unhandled_key_input] is overridden. Any calls to this before [method _ready] will be ignored.
 			</description>
 		</method>
 		<method name="set_scene_instance_load_placeholder">
 			<return type="void" />
-			<argument index="0" name="load_placeholder" type="bool" />
+			<param index="0" name="load_placeholder" type="bool" />
 			<description>
 				Sets whether this is an instance load placeholder. See [InstancePlaceholder].
 			</description>
@@ -781,17 +781,17 @@
 	</members>
 	<signals>
 		<signal name="child_entered_tree">
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
 				Emitted when a child node enters the scene tree, either because it entered on its own or because this node entered with it.
 				This signal is emitted [i]after[/i] the child node's own [constant NOTIFICATION_ENTER_TREE] and [signal tree_entered].
 			</description>
 		</signal>
 		<signal name="child_exiting_tree">
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
 				Emitted when a child node is about to exit the scene tree, either because it is being removed or freed directly, or because this node is exiting the tree.
-				When this signal is received, the child [code]node[/code] is still in the tree and valid. This signal is emitted [i]after[/i] the child node's own [signal tree_exiting] and [constant NOTIFICATION_EXIT_TREE].
+				When this signal is received, the child [param node] is still in the tree and valid. This signal is emitted [i]after[/i] the child node's own [signal tree_exiting] and [constant NOTIFICATION_EXIT_TREE].
 			</description>
 		</signal>
 		<signal name="ready">
diff --git a/doc/classes/Node2D.xml b/doc/classes/Node2D.xml
index 2238be4ece..a587811260 100644
--- a/doc/classes/Node2D.xml
+++ b/doc/classes/Node2D.xml
@@ -13,82 +13,82 @@
 	<methods>
 		<method name="apply_scale">
 			<return type="void" />
-			<argument index="0" name="ratio" type="Vector2" />
+			<param index="0" name="ratio" type="Vector2" />
 			<description>
-				Multiplies the current scale by the [code]ratio[/code] vector.
+				Multiplies the current scale by the [param ratio] vector.
 			</description>
 		</method>
 		<method name="get_angle_to" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="point" type="Vector2" />
+			<param index="0" name="point" type="Vector2" />
 			<description>
-				Returns the angle between the node and the [code]point[/code] in radians.
+				Returns the angle between the node and the [param point] in radians.
 				[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/node2d_get_angle_to.png]Illustration of the returned angle.[/url]
 			</description>
 		</method>
 		<method name="get_relative_transform_to_parent" qualifiers="const">
 			<return type="Transform2D" />
-			<argument index="0" name="parent" type="Node" />
+			<param index="0" name="parent" type="Node" />
 			<description>
 				Returns the [Transform2D] relative to this node's parent.
 			</description>
 		</method>
 		<method name="global_translate">
 			<return type="void" />
-			<argument index="0" name="offset" type="Vector2" />
+			<param index="0" name="offset" type="Vector2" />
 			<description>
-				Adds the [code]offset[/code] vector to the node's global position.
+				Adds the [param offset] vector to the node's global position.
 			</description>
 		</method>
 		<method name="look_at">
 			<return type="void" />
-			<argument index="0" name="point" type="Vector2" />
+			<param index="0" name="point" type="Vector2" />
 			<description>
-				Rotates the node so it points towards the [code]point[/code], which is expected to use global coordinates.
+				Rotates the node so it points towards the [param point], which is expected to use global coordinates.
 			</description>
 		</method>
 		<method name="move_local_x">
 			<return type="void" />
-			<argument index="0" name="delta" type="float" />
-			<argument index="1" name="scaled" type="bool" default="false" />
+			<param index="0" name="delta" type="float" />
+			<param index="1" name="scaled" type="bool" default="false" />
 			<description>
-				Applies a local translation on the node's X axis based on the [method Node._process]'s [code]delta[/code]. If [code]scaled[/code] is [code]false[/code], normalizes the movement.
+				Applies a local translation on the node's X axis based on the [method Node._process]'s [param delta]. If [param scaled] is [code]false[/code], normalizes the movement.
 			</description>
 		</method>
 		<method name="move_local_y">
 			<return type="void" />
-			<argument index="0" name="delta" type="float" />
-			<argument index="1" name="scaled" type="bool" default="false" />
+			<param index="0" name="delta" type="float" />
+			<param index="1" name="scaled" type="bool" default="false" />
 			<description>
-				Applies a local translation on the node's Y axis based on the [method Node._process]'s [code]delta[/code]. If [code]scaled[/code] is [code]false[/code], normalizes the movement.
+				Applies a local translation on the node's Y axis based on the [method Node._process]'s [param delta]. If [param scaled] is [code]false[/code], normalizes the movement.
 			</description>
 		</method>
 		<method name="rotate">
 			<return type="void" />
-			<argument index="0" name="radians" type="float" />
+			<param index="0" name="radians" type="float" />
 			<description>
 				Applies a rotation to the node, in radians, starting from its current rotation.
 			</description>
 		</method>
 		<method name="to_global" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="local_point" type="Vector2" />
+			<param index="0" name="local_point" type="Vector2" />
 			<description>
 				Transforms the provided local position into a position in global coordinate space. The input is expected to be local relative to the [Node2D] it is called on. e.g. Applying this method to the positions of child nodes will correctly transform their positions into the global coordinate space, but applying it to a node's own position will give an incorrect result, as it will incorporate the node's own transformation into its global position.
 			</description>
 		</method>
 		<method name="to_local" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="global_point" type="Vector2" />
+			<param index="0" name="global_point" type="Vector2" />
 			<description>
 				Transforms the provided global position into a position in local coordinate space. The output will be local relative to the [Node2D] it is called on. e.g. It is appropriate for determining the positions of child nodes, but it is not appropriate for determining its own position relative to its parent.
 			</description>
 		</method>
 		<method name="translate">
 			<return type="void" />
-			<argument index="0" name="offset" type="Vector2" />
+			<param index="0" name="offset" type="Vector2" />
 			<description>
-				Translates the node by the given [code]offset[/code] in local coordinates.
+				Translates the node by the given [param offset] in local coordinates.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/Node3D.xml b/doc/classes/Node3D.xml
index ff2afd595a..e9f1f995a5 100644
--- a/doc/classes/Node3D.xml
+++ b/doc/classes/Node3D.xml
@@ -15,7 +15,7 @@
 	<methods>
 		<method name="add_gizmo">
 			<return type="void" />
-			<argument index="0" name="gizmo" type="Node3DGizmo" />
+			<param index="0" name="gizmo" type="Node3DGizmo" />
 			<description>
 				Attach a gizmo to this [code]Node3D[/code].
 			</description>
@@ -58,22 +58,22 @@
 		</method>
 		<method name="global_rotate">
 			<return type="void" />
-			<argument index="0" name="axis" type="Vector3" />
-			<argument index="1" name="angle" type="float" />
+			<param index="0" name="axis" type="Vector3" />
+			<param index="1" name="angle" type="float" />
 			<description>
 				Rotates the global (world) transformation around axis, a unit [Vector3], by specified angle in radians. The rotation axis is in global coordinate system.
 			</description>
 		</method>
 		<method name="global_scale">
 			<return type="void" />
-			<argument index="0" name="scale" type="Vector3" />
+			<param index="0" name="scale" type="Vector3" />
 			<description>
 				Scales the global (world) transformation by the given [Vector3] scale factors.
 			</description>
 		</method>
 		<method name="global_translate">
 			<return type="void" />
-			<argument index="0" name="offset" type="Vector3" />
+			<param index="0" name="offset" type="Vector3" />
 			<description>
 				Moves the global (world) transformation by [Vector3] offset. The offset is in global coordinate system.
 			</description>
@@ -110,22 +110,22 @@
 		</method>
 		<method name="look_at">
 			<return type="void" />
-			<argument index="0" name="target" type="Vector3" />
-			<argument index="1" name="up" type="Vector3" default="Vector3(0, 1, 0)" />
+			<param index="0" name="target" type="Vector3" />
+			<param index="1" name="up" type="Vector3" default="Vector3(0, 1, 0)" />
 			<description>
-				Rotates the node so that the local forward axis (-Z) points toward the [code]target[/code] position.
-				The local up axis (+Y) points as close to the [code]up[/code] vector as possible while staying perpendicular to the local forward axis. The resulting transform is orthogonal, and the scale is preserved. Non-uniform scaling may not work correctly.
-				The [code]target[/code] position cannot be the same as the node's position, the [code]up[/code] vector cannot be zero, and the direction from the node's position to the [code]target[/code] vector cannot be parallel to the [code]up[/code] vector.
+				Rotates the node so that the local forward axis (-Z) points toward the [param target] position.
+				The local up axis (+Y) points as close to the [param up] vector as possible while staying perpendicular to the local forward axis. The resulting transform is orthogonal, and the scale is preserved. Non-uniform scaling may not work correctly.
+				The [param target] position cannot be the same as the node's position, the [param up] vector cannot be zero, and the direction from the node's position to the [param target] vector cannot be parallel to the [param up] vector.
 				Operations take place in global space.
 			</description>
 		</method>
 		<method name="look_at_from_position">
 			<return type="void" />
-			<argument index="0" name="position" type="Vector3" />
-			<argument index="1" name="target" type="Vector3" />
-			<argument index="2" name="up" type="Vector3" default="Vector3(0, 1, 0)" />
+			<param index="0" name="position" type="Vector3" />
+			<param index="1" name="target" type="Vector3" />
+			<param index="2" name="up" type="Vector3" default="Vector3(0, 1, 0)" />
 			<description>
-				Moves the node to the specified [code]position[/code], and then rotates the node to point toward the [code]target[/code] as per [method look_at]. Operations take place in global space.
+				Moves the node to the specified [param position], and then rotates the node to point toward the [param target] as per [method look_at]. Operations take place in global space.
 			</description>
 		</method>
 		<method name="orthonormalize">
@@ -134,67 +134,53 @@
 				Resets this node's transformations (like scale, skew and taper) preserving its rotation and translation by performing Gram-Schmidt orthonormalization on this node's [Transform3D].
 			</description>
 		</method>
-		<method name="property_can_revert">
-			<return type="bool" />
-			<argument index="0" name="name" type="String" />
-			<description>
-				Returns [code]true[/code] if the property identified by [code]name[/code] can be reverted to a default value.
-			</description>
-		</method>
-		<method name="property_get_revert">
-			<return type="Variant" />
-			<argument index="0" name="name" type="String" />
-			<description>
-				Returns the default value of the Node3D property with given [code]name[/code].
-			</description>
-		</method>
 		<method name="rotate">
 			<return type="void" />
-			<argument index="0" name="axis" type="Vector3" />
-			<argument index="1" name="angle" type="float" />
+			<param index="0" name="axis" type="Vector3" />
+			<param index="1" name="angle" type="float" />
 			<description>
 				Rotates the local transformation around axis, a unit [Vector3], by specified angle in radians.
 			</description>
 		</method>
 		<method name="rotate_object_local">
 			<return type="void" />
-			<argument index="0" name="axis" type="Vector3" />
-			<argument index="1" name="angle" type="float" />
+			<param index="0" name="axis" type="Vector3" />
+			<param index="1" name="angle" type="float" />
 			<description>
 				Rotates the local transformation around axis, a unit [Vector3], by specified angle in radians. The rotation axis is in object-local coordinate system.
 			</description>
 		</method>
 		<method name="rotate_x">
 			<return type="void" />
-			<argument index="0" name="angle" type="float" />
+			<param index="0" name="angle" type="float" />
 			<description>
 				Rotates the local transformation around the X axis by angle in radians.
 			</description>
 		</method>
 		<method name="rotate_y">
 			<return type="void" />
-			<argument index="0" name="angle" type="float" />
+			<param index="0" name="angle" type="float" />
 			<description>
 				Rotates the local transformation around the Y axis by angle in radians.
 			</description>
 		</method>
 		<method name="rotate_z">
 			<return type="void" />
-			<argument index="0" name="angle" type="float" />
+			<param index="0" name="angle" type="float" />
 			<description>
 				Rotates the local transformation around the Z axis by angle in radians.
 			</description>
 		</method>
 		<method name="scale_object_local">
 			<return type="void" />
-			<argument index="0" name="scale" type="Vector3" />
+			<param index="0" name="scale" type="Vector3" />
 			<description>
 				Scales the local transformation by given 3D scale factors in object-local coordinate system.
 			</description>
 		</method>
 		<method name="set_disable_scale">
 			<return type="void" />
-			<argument index="0" name="disable" type="bool" />
+			<param index="0" name="disable" type="bool" />
 			<description>
 				Sets whether the node uses a scale of [code](1, 1, 1)[/code] or its local transformation scale. Changes to the local transformation scale are preserved.
 			</description>
@@ -207,30 +193,30 @@
 		</method>
 		<method name="set_ignore_transform_notification">
 			<return type="void" />
-			<argument index="0" name="enabled" type="bool" />
+			<param index="0" name="enabled" type="bool" />
 			<description>
 				Sets whether the node ignores notification that its transformation (global or local) changed.
 			</description>
 		</method>
 		<method name="set_notify_local_transform">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
+			<param index="0" name="enable" type="bool" />
 			<description>
 				Sets whether the node notifies about its local transformation changes. [Node3D] will not propagate this by default.
 			</description>
 		</method>
 		<method name="set_notify_transform">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
+			<param index="0" name="enable" type="bool" />
 			<description>
 				Sets whether the node notifies about its global and local transformation changes. [Node3D] will not propagate this by default, unless it is in the editor context and it has a valid gizmo.
 			</description>
 		</method>
 		<method name="set_subgizmo_selection">
 			<return type="void" />
-			<argument index="0" name="gizmo" type="Node3DGizmo" />
-			<argument index="1" name="id" type="int" />
-			<argument index="2" name="transform" type="Transform3D" />
+			<param index="0" name="gizmo" type="Node3DGizmo" />
+			<param index="1" name="id" type="int" />
+			<param index="2" name="transform" type="Transform3D" />
 			<description>
 				Set subgizmo selection for this node in the editor.
 			</description>
@@ -243,29 +229,29 @@
 		</method>
 		<method name="to_global" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="local_point" type="Vector3" />
+			<param index="0" name="local_point" type="Vector3" />
 			<description>
-				Transforms [code]local_point[/code] from this node's local space to world space.
+				Transforms [param local_point] from this node's local space to world space.
 			</description>
 		</method>
 		<method name="to_local" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="global_point" type="Vector3" />
+			<param index="0" name="global_point" type="Vector3" />
 			<description>
-				Transforms [code]global_point[/code] from world space to this node's local space.
+				Transforms [param global_point] from world space to this node's local space.
 			</description>
 		</method>
 		<method name="translate">
 			<return type="void" />
-			<argument index="0" name="offset" type="Vector3" />
+			<param index="0" name="offset" type="Vector3" />
 			<description>
 				Changes the node's position by the given offset [Vector3].
-				Note that the translation [code]offset[/code] is affected by the node's scale, so if scaled by e.g. [code](10, 1, 1)[/code], a translation by an offset of [code](2, 0, 0)[/code] would actually add 20 ([code]2 * 10[/code]) to the X coordinate.
+				Note that the translation [param offset] is affected by the node's scale, so if scaled by e.g. [code](10, 1, 1)[/code], a translation by an offset of [code](2, 0, 0)[/code] would actually add 20 ([code]2 * 10[/code]) to the X coordinate.
 			</description>
 		</method>
 		<method name="translate_object_local">
 			<return type="void" />
-			<argument index="0" name="offset" type="Vector3" />
+			<param index="0" name="offset" type="Vector3" />
 			<description>
 				Changes the node's position by the given offset [Vector3] in local space.
 			</description>
diff --git a/doc/classes/NodePath.xml b/doc/classes/NodePath.xml
index d9e0680a38..9db100c9f8 100644
--- a/doc/classes/NodePath.xml
+++ b/doc/classes/NodePath.xml
@@ -35,14 +35,14 @@
 		</constructor>
 		<constructor name="NodePath">
 			<return type="NodePath" />
-			<argument index="0" name="from" type="NodePath" />
+			<param index="0" name="from" type="NodePath" />
 			<description>
 				Constructs a [NodePath] as a copy of the given [NodePath]. [code]NodePath("example")[/code] is equivalent to [code]^"example"[/code].
 			</description>
 		</constructor>
 		<constructor name="NodePath">
 			<return type="NodePath" />
-			<argument index="0" name="from" type="String" />
+			<param index="0" name="from" type="String" />
 			<description>
 				Creates a NodePath from a string, e.g. [code]"Path2D/PathFollow2D/Sprite2D:texture:size"[/code]. A path is absolute if it starts with a slash. Absolute paths are only valid in the global scene tree, not within individual scenes. In a relative path, [code]"."[/code] and [code]".."[/code] indicate the current node and its parent.
 				The "subnames" optionally included after the path to the target node can point to resources or properties, and can also be nested.
@@ -111,9 +111,9 @@
 		</method>
 		<method name="get_name" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Gets the node name indicated by [code]idx[/code] (0 to [method get_name_count] - 1).
+				Gets the node name indicated by [param idx] (0 to [method get_name_count] - 1).
 				[codeblocks]
 				[gdscript]
 				var node_path = NodePath("Path2D/PathFollow2D/Sprite2D")
@@ -139,9 +139,9 @@
 		</method>
 		<method name="get_subname" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Gets the resource or property name indicated by [code]idx[/code] (0 to [method get_subname_count]).
+				Gets the resource or property name indicated by [param idx] (0 to [method get_subname_count]).
 				[codeblocks]
 				[gdscript]
 				var node_path = NodePath("Path2D/PathFollow2D/Sprite2D:texture:load_path")
@@ -185,13 +185,13 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="NodePath" />
+			<param index="0" name="right" type="NodePath" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="NodePath" />
+			<param index="0" name="right" type="NodePath" />
 			<description>
 			</description>
 		</operator>
diff --git a/doc/classes/OS.xml b/doc/classes/OS.xml
index 75cd52787a..e4b5404c2c 100644
--- a/doc/classes/OS.xml
+++ b/doc/classes/OS.xml
@@ -12,8 +12,8 @@
 	<methods>
 		<method name="alert">
 			<return type="void" />
-			<argument index="0" name="text" type="String" />
-			<argument index="1" name="title" type="String" default="&quot;Alert!&quot;" />
+			<param index="0" name="text" type="String" />
+			<param index="1" name="title" type="String" default="&quot;Alert!&quot;" />
 			<description>
 				Displays a modal dialog box using the host OS' facilities. Execution is blocked until the dialog is closed.
 			</description>
@@ -33,28 +33,28 @@
 		</method>
 		<method name="crash">
 			<return type="void" />
-			<argument index="0" name="message" type="String" />
+			<param index="0" name="message" type="String" />
 			<description>
 				Crashes the engine (or the editor if called within a [code]@tool[/code] script). This should [i]only[/i] be used for testing the system's crash handler, not for any other purpose. For general error reporting, use (in order of preference) [method @GDScript.assert], [method @GlobalScope.push_error] or [method alert]. See also [method kill].
 			</description>
 		</method>
 		<method name="create_instance">
 			<return type="int" />
-			<argument index="0" name="arguments" type="PackedStringArray" />
+			<param index="0" name="arguments" type="PackedStringArray" />
 			<description>
-				Creates a new instance of Godot that runs independently. The [code]arguments[/code] are used in the given order and separated by a space.
+				Creates a new instance of Godot that runs independently. The [param arguments] are used in the given order and separated by a space.
 				If the process creation succeeds, the method will return the new process ID, which you can use to monitor the process (and potentially terminate it with [method kill]). If the process creation fails, the method will return [code]-1[/code].
 				[b]Note:[/b] This method is implemented on Android, iOS, Linux, macOS and Windows.
 			</description>
 		</method>
 		<method name="create_process">
 			<return type="int" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="arguments" type="PackedStringArray" />
-			<argument index="2" name="open_console" type="bool" default="false" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="arguments" type="PackedStringArray" />
+			<param index="2" name="open_console" type="bool" default="false" />
 			<description>
-				Creates a new process that runs independently of Godot. It will not terminate if Godot terminates. The path specified in [code]path[/code] must exist and be executable file or macOS .app bundle. Platform path resolution will be used. The [code]arguments[/code] are used in the given order and separated by a space.
-				On Windows, if [code]open_console[/code] is [code]true[/code] and the process is a console app, a new terminal window will be opened. This is ignored on other platforms.
+				Creates a new process that runs independently of Godot. It will not terminate if Godot terminates. The path specified in [param path] must exist and be executable file or macOS .app bundle. Platform path resolution will be used. The [param arguments] are used in the given order and separated by a space.
+				On Windows, if [param open_console] is [code]true[/code] and the process is a console app, a new terminal window will be opened. This is ignored on other platforms.
 				If the process creation succeeds, the method will return the new process ID, which you can use to monitor the process (and potentially terminate it with [method kill]). If the process creation fails, the method will return [code]-1[/code].
 				For example, running another instance of the project:
 				[codeblocks]
@@ -72,25 +72,25 @@
 		</method>
 		<method name="delay_msec" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="msec" type="int" />
+			<param index="0" name="msec" type="int" />
 			<description>
-				Delays execution of the current thread by [code]msec[/code] milliseconds. [code]msec[/code] must be greater than or equal to [code]0[/code]. Otherwise, [method delay_msec] will do nothing and will print an error message.
+				Delays execution of the current thread by [param msec] milliseconds. [param msec] must be greater than or equal to [code]0[/code]. Otherwise, [method delay_msec] will do nothing and will print an error message.
 				[b]Note:[/b] [method delay_msec] is a [i]blocking[/i] way to delay code execution. To delay code execution in a non-blocking way, see [method SceneTree.create_timer]. Awaiting with [method SceneTree.create_timer] will delay the execution of code placed below the [code]await[/code] without affecting the rest of the project (or editor, for [EditorPlugin]s and [EditorScript]s).
 				[b]Note:[/b] When [method delay_msec] is called on the main thread, it will freeze the project and will prevent it from redrawing and registering input until the delay has passed. When using [method delay_msec] as part of an [EditorPlugin] or [EditorScript], it will freeze the editor but won't freeze the project if it is currently running (since the project is an independent child process).
 			</description>
 		</method>
 		<method name="delay_usec" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="usec" type="int" />
+			<param index="0" name="usec" type="int" />
 			<description>
-				Delays execution of the current thread by [code]usec[/code] microseconds. [code]usec[/code] must be greater than or equal to [code]0[/code]. Otherwise, [method delay_usec] will do nothing and will print an error message.
+				Delays execution of the current thread by [param usec] microseconds. [param usec] must be greater than or equal to [code]0[/code]. Otherwise, [method delay_usec] will do nothing and will print an error message.
 				[b]Note:[/b] [method delay_usec] is a [i]blocking[/i] way to delay code execution. To delay code execution in a non-blocking way, see [method SceneTree.create_timer]. Awaiting with [method SceneTree.create_timer] will delay the execution of code placed below the [code]await[/code] without affecting the rest of the project (or editor, for [EditorPlugin]s and [EditorScript]s).
 				[b]Note:[/b] When [method delay_usec] is called on the main thread, it will freeze the project and will prevent it from redrawing and registering input until the delay has passed. When using [method delay_usec] as part of an [EditorPlugin] or [EditorScript], it will freeze the editor but won't freeze the project if it is currently running (since the project is an independent child process).
 			</description>
 		</method>
 		<method name="dump_memory_to_file">
 			<return type="void" />
-			<argument index="0" name="file" type="String" />
+			<param index="0" name="file" type="String" />
 			<description>
 				Dumps the memory allocation ringlist to a file (only works in debug).
 				Entry format per line: "Address - Size - Description".
@@ -98,7 +98,7 @@
 		</method>
 		<method name="dump_resources_to_file">
 			<return type="void" />
-			<argument index="0" name="file" type="String" />
+			<param index="0" name="file" type="String" />
 			<description>
 				Dumps all used resources to file (only works in debug).
 				Entry format per line: "Resource Type : Resource Location".
@@ -107,14 +107,14 @@
 		</method>
 		<method name="execute">
 			<return type="int" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="arguments" type="PackedStringArray" />
-			<argument index="2" name="output" type="Array" default="[]" />
-			<argument index="3" name="read_stderr" type="bool" default="false" />
-			<argument index="4" name="open_console" type="bool" default="false" />
-			<description>
-				Executes a command. The file specified in [code]path[/code] must exist and be executable. Platform path resolution will be used. The [code]arguments[/code] are used in the given order and separated by a space. If an [code]output[/code] [Array] is provided, the complete shell output of the process will be appended as a single [String] element in [code]output[/code]. If [code]read_stderr[/code] is [code]true[/code], the output to the standard error stream will be included too.
-				On Windows, if [code]open_console[/code] is [code]true[/code] and the process is a console app, a new terminal window will be opened. This is ignored on other platforms.
+			<param index="0" name="path" type="String" />
+			<param index="1" name="arguments" type="PackedStringArray" />
+			<param index="2" name="output" type="Array" default="[]" />
+			<param index="3" name="read_stderr" type="bool" default="false" />
+			<param index="4" name="open_console" type="bool" default="false" />
+			<description>
+				Executes a command. The file specified in [param path] must exist and be executable. Platform path resolution will be used. The [param arguments] are used in the given order and separated by a space. If an [param output] [Array] is provided, the complete shell output of the process will be appended as a single [String] element in [param output]. If [param read_stderr] is [code]true[/code], the output to the standard error stream will be included too.
+				On Windows, if [param open_console] is [code]true[/code] and the process is a console app, a new terminal window will be opened. This is ignored on other platforms.
 				If the command is successfully executed, the method will return the exit code of the command, or [code]-1[/code] if it fails.
 				[b]Note:[/b] The Godot thread will pause its execution until the executed command terminates. Use [Thread] to create a separate thread that will not pause the Godot thread, or use [method create_process] to create a completely independent process.
 				For example, to retrieve a list of the working directory's contents:
@@ -140,15 +140,15 @@
 				[/csharp]
 				[/codeblocks]
 				[b]Note:[/b] This method is implemented on Android, iOS, Linux, macOS and Windows.
-				[b]Note:[/b] To execute a Windows command interpreter built-in command, specify [code]cmd.exe[/code] in [code]path[/code], [code]/c[/code] as the first argument, and the desired command as the second argument.
-				[b]Note:[/b] To execute a PowerShell built-in command, specify [code]powershell.exe[/code] in [code]path[/code], [code]-Command[/code] as the first argument, and the desired command as the second argument.
-				[b]Note:[/b] To execute a Unix shell built-in command, specify shell executable name in [code]path[/code], [code]-c[/code] as the first argument, and the desired command as the second argument.
+				[b]Note:[/b] To execute a Windows command interpreter built-in command, specify [code]cmd.exe[/code] in [param path], [code]/c[/code] as the first argument, and the desired command as the second argument.
+				[b]Note:[/b] To execute a PowerShell built-in command, specify [code]powershell.exe[/code] in [param path], [code]-Command[/code] as the first argument, and the desired command as the second argument.
+				[b]Note:[/b] To execute a Unix shell built-in command, specify shell executable name in [param path], [code]-c[/code] as the first argument, and the desired command as the second argument.
 				[b]Note:[/b] On macOS, sandboxed applications are limited to run only embedded helper executables, specified during export.
 			</description>
 		</method>
 		<method name="find_keycode_from_string" qualifiers="const">
 			<return type="int" enum="Key" />
-			<argument index="0" name="string" type="String" />
+			<param index="0" name="string" type="String" />
 			<description>
 				Returns the keycode of the given string (e.g. "Escape").
 			</description>
@@ -235,10 +235,10 @@
 		</method>
 		<method name="get_environment" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="variable" type="String" />
+			<param index="0" name="variable" type="String" />
 			<description>
 				Returns the value of an environment variable. Returns an empty string if the environment variable doesn't exist.
-				[b]Note:[/b] Double-check the casing of [code]variable[/code]. Environment variable names are case-sensitive on all platforms except Windows.
+				[b]Note:[/b] Double-check the casing of [param variable]. Environment variable names are case-sensitive on all platforms except Windows.
 			</description>
 		</method>
 		<method name="get_executable_path" qualifiers="const">
@@ -257,7 +257,7 @@
 		</method>
 		<method name="get_keycode_string" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="code" type="int" enum="Key" />
+			<param index="0" name="code" type="int" enum="Key" />
 			<description>
 				Returns the given keycode as a string (e.g. Return values: [code]"Escape"[/code], [code]"Shift+Escape"[/code]).
 				See also [member InputEventKey.keycode] and [method InputEventKey.get_keycode_with_modifiers].
@@ -394,8 +394,8 @@
 		</method>
 		<method name="get_system_dir" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="dir" type="int" enum="OS.SystemDir" />
-			<argument index="1" name="shared_storage" type="bool" default="true" />
+			<param index="0" name="dir" type="int" enum="OS.SystemDir" />
+			<param index="1" name="shared_storage" type="bool" default="true" />
 			<description>
 				Returns the actual path to commonly used folders across different platforms. Available locations are specified in [enum SystemDir].
 				[b]Note:[/b] This method is implemented on Android, Linux, macOS and Windows.
@@ -404,11 +404,11 @@
 		</method>
 		<method name="get_system_font_path" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="font_name" type="String" />
-			<argument index="1" name="bold" type="bool" default="false" />
-			<argument index="2" name="italic" type="bool" default="false" />
+			<param index="0" name="font_name" type="String" />
+			<param index="1" name="bold" type="bool" default="false" />
+			<param index="2" name="italic" type="bool" default="false" />
 			<description>
-				Returns path to the system font file with [code]font_name[/code] and style. Return empty string if no matching fonts found.
+				Returns path to the system font file with [param font_name] and style. Return empty string if no matching fonts found.
 				[b]Note:[/b] This method is implemented on iOS, Linux, macOS and Windows.
 			</description>
 		</method>
@@ -449,15 +449,15 @@
 		</method>
 		<method name="has_environment" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="variable" type="String" />
+			<param index="0" name="variable" type="String" />
 			<description>
-				Returns [code]true[/code] if the environment variable with the name [code]variable[/code] exists.
-				[b]Note:[/b] Double-check the casing of [code]variable[/code]. Environment variable names are case-sensitive on all platforms except Windows.
+				Returns [code]true[/code] if the environment variable with the name [param variable] exists.
+				[b]Note:[/b] Double-check the casing of [param variable]. Environment variable names are case-sensitive on all platforms except Windows.
 			</description>
 		</method>
 		<method name="has_feature" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="tag_name" type="String" />
+			<param index="0" name="tag_name" type="String" />
 			<description>
 				Returns [code]true[/code] if the feature for the given feature tag is supported in the currently running instance, depending on the platform, build, etc. Can be used to check whether you're currently running a debug build, on a certain platform or arch, etc. Refer to the [url=$DOCS_URL/getting_started/workflow/export/feature_tags.html]Feature Tags[/url] documentation for more details.
 				[b]Note:[/b] Tag names are case-sensitive.
@@ -473,16 +473,16 @@
 		</method>
 		<method name="is_keycode_unicode" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="code" type="int" />
+			<param index="0" name="code" type="int" />
 			<description>
 				Returns [code]true[/code] if the input keycode corresponds to a Unicode character.
 			</description>
 		</method>
 		<method name="is_process_running" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="pid" type="int" />
+			<param index="0" name="pid" type="int" />
 			<description>
-				Returns [code]true[/code] if the child process ID ([code]pid[/code]) is still running or [code]false[/code] if it has terminated.
+				Returns [code]true[/code] if the child process ID ([param pid]) is still running or [code]false[/code] if it has terminated.
 				Must be a valid ID generated from [method create_process].
 				[b]Note:[/b] This method is implemented on Android, iOS, Linux, macOS and Windows.
 			</description>
@@ -507,16 +507,16 @@
 		</method>
 		<method name="kill">
 			<return type="int" enum="Error" />
-			<argument index="0" name="pid" type="int" />
+			<param index="0" name="pid" type="int" />
 			<description>
-				Kill (terminate) the process identified by the given process ID ([code]pid[/code]), e.g. the one returned by [method execute] in non-blocking mode. See also [method crash].
+				Kill (terminate) the process identified by the given process ID ([param pid]), e.g. the one returned by [method execute] in non-blocking mode. See also [method crash].
 				[b]Note:[/b] This method can also be used to kill processes that were not spawned by the game.
 				[b]Note:[/b] This method is implemented on Android, iOS, Linux, macOS and Windows.
 			</description>
 		</method>
 		<method name="move_to_trash" qualifiers="const">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Moves the file or directory to the system's recycle bin. See also [method Directory.remove].
 				The method takes only global paths, so you may need to use [method ProjectSettings.globalize_path]. Do not use it for files in [code]res://[/code] as it will not work in exported project.
@@ -536,9 +536,9 @@
 		</method>
 		<method name="print_all_resources">
 			<return type="void" />
-			<argument index="0" name="tofile" type="String" default="&quot;&quot;" />
+			<param index="0" name="tofile" type="String" default="&quot;&quot;" />
 			<description>
-				Shows all resources in the game. Optionally, the list can be written to a file by specifying a file path in [code]tofile[/code].
+				Shows all resources in the game. Optionally, the list can be written to a file by specifying a file path in [param tofile].
 			</description>
 		</method>
 		<method name="print_all_textures_by_size">
@@ -549,21 +549,21 @@
 		</method>
 		<method name="print_resources_by_type">
 			<return type="void" />
-			<argument index="0" name="types" type="PackedStringArray" />
+			<param index="0" name="types" type="PackedStringArray" />
 			<description>
 				Shows the number of resources loaded by the game of the given types.
 			</description>
 		</method>
 		<method name="print_resources_in_use">
 			<return type="void" />
-			<argument index="0" name="short" type="bool" default="false" />
+			<param index="0" name="short" type="bool" default="false" />
 			<description>
 				Shows all resources currently used by the game.
 			</description>
 		</method>
 		<method name="request_permission">
 			<return type="bool" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				At the moment this function is only used by [code]AudioDriverOpenSL[/code] to request permission for [code]RECORD_AUDIO[/code] on Android.
 			</description>
@@ -577,19 +577,19 @@
 		</method>
 		<method name="set_environment" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="variable" type="String" />
-			<argument index="1" name="value" type="String" />
+			<param index="0" name="variable" type="String" />
+			<param index="1" name="value" type="String" />
 			<description>
-				Sets the value of the environment variable [code]variable[/code] to [code]value[/code]. The environment variable will be set for the Godot process and any process executed with [method execute] after running [method set_environment]. The environment variable will [i]not[/i] persist to processes run after the Godot process was terminated.
-				[b]Note:[/b] Double-check the casing of [code]variable[/code]. Environment variable names are case-sensitive on all platforms except Windows.
+				Sets the value of the environment variable [param variable] to [param value]. The environment variable will be set for the Godot process and any process executed with [method execute] after running [method set_environment]. The environment variable will [i]not[/i] persist to processes run after the Godot process was terminated.
+				[b]Note:[/b] Double-check the casing of [param variable]. Environment variable names are case-sensitive on all platforms except Windows.
 			</description>
 		</method>
 		<method name="set_restart_on_exit">
 			<return type="void" />
-			<argument index="0" name="restart" type="bool" />
-			<argument index="1" name="arguments" type="PackedStringArray" default="PackedStringArray()" />
+			<param index="0" name="restart" type="bool" />
+			<param index="1" name="arguments" type="PackedStringArray" default="PackedStringArray()" />
 			<description>
-				If [code]restart[/code] is [code]true[/code], restarts the project automatically when it is exited with [method SceneTree.quit] or [constant Node.NOTIFICATION_WM_CLOSE_REQUEST]. Command line [code]arguments[/code] can be supplied. To restart the project with the same command line arguments as originally used to run the project, pass [method get_cmdline_args] as the value for [code]arguments[/code].
+				If [param restart] is [code]true[/code], restarts the project automatically when it is exited with [method SceneTree.quit] or [constant Node.NOTIFICATION_WM_CLOSE_REQUEST]. Command line [param arguments] can be supplied. To restart the project with the same command line arguments as originally used to run the project, pass [method get_cmdline_args] as the value for [param arguments].
 				[method set_restart_on_exit] can be used to apply setting changes that require a restart. See also [method is_restart_on_exit_set] and [method get_restart_on_exit_arguments].
 				[b]Note:[/b] This method is only effective on desktop platforms, and only when the project isn't started from the editor. It will have no effect on mobile and Web platforms, or when the project is started from the editor.
 				[b]Note:[/b] If the project process crashes or is [i]killed[/i] by the user (by sending [code]SIGKILL[/code] instead of the usual [code]SIGTERM[/code]), the project won't restart automatically.
@@ -597,21 +597,21 @@
 		</method>
 		<method name="set_thread_name">
 			<return type="int" enum="Error" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Sets the name of the current thread.
 			</description>
 		</method>
 		<method name="set_use_file_access_save_and_swap">
 			<return type="void" />
-			<argument index="0" name="enabled" type="bool" />
+			<param index="0" name="enabled" type="bool" />
 			<description>
-				Enables backup saves if [code]enabled[/code] is [code]true[/code].
+				Enables backup saves if [param enabled] is [code]true[/code].
 			</description>
 		</method>
 		<method name="shell_open">
 			<return type="int" enum="Error" />
-			<argument index="0" name="uri" type="String" />
+			<param index="0" name="uri" type="String" />
 			<description>
 				Requests the OS to open a resource with the most appropriate program. For example:
 				- [code]OS.shell_open("C:\\Users\name\Downloads")[/code] on Windows opens the file explorer at the user's Downloads folder.
diff --git a/doc/classes/Object.xml b/doc/classes/Object.xml
index 061b32bfdf..2e03ac5291 100644
--- a/doc/classes/Object.xml
+++ b/doc/classes/Object.xml
@@ -36,10 +36,10 @@
 	<methods>
 		<method name="_get" qualifiers="virtual">
 			<return type="Variant" />
-			<argument index="0" name="property" type="StringName" />
+			<param index="0" name="property" type="StringName" />
 			<description>
 				Virtual method which can be overridden to customize the return value of [method get].
-				Returns the given property. Returns [code]null[/code] if the [code]property[/code] does not exist.
+				Returns the given property. Returns [code]null[/code] if the [param property] does not exist.
 			</description>
 		</method>
 		<method name="_get_property_list" qualifiers="virtual">
@@ -59,18 +59,34 @@
 		</method>
 		<method name="_notification" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="what" type="int" />
+			<param index="0" name="what" type="int" />
 			<description>
-				Called whenever the object receives a notification, which is identified in [code]what[/code] by a constant. The base [Object] has two constants [constant NOTIFICATION_POSTINITIALIZE] and [constant NOTIFICATION_PREDELETE], but subclasses such as [Node] define a lot more notifications which are also received by this method.
+				Called whenever the object receives a notification, which is identified in [param what] by a constant. The base [Object] has two constants [constant NOTIFICATION_POSTINITIALIZE] and [constant NOTIFICATION_PREDELETE], but subclasses such as [Node] define a lot more notifications which are also received by this method.
+			</description>
+		</method>
+		<method name="_property_can_revert" qualifiers="virtual">
+			<return type="bool" />
+			<param index="0" name="property" type="StringName" />
+			<description>
+				Virtual methods that can be overridden to customize the property revert behavior in the editor.
+				Returns [code]true[/code] if the property identified by [code]name[/code] can be reverted to a default value. Override [method _property_get_revert] to return the actual value.
+			</description>
+		</method>
+		<method name="_property_get_revert" qualifiers="virtual">
+			<return type="Variant" />
+			<param index="0" name="property" type="StringName" />
+			<description>
+				Virtual methods that can be overridden to customize the property revert behavior in the editor.
+				Returns the default value of the property identified by [code]name[/code]. [method _property_can_revert] must be overridden as well for this method to be called.
 			</description>
 		</method>
 		<method name="_set" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="property" type="StringName" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="property" type="StringName" />
+			<param index="1" name="value" type="Variant" />
 			<description>
 				Virtual method which can be overridden to customize the return value of [method set].
-				Sets a property. Returns [code]true[/code] if the [code]property[/code] exists.
+				Sets a property. Returns [code]true[/code] if the [param property] exists.
 			</description>
 		</method>
 		<method name="_to_string" qualifiers="virtual">
@@ -82,17 +98,17 @@
 		</method>
 		<method name="add_user_signal">
 			<return type="void" />
-			<argument index="0" name="signal" type="String" />
-			<argument index="1" name="arguments" type="Array" default="[]" />
+			<param index="0" name="signal" type="String" />
+			<param index="1" name="arguments" type="Array" default="[]" />
 			<description>
-				Adds a user-defined [code]signal[/code]. Arguments are optional, but can be added as an [Array] of dictionaries, each containing [code]name: String[/code] and [code]type: int[/code] (see [enum Variant.Type]) entries.
+				Adds a user-defined [param signal]. Arguments are optional, but can be added as an [Array] of dictionaries, each containing [code]name: String[/code] and [code]type: int[/code] (see [enum Variant.Type]) entries.
 			</description>
 		</method>
 		<method name="call" qualifiers="vararg">
 			<return type="Variant" />
-			<argument index="0" name="method" type="StringName" />
+			<param index="0" name="method" type="StringName" />
 			<description>
-				Calls the [code]method[/code] on the object and returns the result. This method supports a variable number of arguments, so parameters are passed as a comma separated list. Example:
+				Calls the [param method] on the object and returns the result. This method supports a variable number of arguments, so parameters are passed as a comma separated list. Example:
 				[codeblocks]
 				[gdscript]
 				var node = Node3D.new()
@@ -108,9 +124,9 @@
 		</method>
 		<method name="call_deferred" qualifiers="vararg">
 			<return type="Variant" />
-			<argument index="0" name="method" type="StringName" />
+			<param index="0" name="method" type="StringName" />
 			<description>
-				Calls the [code]method[/code] on the object during idle time. This method supports a variable number of arguments, so parameters are passed as a comma separated list. Example:
+				Calls the [param method] on the object during idle time. This method supports a variable number of arguments, so parameters are passed as a comma separated list. Example:
 				[codeblocks]
 				[gdscript]
 				var node = Node3D.new()
@@ -126,10 +142,10 @@
 		</method>
 		<method name="callv">
 			<return type="Variant" />
-			<argument index="0" name="method" type="StringName" />
-			<argument index="1" name="arg_array" type="Array" />
+			<param index="0" name="method" type="StringName" />
+			<param index="1" name="arg_array" type="Array" />
 			<description>
-				Calls the [code]method[/code] on the object and returns the result. Contrarily to [method call], this method does not support a variable number of arguments but expects all parameters to be via a single [Array].
+				Calls the [param method] on the object and returns the result. Contrarily to [method call], this method does not support a variable number of arguments but expects all parameters to be via a single [Array].
 				[codeblocks]
 				[gdscript]
 				var node = Node3D.new()
@@ -150,11 +166,11 @@
 		</method>
 		<method name="connect">
 			<return type="int" enum="Error" />
-			<argument index="0" name="signal" type="StringName" />
-			<argument index="1" name="callable" type="Callable" />
-			<argument index="2" name="flags" type="int" default="0" />
+			<param index="0" name="signal" type="StringName" />
+			<param index="1" name="callable" type="Callable" />
+			<param index="2" name="flags" type="int" default="0" />
 			<description>
-				Connects a [code]signal[/code] to a [code]callable[/code]. Use [code]flags[/code] to set deferred or one-shot connections. See [enum ConnectFlags] constants.
+				Connects a [param signal] to a [param callable]. Use [param flags] to set deferred or one-shot connections. See [enum ConnectFlags] constants.
 				A signal can only be connected once to a [Callable]. It will print an error if already connected, unless the signal was connected with [constant CONNECT_REFERENCE_COUNTED]. To avoid this, first, use [method is_connected] to check for existing connections.
 				If the callable's target is destroyed in the game's lifecycle, the connection will be lost.
 				[b]Examples with recommended syntax:[/b]
@@ -291,18 +307,18 @@
 		</method>
 		<method name="disconnect">
 			<return type="void" />
-			<argument index="0" name="signal" type="StringName" />
-			<argument index="1" name="callable" type="Callable" />
+			<param index="0" name="signal" type="StringName" />
+			<param index="1" name="callable" type="Callable" />
 			<description>
-				Disconnects a [code]signal[/code] from a given [code]callable[/code].
+				Disconnects a [param signal] from a given [param callable].
 				If you try to disconnect a connection that does not exist, the method will print an error. Use [method is_connected] to ensure that the connection exists.
 			</description>
 		</method>
 		<method name="emit_signal" qualifiers="vararg">
 			<return type="int" enum="Error" />
-			<argument index="0" name="signal" type="StringName" />
+			<param index="0" name="signal" type="StringName" />
 			<description>
-				Emits the given [code]signal[/code]. The signal must exist, so it should be a built-in signal of this class or one of its parent classes, or a user-defined signal. This method supports a variable number of arguments, so parameters are passed as a comma separated list. Example:
+				Emits the given [param signal]. The signal must exist, so it should be a built-in signal of this class or one of its parent classes, or a user-defined signal. This method supports a variable number of arguments, so parameters are passed as a comma separated list. Example:
 				[codeblocks]
 				[gdscript]
 				emit_signal("hit", "sword", 100)
@@ -323,9 +339,9 @@
 		</method>
 		<method name="get" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="property" type="StringName" />
+			<param index="0" name="property" type="StringName" />
 			<description>
-				Returns the [Variant] value of the given [code]property[/code]. If the [code]property[/code] doesn't exist, this will return [code]null[/code].
+				Returns the [Variant] value of the given [param property]. If the [param property] doesn't exist, this will return [code]null[/code].
 				[b]Note:[/b] In C#, the property name must be specified as snake_case if it is defined by a built-in Godot node. This doesn't apply to user-defined properties where you should use the same convention as in the C# source (typically PascalCase).
 			</description>
 		</method>
@@ -348,7 +364,7 @@
 		</method>
 		<method name="get_indexed" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="property" type="NodePath" />
+			<param index="0" name="property" type="NodePath" />
 			<description>
 				Gets the object's property indexed by the given [NodePath]. The node path should be relative to the current object and can use the colon character ([code]:[/code]) to access nested properties. Examples: [code]"position:x"[/code] or [code]"material:next_pass:blend_mode"[/code].
 				[b]Note:[/b] Even though the method takes [NodePath] argument, it doesn't support actual paths to [Node]s in the scene tree, only colon-separated sub-property paths. For the purpose of nodes, use [method Node.get_node_and_resource] instead.
@@ -363,11 +379,12 @@
 		</method>
 		<method name="get_meta" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="default" type="Variant" default="null" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="default" type="Variant" default="null" />
 			<description>
-				Returns the object's metadata entry for the given [code]name[/code].
-				Throws error if the entry does not exist, unless [code]default[/code] is not [code]null[/code] (in which case the default value will be returned).
+				Returns the object's metadata entry for the given [param name].
+				Throws error if the entry does not exist, unless [param default] is not [code]null[/code] (in which case the default value will be returned). See also [method has_meta], [method set_meta] and [method remove_meta].
+				[b]Note:[/b] Metadata that has a [param name] starting with an underscore ([code]_[/code]) is considered editor-only. Editor-only metadata is not displayed in the inspector and should not be edited.
 			</description>
 		</method>
 		<method name="get_meta_list" qualifiers="const">
@@ -397,9 +414,9 @@
 		</method>
 		<method name="get_signal_connection_list" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="signal" type="StringName" />
+			<param index="0" name="signal" type="StringName" />
 			<description>
-				Returns an [Array] of connections for the given [code]signal[/code].
+				Returns an [Array] of connections for the given [param signal].
 			</description>
 		</method>
 		<method name="get_signal_list" qualifiers="const">
@@ -410,30 +427,31 @@
 		</method>
 		<method name="has_meta" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns [code]true[/code] if a metadata entry is found with the given [code]name[/code].
+				Returns [code]true[/code] if a metadata entry is found with the given [param name]. See also [method get_meta], [method set_meta] and [method remove_meta].
+				[b]Note:[/b] Metadata that has a [param name] starting with an underscore ([code]_[/code]) is considered editor-only. Editor-only metadata is not displayed in the inspector and should not be edited.
 			</description>
 		</method>
 		<method name="has_method" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="method" type="StringName" />
+			<param index="0" name="method" type="StringName" />
 			<description>
-				Returns [code]true[/code] if the object contains the given [code]method[/code].
+				Returns [code]true[/code] if the object contains the given [param method].
 			</description>
 		</method>
 		<method name="has_signal" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="signal" type="StringName" />
+			<param index="0" name="signal" type="StringName" />
 			<description>
-				Returns [code]true[/code] if the given [code]signal[/code] exists.
+				Returns [code]true[/code] if the given [param signal] exists.
 			</description>
 		</method>
 		<method name="has_user_signal" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="signal" type="StringName" />
+			<param index="0" name="signal" type="StringName" />
 			<description>
-				Returns [code]true[/code] if the given user-defined [code]signal[/code] exists. Only signals added using [method add_user_signal] are taken into account.
+				Returns [code]true[/code] if the given user-defined [param signal] exists. Only signals added using [method add_user_signal] are taken into account.
 			</description>
 		</method>
 		<method name="is_blocking_signals" qualifiers="const">
@@ -444,18 +462,18 @@
 		</method>
 		<method name="is_class" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="class" type="String" />
+			<param index="0" name="class" type="String" />
 			<description>
-				Returns [code]true[/code] if the object inherits from the given [code]class[/code]. See also [method get_class].
+				Returns [code]true[/code] if the object inherits from the given [param class]. See also [method get_class].
 				[b]Note:[/b] [method is_class] does not take [code]class_name[/code] declarations into account. If the object has a [code]class_name[/code] defined, [method is_class] will return [code]false[/code] for that name.
 			</description>
 		</method>
 		<method name="is_connected" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="signal" type="StringName" />
-			<argument index="1" name="callable" type="Callable" />
+			<param index="0" name="signal" type="StringName" />
+			<param index="1" name="callable" type="Callable" />
 			<description>
-				Returns [code]true[/code] if a connection exists for a given [code]signal[/code] and [code]callable[/code].
+				Returns [code]true[/code] if a connection exists for a given [param signal] and [param callable].
 			</description>
 		</method>
 		<method name="is_queued_for_deletion" qualifiers="const">
@@ -466,11 +484,11 @@
 		</method>
 		<method name="notification">
 			<return type="void" />
-			<argument index="0" name="what" type="int" />
-			<argument index="1" name="reversed" type="bool" default="false" />
+			<param index="0" name="what" type="int" />
+			<param index="1" name="reversed" type="bool" default="false" />
 			<description>
 				Send a given notification to the object, which will also trigger a call to the [method _notification] method of all classes that the object inherits from.
-				If [code]reversed[/code] is [code]true[/code], [method _notification] is called first on the object's own class, and then up to its successive parent classes. If [code]reversed[/code] is [code]false[/code], [method _notification] is called first on the highest ancestor ([Object] itself), and then down to its successive inheriting classes.
+				If [param reversed] is [code]true[/code], [method _notification] is called first on the object's own class, and then up to its successive parent classes. If [param reversed] is [code]false[/code], [method _notification] is called first on the highest ancestor ([Object] itself), and then down to its successive inheriting classes.
 			</description>
 		</method>
 		<method name="notify_property_list_changed">
@@ -481,31 +499,32 @@
 		</method>
 		<method name="remove_meta">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Removes a given entry from the object's metadata. See also [method set_meta].
+				Removes a given entry from the object's metadata. See also [method has_meta], [method get_meta] and [method set_meta].
+				[b]Note:[/b] Metadata that has a [param name] starting with an underscore ([code]_[/code]) is considered editor-only. Editor-only metadata is not displayed in the inspector and should not be edited.
 			</description>
 		</method>
 		<method name="set">
 			<return type="void" />
-			<argument index="0" name="property" type="StringName" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="property" type="StringName" />
+			<param index="1" name="value" type="Variant" />
 			<description>
-				Assigns a new value to the given property. If the [code]property[/code] does not exist or the given value's type doesn't match, nothing will happen.
+				Assigns a new value to the given property. If the [param property] does not exist or the given value's type doesn't match, nothing will happen.
 				[b]Note:[/b] In C#, the property name must be specified as snake_case if it is defined by a built-in Godot node. This doesn't apply to user-defined properties where you should use the same convention as in the C# source (typically PascalCase).
 			</description>
 		</method>
 		<method name="set_block_signals">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
+			<param index="0" name="enable" type="bool" />
 			<description>
 				If set to [code]true[/code], signal emission is blocked.
 			</description>
 		</method>
 		<method name="set_deferred">
 			<return type="void" />
-			<argument index="0" name="property" type="StringName" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="property" type="StringName" />
+			<param index="1" name="value" type="Variant" />
 			<description>
 				Assigns a new value to the given property, after the current frame's physics step. This is equivalent to calling [method set] via [method call_deferred], i.e. [code]call_deferred("set", property, value)[/code].
 				[b]Note:[/b] In C#, the property name must be specified as snake_case if it is defined by a built-in Godot node. This doesn't apply to user-defined properties where you should use the same convention as in the C# source (typically PascalCase).
@@ -513,8 +532,8 @@
 		</method>
 		<method name="set_indexed">
 			<return type="void" />
-			<argument index="0" name="property" type="NodePath" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="property" type="NodePath" />
+			<param index="1" name="value" type="Variant" />
 			<description>
 				Assigns a new value to the property identified by the [NodePath]. The node path should be relative to the current object and can use the colon character ([code]:[/code]) to access nested properties. Example:
 				[codeblocks]
@@ -535,23 +554,24 @@
 		</method>
 		<method name="set_message_translation">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
+			<param index="0" name="enable" type="bool" />
 			<description>
 				Defines whether the object can translate strings (with calls to [method tr]). Enabled by default.
 			</description>
 		</method>
 		<method name="set_meta">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="value" type="Variant" />
 			<description>
 				Adds, changes or removes a given entry in the object's metadata. Metadata are serialized and can take any [Variant] value.
-				To remove a given entry from the object's metadata, use [method remove_meta]. Metadata is also removed if its value is set to [code]null[/code]. This means you can also use [code]set_meta("name", null)[/code] to remove metadata for [code]"name"[/code].
+				To remove a given entry from the object's metadata, use [method remove_meta]. Metadata is also removed if its value is set to [code]null[/code]. This means you can also use [code]set_meta("name", null)[/code] to remove metadata for [code]"name"[/code]. See also [method has_meta] and [method get_meta].
+				[b]Note:[/b] Metadata that has a [param name] starting with an underscore ([code]_[/code]) is considered editor-only. Editor-only metadata is not displayed in the inspector and should not be edited.
 			</description>
 		</method>
 		<method name="set_script">
 			<return type="void" />
-			<argument index="0" name="script" type="Variant" />
+			<param index="0" name="script" type="Variant" />
 			<description>
 				Assigns a script to the object. Each object can have a single script assigned to it, which are used to extend its functionality.
 				If the object already had a script, the previous script instance will be freed and its variables and state will be lost. The new script's [method _init] method will be called.
@@ -566,24 +586,24 @@
 		</method>
 		<method name="tr" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="message" type="StringName" />
-			<argument index="1" name="context" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="message" type="StringName" />
+			<param index="1" name="context" type="StringName" default="&quot;&quot;" />
 			<description>
 				Translates a message using translation catalogs configured in the Project Settings. An additional context could be used to specify the translation context.
-				Only works if message translation is enabled (which it is by default), otherwise it returns the [code]message[/code] unchanged. See [method set_message_translation].
+				Only works if message translation is enabled (which it is by default), otherwise it returns the [param message] unchanged. See [method set_message_translation].
 				See [url=$DOCS_URL/tutorials/i18n/internationalizing_games.html]Internationalizing games[/url] for examples of the usage of this method.
 			</description>
 		</method>
 		<method name="tr_n" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="message" type="StringName" />
-			<argument index="1" name="plural_message" type="StringName" />
-			<argument index="2" name="n" type="int" />
-			<argument index="3" name="context" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="message" type="StringName" />
+			<param index="1" name="plural_message" type="StringName" />
+			<param index="2" name="n" type="int" />
+			<param index="3" name="context" type="StringName" default="&quot;&quot;" />
 			<description>
 				Translates a message involving plurals using translation catalogs configured in the Project Settings. An additional context could be used to specify the translation context.
-				Only works if message translation is enabled (which it is by default), otherwise it returns the [code]message[/code] or [code]plural_message[/code] unchanged. See [method set_message_translation].
-				The number [code]n[/code] is the number or quantity of the plural object. It will be used to guide the translation system to fetch the correct plural form for the selected language.
+				Only works if message translation is enabled (which it is by default), otherwise it returns the [param message] or [param plural_message] unchanged. See [method set_message_translation].
+				The number [param n] is the number or quantity of the plural object. It will be used to guide the translation system to fetch the correct plural form for the selected language.
 				[b]Note:[/b] Negative and floating-point values usually represent physical entities for which singular and plural don't clearly apply. In such cases, use [method tr].
 				See [url=$DOCS_URL/tutorials/i18n/localization_using_gettext.html]Localization using gettext[/url] for examples of the usage of this method.
 			</description>
diff --git a/doc/classes/OccluderInstance3D.xml b/doc/classes/OccluderInstance3D.xml
index abd99dd3aa..0bebc7ea43 100644
--- a/doc/classes/OccluderInstance3D.xml
+++ b/doc/classes/OccluderInstance3D.xml
@@ -15,23 +15,23 @@
 	<methods>
 		<method name="get_bake_mask_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
-				Returns whether or not the specified layer of the [member bake_mask] is enabled, given a [code]layer_number[/code] between 1 and 32.
+				Returns whether or not the specified layer of the [member bake_mask] is enabled, given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="set_bake_mask_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
-				Based on [code]value[/code], enables or disables the specified layer in the [member bake_mask], given a [code]layer_number[/code] between 1 and 32.
+				Based on [param value], enables or disables the specified layer in the [member bake_mask], given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 	</methods>
 	<members>
 		<member name="bake_mask" type="int" setter="set_bake_mask" getter="get_bake_mask" default="4294967295">
-			The visual layers to account for when baking for occluders. Only [MeshInstance3D]s whose [member VisualInstance3D.layers] match with this [member bake_mask] will be included in the generated occluder mesh. By default, all objects are taken into account for the occluder baking.
+			The visual layers to account for when baking for occluders. Only [MeshInstance3D]s whose [member VisualInstance3D.layers] match with this [member bake_mask] will be included in the generated occluder mesh. By default, all objects with [i]opaque[/i] materials are taken into account for the occluder baking.
 			To improve performance and avoid artifacts, it is recommended to exclude dynamic objects, small objects and fixtures from the baking process by moving them to a separate visual layer and excluding this layer in [member bake_mask].
 		</member>
 		<member name="bake_simplification_distance" type="float" setter="set_bake_simplification_distance" getter="get_bake_simplification_distance" default="0.1">
diff --git a/doc/classes/OptimizedTranslation.xml b/doc/classes/OptimizedTranslation.xml
index 68765f9862..54ebfd3146 100644
--- a/doc/classes/OptimizedTranslation.xml
+++ b/doc/classes/OptimizedTranslation.xml
@@ -11,7 +11,7 @@
 	<methods>
 		<method name="generate">
 			<return type="void" />
-			<argument index="0" name="from" type="Translation" />
+			<param index="0" name="from" type="Translation" />
 			<description>
 				Generates and sets an optimized translation from the given [Translation] resource.
 			</description>
diff --git a/doc/classes/OptionButton.xml b/doc/classes/OptionButton.xml
index 737662fe69..a552a2c16c 100644
--- a/doc/classes/OptionButton.xml
+++ b/doc/classes/OptionButton.xml
@@ -13,26 +13,26 @@
 	<methods>
 		<method name="add_icon_item">
 			<return type="void" />
-			<argument index="0" name="texture" type="Texture2D" />
-			<argument index="1" name="label" type="String" />
-			<argument index="2" name="id" type="int" default="-1" />
+			<param index="0" name="texture" type="Texture2D" />
+			<param index="1" name="label" type="String" />
+			<param index="2" name="id" type="int" default="-1" />
 			<description>
-				Adds an item, with a [code]texture[/code] icon, text [code]label[/code] and (optionally) [code]id[/code]. If no [code]id[/code] is passed, the item index will be used as the item's ID. New items are appended at the end.
+				Adds an item, with a [param texture] icon, text [param label] and (optionally) [param id]. If no [param id] is passed, the item index will be used as the item's ID. New items are appended at the end.
 			</description>
 		</method>
 		<method name="add_item">
 			<return type="void" />
-			<argument index="0" name="label" type="String" />
-			<argument index="1" name="id" type="int" default="-1" />
+			<param index="0" name="label" type="String" />
+			<param index="1" name="id" type="int" default="-1" />
 			<description>
-				Adds an item, with text [code]label[/code] and (optionally) [code]id[/code]. If no [code]id[/code] is passed, the item index will be used as the item's ID. New items are appended at the end.
+				Adds an item, with text [param label] and (optionally) [param id]. If no [param id] is passed, the item index will be used as the item's ID. New items are appended at the end.
 			</description>
 		</method>
 		<method name="add_separator">
 			<return type="void" />
-			<argument index="0" name="text" type="String" default="&quot;&quot;" />
+			<param index="0" name="text" type="String" default="&quot;&quot;" />
 			<description>
-				Adds a separator to the list of items. Separators help to group items, and can optionally be given a [code]text[/code] header. A separator also gets an index assigned, and is appended at the end of the item list.
+				Adds a separator to the list of items. Separators help to group items, and can optionally be given a [param text] header. A separator also gets an index assigned, and is appended at the end of the item list.
 			</description>
 		</method>
 		<method name="clear">
@@ -43,44 +43,44 @@
 		</method>
 		<method name="get_item_icon" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the icon of the item at index [code]idx[/code].
+				Returns the icon of the item at index [param idx].
 			</description>
 		</method>
 		<method name="get_item_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the ID of the item at index [code]idx[/code].
+				Returns the ID of the item at index [param idx].
 			</description>
 		</method>
 		<method name="get_item_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
-				Returns the index of the item with the given [code]id[/code].
+				Returns the index of the item with the given [param id].
 			</description>
 		</method>
 		<method name="get_item_metadata" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Retrieves the metadata of an item. Metadata may be any type and can be used to store extra information about an item, such as an external string ID.
 			</description>
 		</method>
 		<method name="get_item_text" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the text of the item at index [code]idx[/code].
+				Returns the text of the item at index [param idx].
 			</description>
 		</method>
 		<method name="get_item_tooltip" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the tooltip of the item at index [code]idx[/code].
+				Returns the tooltip of the item at index [param idx].
 			</description>
 		</method>
 		<method name="get_popup" qualifiers="const">
@@ -92,7 +92,7 @@
 		</method>
 		<method name="get_selectable_item" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="from_last" type="bool" default="false" />
+			<param index="0" name="from_last" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
@@ -115,27 +115,27 @@
 		</method>
 		<method name="is_item_disabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns [code]true[/code] if the item at index [code]idx[/code] is disabled.
+				Returns [code]true[/code] if the item at index [param idx] is disabled.
 			</description>
 		</method>
 		<method name="is_item_separator" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_item">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Removes the item at index [code]idx[/code].
+				Removes the item at index [param idx].
 			</description>
 		</method>
 		<method name="select">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Selects an item by index and makes it the current item. This will work even if the item is disabled.
 				Passing [code]-1[/code] as the index deselects any currently selected item.
@@ -143,51 +143,51 @@
 		</method>
 		<method name="set_item_disabled">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="disabled" type="bool" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="disabled" type="bool" />
 			<description>
-				Sets whether the item at index [code]idx[/code] is disabled.
+				Sets whether the item at index [param idx] is disabled.
 				Disabled items are drawn differently in the dropdown and are not selectable by the user. If the current selected item is set as disabled, it will remain selected.
 			</description>
 		</method>
 		<method name="set_item_icon">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="texture" type="Texture2D" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="texture" type="Texture2D" />
 			<description>
-				Sets the icon of the item at index [code]idx[/code].
+				Sets the icon of the item at index [param idx].
 			</description>
 		</method>
 		<method name="set_item_id">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="id" type="int" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="id" type="int" />
 			<description>
-				Sets the ID of the item at index [code]idx[/code].
+				Sets the ID of the item at index [param idx].
 			</description>
 		</method>
 		<method name="set_item_metadata">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="metadata" type="Variant" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="metadata" type="Variant" />
 			<description>
 				Sets the metadata of an item. Metadata may be of any type and can be used to store extra information about an item, such as an external string ID.
 			</description>
 		</method>
 		<method name="set_item_text">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="text" type="String" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="text" type="String" />
 			<description>
-				Sets the text of the item at index [code]idx[/code].
+				Sets the text of the item at index [param idx].
 			</description>
 		</method>
 		<method name="set_item_tooltip">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="tooltip" type="String" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="tooltip" type="String" />
 			<description>
-				Sets the tooltip of the item at index [code]idx[/code].
+				Sets the tooltip of the item at index [param idx].
 			</description>
 		</method>
 	</methods>
@@ -208,13 +208,13 @@
 	</members>
 	<signals>
 		<signal name="item_focused">
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Emitted when the user navigates to an item using the [code]ui_up[/code] or [code]ui_down[/code] actions. The index of the item selected is passed as argument.
 			</description>
 		</signal>
 		<signal name="item_selected">
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Emitted when the current item has been changed by the user. The index of the item selected is passed as argument.
 			</description>
@@ -233,6 +233,9 @@
 		<theme_item name="font_hover_color" data_type="color" type="Color" default="Color(0.95, 0.95, 0.95, 1)">
 			Text [Color] used when the [OptionButton] is being hovered.
 		</theme_item>
+		<theme_item name="font_hover_pressed_color" data_type="color" type="Color" default="Color(1, 1, 1, 1)">
+			Text [Color] used when the [OptionButton] is being hovered and pressed.
+		</theme_item>
 		<theme_item name="font_outline_color" data_type="color" type="Color" default="Color(1, 1, 1, 1)">
 			The tint of text outline of the [OptionButton].
 		</theme_item>
@@ -245,6 +248,9 @@
 		<theme_item name="h_separation" data_type="constant" type="int" default="2">
 			The horizontal space between [OptionButton]'s icon and text.
 		</theme_item>
+		<theme_item name="modulate_arrow" data_type="constant" type="int" default="0">
+			If different than [code]0[/code], the arrow icon will be modulated to the font color.
+		</theme_item>
 		<theme_item name="outline_size" data_type="constant" type="int" default="0">
 			The size of the text outline.
 		</theme_item>
diff --git a/doc/classes/PCKPacker.xml b/doc/classes/PCKPacker.xml
index 3b84128123..cb00b45fed 100644
--- a/doc/classes/PCKPacker.xml
+++ b/doc/classes/PCKPacker.xml
@@ -26,28 +26,28 @@
 	<methods>
 		<method name="add_file">
 			<return type="int" enum="Error" />
-			<argument index="0" name="pck_path" type="String" />
-			<argument index="1" name="source_path" type="String" />
-			<argument index="2" name="encrypt" type="bool" default="false" />
+			<param index="0" name="pck_path" type="String" />
+			<param index="1" name="source_path" type="String" />
+			<param index="2" name="encrypt" type="bool" default="false" />
 			<description>
-				Adds the [code]source_path[/code] file to the current PCK package at the [code]pck_path[/code] internal path (should start with [code]res://[/code]).
+				Adds the [param source_path] file to the current PCK package at the [param pck_path] internal path (should start with [code]res://[/code]).
 			</description>
 		</method>
 		<method name="flush">
 			<return type="int" enum="Error" />
-			<argument index="0" name="verbose" type="bool" default="false" />
+			<param index="0" name="verbose" type="bool" default="false" />
 			<description>
-				Writes the files specified using all [method add_file] calls since the last flush. If [code]verbose[/code] is [code]true[/code], a list of files added will be printed to the console for easier debugging.
+				Writes the files specified using all [method add_file] calls since the last flush. If [param verbose] is [code]true[/code], a list of files added will be printed to the console for easier debugging.
 			</description>
 		</method>
 		<method name="pck_start">
 			<return type="int" enum="Error" />
-			<argument index="0" name="pck_name" type="String" />
-			<argument index="1" name="alignment" type="int" default="32" />
-			<argument index="2" name="key" type="String" default="&quot;0000000000000000000000000000000000000000000000000000000000000000&quot;" />
-			<argument index="3" name="encrypt_directory" type="bool" default="false" />
+			<param index="0" name="pck_name" type="String" />
+			<param index="1" name="alignment" type="int" default="32" />
+			<param index="2" name="key" type="String" default="&quot;0000000000000000000000000000000000000000000000000000000000000000&quot;" />
+			<param index="3" name="encrypt_directory" type="bool" default="false" />
 			<description>
-				Creates a new PCK file with the name [code]pck_name[/code]. The [code].pck[/code] file extension isn't added automatically, so it should be part of [code]pck_name[/code] (even though it's not required).
+				Creates a new PCK file with the name [param pck_name]. The [code].pck[/code] file extension isn't added automatically, so it should be part of [param pck_name] (even though it's not required).
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/PackedByteArray.xml b/doc/classes/PackedByteArray.xml
index 3af3bb8697..b02333667d 100644
--- a/doc/classes/PackedByteArray.xml
+++ b/doc/classes/PackedByteArray.xml
@@ -17,14 +17,14 @@
 		</constructor>
 		<constructor name="PackedByteArray">
 			<return type="PackedByteArray" />
-			<argument index="0" name="from" type="PackedByteArray" />
+			<param index="0" name="from" type="PackedByteArray" />
 			<description>
 				Constructs a [PackedByteArray] as a copy of the given [PackedByteArray].
 			</description>
 		</constructor>
 		<constructor name="PackedByteArray">
 			<return type="PackedByteArray" />
-			<argument index="0" name="from" type="Array" />
+			<param index="0" name="from" type="Array" />
 			<description>
 				Constructs a new [PackedByteArray]. Optionally, you can pass in a generic [Array] that will be converted.
 			</description>
@@ -33,137 +33,143 @@
 	<methods>
 		<method name="append">
 			<return type="bool" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Appends an element at the end of the array (alias of [method push_back]).
 			</description>
 		</method>
 		<method name="append_array">
 			<return type="void" />
-			<argument index="0" name="array" type="PackedByteArray" />
+			<param index="0" name="array" type="PackedByteArray" />
 			<description>
 				Appends a [PackedByteArray] at the end of this array.
 			</description>
 		</method>
 		<method name="bsearch">
 			<return type="int" />
-			<argument index="0" name="value" type="int" />
-			<argument index="1" name="before" type="bool" default="true" />
+			<param index="0" name="value" type="int" />
+			<param index="1" name="before" type="bool" default="true" />
 			<description>
-				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a [code]before[/code] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array.
+				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a [param before] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array.
 				[b]Note:[/b] Calling [method bsearch] on an unsorted array results in unexpected behavior.
 			</description>
 		</method>
+		<method name="clear">
+			<return type="void" />
+			<description>
+				Clears the array. This is equivalent to using [method resize] with a size of [code]0[/code].
+			</description>
+		</method>
 		<method name="compress" qualifiers="const">
 			<return type="PackedByteArray" />
-			<argument index="0" name="compression_mode" type="int" default="0" />
+			<param index="0" name="compression_mode" type="int" default="0" />
 			<description>
 				Returns a new [PackedByteArray] with the data compressed. Set the compression mode using one of [enum File.CompressionMode]'s constants.
 			</description>
 		</method>
 		<method name="count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Returns the number of times an element is in the array.
 			</description>
 		</method>
 		<method name="decode_double" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="byte_offset" type="int" />
+			<param index="0" name="byte_offset" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="decode_float" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="byte_offset" type="int" />
+			<param index="0" name="byte_offset" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="decode_half" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="byte_offset" type="int" />
+			<param index="0" name="byte_offset" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="decode_s16" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="byte_offset" type="int" />
+			<param index="0" name="byte_offset" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="decode_s32" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="byte_offset" type="int" />
+			<param index="0" name="byte_offset" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="decode_s64" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="byte_offset" type="int" />
+			<param index="0" name="byte_offset" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="decode_s8" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="byte_offset" type="int" />
+			<param index="0" name="byte_offset" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="decode_u16" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="byte_offset" type="int" />
+			<param index="0" name="byte_offset" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="decode_u32" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="byte_offset" type="int" />
+			<param index="0" name="byte_offset" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="decode_u64" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="byte_offset" type="int" />
+			<param index="0" name="byte_offset" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="decode_u8" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="byte_offset" type="int" />
+			<param index="0" name="byte_offset" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="decode_var" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="byte_offset" type="int" />
-			<argument index="1" name="allow_objects" type="bool" default="false" />
+			<param index="0" name="byte_offset" type="int" />
+			<param index="1" name="allow_objects" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
 		<method name="decode_var_size" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="byte_offset" type="int" />
-			<argument index="1" name="allow_objects" type="bool" default="false" />
+			<param index="0" name="byte_offset" type="int" />
+			<param index="1" name="allow_objects" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
 		<method name="decompress" qualifiers="const">
 			<return type="PackedByteArray" />
-			<argument index="0" name="buffer_size" type="int" />
-			<argument index="1" name="compression_mode" type="int" default="0" />
+			<param index="0" name="buffer_size" type="int" />
+			<param index="1" name="compression_mode" type="int" default="0" />
 			<description>
-				Returns a new [PackedByteArray] with the data decompressed. Set [code]buffer_size[/code] to the size of the uncompressed data. Set the compression mode using one of [enum File.CompressionMode]'s constants.
+				Returns a new [PackedByteArray] with the data decompressed. Set [param buffer_size] to the size of the uncompressed data. Set the compression mode using one of [enum File.CompressionMode]'s constants.
 			</description>
 		</method>
 		<method name="decompress_dynamic" qualifiers="const">
 			<return type="PackedByteArray" />
-			<argument index="0" name="max_output_size" type="int" />
-			<argument index="1" name="compression_mode" type="int" default="0" />
+			<param index="0" name="max_output_size" type="int" />
+			<param index="1" name="compression_mode" type="int" default="0" />
 			<description>
 				Returns a new [PackedByteArray] with the data decompressed. Set the compression mode using one of [enum File.CompressionMode]'s constants. [b]This method only accepts gzip and deflate compression modes.[/b]
 				This method is potentially slower than [code]decompress[/code], as it may have to re-allocate its output buffer multiple times while decompressing, whereas [code]decompress[/code] knows it's output buffer size from the beginning.
-				GZIP has a maximal compression ratio of 1032:1, meaning it's very possible for a small compressed payload to decompress to a potentially very large output. To guard against this, you may provide a maximum size this function is allowed to allocate in bytes via [code]max_output_size[/code]. Passing -1 will allow for unbounded output. If any positive value is passed, and the decompression exceeds that amount in bytes, then an error will be returned.
+				GZIP has a maximal compression ratio of 1032:1, meaning it's very possible for a small compressed payload to decompress to a potentially very large output. To guard against this, you may provide a maximum size this function is allowed to allocate in bytes via [param max_output_size]. Passing -1 will allow for unbounded output. If any positive value is passed, and the decompression exceeds that amount in bytes, then an error will be returned.
 			</description>
 		</method>
 		<method name="duplicate">
@@ -174,100 +180,100 @@
 		</method>
 		<method name="encode_double">
 			<return type="void" />
-			<argument index="0" name="byte_offset" type="int" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="byte_offset" type="int" />
+			<param index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="encode_float">
 			<return type="void" />
-			<argument index="0" name="byte_offset" type="int" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="byte_offset" type="int" />
+			<param index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="encode_half">
 			<return type="void" />
-			<argument index="0" name="byte_offset" type="int" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="byte_offset" type="int" />
+			<param index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="encode_s16">
 			<return type="void" />
-			<argument index="0" name="byte_offset" type="int" />
-			<argument index="1" name="value" type="int" />
+			<param index="0" name="byte_offset" type="int" />
+			<param index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="encode_s32">
 			<return type="void" />
-			<argument index="0" name="byte_offset" type="int" />
-			<argument index="1" name="value" type="int" />
+			<param index="0" name="byte_offset" type="int" />
+			<param index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="encode_s64">
 			<return type="void" />
-			<argument index="0" name="byte_offset" type="int" />
-			<argument index="1" name="value" type="int" />
+			<param index="0" name="byte_offset" type="int" />
+			<param index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="encode_s8">
 			<return type="void" />
-			<argument index="0" name="byte_offset" type="int" />
-			<argument index="1" name="value" type="int" />
+			<param index="0" name="byte_offset" type="int" />
+			<param index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="encode_u16">
 			<return type="void" />
-			<argument index="0" name="byte_offset" type="int" />
-			<argument index="1" name="value" type="int" />
+			<param index="0" name="byte_offset" type="int" />
+			<param index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="encode_u32">
 			<return type="void" />
-			<argument index="0" name="byte_offset" type="int" />
-			<argument index="1" name="value" type="int" />
+			<param index="0" name="byte_offset" type="int" />
+			<param index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="encode_u64">
 			<return type="void" />
-			<argument index="0" name="byte_offset" type="int" />
-			<argument index="1" name="value" type="int" />
+			<param index="0" name="byte_offset" type="int" />
+			<param index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="encode_u8">
 			<return type="void" />
-			<argument index="0" name="byte_offset" type="int" />
-			<argument index="1" name="value" type="int" />
+			<param index="0" name="byte_offset" type="int" />
+			<param index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="encode_var">
 			<return type="int" />
-			<argument index="0" name="byte_offset" type="int" />
-			<argument index="1" name="value" type="Variant" />
-			<argument index="2" name="allow_objects" type="bool" default="false" />
+			<param index="0" name="byte_offset" type="int" />
+			<param index="1" name="value" type="Variant" />
+			<param index="2" name="allow_objects" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
 		<method name="fill">
 			<return type="void" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Assigns the given value to all elements in the array. This can typically be used together with [method resize] to create an array with a given size and initialized elements.
 			</description>
 		</method>
 		<method name="find" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="int" />
-			<argument index="1" name="from" type="int" default="0" />
+			<param index="0" name="value" type="int" />
+			<param index="1" name="from" type="int" default="0" />
 			<description>
 				Searches the array for a value and returns its index or [code]-1[/code] if not found. Optionally, the initial search index can be passed.
 			</description>
@@ -298,15 +304,15 @@
 		</method>
 		<method name="has" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
-				Returns [code]true[/code] if the array contains [code]value[/code].
+				Returns [code]true[/code] if the array contains [param value].
 			</description>
 		</method>
 		<method name="has_encoded_var" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="byte_offset" type="int" />
-			<argument index="1" name="allow_objects" type="bool" default="false" />
+			<param index="0" name="byte_offset" type="int" />
+			<param index="1" name="allow_objects" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
@@ -328,8 +334,8 @@
 		</method>
 		<method name="insert">
 			<return type="int" />
-			<argument index="0" name="at_index" type="int" />
-			<argument index="1" name="value" type="int" />
+			<param index="0" name="at_index" type="int" />
+			<param index="1" name="value" type="int" />
 			<description>
 				Inserts a new element at a given position in the array. The position must be valid, or at the end of the array ([code]idx == size()[/code]).
 			</description>
@@ -342,21 +348,21 @@
 		</method>
 		<method name="push_back">
 			<return type="bool" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Appends an element at the end of the array.
 			</description>
 		</method>
 		<method name="remove_at">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Removes an element from the array by index.
 			</description>
 		</method>
 		<method name="resize">
 			<return type="int" />
-			<argument index="0" name="new_size" type="int" />
+			<param index="0" name="new_size" type="int" />
 			<description>
 				Sets the size of the array. If the array is grown, reserves elements at the end of the array. If the array is shrunk, truncates the array to the new size.
 			</description>
@@ -369,16 +375,16 @@
 		</method>
 		<method name="rfind" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="int" />
-			<argument index="1" name="from" type="int" default="-1" />
+			<param index="0" name="value" type="int" />
+			<param index="1" name="from" type="int" default="-1" />
 			<description>
 				Searches the array in reverse order. Optionally, a start search index can be passed. If negative, the start index is considered relative to the end of the array.
 			</description>
 		</method>
 		<method name="set">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="value" type="int" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="value" type="int" />
 			<description>
 				Changes the byte at the given index.
 			</description>
@@ -391,12 +397,12 @@
 		</method>
 		<method name="slice" qualifiers="const">
 			<return type="PackedByteArray" />
-			<argument index="0" name="begin" type="int" />
-			<argument index="1" name="end" type="int" default="2147483647" />
+			<param index="0" name="begin" type="int" />
+			<param index="1" name="end" type="int" default="2147483647" />
 			<description>
-				Returns the slice of the [PackedByteArray], from [code]begin[/code] (inclusive) to [code]end[/code] (exclusive), as a new [PackedByteArray].
-				The absolute value of [code]begin[/code] and [code]end[/code] will be clamped to the array size, so the default value for [code]end[/code] makes it slice to the size of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for [code]arr.slice(1, arr.size())[/code]).
-				If either [code]begin[/code] or [code]end[/code] are negative, they will be relative to the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for [code]arr.slice(0, arr.size() - 2)[/code]).
+				Returns the slice of the [PackedByteArray], from [param begin] (inclusive) to [param end] (exclusive), as a new [PackedByteArray].
+				The absolute value of [param begin] and [param end] will be clamped to the array size, so the default value for [param end] makes it slice to the size of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for [code]arr.slice(1, arr.size())[/code]).
+				If either [param begin] or [param end] are negative, they will be relative to the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for [code]arr.slice(0, arr.size() - 2)[/code]).
 			</description>
 		</method>
 		<method name="sort">
@@ -441,25 +447,25 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="PackedByteArray" />
+			<param index="0" name="right" type="PackedByteArray" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="PackedByteArray" />
-			<argument index="0" name="right" type="PackedByteArray" />
+			<param index="0" name="right" type="PackedByteArray" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="PackedByteArray" />
+			<param index="0" name="right" type="PackedByteArray" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator []">
 			<return type="int" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</operator>
diff --git a/doc/classes/PackedColorArray.xml b/doc/classes/PackedColorArray.xml
index 12a553af49..c694927175 100644
--- a/doc/classes/PackedColorArray.xml
+++ b/doc/classes/PackedColorArray.xml
@@ -17,14 +17,14 @@
 		</constructor>
 		<constructor name="PackedColorArray">
 			<return type="PackedColorArray" />
-			<argument index="0" name="from" type="PackedColorArray" />
+			<param index="0" name="from" type="PackedColorArray" />
 			<description>
 				Constructs a [PackedColorArray] as a copy of the given [PackedColorArray].
 			</description>
 		</constructor>
 		<constructor name="PackedColorArray">
 			<return type="PackedColorArray" />
-			<argument index="0" name="from" type="Array" />
+			<param index="0" name="from" type="Array" />
 			<description>
 				Constructs a new [PackedColorArray]. Optionally, you can pass in a generic [Array] that will be converted.
 			</description>
@@ -33,30 +33,36 @@
 	<methods>
 		<method name="append">
 			<return type="bool" />
-			<argument index="0" name="value" type="Color" />
+			<param index="0" name="value" type="Color" />
 			<description>
 				Appends an element at the end of the array (alias of [method push_back]).
 			</description>
 		</method>
 		<method name="append_array">
 			<return type="void" />
-			<argument index="0" name="array" type="PackedColorArray" />
+			<param index="0" name="array" type="PackedColorArray" />
 			<description>
 				Appends a [PackedColorArray] at the end of this array.
 			</description>
 		</method>
 		<method name="bsearch">
 			<return type="int" />
-			<argument index="0" name="value" type="Color" />
-			<argument index="1" name="before" type="bool" default="true" />
+			<param index="0" name="value" type="Color" />
+			<param index="1" name="before" type="bool" default="true" />
 			<description>
-				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a [code]before[/code] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array.
+				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a [param before] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array.
 				[b]Note:[/b] Calling [method bsearch] on an unsorted array results in unexpected behavior.
 			</description>
 		</method>
+		<method name="clear">
+			<return type="void" />
+			<description>
+				Clears the array. This is equivalent to using [method resize] with a size of [code]0[/code].
+			</description>
+		</method>
 		<method name="count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="Color" />
+			<param index="0" name="value" type="Color" />
 			<description>
 				Returns the number of times an element is in the array.
 			</description>
@@ -69,30 +75,30 @@
 		</method>
 		<method name="fill">
 			<return type="void" />
-			<argument index="0" name="value" type="Color" />
+			<param index="0" name="value" type="Color" />
 			<description>
 				Assigns the given value to all elements in the array. This can typically be used together with [method resize] to create an array with a given size and initialized elements.
 			</description>
 		</method>
 		<method name="find" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="Color" />
-			<argument index="1" name="from" type="int" default="0" />
+			<param index="0" name="value" type="Color" />
+			<param index="1" name="from" type="int" default="0" />
 			<description>
 				Searches the array for a value and returns its index or [code]-1[/code] if not found. Optionally, the initial search index can be passed.
 			</description>
 		</method>
 		<method name="has" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="value" type="Color" />
+			<param index="0" name="value" type="Color" />
 			<description>
-				Returns [code]true[/code] if the array contains [code]value[/code].
+				Returns [code]true[/code] if the array contains [param value].
 			</description>
 		</method>
 		<method name="insert">
 			<return type="int" />
-			<argument index="0" name="at_index" type="int" />
-			<argument index="1" name="value" type="Color" />
+			<param index="0" name="at_index" type="int" />
+			<param index="1" name="value" type="Color" />
 			<description>
 				Inserts a new element at a given position in the array. The position must be valid, or at the end of the array ([code]idx == size()[/code]).
 			</description>
@@ -105,21 +111,21 @@
 		</method>
 		<method name="push_back">
 			<return type="bool" />
-			<argument index="0" name="value" type="Color" />
+			<param index="0" name="value" type="Color" />
 			<description>
 				Appends a value to the array.
 			</description>
 		</method>
 		<method name="remove_at">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Removes an element from the array by index.
 			</description>
 		</method>
 		<method name="resize">
 			<return type="int" />
-			<argument index="0" name="new_size" type="int" />
+			<param index="0" name="new_size" type="int" />
 			<description>
 				Sets the size of the array. If the array is grown, reserves elements at the end of the array. If the array is shrunk, truncates the array to the new size.
 			</description>
@@ -132,16 +138,16 @@
 		</method>
 		<method name="rfind" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="Color" />
-			<argument index="1" name="from" type="int" default="-1" />
+			<param index="0" name="value" type="Color" />
+			<param index="1" name="from" type="int" default="-1" />
 			<description>
 				Searches the array in reverse order. Optionally, a start search index can be passed. If negative, the start index is considered relative to the end of the array.
 			</description>
 		</method>
 		<method name="set">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="value" type="Color" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="value" type="Color" />
 			<description>
 				Changes the [Color] at the given index.
 			</description>
@@ -154,12 +160,12 @@
 		</method>
 		<method name="slice" qualifiers="const">
 			<return type="PackedColorArray" />
-			<argument index="0" name="begin" type="int" />
-			<argument index="1" name="end" type="int" default="2147483647" />
+			<param index="0" name="begin" type="int" />
+			<param index="1" name="end" type="int" default="2147483647" />
 			<description>
-				Returns the slice of the [PackedColorArray], from [code]begin[/code] (inclusive) to [code]end[/code] (exclusive), as a new [PackedColorArray].
-				The absolute value of [code]begin[/code] and [code]end[/code] will be clamped to the array size, so the default value for [code]end[/code] makes it slice to the size of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for [code]arr.slice(1, arr.size())[/code]).
-				If either [code]begin[/code] or [code]end[/code] are negative, they will be relative to the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for [code]arr.slice(0, arr.size() - 2)[/code]).
+				Returns the slice of the [PackedColorArray], from [param begin] (inclusive) to [param end] (exclusive), as a new [PackedColorArray].
+				The absolute value of [param begin] and [param end] will be clamped to the array size, so the default value for [param end] makes it slice to the size of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for [code]arr.slice(1, arr.size())[/code]).
+				If either [param begin] or [param end] are negative, they will be relative to the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for [code]arr.slice(0, arr.size() - 2)[/code]).
 			</description>
 		</method>
 		<method name="sort">
@@ -177,25 +183,25 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="PackedColorArray" />
+			<param index="0" name="right" type="PackedColorArray" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="PackedColorArray" />
-			<argument index="0" name="right" type="PackedColorArray" />
+			<param index="0" name="right" type="PackedColorArray" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="PackedColorArray" />
+			<param index="0" name="right" type="PackedColorArray" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator []">
 			<return type="Color" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</operator>
diff --git a/doc/classes/PackedDataContainer.xml b/doc/classes/PackedDataContainer.xml
index cba7269ccf..5035c8dee4 100644
--- a/doc/classes/PackedDataContainer.xml
+++ b/doc/classes/PackedDataContainer.xml
@@ -9,7 +9,7 @@
 	<methods>
 		<method name="pack">
 			<return type="int" enum="Error" />
-			<argument index="0" name="value" type="Variant" />
+			<param index="0" name="value" type="Variant" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/PackedFloat32Array.xml b/doc/classes/PackedFloat32Array.xml
index 0a114e6c06..41d0679099 100644
--- a/doc/classes/PackedFloat32Array.xml
+++ b/doc/classes/PackedFloat32Array.xml
@@ -18,14 +18,14 @@
 		</constructor>
 		<constructor name="PackedFloat32Array">
 			<return type="PackedFloat32Array" />
-			<argument index="0" name="from" type="PackedFloat32Array" />
+			<param index="0" name="from" type="PackedFloat32Array" />
 			<description>
 				Constructs a [PackedFloat32Array] as a copy of the given [PackedFloat32Array].
 			</description>
 		</constructor>
 		<constructor name="PackedFloat32Array">
 			<return type="PackedFloat32Array" />
-			<argument index="0" name="from" type="Array" />
+			<param index="0" name="from" type="Array" />
 			<description>
 				Constructs a new [PackedFloat32Array]. Optionally, you can pass in a generic [Array] that will be converted.
 			</description>
@@ -34,30 +34,36 @@
 	<methods>
 		<method name="append">
 			<return type="bool" />
-			<argument index="0" name="value" type="float" />
+			<param index="0" name="value" type="float" />
 			<description>
 				Appends an element at the end of the array (alias of [method push_back]).
 			</description>
 		</method>
 		<method name="append_array">
 			<return type="void" />
-			<argument index="0" name="array" type="PackedFloat32Array" />
+			<param index="0" name="array" type="PackedFloat32Array" />
 			<description>
 				Appends a [PackedFloat32Array] at the end of this array.
 			</description>
 		</method>
 		<method name="bsearch">
 			<return type="int" />
-			<argument index="0" name="value" type="float" />
-			<argument index="1" name="before" type="bool" default="true" />
+			<param index="0" name="value" type="float" />
+			<param index="1" name="before" type="bool" default="true" />
 			<description>
-				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a [code]before[/code] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array.
+				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a [param before] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array.
 				[b]Note:[/b] Calling [method bsearch] on an unsorted array results in unexpected behavior.
 			</description>
 		</method>
+		<method name="clear">
+			<return type="void" />
+			<description>
+				Clears the array. This is equivalent to using [method resize] with a size of [code]0[/code].
+			</description>
+		</method>
 		<method name="count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="float" />
+			<param index="0" name="value" type="float" />
 			<description>
 				Returns the number of times an element is in the array.
 			</description>
@@ -70,30 +76,30 @@
 		</method>
 		<method name="fill">
 			<return type="void" />
-			<argument index="0" name="value" type="float" />
+			<param index="0" name="value" type="float" />
 			<description>
 				Assigns the given value to all elements in the array. This can typically be used together with [method resize] to create an array with a given size and initialized elements.
 			</description>
 		</method>
 		<method name="find" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="float" />
-			<argument index="1" name="from" type="int" default="0" />
+			<param index="0" name="value" type="float" />
+			<param index="1" name="from" type="int" default="0" />
 			<description>
 				Searches the array for a value and returns its index or [code]-1[/code] if not found. Optionally, the initial search index can be passed.
 			</description>
 		</method>
 		<method name="has" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="value" type="float" />
+			<param index="0" name="value" type="float" />
 			<description>
-				Returns [code]true[/code] if the array contains [code]value[/code].
+				Returns [code]true[/code] if the array contains [param value].
 			</description>
 		</method>
 		<method name="insert">
 			<return type="int" />
-			<argument index="0" name="at_index" type="int" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="at_index" type="int" />
+			<param index="1" name="value" type="float" />
 			<description>
 				Inserts a new element at a given position in the array. The position must be valid, or at the end of the array ([code]idx == size()[/code]).
 			</description>
@@ -106,21 +112,21 @@
 		</method>
 		<method name="push_back">
 			<return type="bool" />
-			<argument index="0" name="value" type="float" />
+			<param index="0" name="value" type="float" />
 			<description>
 				Appends an element at the end of the array.
 			</description>
 		</method>
 		<method name="remove_at">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Removes an element from the array by index.
 			</description>
 		</method>
 		<method name="resize">
 			<return type="int" />
-			<argument index="0" name="new_size" type="int" />
+			<param index="0" name="new_size" type="int" />
 			<description>
 				Sets the size of the array. If the array is grown, reserves elements at the end of the array. If the array is shrunk, truncates the array to the new size.
 			</description>
@@ -133,16 +139,16 @@
 		</method>
 		<method name="rfind" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="float" />
-			<argument index="1" name="from" type="int" default="-1" />
+			<param index="0" name="value" type="float" />
+			<param index="1" name="from" type="int" default="-1" />
 			<description>
 				Searches the array in reverse order. Optionally, a start search index can be passed. If negative, the start index is considered relative to the end of the array.
 			</description>
 		</method>
 		<method name="set">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="value" type="float" />
 			<description>
 				Changes the float at the given index.
 			</description>
@@ -155,12 +161,12 @@
 		</method>
 		<method name="slice" qualifiers="const">
 			<return type="PackedFloat32Array" />
-			<argument index="0" name="begin" type="int" />
-			<argument index="1" name="end" type="int" default="2147483647" />
+			<param index="0" name="begin" type="int" />
+			<param index="1" name="end" type="int" default="2147483647" />
 			<description>
-				Returns the slice of the [PackedFloat32Array], from [code]begin[/code] (inclusive) to [code]end[/code] (exclusive), as a new [PackedFloat32Array].
-				The absolute value of [code]begin[/code] and [code]end[/code] will be clamped to the array size, so the default value for [code]end[/code] makes it slice to the size of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for [code]arr.slice(1, arr.size())[/code]).
-				If either [code]begin[/code] or [code]end[/code] are negative, they will be relative to the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for [code]arr.slice(0, arr.size() - 2)[/code]).
+				Returns the slice of the [PackedFloat32Array], from [param begin] (inclusive) to [param end] (exclusive), as a new [PackedFloat32Array].
+				The absolute value of [param begin] and [param end] will be clamped to the array size, so the default value for [param end] makes it slice to the size of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for [code]arr.slice(1, arr.size())[/code]).
+				If either [param begin] or [param end] are negative, they will be relative to the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for [code]arr.slice(0, arr.size() - 2)[/code]).
 			</description>
 		</method>
 		<method name="sort">
@@ -180,25 +186,25 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="PackedFloat32Array" />
+			<param index="0" name="right" type="PackedFloat32Array" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="PackedFloat32Array" />
-			<argument index="0" name="right" type="PackedFloat32Array" />
+			<param index="0" name="right" type="PackedFloat32Array" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="PackedFloat32Array" />
+			<param index="0" name="right" type="PackedFloat32Array" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator []">
 			<return type="float" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</operator>
diff --git a/doc/classes/PackedFloat64Array.xml b/doc/classes/PackedFloat64Array.xml
index 0327559f5b..bedbe3603c 100644
--- a/doc/classes/PackedFloat64Array.xml
+++ b/doc/classes/PackedFloat64Array.xml
@@ -18,14 +18,14 @@
 		</constructor>
 		<constructor name="PackedFloat64Array">
 			<return type="PackedFloat64Array" />
-			<argument index="0" name="from" type="PackedFloat64Array" />
+			<param index="0" name="from" type="PackedFloat64Array" />
 			<description>
 				Constructs a [PackedFloat64Array] as a copy of the given [PackedFloat64Array].
 			</description>
 		</constructor>
 		<constructor name="PackedFloat64Array">
 			<return type="PackedFloat64Array" />
-			<argument index="0" name="from" type="Array" />
+			<param index="0" name="from" type="Array" />
 			<description>
 				Constructs a new [PackedFloat64Array]. Optionally, you can pass in a generic [Array] that will be converted.
 			</description>
@@ -34,30 +34,36 @@
 	<methods>
 		<method name="append">
 			<return type="bool" />
-			<argument index="0" name="value" type="float" />
+			<param index="0" name="value" type="float" />
 			<description>
 				Appends an element at the end of the array (alias of [method push_back]).
 			</description>
 		</method>
 		<method name="append_array">
 			<return type="void" />
-			<argument index="0" name="array" type="PackedFloat64Array" />
+			<param index="0" name="array" type="PackedFloat64Array" />
 			<description>
 				Appends a [PackedFloat64Array] at the end of this array.
 			</description>
 		</method>
 		<method name="bsearch">
 			<return type="int" />
-			<argument index="0" name="value" type="float" />
-			<argument index="1" name="before" type="bool" default="true" />
+			<param index="0" name="value" type="float" />
+			<param index="1" name="before" type="bool" default="true" />
 			<description>
-				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a [code]before[/code] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array.
+				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a [param before] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array.
 				[b]Note:[/b] Calling [method bsearch] on an unsorted array results in unexpected behavior.
 			</description>
 		</method>
+		<method name="clear">
+			<return type="void" />
+			<description>
+				Clears the array. This is equivalent to using [method resize] with a size of [code]0[/code].
+			</description>
+		</method>
 		<method name="count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="float" />
+			<param index="0" name="value" type="float" />
 			<description>
 				Returns the number of times an element is in the array.
 			</description>
@@ -70,30 +76,30 @@
 		</method>
 		<method name="fill">
 			<return type="void" />
-			<argument index="0" name="value" type="float" />
+			<param index="0" name="value" type="float" />
 			<description>
 				Assigns the given value to all elements in the array. This can typically be used together with [method resize] to create an array with a given size and initialized elements.
 			</description>
 		</method>
 		<method name="find" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="float" />
-			<argument index="1" name="from" type="int" default="0" />
+			<param index="0" name="value" type="float" />
+			<param index="1" name="from" type="int" default="0" />
 			<description>
 				Searches the array for a value and returns its index or [code]-1[/code] if not found. Optionally, the initial search index can be passed.
 			</description>
 		</method>
 		<method name="has" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="value" type="float" />
+			<param index="0" name="value" type="float" />
 			<description>
-				Returns [code]true[/code] if the array contains [code]value[/code].
+				Returns [code]true[/code] if the array contains [param value].
 			</description>
 		</method>
 		<method name="insert">
 			<return type="int" />
-			<argument index="0" name="at_index" type="int" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="at_index" type="int" />
+			<param index="1" name="value" type="float" />
 			<description>
 				Inserts a new element at a given position in the array. The position must be valid, or at the end of the array ([code]idx == size()[/code]).
 			</description>
@@ -106,21 +112,21 @@
 		</method>
 		<method name="push_back">
 			<return type="bool" />
-			<argument index="0" name="value" type="float" />
+			<param index="0" name="value" type="float" />
 			<description>
 				Appends an element at the end of the array.
 			</description>
 		</method>
 		<method name="remove_at">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Removes an element from the array by index.
 			</description>
 		</method>
 		<method name="resize">
 			<return type="int" />
-			<argument index="0" name="new_size" type="int" />
+			<param index="0" name="new_size" type="int" />
 			<description>
 				Sets the size of the array. If the array is grown, reserves elements at the end of the array. If the array is shrunk, truncates the array to the new size.
 			</description>
@@ -133,16 +139,16 @@
 		</method>
 		<method name="rfind" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="float" />
-			<argument index="1" name="from" type="int" default="-1" />
+			<param index="0" name="value" type="float" />
+			<param index="1" name="from" type="int" default="-1" />
 			<description>
 				Searches the array in reverse order. Optionally, a start search index can be passed. If negative, the start index is considered relative to the end of the array.
 			</description>
 		</method>
 		<method name="set">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="value" type="float" />
 			<description>
 				Changes the float at the given index.
 			</description>
@@ -155,12 +161,12 @@
 		</method>
 		<method name="slice" qualifiers="const">
 			<return type="PackedFloat64Array" />
-			<argument index="0" name="begin" type="int" />
-			<argument index="1" name="end" type="int" default="2147483647" />
+			<param index="0" name="begin" type="int" />
+			<param index="1" name="end" type="int" default="2147483647" />
 			<description>
-				Returns the slice of the [PackedFloat64Array], from [code]begin[/code] (inclusive) to [code]end[/code] (exclusive), as a new [PackedFloat64Array].
-				The absolute value of [code]begin[/code] and [code]end[/code] will be clamped to the array size, so the default value for [code]end[/code] makes it slice to the size of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for [code]arr.slice(1, arr.size())[/code]).
-				If either [code]begin[/code] or [code]end[/code] are negative, they will be relative to the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for [code]arr.slice(0, arr.size() - 2)[/code]).
+				Returns the slice of the [PackedFloat64Array], from [param begin] (inclusive) to [param end] (exclusive), as a new [PackedFloat64Array].
+				The absolute value of [param begin] and [param end] will be clamped to the array size, so the default value for [param end] makes it slice to the size of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for [code]arr.slice(1, arr.size())[/code]).
+				If either [param begin] or [param end] are negative, they will be relative to the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for [code]arr.slice(0, arr.size() - 2)[/code]).
 			</description>
 		</method>
 		<method name="sort">
@@ -180,25 +186,25 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="PackedFloat64Array" />
+			<param index="0" name="right" type="PackedFloat64Array" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="PackedFloat64Array" />
-			<argument index="0" name="right" type="PackedFloat64Array" />
+			<param index="0" name="right" type="PackedFloat64Array" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="PackedFloat64Array" />
+			<param index="0" name="right" type="PackedFloat64Array" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator []">
 			<return type="float" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</operator>
diff --git a/doc/classes/PackedInt32Array.xml b/doc/classes/PackedInt32Array.xml
index f8b606d266..db4c8c0937 100644
--- a/doc/classes/PackedInt32Array.xml
+++ b/doc/classes/PackedInt32Array.xml
@@ -18,14 +18,14 @@
 		</constructor>
 		<constructor name="PackedInt32Array">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="from" type="PackedInt32Array" />
+			<param index="0" name="from" type="PackedInt32Array" />
 			<description>
 				Constructs a [PackedInt32Array] as a copy of the given [PackedInt32Array].
 			</description>
 		</constructor>
 		<constructor name="PackedInt32Array">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="from" type="Array" />
+			<param index="0" name="from" type="Array" />
 			<description>
 				Constructs a new [PackedInt32Array]. Optionally, you can pass in a generic [Array] that will be converted.
 			</description>
@@ -34,30 +34,36 @@
 	<methods>
 		<method name="append">
 			<return type="bool" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Appends an element at the end of the array (alias of [method push_back]).
 			</description>
 		</method>
 		<method name="append_array">
 			<return type="void" />
-			<argument index="0" name="array" type="PackedInt32Array" />
+			<param index="0" name="array" type="PackedInt32Array" />
 			<description>
 				Appends a [PackedInt32Array] at the end of this array.
 			</description>
 		</method>
 		<method name="bsearch">
 			<return type="int" />
-			<argument index="0" name="value" type="int" />
-			<argument index="1" name="before" type="bool" default="true" />
+			<param index="0" name="value" type="int" />
+			<param index="1" name="before" type="bool" default="true" />
 			<description>
-				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a [code]before[/code] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array.
+				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a [param before] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array.
 				[b]Note:[/b] Calling [method bsearch] on an unsorted array results in unexpected behavior.
 			</description>
 		</method>
+		<method name="clear">
+			<return type="void" />
+			<description>
+				Clears the array. This is equivalent to using [method resize] with a size of [code]0[/code].
+			</description>
+		</method>
 		<method name="count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Returns the number of times an element is in the array.
 			</description>
@@ -70,30 +76,30 @@
 		</method>
 		<method name="fill">
 			<return type="void" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Assigns the given value to all elements in the array. This can typically be used together with [method resize] to create an array with a given size and initialized elements.
 			</description>
 		</method>
 		<method name="find" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="int" />
-			<argument index="1" name="from" type="int" default="0" />
+			<param index="0" name="value" type="int" />
+			<param index="1" name="from" type="int" default="0" />
 			<description>
 				Searches the array for a value and returns its index or [code]-1[/code] if not found. Optionally, the initial search index can be passed.
 			</description>
 		</method>
 		<method name="has" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
-				Returns [code]true[/code] if the array contains [code]value[/code].
+				Returns [code]true[/code] if the array contains [param value].
 			</description>
 		</method>
 		<method name="insert">
 			<return type="int" />
-			<argument index="0" name="at_index" type="int" />
-			<argument index="1" name="value" type="int" />
+			<param index="0" name="at_index" type="int" />
+			<param index="1" name="value" type="int" />
 			<description>
 				Inserts a new integer at a given position in the array. The position must be valid, or at the end of the array ([code]idx == size()[/code]).
 			</description>
@@ -106,21 +112,21 @@
 		</method>
 		<method name="push_back">
 			<return type="bool" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Appends a value to the array.
 			</description>
 		</method>
 		<method name="remove_at">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Removes an element from the array by index.
 			</description>
 		</method>
 		<method name="resize">
 			<return type="int" />
-			<argument index="0" name="new_size" type="int" />
+			<param index="0" name="new_size" type="int" />
 			<description>
 				Sets the size of the array. If the array is grown, reserves elements at the end of the array. If the array is shrunk, truncates the array to the new size.
 			</description>
@@ -133,16 +139,16 @@
 		</method>
 		<method name="rfind" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="int" />
-			<argument index="1" name="from" type="int" default="-1" />
+			<param index="0" name="value" type="int" />
+			<param index="1" name="from" type="int" default="-1" />
 			<description>
 				Searches the array in reverse order. Optionally, a start search index can be passed. If negative, the start index is considered relative to the end of the array.
 			</description>
 		</method>
 		<method name="set">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="value" type="int" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="value" type="int" />
 			<description>
 				Changes the integer at the given index.
 			</description>
@@ -155,12 +161,12 @@
 		</method>
 		<method name="slice" qualifiers="const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="begin" type="int" />
-			<argument index="1" name="end" type="int" default="2147483647" />
+			<param index="0" name="begin" type="int" />
+			<param index="1" name="end" type="int" default="2147483647" />
 			<description>
-				Returns the slice of the [PackedInt32Array], from [code]begin[/code] (inclusive) to [code]end[/code] (exclusive), as a new [PackedInt32Array].
-				The absolute value of [code]begin[/code] and [code]end[/code] will be clamped to the array size, so the default value for [code]end[/code] makes it slice to the size of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for [code]arr.slice(1, arr.size())[/code]).
-				If either [code]begin[/code] or [code]end[/code] are negative, they will be relative to the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for [code]arr.slice(0, arr.size() - 2)[/code]).
+				Returns the slice of the [PackedInt32Array], from [param begin] (inclusive) to [param end] (exclusive), as a new [PackedInt32Array].
+				The absolute value of [param begin] and [param end] will be clamped to the array size, so the default value for [param end] makes it slice to the size of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for [code]arr.slice(1, arr.size())[/code]).
+				If either [param begin] or [param end] are negative, they will be relative to the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for [code]arr.slice(0, arr.size() - 2)[/code]).
 			</description>
 		</method>
 		<method name="sort">
@@ -180,25 +186,25 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="PackedInt32Array" />
+			<param index="0" name="right" type="PackedInt32Array" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="right" type="PackedInt32Array" />
+			<param index="0" name="right" type="PackedInt32Array" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="PackedInt32Array" />
+			<param index="0" name="right" type="PackedInt32Array" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator []">
 			<return type="int" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</operator>
diff --git a/doc/classes/PackedInt64Array.xml b/doc/classes/PackedInt64Array.xml
index ea3e304d35..56d72692a2 100644
--- a/doc/classes/PackedInt64Array.xml
+++ b/doc/classes/PackedInt64Array.xml
@@ -18,14 +18,14 @@
 		</constructor>
 		<constructor name="PackedInt64Array">
 			<return type="PackedInt64Array" />
-			<argument index="0" name="from" type="PackedInt64Array" />
+			<param index="0" name="from" type="PackedInt64Array" />
 			<description>
 				Constructs a [PackedInt64Array] as a copy of the given [PackedInt64Array].
 			</description>
 		</constructor>
 		<constructor name="PackedInt64Array">
 			<return type="PackedInt64Array" />
-			<argument index="0" name="from" type="Array" />
+			<param index="0" name="from" type="Array" />
 			<description>
 				Constructs a new [PackedInt64Array]. Optionally, you can pass in a generic [Array] that will be converted.
 			</description>
@@ -34,30 +34,36 @@
 	<methods>
 		<method name="append">
 			<return type="bool" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Appends an element at the end of the array (alias of [method push_back]).
 			</description>
 		</method>
 		<method name="append_array">
 			<return type="void" />
-			<argument index="0" name="array" type="PackedInt64Array" />
+			<param index="0" name="array" type="PackedInt64Array" />
 			<description>
 				Appends a [PackedInt64Array] at the end of this array.
 			</description>
 		</method>
 		<method name="bsearch">
 			<return type="int" />
-			<argument index="0" name="value" type="int" />
-			<argument index="1" name="before" type="bool" default="true" />
+			<param index="0" name="value" type="int" />
+			<param index="1" name="before" type="bool" default="true" />
 			<description>
-				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a [code]before[/code] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array.
+				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a [param before] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array.
 				[b]Note:[/b] Calling [method bsearch] on an unsorted array results in unexpected behavior.
 			</description>
 		</method>
+		<method name="clear">
+			<return type="void" />
+			<description>
+				Clears the array. This is equivalent to using [method resize] with a size of [code]0[/code].
+			</description>
+		</method>
 		<method name="count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Returns the number of times an element is in the array.
 			</description>
@@ -70,30 +76,30 @@
 		</method>
 		<method name="fill">
 			<return type="void" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Assigns the given value to all elements in the array. This can typically be used together with [method resize] to create an array with a given size and initialized elements.
 			</description>
 		</method>
 		<method name="find" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="int" />
-			<argument index="1" name="from" type="int" default="0" />
+			<param index="0" name="value" type="int" />
+			<param index="1" name="from" type="int" default="0" />
 			<description>
 				Searches the array for a value and returns its index or [code]-1[/code] if not found. Optionally, the initial search index can be passed.
 			</description>
 		</method>
 		<method name="has" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
-				Returns [code]true[/code] if the array contains [code]value[/code].
+				Returns [code]true[/code] if the array contains [param value].
 			</description>
 		</method>
 		<method name="insert">
 			<return type="int" />
-			<argument index="0" name="at_index" type="int" />
-			<argument index="1" name="value" type="int" />
+			<param index="0" name="at_index" type="int" />
+			<param index="1" name="value" type="int" />
 			<description>
 				Inserts a new integer at a given position in the array. The position must be valid, or at the end of the array ([code]idx == size()[/code]).
 			</description>
@@ -106,21 +112,21 @@
 		</method>
 		<method name="push_back">
 			<return type="bool" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Appends a value to the array.
 			</description>
 		</method>
 		<method name="remove_at">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Removes an element from the array by index.
 			</description>
 		</method>
 		<method name="resize">
 			<return type="int" />
-			<argument index="0" name="new_size" type="int" />
+			<param index="0" name="new_size" type="int" />
 			<description>
 				Sets the size of the array. If the array is grown, reserves elements at the end of the array. If the array is shrunk, truncates the array to the new size.
 			</description>
@@ -133,16 +139,16 @@
 		</method>
 		<method name="rfind" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="int" />
-			<argument index="1" name="from" type="int" default="-1" />
+			<param index="0" name="value" type="int" />
+			<param index="1" name="from" type="int" default="-1" />
 			<description>
 				Searches the array in reverse order. Optionally, a start search index can be passed. If negative, the start index is considered relative to the end of the array.
 			</description>
 		</method>
 		<method name="set">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="value" type="int" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="value" type="int" />
 			<description>
 				Changes the integer at the given index.
 			</description>
@@ -155,12 +161,12 @@
 		</method>
 		<method name="slice" qualifiers="const">
 			<return type="PackedInt64Array" />
-			<argument index="0" name="begin" type="int" />
-			<argument index="1" name="end" type="int" default="2147483647" />
+			<param index="0" name="begin" type="int" />
+			<param index="1" name="end" type="int" default="2147483647" />
 			<description>
-				Returns the slice of the [PackedInt64Array], from [code]begin[/code] (inclusive) to [code]end[/code] (exclusive), as a new [PackedInt64Array].
-				The absolute value of [code]begin[/code] and [code]end[/code] will be clamped to the array size, so the default value for [code]end[/code] makes it slice to the size of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for [code]arr.slice(1, arr.size())[/code]).
-				If either [code]begin[/code] or [code]end[/code] are negative, they will be relative to the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for [code]arr.slice(0, arr.size() - 2)[/code]).
+				Returns the slice of the [PackedInt64Array], from [param begin] (inclusive) to [param end] (exclusive), as a new [PackedInt64Array].
+				The absolute value of [param begin] and [param end] will be clamped to the array size, so the default value for [param end] makes it slice to the size of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for [code]arr.slice(1, arr.size())[/code]).
+				If either [param begin] or [param end] are negative, they will be relative to the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for [code]arr.slice(0, arr.size() - 2)[/code]).
 			</description>
 		</method>
 		<method name="sort">
@@ -180,25 +186,25 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="PackedInt64Array" />
+			<param index="0" name="right" type="PackedInt64Array" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="PackedInt64Array" />
-			<argument index="0" name="right" type="PackedInt64Array" />
+			<param index="0" name="right" type="PackedInt64Array" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="PackedInt64Array" />
+			<param index="0" name="right" type="PackedInt64Array" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator []">
 			<return type="int" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</operator>
diff --git a/doc/classes/PackedScene.xml b/doc/classes/PackedScene.xml
index 821fc1ae95..c7fe7d8c37 100644
--- a/doc/classes/PackedScene.xml
+++ b/doc/classes/PackedScene.xml
@@ -90,14 +90,14 @@
 		</method>
 		<method name="instantiate" qualifiers="const">
 			<return type="Node" />
-			<argument index="0" name="edit_state" type="int" enum="PackedScene.GenEditState" default="0" />
+			<param index="0" name="edit_state" type="int" enum="PackedScene.GenEditState" default="0" />
 			<description>
 				Instantiates the scene's node hierarchy. Triggers child scene instantiation(s). Triggers a [constant Node.NOTIFICATION_INSTANCED] notification on the root node.
 			</description>
 		</method>
 		<method name="pack">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="Node" />
+			<param index="0" name="path" type="Node" />
 			<description>
 				Pack will ignore any sub-nodes not owned by given node. See [member Node.owner].
 			</description>
diff --git a/doc/classes/PackedStringArray.xml b/doc/classes/PackedStringArray.xml
index a4653344f0..b58a3b2553 100644
--- a/doc/classes/PackedStringArray.xml
+++ b/doc/classes/PackedStringArray.xml
@@ -24,14 +24,14 @@
 		</constructor>
 		<constructor name="PackedStringArray">
 			<return type="PackedStringArray" />
-			<argument index="0" name="from" type="PackedStringArray" />
+			<param index="0" name="from" type="PackedStringArray" />
 			<description>
 				Constructs a [PackedStringArray] as a copy of the given [PackedStringArray].
 			</description>
 		</constructor>
 		<constructor name="PackedStringArray">
 			<return type="PackedStringArray" />
-			<argument index="0" name="from" type="Array" />
+			<param index="0" name="from" type="Array" />
 			<description>
 				Constructs a new [PackedStringArray]. Optionally, you can pass in a generic [Array] that will be converted.
 			</description>
@@ -40,30 +40,36 @@
 	<methods>
 		<method name="append">
 			<return type="bool" />
-			<argument index="0" name="value" type="String" />
+			<param index="0" name="value" type="String" />
 			<description>
 				Appends an element at the end of the array (alias of [method push_back]).
 			</description>
 		</method>
 		<method name="append_array">
 			<return type="void" />
-			<argument index="0" name="array" type="PackedStringArray" />
+			<param index="0" name="array" type="PackedStringArray" />
 			<description>
 				Appends a [PackedStringArray] at the end of this array.
 			</description>
 		</method>
 		<method name="bsearch">
 			<return type="int" />
-			<argument index="0" name="value" type="String" />
-			<argument index="1" name="before" type="bool" default="true" />
+			<param index="0" name="value" type="String" />
+			<param index="1" name="before" type="bool" default="true" />
 			<description>
-				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a [code]before[/code] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array.
+				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a [param before] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array.
 				[b]Note:[/b] Calling [method bsearch] on an unsorted array results in unexpected behavior.
 			</description>
 		</method>
+		<method name="clear">
+			<return type="void" />
+			<description>
+				Clears the array. This is equivalent to using [method resize] with a size of [code]0[/code].
+			</description>
+		</method>
 		<method name="count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="String" />
+			<param index="0" name="value" type="String" />
 			<description>
 				Returns the number of times an element is in the array.
 			</description>
@@ -76,30 +82,30 @@
 		</method>
 		<method name="fill">
 			<return type="void" />
-			<argument index="0" name="value" type="String" />
+			<param index="0" name="value" type="String" />
 			<description>
 				Assigns the given value to all elements in the array. This can typically be used together with [method resize] to create an array with a given size and initialized elements.
 			</description>
 		</method>
 		<method name="find" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="String" />
-			<argument index="1" name="from" type="int" default="0" />
+			<param index="0" name="value" type="String" />
+			<param index="1" name="from" type="int" default="0" />
 			<description>
 				Searches the array for a value and returns its index or [code]-1[/code] if not found. Optionally, the initial search index can be passed.
 			</description>
 		</method>
 		<method name="has" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="value" type="String" />
+			<param index="0" name="value" type="String" />
 			<description>
-				Returns [code]true[/code] if the array contains [code]value[/code].
+				Returns [code]true[/code] if the array contains [param value].
 			</description>
 		</method>
 		<method name="insert">
 			<return type="int" />
-			<argument index="0" name="at_index" type="int" />
-			<argument index="1" name="value" type="String" />
+			<param index="0" name="at_index" type="int" />
+			<param index="1" name="value" type="String" />
 			<description>
 				Inserts a new element at a given position in the array. The position must be valid, or at the end of the array ([code]idx == size()[/code]).
 			</description>
@@ -112,21 +118,21 @@
 		</method>
 		<method name="push_back">
 			<return type="bool" />
-			<argument index="0" name="value" type="String" />
+			<param index="0" name="value" type="String" />
 			<description>
 				Appends a string element at end of the array.
 			</description>
 		</method>
 		<method name="remove_at">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Removes an element from the array by index.
 			</description>
 		</method>
 		<method name="resize">
 			<return type="int" />
-			<argument index="0" name="new_size" type="int" />
+			<param index="0" name="new_size" type="int" />
 			<description>
 				Sets the size of the array. If the array is grown, reserves elements at the end of the array. If the array is shrunk, truncates the array to the new size.
 			</description>
@@ -139,16 +145,16 @@
 		</method>
 		<method name="rfind" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="String" />
-			<argument index="1" name="from" type="int" default="-1" />
+			<param index="0" name="value" type="String" />
+			<param index="1" name="from" type="int" default="-1" />
 			<description>
 				Searches the array in reverse order. Optionally, a start search index can be passed. If negative, the start index is considered relative to the end of the array.
 			</description>
 		</method>
 		<method name="set">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="value" type="String" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="value" type="String" />
 			<description>
 				Changes the [String] at the given index.
 			</description>
@@ -161,12 +167,12 @@
 		</method>
 		<method name="slice" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="begin" type="int" />
-			<argument index="1" name="end" type="int" default="2147483647" />
+			<param index="0" name="begin" type="int" />
+			<param index="1" name="end" type="int" default="2147483647" />
 			<description>
-				Returns the slice of the [PackedStringArray], from [code]begin[/code] (inclusive) to [code]end[/code] (exclusive), as a new [PackedStringArray].
-				The absolute value of [code]begin[/code] and [code]end[/code] will be clamped to the array size, so the default value for [code]end[/code] makes it slice to the size of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for [code]arr.slice(1, arr.size())[/code]).
-				If either [code]begin[/code] or [code]end[/code] are negative, they will be relative to the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for [code]arr.slice(0, arr.size() - 2)[/code]).
+				Returns the slice of the [PackedStringArray], from [param begin] (inclusive) to [param end] (exclusive), as a new [PackedStringArray].
+				The absolute value of [param begin] and [param end] will be clamped to the array size, so the default value for [param end] makes it slice to the size of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for [code]arr.slice(1, arr.size())[/code]).
+				If either [param begin] or [param end] are negative, they will be relative to the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for [code]arr.slice(0, arr.size() - 2)[/code]).
 			</description>
 		</method>
 		<method name="sort">
@@ -184,25 +190,25 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="PackedStringArray" />
+			<param index="0" name="right" type="PackedStringArray" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="PackedStringArray" />
-			<argument index="0" name="right" type="PackedStringArray" />
+			<param index="0" name="right" type="PackedStringArray" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="PackedStringArray" />
+			<param index="0" name="right" type="PackedStringArray" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator []">
 			<return type="String" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</operator>
diff --git a/doc/classes/PackedVector2Array.xml b/doc/classes/PackedVector2Array.xml
index 8f3e5d173d..7cf63d3d5e 100644
--- a/doc/classes/PackedVector2Array.xml
+++ b/doc/classes/PackedVector2Array.xml
@@ -18,14 +18,14 @@
 		</constructor>
 		<constructor name="PackedVector2Array">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="from" type="PackedVector2Array" />
+			<param index="0" name="from" type="PackedVector2Array" />
 			<description>
 				Constructs a [PackedVector2Array] as a copy of the given [PackedVector2Array].
 			</description>
 		</constructor>
 		<constructor name="PackedVector2Array">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="from" type="Array" />
+			<param index="0" name="from" type="Array" />
 			<description>
 				Constructs a new [PackedVector2Array]. Optionally, you can pass in a generic [Array] that will be converted.
 			</description>
@@ -34,30 +34,36 @@
 	<methods>
 		<method name="append">
 			<return type="bool" />
-			<argument index="0" name="value" type="Vector2" />
+			<param index="0" name="value" type="Vector2" />
 			<description>
 				Appends an element at the end of the array (alias of [method push_back]).
 			</description>
 		</method>
 		<method name="append_array">
 			<return type="void" />
-			<argument index="0" name="array" type="PackedVector2Array" />
+			<param index="0" name="array" type="PackedVector2Array" />
 			<description>
 				Appends a [PackedVector2Array] at the end of this array.
 			</description>
 		</method>
 		<method name="bsearch">
 			<return type="int" />
-			<argument index="0" name="value" type="Vector2" />
-			<argument index="1" name="before" type="bool" default="true" />
+			<param index="0" name="value" type="Vector2" />
+			<param index="1" name="before" type="bool" default="true" />
 			<description>
-				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a [code]before[/code] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array.
+				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a [param before] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array.
 				[b]Note:[/b] Calling [method bsearch] on an unsorted array results in unexpected behavior.
 			</description>
 		</method>
+		<method name="clear">
+			<return type="void" />
+			<description>
+				Clears the array. This is equivalent to using [method resize] with a size of [code]0[/code].
+			</description>
+		</method>
 		<method name="count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="Vector2" />
+			<param index="0" name="value" type="Vector2" />
 			<description>
 				Returns the number of times an element is in the array.
 			</description>
@@ -70,30 +76,30 @@
 		</method>
 		<method name="fill">
 			<return type="void" />
-			<argument index="0" name="value" type="Vector2" />
+			<param index="0" name="value" type="Vector2" />
 			<description>
 				Assigns the given value to all elements in the array. This can typically be used together with [method resize] to create an array with a given size and initialized elements.
 			</description>
 		</method>
 		<method name="find" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="Vector2" />
-			<argument index="1" name="from" type="int" default="0" />
+			<param index="0" name="value" type="Vector2" />
+			<param index="1" name="from" type="int" default="0" />
 			<description>
 				Searches the array for a value and returns its index or [code]-1[/code] if not found. Optionally, the initial search index can be passed.
 			</description>
 		</method>
 		<method name="has" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="value" type="Vector2" />
+			<param index="0" name="value" type="Vector2" />
 			<description>
-				Returns [code]true[/code] if the array contains [code]value[/code].
+				Returns [code]true[/code] if the array contains [param value].
 			</description>
 		</method>
 		<method name="insert">
 			<return type="int" />
-			<argument index="0" name="at_index" type="int" />
-			<argument index="1" name="value" type="Vector2" />
+			<param index="0" name="at_index" type="int" />
+			<param index="1" name="value" type="Vector2" />
 			<description>
 				Inserts a new element at a given position in the array. The position must be valid, or at the end of the array ([code]idx == size()[/code]).
 			</description>
@@ -106,21 +112,21 @@
 		</method>
 		<method name="push_back">
 			<return type="bool" />
-			<argument index="0" name="value" type="Vector2" />
+			<param index="0" name="value" type="Vector2" />
 			<description>
 				Inserts a [Vector2] at the end.
 			</description>
 		</method>
 		<method name="remove_at">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Removes an element from the array by index.
 			</description>
 		</method>
 		<method name="resize">
 			<return type="int" />
-			<argument index="0" name="new_size" type="int" />
+			<param index="0" name="new_size" type="int" />
 			<description>
 				Sets the size of the array. If the array is grown, reserves elements at the end of the array. If the array is shrunk, truncates the array to the new size.
 			</description>
@@ -133,16 +139,16 @@
 		</method>
 		<method name="rfind" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="Vector2" />
-			<argument index="1" name="from" type="int" default="-1" />
+			<param index="0" name="value" type="Vector2" />
+			<param index="1" name="from" type="int" default="-1" />
 			<description>
 				Searches the array in reverse order. Optionally, a start search index can be passed. If negative, the start index is considered relative to the end of the array.
 			</description>
 		</method>
 		<method name="set">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="value" type="Vector2" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="value" type="Vector2" />
 			<description>
 				Changes the [Vector2] at the given index.
 			</description>
@@ -155,12 +161,12 @@
 		</method>
 		<method name="slice" qualifiers="const">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="begin" type="int" />
-			<argument index="1" name="end" type="int" default="2147483647" />
+			<param index="0" name="begin" type="int" />
+			<param index="1" name="end" type="int" default="2147483647" />
 			<description>
-				Returns the slice of the [PackedVector2Array], from [code]begin[/code] (inclusive) to [code]end[/code] (exclusive), as a new [PackedVector2Array].
-				The absolute value of [code]begin[/code] and [code]end[/code] will be clamped to the array size, so the default value for [code]end[/code] makes it slice to the size of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for [code]arr.slice(1, arr.size())[/code]).
-				If either [code]begin[/code] or [code]end[/code] are negative, they will be relative to the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for [code]arr.slice(0, arr.size() - 2)[/code]).
+				Returns the slice of the [PackedVector2Array], from [param begin] (inclusive) to [param end] (exclusive), as a new [PackedVector2Array].
+				The absolute value of [param begin] and [param end] will be clamped to the array size, so the default value for [param end] makes it slice to the size of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for [code]arr.slice(1, arr.size())[/code]).
+				If either [param begin] or [param end] are negative, they will be relative to the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for [code]arr.slice(0, arr.size() - 2)[/code]).
 			</description>
 		</method>
 		<method name="sort">
@@ -178,31 +184,31 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="PackedVector2Array" />
+			<param index="0" name="right" type="PackedVector2Array" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="right" type="Transform2D" />
+			<param index="0" name="right" type="Transform2D" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="right" type="PackedVector2Array" />
+			<param index="0" name="right" type="PackedVector2Array" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="PackedVector2Array" />
+			<param index="0" name="right" type="PackedVector2Array" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator []">
 			<return type="Vector2" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</operator>
diff --git a/doc/classes/PackedVector3Array.xml b/doc/classes/PackedVector3Array.xml
index 1207293c32..5ab42474f0 100644
--- a/doc/classes/PackedVector3Array.xml
+++ b/doc/classes/PackedVector3Array.xml
@@ -17,14 +17,14 @@
 		</constructor>
 		<constructor name="PackedVector3Array">
 			<return type="PackedVector3Array" />
-			<argument index="0" name="from" type="PackedVector3Array" />
+			<param index="0" name="from" type="PackedVector3Array" />
 			<description>
 				Constructs a [PackedVector3Array] as a copy of the given [PackedVector3Array].
 			</description>
 		</constructor>
 		<constructor name="PackedVector3Array">
 			<return type="PackedVector3Array" />
-			<argument index="0" name="from" type="Array" />
+			<param index="0" name="from" type="Array" />
 			<description>
 				Constructs a new [PackedVector3Array]. Optionally, you can pass in a generic [Array] that will be converted.
 			</description>
@@ -33,30 +33,36 @@
 	<methods>
 		<method name="append">
 			<return type="bool" />
-			<argument index="0" name="value" type="Vector3" />
+			<param index="0" name="value" type="Vector3" />
 			<description>
 				Appends an element at the end of the array (alias of [method push_back]).
 			</description>
 		</method>
 		<method name="append_array">
 			<return type="void" />
-			<argument index="0" name="array" type="PackedVector3Array" />
+			<param index="0" name="array" type="PackedVector3Array" />
 			<description>
 				Appends a [PackedVector3Array] at the end of this array.
 			</description>
 		</method>
 		<method name="bsearch">
 			<return type="int" />
-			<argument index="0" name="value" type="Vector3" />
-			<argument index="1" name="before" type="bool" default="true" />
+			<param index="0" name="value" type="Vector3" />
+			<param index="1" name="before" type="bool" default="true" />
 			<description>
-				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a [code]before[/code] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array.
+				Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a [param before] specifier can be passed. If [code]false[/code], the returned index comes after all existing entries of the value in the array.
 				[b]Note:[/b] Calling [method bsearch] on an unsorted array results in unexpected behavior.
 			</description>
 		</method>
+		<method name="clear">
+			<return type="void" />
+			<description>
+				Clears the array. This is equivalent to using [method resize] with a size of [code]0[/code].
+			</description>
+		</method>
 		<method name="count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="Vector3" />
+			<param index="0" name="value" type="Vector3" />
 			<description>
 				Returns the number of times an element is in the array.
 			</description>
@@ -69,30 +75,30 @@
 		</method>
 		<method name="fill">
 			<return type="void" />
-			<argument index="0" name="value" type="Vector3" />
+			<param index="0" name="value" type="Vector3" />
 			<description>
 				Assigns the given value to all elements in the array. This can typically be used together with [method resize] to create an array with a given size and initialized elements.
 			</description>
 		</method>
 		<method name="find" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="Vector3" />
-			<argument index="1" name="from" type="int" default="0" />
+			<param index="0" name="value" type="Vector3" />
+			<param index="1" name="from" type="int" default="0" />
 			<description>
 				Searches the array for a value and returns its index or [code]-1[/code] if not found. Optionally, the initial search index can be passed.
 			</description>
 		</method>
 		<method name="has" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="value" type="Vector3" />
+			<param index="0" name="value" type="Vector3" />
 			<description>
-				Returns [code]true[/code] if the array contains [code]value[/code].
+				Returns [code]true[/code] if the array contains [param value].
 			</description>
 		</method>
 		<method name="insert">
 			<return type="int" />
-			<argument index="0" name="at_index" type="int" />
-			<argument index="1" name="value" type="Vector3" />
+			<param index="0" name="at_index" type="int" />
+			<param index="1" name="value" type="Vector3" />
 			<description>
 				Inserts a new element at a given position in the array. The position must be valid, or at the end of the array ([code]idx == size()[/code]).
 			</description>
@@ -105,21 +111,21 @@
 		</method>
 		<method name="push_back">
 			<return type="bool" />
-			<argument index="0" name="value" type="Vector3" />
+			<param index="0" name="value" type="Vector3" />
 			<description>
 				Inserts a [Vector3] at the end.
 			</description>
 		</method>
 		<method name="remove_at">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Removes an element from the array by index.
 			</description>
 		</method>
 		<method name="resize">
 			<return type="int" />
-			<argument index="0" name="new_size" type="int" />
+			<param index="0" name="new_size" type="int" />
 			<description>
 				Sets the size of the array. If the array is grown, reserves elements at the end of the array. If the array is shrunk, truncates the array to the new size.
 			</description>
@@ -132,16 +138,16 @@
 		</method>
 		<method name="rfind" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="value" type="Vector3" />
-			<argument index="1" name="from" type="int" default="-1" />
+			<param index="0" name="value" type="Vector3" />
+			<param index="1" name="from" type="int" default="-1" />
 			<description>
 				Searches the array in reverse order. Optionally, a start search index can be passed. If negative, the start index is considered relative to the end of the array.
 			</description>
 		</method>
 		<method name="set">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="value" type="Vector3" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="value" type="Vector3" />
 			<description>
 				Changes the [Vector3] at the given index.
 			</description>
@@ -154,12 +160,12 @@
 		</method>
 		<method name="slice" qualifiers="const">
 			<return type="PackedVector3Array" />
-			<argument index="0" name="begin" type="int" />
-			<argument index="1" name="end" type="int" default="2147483647" />
+			<param index="0" name="begin" type="int" />
+			<param index="1" name="end" type="int" default="2147483647" />
 			<description>
-				Returns the slice of the [PackedVector3Array], from [code]begin[/code] (inclusive) to [code]end[/code] (exclusive), as a new [PackedVector3Array].
-				The absolute value of [code]begin[/code] and [code]end[/code] will be clamped to the array size, so the default value for [code]end[/code] makes it slice to the size of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for [code]arr.slice(1, arr.size())[/code]).
-				If either [code]begin[/code] or [code]end[/code] are negative, they will be relative to the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for [code]arr.slice(0, arr.size() - 2)[/code]).
+				Returns the slice of the [PackedVector3Array], from [param begin] (inclusive) to [param end] (exclusive), as a new [PackedVector3Array].
+				The absolute value of [param begin] and [param end] will be clamped to the array size, so the default value for [param end] makes it slice to the size of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for [code]arr.slice(1, arr.size())[/code]).
+				If either [param begin] or [param end] are negative, they will be relative to the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for [code]arr.slice(0, arr.size() - 2)[/code]).
 			</description>
 		</method>
 		<method name="sort">
@@ -177,31 +183,31 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="PackedVector3Array" />
+			<param index="0" name="right" type="PackedVector3Array" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="PackedVector3Array" />
-			<argument index="0" name="right" type="Transform3D" />
+			<param index="0" name="right" type="Transform3D" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="PackedVector3Array" />
-			<argument index="0" name="right" type="PackedVector3Array" />
+			<param index="0" name="right" type="PackedVector3Array" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="PackedVector3Array" />
+			<param index="0" name="right" type="PackedVector3Array" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator []">
 			<return type="Vector3" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</operator>
diff --git a/doc/classes/PacketPeer.xml b/doc/classes/PacketPeer.xml
index 40fa90e4da..ab2bc34672 100644
--- a/doc/classes/PacketPeer.xml
+++ b/doc/classes/PacketPeer.xml
@@ -30,25 +30,25 @@
 		</method>
 		<method name="get_var">
 			<return type="Variant" />
-			<argument index="0" name="allow_objects" type="bool" default="false" />
+			<param index="0" name="allow_objects" type="bool" default="false" />
 			<description>
-				Gets a Variant. If [code]allow_objects[/code] is [code]true[/code], decoding objects is allowed.
+				Gets a Variant. If [param allow_objects] is [code]true[/code], decoding objects is allowed.
 				[b]Warning:[/b] Deserialized objects can contain code which gets executed. Do not use this option if the serialized object comes from untrusted sources to avoid potential security threats such as remote code execution.
 			</description>
 		</method>
 		<method name="put_packet">
 			<return type="int" enum="Error" />
-			<argument index="0" name="buffer" type="PackedByteArray" />
+			<param index="0" name="buffer" type="PackedByteArray" />
 			<description>
 				Sends a raw packet.
 			</description>
 		</method>
 		<method name="put_var">
 			<return type="int" enum="Error" />
-			<argument index="0" name="var" type="Variant" />
-			<argument index="1" name="full_objects" type="bool" default="false" />
+			<param index="0" name="var" type="Variant" />
+			<param index="1" name="full_objects" type="bool" default="false" />
 			<description>
-				Sends a [Variant] as a packet. If [code]full_objects[/code] is [code]true[/code], encoding objects is allowed (and can potentially include code).
+				Sends a [Variant] as a packet. If [param full_objects] is [code]true[/code], encoding objects is allowed (and can potentially include code).
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/PacketPeerDTLS.xml b/doc/classes/PacketPeerDTLS.xml
index ee45c42498..e9918bdd3a 100644
--- a/doc/classes/PacketPeerDTLS.xml
+++ b/doc/classes/PacketPeerDTLS.xml
@@ -13,12 +13,12 @@
 	<methods>
 		<method name="connect_to_peer">
 			<return type="int" enum="Error" />
-			<argument index="0" name="packet_peer" type="PacketPeerUDP" />
-			<argument index="1" name="validate_certs" type="bool" default="true" />
-			<argument index="2" name="for_hostname" type="String" default="&quot;&quot;" />
-			<argument index="3" name="valid_certificate" type="X509Certificate" default="null" />
+			<param index="0" name="packet_peer" type="PacketPeerUDP" />
+			<param index="1" name="validate_certs" type="bool" default="true" />
+			<param index="2" name="for_hostname" type="String" default="&quot;&quot;" />
+			<param index="3" name="valid_certificate" type="X509Certificate" default="null" />
 			<description>
-				Connects a [code]peer[/code] beginning the DTLS handshake using the underlying [PacketPeerUDP] which must be connected (see [method PacketPeerUDP.connect_to_host]). If [code]validate_certs[/code] is [code]true[/code], [PacketPeerDTLS] will validate that the certificate presented by the remote peer and match it with the [code]for_hostname[/code] argument. You can specify a custom [X509Certificate] to use for validation via the [code]valid_certificate[/code] argument.
+				Connects a [param packet_peer] beginning the DTLS handshake using the underlying [PacketPeerUDP] which must be connected (see [method PacketPeerUDP.connect_to_host]). If [param validate_certs] is [code]true[/code], [PacketPeerDTLS] will validate that the certificate presented by the remote peer and match it with the [param for_hostname] argument. You can specify a custom [X509Certificate] to use for validation via the [param valid_certificate] argument.
 			</description>
 		</method>
 		<method name="disconnect_from_peer">
diff --git a/doc/classes/PacketPeerExtension.xml b/doc/classes/PacketPeerExtension.xml
index 7cf5ef3504..28263b3f59 100644
--- a/doc/classes/PacketPeerExtension.xml
+++ b/doc/classes/PacketPeerExtension.xml
@@ -19,15 +19,15 @@
 		</method>
 		<method name="_get_packet" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="r_buffer" type="const uint8_t **" />
-			<argument index="1" name="r_buffer_size" type="int32_t*" />
+			<param index="0" name="r_buffer" type="const uint8_t **" />
+			<param index="1" name="r_buffer_size" type="int32_t*" />
 			<description>
 			</description>
 		</method>
 		<method name="_put_packet" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="p_buffer" type="const uint8_t*" />
-			<argument index="1" name="p_buffer_size" type="int" />
+			<param index="0" name="p_buffer" type="const uint8_t*" />
+			<param index="1" name="p_buffer_size" type="int" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/PacketPeerUDP.xml b/doc/classes/PacketPeerUDP.xml
index 7c6622be3c..b635757b2b 100644
--- a/doc/classes/PacketPeerUDP.xml
+++ b/doc/classes/PacketPeerUDP.xml
@@ -12,14 +12,14 @@
 	<methods>
 		<method name="bind">
 			<return type="int" enum="Error" />
-			<argument index="0" name="port" type="int" />
-			<argument index="1" name="bind_address" type="String" default="&quot;*&quot;" />
-			<argument index="2" name="recv_buf_size" type="int" default="65536" />
+			<param index="0" name="port" type="int" />
+			<param index="1" name="bind_address" type="String" default="&quot;*&quot;" />
+			<param index="2" name="recv_buf_size" type="int" default="65536" />
 			<description>
-				Binds this [PacketPeerUDP] to the specified [code]port[/code] and [code]address[/code] with a buffer size [code]recv_buf_size[/code], allowing it to receive incoming packets.
-				If [code]address[/code] is set to [code]"*"[/code] (default), the peer will be bound on all available addresses (both IPv4 and IPv6).
-				If [code]address[/code] is set to [code]"0.0.0.0"[/code] (for IPv4) or [code]"::"[/code] (for IPv6), the peer will be bound to all available addresses matching that IP type.
-				If [code]address[/code] is set to any valid address (e.g. [code]"192.168.1.101"[/code], [code]"::1"[/code], etc), the peer will only be bound to the interface with that addresses (or fail if no interface with the given address exists).
+				Binds this [PacketPeerUDP] to the specified [param port] and [param bind_address] with a buffer size [param recv_buf_size], allowing it to receive incoming packets.
+				If [param bind_address] is set to [code]"*"[/code] (default), the peer will be bound on all available addresses (both IPv4 and IPv6).
+				If [param bind_address] is set to [code]"0.0.0.0"[/code] (for IPv4) or [code]"::"[/code] (for IPv6), the peer will be bound to all available addresses matching that IP type.
+				If [param bind_address] is set to any valid address (e.g. [code]"192.168.1.101"[/code], [code]"::1"[/code], etc), the peer will only be bound to the interface with that addresses (or fail if no interface with the given address exists).
 			</description>
 		</method>
 		<method name="close">
@@ -30,10 +30,10 @@
 		</method>
 		<method name="connect_to_host">
 			<return type="int" enum="Error" />
-			<argument index="0" name="host" type="String" />
-			<argument index="1" name="port" type="int" />
+			<param index="0" name="host" type="String" />
+			<param index="1" name="port" type="int" />
 			<description>
-				Calling this method connects this UDP peer to the given [code]host[/code]/[code]port[/code] pair. UDP is in reality connectionless, so this option only means that incoming packets from different addresses are automatically discarded, and that outgoing packets are always sent to the connected address (future calls to [method set_dest_address] are not allowed). This method does not send any data to the remote peer, to do that, use [method PacketPeer.put_var] or [method PacketPeer.put_packet] as usual. See also [UDPServer].
+				Calling this method connects this UDP peer to the given [param host]/[param port] pair. UDP is in reality connectionless, so this option only means that incoming packets from different addresses are automatically discarded, and that outgoing packets are always sent to the connected address (future calls to [method set_dest_address] are not allowed). This method does not send any data to the remote peer, to do that, use [method PacketPeer.put_var] or [method PacketPeer.put_packet] as usual. See also [UDPServer].
 				[b]Note:[/b] Connecting to the remote peer does not help to protect from malicious attacks like IP spoofing, etc. Think about using an encryption technique like SSL or DTLS if you feel like your application is transferring sensitive information.
 			</description>
 		</method>
@@ -69,25 +69,25 @@
 		</method>
 		<method name="join_multicast_group">
 			<return type="int" enum="Error" />
-			<argument index="0" name="multicast_address" type="String" />
-			<argument index="1" name="interface_name" type="String" />
+			<param index="0" name="multicast_address" type="String" />
+			<param index="1" name="interface_name" type="String" />
 			<description>
-				Joins the multicast group specified by [code]multicast_address[/code] using the interface identified by [code]interface_name[/code].
+				Joins the multicast group specified by [param multicast_address] using the interface identified by [param interface_name].
 				You can join the same multicast group with multiple interfaces. Use [method IP.get_local_interfaces] to know which are available.
 				[b]Note:[/b] Some Android devices might require the [code]CHANGE_WIFI_MULTICAST_STATE[/code] permission for multicast to work.
 			</description>
 		</method>
 		<method name="leave_multicast_group">
 			<return type="int" enum="Error" />
-			<argument index="0" name="multicast_address" type="String" />
-			<argument index="1" name="interface_name" type="String" />
+			<param index="0" name="multicast_address" type="String" />
+			<param index="1" name="interface_name" type="String" />
 			<description>
-				Removes the interface identified by [code]interface_name[/code] from the multicast group specified by [code]multicast_address[/code].
+				Removes the interface identified by [param interface_name] from the multicast group specified by [param multicast_address].
 			</description>
 		</method>
 		<method name="set_broadcast_enabled">
 			<return type="void" />
-			<argument index="0" name="enabled" type="bool" />
+			<param index="0" name="enabled" type="bool" />
 			<description>
 				Enable or disable sending of broadcast packets (e.g. [code]set_dest_address("255.255.255.255", 4343)[/code]. This option is disabled by default.
 				[b]Note:[/b] Some Android devices might require the [code]CHANGE_WIFI_MULTICAST_STATE[/code] permission and this option to be enabled to receive broadcast packets too.
@@ -95,8 +95,8 @@
 		</method>
 		<method name="set_dest_address">
 			<return type="int" enum="Error" />
-			<argument index="0" name="host" type="String" />
-			<argument index="1" name="port" type="int" />
+			<param index="0" name="host" type="String" />
+			<param index="1" name="port" type="int" />
 			<description>
 				Sets the destination address and port for sending packets and variables. A hostname will be resolved using DNS if needed.
 				[b]Note:[/b] [method set_broadcast_enabled] must be enabled before sending packets to a broadcast address (e.g. [code]255.255.255.255[/code]).
diff --git a/doc/classes/ParticlesMaterial.xml b/doc/classes/ParticlesMaterial.xml
index 7badd826d9..fe4caaa10c 100644
--- a/doc/classes/ParticlesMaterial.xml
+++ b/doc/classes/ParticlesMaterial.xml
@@ -13,60 +13,60 @@
 	<methods>
 		<method name="get_param_max" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="param" type="int" enum="ParticlesMaterial.Parameter" />
+			<param index="0" name="param" type="int" enum="ParticlesMaterial.Parameter" />
 			<description>
 				Returns the maximum value range for the given parameter.
 			</description>
 		</method>
 		<method name="get_param_min" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="param" type="int" enum="ParticlesMaterial.Parameter" />
+			<param index="0" name="param" type="int" enum="ParticlesMaterial.Parameter" />
 			<description>
 				Returns the minimum value range for the given parameter.
 			</description>
 		</method>
 		<method name="get_param_texture" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="param" type="int" enum="ParticlesMaterial.Parameter" />
+			<param index="0" name="param" type="int" enum="ParticlesMaterial.Parameter" />
 			<description>
 				Returns the [Texture2D] used by the specified parameter.
 			</description>
 		</method>
 		<method name="get_particle_flag" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="particle_flag" type="int" enum="ParticlesMaterial.ParticleFlags" />
+			<param index="0" name="particle_flag" type="int" enum="ParticlesMaterial.ParticleFlags" />
 			<description>
 				Returns [code]true[/code] if the specified particle flag is enabled. See [enum ParticleFlags] for options.
 			</description>
 		</method>
 		<method name="set_param_max">
 			<return type="void" />
-			<argument index="0" name="param" type="int" enum="ParticlesMaterial.Parameter" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="param" type="int" enum="ParticlesMaterial.Parameter" />
+			<param index="1" name="value" type="float" />
 			<description>
 				Sets the maximum value range for the given parameter.
 			</description>
 		</method>
 		<method name="set_param_min">
 			<return type="void" />
-			<argument index="0" name="param" type="int" enum="ParticlesMaterial.Parameter" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="param" type="int" enum="ParticlesMaterial.Parameter" />
+			<param index="1" name="value" type="float" />
 			<description>
 				Sets the minimum value range for the given parameter.
 			</description>
 		</method>
 		<method name="set_param_texture">
 			<return type="void" />
-			<argument index="0" name="param" type="int" enum="ParticlesMaterial.Parameter" />
-			<argument index="1" name="texture" type="Texture2D" />
+			<param index="0" name="param" type="int" enum="ParticlesMaterial.Parameter" />
+			<param index="1" name="texture" type="Texture2D" />
 			<description>
 				Sets the [Texture2D] for the specified [enum Parameter].
 			</description>
 		</method>
 		<method name="set_particle_flag">
 			<return type="void" />
-			<argument index="0" name="particle_flag" type="int" enum="ParticlesMaterial.ParticleFlags" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="particle_flag" type="int" enum="ParticlesMaterial.ParticleFlags" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				If [code]true[/code], enables the specified particle flag. See [enum ParticleFlags] for options.
 			</description>
diff --git a/doc/classes/Performance.xml b/doc/classes/Performance.xml
index 01da9cb9a2..ddb290f007 100644
--- a/doc/classes/Performance.xml
+++ b/doc/classes/Performance.xml
@@ -15,11 +15,11 @@
 	<methods>
 		<method name="add_custom_monitor">
 			<return type="void" />
-			<argument index="0" name="id" type="StringName" />
-			<argument index="1" name="callable" type="Callable" />
-			<argument index="2" name="arguments" type="Array" default="[]" />
+			<param index="0" name="id" type="StringName" />
+			<param index="1" name="callable" type="Callable" />
+			<param index="2" name="arguments" type="Array" default="[]" />
 			<description>
-				Adds a custom monitor with the name [code]id[/code]. You can specify the category of the monitor using slash delimiters in [code]id[/code] (for example: [code]"Game/NumberOfNPCs"[/code]). If there is more than one slash delimiter, then the default category is used. The default category is [code]"Custom"[/code]. Prints an error if given [code]id[/code] is already present.
+				Adds a custom monitor with the name [param id]. You can specify the category of the monitor using slash delimiters in [param id] (for example: [code]"Game/NumberOfNPCs"[/code]). If there is more than one slash delimiter, then the default category is used. The default category is [code]"Custom"[/code]. Prints an error if given [param id] is already present.
 				[codeblocks]
 				[gdscript]
 				func _ready():
@@ -73,9 +73,9 @@
 		</method>
 		<method name="get_custom_monitor">
 			<return type="Variant" />
-			<argument index="0" name="id" type="StringName" />
+			<param index="0" name="id" type="StringName" />
 			<description>
-				Returns the value of custom monitor with given [code]id[/code]. The callable is called to get the value of custom monitor. See also [method has_custom_monitor]. Prints an error if the given [code]id[/code] is absent.
+				Returns the value of custom monitor with given [param id]. The callable is called to get the value of custom monitor. See also [method has_custom_monitor]. Prints an error if the given [param id] is absent.
 			</description>
 		</method>
 		<method name="get_custom_monitor_names">
@@ -86,7 +86,7 @@
 		</method>
 		<method name="get_monitor" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="monitor" type="int" enum="Performance.Monitor" />
+			<param index="0" name="monitor" type="int" enum="Performance.Monitor" />
 			<description>
 				Returns the value of one of the available built-in monitors. You should provide one of the [enum Monitor] constants as the argument, like this:
 				[codeblocks]
@@ -108,16 +108,16 @@
 		</method>
 		<method name="has_custom_monitor">
 			<return type="bool" />
-			<argument index="0" name="id" type="StringName" />
+			<param index="0" name="id" type="StringName" />
 			<description>
-				Returns [code]true[/code] if custom monitor with the given [code]id[/code] is present, [code]false[/code] otherwise.
+				Returns [code]true[/code] if custom monitor with the given [param id] is present, [code]false[/code] otherwise.
 			</description>
 		</method>
 		<method name="remove_custom_monitor">
 			<return type="void" />
-			<argument index="0" name="id" type="StringName" />
+			<param index="0" name="id" type="StringName" />
 			<description>
-				Removes the custom monitor with given [code]id[/code]. Prints an error if the given [code]id[/code] is already absent.
+				Removes the custom monitor with given [param id]. Prints an error if the given [param id] is already absent.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/PhysicalBone3D.xml b/doc/classes/PhysicalBone3D.xml
index 7e8cc91766..0768df31cc 100644
--- a/doc/classes/PhysicalBone3D.xml
+++ b/doc/classes/PhysicalBone3D.xml
@@ -9,21 +9,21 @@
 	<methods>
 		<method name="_integrate_forces" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="state" type="PhysicsDirectBodyState3D" />
+			<param index="0" name="state" type="PhysicsDirectBodyState3D" />
 			<description>
 				Called during physics processing, allowing you to read and safely modify the simulation state for the object. By default, it works in addition to the usual physics behavior, but the [member custom_integrator] property allows you to disable the default behavior and do fully custom force integration for a body.
 			</description>
 		</method>
 		<method name="apply_central_impulse">
 			<return type="void" />
-			<argument index="0" name="impulse" type="Vector3" />
+			<param index="0" name="impulse" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="apply_impulse">
 			<return type="void" />
-			<argument index="0" name="impulse" type="Vector3" />
-			<argument index="1" name="position" type="Vector3" default="Vector3(0, 0, 0)" />
+			<param index="0" name="impulse" type="Vector3" />
+			<param index="1" name="position" type="Vector3" default="Vector3(0, 0, 0)" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/PhysicsBody2D.xml b/doc/classes/PhysicsBody2D.xml
index 9cebd68d76..2350fd4458 100644
--- a/doc/classes/PhysicsBody2D.xml
+++ b/doc/classes/PhysicsBody2D.xml
@@ -12,7 +12,7 @@
 	<methods>
 		<method name="add_collision_exception_with">
 			<return type="void" />
-			<argument index="0" name="body" type="Node" />
+			<param index="0" name="body" type="Node" />
 			<description>
 				Adds a body to the list of bodies that this body can't collide with.
 			</description>
@@ -25,34 +25,34 @@
 		</method>
 		<method name="move_and_collide">
 			<return type="KinematicCollision2D" />
-			<argument index="0" name="distance" type="Vector2" />
-			<argument index="1" name="test_only" type="bool" default="false" />
-			<argument index="2" name="safe_margin" type="float" default="0.08" />
+			<param index="0" name="distance" type="Vector2" />
+			<param index="1" name="test_only" type="bool" default="false" />
+			<param index="2" name="safe_margin" type="float" default="0.08" />
 			<description>
-				Moves the body along the vector [code]distance[/code]. In order to be frame rate independent in [method Node._physics_process] or [method Node._process], [code]distance[/code] should be computed using [code]delta[/code].
+				Moves the body along the vector [param distance]. In order to be frame rate independent in [method Node._physics_process] or [method Node._process], [param distance] should be computed using [code]delta[/code].
 				Returns a [KinematicCollision2D], which contains information about the collision when stopped, or when touching another body along the motion.
-				If [code]test_only[/code] is [code]true[/code], the body does not move but the would-be collision information is given.
-				[code]safe_margin[/code] is the extra margin used for collision recovery (see [member CharacterBody2D.collision/safe_margin] for more details).
+				If [param test_only] is [code]true[/code], the body does not move but the would-be collision information is given.
+				[param safe_margin] is the extra margin used for collision recovery (see [member CharacterBody2D.collision/safe_margin] for more details).
 			</description>
 		</method>
 		<method name="remove_collision_exception_with">
 			<return type="void" />
-			<argument index="0" name="body" type="Node" />
+			<param index="0" name="body" type="Node" />
 			<description>
 				Removes a body from the list of bodies that this body can't collide with.
 			</description>
 		</method>
 		<method name="test_move">
 			<return type="bool" />
-			<argument index="0" name="from" type="Transform2D" />
-			<argument index="1" name="distance" type="Vector2" />
-			<argument index="2" name="collision" type="KinematicCollision2D" default="null" />
-			<argument index="3" name="safe_margin" type="float" default="0.08" />
+			<param index="0" name="from" type="Transform2D" />
+			<param index="1" name="distance" type="Vector2" />
+			<param index="2" name="collision" type="KinematicCollision2D" default="null" />
+			<param index="3" name="safe_margin" type="float" default="0.08" />
 			<description>
-				Checks for collisions without moving the body. In order to be frame rate independent in [method Node._physics_process] or [method Node._process], [code]distance[/code] should be computed using [code]delta[/code].
-				Virtually sets the node's position, scale and rotation to that of the given [Transform2D], then tries to move the body along the vector [code]distance[/code]. Returns [code]true[/code] if a collision would stop the body from moving along the whole path.
-				[code]collision[/code] is an optional object of type [KinematicCollision2D], which contains additional information about the collision when stopped, or when touching another body along the motion.
-				[code]safe_margin[/code] is the extra margin used for collision recovery (see [member CharacterBody2D.collision/safe_margin] for more details).
+				Checks for collisions without moving the body. In order to be frame rate independent in [method Node._physics_process] or [method Node._process], [param distance] should be computed using [code]delta[/code].
+				Virtually sets the node's position, scale and rotation to that of the given [Transform2D], then tries to move the body along the vector [param distance]. Returns [code]true[/code] if a collision would stop the body from moving along the whole path.
+				[param collision] is an optional object of type [KinematicCollision2D], which contains additional information about the collision when stopped, or when touching another body along the motion.
+				[param safe_margin] is the extra margin used for collision recovery (see [member CharacterBody2D.collision/safe_margin] for more details).
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/PhysicsBody3D.xml b/doc/classes/PhysicsBody3D.xml
index 843f813997..3ef7fc9030 100644
--- a/doc/classes/PhysicsBody3D.xml
+++ b/doc/classes/PhysicsBody3D.xml
@@ -12,16 +12,16 @@
 	<methods>
 		<method name="add_collision_exception_with">
 			<return type="void" />
-			<argument index="0" name="body" type="Node" />
+			<param index="0" name="body" type="Node" />
 			<description>
 				Adds a body to the list of bodies that this body can't collide with.
 			</description>
 		</method>
 		<method name="get_axis_lock" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="axis" type="int" enum="PhysicsServer3D.BodyAxis" />
+			<param index="0" name="axis" type="int" enum="PhysicsServer3D.BodyAxis" />
 			<description>
-				Returns [code]true[/code] if the specified linear or rotational [code]axis[/code] is locked.
+				Returns [code]true[/code] if the specified linear or rotational [param axis] is locked.
 			</description>
 		</method>
 		<method name="get_collision_exceptions">
@@ -32,46 +32,46 @@
 		</method>
 		<method name="move_and_collide">
 			<return type="KinematicCollision3D" />
-			<argument index="0" name="distance" type="Vector3" />
-			<argument index="1" name="test_only" type="bool" default="false" />
-			<argument index="2" name="safe_margin" type="float" default="0.001" />
-			<argument index="3" name="max_collisions" type="int" default="1" />
+			<param index="0" name="distance" type="Vector3" />
+			<param index="1" name="test_only" type="bool" default="false" />
+			<param index="2" name="safe_margin" type="float" default="0.001" />
+			<param index="3" name="max_collisions" type="int" default="1" />
 			<description>
-				Moves the body along the vector [code]distance[/code]. In order to be frame rate independent in [method Node._physics_process] or [method Node._process], [code]distance[/code] should be computed using [code]delta[/code].
+				Moves the body along the vector [param distance]. In order to be frame rate independent in [method Node._physics_process] or [method Node._process], [param distance] should be computed using [code]delta[/code].
 				The body will stop if it collides. Returns a [KinematicCollision3D], which contains information about the collision when stopped, or when touching another body along the motion.
-				If [code]test_only[/code] is [code]true[/code], the body does not move but the would-be collision information is given.
-				[code]safe_margin[/code] is the extra margin used for collision recovery (see [member CharacterBody3D.collision/safe_margin] for more details).
-				[code]max_collisions[/code] allows to retrieve more than one collision result.
+				If [param test_only] is [code]true[/code], the body does not move but the would-be collision information is given.
+				[param safe_margin] is the extra margin used for collision recovery (see [member CharacterBody3D.collision/safe_margin] for more details).
+				[param max_collisions] allows to retrieve more than one collision result.
 			</description>
 		</method>
 		<method name="remove_collision_exception_with">
 			<return type="void" />
-			<argument index="0" name="body" type="Node" />
+			<param index="0" name="body" type="Node" />
 			<description>
 				Removes a body from the list of bodies that this body can't collide with.
 			</description>
 		</method>
 		<method name="set_axis_lock">
 			<return type="void" />
-			<argument index="0" name="axis" type="int" enum="PhysicsServer3D.BodyAxis" />
-			<argument index="1" name="lock" type="bool" />
+			<param index="0" name="axis" type="int" enum="PhysicsServer3D.BodyAxis" />
+			<param index="1" name="lock" type="bool" />
 			<description>
-				Locks or unlocks the specified linear or rotational [code]axis[/code] depending on the value of [code]lock[/code].
+				Locks or unlocks the specified linear or rotational [param axis] depending on the value of [param lock].
 			</description>
 		</method>
 		<method name="test_move">
 			<return type="bool" />
-			<argument index="0" name="from" type="Transform3D" />
-			<argument index="1" name="distance" type="Vector3" />
-			<argument index="2" name="collision" type="KinematicCollision3D" default="null" />
-			<argument index="3" name="safe_margin" type="float" default="0.001" />
-			<argument index="4" name="max_collisions" type="int" default="1" />
+			<param index="0" name="from" type="Transform3D" />
+			<param index="1" name="distance" type="Vector3" />
+			<param index="2" name="collision" type="KinematicCollision3D" default="null" />
+			<param index="3" name="safe_margin" type="float" default="0.001" />
+			<param index="4" name="max_collisions" type="int" default="1" />
 			<description>
-				Checks for collisions without moving the body. In order to be frame rate independent in [method Node._physics_process] or [method Node._process], [code]distance[/code] should be computed using [code]delta[/code].
-				Virtually sets the node's position, scale and rotation to that of the given [Transform3D], then tries to move the body along the vector [code]distance[/code]. Returns [code]true[/code] if a collision would stop the body from moving along the whole path.
-				[code]collision[/code] is an optional object of type [KinematicCollision3D], which contains additional information about the collision when stopped, or when touching another body along the motion.
-				[code]safe_margin[/code] is the extra margin used for collision recovery (see [member CharacterBody3D.collision/safe_margin] for more details).
-				[code]max_collisions[/code] allows to retrieve more than one collision result.
+				Checks for collisions without moving the body. In order to be frame rate independent in [method Node._physics_process] or [method Node._process], [param distance] should be computed using [code]delta[/code].
+				Virtually sets the node's position, scale and rotation to that of the given [Transform3D], then tries to move the body along the vector [param distance]. Returns [code]true[/code] if a collision would stop the body from moving along the whole path.
+				[param collision] is an optional object of type [KinematicCollision3D], which contains additional information about the collision when stopped, or when touching another body along the motion.
+				[param safe_margin] is the extra margin used for collision recovery (see [member CharacterBody3D.collision/safe_margin] for more details).
+				[param max_collisions] allows to retrieve more than one collision result.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/PhysicsDirectBodyState2D.xml b/doc/classes/PhysicsDirectBodyState2D.xml
index 783b0488d8..93c9f83ff2 100644
--- a/doc/classes/PhysicsDirectBodyState2D.xml
+++ b/doc/classes/PhysicsDirectBodyState2D.xml
@@ -13,7 +13,7 @@
 	<methods>
 		<method name="add_constant_central_force">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="force" type="Vector2" default="Vector2(0, 0)" />
 			<description>
 				Adds a constant directional force without affecting rotation that keeps being applied over time until cleared with [code]constant_force = Vector2(0, 0)[/code].
 				This is equivalent to using [method add_constant_force] at the body's center of mass.
@@ -21,23 +21,23 @@
 		</method>
 		<method name="add_constant_force">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector2" />
-			<argument index="1" name="position" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="force" type="Vector2" />
+			<param index="1" name="position" type="Vector2" default="Vector2(0, 0)" />
 			<description>
 				Adds a constant positioned force to the body that keeps being applied over time until cleared with [code]constant_force = Vector2(0, 0)[/code].
-				[code]position[/code] is the offset from the body origin in global coordinates.
+				[param position] is the offset from the body origin in global coordinates.
 			</description>
 		</method>
 		<method name="add_constant_torque">
 			<return type="void" />
-			<argument index="0" name="torque" type="float" />
+			<param index="0" name="torque" type="float" />
 			<description>
 				Adds a constant rotational force without affecting position that keeps being applied over time until cleared with [code]constant_torque = 0[/code].
 			</description>
 		</method>
 		<method name="apply_central_force">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="force" type="Vector2" default="Vector2(0, 0)" />
 			<description>
 				Applies a directional force without affecting rotation. A force is time dependent and meant to be applied every physics update.
 				This is equivalent to using [method apply_force] at the body's center of mass.
@@ -45,7 +45,7 @@
 		</method>
 		<method name="apply_central_impulse">
 			<return type="void" />
-			<argument index="0" name="impulse" type="Vector2" />
+			<param index="0" name="impulse" type="Vector2" />
 			<description>
 				Applies a directional impulse without affecting rotation.
 				An impulse is time-independent! Applying an impulse every frame would result in a framerate-dependent force. For this reason, it should only be used when simulating one-time impacts (use the "_force" functions otherwise).
@@ -54,33 +54,33 @@
 		</method>
 		<method name="apply_force">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector2" />
-			<argument index="1" name="position" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="force" type="Vector2" />
+			<param index="1" name="position" type="Vector2" default="Vector2(0, 0)" />
 			<description>
 				Applies a positioned force to the body. A force is time dependent and meant to be applied every physics update.
-				[code]position[/code] is the offset from the body origin in global coordinates.
+				[param position] is the offset from the body origin in global coordinates.
 			</description>
 		</method>
 		<method name="apply_impulse">
 			<return type="void" />
-			<argument index="0" name="impulse" type="Vector2" />
-			<argument index="1" name="position" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="impulse" type="Vector2" />
+			<param index="1" name="position" type="Vector2" default="Vector2(0, 0)" />
 			<description>
 				Applies a positioned impulse to the body.
 				An impulse is time-independent! Applying an impulse every frame would result in a framerate-dependent force. For this reason, it should only be used when simulating one-time impacts (use the "_force" functions otherwise).
-				[code]position[/code] is the offset from the body origin in global coordinates.
+				[param position] is the offset from the body origin in global coordinates.
 			</description>
 		</method>
 		<method name="apply_torque">
 			<return type="void" />
-			<argument index="0" name="torque" type="float" />
+			<param index="0" name="torque" type="float" />
 			<description>
 				Applies a rotational force without affecting position. A force is time dependent and meant to be applied every physics update.
 			</description>
 		</method>
 		<method name="apply_torque_impulse">
 			<return type="void" />
-			<argument index="0" name="impulse" type="float" />
+			<param index="0" name="impulse" type="float" />
 			<description>
 				Applies a rotational impulse to the body without affecting the position.
 				An impulse is time-independent! Applying an impulse every frame would result in a framerate-dependent force. For this reason, it should only be used when simulating one-time impacts (use the "_force" functions otherwise).
@@ -102,42 +102,42 @@
 		</method>
 		<method name="get_contact_collider" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 				Returns the collider's [RID].
 			</description>
 		</method>
 		<method name="get_contact_collider_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 				Returns the collider's object id.
 			</description>
 		</method>
 		<method name="get_contact_collider_object" qualifiers="const">
 			<return type="Object" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 				Returns the collider object. This depends on how it was created (will return a scene node if such was used to create it).
 			</description>
 		</method>
 		<method name="get_contact_collider_position" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 				Returns the contact position in the collider.
 			</description>
 		</method>
 		<method name="get_contact_collider_shape" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 				Returns the collider's shape index.
 			</description>
 		</method>
 		<method name="get_contact_collider_velocity_at_position" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 				Returns the linear velocity vector at the collider's contact point.
 			</description>
@@ -151,21 +151,21 @@
 		</method>
 		<method name="get_contact_local_normal" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 				Returns the local normal at the contact point.
 			</description>
 		</method>
 		<method name="get_contact_local_position" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 				Returns the local position of the contact point.
 			</description>
 		</method>
 		<method name="get_contact_local_shape" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 				Returns the local shape index of the collision.
 			</description>
@@ -178,7 +178,7 @@
 		</method>
 		<method name="get_velocity_at_local_position" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="local_position" type="Vector2" />
+			<param index="0" name="local_position" type="Vector2" />
 			<description>
 				Returns the body's velocity at the given relative position, including both translation and rotation.
 			</description>
@@ -191,7 +191,7 @@
 		</method>
 		<method name="set_constant_force">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector2" />
+			<param index="0" name="force" type="Vector2" />
 			<description>
 				Sets the body's total constant positional forces applied during each physics update.
 				See [method add_constant_force] and [method add_constant_central_force].
@@ -199,7 +199,7 @@
 		</method>
 		<method name="set_constant_torque">
 			<return type="void" />
-			<argument index="0" name="torque" type="float" />
+			<param index="0" name="torque" type="float" />
 			<description>
 				Sets the body's total constant rotational forces applied during each physics update.
 				See [method add_constant_torque].
diff --git a/doc/classes/PhysicsDirectBodyState3D.xml b/doc/classes/PhysicsDirectBodyState3D.xml
index 16c53b0727..62eb9f6ac4 100644
--- a/doc/classes/PhysicsDirectBodyState3D.xml
+++ b/doc/classes/PhysicsDirectBodyState3D.xml
@@ -13,7 +13,7 @@
 	<methods>
 		<method name="add_constant_central_force">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector3" default="Vector3(0, 0, 0)" />
+			<param index="0" name="force" type="Vector3" default="Vector3(0, 0, 0)" />
 			<description>
 				Adds a constant directional force without affecting rotation that keeps being applied over time until cleared with [code]constant_force = Vector3(0, 0, 0)[/code].
 				This is equivalent to using [method add_constant_force] at the body's center of mass.
@@ -21,23 +21,23 @@
 		</method>
 		<method name="add_constant_force">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector3" />
-			<argument index="1" name="position" type="Vector3" default="Vector3(0, 0, 0)" />
+			<param index="0" name="force" type="Vector3" />
+			<param index="1" name="position" type="Vector3" default="Vector3(0, 0, 0)" />
 			<description>
 				Adds a constant positioned force to the body that keeps being applied over time until cleared with [code]constant_force = Vector3(0, 0, 0)[/code].
-				[code]position[/code] is the offset from the body origin in global coordinates.
+				[param position] is the offset from the body origin in global coordinates.
 			</description>
 		</method>
 		<method name="add_constant_torque">
 			<return type="void" />
-			<argument index="0" name="torque" type="Vector3" />
+			<param index="0" name="torque" type="Vector3" />
 			<description>
 				Adds a constant rotational force without affecting position that keeps being applied over time until cleared with [code]constant_torque = Vector3(0, 0, 0)[/code].
 			</description>
 		</method>
 		<method name="apply_central_force">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector3" default="Vector3(0, 0, 0)" />
+			<param index="0" name="force" type="Vector3" default="Vector3(0, 0, 0)" />
 			<description>
 				Applies a directional force without affecting rotation. A force is time dependent and meant to be applied every physics update.
 				This is equivalent to using [method apply_force] at the body's center of mass.
@@ -45,7 +45,7 @@
 		</method>
 		<method name="apply_central_impulse">
 			<return type="void" />
-			<argument index="0" name="impulse" type="Vector3" default="Vector3(0, 0, 0)" />
+			<param index="0" name="impulse" type="Vector3" default="Vector3(0, 0, 0)" />
 			<description>
 				Applies a directional impulse without affecting rotation.
 				An impulse is time-independent! Applying an impulse every frame would result in a framerate-dependent force. For this reason, it should only be used when simulating one-time impacts (use the "_force" functions otherwise).
@@ -54,33 +54,33 @@
 		</method>
 		<method name="apply_force">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector3" />
-			<argument index="1" name="position" type="Vector3" default="Vector3(0, 0, 0)" />
+			<param index="0" name="force" type="Vector3" />
+			<param index="1" name="position" type="Vector3" default="Vector3(0, 0, 0)" />
 			<description>
 				Applies a positioned force to the body. A force is time dependent and meant to be applied every physics update.
-				[code]position[/code] is the offset from the body origin in global coordinates.
+				[param position] is the offset from the body origin in global coordinates.
 			</description>
 		</method>
 		<method name="apply_impulse">
 			<return type="void" />
-			<argument index="0" name="impulse" type="Vector3" />
-			<argument index="1" name="position" type="Vector3" default="Vector3(0, 0, 0)" />
+			<param index="0" name="impulse" type="Vector3" />
+			<param index="1" name="position" type="Vector3" default="Vector3(0, 0, 0)" />
 			<description>
 				Applies a positioned impulse to the body.
 				An impulse is time-independent! Applying an impulse every frame would result in a framerate-dependent force. For this reason, it should only be used when simulating one-time impacts (use the "_force" functions otherwise).
-				[code]position[/code] is the offset from the body origin in global coordinates.
+				[param position] is the offset from the body origin in global coordinates.
 			</description>
 		</method>
 		<method name="apply_torque">
 			<return type="void" />
-			<argument index="0" name="torque" type="Vector3" />
+			<param index="0" name="torque" type="Vector3" />
 			<description>
 				Applies a rotational force without affecting position. A force is time dependent and meant to be applied every physics update.
 			</description>
 		</method>
 		<method name="apply_torque_impulse">
 			<return type="void" />
-			<argument index="0" name="impulse" type="Vector3" />
+			<param index="0" name="impulse" type="Vector3" />
 			<description>
 				Applies a rotational impulse to the body without affecting the position.
 				An impulse is time-independent! Applying an impulse every frame would result in a framerate-dependent force. For this reason, it should only be used when simulating one-time impacts (use the "_force" functions otherwise).
@@ -102,42 +102,42 @@
 		</method>
 		<method name="get_contact_collider" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 				Returns the collider's [RID].
 			</description>
 		</method>
 		<method name="get_contact_collider_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 				Returns the collider's object id.
 			</description>
 		</method>
 		<method name="get_contact_collider_object" qualifiers="const">
 			<return type="Object" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 				Returns the collider object.
 			</description>
 		</method>
 		<method name="get_contact_collider_position" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 				Returns the contact position in the collider.
 			</description>
 		</method>
 		<method name="get_contact_collider_shape" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 				Returns the collider's shape index.
 			</description>
 		</method>
 		<method name="get_contact_collider_velocity_at_position" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 				Returns the linear velocity vector at the collider's contact point.
 			</description>
@@ -151,28 +151,28 @@
 		</method>
 		<method name="get_contact_impulse" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 				Impulse created by the contact. Only implemented for Bullet physics.
 			</description>
 		</method>
 		<method name="get_contact_local_normal" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 				Returns the local normal at the contact point.
 			</description>
 		</method>
 		<method name="get_contact_local_position" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 				Returns the local position of the contact point.
 			</description>
 		</method>
 		<method name="get_contact_local_shape" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 				Returns the local shape index of the collision.
 			</description>
@@ -185,7 +185,7 @@
 		</method>
 		<method name="get_velocity_at_local_position" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="local_position" type="Vector3" />
+			<param index="0" name="local_position" type="Vector3" />
 			<description>
 				Returns the body's velocity at the given relative position, including both translation and rotation.
 			</description>
@@ -198,7 +198,7 @@
 		</method>
 		<method name="set_constant_force">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector3" />
+			<param index="0" name="force" type="Vector3" />
 			<description>
 				Sets the body's total constant positional forces applied during each physics update.
 				See [method add_constant_force] and [method add_constant_central_force].
@@ -206,7 +206,7 @@
 		</method>
 		<method name="set_constant_torque">
 			<return type="void" />
-			<argument index="0" name="torque" type="Vector3" />
+			<param index="0" name="torque" type="Vector3" />
 			<description>
 				Sets the body's total constant rotational forces applied during each physics update.
 				See [method add_constant_torque].
diff --git a/doc/classes/PhysicsDirectBodyState3DExtension.xml b/doc/classes/PhysicsDirectBodyState3DExtension.xml
index f0659f8f1b..ade197eadc 100644
--- a/doc/classes/PhysicsDirectBodyState3DExtension.xml
+++ b/doc/classes/PhysicsDirectBodyState3DExtension.xml
@@ -9,58 +9,58 @@
 	<methods>
 		<method name="_add_constant_central_force" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector3" />
+			<param index="0" name="force" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_add_constant_force" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector3" />
-			<argument index="1" name="position" type="Vector3" />
+			<param index="0" name="force" type="Vector3" />
+			<param index="1" name="position" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_add_constant_torque" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="torque" type="Vector3" />
+			<param index="0" name="torque" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_apply_central_force" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector3" />
+			<param index="0" name="force" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_apply_central_impulse" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="impulse" type="Vector3" />
+			<param index="0" name="impulse" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_apply_force" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector3" />
-			<argument index="1" name="position" type="Vector3" />
+			<param index="0" name="force" type="Vector3" />
+			<param index="1" name="position" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_apply_impulse" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="impulse" type="Vector3" />
-			<argument index="1" name="position" type="Vector3" />
+			<param index="0" name="impulse" type="Vector3" />
+			<param index="1" name="position" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_apply_torque" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="torque" type="Vector3" />
+			<param index="0" name="torque" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_apply_torque_impulse" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="impulse" type="Vector3" />
+			<param index="0" name="impulse" type="Vector3" />
 			<description>
 			</description>
 		</method>
@@ -91,37 +91,37 @@
 		</method>
 		<method name="_get_contact_collider" qualifiers="virtual const">
 			<return type="RID" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_contact_collider_id" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_contact_collider_object" qualifiers="virtual const">
 			<return type="Object" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_contact_collider_position" qualifiers="virtual const">
 			<return type="Vector3" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_contact_collider_shape" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_contact_collider_velocity_at_position" qualifiers="virtual const">
 			<return type="Vector3" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 			</description>
 		</method>
@@ -132,25 +132,25 @@
 		</method>
 		<method name="_get_contact_impulse" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_contact_local_normal" qualifiers="virtual const">
 			<return type="Vector3" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_contact_local_position" qualifiers="virtual const">
 			<return type="Vector3" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_contact_local_shape" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="contact_idx" type="int" />
+			<param index="0" name="contact_idx" type="int" />
 			<description>
 			</description>
 		</method>
@@ -206,7 +206,7 @@
 		</method>
 		<method name="_get_velocity_at_local_position" qualifiers="virtual const">
 			<return type="Vector3" />
-			<argument index="0" name="local_position" type="Vector3" />
+			<param index="0" name="local_position" type="Vector3" />
 			<description>
 			</description>
 		</method>
@@ -222,37 +222,37 @@
 		</method>
 		<method name="_set_angular_velocity" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="velocity" type="Vector3" />
+			<param index="0" name="velocity" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_set_constant_force" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector3" />
+			<param index="0" name="force" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_set_constant_torque" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="torque" type="Vector3" />
+			<param index="0" name="torque" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_set_linear_velocity" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="velocity" type="Vector3" />
+			<param index="0" name="velocity" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_set_sleep_state" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="enabled" type="bool" />
+			<param index="0" name="enabled" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_set_transform" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="transform" type="Transform3D" />
+			<param index="0" name="transform" type="Transform3D" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/PhysicsDirectSpaceState2D.xml b/doc/classes/PhysicsDirectSpaceState2D.xml
index 0b95243fe6..6290ea315f 100644
--- a/doc/classes/PhysicsDirectSpaceState2D.xml
+++ b/doc/classes/PhysicsDirectSpaceState2D.xml
@@ -13,7 +13,7 @@
 	<methods>
 		<method name="cast_motion">
 			<return type="Array" />
-			<argument index="0" name="parameters" type="PhysicsShapeQueryParameters2D" />
+			<param index="0" name="parameters" type="PhysicsShapeQueryParameters2D" />
 			<description>
 				Checks how far a [Shape2D] can move without colliding. All the parameters for the query, including the shape and the motion, are supplied through a [PhysicsShapeQueryParameters2D] object.
 				Returns an array with the safe and unsafe proportions (between 0 and 1) of the motion. The safe proportion is the maximum fraction of the motion that can be made without a collision. The unsafe proportion is the minimum fraction of the distance that must be moved for a collision. If no collision is detected a result of [code][1.0, 1.0][/code] will be returned.
@@ -22,8 +22,8 @@
 		</method>
 		<method name="collide_shape">
 			<return type="Array" />
-			<argument index="0" name="parameters" type="PhysicsShapeQueryParameters2D" />
-			<argument index="1" name="max_results" type="int" default="32" />
+			<param index="0" name="parameters" type="PhysicsShapeQueryParameters2D" />
+			<param index="1" name="max_results" type="int" default="32" />
 			<description>
 				Checks the intersections of a shape, given through a [PhysicsShapeQueryParameters2D] object, against the space. The resulting array contains a list of points where the shape intersects another. Like with [method intersect_shape], the number of returned results can be limited to save processing time.
 				Returned points are a list of pairs of contact points. For each pair the first one is in the shape passed in [PhysicsShapeQueryParameters2D] object, second one is in the collided shape from the physics space.
@@ -31,7 +31,7 @@
 		</method>
 		<method name="get_rest_info">
 			<return type="Dictionary" />
-			<argument index="0" name="parameters" type="PhysicsShapeQueryParameters2D" />
+			<param index="0" name="parameters" type="PhysicsShapeQueryParameters2D" />
 			<description>
 				Checks the intersections of a shape, given through a [PhysicsShapeQueryParameters2D] object, against the space. If it collides with more than one shape, the nearest one is selected. If the shape did not intersect anything, then an empty dictionary is returned instead.
 				[b]Note:[/b] This method does not take into account the [code]motion[/code] property of the object. The returned object is a dictionary containing the following fields:
@@ -45,21 +45,21 @@
 		</method>
 		<method name="intersect_point">
 			<return type="Array" />
-			<argument index="0" name="parameters" type="PhysicsPointQueryParameters2D" />
-			<argument index="1" name="max_results" type="int" default="32" />
+			<param index="0" name="parameters" type="PhysicsPointQueryParameters2D" />
+			<param index="1" name="max_results" type="int" default="32" />
 			<description>
 				Checks whether a point is inside any solid shape. Position and other parameters are defined through [PhysicsPointQueryParameters2D]. The shapes the point is inside of are returned in an array containing dictionaries with the following fields:
 				[code]collider[/code]: The colliding object.
 				[code]collider_id[/code]: The colliding object's ID.
 				[code]rid[/code]: The intersecting object's [RID].
 				[code]shape[/code]: The shape index of the colliding shape.
-				The number of intersections can be limited with the [code]max_results[/code] parameter, to reduce the processing time.
+				The number of intersections can be limited with the [param max_results] parameter, to reduce the processing time.
 				[b]Note:[/b] [ConcavePolygonShape2D]s and [CollisionPolygon2D]s in [code]Segments[/code] build mode are not solid shapes. Therefore, they will not be detected.
 			</description>
 		</method>
 		<method name="intersect_ray">
 			<return type="Dictionary" />
-			<argument index="0" name="parameters" type="PhysicsRayQueryParameters2D" />
+			<param index="0" name="parameters" type="PhysicsRayQueryParameters2D" />
 			<description>
 				Intersects a ray in a given space. Ray position and other parameters are defined through [PhysicsRayQueryParameters2D]. The returned object is a dictionary with the following fields:
 				[code]collider[/code]: The colliding object.
@@ -73,15 +73,15 @@
 		</method>
 		<method name="intersect_shape">
 			<return type="Array" />
-			<argument index="0" name="parameters" type="PhysicsShapeQueryParameters2D" />
-			<argument index="1" name="max_results" type="int" default="32" />
+			<param index="0" name="parameters" type="PhysicsShapeQueryParameters2D" />
+			<param index="1" name="max_results" type="int" default="32" />
 			<description>
 				Checks the intersections of a shape, given through a [PhysicsShapeQueryParameters2D] object, against the space. The intersected shapes are returned in an array containing dictionaries with the following fields:
 				[code]collider[/code]: The colliding object.
 				[code]collider_id[/code]: The colliding object's ID.
 				[code]rid[/code]: The intersecting object's [RID].
 				[code]shape[/code]: The shape index of the colliding shape.
-				The number of intersections can be limited with the [code]max_results[/code] parameter, to reduce the processing time.
+				The number of intersections can be limited with the [param max_results] parameter, to reduce the processing time.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/PhysicsDirectSpaceState3D.xml b/doc/classes/PhysicsDirectSpaceState3D.xml
index 048baed345..619891df90 100644
--- a/doc/classes/PhysicsDirectSpaceState3D.xml
+++ b/doc/classes/PhysicsDirectSpaceState3D.xml
@@ -13,7 +13,7 @@
 	<methods>
 		<method name="cast_motion">
 			<return type="Array" />
-			<argument index="0" name="parameters" type="PhysicsShapeQueryParameters3D" />
+			<param index="0" name="parameters" type="PhysicsShapeQueryParameters3D" />
 			<description>
 				Checks how far a [Shape3D] can move without colliding. All the parameters for the query, including the shape, are supplied through a [PhysicsShapeQueryParameters3D] object.
 				Returns an array with the safe and unsafe proportions (between 0 and 1) of the motion. The safe proportion is the maximum fraction of the motion that can be made without a collision. The unsafe proportion is the minimum fraction of the distance that must be moved for a collision. If no collision is detected a result of [code][1.0, 1.0][/code] will be returned.
@@ -22,8 +22,8 @@
 		</method>
 		<method name="collide_shape">
 			<return type="Array" />
-			<argument index="0" name="parameters" type="PhysicsShapeQueryParameters3D" />
-			<argument index="1" name="max_results" type="int" default="32" />
+			<param index="0" name="parameters" type="PhysicsShapeQueryParameters3D" />
+			<param index="1" name="max_results" type="int" default="32" />
 			<description>
 				Checks the intersections of a shape, given through a [PhysicsShapeQueryParameters3D] object, against the space. The resulting array contains a list of points where the shape intersects another. Like with [method intersect_shape], the number of returned results can be limited to save processing time.
 				Returned points are a list of pairs of contact points. For each pair the first one is in the shape passed in [PhysicsShapeQueryParameters3D] object, second one is in the collided shape from the physics space.
@@ -32,7 +32,7 @@
 		</method>
 		<method name="get_rest_info">
 			<return type="Dictionary" />
-			<argument index="0" name="parameters" type="PhysicsShapeQueryParameters3D" />
+			<param index="0" name="parameters" type="PhysicsShapeQueryParameters3D" />
 			<description>
 				Checks the intersections of a shape, given through a [PhysicsShapeQueryParameters3D] object, against the space. If it collides with more than one shape, the nearest one is selected. The returned object is a dictionary containing the following fields:
 				[code]collider_id[/code]: The colliding object's ID.
@@ -47,20 +47,20 @@
 		</method>
 		<method name="intersect_point">
 			<return type="Array" />
-			<argument index="0" name="parameters" type="PhysicsPointQueryParameters3D" />
-			<argument index="1" name="max_results" type="int" default="32" />
+			<param index="0" name="parameters" type="PhysicsPointQueryParameters3D" />
+			<param index="1" name="max_results" type="int" default="32" />
 			<description>
 				Checks whether a point is inside any solid shape. Position and other parameters are defined through [PhysicsPointQueryParameters3D]. The shapes the point is inside of are returned in an array containing dictionaries with the following fields:
 				[code]collider[/code]: The colliding object.
 				[code]collider_id[/code]: The colliding object's ID.
 				[code]rid[/code]: The intersecting object's [RID].
 				[code]shape[/code]: The shape index of the colliding shape.
-				The number of intersections can be limited with the [code]max_results[/code] parameter, to reduce the processing time.
+				The number of intersections can be limited with the [param max_results] parameter, to reduce the processing time.
 			</description>
 		</method>
 		<method name="intersect_ray">
 			<return type="Dictionary" />
-			<argument index="0" name="parameters" type="PhysicsRayQueryParameters3D" />
+			<param index="0" name="parameters" type="PhysicsRayQueryParameters3D" />
 			<description>
 				Intersects a ray in a given space. Ray position and other parameters are defined through [PhysicsRayQueryParameters3D]. The returned object is a dictionary with the following fields:
 				[code]collider[/code]: The colliding object.
@@ -74,15 +74,15 @@
 		</method>
 		<method name="intersect_shape">
 			<return type="Array" />
-			<argument index="0" name="parameters" type="PhysicsShapeQueryParameters3D" />
-			<argument index="1" name="max_results" type="int" default="32" />
+			<param index="0" name="parameters" type="PhysicsShapeQueryParameters3D" />
+			<param index="1" name="max_results" type="int" default="32" />
 			<description>
 				Checks the intersections of a shape, given through a [PhysicsShapeQueryParameters3D] object, against the space. The intersected shapes are returned in an array containing dictionaries with the following fields:
 				[code]collider[/code]: The colliding object.
 				[code]collider_id[/code]: The colliding object's ID.
 				[code]rid[/code]: The intersecting object's [RID].
 				[code]shape[/code]: The shape index of the colliding shape.
-				The number of intersections can be limited with the [code]max_results[/code] parameter, to reduce the processing time.
+				The number of intersections can be limited with the [param max_results] parameter, to reduce the processing time.
 				[b]Note:[/b] This method does not take into account the [code]motion[/code] property of the object.
 			</description>
 		</method>
diff --git a/doc/classes/PhysicsDirectSpaceState3DExtension.xml b/doc/classes/PhysicsDirectSpaceState3DExtension.xml
index f150907963..98593012db 100644
--- a/doc/classes/PhysicsDirectSpaceState3DExtension.xml
+++ b/doc/classes/PhysicsDirectSpaceState3DExtension.xml
@@ -9,89 +9,89 @@
 	<methods>
 		<method name="_cast_motion" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="shape_rid" type="RID" />
-			<argument index="1" name="transform" type="Transform3D" />
-			<argument index="2" name="motion" type="Vector3" />
-			<argument index="3" name="margin" type="float" />
-			<argument index="4" name="collision_mask" type="int" />
-			<argument index="5" name="collide_with_bodies" type="bool" />
-			<argument index="6" name="collide_with_areas" type="bool" />
-			<argument index="7" name="closest_safe" type="float*" />
-			<argument index="8" name="closest_unsafe" type="float*" />
-			<argument index="9" name="info" type="PhysicsServer3DExtensionShapeRestInfo*" />
+			<param index="0" name="shape_rid" type="RID" />
+			<param index="1" name="transform" type="Transform3D" />
+			<param index="2" name="motion" type="Vector3" />
+			<param index="3" name="margin" type="float" />
+			<param index="4" name="collision_mask" type="int" />
+			<param index="5" name="collide_with_bodies" type="bool" />
+			<param index="6" name="collide_with_areas" type="bool" />
+			<param index="7" name="closest_safe" type="float*" />
+			<param index="8" name="closest_unsafe" type="float*" />
+			<param index="9" name="info" type="PhysicsServer3DExtensionShapeRestInfo*" />
 			<description>
 			</description>
 		</method>
 		<method name="_collide_shape" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="shape_rid" type="RID" />
-			<argument index="1" name="transform" type="Transform3D" />
-			<argument index="2" name="motion" type="Vector3" />
-			<argument index="3" name="margin" type="float" />
-			<argument index="4" name="collision_mask" type="int" />
-			<argument index="5" name="collide_with_bodies" type="bool" />
-			<argument index="6" name="collide_with_areas" type="bool" />
-			<argument index="7" name="results" type="void*" />
-			<argument index="8" name="max_results" type="int" />
-			<argument index="9" name="result_count" type="int32_t*" />
+			<param index="0" name="shape_rid" type="RID" />
+			<param index="1" name="transform" type="Transform3D" />
+			<param index="2" name="motion" type="Vector3" />
+			<param index="3" name="margin" type="float" />
+			<param index="4" name="collision_mask" type="int" />
+			<param index="5" name="collide_with_bodies" type="bool" />
+			<param index="6" name="collide_with_areas" type="bool" />
+			<param index="7" name="results" type="void*" />
+			<param index="8" name="max_results" type="int" />
+			<param index="9" name="result_count" type="int32_t*" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_closest_point_to_object_volume" qualifiers="virtual const">
 			<return type="Vector3" />
-			<argument index="0" name="object" type="RID" />
-			<argument index="1" name="point" type="Vector3" />
+			<param index="0" name="object" type="RID" />
+			<param index="1" name="point" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_intersect_point" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="position" type="Vector3" />
-			<argument index="1" name="collision_mask" type="int" />
-			<argument index="2" name="collide_with_bodies" type="bool" />
-			<argument index="3" name="collide_with_areas" type="bool" />
-			<argument index="4" name="results" type="PhysicsServer3DExtensionShapeResult*" />
-			<argument index="5" name="max_results" type="int" />
+			<param index="0" name="position" type="Vector3" />
+			<param index="1" name="collision_mask" type="int" />
+			<param index="2" name="collide_with_bodies" type="bool" />
+			<param index="3" name="collide_with_areas" type="bool" />
+			<param index="4" name="results" type="PhysicsServer3DExtensionShapeResult*" />
+			<param index="5" name="max_results" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_intersect_ray" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="from" type="Vector3" />
-			<argument index="1" name="to" type="Vector3" />
-			<argument index="2" name="collision_mask" type="int" />
-			<argument index="3" name="collide_with_bodies" type="bool" />
-			<argument index="4" name="collide_with_areas" type="bool" />
-			<argument index="5" name="hit_from_inside" type="bool" />
-			<argument index="6" name="hit_back_faces" type="bool" />
-			<argument index="7" name="result" type="PhysicsServer3DExtensionRayResult*" />
+			<param index="0" name="from" type="Vector3" />
+			<param index="1" name="to" type="Vector3" />
+			<param index="2" name="collision_mask" type="int" />
+			<param index="3" name="collide_with_bodies" type="bool" />
+			<param index="4" name="collide_with_areas" type="bool" />
+			<param index="5" name="hit_from_inside" type="bool" />
+			<param index="6" name="hit_back_faces" type="bool" />
+			<param index="7" name="result" type="PhysicsServer3DExtensionRayResult*" />
 			<description>
 			</description>
 		</method>
 		<method name="_intersect_shape" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="shape_rid" type="RID" />
-			<argument index="1" name="transform" type="Transform3D" />
-			<argument index="2" name="motion" type="Vector3" />
-			<argument index="3" name="margin" type="float" />
-			<argument index="4" name="collision_mask" type="int" />
-			<argument index="5" name="collide_with_bodies" type="bool" />
-			<argument index="6" name="collide_with_areas" type="bool" />
-			<argument index="7" name="result_count" type="PhysicsServer3DExtensionShapeResult*" />
-			<argument index="8" name="max_results" type="int" />
+			<param index="0" name="shape_rid" type="RID" />
+			<param index="1" name="transform" type="Transform3D" />
+			<param index="2" name="motion" type="Vector3" />
+			<param index="3" name="margin" type="float" />
+			<param index="4" name="collision_mask" type="int" />
+			<param index="5" name="collide_with_bodies" type="bool" />
+			<param index="6" name="collide_with_areas" type="bool" />
+			<param index="7" name="result_count" type="PhysicsServer3DExtensionShapeResult*" />
+			<param index="8" name="max_results" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_rest_info" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="shape_rid" type="RID" />
-			<argument index="1" name="transform" type="Transform3D" />
-			<argument index="2" name="motion" type="Vector3" />
-			<argument index="3" name="margin" type="float" />
-			<argument index="4" name="collision_mask" type="int" />
-			<argument index="5" name="collide_with_bodies" type="bool" />
-			<argument index="6" name="collide_with_areas" type="bool" />
-			<argument index="7" name="rest_info" type="PhysicsServer3DExtensionShapeRestInfo*" />
+			<param index="0" name="shape_rid" type="RID" />
+			<param index="1" name="transform" type="Transform3D" />
+			<param index="2" name="motion" type="Vector3" />
+			<param index="3" name="margin" type="float" />
+			<param index="4" name="collision_mask" type="int" />
+			<param index="5" name="collide_with_bodies" type="bool" />
+			<param index="6" name="collide_with_areas" type="bool" />
+			<param index="7" name="rest_info" type="PhysicsServer3DExtensionShapeRestInfo*" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/PhysicsRayQueryParameters2D.xml b/doc/classes/PhysicsRayQueryParameters2D.xml
index 36933ef9a2..5afd3973a0 100644
--- a/doc/classes/PhysicsRayQueryParameters2D.xml
+++ b/doc/classes/PhysicsRayQueryParameters2D.xml
@@ -8,6 +8,22 @@
 	</description>
 	<tutorials>
 	</tutorials>
+	<methods>
+		<method name="create" qualifiers="static">
+			<return type="PhysicsRayQueryParameters2D" />
+			<param index="0" name="from" type="Vector2" />
+			<param index="1" name="to" type="Vector2" />
+			<param index="2" name="collision_mask" type="int" default="4294967295" />
+			<param index="3" name="exclude" type="Array" default="[]" />
+			<description>
+				Returns a new, pre-configured [PhysicsRayQueryParameters2D] object. Use it to quickly create query parameters using the most common options.
+				[codeblock]
+				var query = PhysicsRayQueryParameters2D.create(global_position, global_position + Vector2(0, 100))
+				var collision = get_world_2d().direct_space_state.intersect_ray(query)
+				[/codeblock]
+			</description>
+		</method>
+	</methods>
 	<members>
 		<member name="collide_with_areas" type="bool" setter="set_collide_with_areas" getter="is_collide_with_areas_enabled" default="false">
 			If [code]true[/code], the query will take [Area2D]s into account.
diff --git a/doc/classes/PhysicsRayQueryParameters3D.xml b/doc/classes/PhysicsRayQueryParameters3D.xml
index 4244ec785f..620aa6bf5f 100644
--- a/doc/classes/PhysicsRayQueryParameters3D.xml
+++ b/doc/classes/PhysicsRayQueryParameters3D.xml
@@ -8,6 +8,22 @@
 	</description>
 	<tutorials>
 	</tutorials>
+	<methods>
+		<method name="create" qualifiers="static">
+			<return type="PhysicsRayQueryParameters3D" />
+			<param index="0" name="from" type="Vector3" />
+			<param index="1" name="to" type="Vector3" />
+			<param index="2" name="collision_mask" type="int" default="4294967295" />
+			<param index="3" name="exclude" type="Array" default="[]" />
+			<description>
+				Returns a new, pre-configured [PhysicsRayQueryParameters3D] object. Use it to quickly create query parameters using the most common options.
+				[codeblock]
+				var query = PhysicsRayQueryParameters3D.create(position, position + Vector3(0, -10, 0))
+				var collision = get_world_3d().direct_space_state.intersect_ray(query)
+				[/codeblock]
+			</description>
+		</method>
+	</methods>
 	<members>
 		<member name="collide_with_areas" type="bool" setter="set_collide_with_areas" getter="is_collide_with_areas_enabled" default="false">
 			If [code]true[/code], the query will take [Area3D]s into account.
diff --git a/doc/classes/PhysicsServer2D.xml b/doc/classes/PhysicsServer2D.xml
index 1413a3ec11..920b56c8c6 100644
--- a/doc/classes/PhysicsServer2D.xml
+++ b/doc/classes/PhysicsServer2D.xml
@@ -11,32 +11,32 @@
 	<methods>
 		<method name="area_add_shape">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape" type="RID" />
-			<argument index="2" name="transform" type="Transform2D" default="Transform2D(1, 0, 0, 1, 0, 0)" />
-			<argument index="3" name="disabled" type="bool" default="false" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape" type="RID" />
+			<param index="2" name="transform" type="Transform2D" default="Transform2D(1, 0, 0, 1, 0, 0)" />
+			<param index="3" name="disabled" type="bool" default="false" />
 			<description>
 				Adds a shape to the area, along with a transform matrix. Shapes are usually referenced by their index, so you should track which shape has a given index.
 			</description>
 		</method>
 		<method name="area_attach_canvas_instance_id">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="id" type="int" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="area_attach_object_instance_id">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="id" type="int" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="id" type="int" />
 			<description>
 				Assigns the area to a descendant of [Object], so it can exist in the node tree.
 			</description>
 		</method>
 		<method name="area_clear_shapes">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
+			<param index="0" name="area" type="RID" />
 			<description>
 				Removes all shapes from an area. It does not delete the shapes, so they can be reassigned later.
 			</description>
@@ -49,97 +49,97 @@
 		</method>
 		<method name="area_get_canvas_instance_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="area" type="RID" />
+			<param index="0" name="area" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="area_get_object_instance_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="area" type="RID" />
+			<param index="0" name="area" type="RID" />
 			<description>
 				Gets the instance ID of the object the area is assigned to.
 			</description>
 		</method>
 		<method name="area_get_param" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer2D.AreaParameter" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer2D.AreaParameter" />
 			<description>
 				Returns an area parameter value. See [enum AreaParameter] for a list of available parameters.
 			</description>
 		</method>
 		<method name="area_get_shape" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
 			<description>
 				Returns the [RID] of the nth shape of an area.
 			</description>
 		</method>
 		<method name="area_get_shape_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="area" type="RID" />
+			<param index="0" name="area" type="RID" />
 			<description>
 				Returns the number of shapes assigned to an area.
 			</description>
 		</method>
 		<method name="area_get_shape_transform" qualifiers="const">
 			<return type="Transform2D" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
 			<description>
 				Returns the transform matrix of a shape within an area.
 			</description>
 		</method>
 		<method name="area_get_space" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="area" type="RID" />
+			<param index="0" name="area" type="RID" />
 			<description>
 				Returns the space assigned to the area.
 			</description>
 		</method>
 		<method name="area_get_transform" qualifiers="const">
 			<return type="Transform2D" />
-			<argument index="0" name="area" type="RID" />
+			<param index="0" name="area" type="RID" />
 			<description>
 				Returns the transform matrix for an area.
 			</description>
 		</method>
 		<method name="area_remove_shape">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
 			<description>
 				Removes a shape from an area. It does not delete the shape, so it can be reassigned later.
 			</description>
 		</method>
 		<method name="area_set_area_monitor_callback">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="callback" type="Callable" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="callback" type="Callable" />
 			<description>
 			</description>
 		</method>
 		<method name="area_set_collision_layer">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="layer" type="int" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="layer" type="int" />
 			<description>
 				Assigns the area to one or many physics layers.
 			</description>
 		</method>
 		<method name="area_set_collision_mask">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="mask" type="int" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="mask" type="int" />
 			<description>
 				Sets which physics layers the area will monitor.
 			</description>
 		</method>
 		<method name="area_set_monitor_callback">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="callback" type="Callable" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="callback" type="Callable" />
 			<description>
 				Sets the function to call when any body/area enters or exits the area. This callback will be called for any object interacting with the area, and takes five parameters:
 				1: [constant AREA_BODY_ADDED] or [constant AREA_BODY_REMOVED], depending on whether the object entered or exited the area.
@@ -151,75 +151,75 @@
 		</method>
 		<method name="area_set_monitorable">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="monitorable" type="bool" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="monitorable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="area_set_param">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer2D.AreaParameter" />
-			<argument index="2" name="value" type="Variant" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer2D.AreaParameter" />
+			<param index="2" name="value" type="Variant" />
 			<description>
 				Sets the value for an area parameter. See [enum AreaParameter] for a list of available parameters.
 			</description>
 		</method>
 		<method name="area_set_shape">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
-			<argument index="2" name="shape" type="RID" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
+			<param index="2" name="shape" type="RID" />
 			<description>
 				Substitutes a given area shape by another. The old shape is selected by its index, the new one by its [RID].
 			</description>
 		</method>
 		<method name="area_set_shape_disabled">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
-			<argument index="2" name="disabled" type="bool" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
+			<param index="2" name="disabled" type="bool" />
 			<description>
 				Disables a given shape in an area.
 			</description>
 		</method>
 		<method name="area_set_shape_transform">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
-			<argument index="2" name="transform" type="Transform2D" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
+			<param index="2" name="transform" type="Transform2D" />
 			<description>
 				Sets the transform matrix for an area shape.
 			</description>
 		</method>
 		<method name="area_set_space">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="space" type="RID" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="space" type="RID" />
 			<description>
 				Assigns a space to the area.
 			</description>
 		</method>
 		<method name="area_set_transform">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="transform" type="Transform2D" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="transform" type="Transform2D" />
 			<description>
 				Sets the transform matrix for an area.
 			</description>
 		</method>
 		<method name="body_add_collision_exception">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="excepted_body" type="RID" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="excepted_body" type="RID" />
 			<description>
 				Adds a body to the list of bodies exempt from collisions.
 			</description>
 		</method>
 		<method name="body_add_constant_central_force">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="force" type="Vector2" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="force" type="Vector2" />
 			<description>
 				Adds a constant directional force without affecting rotation that keeps being applied over time until cleared with [code]body_set_constant_force(body, Vector2(0, 0))[/code].
 				This is equivalent to using [method body_add_constant_force] at the body's center of mass.
@@ -227,36 +227,36 @@
 		</method>
 		<method name="body_add_constant_force">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="force" type="Vector2" />
-			<argument index="2" name="position" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="force" type="Vector2" />
+			<param index="2" name="position" type="Vector2" default="Vector2(0, 0)" />
 			<description>
 				Adds a constant positioned force to the body that keeps being applied over time until cleared with [code]body_set_constant_force(body, Vector2(0, 0))[/code].
-				[code]position[/code] is the offset from the body origin in global coordinates.
+				[param position] is the offset from the body origin in global coordinates.
 			</description>
 		</method>
 		<method name="body_add_constant_torque">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="torque" type="float" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="torque" type="float" />
 			<description>
 				Adds a constant rotational force without affecting position that keeps being applied over time until cleared with [code]body_set_constant_torque(body, 0)[/code].
 			</description>
 		</method>
 		<method name="body_add_shape">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape" type="RID" />
-			<argument index="2" name="transform" type="Transform2D" default="Transform2D(1, 0, 0, 1, 0, 0)" />
-			<argument index="3" name="disabled" type="bool" default="false" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape" type="RID" />
+			<param index="2" name="transform" type="Transform2D" default="Transform2D(1, 0, 0, 1, 0, 0)" />
+			<param index="3" name="disabled" type="bool" default="false" />
 			<description>
 				Adds a shape to the body, along with a transform matrix. Shapes are usually referenced by their index, so you should track which shape has a given index.
 			</description>
 		</method>
 		<method name="body_apply_central_force">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="force" type="Vector2" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="force" type="Vector2" />
 			<description>
 				Applies a directional force without affecting rotation. A force is time dependent and meant to be applied every physics update.
 				This is equivalent to using [method body_apply_force] at the body's center of mass.
@@ -264,8 +264,8 @@
 		</method>
 		<method name="body_apply_central_impulse">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="impulse" type="Vector2" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="impulse" type="Vector2" />
 			<description>
 				Applies a directional impulse without affecting rotation.
 				An impulse is time-independent! Applying an impulse every frame would result in a framerate-dependent force. For this reason, it should only be used when simulating one-time impacts (use the "_force" functions otherwise).
@@ -274,37 +274,37 @@
 		</method>
 		<method name="body_apply_force">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="force" type="Vector2" />
-			<argument index="2" name="position" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="force" type="Vector2" />
+			<param index="2" name="position" type="Vector2" default="Vector2(0, 0)" />
 			<description>
 				Applies a positioned force to the body. A force is time dependent and meant to be applied every physics update.
-				[code]position[/code] is the offset from the body origin in global coordinates.
+				[param position] is the offset from the body origin in global coordinates.
 			</description>
 		</method>
 		<method name="body_apply_impulse">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="impulse" type="Vector2" />
-			<argument index="2" name="position" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="impulse" type="Vector2" />
+			<param index="2" name="position" type="Vector2" default="Vector2(0, 0)" />
 			<description>
 				Applies a positioned impulse to the body.
 				An impulse is time-independent! Applying an impulse every frame would result in a framerate-dependent force. For this reason, it should only be used when simulating one-time impacts (use the "_force" functions otherwise).
-				[code]position[/code] is the offset from the body origin in global coordinates.
+				[param position] is the offset from the body origin in global coordinates.
 			</description>
 		</method>
 		<method name="body_apply_torque">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="torque" type="float" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="torque" type="float" />
 			<description>
 				Applies a rotational force without affecting position. A force is time dependent and meant to be applied every physics update.
 			</description>
 		</method>
 		<method name="body_apply_torque_impulse">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="impulse" type="float" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="impulse" type="float" />
 			<description>
 				Applies a rotational impulse to the body without affecting the position.
 				An impulse is time-independent! Applying an impulse every frame would result in a framerate-dependent force. For this reason, it should only be used when simulating one-time impacts (use the "_force" functions otherwise).
@@ -312,22 +312,22 @@
 		</method>
 		<method name="body_attach_canvas_instance_id">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="id" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="body_attach_object_instance_id">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="id" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="id" type="int" />
 			<description>
 				Assigns the area to a descendant of [Object], so it can exist in the node tree.
 			</description>
 		</method>
 		<method name="body_clear_shapes">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Removes all shapes from a body.
 			</description>
@@ -340,27 +340,27 @@
 		</method>
 		<method name="body_get_canvas_instance_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="body_get_collision_layer" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns the physics layer or layers a body belongs to.
 			</description>
 		</method>
 		<method name="body_get_collision_mask" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns the physics layer or layers a body can collide with.
 			</description>
 		</method>
 		<method name="body_get_constant_force" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns the body's total constant positional forces applied during each physics update.
 				See [method body_add_constant_force] and [method body_add_constant_central_force].
@@ -368,7 +368,7 @@
 		</method>
 		<method name="body_get_constant_torque" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns the body's total constant rotational forces applied during each physics update.
 				See [method body_add_constant_torque].
@@ -376,143 +376,143 @@
 		</method>
 		<method name="body_get_continuous_collision_detection_mode" qualifiers="const">
 			<return type="int" enum="PhysicsServer2D.CCDMode" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns the continuous collision detection mode.
 			</description>
 		</method>
 		<method name="body_get_direct_state">
 			<return type="PhysicsDirectBodyState2D" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns the [PhysicsDirectBodyState2D] of the body. Returns [code]null[/code] if the body is destroyed or removed from the physics space.
 			</description>
 		</method>
 		<method name="body_get_max_contacts_reported" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns the maximum contacts that can be reported. See [method body_set_max_contacts_reported].
 			</description>
 		</method>
 		<method name="body_get_mode" qualifiers="const">
 			<return type="int" enum="PhysicsServer2D.BodyMode" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns the body mode.
 			</description>
 		</method>
 		<method name="body_get_object_instance_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Gets the instance ID of the object the area is assigned to.
 			</description>
 		</method>
 		<method name="body_get_param" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer2D.BodyParameter" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer2D.BodyParameter" />
 			<description>
 				Returns the value of a body parameter. See [enum BodyParameter] for a list of available parameters.
 			</description>
 		</method>
 		<method name="body_get_shape" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
 			<description>
 				Returns the [RID] of the nth shape of a body.
 			</description>
 		</method>
 		<method name="body_get_shape_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns the number of shapes assigned to a body.
 			</description>
 		</method>
 		<method name="body_get_shape_transform" qualifiers="const">
 			<return type="Transform2D" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
 			<description>
 				Returns the transform matrix of a body shape.
 			</description>
 		</method>
 		<method name="body_get_space" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns the [RID] of the space assigned to a body.
 			</description>
 		</method>
 		<method name="body_get_state" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="state" type="int" enum="PhysicsServer2D.BodyState" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="state" type="int" enum="PhysicsServer2D.BodyState" />
 			<description>
 				Returns a body state.
 			</description>
 		</method>
 		<method name="body_is_omitting_force_integration" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns whether a body uses a callback function to calculate its own physics (see [method body_set_force_integration_callback]).
 			</description>
 		</method>
 		<method name="body_remove_collision_exception">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="excepted_body" type="RID" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="excepted_body" type="RID" />
 			<description>
 				Removes a body from the list of bodies exempt from collisions.
 			</description>
 		</method>
 		<method name="body_remove_shape">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
 			<description>
 				Removes a shape from a body. The shape is not deleted, so it can be reused afterwards.
 			</description>
 		</method>
 		<method name="body_reset_mass_properties">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Restores the default inertia and center of mass based on shapes to cancel any custom values previously set using [method body_set_param].
 			</description>
 		</method>
 		<method name="body_set_axis_velocity">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="axis_velocity" type="Vector2" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="axis_velocity" type="Vector2" />
 			<description>
 				Sets an axis velocity. The velocity in the given vector axis will be set as the given vector length. This is useful for jumping behavior.
 			</description>
 		</method>
 		<method name="body_set_collision_layer">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="layer" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="layer" type="int" />
 			<description>
 				Sets the physics layer or layers a body belongs to.
 			</description>
 		</method>
 		<method name="body_set_collision_mask">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="mask" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="mask" type="int" />
 			<description>
 				Sets the physics layer or layers a body can collide with.
 			</description>
 		</method>
 		<method name="body_set_constant_force">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="force" type="Vector2" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="force" type="Vector2" />
 			<description>
 				Sets the body's total constant positional forces applied during each physics update.
 				See [method body_add_constant_force] and [method body_add_constant_central_force].
@@ -520,8 +520,8 @@
 		</method>
 		<method name="body_set_constant_torque">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="torque" type="float" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="torque" type="float" />
 			<description>
 				Sets the body's total constant rotational forces applied during each physics update.
 				See [method body_add_constant_torque].
@@ -529,8 +529,8 @@
 		</method>
 		<method name="body_set_continuous_collision_detection_mode">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="mode" type="int" enum="PhysicsServer2D.CCDMode" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="mode" type="int" enum="PhysicsServer2D.CCDMode" />
 			<description>
 				Sets the continuous collision detection mode using one of the [enum CCDMode] constants.
 				Continuous collision detection tries to predict where a moving body will collide, instead of moving it and correcting its movement if it collided.
@@ -538,9 +538,9 @@
 		</method>
 		<method name="body_set_force_integration_callback">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="callable" type="Callable" />
-			<argument index="2" name="userdata" type="Variant" default="null" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="callable" type="Callable" />
+			<param index="2" name="userdata" type="Variant" default="null" />
 			<description>
 				Sets the function used to calculate physics for an object, if that object allows it (see [method body_set_omit_force_integration]).
 				The force integration function takes 2 arguments:
@@ -550,87 +550,87 @@
 		</method>
 		<method name="body_set_max_contacts_reported">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="amount" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="amount" type="int" />
 			<description>
-				Sets the maximum contacts to report. Bodies can keep a log of the contacts with other bodies, this is enabled by setting the maximum amount of contacts reported to a number greater than 0.
+				Sets the maximum contacts to report. Bodies can keep a log of the contacts with other bodies. This is enabled by setting the maximum number of contacts reported to a number greater than 0.
 			</description>
 		</method>
 		<method name="body_set_mode">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="mode" type="int" enum="PhysicsServer2D.BodyMode" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="mode" type="int" enum="PhysicsServer2D.BodyMode" />
 			<description>
 				Sets the body mode using one of the [enum BodyMode] constants.
 			</description>
 		</method>
 		<method name="body_set_omit_force_integration">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				Sets whether a body uses a callback function to calculate its own physics (see [method body_set_force_integration_callback]).
 			</description>
 		</method>
 		<method name="body_set_param">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer2D.BodyParameter" />
-			<argument index="2" name="value" type="Variant" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer2D.BodyParameter" />
+			<param index="2" name="value" type="Variant" />
 			<description>
 				Sets a body parameter. See [enum BodyParameter] for a list of available parameters.
 			</description>
 		</method>
 		<method name="body_set_shape">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
-			<argument index="2" name="shape" type="RID" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
+			<param index="2" name="shape" type="RID" />
 			<description>
 				Substitutes a given body shape by another. The old shape is selected by its index, the new one by its [RID].
 			</description>
 		</method>
 		<method name="body_set_shape_as_one_way_collision">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
-			<argument index="2" name="enable" type="bool" />
-			<argument index="3" name="margin" type="float" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
+			<param index="2" name="enable" type="bool" />
+			<param index="3" name="margin" type="float" />
 			<description>
-				Enables one way collision on body if [code]enable[/code] is [code]true[/code].
+				Enables one way collision on body if [param enable] is [code]true[/code].
 			</description>
 		</method>
 		<method name="body_set_shape_disabled">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
-			<argument index="2" name="disabled" type="bool" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
+			<param index="2" name="disabled" type="bool" />
 			<description>
-				Disables shape in body if [code]disable[/code] is [code]true[/code].
+				Disables shape in body if [param disabled] is [code]true[/code].
 			</description>
 		</method>
 		<method name="body_set_shape_transform">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
-			<argument index="2" name="transform" type="Transform2D" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
+			<param index="2" name="transform" type="Transform2D" />
 			<description>
 				Sets the transform matrix for a body shape.
 			</description>
 		</method>
 		<method name="body_set_space">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="space" type="RID" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="space" type="RID" />
 			<description>
 				Assigns a space to the body (see [method space_create]).
 			</description>
 		</method>
 		<method name="body_set_state">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="state" type="int" enum="PhysicsServer2D.BodyState" />
-			<argument index="2" name="value" type="Variant" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="state" type="int" enum="PhysicsServer2D.BodyState" />
+			<param index="2" name="value" type="Variant" />
 			<description>
 				Sets a body state using one of the [enum BodyState] constants.
 				Note that the method doesn't take effect immediately. The state will change on the next physics frame.
@@ -638,9 +638,9 @@
 		</method>
 		<method name="body_test_motion">
 			<return type="bool" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="parameters" type="PhysicsTestMotionParameters2D" />
-			<argument index="2" name="result" type="PhysicsTestMotionResult2D" default="null" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="parameters" type="PhysicsTestMotionParameters2D" />
+			<param index="2" name="result" type="PhysicsTestMotionResult2D" default="null" />
 			<description>
 				Returns [code]true[/code] if a collision would result from moving along a motion vector from a given point in space. [PhysicsTestMotionParameters2D] is passed to set motion parameters. [PhysicsTestMotionResult2D] can be passed to return additional information.
 			</description>
@@ -667,38 +667,38 @@
 		</method>
 		<method name="damped_spring_joint_get_param" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer2D.DampedSpringParam" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer2D.DampedSpringParam" />
 			<description>
 				Returns the value of a damped spring joint parameter. See [enum DampedSpringParam] for a list of available parameters.
 			</description>
 		</method>
 		<method name="damped_spring_joint_set_param">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer2D.DampedSpringParam" />
-			<argument index="2" name="value" type="float" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer2D.DampedSpringParam" />
+			<param index="2" name="value" type="float" />
 			<description>
 				Sets a damped spring joint parameter. See [enum DampedSpringParam] for a list of available parameters.
 			</description>
 		</method>
 		<method name="free_rid">
 			<return type="void" />
-			<argument index="0" name="rid" type="RID" />
+			<param index="0" name="rid" type="RID" />
 			<description>
 				Destroys any of the objects created by PhysicsServer2D. If the [RID] passed is not one of the objects that can be created by PhysicsServer2D, an error will be sent to the console.
 			</description>
 		</method>
 		<method name="get_process_info">
 			<return type="int" />
-			<argument index="0" name="process_info" type="int" enum="PhysicsServer2D.ProcessInfo" />
+			<param index="0" name="process_info" type="int" enum="PhysicsServer2D.ProcessInfo" />
 			<description>
 				Returns information about the current state of the 2D physics engine. See [enum ProcessInfo] for a list of available states.
 			</description>
 		</method>
 		<method name="joint_clear">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
+			<param index="0" name="joint" type="RID" />
 			<description>
 			</description>
 		</method>
@@ -709,54 +709,54 @@
 		</method>
 		<method name="joint_get_param" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer2D.JointParam" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer2D.JointParam" />
 			<description>
 				Returns the value of a joint parameter.
 			</description>
 		</method>
 		<method name="joint_get_type" qualifiers="const">
 			<return type="int" enum="PhysicsServer2D.JointType" />
-			<argument index="0" name="joint" type="RID" />
+			<param index="0" name="joint" type="RID" />
 			<description>
 				Returns a joint's type (see [enum JointType]).
 			</description>
 		</method>
 		<method name="joint_make_damped_spring">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="anchor_a" type="Vector2" />
-			<argument index="2" name="anchor_b" type="Vector2" />
-			<argument index="3" name="body_a" type="RID" />
-			<argument index="4" name="body_b" type="RID" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="anchor_a" type="Vector2" />
+			<param index="2" name="anchor_b" type="Vector2" />
+			<param index="3" name="body_a" type="RID" />
+			<param index="4" name="body_b" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="joint_make_groove">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="groove1_a" type="Vector2" />
-			<argument index="2" name="groove2_a" type="Vector2" />
-			<argument index="3" name="anchor_b" type="Vector2" />
-			<argument index="4" name="body_a" type="RID" />
-			<argument index="5" name="body_b" type="RID" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="groove1_a" type="Vector2" />
+			<param index="2" name="groove2_a" type="Vector2" />
+			<param index="3" name="anchor_b" type="Vector2" />
+			<param index="4" name="body_a" type="RID" />
+			<param index="5" name="body_b" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="joint_make_pin">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="anchor" type="Vector2" />
-			<argument index="2" name="body_a" type="RID" />
-			<argument index="3" name="body_b" type="RID" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="anchor" type="Vector2" />
+			<param index="2" name="body_a" type="RID" />
+			<param index="3" name="body_b" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="joint_set_param">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer2D.JointParam" />
-			<argument index="2" name="value" type="float" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer2D.JointParam" />
+			<param index="2" name="value" type="float" />
 			<description>
 				Sets a joint parameter. See [enum JointParam] for a list of available parameters.
 			</description>
@@ -778,29 +778,29 @@
 		</method>
 		<method name="set_active">
 			<return type="void" />
-			<argument index="0" name="active" type="bool" />
+			<param index="0" name="active" type="bool" />
 			<description>
 				Activates or deactivates the 2D physics engine.
 			</description>
 		</method>
 		<method name="shape_get_data" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="shape" type="RID" />
+			<param index="0" name="shape" type="RID" />
 			<description>
 				Returns the shape data.
 			</description>
 		</method>
 		<method name="shape_get_type" qualifiers="const">
 			<return type="int" enum="PhysicsServer2D.ShapeType" />
-			<argument index="0" name="shape" type="RID" />
+			<param index="0" name="shape" type="RID" />
 			<description>
 				Returns a shape's type (see [enum ShapeType]).
 			</description>
 		</method>
 		<method name="shape_set_data">
 			<return type="void" />
-			<argument index="0" name="shape" type="RID" />
-			<argument index="1" name="data" type="Variant" />
+			<param index="0" name="shape" type="RID" />
+			<param index="1" name="data" type="Variant" />
 			<description>
 				Sets the shape data that defines its shape and size. The data to be passed depends on the kind of shape created [method shape_get_type].
 			</description>
@@ -813,39 +813,39 @@
 		</method>
 		<method name="space_get_direct_state">
 			<return type="PhysicsDirectSpaceState2D" />
-			<argument index="0" name="space" type="RID" />
+			<param index="0" name="space" type="RID" />
 			<description>
 				Returns the state of a space, a [PhysicsDirectSpaceState2D]. This object can be used to make collision/intersection queries.
 			</description>
 		</method>
 		<method name="space_get_param" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="space" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer2D.SpaceParameter" />
+			<param index="0" name="space" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer2D.SpaceParameter" />
 			<description>
 				Returns the value of a space parameter.
 			</description>
 		</method>
 		<method name="space_is_active" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="space" type="RID" />
+			<param index="0" name="space" type="RID" />
 			<description>
 				Returns whether the space is active.
 			</description>
 		</method>
 		<method name="space_set_active">
 			<return type="void" />
-			<argument index="0" name="space" type="RID" />
-			<argument index="1" name="active" type="bool" />
+			<param index="0" name="space" type="RID" />
+			<param index="1" name="active" type="bool" />
 			<description>
 				Marks a space as active. It will not have an effect, unless it is assigned to an area or body.
 			</description>
 		</method>
 		<method name="space_set_param">
 			<return type="void" />
-			<argument index="0" name="space" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer2D.SpaceParameter" />
-			<argument index="2" name="value" type="float" />
+			<param index="0" name="space" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer2D.SpaceParameter" />
+			<param index="2" name="value" type="float" />
 			<description>
 				Sets the value for a space parameter. See [enum SpaceParameter] for a list of available parameters.
 			</description>
@@ -882,7 +882,7 @@
 			Constant to set/get the default solver bias for all physics constraints. A solver bias is a factor controlling how much two objects "rebound", after violating a constraint, to avoid leaving them in that state because of numerical imprecision.
 		</constant>
 		<constant name="SPACE_PARAM_SOLVER_ITERATIONS" value="8" enum="SpaceParameter">
-			Constant to set/get the number of solver iterations for all contacts and constraints. The greater the amount of iterations, the more accurate the collisions will be. However, a greater amount of iterations requires more CPU power, which can decrease performance.
+			Constant to set/get the number of solver iterations for all contacts and constraints. The greater the number of iterations, the more accurate the collisions will be. However, a greater number of iterations requires more CPU power, which can decrease performance.
 		</constant>
 		<constant name="SHAPE_WORLD_BOUNDARY" value="0" enum="ShapeType">
 			This is the constant for creating world boundary shapes. A world boundary shape is an [i]infinite[/i] line with an origin point, and a normal. Thus, it can be used for front/behind checks.
diff --git a/doc/classes/PhysicsServer3D.xml b/doc/classes/PhysicsServer3D.xml
index 2e84287227..b2456c69ec 100644
--- a/doc/classes/PhysicsServer3D.xml
+++ b/doc/classes/PhysicsServer3D.xml
@@ -11,25 +11,25 @@
 	<methods>
 		<method name="area_add_shape">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape" type="RID" />
-			<argument index="2" name="transform" type="Transform3D" default="Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0)" />
-			<argument index="3" name="disabled" type="bool" default="false" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape" type="RID" />
+			<param index="2" name="transform" type="Transform3D" default="Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0)" />
+			<param index="3" name="disabled" type="bool" default="false" />
 			<description>
 				Adds a shape to the area, along with a transform matrix. Shapes are usually referenced by their index, so you should track which shape has a given index.
 			</description>
 		</method>
 		<method name="area_attach_object_instance_id">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="id" type="int" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="id" type="int" />
 			<description>
 				Assigns the area to a descendant of [Object], so it can exist in the node tree.
 			</description>
 		</method>
 		<method name="area_clear_shapes">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
+			<param index="0" name="area" type="RID" />
 			<description>
 				Removes all shapes from an area. It does not delete the shapes, so they can be reassigned later.
 			</description>
@@ -42,91 +42,91 @@
 		</method>
 		<method name="area_get_object_instance_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="area" type="RID" />
+			<param index="0" name="area" type="RID" />
 			<description>
 				Gets the instance ID of the object the area is assigned to.
 			</description>
 		</method>
 		<method name="area_get_param" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.AreaParameter" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.AreaParameter" />
 			<description>
 				Returns an area parameter value. A list of available parameters is on the [enum AreaParameter] constants.
 			</description>
 		</method>
 		<method name="area_get_shape" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
 			<description>
 				Returns the [RID] of the nth shape of an area.
 			</description>
 		</method>
 		<method name="area_get_shape_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="area" type="RID" />
+			<param index="0" name="area" type="RID" />
 			<description>
 				Returns the number of shapes assigned to an area.
 			</description>
 		</method>
 		<method name="area_get_shape_transform" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
 			<description>
 				Returns the transform matrix of a shape within an area.
 			</description>
 		</method>
 		<method name="area_get_space" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="area" type="RID" />
+			<param index="0" name="area" type="RID" />
 			<description>
 				Returns the space assigned to the area.
 			</description>
 		</method>
 		<method name="area_get_transform" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="area" type="RID" />
+			<param index="0" name="area" type="RID" />
 			<description>
 				Returns the transform matrix for an area.
 			</description>
 		</method>
 		<method name="area_remove_shape">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
 			<description>
 				Removes a shape from an area. It does not delete the shape, so it can be reassigned later.
 			</description>
 		</method>
 		<method name="area_set_area_monitor_callback">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="callback" type="Callable" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="callback" type="Callable" />
 			<description>
 			</description>
 		</method>
 		<method name="area_set_collision_layer">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="layer" type="int" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="layer" type="int" />
 			<description>
 				Assigns the area to one or many physics layers.
 			</description>
 		</method>
 		<method name="area_set_collision_mask">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="mask" type="int" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="mask" type="int" />
 			<description>
 				Sets which physics layers the area will monitor.
 			</description>
 		</method>
 		<method name="area_set_monitor_callback">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="callback" type="Callable" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="callback" type="Callable" />
 			<description>
 				Sets the function to call when any body/area enters or exits the area. This callback will be called for any object interacting with the area, and takes five parameters:
 				1: [constant AREA_BODY_ADDED] or [constant AREA_BODY_REMOVED], depending on whether the object entered or exited the area.
@@ -138,82 +138,82 @@
 		</method>
 		<method name="area_set_monitorable">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="monitorable" type="bool" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="monitorable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="area_set_param">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.AreaParameter" />
-			<argument index="2" name="value" type="Variant" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.AreaParameter" />
+			<param index="2" name="value" type="Variant" />
 			<description>
 				Sets the value for an area parameter. A list of available parameters is on the [enum AreaParameter] constants.
 			</description>
 		</method>
 		<method name="area_set_ray_pickable">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				Sets object pickable with rays.
 			</description>
 		</method>
 		<method name="area_set_shape">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
-			<argument index="2" name="shape" type="RID" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
+			<param index="2" name="shape" type="RID" />
 			<description>
 				Substitutes a given area shape by another. The old shape is selected by its index, the new one by its [RID].
 			</description>
 		</method>
 		<method name="area_set_shape_disabled">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
-			<argument index="2" name="disabled" type="bool" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
+			<param index="2" name="disabled" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="area_set_shape_transform">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
-			<argument index="2" name="transform" type="Transform3D" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
+			<param index="2" name="transform" type="Transform3D" />
 			<description>
 				Sets the transform matrix for an area shape.
 			</description>
 		</method>
 		<method name="area_set_space">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="space" type="RID" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="space" type="RID" />
 			<description>
 				Assigns a space to the area.
 			</description>
 		</method>
 		<method name="area_set_transform">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="transform" type="Transform3D" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="transform" type="Transform3D" />
 			<description>
 				Sets the transform matrix for an area.
 			</description>
 		</method>
 		<method name="body_add_collision_exception">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="excepted_body" type="RID" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="excepted_body" type="RID" />
 			<description>
 				Adds a body to the list of bodies exempt from collisions.
 			</description>
 		</method>
 		<method name="body_add_constant_central_force">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="force" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="force" type="Vector3" />
 			<description>
 				Adds a constant directional force without affecting rotation that keeps being applied over time until cleared with [code]body_set_constant_force(body, Vector3(0, 0, 0))[/code].
 				This is equivalent to using [method body_add_constant_force] at the body's center of mass.
@@ -221,36 +221,36 @@
 		</method>
 		<method name="body_add_constant_force">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="force" type="Vector3" />
-			<argument index="2" name="position" type="Vector3" default="Vector3(0, 0, 0)" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="force" type="Vector3" />
+			<param index="2" name="position" type="Vector3" default="Vector3(0, 0, 0)" />
 			<description>
 				Adds a constant positioned force to the body that keeps being applied over time until cleared with [code]body_set_constant_force(body, Vector3(0, 0, 0))[/code].
-				[code]position[/code] is the offset from the body origin in global coordinates.
+				[param position] is the offset from the body origin in global coordinates.
 			</description>
 		</method>
 		<method name="body_add_constant_torque">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="torque" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="torque" type="Vector3" />
 			<description>
 				Adds a constant rotational force without affecting position that keeps being applied over time until cleared with [code]body_set_constant_torque(body, Vector3(0, 0, 0))[/code].
 			</description>
 		</method>
 		<method name="body_add_shape">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape" type="RID" />
-			<argument index="2" name="transform" type="Transform3D" default="Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0)" />
-			<argument index="3" name="disabled" type="bool" default="false" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape" type="RID" />
+			<param index="2" name="transform" type="Transform3D" default="Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0)" />
+			<param index="3" name="disabled" type="bool" default="false" />
 			<description>
 				Adds a shape to the body, along with a transform matrix. Shapes are usually referenced by their index, so you should track which shape has a given index.
 			</description>
 		</method>
 		<method name="body_apply_central_force">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="force" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="force" type="Vector3" />
 			<description>
 				Applies a directional force without affecting rotation. A force is time dependent and meant to be applied every physics update.
 				This is equivalent to using [method body_apply_force] at the body's center of mass.
@@ -258,8 +258,8 @@
 		</method>
 		<method name="body_apply_central_impulse">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="impulse" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="impulse" type="Vector3" />
 			<description>
 				Applies a directional impulse without affecting rotation.
 				An impulse is time-independent! Applying an impulse every frame would result in a framerate-dependent force. For this reason, it should only be used when simulating one-time impacts (use the "_force" functions otherwise).
@@ -268,37 +268,37 @@
 		</method>
 		<method name="body_apply_force">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="force" type="Vector3" />
-			<argument index="2" name="position" type="Vector3" default="Vector3(0, 0, 0)" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="force" type="Vector3" />
+			<param index="2" name="position" type="Vector3" default="Vector3(0, 0, 0)" />
 			<description>
 				Applies a positioned force to the body. A force is time dependent and meant to be applied every physics update.
-				[code]position[/code] is the offset from the body origin in global coordinates.
+				[param position] is the offset from the body origin in global coordinates.
 			</description>
 		</method>
 		<method name="body_apply_impulse">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="impulse" type="Vector3" />
-			<argument index="2" name="position" type="Vector3" default="Vector3(0, 0, 0)" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="impulse" type="Vector3" />
+			<param index="2" name="position" type="Vector3" default="Vector3(0, 0, 0)" />
 			<description>
 				Applies a positioned impulse to the body.
 				An impulse is time-independent! Applying an impulse every frame would result in a framerate-dependent force. For this reason, it should only be used when simulating one-time impacts (use the "_force" functions otherwise).
-				[code]position[/code] is the offset from the body origin in global coordinates.
+				[param position] is the offset from the body origin in global coordinates.
 			</description>
 		</method>
 		<method name="body_apply_torque">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="torque" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="torque" type="Vector3" />
 			<description>
 				Applies a rotational force without affecting position. A force is time dependent and meant to be applied every physics update.
 			</description>
 		</method>
 		<method name="body_apply_torque_impulse">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="impulse" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="impulse" type="Vector3" />
 			<description>
 				Applies a rotational impulse to the body without affecting the position.
 				An impulse is time-independent! Applying an impulse every frame would result in a framerate-dependent force. For this reason, it should only be used when simulating one-time impacts (use the "_force" functions otherwise).
@@ -306,15 +306,15 @@
 		</method>
 		<method name="body_attach_object_instance_id">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="id" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="id" type="int" />
 			<description>
 				Assigns the area to a descendant of [Object], so it can exist in the node tree.
 			</description>
 		</method>
 		<method name="body_clear_shapes">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Removes all shapes from a body.
 			</description>
@@ -326,21 +326,21 @@
 		</method>
 		<method name="body_get_collision_layer" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns the physics layer or layers a body belongs to.
 			</description>
 		</method>
 		<method name="body_get_collision_mask" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns the physics layer or layers a body can collide with.
 			</description>
 		</method>
 		<method name="body_get_constant_force" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns the body's total constant positional forces applied during each physics update.
 				See [method body_add_constant_force] and [method body_add_constant_central_force].
@@ -348,7 +348,7 @@
 		</method>
 		<method name="body_get_constant_torque" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns the body's total constant rotational forces applied during each physics update.
 				See [method body_add_constant_torque].
@@ -356,103 +356,103 @@
 		</method>
 		<method name="body_get_direct_state">
 			<return type="PhysicsDirectBodyState3D" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns the [PhysicsDirectBodyState3D] of the body. Returns [code]null[/code] if the body is destroyed or removed from the physics space.
 			</description>
 		</method>
 		<method name="body_get_max_contacts_reported" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns the maximum contacts that can be reported. See [method body_set_max_contacts_reported].
 			</description>
 		</method>
 		<method name="body_get_mode" qualifiers="const">
 			<return type="int" enum="PhysicsServer3D.BodyMode" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns the body mode.
 			</description>
 		</method>
 		<method name="body_get_object_instance_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Gets the instance ID of the object the area is assigned to.
 			</description>
 		</method>
 		<method name="body_get_param" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.BodyParameter" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.BodyParameter" />
 			<description>
 				Returns the value of a body parameter. A list of available parameters is on the [enum BodyParameter] constants.
 			</description>
 		</method>
 		<method name="body_get_shape" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
 			<description>
 				Returns the [RID] of the nth shape of a body.
 			</description>
 		</method>
 		<method name="body_get_shape_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns the number of shapes assigned to a body.
 			</description>
 		</method>
 		<method name="body_get_shape_transform" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
 			<description>
 				Returns the transform matrix of a body shape.
 			</description>
 		</method>
 		<method name="body_get_space" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns the [RID] of the space assigned to a body.
 			</description>
 		</method>
 		<method name="body_get_state" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="state" type="int" enum="PhysicsServer3D.BodyState" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="state" type="int" enum="PhysicsServer3D.BodyState" />
 			<description>
 				Returns a body state.
 			</description>
 		</method>
 		<method name="body_is_axis_locked" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="axis" type="int" enum="PhysicsServer3D.BodyAxis" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="axis" type="int" enum="PhysicsServer3D.BodyAxis" />
 			<description>
 			</description>
 		</method>
 		<method name="body_is_continuous_collision_detection_enabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				If [code]true[/code], the continuous collision detection mode is enabled.
 			</description>
 		</method>
 		<method name="body_is_omitting_force_integration" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns whether a body uses a callback function to calculate its own physics (see [method body_set_force_integration_callback]).
 			</description>
 		</method>
 		<method name="body_remove_collision_exception">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="excepted_body" type="RID" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="excepted_body" type="RID" />
 			<description>
 				Removes a body from the list of bodies exempt from collisions.
 				Continuous collision detection tries to predict where a moving body will collide, instead of moving it and correcting its movement if it collided.
@@ -460,55 +460,55 @@
 		</method>
 		<method name="body_remove_shape">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
 			<description>
 				Removes a shape from a body. The shape is not deleted, so it can be reused afterwards.
 			</description>
 		</method>
 		<method name="body_reset_mass_properties">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Restores the default inertia and center of mass based on shapes to cancel any custom values previously set using [method body_set_param].
 			</description>
 		</method>
 		<method name="body_set_axis_lock">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="axis" type="int" enum="PhysicsServer3D.BodyAxis" />
-			<argument index="2" name="lock" type="bool" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="axis" type="int" enum="PhysicsServer3D.BodyAxis" />
+			<param index="2" name="lock" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="body_set_axis_velocity">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="axis_velocity" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="axis_velocity" type="Vector3" />
 			<description>
 				Sets an axis velocity. The velocity in the given vector axis will be set as the given vector length. This is useful for jumping behavior.
 			</description>
 		</method>
 		<method name="body_set_collision_layer">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="layer" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="layer" type="int" />
 			<description>
 				Sets the physics layer or layers a body belongs to.
 			</description>
 		</method>
 		<method name="body_set_collision_mask">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="mask" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="mask" type="int" />
 			<description>
 				Sets the physics layer or layers a body can collide with.
 			</description>
 		</method>
 		<method name="body_set_constant_force">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="force" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="force" type="Vector3" />
 			<description>
 				Sets the body's total constant positional forces applied during each physics update.
 				See [method body_add_constant_force] and [method body_add_constant_central_force].
@@ -516,8 +516,8 @@
 		</method>
 		<method name="body_set_constant_torque">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="torque" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="torque" type="Vector3" />
 			<description>
 				Sets the body's total constant rotational forces applied during each physics update.
 				See [method body_add_constant_torque].
@@ -525,8 +525,8 @@
 		</method>
 		<method name="body_set_enable_continuous_collision_detection">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				If [code]true[/code], the continuous collision detection mode is enabled.
 				Continuous collision detection tries to predict where a moving body will collide, instead of moving it and correcting its movement if it collided.
@@ -534,9 +534,9 @@
 		</method>
 		<method name="body_set_force_integration_callback">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="callable" type="Callable" />
-			<argument index="2" name="userdata" type="Variant" default="null" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="callable" type="Callable" />
+			<param index="2" name="userdata" type="Variant" default="null" />
 			<description>
 				Sets the function used to calculate physics for an object, if that object allows it (see [method body_set_omit_force_integration]).
 				The force integration function takes 2 arguments:
@@ -546,93 +546,93 @@
 		</method>
 		<method name="body_set_max_contacts_reported">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="amount" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="amount" type="int" />
 			<description>
-				Sets the maximum contacts to report. Bodies can keep a log of the contacts with other bodies, this is enabled by setting the maximum amount of contacts reported to a number greater than 0.
+				Sets the maximum contacts to report. Bodies can keep a log of the contacts with other bodies. This is enabled by setting the maximum number of contacts reported to a number greater than 0.
 			</description>
 		</method>
 		<method name="body_set_mode">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="mode" type="int" enum="PhysicsServer3D.BodyMode" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="mode" type="int" enum="PhysicsServer3D.BodyMode" />
 			<description>
 				Sets the body mode, from one of the [enum BodyMode] constants.
 			</description>
 		</method>
 		<method name="body_set_omit_force_integration">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				Sets whether a body uses a callback function to calculate its own physics (see [method body_set_force_integration_callback]).
 			</description>
 		</method>
 		<method name="body_set_param">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.BodyParameter" />
-			<argument index="2" name="value" type="Variant" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.BodyParameter" />
+			<param index="2" name="value" type="Variant" />
 			<description>
 				Sets a body parameter. A list of available parameters is on the [enum BodyParameter] constants.
 			</description>
 		</method>
 		<method name="body_set_ray_pickable">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
-				Sets the body pickable with rays if [code]enabled[/code] is set.
+				Sets the body pickable with rays if [param enable] is set.
 			</description>
 		</method>
 		<method name="body_set_shape">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
-			<argument index="2" name="shape" type="RID" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
+			<param index="2" name="shape" type="RID" />
 			<description>
 				Substitutes a given body shape by another. The old shape is selected by its index, the new one by its [RID].
 			</description>
 		</method>
 		<method name="body_set_shape_disabled">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
-			<argument index="2" name="disabled" type="bool" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
+			<param index="2" name="disabled" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="body_set_shape_transform">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
-			<argument index="2" name="transform" type="Transform3D" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
+			<param index="2" name="transform" type="Transform3D" />
 			<description>
 				Sets the transform matrix for a body shape.
 			</description>
 		</method>
 		<method name="body_set_space">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="space" type="RID" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="space" type="RID" />
 			<description>
 				Assigns a space to the body (see [method space_create]).
 			</description>
 		</method>
 		<method name="body_set_state">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="state" type="int" enum="PhysicsServer3D.BodyState" />
-			<argument index="2" name="value" type="Variant" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="state" type="int" enum="PhysicsServer3D.BodyState" />
+			<param index="2" name="value" type="Variant" />
 			<description>
 				Sets a body state (see [enum BodyState] constants).
 			</description>
 		</method>
 		<method name="body_test_motion">
 			<return type="bool" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="parameters" type="PhysicsTestMotionParameters3D" />
-			<argument index="2" name="result" type="PhysicsTestMotionResult3D" default="null" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="parameters" type="PhysicsTestMotionParameters3D" />
+			<param index="2" name="result" type="PhysicsTestMotionResult3D" default="null" />
 			<description>
 				Returns [code]true[/code] if a collision would result from moving along a motion vector from a given point in space. [PhysicsTestMotionParameters3D] is passed to set motion parameters. [PhysicsTestMotionResult3D] can be passed to return additional information.
 			</description>
@@ -654,17 +654,17 @@
 		</method>
 		<method name="cone_twist_joint_get_param" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.ConeTwistJointParam" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.ConeTwistJointParam" />
 			<description>
 				Gets a cone_twist_joint parameter (see [enum ConeTwistJointParam] constants).
 			</description>
 		</method>
 		<method name="cone_twist_joint_set_param">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.ConeTwistJointParam" />
-			<argument index="2" name="value" type="float" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.ConeTwistJointParam" />
+			<param index="2" name="value" type="float" />
 			<description>
 				Sets a cone_twist_joint parameter (see [enum ConeTwistJointParam] constants).
 			</description>
@@ -686,52 +686,52 @@
 		</method>
 		<method name="free_rid">
 			<return type="void" />
-			<argument index="0" name="rid" type="RID" />
+			<param index="0" name="rid" type="RID" />
 			<description>
 				Destroys any of the objects created by PhysicsServer3D. If the [RID] passed is not one of the objects that can be created by PhysicsServer3D, an error will be sent to the console.
 			</description>
 		</method>
 		<method name="generic_6dof_joint_get_flag" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="axis" type="int" enum="Vector3.Axis" />
-			<argument index="2" name="flag" type="int" enum="PhysicsServer3D.G6DOFJointAxisFlag" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="axis" type="int" enum="Vector3.Axis" />
+			<param index="2" name="flag" type="int" enum="PhysicsServer3D.G6DOFJointAxisFlag" />
 			<description>
 				Gets a generic_6_DOF_joint flag (see [enum G6DOFJointAxisFlag] constants).
 			</description>
 		</method>
 		<method name="generic_6dof_joint_get_param" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="axis" type="int" enum="Vector3.Axis" />
-			<argument index="2" name="param" type="int" enum="PhysicsServer3D.G6DOFJointAxisParam" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="axis" type="int" enum="Vector3.Axis" />
+			<param index="2" name="param" type="int" enum="PhysicsServer3D.G6DOFJointAxisParam" />
 			<description>
 				Gets a generic_6_DOF_joint parameter (see [enum G6DOFJointAxisParam] constants).
 			</description>
 		</method>
 		<method name="generic_6dof_joint_set_flag">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="axis" type="int" enum="Vector3.Axis" />
-			<argument index="2" name="flag" type="int" enum="PhysicsServer3D.G6DOFJointAxisFlag" />
-			<argument index="3" name="enable" type="bool" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="axis" type="int" enum="Vector3.Axis" />
+			<param index="2" name="flag" type="int" enum="PhysicsServer3D.G6DOFJointAxisFlag" />
+			<param index="3" name="enable" type="bool" />
 			<description>
 				Sets a generic_6_DOF_joint flag (see [enum G6DOFJointAxisFlag] constants).
 			</description>
 		</method>
 		<method name="generic_6dof_joint_set_param">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="axis" type="int" enum="Vector3.Axis" />
-			<argument index="2" name="param" type="int" enum="PhysicsServer3D.G6DOFJointAxisParam" />
-			<argument index="3" name="value" type="float" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="axis" type="int" enum="Vector3.Axis" />
+			<param index="2" name="param" type="int" enum="PhysicsServer3D.G6DOFJointAxisParam" />
+			<param index="3" name="value" type="float" />
 			<description>
 				Sets a generic_6_DOF_joint parameter (see [enum G6DOFJointAxisParam] constants).
 			</description>
 		</method>
 		<method name="get_process_info">
 			<return type="int" />
-			<argument index="0" name="process_info" type="int" enum="PhysicsServer3D.ProcessInfo" />
+			<param index="0" name="process_info" type="int" enum="PhysicsServer3D.ProcessInfo" />
 			<description>
 				Returns information about the current state of the 3D physics engine. See [enum ProcessInfo] for a list of available states.
 			</description>
@@ -743,41 +743,41 @@
 		</method>
 		<method name="hinge_joint_get_flag" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="flag" type="int" enum="PhysicsServer3D.HingeJointFlag" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="flag" type="int" enum="PhysicsServer3D.HingeJointFlag" />
 			<description>
 				Gets a hinge_joint flag (see [enum HingeJointFlag] constants).
 			</description>
 		</method>
 		<method name="hinge_joint_get_param" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.HingeJointParam" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.HingeJointParam" />
 			<description>
 				Gets a hinge_joint parameter (see [enum HingeJointParam]).
 			</description>
 		</method>
 		<method name="hinge_joint_set_flag">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="flag" type="int" enum="PhysicsServer3D.HingeJointFlag" />
-			<argument index="2" name="enabled" type="bool" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="flag" type="int" enum="PhysicsServer3D.HingeJointFlag" />
+			<param index="2" name="enabled" type="bool" />
 			<description>
 				Sets a hinge_joint flag (see [enum HingeJointFlag] constants).
 			</description>
 		</method>
 		<method name="hinge_joint_set_param">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.HingeJointParam" />
-			<argument index="2" name="value" type="float" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.HingeJointParam" />
+			<param index="2" name="value" type="float" />
 			<description>
 				Sets a hinge_joint parameter (see [enum HingeJointParam] constants).
 			</description>
 		</method>
 		<method name="joint_clear">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
+			<param index="0" name="joint" type="RID" />
 			<description>
 			</description>
 		</method>
@@ -788,119 +788,119 @@
 		</method>
 		<method name="joint_get_solver_priority" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="joint" type="RID" />
+			<param index="0" name="joint" type="RID" />
 			<description>
 				Gets the priority value of the Joint3D.
 			</description>
 		</method>
 		<method name="joint_get_type" qualifiers="const">
 			<return type="int" enum="PhysicsServer3D.JointType" />
-			<argument index="0" name="joint" type="RID" />
+			<param index="0" name="joint" type="RID" />
 			<description>
 				Returns the type of the Joint3D.
 			</description>
 		</method>
 		<method name="joint_make_cone_twist">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="body_A" type="RID" />
-			<argument index="2" name="local_ref_A" type="Transform3D" />
-			<argument index="3" name="body_B" type="RID" />
-			<argument index="4" name="local_ref_B" type="Transform3D" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="body_A" type="RID" />
+			<param index="2" name="local_ref_A" type="Transform3D" />
+			<param index="3" name="body_B" type="RID" />
+			<param index="4" name="local_ref_B" type="Transform3D" />
 			<description>
 			</description>
 		</method>
 		<method name="joint_make_generic_6dof">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="body_A" type="RID" />
-			<argument index="2" name="local_ref_A" type="Transform3D" />
-			<argument index="3" name="body_B" type="RID" />
-			<argument index="4" name="local_ref_B" type="Transform3D" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="body_A" type="RID" />
+			<param index="2" name="local_ref_A" type="Transform3D" />
+			<param index="3" name="body_B" type="RID" />
+			<param index="4" name="local_ref_B" type="Transform3D" />
 			<description>
 			</description>
 		</method>
 		<method name="joint_make_hinge">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="body_A" type="RID" />
-			<argument index="2" name="hinge_A" type="Transform3D" />
-			<argument index="3" name="body_B" type="RID" />
-			<argument index="4" name="hinge_B" type="Transform3D" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="body_A" type="RID" />
+			<param index="2" name="hinge_A" type="Transform3D" />
+			<param index="3" name="body_B" type="RID" />
+			<param index="4" name="hinge_B" type="Transform3D" />
 			<description>
 			</description>
 		</method>
 		<method name="joint_make_pin">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="body_A" type="RID" />
-			<argument index="2" name="local_A" type="Vector3" />
-			<argument index="3" name="body_B" type="RID" />
-			<argument index="4" name="local_B" type="Vector3" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="body_A" type="RID" />
+			<param index="2" name="local_A" type="Vector3" />
+			<param index="3" name="body_B" type="RID" />
+			<param index="4" name="local_B" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="joint_make_slider">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="body_A" type="RID" />
-			<argument index="2" name="local_ref_A" type="Transform3D" />
-			<argument index="3" name="body_B" type="RID" />
-			<argument index="4" name="local_ref_B" type="Transform3D" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="body_A" type="RID" />
+			<param index="2" name="local_ref_A" type="Transform3D" />
+			<param index="3" name="body_B" type="RID" />
+			<param index="4" name="local_ref_B" type="Transform3D" />
 			<description>
 			</description>
 		</method>
 		<method name="joint_set_solver_priority">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="priority" type="int" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="priority" type="int" />
 			<description>
 				Sets the priority value of the Joint3D.
 			</description>
 		</method>
 		<method name="pin_joint_get_local_a" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="joint" type="RID" />
+			<param index="0" name="joint" type="RID" />
 			<description>
 				Returns position of the joint in the local space of body a of the joint.
 			</description>
 		</method>
 		<method name="pin_joint_get_local_b" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="joint" type="RID" />
+			<param index="0" name="joint" type="RID" />
 			<description>
 				Returns position of the joint in the local space of body b of the joint.
 			</description>
 		</method>
 		<method name="pin_joint_get_param" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.PinJointParam" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.PinJointParam" />
 			<description>
 				Gets a pin_joint parameter (see [enum PinJointParam] constants).
 			</description>
 		</method>
 		<method name="pin_joint_set_local_a">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="local_A" type="Vector3" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="local_A" type="Vector3" />
 			<description>
 				Sets position of the joint in the local space of body a of the joint.
 			</description>
 		</method>
 		<method name="pin_joint_set_local_b">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="local_B" type="Vector3" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="local_B" type="Vector3" />
 			<description>
 				Sets position of the joint in the local space of body b of the joint.
 			</description>
 		</method>
 		<method name="pin_joint_set_param">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.PinJointParam" />
-			<argument index="2" name="value" type="float" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.PinJointParam" />
+			<param index="2" name="value" type="float" />
 			<description>
 				Sets a pin_joint parameter (see [enum PinJointParam] constants).
 			</description>
@@ -912,53 +912,53 @@
 		</method>
 		<method name="set_active">
 			<return type="void" />
-			<argument index="0" name="active" type="bool" />
+			<param index="0" name="active" type="bool" />
 			<description>
 				Activates or deactivates the 3D physics engine.
 			</description>
 		</method>
 		<method name="shape_get_data" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="shape" type="RID" />
+			<param index="0" name="shape" type="RID" />
 			<description>
 				Returns the shape data.
 			</description>
 		</method>
 		<method name="shape_get_type" qualifiers="const">
 			<return type="int" enum="PhysicsServer3D.ShapeType" />
-			<argument index="0" name="shape" type="RID" />
+			<param index="0" name="shape" type="RID" />
 			<description>
 				Returns the type of shape (see [enum ShapeType] constants).
 			</description>
 		</method>
 		<method name="shape_set_data">
 			<return type="void" />
-			<argument index="0" name="shape" type="RID" />
-			<argument index="1" name="data" type="Variant" />
+			<param index="0" name="shape" type="RID" />
+			<param index="1" name="data" type="Variant" />
 			<description>
 				Sets the shape data that defines its shape and size. The data to be passed depends on the kind of shape created [method shape_get_type].
 			</description>
 		</method>
 		<method name="slider_joint_get_param" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.SliderJointParam" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.SliderJointParam" />
 			<description>
 				Gets a slider_joint parameter (see [enum SliderJointParam] constants).
 			</description>
 		</method>
 		<method name="slider_joint_set_param">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.SliderJointParam" />
-			<argument index="2" name="value" type="float" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.SliderJointParam" />
+			<param index="2" name="value" type="float" />
 			<description>
 				Gets a slider_joint parameter (see [enum SliderJointParam] constants).
 			</description>
 		</method>
 		<method name="soft_body_get_bounds" qualifiers="const">
 			<return type="AABB" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 			</description>
 		</method>
@@ -970,39 +970,39 @@
 		</method>
 		<method name="space_get_direct_state">
 			<return type="PhysicsDirectSpaceState3D" />
-			<argument index="0" name="space" type="RID" />
+			<param index="0" name="space" type="RID" />
 			<description>
 				Returns the state of a space, a [PhysicsDirectSpaceState3D]. This object can be used to make collision/intersection queries.
 			</description>
 		</method>
 		<method name="space_get_param" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="space" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.SpaceParameter" />
+			<param index="0" name="space" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.SpaceParameter" />
 			<description>
 				Returns the value of a space parameter.
 			</description>
 		</method>
 		<method name="space_is_active" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="space" type="RID" />
+			<param index="0" name="space" type="RID" />
 			<description>
 				Returns whether the space is active.
 			</description>
 		</method>
 		<method name="space_set_active">
 			<return type="void" />
-			<argument index="0" name="space" type="RID" />
-			<argument index="1" name="active" type="bool" />
+			<param index="0" name="space" type="RID" />
+			<param index="1" name="active" type="bool" />
 			<description>
 				Marks a space as active. It will not have an effect, unless it is assigned to an area or body.
 			</description>
 		</method>
 		<method name="space_set_param">
 			<return type="void" />
-			<argument index="0" name="space" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.SpaceParameter" />
-			<argument index="2" name="value" type="float" />
+			<param index="0" name="space" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.SpaceParameter" />
+			<param index="2" name="value" type="float" />
 			<description>
 				Sets the value for a space parameter. A list of available parameters is on the [enum SpaceParameter] constants.
 			</description>
@@ -1422,7 +1422,7 @@
 			Constant to set/get the maximum time of activity. A body marked as potentially inactive for both linear and angular velocity will be put to sleep after this time.
 		</constant>
 		<constant name="SPACE_PARAM_SOLVER_ITERATIONS" value="7" enum="SpaceParameter">
-			Constant to set/get the number of solver iterations for contacts and constraints. The greater the amount of iterations, the more accurate the collisions and constraints will be. However, a greater amount of iterations requires more CPU power, which can decrease performance.
+			Constant to set/get the number of solver iterations for contacts and constraints. The greater the number of iterations, the more accurate the collisions and constraints will be. However, a greater number of iterations requires more CPU power, which can decrease performance.
 		</constant>
 		<constant name="BODY_AXIS_LINEAR_X" value="1" enum="BodyAxis">
 		</constant>
diff --git a/doc/classes/PhysicsServer3DExtension.xml b/doc/classes/PhysicsServer3DExtension.xml
index 795f5b86dd..4188b04e4a 100644
--- a/doc/classes/PhysicsServer3DExtension.xml
+++ b/doc/classes/PhysicsServer3DExtension.xml
@@ -9,23 +9,23 @@
 	<methods>
 		<method name="_area_add_shape" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape" type="RID" />
-			<argument index="2" name="transform" type="Transform3D" />
-			<argument index="3" name="disabled" type="bool" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape" type="RID" />
+			<param index="2" name="transform" type="Transform3D" />
+			<param index="3" name="disabled" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_attach_object_instance_id" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="id" type="int" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_clear_shapes" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
+			<param index="0" name="area" type="RID" />
 			<description>
 			</description>
 		</method>
@@ -36,236 +36,236 @@
 		</method>
 		<method name="_area_get_object_instance_id" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="area" type="RID" />
+			<param index="0" name="area" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_get_param" qualifiers="virtual const">
 			<return type="Variant" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.AreaParameter" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.AreaParameter" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_get_shape" qualifiers="virtual const">
 			<return type="RID" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_get_shape_count" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="area" type="RID" />
+			<param index="0" name="area" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_get_shape_transform" qualifiers="virtual const">
 			<return type="Transform3D" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_get_space" qualifiers="virtual const">
 			<return type="RID" />
-			<argument index="0" name="area" type="RID" />
+			<param index="0" name="area" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_get_transform" qualifiers="virtual const">
 			<return type="Transform3D" />
-			<argument index="0" name="area" type="RID" />
+			<param index="0" name="area" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_remove_shape" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_set_area_monitor_callback" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="callback" type="Callable" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="callback" type="Callable" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_set_collision_layer" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="layer" type="int" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="layer" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_set_collision_mask" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="mask" type="int" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="mask" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_set_monitor_callback" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="callback" type="Callable" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="callback" type="Callable" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_set_monitorable" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="monitorable" type="bool" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="monitorable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_set_param" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.AreaParameter" />
-			<argument index="2" name="value" type="Variant" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.AreaParameter" />
+			<param index="2" name="value" type="Variant" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_set_ray_pickable" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_set_shape" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
-			<argument index="2" name="shape" type="RID" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
+			<param index="2" name="shape" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_set_shape_disabled" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
-			<argument index="2" name="disabled" type="bool" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
+			<param index="2" name="disabled" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_set_shape_transform" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
-			<argument index="2" name="transform" type="Transform3D" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
+			<param index="2" name="transform" type="Transform3D" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_set_space" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="space" type="RID" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="space" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_area_set_transform" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="area" type="RID" />
-			<argument index="1" name="transform" type="Transform3D" />
+			<param index="0" name="area" type="RID" />
+			<param index="1" name="transform" type="Transform3D" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_add_collision_exception" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="excepted_body" type="RID" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="excepted_body" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_add_constant_central_force" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="force" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="force" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_add_constant_force" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="force" type="Vector3" />
-			<argument index="2" name="position" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="force" type="Vector3" />
+			<param index="2" name="position" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_add_constant_torque" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="torque" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="torque" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_add_shape" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape" type="RID" />
-			<argument index="2" name="transform" type="Transform3D" />
-			<argument index="3" name="disabled" type="bool" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape" type="RID" />
+			<param index="2" name="transform" type="Transform3D" />
+			<param index="3" name="disabled" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_apply_central_force" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="force" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="force" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_apply_central_impulse" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="impulse" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="impulse" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_apply_force" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="force" type="Vector3" />
-			<argument index="2" name="position" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="force" type="Vector3" />
+			<param index="2" name="position" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_apply_impulse" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="impulse" type="Vector3" />
-			<argument index="2" name="position" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="impulse" type="Vector3" />
+			<param index="2" name="position" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_apply_torque" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="torque" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="torque" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_apply_torque_impulse" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="impulse" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="impulse" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_attach_object_instance_id" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="id" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_clear_shapes" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 			</description>
 		</method>
@@ -276,273 +276,273 @@
 		</method>
 		<method name="_body_get_collision_layer" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_get_collision_mask" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_get_constant_force" qualifiers="virtual const">
 			<return type="Vector3" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_get_constant_torque" qualifiers="virtual const">
 			<return type="Vector3" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_get_direct_state" qualifiers="virtual">
 			<return type="PhysicsDirectBodyState3D" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_get_max_contacts_reported" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_get_mode" qualifiers="virtual const">
 			<return type="int" enum="PhysicsServer3D.BodyMode" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_get_object_instance_id" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_get_param" qualifiers="virtual const">
 			<return type="Variant" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.BodyParameter" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.BodyParameter" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_get_shape" qualifiers="virtual const">
 			<return type="RID" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_get_shape_count" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_get_shape_transform" qualifiers="virtual const">
 			<return type="Transform3D" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_get_space" qualifiers="virtual const">
 			<return type="RID" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_get_state" qualifiers="virtual const">
 			<return type="Variant" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="state" type="int" enum="PhysicsServer3D.BodyState" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="state" type="int" enum="PhysicsServer3D.BodyState" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_is_axis_locked" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="axis" type="int" enum="PhysicsServer3D.BodyAxis" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="axis" type="int" enum="PhysicsServer3D.BodyAxis" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_is_continuous_collision_detection_enabled" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_is_omitting_force_integration" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_remove_collision_exception" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="excepted_body" type="RID" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="excepted_body" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_remove_shape" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_reset_mass_properties" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_set_axis_lock" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="axis" type="int" enum="PhysicsServer3D.BodyAxis" />
-			<argument index="2" name="lock" type="bool" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="axis" type="int" enum="PhysicsServer3D.BodyAxis" />
+			<param index="2" name="lock" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_set_axis_velocity" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="axis_velocity" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="axis_velocity" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_set_collision_layer" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="layer" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="layer" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_set_collision_mask" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="mask" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="mask" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_set_constant_force" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="force" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="force" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_set_constant_torque" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="torque" type="Vector3" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="torque" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_set_enable_continuous_collision_detection" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_set_force_integration_callback" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="callable" type="Callable" />
-			<argument index="2" name="userdata" type="Variant" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="callable" type="Callable" />
+			<param index="2" name="userdata" type="Variant" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_set_max_contacts_reported" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="amount" type="int" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="amount" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_set_mode" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="mode" type="int" enum="PhysicsServer3D.BodyMode" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="mode" type="int" enum="PhysicsServer3D.BodyMode" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_set_omit_force_integration" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_set_param" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.BodyParameter" />
-			<argument index="2" name="value" type="Variant" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.BodyParameter" />
+			<param index="2" name="value" type="Variant" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_set_ray_pickable" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_set_shape" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
-			<argument index="2" name="shape" type="RID" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
+			<param index="2" name="shape" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_set_shape_disabled" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
-			<argument index="2" name="disabled" type="bool" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
+			<param index="2" name="disabled" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_set_shape_transform" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="shape_idx" type="int" />
-			<argument index="2" name="transform" type="Transform3D" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="shape_idx" type="int" />
+			<param index="2" name="transform" type="Transform3D" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_set_space" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="space" type="RID" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="space" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_set_state" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="state" type="int" enum="PhysicsServer3D.BodyState" />
-			<argument index="2" name="value" type="Variant" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="state" type="int" enum="PhysicsServer3D.BodyState" />
+			<param index="2" name="value" type="Variant" />
 			<description>
 			</description>
 		</method>
 		<method name="_body_test_motion" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="body" type="RID" />
-			<argument index="1" name="from" type="Transform3D" />
-			<argument index="2" name="motion" type="Vector3" />
-			<argument index="3" name="margin" type="float" />
-			<argument index="4" name="max_collisions" type="int" />
-			<argument index="5" name="collide_separation_ray" type="bool" />
-			<argument index="6" name="result" type="PhysicsServer3DExtensionMotionResult*" />
+			<param index="0" name="body" type="RID" />
+			<param index="1" name="from" type="Transform3D" />
+			<param index="2" name="motion" type="Vector3" />
+			<param index="3" name="margin" type="float" />
+			<param index="4" name="max_collisions" type="int" />
+			<param index="5" name="collide_separation_ray" type="bool" />
+			<param index="6" name="result" type="PhysicsServer3DExtensionMotionResult*" />
 			<description>
 			</description>
 		</method>
@@ -563,16 +563,16 @@
 		</method>
 		<method name="_cone_twist_joint_get_param" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.ConeTwistJointParam" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.ConeTwistJointParam" />
 			<description>
 			</description>
 		</method>
 		<method name="_cone_twist_joint_set_param" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.ConeTwistJointParam" />
-			<argument index="2" name="value" type="float" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.ConeTwistJointParam" />
+			<param index="2" name="value" type="float" />
 			<description>
 			</description>
 		</method>
@@ -593,47 +593,47 @@
 		</method>
 		<method name="_free_rid" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="rid" type="RID" />
+			<param index="0" name="rid" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_generic_6dof_joint_get_flag" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="axis" type="int" enum="Vector3.Axis" />
-			<argument index="2" name="flag" type="int" enum="PhysicsServer3D.G6DOFJointAxisFlag" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="axis" type="int" enum="Vector3.Axis" />
+			<param index="2" name="flag" type="int" enum="PhysicsServer3D.G6DOFJointAxisFlag" />
 			<description>
 			</description>
 		</method>
 		<method name="_generic_6dof_joint_get_param" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="axis" type="int" enum="Vector3.Axis" />
-			<argument index="2" name="param" type="int" enum="PhysicsServer3D.G6DOFJointAxisParam" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="axis" type="int" enum="Vector3.Axis" />
+			<param index="2" name="param" type="int" enum="PhysicsServer3D.G6DOFJointAxisParam" />
 			<description>
 			</description>
 		</method>
 		<method name="_generic_6dof_joint_set_flag" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="axis" type="int" enum="Vector3.Axis" />
-			<argument index="2" name="flag" type="int" enum="PhysicsServer3D.G6DOFJointAxisFlag" />
-			<argument index="3" name="enable" type="bool" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="axis" type="int" enum="Vector3.Axis" />
+			<param index="2" name="flag" type="int" enum="PhysicsServer3D.G6DOFJointAxisFlag" />
+			<param index="3" name="enable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_generic_6dof_joint_set_param" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="axis" type="int" enum="Vector3.Axis" />
-			<argument index="2" name="param" type="int" enum="PhysicsServer3D.G6DOFJointAxisParam" />
-			<argument index="3" name="value" type="float" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="axis" type="int" enum="Vector3.Axis" />
+			<param index="2" name="param" type="int" enum="PhysicsServer3D.G6DOFJointAxisParam" />
+			<param index="3" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_process_info" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="process_info" type="int" enum="PhysicsServer3D.ProcessInfo" />
+			<param index="0" name="process_info" type="int" enum="PhysicsServer3D.ProcessInfo" />
 			<description>
 			</description>
 		</method>
@@ -644,37 +644,37 @@
 		</method>
 		<method name="_hinge_joint_get_flag" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="flag" type="int" enum="PhysicsServer3D.HingeJointFlag" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="flag" type="int" enum="PhysicsServer3D.HingeJointFlag" />
 			<description>
 			</description>
 		</method>
 		<method name="_hinge_joint_get_param" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.HingeJointParam" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.HingeJointParam" />
 			<description>
 			</description>
 		</method>
 		<method name="_hinge_joint_set_flag" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="flag" type="int" enum="PhysicsServer3D.HingeJointFlag" />
-			<argument index="2" name="enabled" type="bool" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="flag" type="int" enum="PhysicsServer3D.HingeJointFlag" />
+			<param index="2" name="enabled" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_hinge_joint_set_param" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.HingeJointParam" />
-			<argument index="2" name="value" type="float" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.HingeJointParam" />
+			<param index="2" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="_joint_clear" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
+			<param index="0" name="joint" type="RID" />
 			<description>
 			</description>
 		</method>
@@ -685,111 +685,111 @@
 		</method>
 		<method name="_joint_get_solver_priority" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="joint" type="RID" />
+			<param index="0" name="joint" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_joint_get_type" qualifiers="virtual const">
 			<return type="int" enum="PhysicsServer3D.JointType" />
-			<argument index="0" name="joint" type="RID" />
+			<param index="0" name="joint" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_joint_make_cone_twist" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="body_A" type="RID" />
-			<argument index="2" name="local_ref_A" type="Transform3D" />
-			<argument index="3" name="body_B" type="RID" />
-			<argument index="4" name="local_ref_B" type="Transform3D" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="body_A" type="RID" />
+			<param index="2" name="local_ref_A" type="Transform3D" />
+			<param index="3" name="body_B" type="RID" />
+			<param index="4" name="local_ref_B" type="Transform3D" />
 			<description>
 			</description>
 		</method>
 		<method name="_joint_make_generic_6dof" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="body_A" type="RID" />
-			<argument index="2" name="local_ref_A" type="Transform3D" />
-			<argument index="3" name="body_B" type="RID" />
-			<argument index="4" name="local_ref_B" type="Transform3D" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="body_A" type="RID" />
+			<param index="2" name="local_ref_A" type="Transform3D" />
+			<param index="3" name="body_B" type="RID" />
+			<param index="4" name="local_ref_B" type="Transform3D" />
 			<description>
 			</description>
 		</method>
 		<method name="_joint_make_hinge" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="body_A" type="RID" />
-			<argument index="2" name="hinge_A" type="Transform3D" />
-			<argument index="3" name="body_B" type="RID" />
-			<argument index="4" name="hinge_B" type="Transform3D" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="body_A" type="RID" />
+			<param index="2" name="hinge_A" type="Transform3D" />
+			<param index="3" name="body_B" type="RID" />
+			<param index="4" name="hinge_B" type="Transform3D" />
 			<description>
 			</description>
 		</method>
 		<method name="_joint_make_pin" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="body_A" type="RID" />
-			<argument index="2" name="local_A" type="Vector3" />
-			<argument index="3" name="body_B" type="RID" />
-			<argument index="4" name="local_B" type="Vector3" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="body_A" type="RID" />
+			<param index="2" name="local_A" type="Vector3" />
+			<param index="3" name="body_B" type="RID" />
+			<param index="4" name="local_B" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_joint_make_slider" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="body_A" type="RID" />
-			<argument index="2" name="local_ref_A" type="Transform3D" />
-			<argument index="3" name="body_B" type="RID" />
-			<argument index="4" name="local_ref_B" type="Transform3D" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="body_A" type="RID" />
+			<param index="2" name="local_ref_A" type="Transform3D" />
+			<param index="3" name="body_B" type="RID" />
+			<param index="4" name="local_ref_B" type="Transform3D" />
 			<description>
 			</description>
 		</method>
 		<method name="_joint_set_solver_priority" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="priority" type="int" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="priority" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_pin_joint_get_local_a" qualifiers="virtual const">
 			<return type="Vector3" />
-			<argument index="0" name="joint" type="RID" />
+			<param index="0" name="joint" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_pin_joint_get_local_b" qualifiers="virtual const">
 			<return type="Vector3" />
-			<argument index="0" name="joint" type="RID" />
+			<param index="0" name="joint" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_pin_joint_get_param" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.PinJointParam" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.PinJointParam" />
 			<description>
 			</description>
 		</method>
 		<method name="_pin_joint_set_local_a" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="local_A" type="Vector3" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="local_A" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_pin_joint_set_local_b" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="local_B" type="Vector3" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="local_B" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="_pin_joint_set_param" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.PinJointParam" />
-			<argument index="2" name="value" type="float" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.PinJointParam" />
+			<param index="2" name="value" type="float" />
 			<description>
 			</description>
 		</method>
@@ -800,47 +800,47 @@
 		</method>
 		<method name="_set_active" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="active" type="bool" />
+			<param index="0" name="active" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_shape_get_data" qualifiers="virtual const">
 			<return type="Variant" />
-			<argument index="0" name="shape" type="RID" />
+			<param index="0" name="shape" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_shape_get_type" qualifiers="virtual const">
 			<return type="int" enum="PhysicsServer3D.ShapeType" />
-			<argument index="0" name="shape" type="RID" />
+			<param index="0" name="shape" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_shape_set_data" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="shape" type="RID" />
-			<argument index="1" name="data" type="Variant" />
+			<param index="0" name="shape" type="RID" />
+			<param index="1" name="data" type="Variant" />
 			<description>
 			</description>
 		</method>
 		<method name="_slider_joint_get_param" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.SliderJointParam" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.SliderJointParam" />
 			<description>
 			</description>
 		</method>
 		<method name="_slider_joint_set_param" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="joint" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.SliderJointParam" />
-			<argument index="2" name="value" type="float" />
+			<param index="0" name="joint" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.SliderJointParam" />
+			<param index="2" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="_soft_body_get_bounds" qualifiers="virtual const">
 			<return type="AABB" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 			</description>
 		</method>
@@ -851,35 +851,35 @@
 		</method>
 		<method name="_space_get_direct_state" qualifiers="virtual">
 			<return type="PhysicsDirectSpaceState3D" />
-			<argument index="0" name="space" type="RID" />
+			<param index="0" name="space" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_space_get_param" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="space" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.SpaceParameter" />
+			<param index="0" name="space" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.SpaceParameter" />
 			<description>
 			</description>
 		</method>
 		<method name="_space_is_active" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="space" type="RID" />
+			<param index="0" name="space" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="_space_set_active" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="space" type="RID" />
-			<argument index="1" name="active" type="bool" />
+			<param index="0" name="space" type="RID" />
+			<param index="1" name="active" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_space_set_param" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="space" type="RID" />
-			<argument index="1" name="param" type="int" enum="PhysicsServer3D.SpaceParameter" />
-			<argument index="2" name="value" type="float" />
+			<param index="0" name="space" type="RID" />
+			<param index="1" name="param" type="int" enum="PhysicsServer3D.SpaceParameter" />
+			<param index="2" name="value" type="float" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/PhysicsServer3DRenderingServerHandler.xml b/doc/classes/PhysicsServer3DRenderingServerHandler.xml
index a40a2dd1c6..90066aeb2c 100644
--- a/doc/classes/PhysicsServer3DRenderingServerHandler.xml
+++ b/doc/classes/PhysicsServer3DRenderingServerHandler.xml
@@ -9,21 +9,21 @@
 	<methods>
 		<method name="_set_aabb" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="aabb" type="AABB" />
+			<param index="0" name="aabb" type="AABB" />
 			<description>
 			</description>
 		</method>
 		<method name="_set_normal" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="vertex_id" type="int" />
-			<argument index="1" name="normals" type="const void*" />
+			<param index="0" name="vertex_id" type="int" />
+			<param index="1" name="normals" type="const void*" />
 			<description>
 			</description>
 		</method>
 		<method name="_set_vertex" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="vertex_id" type="int" />
-			<argument index="1" name="vertices" type="const void*" />
+			<param index="0" name="vertex_id" type="int" />
+			<param index="1" name="vertices" type="const void*" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/PhysicsTestMotionResult3D.xml b/doc/classes/PhysicsTestMotionResult3D.xml
index e347a350c2..f82df1989f 100644
--- a/doc/classes/PhysicsTestMotionResult3D.xml
+++ b/doc/classes/PhysicsTestMotionResult3D.xml
@@ -11,35 +11,35 @@
 	<methods>
 		<method name="get_collider" qualifiers="const">
 			<return type="Object" />
-			<argument index="0" name="collision_index" type="int" default="0" />
+			<param index="0" name="collision_index" type="int" default="0" />
 			<description>
 				Returns the colliding body's attached [Object] given a collision index (the deepest collision by default), if a collision occurred.
 			</description>
 		</method>
 		<method name="get_collider_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="collision_index" type="int" default="0" />
+			<param index="0" name="collision_index" type="int" default="0" />
 			<description>
 				Returns the unique instance ID of the colliding body's attached [Object] given a collision index (the deepest collision by default), if a collision occurred. See [method Object.get_instance_id].
 			</description>
 		</method>
 		<method name="get_collider_rid" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="collision_index" type="int" default="0" />
+			<param index="0" name="collision_index" type="int" default="0" />
 			<description>
 				Returns the colliding body's [RID] used by the [PhysicsServer3D] given a collision index (the deepest collision by default), if a collision occurred.
 			</description>
 		</method>
 		<method name="get_collider_shape" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="collision_index" type="int" default="0" />
+			<param index="0" name="collision_index" type="int" default="0" />
 			<description>
 				Returns the colliding body's shape index given a collision index (the deepest collision by default), if a collision occurred. See [CollisionObject3D].
 			</description>
 		</method>
 		<method name="get_collider_velocity" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="collision_index" type="int" default="0" />
+			<param index="0" name="collision_index" type="int" default="0" />
 			<description>
 				Returns the colliding body's velocity given a collision index (the deepest collision by default), if a collision occurred.
 			</description>
@@ -52,28 +52,28 @@
 		</method>
 		<method name="get_collision_depth" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="collision_index" type="int" default="0" />
+			<param index="0" name="collision_index" type="int" default="0" />
 			<description>
 				Returns the length of overlap along the collision normal given a collision index (the deepest collision by default), if a collision occurred.
 			</description>
 		</method>
 		<method name="get_collision_local_shape" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="collision_index" type="int" default="0" />
+			<param index="0" name="collision_index" type="int" default="0" />
 			<description>
 				Returns the moving object's colliding shape given a collision index (the deepest collision by default), if a collision occurred.
 			</description>
 		</method>
 		<method name="get_collision_normal" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="collision_index" type="int" default="0" />
+			<param index="0" name="collision_index" type="int" default="0" />
 			<description>
 				Returns the colliding body's shape's normal at the point of collision given a collision index (the deepest collision by default), if a collision occurred.
 			</description>
 		</method>
 		<method name="get_collision_point" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="collision_index" type="int" default="0" />
+			<param index="0" name="collision_index" type="int" default="0" />
 			<description>
 				Returns the point of collision in global coordinates given a collision index (the deepest collision by default), if a collision occurred.
 			</description>
diff --git a/doc/classes/PinJoint3D.xml b/doc/classes/PinJoint3D.xml
index 013a18b92c..007cdf830d 100644
--- a/doc/classes/PinJoint3D.xml
+++ b/doc/classes/PinJoint3D.xml
@@ -11,15 +11,15 @@
 	<methods>
 		<method name="get_param" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="param" type="int" enum="PinJoint3D.Param" />
+			<param index="0" name="param" type="int" enum="PinJoint3D.Param" />
 			<description>
 				Returns the value of the specified parameter.
 			</description>
 		</method>
 		<method name="set_param">
 			<return type="void" />
-			<argument index="0" name="param" type="int" enum="PinJoint3D.Param" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="param" type="int" enum="PinJoint3D.Param" />
+			<param index="1" name="value" type="float" />
 			<description>
 				Sets the value of the specified parameter.
 			</description>
diff --git a/doc/classes/Plane.xml b/doc/classes/Plane.xml
index 32eb71f1c7..e51e3753fc 100644
--- a/doc/classes/Plane.xml
+++ b/doc/classes/Plane.xml
@@ -18,49 +18,49 @@
 		</constructor>
 		<constructor name="Plane">
 			<return type="Plane" />
-			<argument index="0" name="from" type="Plane" />
+			<param index="0" name="from" type="Plane" />
 			<description>
 				Constructs a [Plane] as a copy of the given [Plane].
 			</description>
 		</constructor>
 		<constructor name="Plane">
 			<return type="Plane" />
-			<argument index="0" name="a" type="float" />
-			<argument index="1" name="b" type="float" />
-			<argument index="2" name="c" type="float" />
-			<argument index="3" name="d" type="float" />
+			<param index="0" name="a" type="float" />
+			<param index="1" name="b" type="float" />
+			<param index="2" name="c" type="float" />
+			<param index="3" name="d" type="float" />
 			<description>
-				Creates a plane from the four parameters. The three components of the resulting plane's [member normal] are [code]a[/code], [code]b[/code] and [code]c[/code], and the plane has a distance of [code]d[/code] from the origin.
+				Creates a plane from the four parameters. The three components of the resulting plane's [member normal] are [param a], [param b] and [param c], and the plane has a distance of [param d] from the origin.
 			</description>
 		</constructor>
 		<constructor name="Plane">
 			<return type="Plane" />
-			<argument index="0" name="normal" type="Vector3" />
+			<param index="0" name="normal" type="Vector3" />
 			<description>
 				Creates a plane from the normal vector. The plane will intersect the origin.
 			</description>
 		</constructor>
 		<constructor name="Plane">
 			<return type="Plane" />
-			<argument index="0" name="normal" type="Vector3" />
-			<argument index="1" name="d" type="float" />
+			<param index="0" name="normal" type="Vector3" />
+			<param index="1" name="d" type="float" />
 			<description>
 				Creates a plane from the normal vector and the plane's distance from the origin.
 			</description>
 		</constructor>
 		<constructor name="Plane">
 			<return type="Plane" />
-			<argument index="0" name="normal" type="Vector3" />
-			<argument index="1" name="point" type="Vector3" />
+			<param index="0" name="normal" type="Vector3" />
+			<param index="1" name="point" type="Vector3" />
 			<description>
 				Creates a plane from the normal vector and a point on the plane.
 			</description>
 		</constructor>
 		<constructor name="Plane">
 			<return type="Plane" />
-			<argument index="0" name="point1" type="Vector3" />
-			<argument index="1" name="point2" type="Vector3" />
-			<argument index="2" name="point3" type="Vector3" />
+			<param index="0" name="point1" type="Vector3" />
+			<param index="1" name="point2" type="Vector3" />
+			<param index="2" name="point3" type="Vector3" />
 			<description>
 				Creates a plane from the three points, given in clockwise order.
 			</description>
@@ -75,55 +75,55 @@
 		</method>
 		<method name="distance_to" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="point" type="Vector3" />
+			<param index="0" name="point" type="Vector3" />
 			<description>
-				Returns the shortest distance from the plane to the position [code]point[/code]. If the point is above the plane, the distance will be positive. If below, the distance will be negative.
+				Returns the shortest distance from the plane to the position [param point]. If the point is above the plane, the distance will be positive. If below, the distance will be negative.
 			</description>
 		</method>
 		<method name="has_point" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="point" type="Vector3" />
-			<argument index="1" name="tolerance" type="float" default="1e-05" />
+			<param index="0" name="point" type="Vector3" />
+			<param index="1" name="tolerance" type="float" default="1e-05" />
 			<description>
-				Returns [code]true[/code] if [code]point[/code] is inside the plane. Comparison uses a custom minimum [code]tolerance[/code] threshold.
+				Returns [code]true[/code] if [param point] is inside the plane. Comparison uses a custom minimum [param tolerance] threshold.
 			</description>
 		</method>
 		<method name="intersect_3" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="b" type="Plane" />
-			<argument index="1" name="c" type="Plane" />
+			<param index="0" name="b" type="Plane" />
+			<param index="1" name="c" type="Plane" />
 			<description>
-				Returns the intersection point of the three planes [code]b[/code], [code]c[/code] and this plane. If no intersection is found, [code]null[/code] is returned.
+				Returns the intersection point of the three planes [param b], [param c] and this plane. If no intersection is found, [code]null[/code] is returned.
 			</description>
 		</method>
 		<method name="intersects_ray" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="from" type="Vector3" />
-			<argument index="1" name="dir" type="Vector3" />
+			<param index="0" name="from" type="Vector3" />
+			<param index="1" name="dir" type="Vector3" />
 			<description>
-				Returns the intersection point of a ray consisting of the position [code]from[/code] and the direction normal [code]dir[/code] with this plane. If no intersection is found, [code]null[/code] is returned.
+				Returns the intersection point of a ray consisting of the position [param from] and the direction normal [param dir] with this plane. If no intersection is found, [code]null[/code] is returned.
 			</description>
 		</method>
 		<method name="intersects_segment" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="from" type="Vector3" />
-			<argument index="1" name="to" type="Vector3" />
+			<param index="0" name="from" type="Vector3" />
+			<param index="1" name="to" type="Vector3" />
 			<description>
-				Returns the intersection point of a segment from position [code]from[/code] to position [code]to[/code] with this plane. If no intersection is found, [code]null[/code] is returned.
+				Returns the intersection point of a segment from position [param from] to position [param to] with this plane. If no intersection is found, [code]null[/code] is returned.
 			</description>
 		</method>
 		<method name="is_equal_approx" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="to_plane" type="Plane" />
+			<param index="0" name="to_plane" type="Plane" />
 			<description>
-				Returns [code]true[/code] if this plane and [code]plane[/code] are approximately equal, by running [method @GlobalScope.is_equal_approx] on each component.
+				Returns [code]true[/code] if this plane and [param to_plane] are approximately equal, by running [method @GlobalScope.is_equal_approx] on each component.
 			</description>
 		</method>
 		<method name="is_point_over" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="point" type="Vector3" />
+			<param index="0" name="point" type="Vector3" />
 			<description>
-				Returns [code]true[/code] if [code]point[/code] is located above the plane.
+				Returns [code]true[/code] if [param point] is located above the plane.
 			</description>
 		</method>
 		<method name="normalized" qualifiers="const">
@@ -134,9 +134,9 @@
 		</method>
 		<method name="project" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="point" type="Vector3" />
+			<param index="0" name="point" type="Vector3" />
 			<description>
-				Returns the orthogonal projection of [code]point[/code] into a point in the plane.
+				Returns the orthogonal projection of [param point] into a point in the plane.
 			</description>
 		</method>
 	</methods>
@@ -173,15 +173,22 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Plane" />
+			<param index="0" name="right" type="Plane" />
 			<description>
 				Returns [code]true[/code] if the planes are not equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
 			</description>
 		</operator>
+		<operator name="operator *">
+			<return type="Plane" />
+			<param index="0" name="right" type="Transform3D" />
+			<description>
+				Inversely transforms (multiplies) the [Plane] by the given [Transform3D] transformation matrix.
+			</description>
+		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="Plane" />
+			<param index="0" name="right" type="Plane" />
 			<description>
 				Returns [code]true[/code] if the planes are exactly equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
diff --git a/doc/classes/Polygon2D.xml b/doc/classes/Polygon2D.xml
index 5f75ac6c50..5d5c69aadd 100644
--- a/doc/classes/Polygon2D.xml
+++ b/doc/classes/Polygon2D.xml
@@ -11,10 +11,10 @@
 	<methods>
 		<method name="add_bone">
 			<return type="void" />
-			<argument index="0" name="path" type="NodePath" />
-			<argument index="1" name="weights" type="PackedFloat32Array" />
+			<param index="0" name="path" type="NodePath" />
+			<param index="1" name="weights" type="PackedFloat32Array" />
 			<description>
-				Adds a bone with the specified [code]path[/code] and [code]weights[/code].
+				Adds a bone with the specified [param path] and [param weights].
 			</description>
 		</method>
 		<method name="clear_bones">
@@ -25,7 +25,7 @@
 		</method>
 		<method name="erase_bone">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Removes the specified bone from this [Polygon2D].
 			</description>
@@ -38,30 +38,30 @@
 		</method>
 		<method name="get_bone_path" qualifiers="const">
 			<return type="NodePath" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Returns the path to the node associated with the specified bone.
 			</description>
 		</method>
 		<method name="get_bone_weights" qualifiers="const">
 			<return type="PackedFloat32Array" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Returns the height values of the specified bone.
 			</description>
 		</method>
 		<method name="set_bone_path">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="path" type="NodePath" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="path" type="NodePath" />
 			<description>
 				Sets the path to the node associated with the specified bone.
 			</description>
 		</method>
 		<method name="set_bone_weights">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="weights" type="PackedFloat32Array" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="weights" type="PackedFloat32Array" />
 			<description>
 				Sets the weight values for the specified bone.
 			</description>
diff --git a/doc/classes/PolygonPathFinder.xml b/doc/classes/PolygonPathFinder.xml
index dbe9978ef5..84d757bfca 100644
--- a/doc/classes/PolygonPathFinder.xml
+++ b/doc/classes/PolygonPathFinder.xml
@@ -9,8 +9,8 @@
 	<methods>
 		<method name="find_path">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="from" type="Vector2" />
-			<argument index="1" name="to" type="Vector2" />
+			<param index="0" name="from" type="Vector2" />
+			<param index="1" name="to" type="Vector2" />
 			<description>
 			</description>
 		</method>
@@ -21,40 +21,40 @@
 		</method>
 		<method name="get_closest_point" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="point" type="Vector2" />
+			<param index="0" name="point" type="Vector2" />
 			<description>
 			</description>
 		</method>
 		<method name="get_intersections" qualifiers="const">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="from" type="Vector2" />
-			<argument index="1" name="to" type="Vector2" />
+			<param index="0" name="from" type="Vector2" />
+			<param index="1" name="to" type="Vector2" />
 			<description>
 			</description>
 		</method>
 		<method name="get_point_penalty" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="is_point_inside" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="point" type="Vector2" />
+			<param index="0" name="point" type="Vector2" />
 			<description>
 			</description>
 		</method>
 		<method name="set_point_penalty">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="penalty" type="float" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="penalty" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="setup">
 			<return type="void" />
-			<argument index="0" name="points" type="PackedVector2Array" />
-			<argument index="1" name="connections" type="PackedInt32Array" />
+			<param index="0" name="points" type="PackedVector2Array" />
+			<param index="1" name="connections" type="PackedInt32Array" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/PopupMenu.xml b/doc/classes/PopupMenu.xml
index 5da2196f29..0f47bea5df 100644
--- a/doc/classes/PopupMenu.xml
+++ b/doc/classes/PopupMenu.xml
@@ -15,165 +15,165 @@
 	<methods>
 		<method name="add_check_item">
 			<return type="void" />
-			<argument index="0" name="label" type="String" />
-			<argument index="1" name="id" type="int" default="-1" />
-			<argument index="2" name="accel" type="int" enum="Key" default="0" />
+			<param index="0" name="label" type="String" />
+			<param index="1" name="id" type="int" default="-1" />
+			<param index="2" name="accel" type="int" enum="Key" default="0" />
 			<description>
-				Adds a new checkable item with text [code]label[/code].
-				An [code]id[/code] can optionally be provided, as well as an accelerator ([code]accel[/code]). If no [code]id[/code] is provided, one will be created from the index. If no [code]accel[/code] is provided then the default [code]0[/code] will be assigned to it. See [method get_item_accelerator] for more info on accelerators.
+				Adds a new checkable item with text [param label].
+				An [param id] can optionally be provided, as well as an accelerator ([param accel]). If no [param id] is provided, one will be created from the index. If no [param accel] is provided then the default [code]0[/code] will be assigned to it. See [method get_item_accelerator] for more info on accelerators.
 				[b]Note:[/b] Checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually. See [method set_item_checked] for more info on how to control it.
 			</description>
 		</method>
 		<method name="add_check_shortcut">
 			<return type="void" />
-			<argument index="0" name="shortcut" type="Shortcut" />
-			<argument index="1" name="id" type="int" default="-1" />
-			<argument index="2" name="global" type="bool" default="false" />
+			<param index="0" name="shortcut" type="Shortcut" />
+			<param index="1" name="id" type="int" default="-1" />
+			<param index="2" name="global" type="bool" default="false" />
 			<description>
 				Adds a new checkable item and assigns the specified [Shortcut] to it. Sets the label of the checkbox to the [Shortcut]'s name.
-				An [code]id[/code] can optionally be provided. If no [code]id[/code] is provided, one will be created from the index.
+				An [param id] can optionally be provided. If no [param id] is provided, one will be created from the index.
 				[b]Note:[/b] Checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually. See [method set_item_checked] for more info on how to control it.
 			</description>
 		</method>
 		<method name="add_icon_check_item">
 			<return type="void" />
-			<argument index="0" name="texture" type="Texture2D" />
-			<argument index="1" name="label" type="String" />
-			<argument index="2" name="id" type="int" default="-1" />
-			<argument index="3" name="accel" type="int" enum="Key" default="0" />
+			<param index="0" name="texture" type="Texture2D" />
+			<param index="1" name="label" type="String" />
+			<param index="2" name="id" type="int" default="-1" />
+			<param index="3" name="accel" type="int" enum="Key" default="0" />
 			<description>
-				Adds a new checkable item with text [code]label[/code] and icon [code]texture[/code].
-				An [code]id[/code] can optionally be provided, as well as an accelerator ([code]accel[/code]). If no [code]id[/code] is provided, one will be created from the index. If no [code]accel[/code] is provided then the default [code]0[/code] will be assigned to it. See [method get_item_accelerator] for more info on accelerators.
+				Adds a new checkable item with text [param label] and icon [param texture].
+				An [param id] can optionally be provided, as well as an accelerator ([param accel]). If no [param id] is provided, one will be created from the index. If no [param accel] is provided then the default [code]0[/code] will be assigned to it. See [method get_item_accelerator] for more info on accelerators.
 				[b]Note:[/b] Checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually. See [method set_item_checked] for more info on how to control it.
 			</description>
 		</method>
 		<method name="add_icon_check_shortcut">
 			<return type="void" />
-			<argument index="0" name="texture" type="Texture2D" />
-			<argument index="1" name="shortcut" type="Shortcut" />
-			<argument index="2" name="id" type="int" default="-1" />
-			<argument index="3" name="global" type="bool" default="false" />
+			<param index="0" name="texture" type="Texture2D" />
+			<param index="1" name="shortcut" type="Shortcut" />
+			<param index="2" name="id" type="int" default="-1" />
+			<param index="3" name="global" type="bool" default="false" />
 			<description>
-				Adds a new checkable item and assigns the specified [Shortcut] and icon [code]texture[/code] to it. Sets the label of the checkbox to the [Shortcut]'s name.
-				An [code]id[/code] can optionally be provided. If no [code]id[/code] is provided, one will be created from the index.
+				Adds a new checkable item and assigns the specified [Shortcut] and icon [param texture] to it. Sets the label of the checkbox to the [Shortcut]'s name.
+				An [param id] can optionally be provided. If no [param id] is provided, one will be created from the index.
 				[b]Note:[/b] Checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually. See [method set_item_checked] for more info on how to control it.
 			</description>
 		</method>
 		<method name="add_icon_item">
 			<return type="void" />
-			<argument index="0" name="texture" type="Texture2D" />
-			<argument index="1" name="label" type="String" />
-			<argument index="2" name="id" type="int" default="-1" />
-			<argument index="3" name="accel" type="int" enum="Key" default="0" />
+			<param index="0" name="texture" type="Texture2D" />
+			<param index="1" name="label" type="String" />
+			<param index="2" name="id" type="int" default="-1" />
+			<param index="3" name="accel" type="int" enum="Key" default="0" />
 			<description>
-				Adds a new item with text [code]label[/code] and icon [code]texture[/code].
-				An [code]id[/code] can optionally be provided, as well as an accelerator ([code]accel[/code]). If no [code]id[/code] is provided, one will be created from the index. If no [code]accel[/code] is provided then the default [code]0[/code] will be assigned to it. See [method get_item_accelerator] for more info on accelerators.
+				Adds a new item with text [param label] and icon [param texture].
+				An [param id] can optionally be provided, as well as an accelerator ([param accel]). If no [param id] is provided, one will be created from the index. If no [param accel] is provided then the default [code]0[/code] will be assigned to it. See [method get_item_accelerator] for more info on accelerators.
 			</description>
 		</method>
 		<method name="add_icon_radio_check_item">
 			<return type="void" />
-			<argument index="0" name="texture" type="Texture2D" />
-			<argument index="1" name="label" type="String" />
-			<argument index="2" name="id" type="int" default="-1" />
-			<argument index="3" name="accel" type="int" enum="Key" default="0" />
+			<param index="0" name="texture" type="Texture2D" />
+			<param index="1" name="label" type="String" />
+			<param index="2" name="id" type="int" default="-1" />
+			<param index="3" name="accel" type="int" enum="Key" default="0" />
 			<description>
 				Same as [method add_icon_check_item], but uses a radio check button.
 			</description>
 		</method>
 		<method name="add_icon_radio_check_shortcut">
 			<return type="void" />
-			<argument index="0" name="texture" type="Texture2D" />
-			<argument index="1" name="shortcut" type="Shortcut" />
-			<argument index="2" name="id" type="int" default="-1" />
-			<argument index="3" name="global" type="bool" default="false" />
+			<param index="0" name="texture" type="Texture2D" />
+			<param index="1" name="shortcut" type="Shortcut" />
+			<param index="2" name="id" type="int" default="-1" />
+			<param index="3" name="global" type="bool" default="false" />
 			<description>
 				Same as [method add_icon_check_shortcut], but uses a radio check button.
 			</description>
 		</method>
 		<method name="add_icon_shortcut">
 			<return type="void" />
-			<argument index="0" name="texture" type="Texture2D" />
-			<argument index="1" name="shortcut" type="Shortcut" />
-			<argument index="2" name="id" type="int" default="-1" />
-			<argument index="3" name="global" type="bool" default="false" />
+			<param index="0" name="texture" type="Texture2D" />
+			<param index="1" name="shortcut" type="Shortcut" />
+			<param index="2" name="id" type="int" default="-1" />
+			<param index="3" name="global" type="bool" default="false" />
 			<description>
-				Adds a new item and assigns the specified [Shortcut] and icon [code]texture[/code] to it. Sets the label of the checkbox to the [Shortcut]'s name.
-				An [code]id[/code] can optionally be provided. If no [code]id[/code] is provided, one will be created from the index.
+				Adds a new item and assigns the specified [Shortcut] and icon [param texture] to it. Sets the label of the checkbox to the [Shortcut]'s name.
+				An [param id] can optionally be provided. If no [param id] is provided, one will be created from the index.
 			</description>
 		</method>
 		<method name="add_item">
 			<return type="void" />
-			<argument index="0" name="label" type="String" />
-			<argument index="1" name="id" type="int" default="-1" />
-			<argument index="2" name="accel" type="int" enum="Key" default="0" />
+			<param index="0" name="label" type="String" />
+			<param index="1" name="id" type="int" default="-1" />
+			<param index="2" name="accel" type="int" enum="Key" default="0" />
 			<description>
-				Adds a new item with text [code]label[/code].
-				An [code]id[/code] can optionally be provided, as well as an accelerator ([code]accel[/code]). If no [code]id[/code] is provided, one will be created from the index. If no [code]accel[/code] is provided then the default [code]0[/code] will be assigned to it. See [method get_item_accelerator] for more info on accelerators.
-				[b]Note:[/b] The provided [code]id[/code] is used only in [signal id_pressed] and [signal id_focused] signals. It's not related to the [code]index[/code] arguments in e.g. [method set_item_checked].
+				Adds a new item with text [param label].
+				An [param id] can optionally be provided, as well as an accelerator ([param accel]). If no [param id] is provided, one will be created from the index. If no [param accel] is provided then the default [code]0[/code] will be assigned to it. See [method get_item_accelerator] for more info on accelerators.
+				[b]Note:[/b] The provided [param id] is used only in [signal id_pressed] and [signal id_focused] signals. It's not related to the [code]index[/code] arguments in e.g. [method set_item_checked].
 			</description>
 		</method>
 		<method name="add_multistate_item">
 			<return type="void" />
-			<argument index="0" name="label" type="String" />
-			<argument index="1" name="max_states" type="int" />
-			<argument index="2" name="default_state" type="int" default="0" />
-			<argument index="3" name="id" type="int" default="-1" />
-			<argument index="4" name="accel" type="int" enum="Key" default="0" />
+			<param index="0" name="label" type="String" />
+			<param index="1" name="max_states" type="int" />
+			<param index="2" name="default_state" type="int" default="0" />
+			<param index="3" name="id" type="int" default="-1" />
+			<param index="4" name="accel" type="int" enum="Key" default="0" />
 			<description>
-				Adds a new multistate item with text [code]label[/code].
-				Contrarily to normal binary items, multistate items can have more than two states, as defined by [code]max_states[/code]. Each press or activate of the item will increase the state by one. The default value is defined by [code]default_state[/code].
-				An [code]id[/code] can optionally be provided, as well as an accelerator ([code]accel[/code]). If no [code]id[/code] is provided, one will be created from the index. If no [code]accel[/code] is provided then the default [code]0[/code] will be assigned to it. See [method get_item_accelerator] for more info on accelerators.
+				Adds a new multistate item with text [param label].
+				Contrarily to normal binary items, multistate items can have more than two states, as defined by [param max_states]. Each press or activate of the item will increase the state by one. The default value is defined by [param default_state].
+				An [param id] can optionally be provided, as well as an accelerator ([param accel]). If no [param id] is provided, one will be created from the index. If no [param accel] is provided then the default [code]0[/code] will be assigned to it. See [method get_item_accelerator] for more info on accelerators.
 			</description>
 		</method>
 		<method name="add_radio_check_item">
 			<return type="void" />
-			<argument index="0" name="label" type="String" />
-			<argument index="1" name="id" type="int" default="-1" />
-			<argument index="2" name="accel" type="int" enum="Key" default="0" />
+			<param index="0" name="label" type="String" />
+			<param index="1" name="id" type="int" default="-1" />
+			<param index="2" name="accel" type="int" enum="Key" default="0" />
 			<description>
-				Adds a new radio check button with text [code]label[/code].
-				An [code]id[/code] can optionally be provided, as well as an accelerator ([code]accel[/code]). If no [code]id[/code] is provided, one will be created from the index. If no [code]accel[/code] is provided then the default [code]0[/code] will be assigned to it. See [method get_item_accelerator] for more info on accelerators.
+				Adds a new radio check button with text [param label].
+				An [param id] can optionally be provided, as well as an accelerator ([param accel]). If no [param id] is provided, one will be created from the index. If no [param accel] is provided then the default [code]0[/code] will be assigned to it. See [method get_item_accelerator] for more info on accelerators.
 				[b]Note:[/b] Checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually. See [method set_item_checked] for more info on how to control it.
 			</description>
 		</method>
 		<method name="add_radio_check_shortcut">
 			<return type="void" />
-			<argument index="0" name="shortcut" type="Shortcut" />
-			<argument index="1" name="id" type="int" default="-1" />
-			<argument index="2" name="global" type="bool" default="false" />
+			<param index="0" name="shortcut" type="Shortcut" />
+			<param index="1" name="id" type="int" default="-1" />
+			<param index="2" name="global" type="bool" default="false" />
 			<description>
 				Adds a new radio check button and assigns a [Shortcut] to it. Sets the label of the checkbox to the [Shortcut]'s name.
-				An [code]id[/code] can optionally be provided. If no [code]id[/code] is provided, one will be created from the index.
+				An [param id] can optionally be provided. If no [param id] is provided, one will be created from the index.
 				[b]Note:[/b] Checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually. See [method set_item_checked] for more info on how to control it.
 			</description>
 		</method>
 		<method name="add_separator">
 			<return type="void" />
-			<argument index="0" name="label" type="String" default="&quot;&quot;" />
-			<argument index="1" name="id" type="int" default="-1" />
+			<param index="0" name="label" type="String" default="&quot;&quot;" />
+			<param index="1" name="id" type="int" default="-1" />
 			<description>
-				Adds a separator between items. Separators also occupy an index, which you can set by using the [code]id[/code] parameter.
-				A [code]label[/code] can optionally be provided, which will appear at the center of the separator.
+				Adds a separator between items. Separators also occupy an index, which you can set by using the [param id] parameter.
+				A [param label] can optionally be provided, which will appear at the center of the separator.
 			</description>
 		</method>
 		<method name="add_shortcut">
 			<return type="void" />
-			<argument index="0" name="shortcut" type="Shortcut" />
-			<argument index="1" name="id" type="int" default="-1" />
-			<argument index="2" name="global" type="bool" default="false" />
+			<param index="0" name="shortcut" type="Shortcut" />
+			<param index="1" name="id" type="int" default="-1" />
+			<param index="2" name="global" type="bool" default="false" />
 			<description>
 				Adds a [Shortcut].
-				An [code]id[/code] can optionally be provided. If no [code]id[/code] is provided, one will be created from the index.
+				An [param id] can optionally be provided. If no [param id] is provided, one will be created from the index.
 			</description>
 		</method>
 		<method name="add_submenu_item">
 			<return type="void" />
-			<argument index="0" name="label" type="String" />
-			<argument index="1" name="submenu" type="String" />
-			<argument index="2" name="id" type="int" default="-1" />
+			<param index="0" name="label" type="String" />
+			<param index="1" name="submenu" type="String" />
+			<param index="2" name="id" type="int" default="-1" />
 			<description>
-				Adds an item that will act as a submenu of the parent [PopupMenu] node when clicked. The [code]submenu[/code] argument is the name of the child [PopupMenu] node that will be shown when the item is clicked.
-				An [code]id[/code] can optionally be provided. If no [code]id[/code] is provided, one will be created from the index.
+				Adds an item that will act as a submenu of the parent [PopupMenu] node when clicked. The [param submenu] argument is the name of the child [PopupMenu] node that will be shown when the item is clicked.
+				An [param id] can optionally be provided. If no [param id] is provided, one will be created from the index.
 			</description>
 		</method>
 		<method name="clear">
@@ -190,312 +190,312 @@
 		</method>
 		<method name="get_item_accelerator" qualifiers="const">
 			<return type="int" enum="Key" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the accelerator of the item at the given [code]index[/code]. Accelerators are special combinations of keys that activate the item, no matter which control is focused.
-			</description>
-		</method>
-		<method name="get_item_horizontal_offset" qualifiers="const">
-			<return type="int" />
-			<argument index="0" name="index" type="int" />
-			<description>
-				Returns the horizontal offset of the item at the given [code]index[/code].
+				Returns the accelerator of the item at the given [param index]. Accelerators are special combinations of keys that activate the item, no matter which control is focused.
 			</description>
 		</method>
 		<method name="get_item_icon" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the icon of the item at the given [code]index[/code].
+				Returns the icon of the item at the given [param index].
 			</description>
 		</method>
 		<method name="get_item_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
+			<description>
+				Returns the id of the item at the given [param index]. [code]id[/code] can be manually assigned, while index can not.
+			</description>
+		</method>
+		<method name="get_item_indent" qualifiers="const">
+			<return type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the id of the item at the given [code]index[/code]. [code]id[/code] can be manually assigned, while index can not.
+				Returns the horizontal offset of the item at the given [param index].
 			</description>
 		</method>
 		<method name="get_item_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
-				Returns the index of the item containing the specified [code]id[/code]. Index is automatically assigned to each item by the engine and can not be set manually.
+				Returns the index of the item containing the specified [param id]. Index is automatically assigned to each item by the engine and can not be set manually.
 			</description>
 		</method>
 		<method name="get_item_language" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Returns item's text language code.
 			</description>
 		</method>
 		<method name="get_item_metadata" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Returns the metadata of the specified item, which might be of any type. You can set it with [method set_item_metadata], which provides a simple way of assigning context data to items.
 			</description>
 		</method>
 		<method name="get_item_shortcut" qualifiers="const">
 			<return type="Shortcut" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the [Shortcut] associated with the item at the given [code]index[/code].
+				Returns the [Shortcut] associated with the item at the given [param index].
 			</description>
 		</method>
 		<method name="get_item_submenu" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the submenu name of the item at the given [code]index[/code]. See [method add_submenu_item] for more info on how to add a submenu.
+				Returns the submenu name of the item at the given [param index]. See [method add_submenu_item] for more info on how to add a submenu.
 			</description>
 		</method>
 		<method name="get_item_text" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the text of the item at the given [code]index[/code].
+				Returns the text of the item at the given [param index].
 			</description>
 		</method>
 		<method name="get_item_text_direction" qualifiers="const">
 			<return type="int" enum="Control.TextDirection" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Returns item's text base writing direction.
 			</description>
 		</method>
 		<method name="get_item_tooltip" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the tooltip associated with the item at the given [code]index[/code].
+				Returns the tooltip associated with the item at the given [param index].
 			</description>
 		</method>
 		<method name="is_item_checkable" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns [code]true[/code] if the item at the given [code]index[/code] is checkable in some way, i.e. if it has a checkbox or radio button.
+				Returns [code]true[/code] if the item at the given [param index] is checkable in some way, i.e. if it has a checkbox or radio button.
 				[b]Note:[/b] Checkable items just display a checkmark or radio button, but don't have any built-in checking behavior and must be checked/unchecked manually.
 			</description>
 		</method>
 		<method name="is_item_checked" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns [code]true[/code] if the item at the given [code]index[/code] is checked.
+				Returns [code]true[/code] if the item at the given [param index] is checked.
 			</description>
 		</method>
 		<method name="is_item_disabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns [code]true[/code] if the item at the given [code]index[/code] is disabled. When it is disabled it can't be selected, or its action invoked.
+				Returns [code]true[/code] if the item at the given [param index] is disabled. When it is disabled it can't be selected, or its action invoked.
 				See [method set_item_disabled] for more info on how to disable an item.
 			</description>
 		</method>
 		<method name="is_item_radio_checkable" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns [code]true[/code] if the item at the given [code]index[/code] has radio button-style checkability.
+				Returns [code]true[/code] if the item at the given [param index] has radio button-style checkability.
 				[b]Note:[/b] This is purely cosmetic; you must add the logic for checking/unchecking items in radio groups.
 			</description>
 		</method>
 		<method name="is_item_separator" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Returns [code]true[/code] if the item is a separator. If it is, it will be displayed as a line. See [method add_separator] for more info on how to add a separator.
 			</description>
 		</method>
 		<method name="is_item_shortcut_disabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Returns [code]true[/code] if the specified item's shortcut is disabled.
 			</description>
 		</method>
 		<method name="remove_item">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Removes the item at the given [code]index[/code] from the menu.
+				Removes the item at the given [param index] from the menu.
 				[b]Note:[/b] The indices of items after the removed item will be shifted by one.
 			</description>
 		</method>
 		<method name="scroll_to_item">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Moves the scroll view to make the item at the given [code]index[/code] visible.
+				Moves the scroll view to make the item at the given [param index] visible.
 			</description>
 		</method>
 		<method name="set_current_index">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Sets the currently focused item as the given [code]index[/code].
+				Sets the currently focused item as the given [param index].
 			</description>
 		</method>
 		<method name="set_item_accelerator">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="accel" type="int" enum="Key" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="accel" type="int" enum="Key" />
 			<description>
-				Sets the accelerator of the item at the given [code]index[/code]. Accelerators are special combinations of keys that activate the item, no matter which control is focused.
+				Sets the accelerator of the item at the given [param index]. Accelerators are special combinations of keys that activate the item, no matter which control is focused.
 			</description>
 		</method>
 		<method name="set_item_as_checkable">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="enable" type="bool" />
 			<description>
-				Sets whether the item at the given [code]index[/code] has a checkbox. If [code]false[/code], sets the type of the item to plain text.
+				Sets whether the item at the given [param index] has a checkbox. If [code]false[/code], sets the type of the item to plain text.
 				[b]Note:[/b] Checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually.
 			</description>
 		</method>
 		<method name="set_item_as_radio_checkable">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="enable" type="bool" />
 			<description>
-				Sets the type of the item at the given [code]index[/code] to radio button. If [code]false[/code], sets the type of the item to plain text.
+				Sets the type of the item at the given [param index] to radio button. If [code]false[/code], sets the type of the item to plain text.
 			</description>
 		</method>
 		<method name="set_item_as_separator">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="enable" type="bool" />
 			<description>
-				Mark the item at the given [code]index[/code] as a separator, which means that it would be displayed as a line. If [code]false[/code], sets the type of the item to plain text.
+				Mark the item at the given [param index] as a separator, which means that it would be displayed as a line. If [code]false[/code], sets the type of the item to plain text.
 			</description>
 		</method>
 		<method name="set_item_checked">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="checked" type="bool" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="checked" type="bool" />
 			<description>
-				Sets the checkstate status of the item at the given [code]index[/code].
+				Sets the checkstate status of the item at the given [param index].
 			</description>
 		</method>
 		<method name="set_item_disabled">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="disabled" type="bool" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="disabled" type="bool" />
 			<description>
-				Enables/disables the item at the given [code]index[/code]. When it is disabled, it can't be selected and its action can't be invoked.
+				Enables/disables the item at the given [param index]. When it is disabled, it can't be selected and its action can't be invoked.
 			</description>
 		</method>
-		<method name="set_item_horizontal_offset">
+		<method name="set_item_icon">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="offset" type="int" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="icon" type="Texture2D" />
 			<description>
-				Sets the horizontal offset of the item at the given [code]index[/code].
+				Replaces the [Texture2D] icon of the item at the given [param index].
 			</description>
 		</method>
-		<method name="set_item_icon">
+		<method name="set_item_id">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="icon" type="Texture2D" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="id" type="int" />
 			<description>
-				Replaces the [Texture2D] icon of the item at the given [code]index[/code].
+				Sets the [param id] of the item at the given [param index].
+				The [param id] is used in [signal id_pressed] and [signal id_focused] signals.
 			</description>
 		</method>
-		<method name="set_item_id">
+		<method name="set_item_indent">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="id" type="int" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="indent" type="int" />
 			<description>
-				Sets the [code]id[/code] of the item at the given [code]index[/code].
-				The [code]id[/code] is used in [signal id_pressed] and [signal id_focused] signals.
+				Sets the horizontal offset of the item at the given [param index].
 			</description>
 		</method>
 		<method name="set_item_language">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="language" type="String" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="language" type="String" />
 			<description>
 				Sets language code of item's text used for line-breaking and text shaping algorithms, if left empty current locale is used instead.
 			</description>
 		</method>
 		<method name="set_item_metadata">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="metadata" type="Variant" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="metadata" type="Variant" />
 			<description>
 				Sets the metadata of an item, which may be of any type. You can later get it with [method get_item_metadata], which provides a simple way of assigning context data to items.
 			</description>
 		</method>
 		<method name="set_item_multistate">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="state" type="int" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="state" type="int" />
 			<description>
 				Sets the state of a multistate item. See [method add_multistate_item] for details.
 			</description>
 		</method>
 		<method name="set_item_shortcut">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="shortcut" type="Shortcut" />
-			<argument index="2" name="global" type="bool" default="false" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="shortcut" type="Shortcut" />
+			<param index="2" name="global" type="bool" default="false" />
 			<description>
-				Sets a [Shortcut] for the item at the given [code]index[/code].
+				Sets a [Shortcut] for the item at the given [param index].
 			</description>
 		</method>
 		<method name="set_item_shortcut_disabled">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="disabled" type="bool" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="disabled" type="bool" />
 			<description>
-				Disables the [Shortcut] of the item at the given [code]index[/code].
+				Disables the [Shortcut] of the item at the given [param index].
 			</description>
 		</method>
 		<method name="set_item_submenu">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="submenu" type="String" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="submenu" type="String" />
 			<description>
-				Sets the submenu of the item at the given [code]index[/code]. The submenu is the name of a child [PopupMenu] node that would be shown when the item is clicked.
+				Sets the submenu of the item at the given [param index]. The submenu is the name of a child [PopupMenu] node that would be shown when the item is clicked.
 			</description>
 		</method>
 		<method name="set_item_text">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="text" type="String" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="text" type="String" />
 			<description>
-				Sets the text of the item at the given [code]index[/code].
+				Sets the text of the item at the given [param index].
 			</description>
 		</method>
 		<method name="set_item_text_direction">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="direction" type="int" enum="Control.TextDirection" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="direction" type="int" enum="Control.TextDirection" />
 			<description>
 				Sets item's text base writing direction.
 			</description>
 		</method>
 		<method name="set_item_tooltip">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="tooltip" type="String" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="tooltip" type="String" />
 			<description>
-				Sets the [String] tooltip of the item at the given [code]index[/code].
+				Sets the [String] tooltip of the item at the given [param index].
 			</description>
 		</method>
 		<method name="toggle_item_checked">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Toggles the check state of the item at the given [code]index[/code].
+				Toggles the check state of the item at the given [param index].
 			</description>
 		</method>
 		<method name="toggle_item_multistate">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Cycle to the next state of a multistate item. See [method add_multistate_item] for details.
 			</description>
@@ -523,21 +523,25 @@
 	</members>
 	<signals>
 		<signal name="id_focused">
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
-				Emitted when user navigated to an item of some [code]id[/code] using [code]ui_up[/code] or [code]ui_down[/code] action.
+				Emitted when user navigated to an item of some [param id] using [code]ui_up[/code] or [code]ui_down[/code] action.
 			</description>
 		</signal>
 		<signal name="id_pressed">
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
-				Emitted when an item of some [code]id[/code] is pressed or its accelerator is activated.
+				Emitted when an item of some [param id] is pressed or its accelerator is activated.
 			</description>
 		</signal>
 		<signal name="index_pressed">
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
+			<description>
+				Emitted when an item of some [param index] is pressed or its accelerator is activated.
+			</description>
+		</signal>
+		<signal name="menu_changed">
 			<description>
-				Emitted when an item of some [code]index[/code] is pressed or its accelerator is activated.
 			</description>
 		</signal>
 	</signals>
@@ -566,6 +570,9 @@
 		<theme_item name="h_separation" data_type="constant" type="int" default="4">
 			The horizontal space between the item's elements.
 		</theme_item>
+		<theme_item name="indent" data_type="constant" type="int" default="10">
+			Width of the single indentation level.
+		</theme_item>
 		<theme_item name="item_end_padding" data_type="constant" type="int" default="2">
 		</theme_item>
 		<theme_item name="item_start_padding" data_type="constant" type="int" default="2">
@@ -594,12 +601,21 @@
 		<theme_item name="checked" data_type="icon" type="Texture2D">
 			[Texture2D] icon for the checked checkbox items.
 		</theme_item>
+		<theme_item name="checked_disabled" data_type="icon" type="Texture2D">
+			[Texture2D] icon for the checked checkbox items when they are disabled.
+		</theme_item>
 		<theme_item name="radio_checked" data_type="icon" type="Texture2D">
 			[Texture2D] icon for the checked radio button items.
 		</theme_item>
+		<theme_item name="radio_checked_disabled" data_type="icon" type="Texture2D">
+			[Texture2D] icon for the checked radio button items when they are disabled.
+		</theme_item>
 		<theme_item name="radio_unchecked" data_type="icon" type="Texture2D">
 			[Texture2D] icon for the unchecked radio button items.
 		</theme_item>
+		<theme_item name="radio_unchecked_disabled" data_type="icon" type="Texture2D">
+			[Texture2D] icon for the unchecked radio button items when they are disabled.
+		</theme_item>
 		<theme_item name="submenu" data_type="icon" type="Texture2D">
 			[Texture2D] icon for the submenu arrow (for left-to-right layouts).
 		</theme_item>
@@ -609,6 +625,9 @@
 		<theme_item name="unchecked" data_type="icon" type="Texture2D">
 			[Texture2D] icon for the unchecked checkbox items.
 		</theme_item>
+		<theme_item name="unchecked_disabled" data_type="icon" type="Texture2D">
+			[Texture2D] icon for the unchecked checkbox items when they are disabled.
+		</theme_item>
 		<theme_item name="hover" data_type="style" type="StyleBox">
 			[StyleBox] displayed when the [PopupMenu] item is hovered.
 		</theme_item>
diff --git a/doc/classes/PopupPanel.xml b/doc/classes/PopupPanel.xml
index d850cf20b8..0c6c342f5b 100644
--- a/doc/classes/PopupPanel.xml
+++ b/doc/classes/PopupPanel.xml
@@ -5,6 +5,7 @@
 	</brief_description>
 	<description>
 		Class for displaying popups with a panel background. In some cases it might be simpler to use than [Popup], since it provides a configurable background. If you are making windows, better check [Window].
+		If any [Control] node is added as a child of this [PopupPanel], it will be stretched to fit the panel's size (similar to how [PanelContainer] works).
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/PortableCompressedTexture2D.xml b/doc/classes/PortableCompressedTexture2D.xml
index aad72bbb48..c7e2f2fbdc 100644
--- a/doc/classes/PortableCompressedTexture2D.xml
+++ b/doc/classes/PortableCompressedTexture2D.xml
@@ -15,10 +15,10 @@
 	<methods>
 		<method name="create_from_image">
 			<return type="void" />
-			<argument index="0" name="image" type="Image" />
-			<argument index="1" name="compression_mode" type="int" enum="PortableCompressedTexture2D.CompressionMode" />
-			<argument index="2" name="normal_map" type="bool" default="false" />
-			<argument index="3" name="lossy_quality" type="float" default="0.8" />
+			<param index="0" name="image" type="Image" />
+			<param index="1" name="compression_mode" type="int" enum="PortableCompressedTexture2D.CompressionMode" />
+			<param index="2" name="normal_map" type="bool" default="false" />
+			<param index="3" name="lossy_quality" type="float" default="0.8" />
 			<description>
 				Initializes the compressed texture from a base image. The compression mode must be provided.
 				If this image will be used as a normal map, the "normal map" flag is recommended, to ensure optimum quality.
@@ -45,7 +45,7 @@
 		</method>
 		<method name="set_keep_all_compressed_buffers" qualifiers="static">
 			<return type="void" />
-			<argument index="0" name="keep" type="bool" />
+			<param index="0" name="keep" type="bool" />
 			<description>
 				Overrides the flag globally for all textures of this type. This is used primarily by the editor.
 			</description>
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml
index ae0ec64c27..f72aeff469 100644
--- a/doc/classes/ProjectSettings.xml
+++ b/doc/classes/ProjectSettings.xml
@@ -17,7 +17,7 @@
 	<methods>
 		<method name="add_property_info">
 			<return type="void" />
-			<argument index="0" name="hint" type="Dictionary" />
+			<param index="0" name="hint" type="Dictionary" />
 			<description>
 				Adds a custom property info to a property. The dictionary must contain:
 				- [code]name[/code]: [String] (the property's name)
@@ -55,21 +55,21 @@
 		</method>
 		<method name="clear">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Clears the whole configuration (not recommended, may break things).
 			</description>
 		</method>
 		<method name="get_order" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Returns the order of a configuration value (influences when saved to the config file).
 			</description>
 		</method>
 		<method name="get_setting" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Returns the value of a setting.
 				[b]Example:[/b]
@@ -85,9 +85,9 @@
 		</method>
 		<method name="globalize_path" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
-				Returns the absolute, native OS path corresponding to the localized [code]path[/code] (starting with [code]res://[/code] or [code]user://[/code]). The returned path will vary depending on the operating system and user preferences. See [url=$DOCS_URL/tutorials/io/data_paths.html]File paths in Godot projects[/url] to see what those paths convert to. See also [method localize_path].
+				Returns the absolute, native OS path corresponding to the localized [param path] (starting with [code]res://[/code] or [code]user://[/code]). The returned path will vary depending on the operating system and user preferences. See [url=$DOCS_URL/tutorials/io/data_paths.html]File paths in Godot projects[/url] to see what those paths convert to. See also [method localize_path].
 				[b]Note:[/b] [method globalize_path] with [code]res://[/code] will not work in an exported project. Instead, prepend the executable's base directory to the path when running from an exported project:
 				[codeblock]
 				var path = ""
@@ -106,41 +106,27 @@
 		</method>
 		<method name="has_setting" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Returns [code]true[/code] if a configuration value is present.
 			</description>
 		</method>
 		<method name="load_resource_pack">
 			<return type="bool" />
-			<argument index="0" name="pack" type="String" />
-			<argument index="1" name="replace_files" type="bool" default="true" />
-			<argument index="2" name="offset" type="int" default="0" />
+			<param index="0" name="pack" type="String" />
+			<param index="1" name="replace_files" type="bool" default="true" />
+			<param index="2" name="offset" type="int" default="0" />
 			<description>
-				Loads the contents of the .pck or .zip file specified by [code]pack[/code] into the resource filesystem ([code]res://[/code]). Returns [code]true[/code] on success.
-				[b]Note:[/b] If a file from [code]pack[/code] shares the same path as a file already in the resource filesystem, any attempts to load that file will use the file from [code]pack[/code] unless [code]replace_files[/code] is set to [code]false[/code].
-				[b]Note:[/b] The optional [code]offset[/code] parameter can be used to specify the offset in bytes to the start of the resource pack. This is only supported for .pck files.
+				Loads the contents of the .pck or .zip file specified by [param pack] into the resource filesystem ([code]res://[/code]). Returns [code]true[/code] on success.
+				[b]Note:[/b] If a file from [param pack] shares the same path as a file already in the resource filesystem, any attempts to load that file will use the file from [param pack] unless [param replace_files] is set to [code]false[/code].
+				[b]Note:[/b] The optional [param offset] parameter can be used to specify the offset in bytes to the start of the resource pack. This is only supported for .pck files.
 			</description>
 		</method>
 		<method name="localize_path" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
-				Returns the localized path (starting with [code]res://[/code]) corresponding to the absolute, native OS [code]path[/code]. See also [method globalize_path].
-			</description>
-		</method>
-		<method name="property_can_revert">
-			<return type="bool" />
-			<argument index="0" name="name" type="String" />
-			<description>
-				Returns [code]true[/code] if the specified property exists and its initial value differs from the current value.
-			</description>
-		</method>
-		<method name="property_get_revert">
-			<return type="Variant" />
-			<argument index="0" name="name" type="String" />
-			<description>
-				Returns the specified property's initial value. Returns [code]null[/code] if the property does not exist.
+				Returns the localized path (starting with [code]res://[/code]) corresponding to the absolute, native OS [param path]. See also [method globalize_path].
 			</description>
 		</method>
 		<method name="save">
@@ -152,31 +138,31 @@
 		</method>
 		<method name="save_custom">
 			<return type="int" enum="Error" />
-			<argument index="0" name="file" type="String" />
+			<param index="0" name="file" type="String" />
 			<description>
 				Saves the configuration to a custom file. The file extension must be [code].godot[/code] (to save in text-based [ConfigFile] format) or [code].binary[/code] (to save in binary format). You can also save [code]override.cfg[/code] file, which is also text, but can be used in exported projects unlike other formats.
 			</description>
 		</method>
 		<method name="set_initial_value">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="value" type="Variant" />
 			<description>
 				Sets the specified property's initial value. This is the value the property reverts to.
 			</description>
 		</method>
 		<method name="set_order">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="position" type="int" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="position" type="int" />
 			<description>
 				Sets the order of a configuration value (influences when saved to the config file).
 			</description>
 		</method>
 		<method name="set_setting">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="value" type="Variant" />
 			<description>
 				Sets the value of a setting.
 				[b]Example:[/b]
@@ -292,6 +278,8 @@
 		</member>
 		<member name="audio/driver/driver" type="String" setter="" getter="">
 			Specifies the audio driver to use. This setting is platform-dependent as each platform supports different audio drivers. If left empty, the default audio driver will be used.
+			The [code]Dummy[/code] audio driver disables all audio playback and recording, which is useful for non-game applications as it reduces CPU usage. It also prevents the engine from appearing as an application playing audio in the OS' audio mixer.
+			[b]Note:[/b] The driver in use can be overridden at runtime via the [code]--audio-driver[/code] command line argument.
 		</member>
 		<member name="audio/driver/enable_input" type="bool" setter="" getter="" default="false">
 			If [code]true[/code], microphone input will be allowed. This requires appropriate permissions to be set when exporting to Android or iOS.
@@ -344,7 +332,7 @@
 			Path to logs within the project. Using an [code]user://[/code] path is recommended.
 		</member>
 		<member name="debug/file_logging/max_log_files" type="int" setter="" getter="" default="5">
-			Specifies the maximum amount of log files allowed (used for rotation).
+			Specifies the maximum number of log files allowed (used for rotation).
 		</member>
 		<member name="debug/gdscript/warnings/assert_always_false" type="int" setter="" getter="" default="1">
 			If [code]enabled[/code], prints a warning or an error when an [code]assert[/code] call always returns false.
@@ -466,7 +454,7 @@
 			Maximum call stack allowed for debugging GDScript.
 		</member>
 		<member name="debug/settings/profiler/max_functions" type="int" setter="" getter="" default="16384">
-			Maximum amount of functions per frame allowed when profiling.
+			Maximum number of functions per frame allowed when profiling.
 		</member>
 		<member name="debug/settings/stdout/print_fps" type="bool" setter="" getter="" default="false">
 			Print frames per second to standard output every second.
@@ -549,6 +537,9 @@
 		<member name="display/window/energy_saving/keep_screen_on" type="bool" setter="" getter="" default="true">
 			If [code]true[/code], keeps the screen on (even in case of inactivity), so the screensaver does not take over. Works on desktop and mobile platforms.
 		</member>
+		<member name="display/window/energy_saving/keep_screen_on.editor" type="bool" setter="" getter="" default="false">
+			Editor-only override for [member display/window/energy_saving/keep_screen_on]. Does not affect exported projects in debug or release mode.
+		</member>
 		<member name="display/window/handheld/orientation" type="int" setter="" getter="" default="0">
 			The default screen orientation to use on mobile devices. See [enum DisplayServer.ScreenOrientation] for possible values.
 			[b]Note:[/b] When set to a portrait orientation, this project setting does not flip the project resolution's width and height automatically. Instead, you have to set [member display/window/size/viewport_width] and [member display/window/size/viewport_height] accordingly.
@@ -573,22 +564,22 @@
 			Allows the window to be resizable by default.
 			[b]Note:[/b] This setting is ignored on iOS.
 		</member>
-		<member name="display/window/size/viewport_height" type="int" setter="" getter="" default="600">
-			Sets the game's main viewport height. On desktop platforms, this is also the initial window height.
+		<member name="display/window/size/viewport_height" type="int" setter="" getter="" default="648">
+			Sets the game's main viewport height. On desktop platforms, this is also the initial window height, represented by an indigo-colored rectangle in the 2D editor. Stretch mode settings also use this as a reference when using the [code]canvas_items[/code] or [code]viewport[/code] stretch modes. See also [member display/window/size/viewport_width], [member display/window/size/window_width_override] and [member display/window/size/window_height_override].
 		</member>
-		<member name="display/window/size/viewport_width" type="int" setter="" getter="" default="1024">
-			Sets the game's main viewport width. On desktop platforms, this is also the initial window width.
+		<member name="display/window/size/viewport_width" type="int" setter="" getter="" default="1152">
+			Sets the game's main viewport width. On desktop platforms, this is also the initial window width, represented by an indigo-colored rectangle in the 2D editor. Stretch mode settings also use this as a reference when using the [code]canvas_items[/code] or [code]viewport[/code] stretch modes. See also [member display/window/size/viewport_height], [member display/window/size/window_width_override] and [member display/window/size/window_height_override].
 		</member>
 		<member name="display/window/size/window_height_override" type="int" setter="" getter="" default="0">
-			On desktop platforms, sets the game's initial window height.
-			[b]Note:[/b] By default, or when set to 0, the initial window height is the [member display/window/size/viewport_height]. This setting is ignored on iOS, Android, and HTML5.
+			On desktop platforms, overrides the game's initial window height. See also [member display/window/size/window_width_override], [member display/window/size/viewport_width] and [member display/window/size/viewport_height].
+			[b]Note:[/b] By default, or when set to [code]0[/code], the initial window height is the [member display/window/size/viewport_height]. This setting is ignored on iOS, Android, and HTML5.
 		</member>
 		<member name="display/window/size/window_width_override" type="int" setter="" getter="" default="0">
-			On desktop platforms, sets the game's initial window width.
-			[b]Note:[/b] By default, or when set to 0, the initial window width is the viewport [member display/window/size/viewport_width]. This setting is ignored on iOS, Android, and HTML5.
+			On desktop platforms, overrides the game's initial window width. See also [member display/window/size/window_height_override], [member display/window/size/viewport_width] and [member display/window/size/viewport_height].
+			[b]Note:[/b] By default, or when set to [code]0[/code], the initial window width is the viewport [member display/window/size/viewport_width]. This setting is ignored on iOS, Android, and HTML5.
 		</member>
 		<member name="display/window/vsync/vsync_mode" type="int" setter="" getter="" default="1">
-			Sets the VSync mode for the main game window.
+			Sets the V-Sync mode for the main game window.
 			See [enum DisplayServer.VSyncMode] for possible values and how they affect the behavior of your application.
 			Depending on the platform and used renderer, the engine will fall back to [code]Enabled[/code], if the desired mode is not supported.
 		</member>
@@ -864,6 +855,7 @@
 		</member>
 		<member name="input_devices/pen_tablet/driver" type="String" setter="" getter="">
 			Specifies the tablet driver to use. If left empty, the default driver will be used.
+			[b]Note:[/b] The driver in use can be overridden at runtime via the [code]--tablet-driver[/code] command line argument.
 		</member>
 		<member name="input_devices/pen_tablet/driver.windows" type="String" setter="" getter="">
 			Override for [member input_devices/pen_tablet/driver] on Windows.
@@ -927,6 +919,9 @@
 		</member>
 		<member name="internationalization/rendering/text_driver" type="String" setter="" getter="" default="&quot;&quot;">
 			Specifies the [TextServer] to use. If left empty, the default will be used.
+			"ICU / HarfBuzz / Graphite" is the most advanced text driver, supporting right-to-left typesetting and complex scripts (for languages like Arabic, Hebrew, etc). The "Fallback" text driver does not support right-to-left typesetting and complex scripts.
+			[b]Note:[/b] The driver in use can be overridden at runtime via the [code]--text-driver[/code] command line argument.
+			[b]Note:[/b] There is an additional [code]Dummy[/code] text driver available, which disables all text rendering and font-related functionality. This driver is not listed in the project settings, but it can be enabled when running the editor or project using the [code]--text-driver Dummy[/code] command line argument.
 		</member>
 		<member name="layer_names/2d_navigation/layer_1" type="String" setter="" getter="" default="&quot;&quot;">
 			Optional name for the 2D navigation layer 1. If left empty, the layer will display as "Layer 1".
@@ -1465,13 +1460,13 @@
 			Default edge connection margin for 3D navigation maps. See [method NavigationServer3D.map_set_edge_connection_margin].
 		</member>
 		<member name="network/limits/debugger/max_chars_per_second" type="int" setter="" getter="" default="32768">
-			Maximum amount of characters allowed to send as output from the debugger. Over this value, content is dropped. This helps not to stall the debugger connection.
+			Maximum number of characters allowed to send as output from the debugger. Over this value, content is dropped. This helps not to stall the debugger connection.
 		</member>
 		<member name="network/limits/debugger/max_errors_per_second" type="int" setter="" getter="" default="400">
 			Maximum number of errors allowed to be sent from the debugger. Over this value, content is dropped. This helps not to stall the debugger connection.
 		</member>
 		<member name="network/limits/debugger/max_queued_messages" type="int" setter="" getter="" default="2048">
-			Maximum amount of messages in the debugger queue. Over this value, content is dropped. This helps to limit the debugger memory usage.
+			Maximum number of messages in the debugger queue. Over this value, content is dropped. This helps to limit the debugger memory usage.
 		</member>
 		<member name="network/limits/debugger/max_warnings_per_second" type="int" setter="" getter="" default="400">
 			Maximum number of warnings allowed to be sent from the debugger. Over this value, content is dropped. This helps not to stall the debugger connection.
@@ -1562,7 +1557,7 @@
 			Individual shapes can have a specific bias value (see [member Shape2D.custom_solver_bias]).
 		</member>
 		<member name="physics/2d/solver/solver_iterations" type="int" setter="" getter="" default="16">
-			Number of solver iterations for all contacts and constraints. The greater the amount of iterations, the more accurate the collisions will be. However, a greater amount of iterations requires more CPU power, which can decrease performance. See [constant PhysicsServer2D.SPACE_PARAM_SOLVER_ITERATIONS].
+			Number of solver iterations for all contacts and constraints. The greater the number of iterations, the more accurate the collisions will be. However, a greater number of iterations requires more CPU power, which can decrease performance. See [constant PhysicsServer2D.SPACE_PARAM_SOLVER_ITERATIONS].
 		</member>
 		<member name="physics/2d/time_before_sleep" type="float" setter="" getter="" default="0.5">
 			Time (in seconds) of inactivity before which a 2D physics body will put to sleep. See [constant PhysicsServer2D.SPACE_PARAM_BODY_TIME_TO_SLEEP].
@@ -1630,7 +1625,7 @@
 			Individual shapes can have a specific bias value (see [member Shape3D.custom_solver_bias]).
 		</member>
 		<member name="physics/3d/solver/solver_iterations" type="int" setter="" getter="" default="16">
-			Number of solver iterations for all contacts and constraints. The greater the amount of iterations, the more accurate the collisions will be. However, a greater amount of iterations requires more CPU power, which can decrease performance. See [constant PhysicsServer3D.SPACE_PARAM_SOLVER_ITERATIONS].
+			Number of solver iterations for all contacts and constraints. The greater the number of iterations, the more accurate the collisions will be. However, a greater number of iterations requires more CPU power, which can decrease performance. See [constant PhysicsServer3D.SPACE_PARAM_SOLVER_ITERATIONS].
 		</member>
 		<member name="physics/3d/time_before_sleep" type="float" setter="" getter="" default="0.5">
 			Time (in seconds) of inactivity before which a 3D physics body will put to sleep. See [constant PhysicsServer3D.SPACE_PARAM_BODY_TIME_TO_SLEEP].
@@ -1833,7 +1828,7 @@
 			Max number of omnilights and spotlights renderable per object. At the default value of 8, this means that each surface can be affected by up to 8 omnilights and 8 spotlights. This is further limited by hardware support and [member rendering/limits/opengl/max_renderable_lights]. Setting this low will slightly reduce memory usage, may decrease shader compile times, and may result in faster rendering on low-end, mobile, or web devices.
 		</member>
 		<member name="rendering/limits/opengl/max_renderable_elements" type="int" setter="" getter="" default="65536">
-			Max amount of elements renderable in a frame. If more elements than this are visible per frame, they will not be drawn. Keep in mind elements refer to mesh surfaces and not meshes themselves. Setting this low will slightly reduce memory usage and may decrease shader compile times, particularly on web. For most uses, the default value is suitable, but consider lowering as much as possible on web export.
+			Max number of elements renderable in a frame. If more elements than this are visible per frame, they will not be drawn. Keep in mind elements refer to mesh surfaces and not meshes themselves. Setting this low will slightly reduce memory usage and may decrease shader compile times, particularly on web. For most uses, the default value is suitable, but consider lowering as much as possible on web export.
 		</member>
 		<member name="rendering/limits/opengl/max_renderable_lights" type="int" setter="" getter="" default="32">
 			Max number of positional lights renderable in a frame. If more lights than this number are used, they will be ignored. Setting this low will slightly reduce memory usage and may decrease shader compile times, particularly on web. For most uses, the default value is suitable, but consider lowering as much as possible on web export.
@@ -1971,7 +1966,7 @@
 		</member>
 		<member name="rendering/textures/default_filters/texture_mipmap_bias" type="float" setter="" getter="" default="0.0">
 			Affects the final texture sharpness by reading from a lower or higher mipmap (also called "texture LOD bias"). Negative values make mipmapped textures sharper but grainier when viewed at a distance, while positive values make mipmapped textures blurrier (even when up close). To get sharper textures at a distance without introducing too much graininess, set this between [code]-0.75[/code] and [code]0.0[/code]. Enabling temporal antialiasing ([member rendering/anti_aliasing/quality/use_taa]) can help reduce the graininess visible when using negative mipmap bias.
-			[b]Note:[/b] When the 3D scaling mode is set to FSR 1.0, this value is used to adjust the automatic mipmap bias which is calculated internally based on the scale factor. The formula for this is [code]-log2(1.0 / scale) + mipmap_bias[/code].
+			[b]Note:[/b] If [member rendering/scaling_3d/scale] is lower than [code]1.0[/code] (exclusive), [member rendering/textures/default_filters/texture_mipmap_bias] is used to adjust the automatic mipmap bias which is calculated internally based on the scale factor. The formula for this is [code]log2(scaling_3d_scale) + mipmap_bias[/code].
 			[b]Note:[/b] This property is only read when the project starts. To change the mipmap LOD bias at run-time, set [member Viewport.texture_mipmap_bias] instead.
 		</member>
 		<member name="rendering/textures/default_filters/use_nearest_mipmap_filter" type="bool" setter="" getter="" default="false">
diff --git a/doc/classes/Projection.xml b/doc/classes/Projection.xml
index 2bbfd04e9e..b8f6e54d87 100644
--- a/doc/classes/Projection.xml
+++ b/doc/classes/Projection.xml
@@ -14,13 +14,13 @@
 		</constructor>
 		<constructor name="Projection">
 			<return type="Projection" />
-			<argument index="0" name="from" type="Projection" />
+			<param index="0" name="from" type="Projection" />
 			<description>
 			</description>
 		</constructor>
 		<constructor name="Projection">
 			<return type="Projection" />
-			<argument index="0" name="from" type="Transform3D" />
+			<param index="0" name="from" type="Transform3D" />
 			<description>
 			</description>
 		</constructor>
@@ -28,98 +28,98 @@
 	<methods>
 		<method name="create_depth_correction" qualifiers="static">
 			<return type="Projection" />
-			<argument index="0" name="flip_y" type="bool" />
+			<param index="0" name="flip_y" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="create_fit_aabb" qualifiers="static">
 			<return type="Projection" />
-			<argument index="0" name="aabb" type="AABB" />
+			<param index="0" name="aabb" type="AABB" />
 			<description>
 			</description>
 		</method>
 		<method name="create_for_hmd" qualifiers="static">
 			<return type="Projection" />
-			<argument index="0" name="eye" type="int" />
-			<argument index="1" name="aspect" type="float" />
-			<argument index="2" name="intraocular_dist" type="float" />
-			<argument index="3" name="display_width" type="float" />
-			<argument index="4" name="display_to_lens" type="float" />
-			<argument index="5" name="oversample" type="float" />
-			<argument index="6" name="z_near" type="float" />
-			<argument index="7" name="z_far" type="float" />
+			<param index="0" name="eye" type="int" />
+			<param index="1" name="aspect" type="float" />
+			<param index="2" name="intraocular_dist" type="float" />
+			<param index="3" name="display_width" type="float" />
+			<param index="4" name="display_to_lens" type="float" />
+			<param index="5" name="oversample" type="float" />
+			<param index="6" name="z_near" type="float" />
+			<param index="7" name="z_far" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="create_frustum" qualifiers="static">
 			<return type="Projection" />
-			<argument index="0" name="left" type="float" />
-			<argument index="1" name="right" type="float" />
-			<argument index="2" name="bottom" type="float" />
-			<argument index="3" name="top" type="float" />
-			<argument index="4" name="z_near" type="float" />
-			<argument index="5" name="z_far" type="float" />
+			<param index="0" name="left" type="float" />
+			<param index="1" name="right" type="float" />
+			<param index="2" name="bottom" type="float" />
+			<param index="3" name="top" type="float" />
+			<param index="4" name="z_near" type="float" />
+			<param index="5" name="z_far" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="create_frustum_aspect" qualifiers="static">
 			<return type="Projection" />
-			<argument index="0" name="size" type="float" />
-			<argument index="1" name="aspect" type="float" />
-			<argument index="2" name="offset" type="Vector2" />
-			<argument index="3" name="z_near" type="float" />
-			<argument index="4" name="z_far" type="float" />
-			<argument index="5" name="flip_fov" type="bool" default="false" />
+			<param index="0" name="size" type="float" />
+			<param index="1" name="aspect" type="float" />
+			<param index="2" name="offset" type="Vector2" />
+			<param index="3" name="z_near" type="float" />
+			<param index="4" name="z_far" type="float" />
+			<param index="5" name="flip_fov" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
 		<method name="create_light_atlas_rect" qualifiers="static">
 			<return type="Projection" />
-			<argument index="0" name="rect" type="Rect2" />
+			<param index="0" name="rect" type="Rect2" />
 			<description>
 			</description>
 		</method>
 		<method name="create_orthogonal" qualifiers="static">
 			<return type="Projection" />
-			<argument index="0" name="left" type="float" />
-			<argument index="1" name="right" type="float" />
-			<argument index="2" name="bottom" type="float" />
-			<argument index="3" name="top" type="float" />
-			<argument index="4" name="z_near" type="float" />
-			<argument index="5" name="z_far" type="float" />
+			<param index="0" name="left" type="float" />
+			<param index="1" name="right" type="float" />
+			<param index="2" name="bottom" type="float" />
+			<param index="3" name="top" type="float" />
+			<param index="4" name="z_near" type="float" />
+			<param index="5" name="z_far" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="create_orthogonal_aspect" qualifiers="static">
 			<return type="Projection" />
-			<argument index="0" name="size" type="float" />
-			<argument index="1" name="aspect" type="float" />
-			<argument index="2" name="z_near" type="float" />
-			<argument index="3" name="z_far" type="float" />
-			<argument index="4" name="flip_fov" type="bool" default="false" />
+			<param index="0" name="size" type="float" />
+			<param index="1" name="aspect" type="float" />
+			<param index="2" name="z_near" type="float" />
+			<param index="3" name="z_far" type="float" />
+			<param index="4" name="flip_fov" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
 		<method name="create_perspective" qualifiers="static">
 			<return type="Projection" />
-			<argument index="0" name="fovy" type="float" />
-			<argument index="1" name="aspect" type="float" />
-			<argument index="2" name="z_near" type="float" />
-			<argument index="3" name="z_far" type="float" />
-			<argument index="4" name="flip_fov" type="bool" default="false" />
+			<param index="0" name="fovy" type="float" />
+			<param index="1" name="aspect" type="float" />
+			<param index="2" name="z_near" type="float" />
+			<param index="3" name="z_far" type="float" />
+			<param index="4" name="flip_fov" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
 		<method name="create_perspective_hmd" qualifiers="static">
 			<return type="Projection" />
-			<argument index="0" name="fovy" type="float" />
-			<argument index="1" name="aspect" type="float" />
-			<argument index="2" name="z_near" type="float" />
-			<argument index="3" name="z_far" type="float" />
-			<argument index="4" name="flip_fov" type="bool" />
-			<argument index="5" name="eye" type="int" />
-			<argument index="6" name="intraocular_dist" type="float" />
-			<argument index="7" name=" convergence_dist" type="float" />
+			<param index="0" name="fovy" type="float" />
+			<param index="1" name="aspect" type="float" />
+			<param index="2" name="z_near" type="float" />
+			<param index="3" name="z_far" type="float" />
+			<param index="4" name="flip_fov" type="bool" />
+			<param index="5" name="eye" type="int" />
+			<param index="6" name="intraocular_dist" type="float" />
+			<param index="7" name=" convergence_dist" type="float" />
 			<description>
 			</description>
 		</method>
@@ -150,8 +150,8 @@
 		</method>
 		<method name="get_fovy" qualifiers="static">
 			<return type="float" />
-			<argument index="0" name="fovx" type="float" />
-			<argument index="1" name="aspect" type="float" />
+			<param index="0" name="fovx" type="float" />
+			<param index="1" name="aspect" type="float" />
 			<description>
 			</description>
 		</method>
@@ -162,13 +162,13 @@
 		</method>
 		<method name="get_pixels_per_meter" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="for_pixel_width" type="int" />
+			<param index="0" name="for_pixel_width" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_projection_plane" qualifiers="const">
 			<return type="Plane" />
-			<argument index="0" name="plane" type="int" />
+			<param index="0" name="plane" type="int" />
 			<description>
 			</description>
 		</method>
@@ -199,13 +199,13 @@
 		</method>
 		<method name="jitter_offseted" qualifiers="const">
 			<return type="Projection" />
-			<argument index="0" name="offset" type="Vector2" />
+			<param index="0" name="offset" type="Vector2" />
 			<description>
 			</description>
 		</method>
 		<method name="perspective_znear_adjusted" qualifiers="const">
 			<return type="Projection" />
-			<argument index="0" name="new_znear" type="float" />
+			<param index="0" name="new_znear" type="float" />
 			<description>
 			</description>
 		</method>
@@ -241,31 +241,31 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Projection" />
+			<param index="0" name="right" type="Projection" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Projection" />
-			<argument index="0" name="right" type="Projection" />
+			<param index="0" name="right" type="Projection" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector4" />
-			<argument index="0" name="right" type="Vector4" />
+			<param index="0" name="right" type="Vector4" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="Projection" />
+			<param index="0" name="right" type="Projection" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator []">
 			<return type="Vector4" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</operator>
diff --git a/doc/classes/PropertyTweener.xml b/doc/classes/PropertyTweener.xml
index e0fbeec7c1..75d9c919aa 100644
--- a/doc/classes/PropertyTweener.xml
+++ b/doc/classes/PropertyTweener.xml
@@ -22,7 +22,7 @@
 		</method>
 		<method name="from">
 			<return type="PropertyTweener" />
-			<argument index="0" name="value" type="Variant" />
+			<param index="0" name="value" type="Variant" />
 			<description>
 				Sets a custom initial value to the [PropertyTweener]. Example:
 				[codeblock]
@@ -43,21 +43,21 @@
 		</method>
 		<method name="set_delay">
 			<return type="PropertyTweener" />
-			<argument index="0" name="delay" type="float" />
+			<param index="0" name="delay" type="float" />
 			<description>
 				Sets the time in seconds after which the [PropertyTweener] will start interpolating. By default there's no delay.
 			</description>
 		</method>
 		<method name="set_ease">
 			<return type="PropertyTweener" />
-			<argument index="0" name="ease" type="int" enum="Tween.EaseType" />
+			<param index="0" name="ease" type="int" enum="Tween.EaseType" />
 			<description>
 				Sets the type of used easing from [enum Tween.EaseType]. If not set, the default easing is used from the [Tween] that contains this Tweener.
 			</description>
 		</method>
 		<method name="set_trans">
 			<return type="PropertyTweener" />
-			<argument index="0" name="trans" type="int" enum="Tween.TransitionType" />
+			<param index="0" name="trans" type="int" enum="Tween.TransitionType" />
 			<description>
 				Sets the type of used transition from [enum Tween.TransitionType]. If not set, the default transition is used from the [Tween] that contains this Tweener.
 			</description>
diff --git a/doc/classes/ProxyTexture.xml b/doc/classes/ProxyTexture.xml
deleted file mode 100644
index 778e3f3f69..0000000000
--- a/doc/classes/ProxyTexture.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="ProxyTexture" inherits="Texture2D" version="4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
-	<brief_description>
-	</brief_description>
-	<description>
-	</description>
-	<tutorials>
-	</tutorials>
-	<members>
-		<member name="base" type="Texture2D" setter="set_base" getter="get_base">
-		</member>
-	</members>
-</class>
diff --git a/doc/classes/Quaternion.xml b/doc/classes/Quaternion.xml
index 30e96607da..bc0ffbefe2 100644
--- a/doc/classes/Quaternion.xml
+++ b/doc/classes/Quaternion.xml
@@ -21,45 +21,45 @@
 		</constructor>
 		<constructor name="Quaternion">
 			<return type="Quaternion" />
-			<argument index="0" name="from" type="Quaternion" />
+			<param index="0" name="from" type="Quaternion" />
 			<description>
 				Constructs a [Quaternion] as a copy of the given [Quaternion].
 			</description>
 		</constructor>
 		<constructor name="Quaternion">
 			<return type="Quaternion" />
-			<argument index="0" name="arc_from" type="Vector3" />
-			<argument index="1" name="arc_to" type="Vector3" />
+			<param index="0" name="arc_from" type="Vector3" />
+			<param index="1" name="arc_to" type="Vector3" />
 			<description>
 			</description>
 		</constructor>
 		<constructor name="Quaternion">
 			<return type="Quaternion" />
-			<argument index="0" name="axis" type="Vector3" />
-			<argument index="1" name="angle" type="float" />
+			<param index="0" name="axis" type="Vector3" />
+			<param index="1" name="angle" type="float" />
 			<description>
 				Constructs a quaternion that will rotate around the given axis by the specified angle. The axis must be a normalized vector.
 			</description>
 		</constructor>
 		<constructor name="Quaternion">
 			<return type="Quaternion" />
-			<argument index="0" name="euler_yxz" type="Vector3" />
+			<param index="0" name="euler_yxz" type="Vector3" />
 			<description>
 			</description>
 		</constructor>
 		<constructor name="Quaternion">
 			<return type="Quaternion" />
-			<argument index="0" name="from" type="Basis" />
+			<param index="0" name="from" type="Basis" />
 			<description>
 				Constructs a quaternion from the given [Basis].
 			</description>
 		</constructor>
 		<constructor name="Quaternion">
 			<return type="Quaternion" />
-			<argument index="0" name="x" type="float" />
-			<argument index="1" name="y" type="float" />
-			<argument index="2" name="z" type="float" />
-			<argument index="3" name="w" type="float" />
+			<param index="0" name="x" type="float" />
+			<param index="1" name="y" type="float" />
+			<param index="2" name="z" type="float" />
+			<param index="3" name="w" type="float" />
 			<description>
 				Constructs a quaternion defined by the given values.
 			</description>
@@ -68,15 +68,15 @@
 	<methods>
 		<method name="angle_to" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="to" type="Quaternion" />
+			<param index="0" name="to" type="Quaternion" />
 			<description>
-				Returns the angle between this quaternion and [code]to[/code]. This is the magnitude of the angle you would need to rotate by to get from one to the other.
-				[b]Note:[/b] This method has an abnormally high amount of floating-point error, so methods such as [code]is_zero_approx[/code] will not work reliably.
+				Returns the angle between this quaternion and [param to]. This is the magnitude of the angle you would need to rotate by to get from one to the other.
+				[b]Note:[/b] This method has an abnormally high number of floating-point errors, so methods such as [code]is_zero_approx[/code] will not work reliably.
 			</description>
 		</method>
 		<method name="dot" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="with" type="Quaternion" />
+			<param index="0" name="with" type="Quaternion" />
 			<description>
 				Returns the dot product of two quaternions.
 			</description>
@@ -110,9 +110,9 @@
 		</method>
 		<method name="is_equal_approx" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="to" type="Quaternion" />
+			<param index="0" name="to" type="Quaternion" />
 			<description>
-				Returns [code]true[/code] if this quaternion and [code]quat[/code] are approximately equal, by running [method @GlobalScope.is_equal_approx] on each component.
+				Returns [code]true[/code] if this quaternion and [param to] are approximately equal, by running [method @GlobalScope.is_equal_approx] on each component.
 			</description>
 		</method>
 		<method name="is_normalized" qualifiers="const">
@@ -146,29 +146,29 @@
 		</method>
 		<method name="slerp" qualifiers="const">
 			<return type="Quaternion" />
-			<argument index="0" name="to" type="Quaternion" />
-			<argument index="1" name="weight" type="float" />
+			<param index="0" name="to" type="Quaternion" />
+			<param index="1" name="weight" type="float" />
 			<description>
-				Returns the result of the spherical linear interpolation between this quaternion and [code]to[/code] by amount [code]weight[/code].
+				Returns the result of the spherical linear interpolation between this quaternion and [param to] by amount [param weight].
 				[b]Note:[/b] Both quaternions must be normalized.
 			</description>
 		</method>
 		<method name="slerpni" qualifiers="const">
 			<return type="Quaternion" />
-			<argument index="0" name="to" type="Quaternion" />
-			<argument index="1" name="weight" type="float" />
+			<param index="0" name="to" type="Quaternion" />
+			<param index="1" name="weight" type="float" />
 			<description>
-				Returns the result of the spherical linear interpolation between this quaternion and [code]to[/code] by amount [code]weight[/code], but without checking if the rotation path is not bigger than 90 degrees.
+				Returns the result of the spherical linear interpolation between this quaternion and [param to] by amount [param weight], but without checking if the rotation path is not bigger than 90 degrees.
 			</description>
 		</method>
 		<method name="spherical_cubic_interpolate" qualifiers="const">
 			<return type="Quaternion" />
-			<argument index="0" name="b" type="Quaternion" />
-			<argument index="1" name="pre_a" type="Quaternion" />
-			<argument index="2" name="post_b" type="Quaternion" />
-			<argument index="3" name="weight" type="float" />
+			<param index="0" name="b" type="Quaternion" />
+			<param index="1" name="pre_a" type="Quaternion" />
+			<param index="2" name="post_b" type="Quaternion" />
+			<param index="3" name="weight" type="float" />
 			<description>
-				Performs a spherical cubic interpolation between quaternions [code]pre_a[/code], this vector, [code]b[/code], and [code]post_b[/code], by the given amount [code]weight[/code].
+				Performs a spherical cubic interpolation between quaternions [param pre_a], this vector, [param b], and [param post_b], by the given amount [param weight].
 			</description>
 		</method>
 	</methods>
@@ -198,7 +198,7 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Quaternion" />
+			<param index="0" name="right" type="Quaternion" />
 			<description>
 				Returns [code]true[/code] if the quaternions are not equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
@@ -206,63 +206,63 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Quaternion" />
-			<argument index="0" name="right" type="Quaternion" />
+			<param index="0" name="right" type="Quaternion" />
 			<description>
 				Composes these two quaternions by multiplying them together. This has the effect of rotating the second quaternion (the child) by the first quaternion (the parent).
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector3" />
-			<argument index="0" name="right" type="Vector3" />
+			<param index="0" name="right" type="Vector3" />
 			<description>
 				Rotates (multiplies) the [Vector3] by the given [Quaternion].
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Quaternion" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Multiplies each component of the [Quaternion] by the given value. This operation is not meaningful on its own, but it can be used as a part of a larger expression.
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Quaternion" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Multiplies each component of the [Quaternion] by the given value. This operation is not meaningful on its own, but it can be used as a part of a larger expression.
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="Quaternion" />
-			<argument index="0" name="right" type="Quaternion" />
+			<param index="0" name="right" type="Quaternion" />
 			<description>
 				Adds each component of the left [Quaternion] to the right [Quaternion]. This operation is not meaningful on its own, but it can be used as a part of a larger expression, such as approximating an intermediate rotation between two nearby rotations.
 			</description>
 		</operator>
 		<operator name="operator -">
 			<return type="Quaternion" />
-			<argument index="0" name="right" type="Quaternion" />
+			<param index="0" name="right" type="Quaternion" />
 			<description>
 				Subtracts each component of the left [Quaternion] by the right [Quaternion]. This operation is not meaningful on its own, but it can be used as a part of a larger expression.
 			</description>
 		</operator>
 		<operator name="operator /">
 			<return type="Quaternion" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Divides each component of the [Quaternion] by the given value. This operation is not meaningful on its own, but it can be used as a part of a larger expression.
 			</description>
 		</operator>
 		<operator name="operator /">
 			<return type="Quaternion" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Divides each component of the [Quaternion] by the given value. This operation is not meaningful on its own, but it can be used as a part of a larger expression.
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="Quaternion" />
+			<param index="0" name="right" type="Quaternion" />
 			<description>
 				Returns [code]true[/code] if the quaternions are exactly equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
@@ -270,7 +270,7 @@
 		</operator>
 		<operator name="operator []">
 			<return type="float" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Access quaternion components using their index. [code]q[0][/code] is equivalent to [code]q.x[/code], [code]q[1][/code] is equivalent to [code]q.y[/code], [code]q[2][/code] is equivalent to [code]q.z[/code], and [code]q[3][/code] is equivalent to [code]q.w[/code].
 			</description>
diff --git a/doc/classes/RDShaderFile.xml b/doc/classes/RDShaderFile.xml
index e719337f22..72bf6faaec 100644
--- a/doc/classes/RDShaderFile.xml
+++ b/doc/classes/RDShaderFile.xml
@@ -9,7 +9,7 @@
 	<methods>
 		<method name="get_spirv" qualifiers="const">
 			<return type="RDShaderSPIRV" />
-			<argument index="0" name="version" type="StringName" default="&amp;&quot;&quot;" />
+			<param index="0" name="version" type="StringName" default="&amp;&quot;&quot;" />
 			<description>
 			</description>
 		</method>
@@ -20,8 +20,8 @@
 		</method>
 		<method name="set_bytecode">
 			<return type="void" />
-			<argument index="0" name="bytecode" type="RDShaderSPIRV" />
-			<argument index="1" name="version" type="StringName" default="&amp;&quot;&quot;" />
+			<param index="0" name="bytecode" type="RDShaderSPIRV" />
+			<param index="1" name="version" type="StringName" default="&amp;&quot;&quot;" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/RDShaderSPIRV.xml b/doc/classes/RDShaderSPIRV.xml
index 4453d7eb27..13dc2c6519 100644
--- a/doc/classes/RDShaderSPIRV.xml
+++ b/doc/classes/RDShaderSPIRV.xml
@@ -9,27 +9,27 @@
 	<methods>
 		<method name="get_stage_bytecode" qualifiers="const">
 			<return type="PackedByteArray" />
-			<argument index="0" name="stage" type="int" enum="RenderingDevice.ShaderStage" />
+			<param index="0" name="stage" type="int" enum="RenderingDevice.ShaderStage" />
 			<description>
 			</description>
 		</method>
 		<method name="get_stage_compile_error" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="stage" type="int" enum="RenderingDevice.ShaderStage" />
+			<param index="0" name="stage" type="int" enum="RenderingDevice.ShaderStage" />
 			<description>
 			</description>
 		</method>
 		<method name="set_stage_bytecode">
 			<return type="void" />
-			<argument index="0" name="stage" type="int" enum="RenderingDevice.ShaderStage" />
-			<argument index="1" name="bytecode" type="PackedByteArray" />
+			<param index="0" name="stage" type="int" enum="RenderingDevice.ShaderStage" />
+			<param index="1" name="bytecode" type="PackedByteArray" />
 			<description>
 			</description>
 		</method>
 		<method name="set_stage_compile_error">
 			<return type="void" />
-			<argument index="0" name="stage" type="int" enum="RenderingDevice.ShaderStage" />
-			<argument index="1" name="compile_error" type="String" />
+			<param index="0" name="stage" type="int" enum="RenderingDevice.ShaderStage" />
+			<param index="1" name="compile_error" type="String" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/RDShaderSource.xml b/doc/classes/RDShaderSource.xml
index 4c3c21bcb9..ddeae95e39 100644
--- a/doc/classes/RDShaderSource.xml
+++ b/doc/classes/RDShaderSource.xml
@@ -9,14 +9,14 @@
 	<methods>
 		<method name="get_stage_source" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="stage" type="int" enum="RenderingDevice.ShaderStage" />
+			<param index="0" name="stage" type="int" enum="RenderingDevice.ShaderStage" />
 			<description>
 			</description>
 		</method>
 		<method name="set_stage_source">
 			<return type="void" />
-			<argument index="0" name="stage" type="int" enum="RenderingDevice.ShaderStage" />
-			<argument index="1" name="source" type="String" />
+			<param index="0" name="stage" type="int" enum="RenderingDevice.ShaderStage" />
+			<param index="1" name="source" type="String" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/RDTextureFormat.xml b/doc/classes/RDTextureFormat.xml
index fe2f6d7b1c..1b70303d2d 100644
--- a/doc/classes/RDTextureFormat.xml
+++ b/doc/classes/RDTextureFormat.xml
@@ -9,13 +9,13 @@
 	<methods>
 		<method name="add_shareable_format">
 			<return type="void" />
-			<argument index="0" name="format" type="int" enum="RenderingDevice.DataFormat" />
+			<param index="0" name="format" type="int" enum="RenderingDevice.DataFormat" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_shareable_format">
 			<return type="void" />
-			<argument index="0" name="format" type="int" enum="RenderingDevice.DataFormat" />
+			<param index="0" name="format" type="int" enum="RenderingDevice.DataFormat" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/RDUniform.xml b/doc/classes/RDUniform.xml
index 29664d7c40..d144024000 100644
--- a/doc/classes/RDUniform.xml
+++ b/doc/classes/RDUniform.xml
@@ -9,7 +9,7 @@
 	<methods>
 		<method name="add_id">
 			<return type="void" />
-			<argument index="0" name="id" type="RID" />
+			<param index="0" name="id" type="RID" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/RID.xml b/doc/classes/RID.xml
index 39be605e1b..a6523e4c8b 100644
--- a/doc/classes/RID.xml
+++ b/doc/classes/RID.xml
@@ -17,7 +17,7 @@
 		</constructor>
 		<constructor name="RID">
 			<return type="RID" />
-			<argument index="0" name="from" type="RID" />
+			<param index="0" name="from" type="RID" />
 			<description>
 				Constructs a [RID] as a copy of the given [RID].
 			</description>
@@ -40,37 +40,37 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="RID" />
+			<param index="0" name="right" type="RID" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator &lt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="RID" />
+			<param index="0" name="right" type="RID" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator &lt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="RID" />
+			<param index="0" name="right" type="RID" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="RID" />
+			<param index="0" name="right" type="RID" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator &gt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="RID" />
+			<param index="0" name="right" type="RID" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator &gt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="RID" />
+			<param index="0" name="right" type="RID" />
 			<description>
 			</description>
 		</operator>
diff --git a/doc/classes/RandomNumberGenerator.xml b/doc/classes/RandomNumberGenerator.xml
index 28151e858e..b8a290381f 100644
--- a/doc/classes/RandomNumberGenerator.xml
+++ b/doc/classes/RandomNumberGenerator.xml
@@ -27,18 +27,18 @@
 		</method>
 		<method name="randf_range">
 			<return type="float" />
-			<argument index="0" name="from" type="float" />
-			<argument index="1" name="to" type="float" />
+			<param index="0" name="from" type="float" />
+			<param index="1" name="to" type="float" />
 			<description>
-				Returns a pseudo-random float between [code]from[/code] and [code]to[/code] (inclusive).
+				Returns a pseudo-random float between [param from] and [param to] (inclusive).
 			</description>
 		</method>
 		<method name="randfn">
 			<return type="float" />
-			<argument index="0" name="mean" type="float" default="0.0" />
-			<argument index="1" name="deviation" type="float" default="1.0" />
+			<param index="0" name="mean" type="float" default="0.0" />
+			<param index="1" name="deviation" type="float" default="1.0" />
 			<description>
-				Returns a [url=https://en.wikipedia.org/wiki/Normal_distribution]normally-distributed[/url] pseudo-random number, using Box-Muller transform with the specified [code]mean[/code] and a standard [code]deviation[/code]. This is also called Gaussian distribution.
+				Returns a [url=https://en.wikipedia.org/wiki/Normal_distribution]normally-distributed[/url] pseudo-random number, using Box-Muller transform with the specified [param mean] and a standard [param deviation]. This is also called Gaussian distribution.
 			</description>
 		</method>
 		<method name="randi">
@@ -49,10 +49,10 @@
 		</method>
 		<method name="randi_range">
 			<return type="int" />
-			<argument index="0" name="from" type="int" />
-			<argument index="1" name="to" type="int" />
+			<param index="0" name="from" type="int" />
+			<param index="1" name="to" type="int" />
 			<description>
-				Returns a pseudo-random 32-bit signed integer between [code]from[/code] and [code]to[/code] (inclusive).
+				Returns a pseudo-random 32-bit signed integer between [param from] and [param to] (inclusive).
 			</description>
 		</method>
 		<method name="randomize">
diff --git a/doc/classes/Range.xml b/doc/classes/Range.xml
index 22793e75d8..16e6e86f9e 100644
--- a/doc/classes/Range.xml
+++ b/doc/classes/Range.xml
@@ -11,14 +11,14 @@
 	<methods>
 		<method name="_value_changed" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="new_value" type="float" />
+			<param index="0" name="new_value" type="float" />
 			<description>
 				Called when the [Range]'s value is changed (following the same conditions as [signal value_changed]).
 			</description>
 		</method>
 		<method name="share">
 			<return type="void" />
-			<argument index="0" name="with" type="Node" />
+			<param index="0" name="with" type="Node" />
 			<description>
 				Binds two [Range]s together along with any ranges previously grouped with either of them. When any of range's member variables change, it will share the new value with all other ranges in its group.
 			</description>
@@ -69,10 +69,10 @@
 			</description>
 		</signal>
 		<signal name="value_changed">
-			<argument index="0" name="value" type="float" />
+			<param index="0" name="value" type="float" />
 			<description>
 				Emitted when [member value] changes. When used on a [Slider], this is called continuously while dragging (potentially every frame). If you are performing an expensive operation in a function connected to [signal value_changed], consider using a [i]debouncing[/i] [Timer] to call the function less often.
-				[b]Note:[/b] Unlike signals such as [signal LineEdit.text_changed], [signal value_changed] is also emitted when [code]value[/code] is set directly via code.
+				[b]Note:[/b] Unlike signals such as [signal LineEdit.text_changed], [signal value_changed] is also emitted when [param value] is set directly via code.
 			</description>
 		</signal>
 	</signals>
diff --git a/doc/classes/RayCast2D.xml b/doc/classes/RayCast2D.xml
index 2a7d3502df..4f4395a433 100644
--- a/doc/classes/RayCast2D.xml
+++ b/doc/classes/RayCast2D.xml
@@ -16,14 +16,14 @@
 	<methods>
 		<method name="add_exception">
 			<return type="void" />
-			<argument index="0" name="node" type="CollisionObject2D" />
+			<param index="0" name="node" type="CollisionObject2D" />
 			<description>
 				Adds a collision exception so the ray does not report collisions with the specified [CollisionObject2D] node.
 			</description>
 		</method>
 		<method name="add_exception_rid">
 			<return type="void" />
-			<argument index="0" name="rid" type="RID" />
+			<param index="0" name="rid" type="RID" />
 			<description>
 				Adds a collision exception so the ray does not report collisions with the specified [RID].
 			</description>
@@ -55,9 +55,9 @@
 		</method>
 		<method name="get_collision_mask_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
-				Returns whether or not the specified layer of the [member collision_mask] is enabled, given a [code]layer_number[/code] between 1 and 32.
+				Returns whether or not the specified layer of the [member collision_mask] is enabled, given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="get_collision_normal" qualifiers="const">
@@ -81,24 +81,24 @@
 		</method>
 		<method name="remove_exception">
 			<return type="void" />
-			<argument index="0" name="node" type="CollisionObject2D" />
+			<param index="0" name="node" type="CollisionObject2D" />
 			<description>
 				Removes a collision exception so the ray does report collisions with the specified [CollisionObject2D] node.
 			</description>
 		</method>
 		<method name="remove_exception_rid">
 			<return type="void" />
-			<argument index="0" name="rid" type="RID" />
+			<param index="0" name="rid" type="RID" />
 			<description>
 				Removes a collision exception so the ray does report collisions with the specified [RID].
 			</description>
 		</method>
 		<method name="set_collision_mask_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
-				Based on [code]value[/code], enables or disables the specified layer in the [member collision_mask], given a [code]layer_number[/code] between 1 and 32.
+				Based on [param value], enables or disables the specified layer in the [member collision_mask], given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/RayCast3D.xml b/doc/classes/RayCast3D.xml
index 65437daa79..7cc6fc55cd 100644
--- a/doc/classes/RayCast3D.xml
+++ b/doc/classes/RayCast3D.xml
@@ -17,14 +17,14 @@
 	<methods>
 		<method name="add_exception">
 			<return type="void" />
-			<argument index="0" name="node" type="CollisionObject3D" />
+			<param index="0" name="node" type="CollisionObject3D" />
 			<description>
 				Adds a collision exception so the ray does not report collisions with the specified [CollisionObject3D] node.
 			</description>
 		</method>
 		<method name="add_exception_rid">
 			<return type="void" />
-			<argument index="0" name="rid" type="RID" />
+			<param index="0" name="rid" type="RID" />
 			<description>
 				Adds a collision exception so the ray does not report collisions with the specified [RID].
 			</description>
@@ -56,9 +56,9 @@
 		</method>
 		<method name="get_collision_mask_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
-				Returns whether or not the specified layer of the [member collision_mask] is enabled, given a [code]layer_number[/code] between 1 and 32.
+				Returns whether or not the specified layer of the [member collision_mask] is enabled, given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="get_collision_normal" qualifiers="const">
@@ -82,24 +82,24 @@
 		</method>
 		<method name="remove_exception">
 			<return type="void" />
-			<argument index="0" name="node" type="CollisionObject3D" />
+			<param index="0" name="node" type="CollisionObject3D" />
 			<description>
 				Removes a collision exception so the ray does report collisions with the specified [CollisionObject3D] node.
 			</description>
 		</method>
 		<method name="remove_exception_rid">
 			<return type="void" />
-			<argument index="0" name="rid" type="RID" />
+			<param index="0" name="rid" type="RID" />
 			<description>
 				Removes a collision exception so the ray does report collisions with the specified [RID].
 			</description>
 		</method>
 		<method name="set_collision_mask_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
-				Based on [code]value[/code], enables or disables the specified layer in the [member collision_mask], given a [code]layer_number[/code] between 1 and 32.
+				Based on [param value], enables or disables the specified layer in the [member collision_mask], given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/Rect2.xml b/doc/classes/Rect2.xml
index e4b66a9d53..7132f4f0b5 100644
--- a/doc/classes/Rect2.xml
+++ b/doc/classes/Rect2.xml
@@ -23,32 +23,32 @@
 		</constructor>
 		<constructor name="Rect2">
 			<return type="Rect2" />
-			<argument index="0" name="from" type="Rect2" />
+			<param index="0" name="from" type="Rect2" />
 			<description>
 				Constructs a [Rect2] as a copy of the given [Rect2].
 			</description>
 		</constructor>
 		<constructor name="Rect2">
 			<return type="Rect2" />
-			<argument index="0" name="from" type="Rect2i" />
+			<param index="0" name="from" type="Rect2i" />
 			<description>
 				Constructs a [Rect2] from a [Rect2i].
 			</description>
 		</constructor>
 		<constructor name="Rect2">
 			<return type="Rect2" />
-			<argument index="0" name="position" type="Vector2" />
-			<argument index="1" name="size" type="Vector2" />
+			<param index="0" name="position" type="Vector2" />
+			<param index="1" name="size" type="Vector2" />
 			<description>
 				Constructs a [Rect2] by position and size.
 			</description>
 		</constructor>
 		<constructor name="Rect2">
 			<return type="Rect2" />
-			<argument index="0" name="x" type="float" />
-			<argument index="1" name="y" type="float" />
-			<argument index="2" name="width" type="float" />
-			<argument index="3" name="height" type="float" />
+			<param index="0" name="x" type="float" />
+			<param index="1" name="y" type="float" />
+			<param index="2" name="width" type="float" />
+			<param index="3" name="height" type="float" />
 			<description>
 				Constructs a [Rect2] by x, y, width, and height.
 			</description>
@@ -63,14 +63,14 @@
 		</method>
 		<method name="encloses" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="b" type="Rect2" />
+			<param index="0" name="b" type="Rect2" />
 			<description>
 				Returns [code]true[/code] if this [Rect2] completely encloses another one.
 			</description>
 		</method>
 		<method name="expand" qualifiers="const">
 			<return type="Rect2" />
-			<argument index="0" name="to" type="Vector2" />
+			<param index="0" name="to" type="Vector2" />
 			<description>
 				Returns a copy of this [Rect2] expanded to include a given point.
 				[b]Example:[/b]
@@ -104,27 +104,27 @@
 		</method>
 		<method name="grow" qualifiers="const">
 			<return type="Rect2" />
-			<argument index="0" name="amount" type="float" />
+			<param index="0" name="amount" type="float" />
 			<description>
-				Returns a copy of the [Rect2] grown by the specified [code]amount[/code] on all sides.
+				Returns a copy of the [Rect2] grown by the specified [param amount] on all sides.
 			</description>
 		</method>
 		<method name="grow_individual" qualifiers="const">
 			<return type="Rect2" />
-			<argument index="0" name="left" type="float" />
-			<argument index="1" name="top" type="float" />
-			<argument index="2" name="right" type="float" />
-			<argument index="3" name="bottom" type="float" />
+			<param index="0" name="left" type="float" />
+			<param index="1" name="top" type="float" />
+			<param index="2" name="right" type="float" />
+			<param index="3" name="bottom" type="float" />
 			<description>
 				Returns a copy of the [Rect2] grown by the specified amount on each side individually.
 			</description>
 		</method>
 		<method name="grow_side" qualifiers="const">
 			<return type="Rect2" />
-			<argument index="0" name="side" type="int" />
-			<argument index="1" name="amount" type="float" />
+			<param index="0" name="side" type="int" />
+			<param index="1" name="amount" type="float" />
 			<description>
-				Returns a copy of the [Rect2] grown by the specified [code]amount[/code] on the specified [enum Side].
+				Returns a copy of the [Rect2] grown by the specified [param amount] on the specified [enum Side].
 			</description>
 		</method>
 		<method name="has_no_area" qualifiers="const">
@@ -136,7 +136,7 @@
 		</method>
 		<method name="has_point" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="point" type="Vector2" />
+			<param index="0" name="point" type="Vector2" />
 			<description>
 				Returns [code]true[/code] if the [Rect2] contains a point. By convention, the right and bottom edges of the [Rect2] are considered exclusive, so points on these edges are [b]not[/b] included.
 				[b]Note:[/b] This method is not reliable for [Rect2] with a [i]negative size[/i]. Use [method abs] to get a positive sized equivalent rectangle to check for contained points.
@@ -144,33 +144,33 @@
 		</method>
 		<method name="intersection" qualifiers="const">
 			<return type="Rect2" />
-			<argument index="0" name="b" type="Rect2" />
+			<param index="0" name="b" type="Rect2" />
 			<description>
-				Returns the intersection of this [Rect2] and [code]b[/code].
+				Returns the intersection of this [Rect2] and [param b].
 				If the rectangles do not intersect, an empty [Rect2] is returned.
 			</description>
 		</method>
 		<method name="intersects" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="b" type="Rect2" />
-			<argument index="1" name="include_borders" type="bool" default="false" />
+			<param index="0" name="b" type="Rect2" />
+			<param index="1" name="include_borders" type="bool" default="false" />
 			<description>
 				Returns [code]true[/code] if the [Rect2] overlaps with [code]b[/code] (i.e. they have at least one point in common).
-				If [code]include_borders[/code] is [code]true[/code], they will also be considered overlapping if their borders touch, even without intersection.
+				If [param include_borders] is [code]true[/code], they will also be considered overlapping if their borders touch, even without intersection.
 			</description>
 		</method>
 		<method name="is_equal_approx" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="rect" type="Rect2" />
+			<param index="0" name="rect" type="Rect2" />
 			<description>
-				Returns [code]true[/code] if this [Rect2] and [code]rect[/code] are approximately equal, by calling [code]is_equal_approx[/code] on each component.
+				Returns [code]true[/code] if this [Rect2] and [param rect] are approximately equal, by calling [code]is_equal_approx[/code] on each component.
 			</description>
 		</method>
 		<method name="merge" qualifiers="const">
 			<return type="Rect2" />
-			<argument index="0" name="b" type="Rect2" />
+			<param index="0" name="b" type="Rect2" />
 			<description>
-				Returns a larger [Rect2] that contains this [Rect2] and [code]b[/code].
+				Returns a larger [Rect2] that contains this [Rect2] and [param b].
 			</description>
 		</method>
 	</methods>
@@ -189,7 +189,7 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Rect2" />
+			<param index="0" name="right" type="Rect2" />
 			<description>
 				Returns [code]true[/code] if the rectangles are not equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
@@ -197,14 +197,14 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Rect2" />
-			<argument index="0" name="right" type="Transform2D" />
+			<param index="0" name="right" type="Transform2D" />
 			<description>
 				Inversely transforms (multiplies) the [Rect2] by the given [Transform2D] transformation matrix.
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="Rect2" />
+			<param index="0" name="right" type="Rect2" />
 			<description>
 				Returns [code]true[/code] if the rectangles are exactly equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
diff --git a/doc/classes/Rect2i.xml b/doc/classes/Rect2i.xml
index c9ae685a15..d5d68bde31 100644
--- a/doc/classes/Rect2i.xml
+++ b/doc/classes/Rect2i.xml
@@ -21,32 +21,32 @@
 		</constructor>
 		<constructor name="Rect2i">
 			<return type="Rect2i" />
-			<argument index="0" name="from" type="Rect2i" />
+			<param index="0" name="from" type="Rect2i" />
 			<description>
 				Constructs a [Rect2i] as a copy of the given [Rect2i].
 			</description>
 		</constructor>
 		<constructor name="Rect2i">
 			<return type="Rect2i" />
-			<argument index="0" name="from" type="Rect2" />
+			<param index="0" name="from" type="Rect2" />
 			<description>
 				Constructs a new [Rect2i] from [Rect2]. The floating point coordinates will be truncated.
 			</description>
 		</constructor>
 		<constructor name="Rect2i">
 			<return type="Rect2i" />
-			<argument index="0" name="position" type="Vector2i" />
-			<argument index="1" name="size" type="Vector2i" />
+			<param index="0" name="position" type="Vector2i" />
+			<param index="1" name="size" type="Vector2i" />
 			<description>
 				Constructs a [Rect2i] by position and size.
 			</description>
 		</constructor>
 		<constructor name="Rect2i">
 			<return type="Rect2i" />
-			<argument index="0" name="x" type="int" />
-			<argument index="1" name="y" type="int" />
-			<argument index="2" name="width" type="int" />
-			<argument index="3" name="height" type="int" />
+			<param index="0" name="x" type="int" />
+			<param index="1" name="y" type="int" />
+			<param index="2" name="width" type="int" />
+			<param index="3" name="height" type="int" />
 			<description>
 				Constructs a [Rect2i] by x, y, width, and height.
 			</description>
@@ -61,14 +61,14 @@
 		</method>
 		<method name="encloses" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="b" type="Rect2i" />
+			<param index="0" name="b" type="Rect2i" />
 			<description>
 				Returns [code]true[/code] if this [Rect2i] completely encloses another one.
 			</description>
 		</method>
 		<method name="expand" qualifiers="const">
 			<return type="Rect2i" />
-			<argument index="0" name="to" type="Vector2i" />
+			<param index="0" name="to" type="Vector2i" />
 			<description>
 				Returns a copy of this [Rect2i] expanded so that the borders align with the given point.
 				[codeblocks]
@@ -102,27 +102,27 @@
 		</method>
 		<method name="grow" qualifiers="const">
 			<return type="Rect2i" />
-			<argument index="0" name="amount" type="int" />
+			<param index="0" name="amount" type="int" />
 			<description>
-				Returns a copy of the [Rect2i] grown by the specified [code]amount[/code] on all sides.
+				Returns a copy of the [Rect2i] grown by the specified [param amount] on all sides.
 			</description>
 		</method>
 		<method name="grow_individual" qualifiers="const">
 			<return type="Rect2i" />
-			<argument index="0" name="left" type="int" />
-			<argument index="1" name="top" type="int" />
-			<argument index="2" name="right" type="int" />
-			<argument index="3" name="bottom" type="int" />
+			<param index="0" name="left" type="int" />
+			<param index="1" name="top" type="int" />
+			<param index="2" name="right" type="int" />
+			<param index="3" name="bottom" type="int" />
 			<description>
 				Returns a copy of the [Rect2i] grown by the specified amount on each side individually.
 			</description>
 		</method>
 		<method name="grow_side" qualifiers="const">
 			<return type="Rect2i" />
-			<argument index="0" name="side" type="int" />
-			<argument index="1" name="amount" type="int" />
+			<param index="0" name="side" type="int" />
+			<param index="1" name="amount" type="int" />
 			<description>
-				Returns a copy of the [Rect2i] grown by the specified [code]amount[/code] on the specified [enum Side].
+				Returns a copy of the [Rect2i] grown by the specified [param amount] on the specified [enum Side].
 			</description>
 		</method>
 		<method name="has_no_area" qualifiers="const">
@@ -134,7 +134,7 @@
 		</method>
 		<method name="has_point" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="point" type="Vector2i" />
+			<param index="0" name="point" type="Vector2i" />
 			<description>
 				Returns [code]true[/code] if the [Rect2i] contains a point. By convention, the right and bottom edges of the [Rect2i] are considered exclusive, so points on these edges are [b]not[/b] included.
 				[b]Note:[/b] This method is not reliable for [Rect2i] with a [i]negative size[/i]. Use [method abs] to get a positive sized equivalent rectangle to check for contained points.
@@ -142,7 +142,7 @@
 		</method>
 		<method name="intersection" qualifiers="const">
 			<return type="Rect2i" />
-			<argument index="0" name="b" type="Rect2i" />
+			<param index="0" name="b" type="Rect2i" />
 			<description>
 				Returns the intersection of this [Rect2i] and [code]b[/code].
 				If the rectangles do not intersect, an empty [Rect2i] is returned.
@@ -150,16 +150,16 @@
 		</method>
 		<method name="intersects" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="b" type="Rect2i" />
+			<param index="0" name="b" type="Rect2i" />
 			<description>
 				Returns [code]true[/code] if the [Rect2i] overlaps with [code]b[/code] (i.e. they have at least one point in common).
 			</description>
 		</method>
 		<method name="merge" qualifiers="const">
 			<return type="Rect2i" />
-			<argument index="0" name="b" type="Rect2i" />
+			<param index="0" name="b" type="Rect2i" />
 			<description>
-				Returns a larger [Rect2i] that contains this [Rect2i] and [code]b[/code].
+				Returns a larger [Rect2i] that contains this [Rect2i] and [param b].
 			</description>
 		</method>
 	</methods>
@@ -178,14 +178,14 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Rect2i" />
+			<param index="0" name="right" type="Rect2i" />
 			<description>
 				Returns [code]true[/code] if the rectangles are not equal.
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="Rect2i" />
+			<param index="0" name="right" type="Rect2i" />
 			<description>
 				Returns [code]true[/code] if the rectangles are equal.
 			</description>
diff --git a/doc/classes/ReflectionProbe.xml b/doc/classes/ReflectionProbe.xml
index ff66a89cb7..fee48dd246 100644
--- a/doc/classes/ReflectionProbe.xml
+++ b/doc/classes/ReflectionProbe.xml
@@ -50,7 +50,7 @@
 			[b]Note:[/b] [member mesh_lod_threshold] does not affect [GeometryInstance3D] visibility ranges (also known as "manual" LOD or hierarchical LOD).
 		</member>
 		<member name="origin_offset" type="Vector3" setter="set_origin_offset" getter="get_origin_offset" default="Vector3(0, 0, 0)">
-			Sets the origin offset to be used when this [ReflectionProbe] is in [member box_projection] mode. This can be set to a non-zero value to ensure a reflection fits a rectangle-shaped room, while reducing the amount of objects that "get in the way" of the reflection.
+			Sets the origin offset to be used when this [ReflectionProbe] is in [member box_projection] mode. This can be set to a non-zero value to ensure a reflection fits a rectangle-shaped room, while reducing the number of objects that "get in the way" of the reflection.
 		</member>
 		<member name="update_mode" type="int" setter="set_update_mode" getter="get_update_mode" enum="ReflectionProbe.UpdateMode" default="0">
 			Sets how frequently the [ReflectionProbe] is updated. Can be [constant UPDATE_ONCE] or [constant UPDATE_ALWAYS].
diff --git a/doc/classes/RenderingDevice.xml b/doc/classes/RenderingDevice.xml
index 6248394b1a..2f0b9dae72 100644
--- a/doc/classes/RenderingDevice.xml
+++ b/doc/classes/RenderingDevice.xml
@@ -9,102 +9,102 @@
 	<methods>
 		<method name="barrier">
 			<return type="void" />
-			<argument index="0" name="from" type="int" default="7" />
-			<argument index="1" name="to" type="int" default="7" />
+			<param index="0" name="from" type="int" default="7" />
+			<param index="1" name="to" type="int" default="7" />
 			<description>
 			</description>
 		</method>
 		<method name="buffer_clear">
 			<return type="int" enum="Error" />
-			<argument index="0" name="buffer" type="RID" />
-			<argument index="1" name="offset" type="int" />
-			<argument index="2" name="size_bytes" type="int" />
-			<argument index="3" name="post_barrier" type="int" default="7" />
+			<param index="0" name="buffer" type="RID" />
+			<param index="1" name="offset" type="int" />
+			<param index="2" name="size_bytes" type="int" />
+			<param index="3" name="post_barrier" type="int" default="7" />
 			<description>
 			</description>
 		</method>
 		<method name="buffer_get_data">
 			<return type="PackedByteArray" />
-			<argument index="0" name="buffer" type="RID" />
+			<param index="0" name="buffer" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="buffer_update">
 			<return type="int" enum="Error" />
-			<argument index="0" name="buffer" type="RID" />
-			<argument index="1" name="offset" type="int" />
-			<argument index="2" name="size_bytes" type="int" />
-			<argument index="3" name="data" type="PackedByteArray" />
-			<argument index="4" name="post_barrier" type="int" default="7" />
+			<param index="0" name="buffer" type="RID" />
+			<param index="1" name="offset" type="int" />
+			<param index="2" name="size_bytes" type="int" />
+			<param index="3" name="data" type="PackedByteArray" />
+			<param index="4" name="post_barrier" type="int" default="7" />
 			<description>
 			</description>
 		</method>
 		<method name="capture_timestamp">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="compute_list_add_barrier">
 			<return type="void" />
-			<argument index="0" name="compute_list" type="int" />
+			<param index="0" name="compute_list" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="compute_list_begin">
 			<return type="int" />
-			<argument index="0" name="allow_draw_overlap" type="bool" default="false" />
+			<param index="0" name="allow_draw_overlap" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
 		<method name="compute_list_bind_compute_pipeline">
 			<return type="void" />
-			<argument index="0" name="compute_list" type="int" />
-			<argument index="1" name="compute_pipeline" type="RID" />
+			<param index="0" name="compute_list" type="int" />
+			<param index="1" name="compute_pipeline" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="compute_list_bind_uniform_set">
 			<return type="void" />
-			<argument index="0" name="compute_list" type="int" />
-			<argument index="1" name="uniform_set" type="RID" />
-			<argument index="2" name="set_index" type="int" />
+			<param index="0" name="compute_list" type="int" />
+			<param index="1" name="uniform_set" type="RID" />
+			<param index="2" name="set_index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="compute_list_dispatch">
 			<return type="void" />
-			<argument index="0" name="compute_list" type="int" />
-			<argument index="1" name="x_groups" type="int" />
-			<argument index="2" name="y_groups" type="int" />
-			<argument index="3" name="z_groups" type="int" />
+			<param index="0" name="compute_list" type="int" />
+			<param index="1" name="x_groups" type="int" />
+			<param index="2" name="y_groups" type="int" />
+			<param index="3" name="z_groups" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="compute_list_end">
 			<return type="void" />
-			<argument index="0" name="post_barrier" type="int" default="7" />
+			<param index="0" name="post_barrier" type="int" default="7" />
 			<description>
 			</description>
 		</method>
 		<method name="compute_list_set_push_constant">
 			<return type="void" />
-			<argument index="0" name="compute_list" type="int" />
-			<argument index="1" name="buffer" type="PackedByteArray" />
-			<argument index="2" name="size_bytes" type="int" />
+			<param index="0" name="compute_list" type="int" />
+			<param index="1" name="buffer" type="PackedByteArray" />
+			<param index="2" name="size_bytes" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="compute_pipeline_create">
 			<return type="RID" />
-			<argument index="0" name="shader" type="RID" />
-			<argument index="1" name="specialization_constants" type="RDPipelineSpecializationConstant[]" default="[]" />
+			<param index="0" name="shader" type="RID" />
+			<param index="1" name="specialization_constants" type="RDPipelineSpecializationConstant[]" default="[]" />
 			<description>
 			</description>
 		</method>
 		<method name="compute_pipeline_is_valid">
 			<return type="bool" />
-			<argument index="0" name="compute_pieline" type="RID" />
+			<param index="0" name="compute_pieline" type="RID" />
 			<description>
 			</description>
 		</method>
@@ -115,8 +115,8 @@
 		</method>
 		<method name="draw_command_begin_label">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="color" type="Color" />
 			<description>
 			</description>
 		</method>
@@ -127,111 +127,111 @@
 		</method>
 		<method name="draw_command_insert_label">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="color" type="Color" />
 			<description>
 			</description>
 		</method>
 		<method name="draw_list_begin">
 			<return type="int" />
-			<argument index="0" name="framebuffer" type="RID" />
-			<argument index="1" name="initial_color_action" type="int" enum="RenderingDevice.InitialAction" />
-			<argument index="2" name="final_color_action" type="int" enum="RenderingDevice.FinalAction" />
-			<argument index="3" name="initial_depth_action" type="int" enum="RenderingDevice.InitialAction" />
-			<argument index="4" name="final_depth_action" type="int" enum="RenderingDevice.FinalAction" />
-			<argument index="5" name="clear_color_values" type="PackedColorArray" default="PackedColorArray()" />
-			<argument index="6" name="clear_depth" type="float" default="1.0" />
-			<argument index="7" name="clear_stencil" type="int" default="0" />
-			<argument index="8" name="region" type="Rect2" default="Rect2(0, 0, 0, 0)" />
-			<argument index="9" name="storage_textures" type="Array" default="[]" />
+			<param index="0" name="framebuffer" type="RID" />
+			<param index="1" name="initial_color_action" type="int" enum="RenderingDevice.InitialAction" />
+			<param index="2" name="final_color_action" type="int" enum="RenderingDevice.FinalAction" />
+			<param index="3" name="initial_depth_action" type="int" enum="RenderingDevice.InitialAction" />
+			<param index="4" name="final_depth_action" type="int" enum="RenderingDevice.FinalAction" />
+			<param index="5" name="clear_color_values" type="PackedColorArray" default="PackedColorArray()" />
+			<param index="6" name="clear_depth" type="float" default="1.0" />
+			<param index="7" name="clear_stencil" type="int" default="0" />
+			<param index="8" name="region" type="Rect2" default="Rect2(0, 0, 0, 0)" />
+			<param index="9" name="storage_textures" type="Array" default="[]" />
 			<description>
 			</description>
 		</method>
 		<method name="draw_list_begin_for_screen">
 			<return type="int" />
-			<argument index="0" name="screen" type="int" default="0" />
-			<argument index="1" name="clear_color" type="Color" default="Color(0, 0, 0, 1)" />
+			<param index="0" name="screen" type="int" default="0" />
+			<param index="1" name="clear_color" type="Color" default="Color(0, 0, 0, 1)" />
 			<description>
 			</description>
 		</method>
 		<method name="draw_list_begin_split">
 			<return type="PackedInt64Array" />
-			<argument index="0" name="framebuffer" type="RID" />
-			<argument index="1" name="splits" type="int" />
-			<argument index="2" name="initial_color_action" type="int" enum="RenderingDevice.InitialAction" />
-			<argument index="3" name="final_color_action" type="int" enum="RenderingDevice.FinalAction" />
-			<argument index="4" name="initial_depth_action" type="int" enum="RenderingDevice.InitialAction" />
-			<argument index="5" name="final_depth_action" type="int" enum="RenderingDevice.FinalAction" />
-			<argument index="6" name="clear_color_values" type="PackedColorArray" default="PackedColorArray()" />
-			<argument index="7" name="clear_depth" type="float" default="1.0" />
-			<argument index="8" name="clear_stencil" type="int" default="0" />
-			<argument index="9" name="region" type="Rect2" default="Rect2(0, 0, 0, 0)" />
-			<argument index="10" name="storage_textures" type="RID[]" default="[]" />
+			<param index="0" name="framebuffer" type="RID" />
+			<param index="1" name="splits" type="int" />
+			<param index="2" name="initial_color_action" type="int" enum="RenderingDevice.InitialAction" />
+			<param index="3" name="final_color_action" type="int" enum="RenderingDevice.FinalAction" />
+			<param index="4" name="initial_depth_action" type="int" enum="RenderingDevice.InitialAction" />
+			<param index="5" name="final_depth_action" type="int" enum="RenderingDevice.FinalAction" />
+			<param index="6" name="clear_color_values" type="PackedColorArray" default="PackedColorArray()" />
+			<param index="7" name="clear_depth" type="float" default="1.0" />
+			<param index="8" name="clear_stencil" type="int" default="0" />
+			<param index="9" name="region" type="Rect2" default="Rect2(0, 0, 0, 0)" />
+			<param index="10" name="storage_textures" type="RID[]" default="[]" />
 			<description>
 			</description>
 		</method>
 		<method name="draw_list_bind_index_array">
 			<return type="void" />
-			<argument index="0" name="draw_list" type="int" />
-			<argument index="1" name="index_array" type="RID" />
+			<param index="0" name="draw_list" type="int" />
+			<param index="1" name="index_array" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="draw_list_bind_render_pipeline">
 			<return type="void" />
-			<argument index="0" name="draw_list" type="int" />
-			<argument index="1" name="render_pipeline" type="RID" />
+			<param index="0" name="draw_list" type="int" />
+			<param index="1" name="render_pipeline" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="draw_list_bind_uniform_set">
 			<return type="void" />
-			<argument index="0" name="draw_list" type="int" />
-			<argument index="1" name="uniform_set" type="RID" />
-			<argument index="2" name="set_index" type="int" />
+			<param index="0" name="draw_list" type="int" />
+			<param index="1" name="uniform_set" type="RID" />
+			<param index="2" name="set_index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="draw_list_bind_vertex_array">
 			<return type="void" />
-			<argument index="0" name="draw_list" type="int" />
-			<argument index="1" name="vertex_array" type="RID" />
+			<param index="0" name="draw_list" type="int" />
+			<param index="1" name="vertex_array" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="draw_list_disable_scissor">
 			<return type="void" />
-			<argument index="0" name="draw_list" type="int" />
+			<param index="0" name="draw_list" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="draw_list_draw">
 			<return type="void" />
-			<argument index="0" name="draw_list" type="int" />
-			<argument index="1" name="use_indices" type="bool" />
-			<argument index="2" name="instances" type="int" />
-			<argument index="3" name="procedural_vertex_count" type="int" default="0" />
+			<param index="0" name="draw_list" type="int" />
+			<param index="1" name="use_indices" type="bool" />
+			<param index="2" name="instances" type="int" />
+			<param index="3" name="procedural_vertex_count" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="draw_list_enable_scissor">
 			<return type="void" />
-			<argument index="0" name="draw_list" type="int" />
-			<argument index="1" name="rect" type="Rect2" default="Rect2(0, 0, 0, 0)" />
+			<param index="0" name="draw_list" type="int" />
+			<param index="1" name="rect" type="Rect2" default="Rect2(0, 0, 0, 0)" />
 			<description>
 			</description>
 		</method>
 		<method name="draw_list_end">
 			<return type="void" />
-			<argument index="0" name="post_barrier" type="int" default="7" />
+			<param index="0" name="post_barrier" type="int" default="7" />
 			<description>
 			</description>
 		</method>
 		<method name="draw_list_set_push_constant">
 			<return type="void" />
-			<argument index="0" name="draw_list" type="int" />
-			<argument index="1" name="buffer" type="PackedByteArray" />
-			<argument index="2" name="size_bytes" type="int" />
+			<param index="0" name="draw_list" type="int" />
+			<param index="1" name="buffer" type="PackedByteArray" />
+			<param index="2" name="size_bytes" type="int" />
 			<description>
 			</description>
 		</method>
@@ -242,72 +242,78 @@
 		</method>
 		<method name="draw_list_switch_to_next_pass_split">
 			<return type="PackedInt64Array" />
-			<argument index="0" name="splits" type="int" />
+			<param index="0" name="splits" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="framebuffer_create">
 			<return type="RID" />
-			<argument index="0" name="textures" type="RID[]" />
-			<argument index="1" name="validate_with_format" type="int" default="-1" />
-			<argument index="2" name="view_count" type="int" default="1" />
+			<param index="0" name="textures" type="RID[]" />
+			<param index="1" name="validate_with_format" type="int" default="-1" />
+			<param index="2" name="view_count" type="int" default="1" />
 			<description>
 			</description>
 		</method>
 		<method name="framebuffer_create_empty">
 			<return type="RID" />
-			<argument index="0" name="size" type="Vector2i" />
-			<argument index="1" name="samples" type="int" enum="RenderingDevice.TextureSamples" default="0" />
-			<argument index="2" name="validate_with_format" type="int" default="-1" />
+			<param index="0" name="size" type="Vector2i" />
+			<param index="1" name="samples" type="int" enum="RenderingDevice.TextureSamples" default="0" />
+			<param index="2" name="validate_with_format" type="int" default="-1" />
 			<description>
 			</description>
 		</method>
 		<method name="framebuffer_create_multipass">
 			<return type="RID" />
-			<argument index="0" name="textures" type="RID[]" />
-			<argument index="1" name="passes" type="RDFramebufferPass[]" />
-			<argument index="2" name="validate_with_format" type="int" default="-1" />
-			<argument index="3" name="view_count" type="int" default="1" />
+			<param index="0" name="textures" type="RID[]" />
+			<param index="1" name="passes" type="RDFramebufferPass[]" />
+			<param index="2" name="validate_with_format" type="int" default="-1" />
+			<param index="3" name="view_count" type="int" default="1" />
 			<description>
 			</description>
 		</method>
 		<method name="framebuffer_format_create">
 			<return type="int" />
-			<argument index="0" name="attachments" type="RDAttachmentFormat[]" />
-			<argument index="1" name="view_count" type="int" default="1" />
+			<param index="0" name="attachments" type="RDAttachmentFormat[]" />
+			<param index="1" name="view_count" type="int" default="1" />
 			<description>
 			</description>
 		</method>
 		<method name="framebuffer_format_create_empty">
 			<return type="int" />
-			<argument index="0" name="samples" type="int" enum="RenderingDevice.TextureSamples" default="0" />
+			<param index="0" name="samples" type="int" enum="RenderingDevice.TextureSamples" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="framebuffer_format_create_multipass">
 			<return type="int" />
-			<argument index="0" name="attachments" type="RDAttachmentFormat[]" />
-			<argument index="1" name="passes" type="RDFramebufferPass[]" />
-			<argument index="2" name="view_count" type="int" default="1" />
+			<param index="0" name="attachments" type="RDAttachmentFormat[]" />
+			<param index="1" name="passes" type="RDFramebufferPass[]" />
+			<param index="2" name="view_count" type="int" default="1" />
 			<description>
 			</description>
 		</method>
 		<method name="framebuffer_format_get_texture_samples">
 			<return type="int" enum="RenderingDevice.TextureSamples" />
-			<argument index="0" name="format" type="int" />
-			<argument index="1" name="render_pass" type="int" default="0" />
+			<param index="0" name="format" type="int" />
+			<param index="1" name="render_pass" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="framebuffer_get_format">
 			<return type="int" />
-			<argument index="0" name="framebuffer" type="RID" />
+			<param index="0" name="framebuffer" type="RID" />
+			<description>
+			</description>
+		</method>
+		<method name="framebuffer_is_valid" qualifiers="const">
+			<return type="bool" />
+			<param index="0" name="framebuffer" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="free_rid">
 			<return type="void" />
-			<argument index="0" name="rid" type="RID" />
+			<param index="0" name="rid" type="RID" />
 			<description>
 			</description>
 		</method>
@@ -318,19 +324,19 @@
 		</method>
 		<method name="get_captured_timestamp_cpu_time" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_captured_timestamp_gpu_time" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_captured_timestamp_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
@@ -361,9 +367,9 @@
 		</method>
 		<method name="get_driver_resource">
 			<return type="int" />
-			<argument index="0" name="resource" type="int" enum="RenderingDevice.DriverResource" />
-			<argument index="1" name="rid" type="RID" />
-			<argument index="2" name="index" type="int" />
+			<param index="0" name="resource" type="int" enum="RenderingDevice.DriverResource" />
+			<param index="1" name="rid" type="RID" />
+			<param index="2" name="index" type="int" />
 			<description>
 			</description>
 		</method>
@@ -374,58 +380,58 @@
 		</method>
 		<method name="get_memory_usage" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="type" type="int" enum="RenderingDevice.MemoryType" />
+			<param index="0" name="type" type="int" enum="RenderingDevice.MemoryType" />
 			<description>
 			</description>
 		</method>
 		<method name="index_array_create">
 			<return type="RID" />
-			<argument index="0" name="index_buffer" type="RID" />
-			<argument index="1" name="index_offset" type="int" />
-			<argument index="2" name="index_count" type="int" />
+			<param index="0" name="index_buffer" type="RID" />
+			<param index="1" name="index_offset" type="int" />
+			<param index="2" name="index_count" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="index_buffer_create">
 			<return type="RID" />
-			<argument index="0" name="size_indices" type="int" />
-			<argument index="1" name="format" type="int" enum="RenderingDevice.IndexBufferFormat" />
-			<argument index="2" name="data" type="PackedByteArray" default="PackedByteArray()" />
-			<argument index="3" name="use_restart_indices" type="bool" default="false" />
+			<param index="0" name="size_indices" type="int" />
+			<param index="1" name="format" type="int" enum="RenderingDevice.IndexBufferFormat" />
+			<param index="2" name="data" type="PackedByteArray" default="PackedByteArray()" />
+			<param index="3" name="use_restart_indices" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
 		<method name="limit_get" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="limit" type="int" enum="RenderingDevice.Limit" />
+			<param index="0" name="limit" type="int" enum="RenderingDevice.Limit" />
 			<description>
 			</description>
 		</method>
 		<method name="render_pipeline_create">
 			<return type="RID" />
-			<argument index="0" name="shader" type="RID" />
-			<argument index="1" name="framebuffer_format" type="int" />
-			<argument index="2" name="vertex_format" type="int" />
-			<argument index="3" name="primitive" type="int" enum="RenderingDevice.RenderPrimitive" />
-			<argument index="4" name="rasterization_state" type="RDPipelineRasterizationState" />
-			<argument index="5" name="multisample_state" type="RDPipelineMultisampleState" />
-			<argument index="6" name="stencil_state" type="RDPipelineDepthStencilState" />
-			<argument index="7" name="color_blend_state" type="RDPipelineColorBlendState" />
-			<argument index="8" name="dynamic_state_flags" type="int" default="0" />
-			<argument index="9" name="for_render_pass" type="int" default="0" />
-			<argument index="10" name="specialization_constants" type="RDPipelineSpecializationConstant[]" default="[]" />
+			<param index="0" name="shader" type="RID" />
+			<param index="1" name="framebuffer_format" type="int" />
+			<param index="2" name="vertex_format" type="int" />
+			<param index="3" name="primitive" type="int" enum="RenderingDevice.RenderPrimitive" />
+			<param index="4" name="rasterization_state" type="RDPipelineRasterizationState" />
+			<param index="5" name="multisample_state" type="RDPipelineMultisampleState" />
+			<param index="6" name="stencil_state" type="RDPipelineDepthStencilState" />
+			<param index="7" name="color_blend_state" type="RDPipelineColorBlendState" />
+			<param index="8" name="dynamic_state_flags" type="int" default="0" />
+			<param index="9" name="for_render_pass" type="int" default="0" />
+			<param index="10" name="specialization_constants" type="RDPipelineSpecializationConstant[]" default="[]" />
 			<description>
 			</description>
 		</method>
 		<method name="render_pipeline_is_valid">
 			<return type="bool" />
-			<argument index="0" name="render_pipeline" type="RID" />
+			<param index="0" name="render_pipeline" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="sampler_create">
 			<return type="RID" />
-			<argument index="0" name="state" type="RDSamplerState" />
+			<param index="0" name="state" type="RDSamplerState" />
 			<description>
 			</description>
 		</method>
@@ -436,61 +442,61 @@
 		</method>
 		<method name="screen_get_height" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="screen" type="int" default="0" />
+			<param index="0" name="screen" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="screen_get_width" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="screen" type="int" default="0" />
+			<param index="0" name="screen" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="set_resource_name">
 			<return type="void" />
-			<argument index="0" name="id" type="RID" />
-			<argument index="1" name="name" type="String" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="name" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="shader_compile_binary_from_spirv">
 			<return type="PackedByteArray" />
-			<argument index="0" name="spirv_data" type="RDShaderSPIRV" />
-			<argument index="1" name="name" type="String" default="&quot;&quot;" />
+			<param index="0" name="spirv_data" type="RDShaderSPIRV" />
+			<param index="1" name="name" type="String" default="&quot;&quot;" />
 			<description>
 			</description>
 		</method>
 		<method name="shader_compile_spirv_from_source">
 			<return type="RDShaderSPIRV" />
-			<argument index="0" name="shader_source" type="RDShaderSource" />
-			<argument index="1" name="allow_cache" type="bool" default="true" />
+			<param index="0" name="shader_source" type="RDShaderSource" />
+			<param index="1" name="allow_cache" type="bool" default="true" />
 			<description>
 			</description>
 		</method>
 		<method name="shader_create_from_bytecode">
 			<return type="RID" />
-			<argument index="0" name="binary_data" type="PackedByteArray" />
+			<param index="0" name="binary_data" type="PackedByteArray" />
 			<description>
 			</description>
 		</method>
 		<method name="shader_create_from_spirv">
 			<return type="RID" />
-			<argument index="0" name="spirv_data" type="RDShaderSPIRV" />
-			<argument index="1" name="name" type="String" default="&quot;&quot;" />
+			<param index="0" name="spirv_data" type="RDShaderSPIRV" />
+			<param index="1" name="name" type="String" default="&quot;&quot;" />
 			<description>
 			</description>
 		</method>
 		<method name="shader_get_vertex_input_attribute_mask">
 			<return type="int" />
-			<argument index="0" name="shader" type="RID" />
+			<param index="0" name="shader" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="storage_buffer_create">
 			<return type="RID" />
-			<argument index="0" name="size_bytes" type="int" />
-			<argument index="1" name="data" type="PackedByteArray" default="PackedByteArray()" />
-			<argument index="2" name="usage" type="int" default="0" />
+			<param index="0" name="size_bytes" type="int" />
+			<param index="1" name="data" type="PackedByteArray" default="PackedByteArray()" />
+			<param index="2" name="usage" type="int" default="0" />
 			<description>
 			</description>
 		</method>
@@ -506,140 +512,140 @@
 		</method>
 		<method name="texture_buffer_create">
 			<return type="RID" />
-			<argument index="0" name="size_bytes" type="int" />
-			<argument index="1" name="format" type="int" enum="RenderingDevice.DataFormat" />
-			<argument index="2" name="data" type="PackedByteArray" default="PackedByteArray()" />
+			<param index="0" name="size_bytes" type="int" />
+			<param index="1" name="format" type="int" enum="RenderingDevice.DataFormat" />
+			<param index="2" name="data" type="PackedByteArray" default="PackedByteArray()" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_clear">
 			<return type="int" enum="Error" />
-			<argument index="0" name="texture" type="RID" />
-			<argument index="1" name="color" type="Color" />
-			<argument index="2" name="base_mipmap" type="int" />
-			<argument index="3" name="mipmap_count" type="int" />
-			<argument index="4" name="base_layer" type="int" />
-			<argument index="5" name="layer_count" type="int" />
-			<argument index="6" name="post_barrier" type="int" default="7" />
+			<param index="0" name="texture" type="RID" />
+			<param index="1" name="color" type="Color" />
+			<param index="2" name="base_mipmap" type="int" />
+			<param index="3" name="mipmap_count" type="int" />
+			<param index="4" name="base_layer" type="int" />
+			<param index="5" name="layer_count" type="int" />
+			<param index="6" name="post_barrier" type="int" default="7" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_copy">
 			<return type="int" enum="Error" />
-			<argument index="0" name="from_texture" type="RID" />
-			<argument index="1" name="to_texture" type="RID" />
-			<argument index="2" name="from_pos" type="Vector3" />
-			<argument index="3" name="to_pos" type="Vector3" />
-			<argument index="4" name="size" type="Vector3" />
-			<argument index="5" name="src_mipmap" type="int" />
-			<argument index="6" name="dst_mipmap" type="int" />
-			<argument index="7" name="src_layer" type="int" />
-			<argument index="8" name="dst_layer" type="int" />
-			<argument index="9" name="post_barrier" type="int" default="7" />
+			<param index="0" name="from_texture" type="RID" />
+			<param index="1" name="to_texture" type="RID" />
+			<param index="2" name="from_pos" type="Vector3" />
+			<param index="3" name="to_pos" type="Vector3" />
+			<param index="4" name="size" type="Vector3" />
+			<param index="5" name="src_mipmap" type="int" />
+			<param index="6" name="dst_mipmap" type="int" />
+			<param index="7" name="src_layer" type="int" />
+			<param index="8" name="dst_layer" type="int" />
+			<param index="9" name="post_barrier" type="int" default="7" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_create">
 			<return type="RID" />
-			<argument index="0" name="format" type="RDTextureFormat" />
-			<argument index="1" name="view" type="RDTextureView" />
-			<argument index="2" name="data" type="PackedByteArray[]" default="[]" />
+			<param index="0" name="format" type="RDTextureFormat" />
+			<param index="1" name="view" type="RDTextureView" />
+			<param index="2" name="data" type="PackedByteArray[]" default="[]" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_create_shared">
 			<return type="RID" />
-			<argument index="0" name="view" type="RDTextureView" />
-			<argument index="1" name="with_texture" type="RID" />
+			<param index="0" name="view" type="RDTextureView" />
+			<param index="1" name="with_texture" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_create_shared_from_slice">
 			<return type="RID" />
-			<argument index="0" name="view" type="RDTextureView" />
-			<argument index="1" name="with_texture" type="RID" />
-			<argument index="2" name="layer" type="int" />
-			<argument index="3" name="mipmap" type="int" />
-			<argument index="4" name="mipmaps" type="int" default="1" />
-			<argument index="5" name="slice_type" type="int" enum="RenderingDevice.TextureSliceType" default="0" />
+			<param index="0" name="view" type="RDTextureView" />
+			<param index="1" name="with_texture" type="RID" />
+			<param index="2" name="layer" type="int" />
+			<param index="3" name="mipmap" type="int" />
+			<param index="4" name="mipmaps" type="int" default="1" />
+			<param index="5" name="slice_type" type="int" enum="RenderingDevice.TextureSliceType" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_get_data">
 			<return type="PackedByteArray" />
-			<argument index="0" name="texture" type="RID" />
-			<argument index="1" name="layer" type="int" />
+			<param index="0" name="texture" type="RID" />
+			<param index="1" name="layer" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_is_format_supported_for_usage" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="format" type="int" enum="RenderingDevice.DataFormat" />
-			<argument index="1" name="usage_flags" type="int" />
+			<param index="0" name="format" type="int" enum="RenderingDevice.DataFormat" />
+			<param index="1" name="usage_flags" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_is_shared">
 			<return type="bool" />
-			<argument index="0" name="texture" type="RID" />
+			<param index="0" name="texture" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_is_valid">
 			<return type="bool" />
-			<argument index="0" name="texture" type="RID" />
+			<param index="0" name="texture" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_resolve_multisample">
 			<return type="int" enum="Error" />
-			<argument index="0" name="from_texture" type="RID" />
-			<argument index="1" name="to_texture" type="RID" />
-			<argument index="2" name="post_barrier" type="int" default="7" />
+			<param index="0" name="from_texture" type="RID" />
+			<param index="1" name="to_texture" type="RID" />
+			<param index="2" name="post_barrier" type="int" default="7" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_update">
 			<return type="int" enum="Error" />
-			<argument index="0" name="texture" type="RID" />
-			<argument index="1" name="layer" type="int" />
-			<argument index="2" name="data" type="PackedByteArray" />
-			<argument index="3" name="post_barrier" type="int" default="7" />
+			<param index="0" name="texture" type="RID" />
+			<param index="1" name="layer" type="int" />
+			<param index="2" name="data" type="PackedByteArray" />
+			<param index="3" name="post_barrier" type="int" default="7" />
 			<description>
 			</description>
 		</method>
 		<method name="uniform_buffer_create">
 			<return type="RID" />
-			<argument index="0" name="size_bytes" type="int" />
-			<argument index="1" name="data" type="PackedByteArray" default="PackedByteArray()" />
+			<param index="0" name="size_bytes" type="int" />
+			<param index="1" name="data" type="PackedByteArray" default="PackedByteArray()" />
 			<description>
 			</description>
 		</method>
 		<method name="uniform_set_create">
 			<return type="RID" />
-			<argument index="0" name="uniforms" type="Array" />
-			<argument index="1" name="shader" type="RID" />
-			<argument index="2" name="shader_set" type="int" />
+			<param index="0" name="uniforms" type="Array" />
+			<param index="1" name="shader" type="RID" />
+			<param index="2" name="shader_set" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="uniform_set_is_valid">
 			<return type="bool" />
-			<argument index="0" name="uniform_set" type="RID" />
+			<param index="0" name="uniform_set" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="vertex_buffer_create">
 			<return type="RID" />
-			<argument index="0" name="size_bytes" type="int" />
-			<argument index="1" name="data" type="PackedByteArray" default="PackedByteArray()" />
-			<argument index="2" name="use_as_storage" type="bool" default="false" />
+			<param index="0" name="size_bytes" type="int" />
+			<param index="1" name="data" type="PackedByteArray" default="PackedByteArray()" />
+			<param index="2" name="use_as_storage" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
 		<method name="vertex_format_create">
 			<return type="int" />
-			<argument index="0" name="vertex_descriptions" type="RDVertexAttribute[]" />
+			<param index="0" name="vertex_descriptions" type="RDVertexAttribute[]" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/RenderingServer.xml b/doc/classes/RenderingServer.xml
index 9a398b1f33..62351ea9ec 100644
--- a/doc/classes/RenderingServer.xml
+++ b/doc/classes/RenderingServer.xml
@@ -20,9 +20,9 @@
 	<methods>
 		<method name="bake_render_uv2">
 			<return type="Image[]" />
-			<argument index="0" name="base" type="RID" />
-			<argument index="1" name="material_overrides" type="Array" />
-			<argument index="2" name="image_size" type="Vector2i" />
+			<param index="0" name="base" type="RID" />
+			<param index="1" name="material_overrides" type="Array" />
+			<param index="2" name="image_size" type="Vector2i" />
 			<description>
 			</description>
 		</method>
@@ -40,104 +40,104 @@
 		</method>
 		<method name="camera_effects_set_custom_exposure">
 			<return type="void" />
-			<argument index="0" name="camera_effects" type="RID" />
-			<argument index="1" name="enable" type="bool" />
-			<argument index="2" name="exposure" type="float" />
+			<param index="0" name="camera_effects" type="RID" />
+			<param index="1" name="enable" type="bool" />
+			<param index="2" name="exposure" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="camera_effects_set_dof_blur">
 			<return type="void" />
-			<argument index="0" name="camera_effects" type="RID" />
-			<argument index="1" name="far_enable" type="bool" />
-			<argument index="2" name="far_distance" type="float" />
-			<argument index="3" name="far_transition" type="float" />
-			<argument index="4" name="near_enable" type="bool" />
-			<argument index="5" name="near_distance" type="float" />
-			<argument index="6" name="near_transition" type="float" />
-			<argument index="7" name="amount" type="float" />
+			<param index="0" name="camera_effects" type="RID" />
+			<param index="1" name="far_enable" type="bool" />
+			<param index="2" name="far_distance" type="float" />
+			<param index="3" name="far_transition" type="float" />
+			<param index="4" name="near_enable" type="bool" />
+			<param index="5" name="near_distance" type="float" />
+			<param index="6" name="near_transition" type="float" />
+			<param index="7" name="amount" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="camera_effects_set_dof_blur_bokeh_shape">
 			<return type="void" />
-			<argument index="0" name="shape" type="int" enum="RenderingServer.DOFBokehShape" />
+			<param index="0" name="shape" type="int" enum="RenderingServer.DOFBokehShape" />
 			<description>
 			</description>
 		</method>
 		<method name="camera_effects_set_dof_blur_quality">
 			<return type="void" />
-			<argument index="0" name="quality" type="int" enum="RenderingServer.DOFBlurQuality" />
-			<argument index="1" name="use_jitter" type="bool" />
+			<param index="0" name="quality" type="int" enum="RenderingServer.DOFBlurQuality" />
+			<param index="1" name="use_jitter" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="camera_set_camera_effects">
 			<return type="void" />
-			<argument index="0" name="camera" type="RID" />
-			<argument index="1" name="effects" type="RID" />
+			<param index="0" name="camera" type="RID" />
+			<param index="1" name="effects" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="camera_set_cull_mask">
 			<return type="void" />
-			<argument index="0" name="camera" type="RID" />
-			<argument index="1" name="layers" type="int" />
+			<param index="0" name="camera" type="RID" />
+			<param index="1" name="layers" type="int" />
 			<description>
 				Sets the cull mask associated with this camera. The cull mask describes which 3D layers are rendered by this camera. Equivalent to [member Camera3D.cull_mask].
 			</description>
 		</method>
 		<method name="camera_set_environment">
 			<return type="void" />
-			<argument index="0" name="camera" type="RID" />
-			<argument index="1" name="env" type="RID" />
+			<param index="0" name="camera" type="RID" />
+			<param index="1" name="env" type="RID" />
 			<description>
 				Sets the environment used by this camera. Equivalent to [member Camera3D.environment].
 			</description>
 		</method>
 		<method name="camera_set_frustum">
 			<return type="void" />
-			<argument index="0" name="camera" type="RID" />
-			<argument index="1" name="size" type="float" />
-			<argument index="2" name="offset" type="Vector2" />
-			<argument index="3" name="z_near" type="float" />
-			<argument index="4" name="z_far" type="float" />
+			<param index="0" name="camera" type="RID" />
+			<param index="1" name="size" type="float" />
+			<param index="2" name="offset" type="Vector2" />
+			<param index="3" name="z_near" type="float" />
+			<param index="4" name="z_far" type="float" />
 			<description>
-				Sets camera to use frustum projection. This mode allows adjusting the [code]offset[/code] argument to create "tilted frustum" effects.
+				Sets camera to use frustum projection. This mode allows adjusting the [param offset] argument to create "tilted frustum" effects.
 			</description>
 		</method>
 		<method name="camera_set_orthogonal">
 			<return type="void" />
-			<argument index="0" name="camera" type="RID" />
-			<argument index="1" name="size" type="float" />
-			<argument index="2" name="z_near" type="float" />
-			<argument index="3" name="z_far" type="float" />
+			<param index="0" name="camera" type="RID" />
+			<param index="1" name="size" type="float" />
+			<param index="2" name="z_near" type="float" />
+			<param index="3" name="z_far" type="float" />
 			<description>
 				Sets camera to use orthogonal projection, also known as orthographic projection. Objects remain the same size on the screen no matter how far away they are.
 			</description>
 		</method>
 		<method name="camera_set_perspective">
 			<return type="void" />
-			<argument index="0" name="camera" type="RID" />
-			<argument index="1" name="fovy_degrees" type="float" />
-			<argument index="2" name="z_near" type="float" />
-			<argument index="3" name="z_far" type="float" />
+			<param index="0" name="camera" type="RID" />
+			<param index="1" name="fovy_degrees" type="float" />
+			<param index="2" name="z_near" type="float" />
+			<param index="3" name="z_far" type="float" />
 			<description>
 				Sets camera to use perspective projection. Objects on the screen becomes smaller when they are far away.
 			</description>
 		</method>
 		<method name="camera_set_transform">
 			<return type="void" />
-			<argument index="0" name="camera" type="RID" />
-			<argument index="1" name="transform" type="Transform3D" />
+			<param index="0" name="camera" type="RID" />
+			<param index="1" name="transform" type="Transform3D" />
 			<description>
 				Sets [Transform3D] of camera.
 			</description>
 		</method>
 		<method name="camera_set_use_vertical_aspect">
 			<return type="void" />
-			<argument index="0" name="camera" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="camera" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				If [code]true[/code], preserves the horizontal aspect ratio which is equivalent to [constant Camera3D.KEEP_WIDTH]. If [code]false[/code], preserves the vertical aspect ratio which is equivalent to [constant Camera3D.KEEP_HEIGHT].
 			</description>
@@ -151,181 +151,181 @@
 		</method>
 		<method name="canvas_item_add_animation_slice">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="animation_length" type="float" />
-			<argument index="2" name="slice_begin" type="float" />
-			<argument index="3" name="slice_end" type="float" />
-			<argument index="4" name="offset" type="float" default="0.0" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="animation_length" type="float" />
+			<param index="2" name="slice_begin" type="float" />
+			<param index="3" name="slice_end" type="float" />
+			<param index="4" name="offset" type="float" default="0.0" />
 			<description>
 				Subsequent drawing commands will be ignored unless they fall within the specified animation slice. This is a faster way to implement animations that loop on background rather than redrawing constantly.
 			</description>
 		</method>
 		<method name="canvas_item_add_circle">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="radius" type="float" />
-			<argument index="3" name="color" type="Color" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="radius" type="float" />
+			<param index="3" name="color" type="Color" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_add_clip_ignore">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="ignore" type="bool" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="ignore" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_add_line">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="from" type="Vector2" />
-			<argument index="2" name="to" type="Vector2" />
-			<argument index="3" name="color" type="Color" />
-			<argument index="4" name="width" type="float" default="1.0" />
-			<argument index="5" name="antialiased" type="bool" default="false" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="from" type="Vector2" />
+			<param index="2" name="to" type="Vector2" />
+			<param index="3" name="color" type="Color" />
+			<param index="4" name="width" type="float" default="1.0" />
+			<param index="5" name="antialiased" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_add_mesh">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="mesh" type="RID" />
-			<argument index="2" name="transform" type="Transform2D" default="Transform2D(1, 0, 0, 1, 0, 0)" />
-			<argument index="3" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="4" name="texture" type="RID" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="mesh" type="RID" />
+			<param index="2" name="transform" type="Transform2D" default="Transform2D(1, 0, 0, 1, 0, 0)" />
+			<param index="3" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="4" name="texture" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_add_msdf_texture_rect_region">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="rect" type="Rect2" />
-			<argument index="2" name="texture" type="RID" />
-			<argument index="3" name="src_rect" type="Rect2" />
-			<argument index="4" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="5" name="outline_size" type="int" default="0" />
-			<argument index="6" name="px_range" type="float" default="1.0" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="rect" type="Rect2" />
+			<param index="2" name="texture" type="RID" />
+			<param index="3" name="src_rect" type="Rect2" />
+			<param index="4" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="5" name="outline_size" type="int" default="0" />
+			<param index="6" name="px_range" type="float" default="1.0" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_add_multimesh">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="mesh" type="RID" />
-			<argument index="2" name="texture" type="RID" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="mesh" type="RID" />
+			<param index="2" name="texture" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_add_nine_patch">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="rect" type="Rect2" />
-			<argument index="2" name="source" type="Rect2" />
-			<argument index="3" name="texture" type="RID" />
-			<argument index="4" name="topleft" type="Vector2" />
-			<argument index="5" name="bottomright" type="Vector2" />
-			<argument index="6" name="x_axis_mode" type="int" enum="RenderingServer.NinePatchAxisMode" default="0" />
-			<argument index="7" name="y_axis_mode" type="int" enum="RenderingServer.NinePatchAxisMode" default="0" />
-			<argument index="8" name="draw_center" type="bool" default="true" />
-			<argument index="9" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="rect" type="Rect2" />
+			<param index="2" name="source" type="Rect2" />
+			<param index="3" name="texture" type="RID" />
+			<param index="4" name="topleft" type="Vector2" />
+			<param index="5" name="bottomright" type="Vector2" />
+			<param index="6" name="x_axis_mode" type="int" enum="RenderingServer.NinePatchAxisMode" default="0" />
+			<param index="7" name="y_axis_mode" type="int" enum="RenderingServer.NinePatchAxisMode" default="0" />
+			<param index="8" name="draw_center" type="bool" default="true" />
+			<param index="9" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_add_particles">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="particles" type="RID" />
-			<argument index="2" name="texture" type="RID" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="particles" type="RID" />
+			<param index="2" name="texture" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_add_polygon">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="points" type="PackedVector2Array" />
-			<argument index="2" name="colors" type="PackedColorArray" />
-			<argument index="3" name="uvs" type="PackedVector2Array" default="PackedVector2Array()" />
-			<argument index="4" name="texture" type="RID" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="points" type="PackedVector2Array" />
+			<param index="2" name="colors" type="PackedColorArray" />
+			<param index="3" name="uvs" type="PackedVector2Array" default="PackedVector2Array()" />
+			<param index="4" name="texture" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_add_polyline">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="points" type="PackedVector2Array" />
-			<argument index="2" name="colors" type="PackedColorArray" />
-			<argument index="3" name="width" type="float" default="1.0" />
-			<argument index="4" name="antialiased" type="bool" default="false" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="points" type="PackedVector2Array" />
+			<param index="2" name="colors" type="PackedColorArray" />
+			<param index="3" name="width" type="float" default="1.0" />
+			<param index="4" name="antialiased" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_add_primitive">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="points" type="PackedVector2Array" />
-			<argument index="2" name="colors" type="PackedColorArray" />
-			<argument index="3" name="uvs" type="PackedVector2Array" />
-			<argument index="4" name="texture" type="RID" />
-			<argument index="5" name="width" type="float" default="1.0" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="points" type="PackedVector2Array" />
+			<param index="2" name="colors" type="PackedColorArray" />
+			<param index="3" name="uvs" type="PackedVector2Array" />
+			<param index="4" name="texture" type="RID" />
+			<param index="5" name="width" type="float" default="1.0" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_add_rect">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="rect" type="Rect2" />
-			<argument index="2" name="color" type="Color" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="rect" type="Rect2" />
+			<param index="2" name="color" type="Color" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_add_set_transform">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="transform" type="Transform2D" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="transform" type="Transform2D" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_add_texture_rect">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="rect" type="Rect2" />
-			<argument index="2" name="texture" type="RID" />
-			<argument index="3" name="tile" type="bool" default="false" />
-			<argument index="4" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="5" name="transpose" type="bool" default="false" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="rect" type="Rect2" />
+			<param index="2" name="texture" type="RID" />
+			<param index="3" name="tile" type="bool" default="false" />
+			<param index="4" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="5" name="transpose" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_add_texture_rect_region">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="rect" type="Rect2" />
-			<argument index="2" name="texture" type="RID" />
-			<argument index="3" name="src_rect" type="Rect2" />
-			<argument index="4" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="5" name="transpose" type="bool" default="false" />
-			<argument index="6" name="clip_uv" type="bool" default="true" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="rect" type="Rect2" />
+			<param index="2" name="texture" type="RID" />
+			<param index="3" name="src_rect" type="Rect2" />
+			<param index="4" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="5" name="transpose" type="bool" default="false" />
+			<param index="6" name="clip_uv" type="bool" default="true" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_add_triangle_array">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="indices" type="PackedInt32Array" />
-			<argument index="2" name="points" type="PackedVector2Array" />
-			<argument index="3" name="colors" type="PackedColorArray" />
-			<argument index="4" name="uvs" type="PackedVector2Array" default="PackedVector2Array()" />
-			<argument index="5" name="bones" type="PackedInt32Array" default="PackedInt32Array()" />
-			<argument index="6" name="weights" type="PackedFloat32Array" default="PackedFloat32Array()" />
-			<argument index="7" name="texture" type="RID" />
-			<argument index="8" name="count" type="int" default="-1" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="indices" type="PackedInt32Array" />
+			<param index="2" name="points" type="PackedVector2Array" />
+			<param index="3" name="colors" type="PackedColorArray" />
+			<param index="4" name="uvs" type="PackedVector2Array" default="PackedVector2Array()" />
+			<param index="5" name="bones" type="PackedInt32Array" default="PackedInt32Array()" />
+			<param index="6" name="weights" type="PackedFloat32Array" default="PackedFloat32Array()" />
+			<param index="7" name="texture" type="RID" />
+			<param index="8" name="count" type="int" default="-1" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_clear">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
+			<param index="0" name="item" type="RID" />
 			<description>
 				Clears the [CanvasItem] and removes all commands in it.
 			</description>
@@ -337,170 +337,170 @@
 		</method>
 		<method name="canvas_item_set_canvas_group_mode">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="mode" type="int" enum="RenderingServer.CanvasGroupMode" />
-			<argument index="2" name="clear_margin" type="float" default="5.0" />
-			<argument index="3" name="fit_empty" type="bool" default="false" />
-			<argument index="4" name="fit_margin" type="float" default="0.0" />
-			<argument index="5" name="blur_mipmaps" type="bool" default="false" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="mode" type="int" enum="RenderingServer.CanvasGroupMode" />
+			<param index="2" name="clear_margin" type="float" default="5.0" />
+			<param index="3" name="fit_empty" type="bool" default="false" />
+			<param index="4" name="fit_margin" type="float" default="0.0" />
+			<param index="5" name="blur_mipmaps" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_set_clip">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="clip" type="bool" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="clip" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_set_copy_to_backbuffer">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
-			<argument index="2" name="rect" type="Rect2" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="enabled" type="bool" />
+			<param index="2" name="rect" type="Rect2" />
 			<description>
 				Sets the [CanvasItem] to copy a rect to the backbuffer.
 			</description>
 		</method>
 		<method name="canvas_item_set_custom_rect">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="use_custom_rect" type="bool" />
-			<argument index="2" name="rect" type="Rect2" default="Rect2(0, 0, 0, 0)" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="use_custom_rect" type="bool" />
+			<param index="2" name="rect" type="Rect2" default="Rect2(0, 0, 0, 0)" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_set_default_texture_filter">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="filter" type="int" enum="RenderingServer.CanvasItemTextureFilter" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="filter" type="int" enum="RenderingServer.CanvasItemTextureFilter" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_set_default_texture_repeat">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="repeat" type="int" enum="RenderingServer.CanvasItemTextureRepeat" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="repeat" type="int" enum="RenderingServer.CanvasItemTextureRepeat" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_set_distance_field_mode">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_set_draw_behind_parent">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_set_draw_index">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="index" type="int" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="index" type="int" />
 			<description>
 				Sets the index for the [CanvasItem].
 			</description>
 		</method>
 		<method name="canvas_item_set_light_mask">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="mask" type="int" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="mask" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_set_material">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="material" type="RID" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="material" type="RID" />
 			<description>
 				Sets a new material to the [CanvasItem].
 			</description>
 		</method>
 		<method name="canvas_item_set_modulate">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="color" type="Color" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_set_parent">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="parent" type="RID" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="parent" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_set_self_modulate">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="color" type="Color" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_set_sort_children_by_y">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_set_transform">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="transform" type="Transform2D" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="transform" type="Transform2D" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_set_use_parent_material">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				Sets if the [CanvasItem] uses its parent's material.
 			</description>
 		</method>
 		<method name="canvas_item_set_visibility_notifier">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="enable" type="bool" />
-			<argument index="2" name="area" type="Rect2" />
-			<argument index="3" name="enter_callable" type="Callable" />
-			<argument index="4" name="exit_callable" type="Callable" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="enable" type="bool" />
+			<param index="2" name="area" type="Rect2" />
+			<param index="3" name="enter_callable" type="Callable" />
+			<param index="4" name="exit_callable" type="Callable" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_set_visible">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="visible" type="bool" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="visible" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_item_set_z_as_relative_to_parent">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				If this is enabled, the Z index of the parent will be added to the children's Z index.
 			</description>
 		</method>
 		<method name="canvas_item_set_z_index">
 			<return type="void" />
-			<argument index="0" name="item" type="RID" />
-			<argument index="1" name="z_index" type="int" />
+			<param index="0" name="item" type="RID" />
+			<param index="1" name="z_index" type="int" />
 			<description>
 				Sets the [CanvasItem]'s Z index, i.e. its draw order (lower indexes are drawn first).
 			</description>
 		</method>
 		<method name="canvas_light_attach_to_canvas">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="canvas" type="RID" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="canvas" type="RID" />
 			<description>
 				Attaches the canvas light to the canvas. Removes it from its previous canvas.
 			</description>
@@ -514,8 +514,8 @@
 		</method>
 		<method name="canvas_light_occluder_attach_to_canvas">
 			<return type="void" />
-			<argument index="0" name="occluder" type="RID" />
-			<argument index="1" name="canvas" type="RID" />
+			<param index="0" name="occluder" type="RID" />
+			<param index="1" name="canvas" type="RID" />
 			<description>
 				Attaches a light occluder to the canvas. Removes it from its previous canvas.
 			</description>
@@ -529,177 +529,177 @@
 		</method>
 		<method name="canvas_light_occluder_set_as_sdf_collision">
 			<return type="void" />
-			<argument index="0" name="occluder" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="occluder" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_light_occluder_set_enabled">
 			<return type="void" />
-			<argument index="0" name="occluder" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="occluder" type="RID" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				Enables or disables light occluder.
 			</description>
 		</method>
 		<method name="canvas_light_occluder_set_light_mask">
 			<return type="void" />
-			<argument index="0" name="occluder" type="RID" />
-			<argument index="1" name="mask" type="int" />
+			<param index="0" name="occluder" type="RID" />
+			<param index="1" name="mask" type="int" />
 			<description>
 				The light mask. See [LightOccluder2D] for more information on light masks.
 			</description>
 		</method>
 		<method name="canvas_light_occluder_set_polygon">
 			<return type="void" />
-			<argument index="0" name="occluder" type="RID" />
-			<argument index="1" name="polygon" type="RID" />
+			<param index="0" name="occluder" type="RID" />
+			<param index="1" name="polygon" type="RID" />
 			<description>
 				Sets a light occluder's polygon.
 			</description>
 		</method>
 		<method name="canvas_light_occluder_set_transform">
 			<return type="void" />
-			<argument index="0" name="occluder" type="RID" />
-			<argument index="1" name="transform" type="Transform2D" />
+			<param index="0" name="occluder" type="RID" />
+			<param index="1" name="transform" type="Transform2D" />
 			<description>
 				Sets a light occluder's [Transform2D].
 			</description>
 		</method>
 		<method name="canvas_light_set_color">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="color" type="Color" />
 			<description>
 				Sets the color for a light.
 			</description>
 		</method>
 		<method name="canvas_light_set_enabled">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				Enables or disables a canvas light.
 			</description>
 		</method>
 		<method name="canvas_light_set_energy">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="energy" type="float" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="energy" type="float" />
 			<description>
 				Sets a canvas light's energy.
 			</description>
 		</method>
 		<method name="canvas_light_set_height">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="height" type="float" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="height" type="float" />
 			<description>
 				Sets a canvas light's height.
 			</description>
 		</method>
 		<method name="canvas_light_set_item_cull_mask">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="mask" type="int" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="mask" type="int" />
 			<description>
 				The light mask. See [LightOccluder2D] for more information on light masks.
 			</description>
 		</method>
 		<method name="canvas_light_set_item_shadow_cull_mask">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="mask" type="int" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="mask" type="int" />
 			<description>
 				The binary mask used to determine which layers this canvas light's shadows affects. See [LightOccluder2D] for more information on light masks.
 			</description>
 		</method>
 		<method name="canvas_light_set_layer_range">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="min_layer" type="int" />
-			<argument index="2" name="max_layer" type="int" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="min_layer" type="int" />
+			<param index="2" name="max_layer" type="int" />
 			<description>
 				The layer range that gets rendered with this light.
 			</description>
 		</method>
 		<method name="canvas_light_set_mode">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="mode" type="int" enum="RenderingServer.CanvasLightMode" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="mode" type="int" enum="RenderingServer.CanvasLightMode" />
 			<description>
 				The mode of the light, see [enum CanvasLightMode] constants.
 			</description>
 		</method>
 		<method name="canvas_light_set_shadow_color">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="color" type="Color" />
 			<description>
 				Sets the color of the canvas light's shadow.
 			</description>
 		</method>
 		<method name="canvas_light_set_shadow_enabled">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				Enables or disables the canvas light's shadow.
 			</description>
 		</method>
 		<method name="canvas_light_set_shadow_filter">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="filter" type="int" enum="RenderingServer.CanvasLightShadowFilter" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="filter" type="int" enum="RenderingServer.CanvasLightShadowFilter" />
 			<description>
 				Sets the canvas light's shadow's filter, see [enum CanvasLightShadowFilter] constants.
 			</description>
 		</method>
 		<method name="canvas_light_set_shadow_smooth">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="smooth" type="float" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="smooth" type="float" />
 			<description>
 				Smoothens the shadow. The lower, the smoother.
 			</description>
 		</method>
 		<method name="canvas_light_set_texture">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="texture" type="RID" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="texture" type="RID" />
 			<description>
 				Sets the texture to be used by a [PointLight2D]. Equivalent to [member PointLight2D.texture].
 			</description>
 		</method>
 		<method name="canvas_light_set_texture_offset">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="offset" type="Vector2" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="offset" type="Vector2" />
 			<description>
 				Sets the offset of a [PointLight2D]'s texture. Equivalent to [member PointLight2D.offset].
 			</description>
 		</method>
 		<method name="canvas_light_set_texture_scale">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="scale" type="float" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="scale" type="float" />
 			<description>
 				Sets the scale factor of a [PointLight2D]'s texture. Equivalent to [member PointLight2D.texture_scale].
 			</description>
 		</method>
 		<method name="canvas_light_set_transform">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="transform" type="Transform2D" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="transform" type="Transform2D" />
 			<description>
 				Sets the canvas light's [Transform2D].
 			</description>
 		</method>
 		<method name="canvas_light_set_z_range">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="min_z" type="int" />
-			<argument index="2" name="max_z" type="int" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="min_z" type="int" />
+			<param index="2" name="max_z" type="int" />
 			<description>
 				Sets the Z range of objects that will be affected by this light. Equivalent to [member Light2D.range_z_min] and [member Light2D.range_z_max].
 			</description>
@@ -713,47 +713,47 @@
 		</method>
 		<method name="canvas_occluder_polygon_set_cull_mode">
 			<return type="void" />
-			<argument index="0" name="occluder_polygon" type="RID" />
-			<argument index="1" name="mode" type="int" enum="RenderingServer.CanvasOccluderPolygonCullMode" />
+			<param index="0" name="occluder_polygon" type="RID" />
+			<param index="1" name="mode" type="int" enum="RenderingServer.CanvasOccluderPolygonCullMode" />
 			<description>
 				Sets an occluder polygons cull mode. See [enum CanvasOccluderPolygonCullMode] constants.
 			</description>
 		</method>
 		<method name="canvas_occluder_polygon_set_shape">
 			<return type="void" />
-			<argument index="0" name="occluder_polygon" type="RID" />
-			<argument index="1" name="shape" type="PackedVector2Array" />
-			<argument index="2" name="closed" type="bool" />
+			<param index="0" name="occluder_polygon" type="RID" />
+			<param index="1" name="shape" type="PackedVector2Array" />
+			<param index="2" name="closed" type="bool" />
 			<description>
 				Sets the shape of the occluder polygon.
 			</description>
 		</method>
 		<method name="canvas_set_disable_scale">
 			<return type="void" />
-			<argument index="0" name="disable" type="bool" />
+			<param index="0" name="disable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_set_item_mirroring">
 			<return type="void" />
-			<argument index="0" name="canvas" type="RID" />
-			<argument index="1" name="item" type="RID" />
-			<argument index="2" name="mirroring" type="Vector2" />
+			<param index="0" name="canvas" type="RID" />
+			<param index="1" name="item" type="RID" />
+			<param index="2" name="mirroring" type="Vector2" />
 			<description>
 				A copy of the canvas item will be drawn with a local offset of the mirroring [Vector2].
 			</description>
 		</method>
 		<method name="canvas_set_modulate">
 			<return type="void" />
-			<argument index="0" name="canvas" type="RID" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="canvas" type="RID" />
+			<param index="1" name="color" type="Color" />
 			<description>
 				Modulates all colors in the given canvas.
 			</description>
 		</method>
 		<method name="canvas_set_shadow_texture_size">
 			<return type="void" />
-			<argument index="0" name="size" type="int" />
+			<param index="0" name="size" type="int" />
 			<description>
 			</description>
 		</method>
@@ -764,31 +764,31 @@
 		</method>
 		<method name="canvas_texture_set_channel">
 			<return type="void" />
-			<argument index="0" name="canvas_texture" type="RID" />
-			<argument index="1" name="channel" type="int" enum="RenderingServer.CanvasTextureChannel" />
-			<argument index="2" name="texture" type="RID" />
+			<param index="0" name="canvas_texture" type="RID" />
+			<param index="1" name="channel" type="int" enum="RenderingServer.CanvasTextureChannel" />
+			<param index="2" name="texture" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_texture_set_shading_parameters">
 			<return type="void" />
-			<argument index="0" name="canvas_texture" type="RID" />
-			<argument index="1" name="base_color" type="Color" />
-			<argument index="2" name="shininess" type="float" />
+			<param index="0" name="canvas_texture" type="RID" />
+			<param index="1" name="base_color" type="Color" />
+			<param index="2" name="shininess" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_texture_set_texture_filter">
 			<return type="void" />
-			<argument index="0" name="canvas_texture" type="RID" />
-			<argument index="1" name="filter" type="int" enum="RenderingServer.CanvasItemTextureFilter" />
+			<param index="0" name="canvas_texture" type="RID" />
+			<param index="1" name="filter" type="int" enum="RenderingServer.CanvasItemTextureFilter" />
 			<description>
 			</description>
 		</method>
 		<method name="canvas_texture_set_texture_repeat">
 			<return type="void" />
-			<argument index="0" name="canvas_texture" type="RID" />
-			<argument index="1" name="repeat" type="int" enum="RenderingServer.CanvasItemTextureRepeat" />
+			<param index="0" name="canvas_texture" type="RID" />
+			<param index="1" name="repeat" type="int" enum="RenderingServer.CanvasItemTextureRepeat" />
 			<description>
 			</description>
 		</method>
@@ -804,74 +804,74 @@
 		</method>
 		<method name="decal_set_albedo_mix">
 			<return type="void" />
-			<argument index="0" name="decal" type="RID" />
-			<argument index="1" name="albedo_mix" type="float" />
+			<param index="0" name="decal" type="RID" />
+			<param index="1" name="albedo_mix" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="decal_set_cull_mask">
 			<return type="void" />
-			<argument index="0" name="decal" type="RID" />
-			<argument index="1" name="mask" type="int" />
+			<param index="0" name="decal" type="RID" />
+			<param index="1" name="mask" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="decal_set_distance_fade">
 			<return type="void" />
-			<argument index="0" name="decal" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
-			<argument index="2" name="begin" type="float" />
-			<argument index="3" name="length" type="float" />
+			<param index="0" name="decal" type="RID" />
+			<param index="1" name="enabled" type="bool" />
+			<param index="2" name="begin" type="float" />
+			<param index="3" name="length" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="decal_set_emission_energy">
 			<return type="void" />
-			<argument index="0" name="decal" type="RID" />
-			<argument index="1" name="energy" type="float" />
+			<param index="0" name="decal" type="RID" />
+			<param index="1" name="energy" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="decal_set_extents">
 			<return type="void" />
-			<argument index="0" name="decal" type="RID" />
-			<argument index="1" name="extents" type="Vector3" />
+			<param index="0" name="decal" type="RID" />
+			<param index="1" name="extents" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="decal_set_fade">
 			<return type="void" />
-			<argument index="0" name="decal" type="RID" />
-			<argument index="1" name="above" type="float" />
-			<argument index="2" name="below" type="float" />
+			<param index="0" name="decal" type="RID" />
+			<param index="1" name="above" type="float" />
+			<param index="2" name="below" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="decal_set_modulate">
 			<return type="void" />
-			<argument index="0" name="decal" type="RID" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="decal" type="RID" />
+			<param index="1" name="color" type="Color" />
 			<description>
 			</description>
 		</method>
 		<method name="decal_set_normal_fade">
 			<return type="void" />
-			<argument index="0" name="decal" type="RID" />
-			<argument index="1" name="fade" type="float" />
+			<param index="0" name="decal" type="RID" />
+			<param index="1" name="fade" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="decal_set_texture">
 			<return type="void" />
-			<argument index="0" name="decal" type="RID" />
-			<argument index="1" name="type" type="int" enum="RenderingServer.DecalTexture" />
-			<argument index="2" name="texture" type="RID" />
+			<param index="0" name="decal" type="RID" />
+			<param index="1" name="type" type="int" enum="RenderingServer.DecalTexture" />
+			<param index="2" name="texture" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="decals_set_filter">
 			<return type="void" />
-			<argument index="0" name="filter" type="int" enum="RenderingServer.DecalFilter" />
+			<param index="0" name="filter" type="int" enum="RenderingServer.DecalFilter" />
 			<description>
 			</description>
 		</method>
@@ -885,22 +885,22 @@
 		</method>
 		<method name="directional_shadow_atlas_set_size">
 			<return type="void" />
-			<argument index="0" name="size" type="int" />
-			<argument index="1" name="is_16bits" type="bool" />
+			<param index="0" name="size" type="int" />
+			<param index="1" name="is_16bits" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="directional_soft_shadow_filter_set_quality">
 			<return type="void" />
-			<argument index="0" name="quality" type="int" enum="RenderingServer.ShadowQuality" />
+			<param index="0" name="quality" type="int" enum="RenderingServer.ShadowQuality" />
 			<description>
 			</description>
 		</method>
 		<method name="environment_bake_panorama">
 			<return type="Image" />
-			<argument index="0" name="environment" type="RID" />
-			<argument index="1" name="bake_irradiance" type="bool" />
-			<argument index="2" name="size" type="Vector2i" />
+			<param index="0" name="environment" type="RID" />
+			<param index="1" name="bake_irradiance" type="bool" />
+			<param index="2" name="size" type="Vector2i" />
 			<description>
 			</description>
 		</method>
@@ -913,266 +913,266 @@
 		</method>
 		<method name="environment_glow_set_use_bicubic_upscale">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
+			<param index="0" name="enable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="environment_glow_set_use_high_quality">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
+			<param index="0" name="enable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="environment_set_adjustment">
 			<return type="void" />
-			<argument index="0" name="env" type="RID" />
-			<argument index="1" name="enable" type="bool" />
-			<argument index="2" name="brightness" type="float" />
-			<argument index="3" name="contrast" type="float" />
-			<argument index="4" name="saturation" type="float" />
-			<argument index="5" name="use_1d_color_correction" type="bool" />
-			<argument index="6" name="color_correction" type="RID" />
+			<param index="0" name="env" type="RID" />
+			<param index="1" name="enable" type="bool" />
+			<param index="2" name="brightness" type="float" />
+			<param index="3" name="contrast" type="float" />
+			<param index="4" name="saturation" type="float" />
+			<param index="5" name="use_1d_color_correction" type="bool" />
+			<param index="6" name="color_correction" type="RID" />
 			<description>
 				Sets the values to be used with the "Adjustment" post-process effect. See [Environment] for more details.
 			</description>
 		</method>
 		<method name="environment_set_ambient_light">
 			<return type="void" />
-			<argument index="0" name="env" type="RID" />
-			<argument index="1" name="color" type="Color" />
-			<argument index="2" name="ambient" type="int" enum="RenderingServer.EnvironmentAmbientSource" default="0" />
-			<argument index="3" name="energy" type="float" default="1.0" />
-			<argument index="4" name="sky_contibution" type="float" default="0.0" />
-			<argument index="5" name="reflection_source" type="int" enum="RenderingServer.EnvironmentReflectionSource" default="0" />
+			<param index="0" name="env" type="RID" />
+			<param index="1" name="color" type="Color" />
+			<param index="2" name="ambient" type="int" enum="RenderingServer.EnvironmentAmbientSource" default="0" />
+			<param index="3" name="energy" type="float" default="1.0" />
+			<param index="4" name="sky_contibution" type="float" default="0.0" />
+			<param index="5" name="reflection_source" type="int" enum="RenderingServer.EnvironmentReflectionSource" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="environment_set_background">
 			<return type="void" />
-			<argument index="0" name="env" type="RID" />
-			<argument index="1" name="bg" type="int" enum="RenderingServer.EnvironmentBG" />
+			<param index="0" name="env" type="RID" />
+			<param index="1" name="bg" type="int" enum="RenderingServer.EnvironmentBG" />
 			<description>
 				Sets the [i]BGMode[/i] of the environment. Equivalent to [member Environment.background_mode].
 			</description>
 		</method>
 		<method name="environment_set_bg_color">
 			<return type="void" />
-			<argument index="0" name="env" type="RID" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="env" type="RID" />
+			<param index="1" name="color" type="Color" />
 			<description>
 				Color displayed for clear areas of the scene (if using Custom color or Color+Sky background modes).
 			</description>
 		</method>
 		<method name="environment_set_bg_energy">
 			<return type="void" />
-			<argument index="0" name="env" type="RID" />
-			<argument index="1" name="energy" type="float" />
+			<param index="0" name="env" type="RID" />
+			<param index="1" name="energy" type="float" />
 			<description>
 				Sets the intensity of the background color.
 			</description>
 		</method>
 		<method name="environment_set_canvas_max_layer">
 			<return type="void" />
-			<argument index="0" name="env" type="RID" />
-			<argument index="1" name="max_layer" type="int" />
+			<param index="0" name="env" type="RID" />
+			<param index="1" name="max_layer" type="int" />
 			<description>
 				Sets the maximum layer to use if using Canvas background mode.
 			</description>
 		</method>
 		<method name="environment_set_fog">
 			<return type="void" />
-			<argument index="0" name="env" type="RID" />
-			<argument index="1" name="enable" type="bool" />
-			<argument index="2" name="light_color" type="Color" />
-			<argument index="3" name="light_energy" type="float" />
-			<argument index="4" name="sun_scatter" type="float" />
-			<argument index="5" name="density" type="float" />
-			<argument index="6" name="height" type="float" />
-			<argument index="7" name="height_density" type="float" />
-			<argument index="8" name="aerial_perspective" type="float" />
+			<param index="0" name="env" type="RID" />
+			<param index="1" name="enable" type="bool" />
+			<param index="2" name="light_color" type="Color" />
+			<param index="3" name="light_energy" type="float" />
+			<param index="4" name="sun_scatter" type="float" />
+			<param index="5" name="density" type="float" />
+			<param index="6" name="height" type="float" />
+			<param index="7" name="height_density" type="float" />
+			<param index="8" name="aerial_perspective" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="environment_set_glow">
 			<return type="void" />
-			<argument index="0" name="env" type="RID" />
-			<argument index="1" name="enable" type="bool" />
-			<argument index="2" name="levels" type="PackedFloat32Array" />
-			<argument index="3" name="intensity" type="float" />
-			<argument index="4" name="strength" type="float" />
-			<argument index="5" name="mix" type="float" />
-			<argument index="6" name="bloom_threshold" type="float" />
-			<argument index="7" name="blend_mode" type="int" enum="RenderingServer.EnvironmentGlowBlendMode" />
-			<argument index="8" name="hdr_bleed_threshold" type="float" />
-			<argument index="9" name="hdr_bleed_scale" type="float" />
-			<argument index="10" name="hdr_luminance_cap" type="float" />
-			<argument index="11" name="glow_map_strength" type="float" />
-			<argument index="12" name="glow_map" type="RID" />
+			<param index="0" name="env" type="RID" />
+			<param index="1" name="enable" type="bool" />
+			<param index="2" name="levels" type="PackedFloat32Array" />
+			<param index="3" name="intensity" type="float" />
+			<param index="4" name="strength" type="float" />
+			<param index="5" name="mix" type="float" />
+			<param index="6" name="bloom_threshold" type="float" />
+			<param index="7" name="blend_mode" type="int" enum="RenderingServer.EnvironmentGlowBlendMode" />
+			<param index="8" name="hdr_bleed_threshold" type="float" />
+			<param index="9" name="hdr_bleed_scale" type="float" />
+			<param index="10" name="hdr_luminance_cap" type="float" />
+			<param index="11" name="glow_map_strength" type="float" />
+			<param index="12" name="glow_map" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="environment_set_sdfgi">
 			<return type="void" />
-			<argument index="0" name="env" type="RID" />
-			<argument index="1" name="enable" type="bool" />
-			<argument index="2" name="cascades" type="int" />
-			<argument index="3" name="min_cell_size" type="float" />
-			<argument index="4" name="y_scale" type="int" enum="RenderingServer.EnvironmentSDFGIYScale" />
-			<argument index="5" name="use_occlusion" type="bool" />
-			<argument index="6" name="bounce_feedback" type="float" />
-			<argument index="7" name="read_sky" type="bool" />
-			<argument index="8" name="energy" type="float" />
-			<argument index="9" name="normal_bias" type="float" />
-			<argument index="10" name="probe_bias" type="float" />
+			<param index="0" name="env" type="RID" />
+			<param index="1" name="enable" type="bool" />
+			<param index="2" name="cascades" type="int" />
+			<param index="3" name="min_cell_size" type="float" />
+			<param index="4" name="y_scale" type="int" enum="RenderingServer.EnvironmentSDFGIYScale" />
+			<param index="5" name="use_occlusion" type="bool" />
+			<param index="6" name="bounce_feedback" type="float" />
+			<param index="7" name="read_sky" type="bool" />
+			<param index="8" name="energy" type="float" />
+			<param index="9" name="normal_bias" type="float" />
+			<param index="10" name="probe_bias" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="environment_set_sdfgi_frames_to_converge">
 			<return type="void" />
-			<argument index="0" name="frames" type="int" enum="RenderingServer.EnvironmentSDFGIFramesToConverge" />
+			<param index="0" name="frames" type="int" enum="RenderingServer.EnvironmentSDFGIFramesToConverge" />
 			<description>
 			</description>
 		</method>
 		<method name="environment_set_sdfgi_frames_to_update_light">
 			<return type="void" />
-			<argument index="0" name="frames" type="int" enum="RenderingServer.EnvironmentSDFGIFramesToUpdateLight" />
+			<param index="0" name="frames" type="int" enum="RenderingServer.EnvironmentSDFGIFramesToUpdateLight" />
 			<description>
 			</description>
 		</method>
 		<method name="environment_set_sdfgi_ray_count">
 			<return type="void" />
-			<argument index="0" name="ray_count" type="int" enum="RenderingServer.EnvironmentSDFGIRayCount" />
+			<param index="0" name="ray_count" type="int" enum="RenderingServer.EnvironmentSDFGIRayCount" />
 			<description>
 			</description>
 		</method>
 		<method name="environment_set_sky">
 			<return type="void" />
-			<argument index="0" name="env" type="RID" />
-			<argument index="1" name="sky" type="RID" />
+			<param index="0" name="env" type="RID" />
+			<param index="1" name="sky" type="RID" />
 			<description>
 				Sets the [Sky] to be used as the environment's background when using [i]BGMode[/i] sky. Equivalent to [member Environment.sky].
 			</description>
 		</method>
 		<method name="environment_set_sky_custom_fov">
 			<return type="void" />
-			<argument index="0" name="env" type="RID" />
-			<argument index="1" name="scale" type="float" />
+			<param index="0" name="env" type="RID" />
+			<param index="1" name="scale" type="float" />
 			<description>
 				Sets a custom field of view for the background [Sky]. Equivalent to [member Environment.sky_custom_fov].
 			</description>
 		</method>
 		<method name="environment_set_sky_orientation">
 			<return type="void" />
-			<argument index="0" name="env" type="RID" />
-			<argument index="1" name="orientation" type="Basis" />
+			<param index="0" name="env" type="RID" />
+			<param index="1" name="orientation" type="Basis" />
 			<description>
 				Sets the rotation of the background [Sky] expressed as a [Basis]. Equivalent to [member Environment.sky_rotation], where the rotation vector is used to construct the [Basis].
 			</description>
 		</method>
 		<method name="environment_set_ssao">
 			<return type="void" />
-			<argument index="0" name="env" type="RID" />
-			<argument index="1" name="enable" type="bool" />
-			<argument index="2" name="radius" type="float" />
-			<argument index="3" name="intensity" type="float" />
-			<argument index="4" name="power" type="float" />
-			<argument index="5" name="detail" type="float" />
-			<argument index="6" name="horizon" type="float" />
-			<argument index="7" name="sharpness" type="float" />
-			<argument index="8" name="light_affect" type="float" />
-			<argument index="9" name="ao_channel_affect" type="float" />
+			<param index="0" name="env" type="RID" />
+			<param index="1" name="enable" type="bool" />
+			<param index="2" name="radius" type="float" />
+			<param index="3" name="intensity" type="float" />
+			<param index="4" name="power" type="float" />
+			<param index="5" name="detail" type="float" />
+			<param index="6" name="horizon" type="float" />
+			<param index="7" name="sharpness" type="float" />
+			<param index="8" name="light_affect" type="float" />
+			<param index="9" name="ao_channel_affect" type="float" />
 			<description>
 				Sets the variables to be used with the screen-space ambient occlusion (SSAO) post-process effect. See [Environment] for more details.
 			</description>
 		</method>
 		<method name="environment_set_ssao_quality">
 			<return type="void" />
-			<argument index="0" name="quality" type="int" enum="RenderingServer.EnvironmentSSAOQuality" />
-			<argument index="1" name="half_size" type="bool" />
-			<argument index="2" name="adaptive_target" type="float" />
-			<argument index="3" name="blur_passes" type="int" />
-			<argument index="4" name="fadeout_from" type="float" />
-			<argument index="5" name="fadeout_to" type="float" />
+			<param index="0" name="quality" type="int" enum="RenderingServer.EnvironmentSSAOQuality" />
+			<param index="1" name="half_size" type="bool" />
+			<param index="2" name="adaptive_target" type="float" />
+			<param index="3" name="blur_passes" type="int" />
+			<param index="4" name="fadeout_from" type="float" />
+			<param index="5" name="fadeout_to" type="float" />
 			<description>
 				Sets the quality level of the screen-space ambient occlusion (SSAO) post-process effect. See [Environment] for more details.
 			</description>
 		</method>
 		<method name="environment_set_ssil_quality">
 			<return type="void" />
-			<argument index="0" name="quality" type="int" enum="RenderingServer.EnvironmentSSILQuality" />
-			<argument index="1" name="half_size" type="bool" />
-			<argument index="2" name="adaptive_target" type="float" />
-			<argument index="3" name="blur_passes" type="int" />
-			<argument index="4" name="fadeout_from" type="float" />
-			<argument index="5" name="fadeout_to" type="float" />
+			<param index="0" name="quality" type="int" enum="RenderingServer.EnvironmentSSILQuality" />
+			<param index="1" name="half_size" type="bool" />
+			<param index="2" name="adaptive_target" type="float" />
+			<param index="3" name="blur_passes" type="int" />
+			<param index="4" name="fadeout_from" type="float" />
+			<param index="5" name="fadeout_to" type="float" />
 			<description>
 				Sets the quality level of the screen-space indirect lighting (SSIL) post-process effect. See [Environment] for more details.
 			</description>
 		</method>
 		<method name="environment_set_ssr">
 			<return type="void" />
-			<argument index="0" name="env" type="RID" />
-			<argument index="1" name="enable" type="bool" />
-			<argument index="2" name="max_steps" type="int" />
-			<argument index="3" name="fade_in" type="float" />
-			<argument index="4" name="fade_out" type="float" />
-			<argument index="5" name="depth_tolerance" type="float" />
+			<param index="0" name="env" type="RID" />
+			<param index="1" name="enable" type="bool" />
+			<param index="2" name="max_steps" type="int" />
+			<param index="3" name="fade_in" type="float" />
+			<param index="4" name="fade_out" type="float" />
+			<param index="5" name="depth_tolerance" type="float" />
 			<description>
 				Sets the variables to be used with the "screen space reflections" post-process effect. See [Environment] for more details.
 			</description>
 		</method>
 		<method name="environment_set_ssr_roughness_quality">
 			<return type="void" />
-			<argument index="0" name="quality" type="int" enum="RenderingServer.EnvironmentSSRRoughnessQuality" />
+			<param index="0" name="quality" type="int" enum="RenderingServer.EnvironmentSSRRoughnessQuality" />
 			<description>
 			</description>
 		</method>
 		<method name="environment_set_tonemap">
 			<return type="void" />
-			<argument index="0" name="env" type="RID" />
-			<argument index="1" name="tone_mapper" type="int" enum="RenderingServer.EnvironmentToneMapper" />
-			<argument index="2" name="exposure" type="float" />
-			<argument index="3" name="white" type="float" />
-			<argument index="4" name="auto_exposure" type="bool" />
-			<argument index="5" name="min_luminance" type="float" />
-			<argument index="6" name="max_luminance" type="float" />
-			<argument index="7" name="auto_exp_speed" type="float" />
-			<argument index="8" name="auto_exp_grey" type="float" />
+			<param index="0" name="env" type="RID" />
+			<param index="1" name="tone_mapper" type="int" enum="RenderingServer.EnvironmentToneMapper" />
+			<param index="2" name="exposure" type="float" />
+			<param index="3" name="white" type="float" />
+			<param index="4" name="auto_exposure" type="bool" />
+			<param index="5" name="min_luminance" type="float" />
+			<param index="6" name="max_luminance" type="float" />
+			<param index="7" name="auto_exp_speed" type="float" />
+			<param index="8" name="auto_exp_grey" type="float" />
 			<description>
 				Sets the variables to be used with the "tonemap" post-process effect. See [Environment] for more details.
 			</description>
 		</method>
 		<method name="environment_set_volumetric_fog">
 			<return type="void" />
-			<argument index="0" name="env" type="RID" />
-			<argument index="1" name="enable" type="bool" />
-			<argument index="2" name="density" type="float" />
-			<argument index="3" name="albedo" type="Color" />
-			<argument index="4" name="emission" type="Color" />
-			<argument index="5" name="emission_energy" type="float" />
-			<argument index="6" name="anisotropy" type="float" />
-			<argument index="7" name="length" type="float" />
-			<argument index="8" name="p_detail_spread" type="float" />
-			<argument index="9" name="gi_inject" type="float" />
-			<argument index="10" name="temporal_reprojection" type="bool" />
-			<argument index="11" name="temporal_reprojection_amount" type="float" />
-			<argument index="12" name="ambient_inject" type="float" />
+			<param index="0" name="env" type="RID" />
+			<param index="1" name="enable" type="bool" />
+			<param index="2" name="density" type="float" />
+			<param index="3" name="albedo" type="Color" />
+			<param index="4" name="emission" type="Color" />
+			<param index="5" name="emission_energy" type="float" />
+			<param index="6" name="anisotropy" type="float" />
+			<param index="7" name="length" type="float" />
+			<param index="8" name="p_detail_spread" type="float" />
+			<param index="9" name="gi_inject" type="float" />
+			<param index="10" name="temporal_reprojection" type="bool" />
+			<param index="11" name="temporal_reprojection_amount" type="float" />
+			<param index="12" name="ambient_inject" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="environment_set_volumetric_fog_filter_active">
 			<return type="void" />
-			<argument index="0" name="active" type="bool" />
+			<param index="0" name="active" type="bool" />
 			<description>
 				Enables filtering of the volumetric fog scattering buffer. This results in much smoother volumes with very few under-sampling artifacts.
 			</description>
 		</method>
 		<method name="environment_set_volumetric_fog_volume_size">
 			<return type="void" />
-			<argument index="0" name="size" type="int" />
-			<argument index="1" name="depth" type="int" />
+			<param index="0" name="size" type="int" />
+			<param index="1" name="depth" type="int" />
 			<description>
-				Sets the resolution of the volumetric fog's froxel buffer. [code]size[/code] is modified by the screen's aspect ratio and then used to set the width and height of the buffer. While [code]depth[/code] is directly used to set the depth of the buffer.
+				Sets the resolution of the volumetric fog's froxel buffer. [param size] is modified by the screen's aspect ratio and then used to set the width and height of the buffer. While [param depth] is directly used to set the depth of the buffer.
 			</description>
 		</method>
 		<method name="fog_volume_create">
@@ -1183,32 +1183,32 @@
 		</method>
 		<method name="fog_volume_set_extents">
 			<return type="void" />
-			<argument index="0" name="fog_volume" type="RID" />
-			<argument index="1" name="extents" type="Vector3" />
+			<param index="0" name="fog_volume" type="RID" />
+			<param index="1" name="extents" type="Vector3" />
 			<description>
 				Sets the size of the fog volume when shape is [constant RenderingServer.FOG_VOLUME_SHAPE_ELLIPSOID], [constant RenderingServer.FOG_VOLUME_SHAPE_CONE], [constant RenderingServer.FOG_VOLUME_SHAPE_CYLINDER] or [constant RenderingServer.FOG_VOLUME_SHAPE_BOX].
 			</description>
 		</method>
 		<method name="fog_volume_set_material">
 			<return type="void" />
-			<argument index="0" name="fog_volume" type="RID" />
-			<argument index="1" name="material" type="RID" />
+			<param index="0" name="fog_volume" type="RID" />
+			<param index="1" name="material" type="RID" />
 			<description>
 				Sets the [Material] of the fog volume. Can be either a [FogMaterial] or a custom [ShaderMaterial].
 			</description>
 		</method>
 		<method name="fog_volume_set_shape">
 			<return type="void" />
-			<argument index="0" name="fog_volume" type="RID" />
-			<argument index="1" name="shape" type="int" enum="RenderingServer.FogVolumeShape" />
+			<param index="0" name="fog_volume" type="RID" />
+			<param index="1" name="shape" type="int" enum="RenderingServer.FogVolumeShape" />
 			<description>
 				Sets the shape of the fog volume to either [constant RenderingServer.FOG_VOLUME_SHAPE_ELLIPSOID], [constant RenderingServer.FOG_VOLUME_SHAPE_CONE], [constant RenderingServer.FOG_VOLUME_SHAPE_CYLINDER], [constant RenderingServer.FOG_VOLUME_SHAPE_BOX] or [constant RenderingServer.FOG_VOLUME_SHAPE_WORLD].
 			</description>
 		</method>
 		<method name="force_draw">
 			<return type="void" />
-			<argument index="0" name="swap_buffers" type="bool" default="true" />
-			<argument index="1" name="frame_step" type="float" default="0.0" />
+			<param index="0" name="swap_buffers" type="bool" default="true" />
+			<param index="1" name="frame_step" type="float" default="0.0" />
 			<description>
 			</description>
 		</method>
@@ -1219,7 +1219,7 @@
 		</method>
 		<method name="free_rid">
 			<return type="void" />
-			<argument index="0" name="rid" type="RID" />
+			<param index="0" name="rid" type="RID" />
 			<description>
 				Tries to free an object in the RenderingServer.
 			</description>
@@ -1236,7 +1236,7 @@
 		</method>
 		<method name="get_rendering_info">
 			<return type="int" />
-			<argument index="0" name="info" type="int" enum="RenderingServer.RenderingInfo" />
+			<param index="0" name="info" type="int" enum="RenderingServer.RenderingInfo" />
 			<description>
 			</description>
 		</method>
@@ -1288,22 +1288,22 @@
 		</method>
 		<method name="gi_set_use_half_resolution">
 			<return type="void" />
-			<argument index="0" name="half_resolution" type="bool" />
+			<param index="0" name="half_resolution" type="bool" />
 			<description>
-				If [code]half_resolution[/code] is [code]true[/code], renders [VoxelGI] and SDFGI ([member Environment.sdfgi_enabled]) buffers at halved resolution (e.g. 960×540 when the viewport size is 1920×1080). This improves performance significantly when VoxelGI or SDFGI is enabled, at the cost of artifacts that may be visible on polygon edges. The loss in quality becomes less noticeable as the viewport resolution increases. [LightmapGI] rendering is not affected by this setting. See also [member ProjectSettings.rendering/global_illumination/gi/use_half_resolution].
+				If [param half_resolution] is [code]true[/code], renders [VoxelGI] and SDFGI ([member Environment.sdfgi_enabled]) buffers at halved resolution (e.g. 960×540 when the viewport size is 1920×1080). This improves performance significantly when VoxelGI or SDFGI is enabled, at the cost of artifacts that may be visible on polygon edges. The loss in quality becomes less noticeable as the viewport resolution increases. [LightmapGI] rendering is not affected by this setting. See also [member ProjectSettings.rendering/global_illumination/gi/use_half_resolution].
 			</description>
 		</method>
 		<method name="global_shader_uniform_add">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="type" type="int" enum="RenderingServer.GlobalShaderUniformType" />
-			<argument index="2" name="default_value" type="Variant" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="type" type="int" enum="RenderingServer.GlobalShaderUniformType" />
+			<param index="2" name="default_value" type="Variant" />
 			<description>
 			</description>
 		</method>
 		<method name="global_shader_uniform_get" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 			</description>
 		</method>
@@ -1314,27 +1314,27 @@
 		</method>
 		<method name="global_shader_uniform_get_type" qualifiers="const">
 			<return type="int" enum="RenderingServer.GlobalShaderUniformType" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 			</description>
 		</method>
 		<method name="global_shader_uniform_remove">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 			</description>
 		</method>
 		<method name="global_shader_uniform_set">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="value" type="Variant" />
 			<description>
 			</description>
 		</method>
 		<method name="global_shader_uniform_set_override">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="value" type="Variant" />
 			<description>
 			</description>
 		</method>
@@ -1346,30 +1346,30 @@
 		</method>
 		<method name="has_feature" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="feature" type="int" enum="RenderingServer.Features" />
+			<param index="0" name="feature" type="int" enum="RenderingServer.Features" />
 			<description>
 				Not yet implemented. Always returns [code]false[/code].
 			</description>
 		</method>
 		<method name="has_os_feature" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="feature" type="String" />
+			<param index="0" name="feature" type="String" />
 			<description>
-				Returns [code]true[/code] if the OS supports a certain feature. Features might be [code]s3tc[/code], [code]etc[/code], and [code]etc2[/code].
+				Returns [code]true[/code] if the OS supports a certain [param feature]. Features might be [code]s3tc[/code], [code]etc[/code], and [code]etc2[/code].
 			</description>
 		</method>
 		<method name="instance_attach_object_instance_id">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="id" type="int" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="id" type="int" />
 			<description>
 				Attaches a unique Object ID to instance. Object ID must be attached to instance for proper culling with [method instances_cull_aabb], [method instances_cull_convex], and [method instances_cull_ray].
 			</description>
 		</method>
 		<method name="instance_attach_skeleton">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="skeleton" type="RID" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="skeleton" type="RID" />
 			<description>
 				Attaches a skeleton to an instance. Removes the previous skeleton from the instance.
 			</description>
@@ -1384,206 +1384,206 @@
 		</method>
 		<method name="instance_create2">
 			<return type="RID" />
-			<argument index="0" name="base" type="RID" />
-			<argument index="1" name="scenario" type="RID" />
+			<param index="0" name="base" type="RID" />
+			<param index="1" name="scenario" type="RID" />
 			<description>
 				Creates a visual instance, adds it to the RenderingServer, and sets both base and scenario. It can be accessed with the RID that is returned. This RID will be used in all [code]instance_*[/code] RenderingServer functions.
 				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 			</description>
 		</method>
-		<method name="instance_geometry_get_shader_parameter" qualifiers="const">
+		<method name="instance_geometry_get_shader_uniform" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="parameter" type="StringName" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="parameter" type="StringName" />
 			<description>
 			</description>
 		</method>
-		<method name="instance_geometry_get_shader_parameter_default_value" qualifiers="const">
+		<method name="instance_geometry_get_shader_uniform_default_value" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="parameter" type="StringName" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="parameter" type="StringName" />
 			<description>
 			</description>
 		</method>
-		<method name="instance_geometry_get_shader_parameter_list" qualifiers="const">
+		<method name="instance_geometry_get_shader_uniform_list" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="instance" type="RID" />
+			<param index="0" name="instance" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="instance_geometry_set_cast_shadows_setting">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="shadow_casting_setting" type="int" enum="RenderingServer.ShadowCastingSetting" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="shadow_casting_setting" type="int" enum="RenderingServer.ShadowCastingSetting" />
 			<description>
 				Sets the shadow casting setting to one of [enum ShadowCastingSetting]. Equivalent to [member GeometryInstance3D.cast_shadow].
 			</description>
 		</method>
 		<method name="instance_geometry_set_flag">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="flag" type="int" enum="RenderingServer.InstanceFlags" />
-			<argument index="2" name="enabled" type="bool" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="flag" type="int" enum="RenderingServer.InstanceFlags" />
+			<param index="2" name="enabled" type="bool" />
 			<description>
 				Sets the flag for a given [enum InstanceFlags]. See [enum InstanceFlags] for more details.
 			</description>
 		</method>
 		<method name="instance_geometry_set_lightmap">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="lightmap" type="RID" />
-			<argument index="2" name="lightmap_uv_scale" type="Rect2" />
-			<argument index="3" name="lightmap_slice" type="int" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="lightmap" type="RID" />
+			<param index="2" name="lightmap_uv_scale" type="Rect2" />
+			<param index="3" name="lightmap_slice" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="instance_geometry_set_lod_bias">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="lod_bias" type="float" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="lod_bias" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="instance_geometry_set_material_overlay">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="material" type="RID" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="material" type="RID" />
 			<description>
 				Sets a material that will be rendered for all surfaces on top of active materials for the mesh associated with this instance. Equivalent to [member GeometryInstance3D.material_overlay].
 			</description>
 		</method>
 		<method name="instance_geometry_set_material_override">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="material" type="RID" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="material" type="RID" />
 			<description>
 				Sets a material that will override the material for all surfaces on the mesh associated with this instance. Equivalent to [member GeometryInstance3D.material_override].
 			</description>
 		</method>
-		<method name="instance_geometry_set_shader_parameter">
+		<method name="instance_geometry_set_shader_uniform">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="parameter" type="StringName" />
-			<argument index="2" name="value" type="Variant" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="parameter" type="StringName" />
+			<param index="2" name="value" type="Variant" />
 			<description>
 			</description>
 		</method>
 		<method name="instance_geometry_set_transparency">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="transparency" type="float" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="transparency" type="float" />
 			<description>
 				Sets the transparency for the given geometry instance. Equivalent to [member GeometryInstance3D.transparency].
-				A transparency of [code]0.0[/code] is fully opaque, while [code]1.0[/code] is fully transparent. Values greater than [code]0.0[/code] (exclusive) will force the geometry's materials to go through the transparent pipeline, which is slower to render and can exhibit rendering issues due to incorrect transparency sorting. However, unlike using a transparent material, setting [code]transparency[/code] to a value greater than [code]0.0[/code] (exclusive) will [i]not[/i] disable shadow rendering.
+				A transparency of [code]0.0[/code] is fully opaque, while [code]1.0[/code] is fully transparent. Values greater than [code]0.0[/code] (exclusive) will force the geometry's materials to go through the transparent pipeline, which is slower to render and can exhibit rendering issues due to incorrect transparency sorting. However, unlike using a transparent material, setting [param transparency] to a value greater than [code]0.0[/code] (exclusive) will [i]not[/i] disable shadow rendering.
 				In spatial shaders, [code]1.0 - transparency[/code] is set as the default value of the [code]ALPHA[/code] built-in.
-				[b]Note:[/b] [code]transparency[/code] is clamped between [code]0.0[/code] and [code]1.0[/code], so this property cannot be used to make transparent materials more opaque than they originally are.
+				[b]Note:[/b] [param transparency] is clamped between [code]0.0[/code] and [code]1.0[/code], so this property cannot be used to make transparent materials more opaque than they originally are.
 			</description>
 		</method>
 		<method name="instance_geometry_set_visibility_range">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="min" type="float" />
-			<argument index="2" name="max" type="float" />
-			<argument index="3" name="min_margin" type="float" />
-			<argument index="4" name="max_margin" type="float" />
-			<argument index="5" name="fade_mode" type="int" enum="RenderingServer.VisibilityRangeFadeMode" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="min" type="float" />
+			<param index="2" name="max" type="float" />
+			<param index="3" name="min_margin" type="float" />
+			<param index="4" name="max_margin" type="float" />
+			<param index="5" name="fade_mode" type="int" enum="RenderingServer.VisibilityRangeFadeMode" />
 			<description>
 				Sets the visibility range values for the given geometry instance. Equivalent to [member GeometryInstance3D.visibility_range_begin] and related properties.
 			</description>
 		</method>
 		<method name="instance_set_base">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="base" type="RID" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="base" type="RID" />
 			<description>
 				Sets the base of the instance. A base can be any of the 3D objects that are created in the RenderingServer that can be displayed. For example, any of the light types, mesh, multimesh, immediate geometry, particle system, reflection probe, lightmap, and the GI probe are all types that can be set as the base of an instance in order to be displayed in the scenario.
 			</description>
 		</method>
 		<method name="instance_set_blend_shape_weight">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="shape" type="int" />
-			<argument index="2" name="weight" type="float" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="shape" type="int" />
+			<param index="2" name="weight" type="float" />
 			<description>
 				Sets the weight for a given blend shape associated with this instance.
 			</description>
 		</method>
 		<method name="instance_set_custom_aabb">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="aabb" type="AABB" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="aabb" type="AABB" />
 			<description>
 				Sets a custom AABB to use when culling objects from the view frustum. Equivalent to [method GeometryInstance3D.set_custom_aabb].
 			</description>
 		</method>
 		<method name="instance_set_extra_visibility_margin">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="margin" type="float" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="margin" type="float" />
 			<description>
 				Sets a margin to increase the size of the AABB when culling objects from the view frustum. This allows you to avoid culling objects that fall outside the view frustum. Equivalent to [member GeometryInstance3D.extra_cull_margin].
 			</description>
 		</method>
 		<method name="instance_set_ignore_culling">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="instance_set_layer_mask">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="mask" type="int" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="mask" type="int" />
 			<description>
 				Sets the render layers that this instance will be drawn to. Equivalent to [member VisualInstance3D.layers].
 			</description>
 		</method>
 		<method name="instance_set_scenario">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="scenario" type="RID" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="scenario" type="RID" />
 			<description>
 				Sets the scenario that the instance is in. The scenario is the 3D world that the objects will be displayed in.
 			</description>
 		</method>
 		<method name="instance_set_surface_override_material">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="surface" type="int" />
-			<argument index="2" name="material" type="RID" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="surface" type="int" />
+			<param index="2" name="material" type="RID" />
 			<description>
 				Sets the override material of a specific surface. Equivalent to [method MeshInstance3D.set_surface_override_material].
 			</description>
 		</method>
 		<method name="instance_set_transform">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="transform" type="Transform3D" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="transform" type="Transform3D" />
 			<description>
 				Sets the world space transform of the instance. Equivalent to [member Node3D.transform].
 			</description>
 		</method>
 		<method name="instance_set_visibility_parent">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="parent" type="RID" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="parent" type="RID" />
 			<description>
 				Sets the visibility parent for the given instance. Equivalent to [member Node3D.visibility_parent].
 			</description>
 		</method>
 		<method name="instance_set_visible">
 			<return type="void" />
-			<argument index="0" name="instance" type="RID" />
-			<argument index="1" name="visible" type="bool" />
+			<param index="0" name="instance" type="RID" />
+			<param index="1" name="visible" type="bool" />
 			<description>
 				Sets whether an instance is drawn or not. Equivalent to [member Node3D.visible].
 			</description>
 		</method>
 		<method name="instances_cull_aabb" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="aabb" type="AABB" />
-			<argument index="1" name="scenario" type="RID" />
+			<param index="0" name="aabb" type="AABB" />
+			<param index="1" name="scenario" type="RID" />
 			<description>
 				Returns an array of object IDs intersecting with the provided AABB. Only visual 3D nodes are considered, such as [MeshInstance3D] or [DirectionalLight3D]. Use [method @GlobalScope.instance_from_id] to obtain the actual nodes. A scenario RID must be provided, which is available in the [World3D] you want to query. This forces an update for all resources queued to update.
 				[b]Warning:[/b] This function is primarily intended for editor usage. For in-game use cases, prefer physics collision.
@@ -1591,8 +1591,8 @@
 		</method>
 		<method name="instances_cull_convex" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="convex" type="Array" />
-			<argument index="1" name="scenario" type="RID" />
+			<param index="0" name="convex" type="Array" />
+			<param index="1" name="scenario" type="RID" />
 			<description>
 				Returns an array of object IDs intersecting with the provided convex shape. Only visual 3D nodes are considered, such as [MeshInstance3D] or [DirectionalLight3D]. Use [method @GlobalScope.instance_from_id] to obtain the actual nodes. A scenario RID must be provided, which is available in the [World3D] you want to query. This forces an update for all resources queued to update.
 				[b]Warning:[/b] This function is primarily intended for editor usage. For in-game use cases, prefer physics collision.
@@ -1600,9 +1600,9 @@
 		</method>
 		<method name="instances_cull_ray" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="from" type="Vector3" />
-			<argument index="1" name="to" type="Vector3" />
-			<argument index="2" name="scenario" type="RID" />
+			<param index="0" name="from" type="Vector3" />
+			<param index="1" name="to" type="Vector3" />
+			<param index="2" name="scenario" type="RID" />
 			<description>
 				Returns an array of object IDs intersecting with the provided 3D ray. Only visual 3D nodes are considered, such as [MeshInstance3D] or [DirectionalLight3D]. Use [method @GlobalScope.instance_from_id] to obtain the actual nodes. A scenario RID must be provided, which is available in the [World3D] you want to query. This forces an update for all resources queued to update.
 				[b]Warning:[/b] This function is primarily intended for editor usage. For in-game use cases, prefer physics collision.
@@ -1610,120 +1610,120 @@
 		</method>
 		<method name="light_directional_set_blend_splits">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				If [code]true[/code], this directional light will blend between shadow map splits resulting in a smoother transition between them. Equivalent to [member DirectionalLight3D.directional_shadow_blend_splits].
 			</description>
 		</method>
 		<method name="light_directional_set_shadow_mode">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="mode" type="int" enum="RenderingServer.LightDirectionalShadowMode" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="mode" type="int" enum="RenderingServer.LightDirectionalShadowMode" />
 			<description>
 				Sets the shadow mode for this directional light. Equivalent to [member DirectionalLight3D.directional_shadow_mode]. See [enum LightDirectionalShadowMode] for options.
 			</description>
 		</method>
 		<method name="light_directional_set_sky_mode">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="mode" type="int" enum="RenderingServer.LightDirectionalSkyMode" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="mode" type="int" enum="RenderingServer.LightDirectionalSkyMode" />
 			<description>
 				If [code]true[/code], this light will not be used for anything except sky shaders. Use this for lights that impact your sky shader that you may want to hide from affecting the rest of the scene. For example, you may want to enable this when the sun in your sky shader falls below the horizon.
 			</description>
 		</method>
 		<method name="light_omni_set_shadow_mode">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="mode" type="int" enum="RenderingServer.LightOmniShadowMode" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="mode" type="int" enum="RenderingServer.LightOmniShadowMode" />
 			<description>
 				Sets whether to use a dual paraboloid or a cubemap for the shadow map. Dual paraboloid is faster but may suffer from artifacts. Equivalent to [member OmniLight3D.omni_shadow_mode].
 			</description>
 		</method>
 		<method name="light_projectors_set_filter">
 			<return type="void" />
-			<argument index="0" name="filter" type="int" enum="RenderingServer.LightProjectorFilter" />
+			<param index="0" name="filter" type="int" enum="RenderingServer.LightProjectorFilter" />
 			<description>
 			</description>
 		</method>
 		<method name="light_set_bake_mode">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="bake_mode" type="int" enum="RenderingServer.LightBakeMode" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="bake_mode" type="int" enum="RenderingServer.LightBakeMode" />
 			<description>
 			</description>
 		</method>
 		<method name="light_set_color">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="color" type="Color" />
 			<description>
 				Sets the color of the light. Equivalent to [member Light3D.light_color].
 			</description>
 		</method>
 		<method name="light_set_cull_mask">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="mask" type="int" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="mask" type="int" />
 			<description>
 				Sets the cull mask for this Light3D. Lights only affect objects in the selected layers. Equivalent to [member Light3D.light_cull_mask].
 			</description>
 		</method>
 		<method name="light_set_distance_fade">
 			<return type="void" />
-			<argument index="0" name="decal" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
-			<argument index="2" name="begin" type="float" />
-			<argument index="3" name="shadow" type="float" />
-			<argument index="4" name="length" type="float" />
+			<param index="0" name="decal" type="RID" />
+			<param index="1" name="enabled" type="bool" />
+			<param index="2" name="begin" type="float" />
+			<param index="3" name="shadow" type="float" />
+			<param index="4" name="length" type="float" />
 			<description>
 				Sets the distance fade for this Light3D. This acts as a form of level of detail (LOD) and can be used to improve performance. Equivalent to [member Light3D.distance_fade_enabled], [member Light3D.distance_fade_begin], [member Light3D.distance_fade_shadow], and [member Light3D.distance_fade_length].
 			</description>
 		</method>
 		<method name="light_set_max_sdfgi_cascade">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="cascade" type="int" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="cascade" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="light_set_negative">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				If [code]true[/code], light will subtract light instead of adding light. Equivalent to [member Light3D.light_negative].
 			</description>
 		</method>
 		<method name="light_set_param">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="param" type="int" enum="RenderingServer.LightParam" />
-			<argument index="2" name="value" type="float" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="param" type="int" enum="RenderingServer.LightParam" />
+			<param index="2" name="value" type="float" />
 			<description>
 				Sets the specified light parameter. See [enum LightParam] for options. Equivalent to [method Light3D.set_param].
 			</description>
 		</method>
 		<method name="light_set_projector">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="texture" type="RID" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="texture" type="RID" />
 			<description>
 				Not implemented in Godot 3.x.
 			</description>
 		</method>
 		<method name="light_set_reverse_cull_face_mode">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				If [code]true[/code], reverses the backface culling of the mesh. This can be useful when you have a flat mesh that has a light behind it. If you need to cast a shadow on both sides of the mesh, set the mesh to use double-sided shadows with [method instance_geometry_set_cast_shadows_setting]. Equivalent to [member Light3D.shadow_reverse_cull_face].
 			</description>
 		</method>
 		<method name="light_set_shadow">
 			<return type="void" />
-			<argument index="0" name="light" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="light" type="RID" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				If [code]true[/code], light will cast shadows. Equivalent to [member Light3D.shadow_enabled].
 			</description>
@@ -1735,73 +1735,73 @@
 		</method>
 		<method name="lightmap_get_probe_capture_bsp_tree" qualifiers="const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="lightmap" type="RID" />
+			<param index="0" name="lightmap" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="lightmap_get_probe_capture_points" qualifiers="const">
 			<return type="PackedVector3Array" />
-			<argument index="0" name="lightmap" type="RID" />
+			<param index="0" name="lightmap" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="lightmap_get_probe_capture_sh" qualifiers="const">
 			<return type="PackedColorArray" />
-			<argument index="0" name="lightmap" type="RID" />
+			<param index="0" name="lightmap" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="lightmap_get_probe_capture_tetrahedra" qualifiers="const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="lightmap" type="RID" />
+			<param index="0" name="lightmap" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="lightmap_set_probe_bounds">
 			<return type="void" />
-			<argument index="0" name="lightmap" type="RID" />
-			<argument index="1" name="bounds" type="AABB" />
+			<param index="0" name="lightmap" type="RID" />
+			<param index="1" name="bounds" type="AABB" />
 			<description>
 			</description>
 		</method>
 		<method name="lightmap_set_probe_capture_data">
 			<return type="void" />
-			<argument index="0" name="lightmap" type="RID" />
-			<argument index="1" name="points" type="PackedVector3Array" />
-			<argument index="2" name="point_sh" type="PackedColorArray" />
-			<argument index="3" name="tetrahedra" type="PackedInt32Array" />
-			<argument index="4" name="bsp_tree" type="PackedInt32Array" />
+			<param index="0" name="lightmap" type="RID" />
+			<param index="1" name="points" type="PackedVector3Array" />
+			<param index="2" name="point_sh" type="PackedColorArray" />
+			<param index="3" name="tetrahedra" type="PackedInt32Array" />
+			<param index="4" name="bsp_tree" type="PackedInt32Array" />
 			<description>
 			</description>
 		</method>
 		<method name="lightmap_set_probe_capture_update_speed">
 			<return type="void" />
-			<argument index="0" name="speed" type="float" />
+			<param index="0" name="speed" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="lightmap_set_probe_interior">
 			<return type="void" />
-			<argument index="0" name="lightmap" type="RID" />
-			<argument index="1" name="interior" type="bool" />
+			<param index="0" name="lightmap" type="RID" />
+			<param index="1" name="interior" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="lightmap_set_textures">
 			<return type="void" />
-			<argument index="0" name="lightmap" type="RID" />
-			<argument index="1" name="light" type="RID" />
-			<argument index="2" name="uses_sh" type="bool" />
+			<param index="0" name="lightmap" type="RID" />
+			<param index="1" name="light" type="RID" />
+			<param index="2" name="uses_sh" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="make_sphere_mesh">
 			<return type="RID" />
-			<argument index="0" name="latitudes" type="int" />
-			<argument index="1" name="longitudes" type="int" />
-			<argument index="2" name="radius" type="float" />
+			<param index="0" name="latitudes" type="int" />
+			<param index="1" name="longitudes" type="int" />
+			<param index="2" name="radius" type="float" />
 			<description>
-				Returns a mesh of a sphere with the given amount of horizontal and vertical subdivisions.
+				Returns a mesh of a sphere with the given number of horizontal and vertical subdivisions.
 			</description>
 		</method>
 		<method name="material_create">
@@ -1813,66 +1813,66 @@
 		</method>
 		<method name="material_get_param" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="material" type="RID" />
-			<argument index="1" name="parameter" type="StringName" />
+			<param index="0" name="material" type="RID" />
+			<param index="1" name="parameter" type="StringName" />
 			<description>
 				Returns the value of a certain material's parameter.
 			</description>
 		</method>
 		<method name="material_set_next_pass">
 			<return type="void" />
-			<argument index="0" name="material" type="RID" />
-			<argument index="1" name="next_material" type="RID" />
+			<param index="0" name="material" type="RID" />
+			<param index="1" name="next_material" type="RID" />
 			<description>
 				Sets an object's next material.
 			</description>
 		</method>
 		<method name="material_set_param">
 			<return type="void" />
-			<argument index="0" name="material" type="RID" />
-			<argument index="1" name="parameter" type="StringName" />
-			<argument index="2" name="value" type="Variant" />
+			<param index="0" name="material" type="RID" />
+			<param index="1" name="parameter" type="StringName" />
+			<param index="2" name="value" type="Variant" />
 			<description>
 				Sets a material's parameter.
 			</description>
 		</method>
 		<method name="material_set_render_priority">
 			<return type="void" />
-			<argument index="0" name="material" type="RID" />
-			<argument index="1" name="priority" type="int" />
+			<param index="0" name="material" type="RID" />
+			<param index="1" name="priority" type="int" />
 			<description>
 				Sets a material's render priority.
 			</description>
 		</method>
 		<method name="material_set_shader">
 			<return type="void" />
-			<argument index="0" name="shader_material" type="RID" />
-			<argument index="1" name="shader" type="RID" />
+			<param index="0" name="shader_material" type="RID" />
+			<param index="1" name="shader" type="RID" />
 			<description>
 				Sets a shader material's shader.
 			</description>
 		</method>
 		<method name="mesh_add_surface">
 			<return type="void" />
-			<argument index="0" name="mesh" type="RID" />
-			<argument index="1" name="surface" type="Dictionary" />
+			<param index="0" name="mesh" type="RID" />
+			<param index="1" name="surface" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="mesh_add_surface_from_arrays">
 			<return type="void" />
-			<argument index="0" name="mesh" type="RID" />
-			<argument index="1" name="primitive" type="int" enum="RenderingServer.PrimitiveType" />
-			<argument index="2" name="arrays" type="Array" />
-			<argument index="3" name="blend_shapes" type="Array" default="[]" />
-			<argument index="4" name="lods" type="Dictionary" default="{}" />
-			<argument index="5" name="compress_format" type="int" default="0" />
+			<param index="0" name="mesh" type="RID" />
+			<param index="1" name="primitive" type="int" enum="RenderingServer.PrimitiveType" />
+			<param index="2" name="arrays" type="Array" />
+			<param index="3" name="blend_shapes" type="Array" default="[]" />
+			<param index="4" name="lods" type="Dictionary" default="{}" />
+			<param index="5" name="compress_format" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="mesh_clear">
 			<return type="void" />
-			<argument index="0" name="mesh" type="RID" />
+			<param index="0" name="mesh" type="RID" />
 			<description>
 				Removes all surfaces from a mesh.
 			</description>
@@ -1887,165 +1887,165 @@
 		</method>
 		<method name="mesh_create_from_surfaces">
 			<return type="RID" />
-			<argument index="0" name="surfaces" type="Dictionary[]" />
-			<argument index="1" name="blend_shape_count" type="int" default="0" />
+			<param index="0" name="surfaces" type="Dictionary[]" />
+			<param index="1" name="blend_shape_count" type="int" default="0" />
 			<description>
 			</description>
 		</method>
 		<method name="mesh_get_blend_shape_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="mesh" type="RID" />
+			<param index="0" name="mesh" type="RID" />
 			<description>
 				Returns a mesh's blend shape count.
 			</description>
 		</method>
 		<method name="mesh_get_blend_shape_mode" qualifiers="const">
 			<return type="int" enum="RenderingServer.BlendShapeMode" />
-			<argument index="0" name="mesh" type="RID" />
+			<param index="0" name="mesh" type="RID" />
 			<description>
 				Returns a mesh's blend shape mode.
 			</description>
 		</method>
 		<method name="mesh_get_custom_aabb" qualifiers="const">
 			<return type="AABB" />
-			<argument index="0" name="mesh" type="RID" />
+			<param index="0" name="mesh" type="RID" />
 			<description>
 				Returns a mesh's custom aabb.
 			</description>
 		</method>
 		<method name="mesh_get_surface">
 			<return type="Dictionary" />
-			<argument index="0" name="mesh" type="RID" />
-			<argument index="1" name="surface" type="int" />
+			<param index="0" name="mesh" type="RID" />
+			<param index="1" name="surface" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="mesh_get_surface_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="mesh" type="RID" />
+			<param index="0" name="mesh" type="RID" />
 			<description>
 				Returns a mesh's number of surfaces.
 			</description>
 		</method>
 		<method name="mesh_set_blend_shape_mode">
 			<return type="void" />
-			<argument index="0" name="mesh" type="RID" />
-			<argument index="1" name="mode" type="int" enum="RenderingServer.BlendShapeMode" />
+			<param index="0" name="mesh" type="RID" />
+			<param index="1" name="mode" type="int" enum="RenderingServer.BlendShapeMode" />
 			<description>
 				Sets a mesh's blend shape mode.
 			</description>
 		</method>
 		<method name="mesh_set_custom_aabb">
 			<return type="void" />
-			<argument index="0" name="mesh" type="RID" />
-			<argument index="1" name="aabb" type="AABB" />
+			<param index="0" name="mesh" type="RID" />
+			<param index="1" name="aabb" type="AABB" />
 			<description>
 				Sets a mesh's custom aabb.
 			</description>
 		</method>
 		<method name="mesh_set_shadow_mesh">
 			<return type="void" />
-			<argument index="0" name="mesh" type="RID" />
-			<argument index="1" name="shadow_mesh" type="RID" />
+			<param index="0" name="mesh" type="RID" />
+			<param index="1" name="shadow_mesh" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="mesh_surface_get_arrays" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="mesh" type="RID" />
-			<argument index="1" name="surface" type="int" />
+			<param index="0" name="mesh" type="RID" />
+			<param index="1" name="surface" type="int" />
 			<description>
 				Returns a mesh's surface's buffer arrays.
 			</description>
 		</method>
 		<method name="mesh_surface_get_blend_shape_arrays" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="mesh" type="RID" />
-			<argument index="1" name="surface" type="int" />
+			<param index="0" name="mesh" type="RID" />
+			<param index="1" name="surface" type="int" />
 			<description>
 				Returns a mesh's surface's arrays for blend shapes.
 			</description>
 		</method>
 		<method name="mesh_surface_get_format_attribute_stride" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="format" type="int" />
-			<argument index="1" name="vertex_count" type="int" />
+			<param index="0" name="format" type="int" />
+			<param index="1" name="vertex_count" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="mesh_surface_get_format_offset" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="format" type="int" />
-			<argument index="1" name="vertex_count" type="int" />
-			<argument index="2" name="array_index" type="int" />
+			<param index="0" name="format" type="int" />
+			<param index="1" name="vertex_count" type="int" />
+			<param index="2" name="array_index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="mesh_surface_get_format_skin_stride" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="format" type="int" />
-			<argument index="1" name="vertex_count" type="int" />
+			<param index="0" name="format" type="int" />
+			<param index="1" name="vertex_count" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="mesh_surface_get_format_vertex_stride" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="format" type="int" />
-			<argument index="1" name="vertex_count" type="int" />
+			<param index="0" name="format" type="int" />
+			<param index="1" name="vertex_count" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="mesh_surface_get_material" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="mesh" type="RID" />
-			<argument index="1" name="surface" type="int" />
+			<param index="0" name="mesh" type="RID" />
+			<param index="1" name="surface" type="int" />
 			<description>
 				Returns a mesh's surface's material.
 			</description>
 		</method>
 		<method name="mesh_surface_set_material">
 			<return type="void" />
-			<argument index="0" name="mesh" type="RID" />
-			<argument index="1" name="surface" type="int" />
-			<argument index="2" name="material" type="RID" />
+			<param index="0" name="mesh" type="RID" />
+			<param index="1" name="surface" type="int" />
+			<param index="2" name="material" type="RID" />
 			<description>
 				Sets a mesh's surface's material.
 			</description>
 		</method>
 		<method name="mesh_surface_update_attribute_region">
 			<return type="void" />
-			<argument index="0" name="mesh" type="RID" />
-			<argument index="1" name="surface" type="int" />
-			<argument index="2" name="offset" type="int" />
-			<argument index="3" name="data" type="PackedByteArray" />
+			<param index="0" name="mesh" type="RID" />
+			<param index="1" name="surface" type="int" />
+			<param index="2" name="offset" type="int" />
+			<param index="3" name="data" type="PackedByteArray" />
 			<description>
 			</description>
 		</method>
 		<method name="mesh_surface_update_skin_region">
 			<return type="void" />
-			<argument index="0" name="mesh" type="RID" />
-			<argument index="1" name="surface" type="int" />
-			<argument index="2" name="offset" type="int" />
-			<argument index="3" name="data" type="PackedByteArray" />
+			<param index="0" name="mesh" type="RID" />
+			<param index="1" name="surface" type="int" />
+			<param index="2" name="offset" type="int" />
+			<param index="3" name="data" type="PackedByteArray" />
 			<description>
 			</description>
 		</method>
 		<method name="mesh_surface_update_vertex_region">
 			<return type="void" />
-			<argument index="0" name="mesh" type="RID" />
-			<argument index="1" name="surface" type="int" />
-			<argument index="2" name="offset" type="int" />
-			<argument index="3" name="data" type="PackedByteArray" />
+			<param index="0" name="mesh" type="RID" />
+			<param index="1" name="surface" type="int" />
+			<param index="2" name="offset" type="int" />
+			<param index="3" name="data" type="PackedByteArray" />
 			<description>
 			</description>
 		</method>
 		<method name="multimesh_allocate_data">
 			<return type="void" />
-			<argument index="0" name="multimesh" type="RID" />
-			<argument index="1" name="instances" type="int" />
-			<argument index="2" name="transform_format" type="int" enum="RenderingServer.MultimeshTransformFormat" />
-			<argument index="3" name="color_format" type="bool" default="false" />
-			<argument index="4" name="custom_data_format" type="bool" default="false" />
+			<param index="0" name="multimesh" type="RID" />
+			<param index="1" name="instances" type="int" />
+			<param index="2" name="transform_format" type="int" enum="RenderingServer.MultimeshTransformFormat" />
+			<param index="3" name="color_format" type="bool" default="false" />
+			<param index="4" name="custom_data_format" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
@@ -2059,125 +2059,125 @@
 		</method>
 		<method name="multimesh_get_aabb" qualifiers="const">
 			<return type="AABB" />
-			<argument index="0" name="multimesh" type="RID" />
+			<param index="0" name="multimesh" type="RID" />
 			<description>
 				Calculates and returns the axis-aligned bounding box that encloses all instances within the multimesh.
 			</description>
 		</method>
 		<method name="multimesh_get_buffer" qualifiers="const">
 			<return type="PackedFloat32Array" />
-			<argument index="0" name="multimesh" type="RID" />
+			<param index="0" name="multimesh" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="multimesh_get_instance_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="multimesh" type="RID" />
+			<param index="0" name="multimesh" type="RID" />
 			<description>
 				Returns the number of instances allocated for this multimesh.
 			</description>
 		</method>
 		<method name="multimesh_get_mesh" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="multimesh" type="RID" />
+			<param index="0" name="multimesh" type="RID" />
 			<description>
 				Returns the RID of the mesh that will be used in drawing this multimesh.
 			</description>
 		</method>
 		<method name="multimesh_get_visible_instances" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="multimesh" type="RID" />
+			<param index="0" name="multimesh" type="RID" />
 			<description>
 				Returns the number of visible instances for this multimesh.
 			</description>
 		</method>
 		<method name="multimesh_instance_get_color" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="multimesh" type="RID" />
-			<argument index="1" name="index" type="int" />
+			<param index="0" name="multimesh" type="RID" />
+			<param index="1" name="index" type="int" />
 			<description>
 				Returns the color by which the specified instance will be modulated.
 			</description>
 		</method>
 		<method name="multimesh_instance_get_custom_data" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="multimesh" type="RID" />
-			<argument index="1" name="index" type="int" />
+			<param index="0" name="multimesh" type="RID" />
+			<param index="1" name="index" type="int" />
 			<description>
 				Returns the custom data associated with the specified instance.
 			</description>
 		</method>
 		<method name="multimesh_instance_get_transform" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="multimesh" type="RID" />
-			<argument index="1" name="index" type="int" />
+			<param index="0" name="multimesh" type="RID" />
+			<param index="1" name="index" type="int" />
 			<description>
 				Returns the [Transform3D] of the specified instance.
 			</description>
 		</method>
 		<method name="multimesh_instance_get_transform_2d" qualifiers="const">
 			<return type="Transform2D" />
-			<argument index="0" name="multimesh" type="RID" />
-			<argument index="1" name="index" type="int" />
+			<param index="0" name="multimesh" type="RID" />
+			<param index="1" name="index" type="int" />
 			<description>
 				Returns the [Transform2D] of the specified instance. For use when the multimesh is set to use 2D transforms.
 			</description>
 		</method>
 		<method name="multimesh_instance_set_color">
 			<return type="void" />
-			<argument index="0" name="multimesh" type="RID" />
-			<argument index="1" name="index" type="int" />
-			<argument index="2" name="color" type="Color" />
+			<param index="0" name="multimesh" type="RID" />
+			<param index="1" name="index" type="int" />
+			<param index="2" name="color" type="Color" />
 			<description>
 				Sets the color by which this instance will be modulated. Equivalent to [method MultiMesh.set_instance_color].
 			</description>
 		</method>
 		<method name="multimesh_instance_set_custom_data">
 			<return type="void" />
-			<argument index="0" name="multimesh" type="RID" />
-			<argument index="1" name="index" type="int" />
-			<argument index="2" name="custom_data" type="Color" />
+			<param index="0" name="multimesh" type="RID" />
+			<param index="1" name="index" type="int" />
+			<param index="2" name="custom_data" type="Color" />
 			<description>
 				Sets the custom data for this instance. Custom data is passed as a [Color], but is interpreted as a [code]vec4[/code] in the shader. Equivalent to [method MultiMesh.set_instance_custom_data].
 			</description>
 		</method>
 		<method name="multimesh_instance_set_transform">
 			<return type="void" />
-			<argument index="0" name="multimesh" type="RID" />
-			<argument index="1" name="index" type="int" />
-			<argument index="2" name="transform" type="Transform3D" />
+			<param index="0" name="multimesh" type="RID" />
+			<param index="1" name="index" type="int" />
+			<param index="2" name="transform" type="Transform3D" />
 			<description>
 				Sets the [Transform3D] for this instance. Equivalent to [method MultiMesh.set_instance_transform].
 			</description>
 		</method>
 		<method name="multimesh_instance_set_transform_2d">
 			<return type="void" />
-			<argument index="0" name="multimesh" type="RID" />
-			<argument index="1" name="index" type="int" />
-			<argument index="2" name="transform" type="Transform2D" />
+			<param index="0" name="multimesh" type="RID" />
+			<param index="1" name="index" type="int" />
+			<param index="2" name="transform" type="Transform2D" />
 			<description>
 				Sets the [Transform2D] for this instance. For use when multimesh is used in 2D. Equivalent to [method MultiMesh.set_instance_transform_2d].
 			</description>
 		</method>
 		<method name="multimesh_set_buffer">
 			<return type="void" />
-			<argument index="0" name="multimesh" type="RID" />
-			<argument index="1" name="buffer" type="PackedFloat32Array" />
+			<param index="0" name="multimesh" type="RID" />
+			<param index="1" name="buffer" type="PackedFloat32Array" />
 			<description>
 			</description>
 		</method>
 		<method name="multimesh_set_mesh">
 			<return type="void" />
-			<argument index="0" name="multimesh" type="RID" />
-			<argument index="1" name="mesh" type="RID" />
+			<param index="0" name="multimesh" type="RID" />
+			<param index="1" name="mesh" type="RID" />
 			<description>
 				Sets the mesh to be drawn by the multimesh. Equivalent to [member MultiMesh.mesh].
 			</description>
 		</method>
 		<method name="multimesh_set_visible_instances">
 			<return type="void" />
-			<argument index="0" name="multimesh" type="RID" />
-			<argument index="1" name="visible" type="int" />
+			<param index="0" name="multimesh" type="RID" />
+			<param index="1" name="visible" type="int" />
 			<description>
 				Sets the number of instances visible at a given time. If -1, all instances that have been allocated are drawn. Equivalent to [member MultiMesh.visible_instance_count].
 			</description>
@@ -2189,9 +2189,9 @@
 		</method>
 		<method name="occluder_set_mesh">
 			<return type="void" />
-			<argument index="0" name="occluder" type="RID" />
-			<argument index="1" name="vertices" type="PackedVector3Array" />
-			<argument index="2" name="indices" type="PackedInt32Array" />
+			<param index="0" name="occluder" type="RID" />
+			<param index="1" name="vertices" type="PackedVector3Array" />
+			<param index="2" name="indices" type="PackedInt32Array" />
 			<description>
 			</description>
 		</method>
@@ -2210,70 +2210,70 @@
 		</method>
 		<method name="particles_collision_height_field_update">
 			<return type="void" />
-			<argument index="0" name="particles_collision" type="RID" />
+			<param index="0" name="particles_collision" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="particles_collision_set_attractor_attenuation">
 			<return type="void" />
-			<argument index="0" name="particles_collision" type="RID" />
-			<argument index="1" name="curve" type="float" />
+			<param index="0" name="particles_collision" type="RID" />
+			<param index="1" name="curve" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="particles_collision_set_attractor_directionality">
 			<return type="void" />
-			<argument index="0" name="particles_collision" type="RID" />
-			<argument index="1" name="amount" type="float" />
+			<param index="0" name="particles_collision" type="RID" />
+			<param index="1" name="amount" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="particles_collision_set_attractor_strength">
 			<return type="void" />
-			<argument index="0" name="particles_collision" type="RID" />
-			<argument index="1" name="setrngth" type="float" />
+			<param index="0" name="particles_collision" type="RID" />
+			<param index="1" name="setrngth" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="particles_collision_set_box_extents">
 			<return type="void" />
-			<argument index="0" name="particles_collision" type="RID" />
-			<argument index="1" name="extents" type="Vector3" />
+			<param index="0" name="particles_collision" type="RID" />
+			<param index="1" name="extents" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="particles_collision_set_collision_type">
 			<return type="void" />
-			<argument index="0" name="particles_collision" type="RID" />
-			<argument index="1" name="type" type="int" enum="RenderingServer.ParticlesCollisionType" />
+			<param index="0" name="particles_collision" type="RID" />
+			<param index="1" name="type" type="int" enum="RenderingServer.ParticlesCollisionType" />
 			<description>
 			</description>
 		</method>
 		<method name="particles_collision_set_cull_mask">
 			<return type="void" />
-			<argument index="0" name="particles_collision" type="RID" />
-			<argument index="1" name="mask" type="int" />
+			<param index="0" name="particles_collision" type="RID" />
+			<param index="1" name="mask" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="particles_collision_set_field_texture">
 			<return type="void" />
-			<argument index="0" name="particles_collision" type="RID" />
-			<argument index="1" name="texture" type="RID" />
+			<param index="0" name="particles_collision" type="RID" />
+			<param index="1" name="texture" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="particles_collision_set_height_field_resolution">
 			<return type="void" />
-			<argument index="0" name="particles_collision" type="RID" />
-			<argument index="1" name="resolution" type="int" enum="RenderingServer.ParticlesCollisionHeightfieldResolution" />
+			<param index="0" name="particles_collision" type="RID" />
+			<param index="1" name="resolution" type="int" enum="RenderingServer.ParticlesCollisionHeightfieldResolution" />
 			<description>
 			</description>
 		</method>
 		<method name="particles_collision_set_sphere_radius">
 			<return type="void" />
-			<argument index="0" name="particles_collision" type="RID" />
-			<argument index="1" name="radius" type="float" />
+			<param index="0" name="particles_collision" type="RID" />
+			<param index="1" name="radius" type="float" />
 			<description>
 			</description>
 		</method>
@@ -2287,180 +2287,180 @@
 		</method>
 		<method name="particles_emit">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="transform" type="Transform3D" />
-			<argument index="2" name="velocity" type="Vector3" />
-			<argument index="3" name="color" type="Color" />
-			<argument index="4" name="custom" type="Color" />
-			<argument index="5" name="emit_flags" type="int" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="transform" type="Transform3D" />
+			<param index="2" name="velocity" type="Vector3" />
+			<param index="3" name="color" type="Color" />
+			<param index="4" name="custom" type="Color" />
+			<param index="5" name="emit_flags" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="particles_get_current_aabb">
 			<return type="AABB" />
-			<argument index="0" name="particles" type="RID" />
+			<param index="0" name="particles" type="RID" />
 			<description>
 				Calculates and returns the axis-aligned bounding box that contains all the particles. Equivalent to [method GPUParticles3D.capture_aabb].
 			</description>
 		</method>
 		<method name="particles_get_emitting">
 			<return type="bool" />
-			<argument index="0" name="particles" type="RID" />
+			<param index="0" name="particles" type="RID" />
 			<description>
 				Returns [code]true[/code] if particles are currently set to emitting.
 			</description>
 		</method>
 		<method name="particles_is_inactive">
 			<return type="bool" />
-			<argument index="0" name="particles" type="RID" />
+			<param index="0" name="particles" type="RID" />
 			<description>
 				Returns [code]true[/code] if particles are not emitting and particles are set to inactive.
 			</description>
 		</method>
 		<method name="particles_request_process">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
+			<param index="0" name="particles" type="RID" />
 			<description>
 				Add particle system to list of particle systems that need to be updated. Update will take place on the next frame, or on the next call to [method instances_cull_aabb], [method instances_cull_convex], or [method instances_cull_ray].
 			</description>
 		</method>
 		<method name="particles_restart">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
+			<param index="0" name="particles" type="RID" />
 			<description>
 				Reset the particles on the next update. Equivalent to [method GPUParticles3D.restart].
 			</description>
 		</method>
 		<method name="particles_set_amount">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="amount" type="int" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="amount" type="int" />
 			<description>
 				Sets the number of particles to be drawn and allocates the memory for them. Equivalent to [member GPUParticles3D.amount].
 			</description>
 		</method>
 		<method name="particles_set_collision_base_size">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="size" type="float" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="size" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="particles_set_custom_aabb">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="aabb" type="AABB" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="aabb" type="AABB" />
 			<description>
 				Sets a custom axis-aligned bounding box for the particle system. Equivalent to [member GPUParticles3D.visibility_aabb].
 			</description>
 		</method>
 		<method name="particles_set_draw_order">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="order" type="int" enum="RenderingServer.ParticlesDrawOrder" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="order" type="int" enum="RenderingServer.ParticlesDrawOrder" />
 			<description>
 				Sets the draw order of the particles to one of the named enums from [enum ParticlesDrawOrder]. See [enum ParticlesDrawOrder] for options. Equivalent to [member GPUParticles3D.draw_order].
 			</description>
 		</method>
 		<method name="particles_set_draw_pass_mesh">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="pass" type="int" />
-			<argument index="2" name="mesh" type="RID" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="pass" type="int" />
+			<param index="2" name="mesh" type="RID" />
 			<description>
 				Sets the mesh to be used for the specified draw pass. Equivalent to [member GPUParticles3D.draw_pass_1], [member GPUParticles3D.draw_pass_2], [member GPUParticles3D.draw_pass_3], and [member GPUParticles3D.draw_pass_4].
 			</description>
 		</method>
 		<method name="particles_set_draw_passes">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="count" type="int" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="count" type="int" />
 			<description>
 				Sets the number of draw passes to use. Equivalent to [member GPUParticles3D.draw_passes].
 			</description>
 		</method>
 		<method name="particles_set_emission_transform">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="transform" type="Transform3D" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="transform" type="Transform3D" />
 			<description>
 				Sets the [Transform3D] that will be used by the particles when they first emit.
 			</description>
 		</method>
 		<method name="particles_set_emitting">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="emitting" type="bool" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="emitting" type="bool" />
 			<description>
 				If [code]true[/code], particles will emit over time. Setting to false does not reset the particles, but only stops their emission. Equivalent to [member GPUParticles3D.emitting].
 			</description>
 		</method>
 		<method name="particles_set_explosiveness_ratio">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="ratio" type="float" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="ratio" type="float" />
 			<description>
 				Sets the explosiveness ratio. Equivalent to [member GPUParticles3D.explosiveness].
 			</description>
 		</method>
 		<method name="particles_set_fixed_fps">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="fps" type="int" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="fps" type="int" />
 			<description>
 				Sets the frame rate that the particle system rendering will be fixed to. Equivalent to [member GPUParticles3D.fixed_fps].
 			</description>
 		</method>
 		<method name="particles_set_fractional_delta">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				If [code]true[/code], uses fractional delta which smooths the movement of the particles. Equivalent to [member GPUParticles3D.fract_delta].
 			</description>
 		</method>
 		<method name="particles_set_interpolate">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="particles_set_lifetime">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="lifetime" type="float" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="lifetime" type="float" />
 			<description>
 				Sets the lifetime of each particle in the system. Equivalent to [member GPUParticles3D.lifetime].
 			</description>
 		</method>
 		<method name="particles_set_mode">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="mode" type="int" enum="RenderingServer.ParticlesMode" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="mode" type="int" enum="RenderingServer.ParticlesMode" />
 			<description>
 			</description>
 		</method>
 		<method name="particles_set_one_shot">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="one_shot" type="bool" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="one_shot" type="bool" />
 			<description>
 				If [code]true[/code], particles will emit once and then stop. Equivalent to [member GPUParticles3D.one_shot].
 			</description>
 		</method>
 		<method name="particles_set_pre_process_time">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="time" type="float" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="time" type="float" />
 			<description>
 				Sets the preprocess time for the particles' animation. This lets you delay starting an animation until after the particles have begun emitting. Equivalent to [member GPUParticles3D.preprocess].
 			</description>
 		</method>
 		<method name="particles_set_process_material">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="material" type="RID" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="material" type="RID" />
 			<description>
 				Sets the material for processing the particles.
 				[b]Note:[/b] This is not the material used to draw the materials. Equivalent to [member GPUParticles3D.process_material].
@@ -2468,60 +2468,60 @@
 		</method>
 		<method name="particles_set_randomness_ratio">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="ratio" type="float" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="ratio" type="float" />
 			<description>
 				Sets the emission randomness ratio. This randomizes the emission of particles within their phase. Equivalent to [member GPUParticles3D.randomness].
 			</description>
 		</method>
 		<method name="particles_set_speed_scale">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="scale" type="float" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="scale" type="float" />
 			<description>
 				Sets the speed scale of the particle system. Equivalent to [member GPUParticles3D.speed_scale].
 			</description>
 		</method>
 		<method name="particles_set_subemitter">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="subemitter_particles" type="RID" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="subemitter_particles" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="particles_set_trail_bind_poses">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="bind_poses" type="Transform3D[]" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="bind_poses" type="Transform3D[]" />
 			<description>
 			</description>
 		</method>
 		<method name="particles_set_trails">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="enable" type="bool" />
-			<argument index="2" name="length_sec" type="float" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="enable" type="bool" />
+			<param index="2" name="length_sec" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="particles_set_transform_align">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="align" type="int" enum="RenderingServer.ParticlesTransformAlign" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="align" type="int" enum="RenderingServer.ParticlesTransformAlign" />
 			<description>
 			</description>
 		</method>
 		<method name="particles_set_use_local_coordinates">
 			<return type="void" />
-			<argument index="0" name="particles" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="particles" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				If [code]true[/code], particles use local coordinates. If [code]false[/code] they use global coordinates. Equivalent to [member GPUParticles3D.local_coords].
 			</description>
 		</method>
 		<method name="positional_soft_shadow_filter_set_quality">
 			<return type="void" />
-			<argument index="0" name="quality" type="int" enum="RenderingServer.ShadowQuality" />
+			<param index="0" name="quality" type="int" enum="RenderingServer.ShadowQuality" />
 			<description>
 			</description>
 		</method>
@@ -2535,114 +2535,114 @@
 		</method>
 		<method name="reflection_probe_set_ambient_color">
 			<return type="void" />
-			<argument index="0" name="probe" type="RID" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="probe" type="RID" />
+			<param index="1" name="color" type="Color" />
 			<description>
 			</description>
 		</method>
 		<method name="reflection_probe_set_ambient_energy">
 			<return type="void" />
-			<argument index="0" name="probe" type="RID" />
-			<argument index="1" name="energy" type="float" />
+			<param index="0" name="probe" type="RID" />
+			<param index="1" name="energy" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="reflection_probe_set_ambient_mode">
 			<return type="void" />
-			<argument index="0" name="probe" type="RID" />
-			<argument index="1" name="mode" type="int" enum="RenderingServer.ReflectionProbeAmbientMode" />
+			<param index="0" name="probe" type="RID" />
+			<param index="1" name="mode" type="int" enum="RenderingServer.ReflectionProbeAmbientMode" />
 			<description>
 			</description>
 		</method>
 		<method name="reflection_probe_set_as_interior">
 			<return type="void" />
-			<argument index="0" name="probe" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="probe" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				If [code]true[/code], reflections will ignore sky contribution. Equivalent to [member ReflectionProbe.interior].
 			</description>
 		</method>
 		<method name="reflection_probe_set_cull_mask">
 			<return type="void" />
-			<argument index="0" name="probe" type="RID" />
-			<argument index="1" name="layers" type="int" />
+			<param index="0" name="probe" type="RID" />
+			<param index="1" name="layers" type="int" />
 			<description>
 				Sets the render cull mask for this reflection probe. Only instances with a matching cull mask will be rendered by this probe. Equivalent to [member ReflectionProbe.cull_mask].
 			</description>
 		</method>
 		<method name="reflection_probe_set_enable_box_projection">
 			<return type="void" />
-			<argument index="0" name="probe" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="probe" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				If [code]true[/code], uses box projection. This can make reflections look more correct in certain situations. Equivalent to [member ReflectionProbe.box_projection].
 			</description>
 		</method>
 		<method name="reflection_probe_set_enable_shadows">
 			<return type="void" />
-			<argument index="0" name="probe" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="probe" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				If [code]true[/code], computes shadows in the reflection probe. This makes the reflection much slower to compute. Equivalent to [member ReflectionProbe.enable_shadows].
 			</description>
 		</method>
 		<method name="reflection_probe_set_extents">
 			<return type="void" />
-			<argument index="0" name="probe" type="RID" />
-			<argument index="1" name="extents" type="Vector3" />
+			<param index="0" name="probe" type="RID" />
+			<param index="1" name="extents" type="Vector3" />
 			<description>
 				Sets the size of the area that the reflection probe will capture. Equivalent to [member ReflectionProbe.extents].
 			</description>
 		</method>
 		<method name="reflection_probe_set_intensity">
 			<return type="void" />
-			<argument index="0" name="probe" type="RID" />
-			<argument index="1" name="intensity" type="float" />
+			<param index="0" name="probe" type="RID" />
+			<param index="1" name="intensity" type="float" />
 			<description>
 				Sets the intensity of the reflection probe. Intensity modulates the strength of the reflection. Equivalent to [member ReflectionProbe.intensity].
 			</description>
 		</method>
 		<method name="reflection_probe_set_max_distance">
 			<return type="void" />
-			<argument index="0" name="probe" type="RID" />
-			<argument index="1" name="distance" type="float" />
+			<param index="0" name="probe" type="RID" />
+			<param index="1" name="distance" type="float" />
 			<description>
 				Sets the max distance away from the probe an object can be before it is culled. Equivalent to [member ReflectionProbe.max_distance].
 			</description>
 		</method>
 		<method name="reflection_probe_set_mesh_lod_threshold">
 			<return type="void" />
-			<argument index="0" name="probe" type="RID" />
-			<argument index="1" name="pixels" type="float" />
+			<param index="0" name="probe" type="RID" />
+			<param index="1" name="pixels" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="reflection_probe_set_origin_offset">
 			<return type="void" />
-			<argument index="0" name="probe" type="RID" />
-			<argument index="1" name="offset" type="Vector3" />
+			<param index="0" name="probe" type="RID" />
+			<param index="1" name="offset" type="Vector3" />
 			<description>
 				Sets the origin offset to be used when this reflection probe is in box project mode. Equivalent to [member ReflectionProbe.origin_offset].
 			</description>
 		</method>
 		<method name="reflection_probe_set_resolution">
 			<return type="void" />
-			<argument index="0" name="probe" type="RID" />
-			<argument index="1" name="resolution" type="int" />
+			<param index="0" name="probe" type="RID" />
+			<param index="1" name="resolution" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="reflection_probe_set_update_mode">
 			<return type="void" />
-			<argument index="0" name="probe" type="RID" />
-			<argument index="1" name="mode" type="int" enum="RenderingServer.ReflectionProbeUpdateMode" />
+			<param index="0" name="probe" type="RID" />
+			<param index="1" name="mode" type="int" enum="RenderingServer.ReflectionProbeUpdateMode" />
 			<description>
 				Sets how often the reflection probe updates. Can either be once or every frame. See [enum ReflectionProbeUpdateMode] for options.
 			</description>
 		</method>
 		<method name="request_frame_drawn_callback">
 			<return type="void" />
-			<argument index="0" name="callable" type="Callable" />
+			<param index="0" name="callable" type="Callable" />
 			<description>
 				Schedules a callback to the given callable after a frame has been drawn.
 			</description>
@@ -2657,55 +2657,55 @@
 		</method>
 		<method name="scenario_set_camera_effects">
 			<return type="void" />
-			<argument index="0" name="scenario" type="RID" />
-			<argument index="1" name="effects" type="RID" />
+			<param index="0" name="scenario" type="RID" />
+			<param index="1" name="effects" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="scenario_set_environment">
 			<return type="void" />
-			<argument index="0" name="scenario" type="RID" />
-			<argument index="1" name="environment" type="RID" />
+			<param index="0" name="scenario" type="RID" />
+			<param index="1" name="environment" type="RID" />
 			<description>
 				Sets the environment that will be used with this scenario.
 			</description>
 		</method>
 		<method name="scenario_set_fallback_environment">
 			<return type="void" />
-			<argument index="0" name="scenario" type="RID" />
-			<argument index="1" name="environment" type="RID" />
+			<param index="0" name="scenario" type="RID" />
+			<param index="1" name="environment" type="RID" />
 			<description>
 				Sets the fallback environment to be used by this scenario. The fallback environment is used if no environment is set. Internally, this is used by the editor to provide a default environment.
 			</description>
 		</method>
 		<method name="screen_space_roughness_limiter_set_active">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
-			<argument index="1" name="amount" type="float" />
-			<argument index="2" name="limit" type="float" />
+			<param index="0" name="enable" type="bool" />
+			<param index="1" name="amount" type="float" />
+			<param index="2" name="limit" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_boot_image">
 			<return type="void" />
-			<argument index="0" name="image" type="Image" />
-			<argument index="1" name="color" type="Color" />
-			<argument index="2" name="scale" type="bool" />
-			<argument index="3" name="use_filter" type="bool" default="true" />
+			<param index="0" name="image" type="Image" />
+			<param index="1" name="color" type="Color" />
+			<param index="2" name="scale" type="bool" />
+			<param index="3" name="use_filter" type="bool" default="true" />
 			<description>
-				Sets a boot image. The color defines the background color. If [code]scale[/code] is [code]true[/code], the image will be scaled to fit the screen size. If [code]use_filter[/code] is [code]true[/code], the image will be scaled with linear interpolation. If [code]use_filter[/code] is [code]false[/code], the image will be scaled with nearest-neighbor interpolation.
+				Sets a boot image. The color defines the background color. If [param scale] is [code]true[/code], the image will be scaled to fit the screen size. If [param use_filter] is [code]true[/code], the image will be scaled with linear interpolation. If [param use_filter] is [code]false[/code], the image will be scaled with nearest-neighbor interpolation.
 			</description>
 		</method>
 		<method name="set_debug_generate_wireframes">
 			<return type="void" />
-			<argument index="0" name="generate" type="bool" />
+			<param index="0" name="generate" type="bool" />
 			<description>
 				If [code]true[/code], the engine will generate wireframes for use with the wireframe debug mode.
 			</description>
 		</method>
 		<method name="set_default_clear_color">
 			<return type="void" />
-			<argument index="0" name="color" type="Color" />
+			<param index="0" name="color" type="Color" />
 			<description>
 				Sets the default clear color which is used when a specific clear color has not been selected.
 			</description>
@@ -2719,98 +2719,98 @@
 		</method>
 		<method name="shader_get_code" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="shader" type="RID" />
+			<param index="0" name="shader" type="RID" />
 			<description>
 				Returns a shader's code.
 			</description>
 		</method>
 		<method name="shader_get_default_texture_param" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="shader" type="RID" />
-			<argument index="1" name="param" type="StringName" />
-			<argument index="2" name="index" type="int" default="0" />
+			<param index="0" name="shader" type="RID" />
+			<param index="1" name="param" type="StringName" />
+			<param index="2" name="index" type="int" default="0" />
 			<description>
 				Returns a default texture from a shader searched by name.
-				[b]Note:[/b] If the sampler array is used use [code]index[/code] to access the specified texture.
+				[b]Note:[/b] If the sampler array is used use [param index] to access the specified texture.
 			</description>
 		</method>
 		<method name="shader_get_param_default" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="shader" type="RID" />
-			<argument index="1" name="param" type="StringName" />
+			<param index="0" name="shader" type="RID" />
+			<param index="1" name="param" type="StringName" />
 			<description>
 			</description>
 		</method>
-		<method name="shader_get_param_list" qualifiers="const">
+		<method name="shader_get_shader_uniform_list" qualifiers="const">
 			<return type="Dictionary[]" />
-			<argument index="0" name="shader" type="RID" />
+			<param index="0" name="shader" type="RID" />
 			<description>
 				Returns the parameters of a shader.
 			</description>
 		</method>
 		<method name="shader_set_code">
 			<return type="void" />
-			<argument index="0" name="shader" type="RID" />
-			<argument index="1" name="code" type="String" />
+			<param index="0" name="shader" type="RID" />
+			<param index="1" name="code" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="shader_set_default_texture_param">
 			<return type="void" />
-			<argument index="0" name="shader" type="RID" />
-			<argument index="1" name="param" type="StringName" />
-			<argument index="2" name="texture" type="RID" />
-			<argument index="3" name="index" type="int" default="0" />
+			<param index="0" name="shader" type="RID" />
+			<param index="1" name="param" type="StringName" />
+			<param index="2" name="texture" type="RID" />
+			<param index="3" name="index" type="int" default="0" />
 			<description>
 				Sets a shader's default texture. Overwrites the texture given by name.
-				[b]Note:[/b] If the sampler array is used use [code]index[/code] to access the specified texture.
+				[b]Note:[/b] If the sampler array is used use [param index] to access the specified texture.
 			</description>
 		</method>
 		<method name="shader_set_path_hint">
 			<return type="void" />
-			<argument index="0" name="shader" type="RID" />
-			<argument index="1" name="path" type="String" />
+			<param index="0" name="shader" type="RID" />
+			<param index="1" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="skeleton_allocate_data">
 			<return type="void" />
-			<argument index="0" name="skeleton" type="RID" />
-			<argument index="1" name="bones" type="int" />
-			<argument index="2" name="is_2d_skeleton" type="bool" default="false" />
+			<param index="0" name="skeleton" type="RID" />
+			<param index="1" name="bones" type="int" />
+			<param index="2" name="is_2d_skeleton" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
 		<method name="skeleton_bone_get_transform" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="skeleton" type="RID" />
-			<argument index="1" name="bone" type="int" />
+			<param index="0" name="skeleton" type="RID" />
+			<param index="1" name="bone" type="int" />
 			<description>
 				Returns the [Transform3D] set for a specific bone of this skeleton.
 			</description>
 		</method>
 		<method name="skeleton_bone_get_transform_2d" qualifiers="const">
 			<return type="Transform2D" />
-			<argument index="0" name="skeleton" type="RID" />
-			<argument index="1" name="bone" type="int" />
+			<param index="0" name="skeleton" type="RID" />
+			<param index="1" name="bone" type="int" />
 			<description>
 				Returns the [Transform2D] set for a specific bone of this skeleton.
 			</description>
 		</method>
 		<method name="skeleton_bone_set_transform">
 			<return type="void" />
-			<argument index="0" name="skeleton" type="RID" />
-			<argument index="1" name="bone" type="int" />
-			<argument index="2" name="transform" type="Transform3D" />
+			<param index="0" name="skeleton" type="RID" />
+			<param index="1" name="bone" type="int" />
+			<param index="2" name="transform" type="Transform3D" />
 			<description>
 				Sets the [Transform3D] for a specific bone of this skeleton.
 			</description>
 		</method>
 		<method name="skeleton_bone_set_transform_2d">
 			<return type="void" />
-			<argument index="0" name="skeleton" type="RID" />
-			<argument index="1" name="bone" type="int" />
-			<argument index="2" name="transform" type="Transform2D" />
+			<param index="0" name="skeleton" type="RID" />
+			<param index="1" name="bone" type="int" />
+			<param index="2" name="transform" type="Transform2D" />
 			<description>
 				Sets the [Transform2D] for a specific bone of this skeleton.
 			</description>
@@ -2824,24 +2824,24 @@
 		</method>
 		<method name="skeleton_get_bone_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="skeleton" type="RID" />
+			<param index="0" name="skeleton" type="RID" />
 			<description>
 				Returns the number of bones allocated for this skeleton.
 			</description>
 		</method>
 		<method name="skeleton_set_base_transform_2d">
 			<return type="void" />
-			<argument index="0" name="skeleton" type="RID" />
-			<argument index="1" name="base_transform" type="Transform2D" />
+			<param index="0" name="skeleton" type="RID" />
+			<param index="1" name="base_transform" type="Transform2D" />
 			<description>
 			</description>
 		</method>
 		<method name="sky_bake_panorama">
 			<return type="Image" />
-			<argument index="0" name="sky" type="RID" />
-			<argument index="1" name="energy" type="float" />
-			<argument index="2" name="bake_irradiance" type="bool" />
-			<argument index="3" name="size" type="Vector2i" />
+			<param index="0" name="sky" type="RID" />
+			<param index="1" name="energy" type="float" />
+			<param index="2" name="bake_irradiance" type="bool" />
+			<param index="3" name="size" type="Vector2i" />
 			<description>
 			</description>
 		</method>
@@ -2854,23 +2854,23 @@
 		</method>
 		<method name="sky_set_material">
 			<return type="void" />
-			<argument index="0" name="sky" type="RID" />
-			<argument index="1" name="material" type="RID" />
+			<param index="0" name="sky" type="RID" />
+			<param index="1" name="material" type="RID" />
 			<description>
 				Sets the material that the sky uses to render the background and reflection maps.
 			</description>
 		</method>
 		<method name="sky_set_mode">
 			<return type="void" />
-			<argument index="0" name="sky" type="RID" />
-			<argument index="1" name="mode" type="int" enum="RenderingServer.SkyMode" />
+			<param index="0" name="sky" type="RID" />
+			<param index="1" name="mode" type="int" enum="RenderingServer.SkyMode" />
 			<description>
 			</description>
 		</method>
 		<method name="sky_set_radiance_size">
 			<return type="void" />
-			<argument index="0" name="sky" type="RID" />
-			<argument index="1" name="radiance_size" type="int" />
+			<param index="0" name="sky" type="RID" />
+			<param index="1" name="radiance_size" type="int" />
 			<description>
 			</description>
 		</method>
@@ -2884,46 +2884,46 @@
 		</method>
 		<method name="sub_surface_scattering_set_quality">
 			<return type="void" />
-			<argument index="0" name="quality" type="int" enum="RenderingServer.SubSurfaceScatteringQuality" />
+			<param index="0" name="quality" type="int" enum="RenderingServer.SubSurfaceScatteringQuality" />
 			<description>
 			</description>
 		</method>
 		<method name="sub_surface_scattering_set_scale">
 			<return type="void" />
-			<argument index="0" name="scale" type="float" />
-			<argument index="1" name="depth_scale" type="float" />
+			<param index="0" name="scale" type="float" />
+			<param index="1" name="depth_scale" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_2d_create">
 			<return type="RID" />
-			<argument index="0" name="image" type="Image" />
+			<param index="0" name="image" type="Image" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_2d_get" qualifiers="const">
 			<return type="Image" />
-			<argument index="0" name="texture" type="RID" />
+			<param index="0" name="texture" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_2d_layer_get" qualifiers="const">
 			<return type="Image" />
-			<argument index="0" name="texture" type="RID" />
-			<argument index="1" name="layer" type="int" />
+			<param index="0" name="texture" type="RID" />
+			<param index="1" name="layer" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_2d_layered_create">
 			<return type="RID" />
-			<argument index="0" name="layers" type="Image[]" />
-			<argument index="1" name="layered_type" type="int" enum="RenderingServer.TextureLayeredType" />
+			<param index="0" name="layers" type="Image[]" />
+			<param index="1" name="layered_type" type="int" enum="RenderingServer.TextureLayeredType" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_2d_layered_placeholder_create">
 			<return type="RID" />
-			<argument index="0" name="layered_type" type="int" enum="RenderingServer.TextureLayeredType" />
+			<param index="0" name="layered_type" type="int" enum="RenderingServer.TextureLayeredType" />
 			<description>
 			</description>
 		</method>
@@ -2934,26 +2934,26 @@
 		</method>
 		<method name="texture_2d_update">
 			<return type="void" />
-			<argument index="0" name="texture" type="RID" />
-			<argument index="1" name="image" type="Image" />
-			<argument index="2" name="layer" type="int" />
+			<param index="0" name="texture" type="RID" />
+			<param index="1" name="image" type="Image" />
+			<param index="2" name="layer" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_3d_create">
 			<return type="RID" />
-			<argument index="0" name="format" type="int" enum="Image.Format" />
-			<argument index="1" name="width" type="int" />
-			<argument index="2" name="height" type="int" />
-			<argument index="3" name="depth" type="int" />
-			<argument index="4" name="mipmaps" type="bool" />
-			<argument index="5" name="data" type="Image[]" />
+			<param index="0" name="format" type="int" enum="Image.Format" />
+			<param index="1" name="width" type="int" />
+			<param index="2" name="height" type="int" />
+			<param index="3" name="depth" type="int" />
+			<param index="4" name="mipmaps" type="bool" />
+			<param index="5" name="data" type="Image[]" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_3d_get" qualifiers="const">
 			<return type="Image[]" />
-			<argument index="0" name="texture" type="RID" />
+			<param index="0" name="texture" type="RID" />
 			<description>
 			</description>
 		</method>
@@ -2964,82 +2964,82 @@
 		</method>
 		<method name="texture_3d_update">
 			<return type="void" />
-			<argument index="0" name="texture" type="RID" />
-			<argument index="1" name="data" type="Image[]" />
+			<param index="0" name="texture" type="RID" />
+			<param index="1" name="data" type="Image[]" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_get_path" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="texture" type="RID" />
+			<param index="0" name="texture" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_proxy_create">
 			<return type="RID" />
-			<argument index="0" name="base" type="RID" />
+			<param index="0" name="base" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_proxy_update">
 			<return type="void" />
-			<argument index="0" name="texture" type="RID" />
-			<argument index="1" name="proxy_to" type="RID" />
+			<param index="0" name="texture" type="RID" />
+			<param index="1" name="proxy_to" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_replace">
 			<return type="void" />
-			<argument index="0" name="texture" type="RID" />
-			<argument index="1" name="by_texture" type="RID" />
+			<param index="0" name="texture" type="RID" />
+			<param index="1" name="by_texture" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_set_force_redraw_if_visible">
 			<return type="void" />
-			<argument index="0" name="texture" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="texture" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_set_path">
 			<return type="void" />
-			<argument index="0" name="texture" type="RID" />
-			<argument index="1" name="path" type="String" />
+			<param index="0" name="texture" type="RID" />
+			<param index="1" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="texture_set_size_override">
 			<return type="void" />
-			<argument index="0" name="texture" type="RID" />
-			<argument index="1" name="width" type="int" />
-			<argument index="2" name="height" type="int" />
+			<param index="0" name="texture" type="RID" />
+			<param index="1" name="width" type="int" />
+			<param index="2" name="height" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="viewport_attach_camera">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="camera" type="RID" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="camera" type="RID" />
 			<description>
 				Sets a viewport's camera.
 			</description>
 		</method>
 		<method name="viewport_attach_canvas">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="canvas" type="RID" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="canvas" type="RID" />
 			<description>
 				Sets a viewport's canvas.
 			</description>
 		</method>
 		<method name="viewport_attach_to_screen">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="rect" type="Rect2" default="Rect2(0, 0, 0, 0)" />
-			<argument index="2" name="screen" type="int" default="0" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="rect" type="Rect2" default="Rect2(0, 0, 0, 0)" />
+			<param index="2" name="screen" type="int" default="0" />
 			<description>
-				Copies the viewport to a region of the screen specified by [code]rect[/code]. If [method viewport_set_render_direct_to_screen] is [code]true[/code], then the viewport does not use a framebuffer and the contents of the viewport are rendered directly to screen. However, note that the root viewport is drawn last, therefore it will draw over the screen. Accordingly, you must set the root viewport to an area that does not cover the area that you have attached this viewport to.
+				Copies the viewport to a region of the screen specified by [param rect]. If [method viewport_set_render_direct_to_screen] is [code]true[/code], then the viewport does not use a framebuffer and the contents of the viewport are rendered directly to screen. However, note that the root viewport is drawn last, therefore it will draw over the screen. Accordingly, you must set the root viewport to an area that does not cover the area that you have attached this viewport to.
 				For example, you can set the root viewport to not render at all with the following code:
 				FIXME: The method seems to be non-existent.
 				[codeblocks]
@@ -3061,185 +3061,185 @@
 		</method>
 		<method name="viewport_get_measured_render_time_cpu" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="viewport" type="RID" />
+			<param index="0" name="viewport" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="viewport_get_measured_render_time_gpu" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="viewport" type="RID" />
+			<param index="0" name="viewport" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="viewport_get_render_info">
 			<return type="int" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="type" type="int" enum="RenderingServer.ViewportRenderInfoType" />
-			<argument index="2" name="info" type="int" enum="RenderingServer.ViewportRenderInfo" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="type" type="int" enum="RenderingServer.ViewportRenderInfoType" />
+			<param index="2" name="info" type="int" enum="RenderingServer.ViewportRenderInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="viewport_get_texture" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="viewport" type="RID" />
+			<param index="0" name="viewport" type="RID" />
 			<description>
 				Returns the viewport's last rendered frame.
 			</description>
 		</method>
 		<method name="viewport_remove_canvas">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="canvas" type="RID" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="canvas" type="RID" />
 			<description>
 				Detaches a viewport from a canvas and vice versa.
 			</description>
 		</method>
 		<method name="viewport_set_active">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="active" type="bool" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="active" type="bool" />
 			<description>
 				If [code]true[/code], sets the viewport active, else sets it inactive.
 			</description>
 		</method>
 		<method name="viewport_set_canvas_stacking">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="canvas" type="RID" />
-			<argument index="2" name="layer" type="int" />
-			<argument index="3" name="sublayer" type="int" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="canvas" type="RID" />
+			<param index="2" name="layer" type="int" />
+			<param index="3" name="sublayer" type="int" />
 			<description>
 				Sets the stacking order for a viewport's canvas.
-				[code]layer[/code] is the actual canvas layer, while [code]sublayer[/code] specifies the stacking order of the canvas among those in the same layer.
+				[param layer] is the actual canvas layer, while [param sublayer] specifies the stacking order of the canvas among those in the same layer.
 			</description>
 		</method>
 		<method name="viewport_set_canvas_transform">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="canvas" type="RID" />
-			<argument index="2" name="offset" type="Transform2D" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="canvas" type="RID" />
+			<param index="2" name="offset" type="Transform2D" />
 			<description>
 				Sets the transformation of a viewport's canvas.
 			</description>
 		</method>
 		<method name="viewport_set_clear_mode">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="clear_mode" type="int" enum="RenderingServer.ViewportClearMode" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="clear_mode" type="int" enum="RenderingServer.ViewportClearMode" />
 			<description>
 				Sets the clear mode of a viewport. See [enum ViewportClearMode] for options.
 			</description>
 		</method>
 		<method name="viewport_set_debug_draw">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="draw" type="int" enum="RenderingServer.ViewportDebugDraw" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="draw" type="int" enum="RenderingServer.ViewportDebugDraw" />
 			<description>
 				Sets the debug draw mode of a viewport. See [enum ViewportDebugDraw] for options.
 			</description>
 		</method>
 		<method name="viewport_set_default_canvas_item_texture_filter">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="filter" type="int" enum="RenderingServer.CanvasItemTextureFilter" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="filter" type="int" enum="RenderingServer.CanvasItemTextureFilter" />
 			<description>
 			</description>
 		</method>
 		<method name="viewport_set_default_canvas_item_texture_repeat">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="repeat" type="int" enum="RenderingServer.CanvasItemTextureRepeat" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="repeat" type="int" enum="RenderingServer.CanvasItemTextureRepeat" />
 			<description>
 			</description>
 		</method>
 		<method name="viewport_set_disable_2d">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="disable" type="bool" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="disable" type="bool" />
 			<description>
 				If [code]true[/code], the viewport's canvas is not rendered.
 			</description>
 		</method>
 		<method name="viewport_set_disable_3d">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="disable" type="bool" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="disable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="viewport_set_disable_environment">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="disabled" type="bool" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="disabled" type="bool" />
 			<description>
 				If [code]true[/code], rendering of a viewport's environment is disabled.
 			</description>
 		</method>
 		<method name="viewport_set_fsr_sharpness">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="sharpness" type="float" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="sharpness" type="float" />
 			<description>
 				Determines how sharp the upscaled image will be when using the FSR upscaling mode. Sharpness halves with every whole number. Values go from 0.0 (sharpest) to 2.0. Values above 2.0 won't make a visible difference.
 			</description>
 		</method>
 		<method name="viewport_set_global_canvas_transform">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="transform" type="Transform2D" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="transform" type="Transform2D" />
 			<description>
 				Sets the viewport's global transformation matrix.
 			</description>
 		</method>
 		<method name="viewport_set_measure_render_time">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="viewport_set_msaa">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="msaa" type="int" enum="RenderingServer.ViewportMSAA" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="msaa" type="int" enum="RenderingServer.ViewportMSAA" />
 			<description>
 				Sets the anti-aliasing mode. See [enum ViewportMSAA] for options.
 			</description>
 		</method>
 		<method name="viewport_set_occlusion_culling_build_quality">
 			<return type="void" />
-			<argument index="0" name="quality" type="int" enum="RenderingServer.ViewportOcclusionCullingBuildQuality" />
+			<param index="0" name="quality" type="int" enum="RenderingServer.ViewportOcclusionCullingBuildQuality" />
 			<description>
 			</description>
 		</method>
 		<method name="viewport_set_occlusion_rays_per_thread">
 			<return type="void" />
-			<argument index="0" name="rays_per_thread" type="int" />
+			<param index="0" name="rays_per_thread" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="viewport_set_parent_viewport">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="parent_viewport" type="RID" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="parent_viewport" type="RID" />
 			<description>
 				Sets the viewport's parent to another viewport.
 			</description>
 		</method>
 		<method name="viewport_set_positional_shadow_atlas_quadrant_subdivision">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="quadrant" type="int" />
-			<argument index="2" name="subdivision" type="int" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="quadrant" type="int" />
+			<param index="2" name="subdivision" type="int" />
 			<description>
 				Sets the shadow atlas quadrant's subdivision.
 			</description>
 		</method>
 		<method name="viewport_set_positional_shadow_atlas_size">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="use_16_bits" type="bool" default="false" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="use_16_bits" type="bool" default="false" />
 			<description>
 				Sets the size of the shadow atlas's images (used for omni and spot lights). The value will be rounded up to the nearest power of 2.
 				[b]Note:[/b] If this is set to [code]0[/code], no shadows will be visible at all (including directional shadows).
@@ -3247,24 +3247,24 @@
 		</method>
 		<method name="viewport_set_render_direct_to_screen">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				If [code]true[/code], render the contents of the viewport directly to screen. This allows a low-level optimization where you can skip drawing a viewport to the root viewport. While this optimization can result in a significant increase in speed (especially on older devices), it comes at a cost of usability. When this is enabled, you cannot read from the viewport or from the [code]SCREEN_TEXTURE[/code]. You also lose the benefit of certain window settings, such as the various stretch modes. Another consequence to be aware of is that in 2D the rendering happens in window coordinates, so if you have a viewport that is double the size of the window, and you set this, then only the portion that fits within the window will be drawn, no automatic scaling is possible, even if your game scene is significantly larger than the window size.
 			</description>
 		</method>
 		<method name="viewport_set_scaling_3d_mode">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="scaling_3d_mode" type="int" enum="RenderingServer.ViewportScaling3DMode" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="scaling_3d_mode" type="int" enum="RenderingServer.ViewportScaling3DMode" />
 			<description>
 				Sets scaling 3d mode. Bilinear scaling renders at different resolution to either undersample or supersample the viewport. FidelityFX Super Resolution 1.0, abbreviated to FSR, is an upscaling technology that produces high quality images at fast framerates by using a spatially aware upscaling algorithm. FSR is slightly more expensive than bilinear, but it produces significantly higher image quality. FSR should be used where possible.
 			</description>
 		</method>
 		<method name="viewport_set_scaling_3d_scale">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="scale" type="float" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="scale" type="float" />
 			<description>
 				Scales the 3D render buffer based on the viewport size uses an image filter specified in [enum ViewportScaling3DMode] to scale the output image to the full viewport size. Values lower than [code]1.0[/code] can be used to speed up 3D rendering at the cost of quality (undersampling). Values greater than [code]1.0[/code] are only valid for bilinear mode and can be used to improve 3D rendering quality at a high performance cost (supersampling). See also [enum ViewportMSAA] for multi-sample antialiasing, which is significantly cheaper but only smoothens the edges of polygons.
 				When using FSR upscaling, AMD recommends exposing the following values as preset options to users "Ultra Quality: 0.77", "Quality: 0.67", "Balanced: 0.59", "Performance: 0.5" instead of exposing the entire scale.
@@ -3272,8 +3272,8 @@
 		</method>
 		<method name="viewport_set_scenario">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="scenario" type="RID" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="scenario" type="RID" />
 			<description>
 				Sets a viewport's scenario.
 				The scenario contains information about environment information, reflection atlas etc.
@@ -3281,46 +3281,46 @@
 		</method>
 		<method name="viewport_set_screen_space_aa">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="mode" type="int" enum="RenderingServer.ViewportScreenSpaceAA" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="mode" type="int" enum="RenderingServer.ViewportScreenSpaceAA" />
 			<description>
 			</description>
 		</method>
 		<method name="viewport_set_sdf_oversize_and_scale">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="oversize" type="int" enum="RenderingServer.ViewportSDFOversize" />
-			<argument index="2" name="scale" type="int" enum="RenderingServer.ViewportSDFScale" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="oversize" type="int" enum="RenderingServer.ViewportSDFOversize" />
+			<param index="2" name="scale" type="int" enum="RenderingServer.ViewportSDFScale" />
 			<description>
 			</description>
 		</method>
 		<method name="viewport_set_size">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="width" type="int" />
-			<argument index="2" name="height" type="int" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="width" type="int" />
+			<param index="2" name="height" type="int" />
 			<description>
 				Sets the viewport's width and height.
 			</description>
 		</method>
 		<method name="viewport_set_snap_2d_transforms_to_pixel">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="viewport_set_snap_2d_vertices_to_pixel">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="viewport_set_texture_mipmap_bias">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="mipmap_bias" type="float" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="mipmap_bias" type="float" />
 			<description>
 				Affects the final texture sharpness by reading from a lower or higher mipmap (also called "texture LOD bias"). Negative values make mipmapped textures sharper but grainier when viewed at a distance, while positive values make mipmapped textures blurrier (even when up close). To get sharper textures at a distance without introducing too much graininess, set this between [code]-0.75[/code] and [code]0.0[/code]. Enabling temporal antialiasing ([member ProjectSettings.rendering/anti_aliasing/quality/use_taa]) can help reduce the graininess visible when using negative mipmap bias.
 				[b]Note:[/b] When the 3D scaling mode is set to FSR 1.0, this value is used to adjust the automatic mipmap bias which is calculated internally based on the scale factor. The formula for this is [code]-log2(1.0 / scale) + mipmap_bias[/code].
@@ -3328,62 +3328,62 @@
 		</method>
 		<method name="viewport_set_transparent_background">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				If [code]true[/code], the viewport renders its background as transparent.
 			</description>
 		</method>
 		<method name="viewport_set_update_mode">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="update_mode" type="int" enum="RenderingServer.ViewportUpdateMode" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="update_mode" type="int" enum="RenderingServer.ViewportUpdateMode" />
 			<description>
 				Sets when the viewport should be updated. See [enum ViewportUpdateMode] constants for options.
 			</description>
 		</method>
 		<method name="viewport_set_use_debanding">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="viewport_set_use_occlusion_culling">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="viewport_set_use_taa">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				If [code]true[/code], use Temporal Anti-Aliasing.
 			</description>
 		</method>
 		<method name="viewport_set_use_xr">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="use_xr" type="bool" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="use_xr" type="bool" />
 			<description>
 				If [code]true[/code], the viewport uses augmented or virtual reality technologies. See [XRInterface].
 			</description>
 		</method>
 		<method name="viewport_set_vrs_mode">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="mode" type="int" enum="RenderingServer.ViewportVRSMode" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="mode" type="int" enum="RenderingServer.ViewportVRSMode" />
 			<description>
 				Sets the Variable Rate Shading (VRS) mode for the viewport. Note, if hardware does not support VRS this property is ignored.
 			</description>
 		</method>
 		<method name="viewport_set_vrs_texture">
 			<return type="void" />
-			<argument index="0" name="viewport" type="RID" />
-			<argument index="1" name="texture" type="RID" />
+			<param index="0" name="viewport" type="RID" />
+			<param index="1" name="texture" type="RID" />
 			<description>
 				Texture to use when the VRS mode is set to [constant RenderingServer.VIEWPORT_VRS_TEXTURE].
 			</description>
@@ -3395,29 +3395,29 @@
 		</method>
 		<method name="visibility_notifier_set_aabb">
 			<return type="void" />
-			<argument index="0" name="notifier" type="RID" />
-			<argument index="1" name="aabb" type="AABB" />
+			<param index="0" name="notifier" type="RID" />
+			<param index="1" name="aabb" type="AABB" />
 			<description>
 			</description>
 		</method>
 		<method name="visibility_notifier_set_callbacks">
 			<return type="void" />
-			<argument index="0" name="notifier" type="RID" />
-			<argument index="1" name="enter_callable" type="Callable" />
-			<argument index="2" name="exit_callable" type="Callable" />
+			<param index="0" name="notifier" type="RID" />
+			<param index="1" name="enter_callable" type="Callable" />
+			<param index="2" name="exit_callable" type="Callable" />
 			<description>
 			</description>
 		</method>
 		<method name="voxel_gi_allocate_data">
 			<return type="void" />
-			<argument index="0" name="voxel_gi" type="RID" />
-			<argument index="1" name="to_cell_xform" type="Transform3D" />
-			<argument index="2" name="aabb" type="AABB" />
-			<argument index="3" name="octree_size" type="Vector3i" />
-			<argument index="4" name="octree_cells" type="PackedByteArray" />
-			<argument index="5" name="data_cells" type="PackedByteArray" />
-			<argument index="6" name="distance_field" type="PackedByteArray" />
-			<argument index="7" name="level_counts" type="PackedInt32Array" />
+			<param index="0" name="voxel_gi" type="RID" />
+			<param index="1" name="to_cell_xform" type="Transform3D" />
+			<param index="2" name="aabb" type="AABB" />
+			<param index="3" name="octree_size" type="Vector3i" />
+			<param index="4" name="octree_cells" type="PackedByteArray" />
+			<param index="5" name="data_cells" type="PackedByteArray" />
+			<param index="6" name="distance_field" type="PackedByteArray" />
+			<param index="7" name="level_counts" type="PackedInt32Array" />
 			<description>
 			</description>
 		</method>
@@ -3428,92 +3428,92 @@
 		</method>
 		<method name="voxel_gi_get_data_cells" qualifiers="const">
 			<return type="PackedByteArray" />
-			<argument index="0" name="voxel_gi" type="RID" />
+			<param index="0" name="voxel_gi" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="voxel_gi_get_distance_field" qualifiers="const">
 			<return type="PackedByteArray" />
-			<argument index="0" name="voxel_gi" type="RID" />
+			<param index="0" name="voxel_gi" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="voxel_gi_get_level_counts" qualifiers="const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="voxel_gi" type="RID" />
+			<param index="0" name="voxel_gi" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="voxel_gi_get_octree_cells" qualifiers="const">
 			<return type="PackedByteArray" />
-			<argument index="0" name="voxel_gi" type="RID" />
+			<param index="0" name="voxel_gi" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="voxel_gi_get_octree_size" qualifiers="const">
 			<return type="Vector3i" />
-			<argument index="0" name="voxel_gi" type="RID" />
+			<param index="0" name="voxel_gi" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="voxel_gi_get_to_cell_xform" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="voxel_gi" type="RID" />
+			<param index="0" name="voxel_gi" type="RID" />
 			<description>
 			</description>
 		</method>
 		<method name="voxel_gi_set_bias">
 			<return type="void" />
-			<argument index="0" name="voxel_gi" type="RID" />
-			<argument index="1" name="bias" type="float" />
+			<param index="0" name="voxel_gi" type="RID" />
+			<param index="1" name="bias" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="voxel_gi_set_dynamic_range">
 			<return type="void" />
-			<argument index="0" name="voxel_gi" type="RID" />
-			<argument index="1" name="range" type="float" />
+			<param index="0" name="voxel_gi" type="RID" />
+			<param index="1" name="range" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="voxel_gi_set_energy">
 			<return type="void" />
-			<argument index="0" name="voxel_gi" type="RID" />
-			<argument index="1" name="energy" type="float" />
+			<param index="0" name="voxel_gi" type="RID" />
+			<param index="1" name="energy" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="voxel_gi_set_interior">
 			<return type="void" />
-			<argument index="0" name="voxel_gi" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="voxel_gi" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="voxel_gi_set_normal_bias">
 			<return type="void" />
-			<argument index="0" name="voxel_gi" type="RID" />
-			<argument index="1" name="bias" type="float" />
+			<param index="0" name="voxel_gi" type="RID" />
+			<param index="1" name="bias" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="voxel_gi_set_propagation">
 			<return type="void" />
-			<argument index="0" name="voxel_gi" type="RID" />
-			<argument index="1" name="amount" type="float" />
+			<param index="0" name="voxel_gi" type="RID" />
+			<param index="1" name="amount" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="voxel_gi_set_quality">
 			<return type="void" />
-			<argument index="0" name="quality" type="int" enum="RenderingServer.VoxelGIQuality" />
+			<param index="0" name="quality" type="int" enum="RenderingServer.VoxelGIQuality" />
 			<description>
 			</description>
 		</method>
 		<method name="voxel_gi_set_use_two_bounces">
 			<return type="void" />
-			<argument index="0" name="voxel_gi" type="RID" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="voxel_gi" type="RID" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 			</description>
 		</method>
@@ -3777,6 +3777,7 @@
 			The light's energy.
 		</constant>
 		<constant name="LIGHT_PARAM_INDIRECT_ENERGY" value="1" enum="LightParam">
+			The light's indirect energy multiplier (final indirect energy is [constant LIGHT_PARAM_ENERGY] * [constant LIGHT_PARAM_INDIRECT_ENERGY]).
 		</constant>
 		<constant name="LIGHT_PARAM_SPECULAR" value="2" enum="LightParam">
 			The light's influence on specularity.
@@ -3820,14 +3821,17 @@
 		<constant name="LIGHT_PARAM_SHADOW_PANCAKE_SIZE" value="15" enum="LightParam">
 			Sets the size of the directional shadow pancake. The pancake offsets the start of the shadow's camera frustum to provide a higher effective depth resolution for the shadow. However, a high pancake size can cause artifacts in the shadows of large objects that are close to the edge of the frustum. Reducing the pancake size can help. Setting the size to [code]0[/code] turns off the pancaking effect.
 		</constant>
-		<constant name="LIGHT_PARAM_SHADOW_BLUR" value="16" enum="LightParam">
+		<constant name="LIGHT_PARAM_SHADOW_OPACITY" value="16" enum="LightParam">
+			The light's shadow opacity. Values lower than [code]1.0[/code] make the light appear through shadows. This can be used to fake global illumination at a low performance cost.
+		</constant>
+		<constant name="LIGHT_PARAM_SHADOW_BLUR" value="17" enum="LightParam">
 			Blurs the edges of the shadow. Can be used to hide pixel artifacts in low resolution shadow maps. A high value can make shadows appear grainy and can cause other unwanted artifacts. Try to keep as near default as possible.
 		</constant>
-		<constant name="LIGHT_PARAM_SHADOW_VOLUMETRIC_FOG_FADE" value="17" enum="LightParam">
+		<constant name="LIGHT_PARAM_SHADOW_VOLUMETRIC_FOG_FADE" value="18" enum="LightParam">
 		</constant>
-		<constant name="LIGHT_PARAM_TRANSMITTANCE_BIAS" value="18" enum="LightParam">
+		<constant name="LIGHT_PARAM_TRANSMITTANCE_BIAS" value="19" enum="LightParam">
 		</constant>
-		<constant name="LIGHT_PARAM_MAX" value="19" enum="LightParam">
+		<constant name="LIGHT_PARAM_MAX" value="20" enum="LightParam">
 			Represents the size of the [enum LightParam] enum.
 		</constant>
 		<constant name="LIGHT_BAKE_DISABLED" value="0" enum="LightBakeMode">
diff --git a/doc/classes/Resource.xml b/doc/classes/Resource.xml
index b08b1540ab..3adf10da2d 100644
--- a/doc/classes/Resource.xml
+++ b/doc/classes/Resource.xml
@@ -19,11 +19,11 @@
 		</method>
 		<method name="duplicate" qualifiers="const">
 			<return type="Resource" />
-			<argument index="0" name="subresources" type="bool" default="false" />
+			<param index="0" name="subresources" type="bool" default="false" />
 			<description>
 				Duplicates the resource, returning a new resource with the exported members copied. [b]Note:[/b] To duplicate the resource the constructor is called without arguments. This method will error when the constructor doesn't have default values.
-				By default, sub-resources are shared between resource copies for efficiency. This can be changed by passing [code]true[/code] to the [code]subresources[/code] argument which will copy the subresources.
-				[b]Note:[/b] If [code]subresources[/code] is [code]true[/code], this method will only perform a shallow copy. Nested resources within subresources will not be duplicated and will still be shared.
+				By default, sub-resources are shared between resource copies for efficiency. This can be changed by passing [code]true[/code] to the [param subresources] argument which will copy the subresources.
+				[b]Note:[/b] If [param subresources] is [code]true[/code], this method will only perform a shallow copy. Nested resources within subresources will not be duplicated and will still be shared.
 				[b]Note:[/b] When duplicating a resource, only [code]export[/code]ed properties are copied. Other properties will be set to their default value in the new resource.
 			</description>
 		</method>
@@ -60,7 +60,7 @@
 		</method>
 		<method name="take_over_path">
 			<return type="void" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Sets the path of the resource, potentially overriding an existing cache entry for this path. This differs from setting [member resource_path], as the latter would error out if another resource was already cached for the given path.
 			</description>
diff --git a/doc/classes/ResourceFormatLoader.xml b/doc/classes/ResourceFormatLoader.xml
index fef94b5f3b..9b8c8d4d9d 100644
--- a/doc/classes/ResourceFormatLoader.xml
+++ b/doc/classes/ResourceFormatLoader.xml
@@ -13,22 +13,22 @@
 	<methods>
 		<method name="_exists" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_classes_used" qualifiers="virtual const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_dependencies" qualifiers="virtual const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="add_types" type="bool" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="add_types" type="bool" />
 			<description>
-				If implemented, gets the dependencies of a given resource. If [code]add_types[/code] is [code]true[/code], paths should be appended [code]::TypeName[/code], where [code]TypeName[/code] is the class name of the dependency.
+				If implemented, gets the dependencies of a given resource. If [param add_types] is [code]true[/code], paths should be appended [code]::TypeName[/code], where [code]TypeName[/code] is the class name of the dependency.
 				[b]Note:[/b] Custom resource types defined by scripts aren't known by the [ClassDB], so you might just return [code]"Resource"[/code] for them.
 			</description>
 		</method>
@@ -40,7 +40,7 @@
 		</method>
 		<method name="_get_resource_type" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Gets the class name of the resource associated with the given path. If the loader cannot handle it, it should return [code]""[/code].
 				[b]Note:[/b] Custom resource types defined by scripts aren't known by the [ClassDB], so you might just return [code]"Resource"[/code] for them.
@@ -48,13 +48,13 @@
 		</method>
 		<method name="_get_resource_uid" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="_handles_type" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="type" type="StringName" />
+			<param index="0" name="type" type="StringName" />
 			<description>
 				Tells which resource class this loader can load.
 				[b]Note:[/b] Custom resource types defined by scripts aren't known by the [ClassDB], so you might just handle [code]"Resource"[/code] for them.
@@ -62,21 +62,21 @@
 		</method>
 		<method name="_load" qualifiers="virtual const">
 			<return type="Variant" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="original_path" type="String" />
-			<argument index="2" name="use_sub_threads" type="bool" />
-			<argument index="3" name="cache_mode" type="int" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="original_path" type="String" />
+			<param index="2" name="use_sub_threads" type="bool" />
+			<param index="3" name="cache_mode" type="int" />
 			<description>
-				Loads a resource when the engine finds this loader to be compatible. If the loaded resource is the result of an import, [code]original_path[/code] will target the source file. Returns a [Resource] object on success, or an [enum Error] constant in case of failure.
-				The [code]cache_mode[/code] property defines whether and how the cache should be used or updated when loading the resource. See [enum CacheMode] for details.
+				Loads a resource when the engine finds this loader to be compatible. If the loaded resource is the result of an import, [param original_path] will target the source file. Returns a [Resource] object on success, or an [enum Error] constant in case of failure.
+				The [param cache_mode] property defines whether and how the cache should be used or updated when loading the resource. See [enum CacheMode] for details.
 			</description>
 		</method>
 		<method name="_rename_dependencies" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="renames" type="Dictionary" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="renames" type="Dictionary" />
 			<description>
-				If implemented, renames dependencies within the given resource and saves it. [code]renames[/code] is a dictionary [code]{ String =&gt; String }[/code] mapping old dependency paths to new paths.
+				If implemented, renames dependencies within the given resource and saves it. [param renames] is a dictionary [code]{ String =&gt; String }[/code] mapping old dependency paths to new paths.
 				Returns [constant OK] on success, or an [enum Error] constant in case of failure.
 			</description>
 		</method>
diff --git a/doc/classes/ResourceFormatSaver.xml b/doc/classes/ResourceFormatSaver.xml
index f9c4ca0d49..a84c2165f5 100644
--- a/doc/classes/ResourceFormatSaver.xml
+++ b/doc/classes/ResourceFormatSaver.xml
@@ -12,25 +12,25 @@
 	<methods>
 		<method name="_get_recognized_extensions" qualifiers="virtual const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="resource" type="Resource" />
+			<param index="0" name="resource" type="Resource" />
 			<description>
 				Returns the list of extensions available for saving the resource object, provided it is recognized (see [method _recognize]).
 			</description>
 		</method>
 		<method name="_recognize" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="resource" type="Resource" />
+			<param index="0" name="resource" type="Resource" />
 			<description>
 				Returns whether the given resource object can be saved by this saver.
 			</description>
 		</method>
 		<method name="_save" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="path" type="Resource" />
-			<argument index="1" name="resource" type="String" />
-			<argument index="2" name="flags" type="int" />
+			<param index="0" name="path" type="Resource" />
+			<param index="1" name="resource" type="String" />
+			<param index="2" name="flags" type="int" />
 			<description>
-				Saves the given resource object to a file at the target [code]path[/code]. [code]flags[/code] is a bitmask composed with [enum ResourceSaver.SaverFlags] constants.
+				Saves the given resource object to a file at the target [param path]. [param flags] is a bitmask composed with [enum ResourceSaver.SaverFlags] constants.
 				Returns [constant OK] on success, or an [enum Error] constant in case of failure.
 			</description>
 		</method>
diff --git a/doc/classes/ResourceLoader.xml b/doc/classes/ResourceLoader.xml
index 729058c9b3..d51a5293ec 100644
--- a/doc/classes/ResourceLoader.xml
+++ b/doc/classes/ResourceLoader.xml
@@ -14,8 +14,8 @@
 	<methods>
 		<method name="add_resource_format_loader">
 			<return type="void" />
-			<argument index="0" name="format_loader" type="ResourceFormatLoader" />
-			<argument index="1" name="at_front" type="bool" default="false" />
+			<param index="0" name="format_loader" type="ResourceFormatLoader" />
+			<param index="1" name="at_front" type="bool" default="false" />
 			<description>
 				Registers a new [ResourceFormatLoader]. The ResourceLoader will use the ResourceFormatLoader as described in [method load].
 				This method is performed implicitly for ResourceFormatLoaders written in GDScript (see [ResourceFormatLoader] for more information).
@@ -23,59 +23,59 @@
 		</method>
 		<method name="exists">
 			<return type="bool" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="type_hint" type="String" default="&quot;&quot;" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="type_hint" type="String" default="&quot;&quot;" />
 			<description>
-				Returns whether a recognized resource exists for the given [code]path[/code].
-				An optional [code]type_hint[/code] can be used to further specify the [Resource] type that should be handled by the [ResourceFormatLoader]. Anything that inherits from [Resource] can be used as a type hint, for example [Image].
+				Returns whether a recognized resource exists for the given [param path].
+				An optional [param type_hint] can be used to further specify the [Resource] type that should be handled by the [ResourceFormatLoader]. Anything that inherits from [Resource] can be used as a type hint, for example [Image].
 			</description>
 		</method>
 		<method name="get_dependencies">
 			<return type="PackedStringArray" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
-				Returns the dependencies for the resource at the given [code]path[/code].
+				Returns the dependencies for the resource at the given [param path].
 			</description>
 		</method>
 		<method name="get_recognized_extensions_for_type">
 			<return type="PackedStringArray" />
-			<argument index="0" name="type" type="String" />
+			<param index="0" name="type" type="String" />
 			<description>
 				Returns the list of recognized extensions for a resource type.
 			</description>
 		</method>
 		<method name="get_resource_uid">
 			<return type="int" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Returns the ID associated with a given resource path, or [code]-1[/code] when no such ID exists.
 			</description>
 		</method>
 		<method name="has_cached">
 			<return type="bool" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
-				Returns whether a cached resource is available for the given [code]path[/code].
+				Returns whether a cached resource is available for the given [param path].
 				Once a resource has been loaded by the engine, it is cached in memory for faster access, and future calls to the [method load] method will use the cached version. The cached resource can be overridden by using [method Resource.take_over_path] on a new resource for that same path.
 			</description>
 		</method>
 		<method name="load">
 			<return type="Resource" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="type_hint" type="String" default="&quot;&quot;" />
-			<argument index="2" name="cache_mode" type="int" enum="ResourceLoader.CacheMode" default="1" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="type_hint" type="String" default="&quot;&quot;" />
+			<param index="2" name="cache_mode" type="int" enum="ResourceLoader.CacheMode" default="1" />
 			<description>
-				Loads a resource at the given [code]path[/code], caching the result for further access.
+				Loads a resource at the given [param path], caching the result for further access.
 				The registered [ResourceFormatLoader]s are queried sequentially to find the first one which can handle the file's extension, and then attempt loading. If loading fails, the remaining ResourceFormatLoaders are also attempted.
-				An optional [code]type_hint[/code] can be used to further specify the [Resource] type that should be handled by the [ResourceFormatLoader]. Anything that inherits from [Resource] can be used as a type hint, for example [Image].
-				The [code]cache_mode[/code] property defines whether and how the cache should be used or updated when loading the resource. See [enum CacheMode] for details.
+				An optional [param type_hint] can be used to further specify the [Resource] type that should be handled by the [ResourceFormatLoader]. Anything that inherits from [Resource] can be used as a type hint, for example [Image].
+				The [param cache_mode] property defines whether and how the cache should be used or updated when loading the resource. See [enum CacheMode] for details.
 				Returns an empty resource if no [ResourceFormatLoader] could handle the file.
 				GDScript has a simplified [method @GDScript.load] built-in method which can be used in most situations, leaving the use of [ResourceLoader] for more advanced scenarios.
 			</description>
 		</method>
 		<method name="load_threaded_get">
 			<return type="Resource" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Returns the resource loaded by [method load_threaded_request].
 				If this is called before the loading thread is done (i.e. [method load_threaded_get_status] is not [constant THREAD_LOAD_LOADED]), the calling thread will be blocked until the resource has finished loading.
@@ -83,34 +83,34 @@
 		</method>
 		<method name="load_threaded_get_status">
 			<return type="int" enum="ResourceLoader.ThreadLoadStatus" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="progress" type="Array" default="[]" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="progress" type="Array" default="[]" />
 			<description>
-				Returns the status of a threaded loading operation started with [method load_threaded_request] for the resource at [code]path[/code]. See [enum ThreadLoadStatus] for possible return values.
-				An array variable can optionally be passed via [code]progress[/code], and will return a one-element array containing the percentage of completion of the threaded loading.
+				Returns the status of a threaded loading operation started with [method load_threaded_request] for the resource at [param path]. See [enum ThreadLoadStatus] for possible return values.
+				An array variable can optionally be passed via [param progress], and will return a one-element array containing the percentage of completion of the threaded loading.
 			</description>
 		</method>
 		<method name="load_threaded_request">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="type_hint" type="String" default="&quot;&quot;" />
-			<argument index="2" name="use_sub_threads" type="bool" default="false" />
-			<argument index="3" name="cache_mode" type="int" enum="ResourceLoader.CacheMode" default="1" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="type_hint" type="String" default="&quot;&quot;" />
+			<param index="2" name="use_sub_threads" type="bool" default="false" />
+			<param index="3" name="cache_mode" type="int" enum="ResourceLoader.CacheMode" default="1" />
 			<description>
-				Loads the resource using threads. If [code]use_sub_threads[/code] is [code]true[/code], multiple threads will be used to load the resource, which makes loading faster, but may affect the main thread (and thus cause game slowdowns).
-				The [code]cache_mode[/code] property defines whether and how the cache should be used or updated when loading the resource. See [enum CacheMode] for details.
+				Loads the resource using threads. If [param use_sub_threads] is [code]true[/code], multiple threads will be used to load the resource, which makes loading faster, but may affect the main thread (and thus cause game slowdowns).
+				The [param cache_mode] property defines whether and how the cache should be used or updated when loading the resource. See [enum CacheMode] for details.
 			</description>
 		</method>
 		<method name="remove_resource_format_loader">
 			<return type="void" />
-			<argument index="0" name="format_loader" type="ResourceFormatLoader" />
+			<param index="0" name="format_loader" type="ResourceFormatLoader" />
 			<description>
 				Unregisters the given [ResourceFormatLoader].
 			</description>
 		</method>
 		<method name="set_abort_on_missing_resources">
 			<return type="void" />
-			<argument index="0" name="abort" type="bool" />
+			<param index="0" name="abort" type="bool" />
 			<description>
 				Changes the behavior on missing sub-resources. The default behavior is to abort loading.
 			</description>
diff --git a/doc/classes/ResourcePreloader.xml b/doc/classes/ResourcePreloader.xml
index 63db131cec..17904697e6 100644
--- a/doc/classes/ResourcePreloader.xml
+++ b/doc/classes/ResourcePreloader.xml
@@ -12,17 +12,17 @@
 	<methods>
 		<method name="add_resource">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="resource" type="Resource" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="resource" type="Resource" />
 			<description>
-				Adds a resource to the preloader with the given [code]name[/code]. If a resource with the given [code]name[/code] already exists, the new resource will be renamed to "[code]name[/code] N" where N is an incrementing number starting from 2.
+				Adds a resource to the preloader with the given [param name]. If a resource with the given [param name] already exists, the new resource will be renamed to "[param name] N" where N is an incrementing number starting from 2.
 			</description>
 		</method>
 		<method name="get_resource" qualifiers="const">
 			<return type="Resource" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns the resource associated to [code]name[/code].
+				Returns the resource associated to [param name].
 			</description>
 		</method>
 		<method name="get_resource_list" qualifiers="const">
@@ -33,24 +33,24 @@
 		</method>
 		<method name="has_resource" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns [code]true[/code] if the preloader contains a resource associated to [code]name[/code].
+				Returns [code]true[/code] if the preloader contains a resource associated to [param name].
 			</description>
 		</method>
 		<method name="remove_resource">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Removes the resource associated to [code]name[/code] from the preloader.
+				Removes the resource associated to [param name] from the preloader.
 			</description>
 		</method>
 		<method name="rename_resource">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="newname" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="newname" type="StringName" />
 			<description>
-				Renames a resource inside the preloader from [code]name[/code] to [code]newname[/code].
+				Renames a resource inside the preloader from [param name] to [param newname].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/ResourceSaver.xml b/doc/classes/ResourceSaver.xml
index 10387a4f14..b0c9056cbc 100644
--- a/doc/classes/ResourceSaver.xml
+++ b/doc/classes/ResourceSaver.xml
@@ -12,8 +12,8 @@
 	<methods>
 		<method name="add_resource_format_saver">
 			<return type="void" />
-			<argument index="0" name="format_saver" type="ResourceFormatSaver" />
-			<argument index="1" name="at_front" type="bool" default="false" />
+			<param index="0" name="format_saver" type="ResourceFormatSaver" />
+			<param index="1" name="at_front" type="bool" default="false" />
 			<description>
 				Registers a new [ResourceFormatSaver]. The ResourceSaver will use the ResourceFormatSaver as described in [method save].
 				This method is performed implicitly for ResourceFormatSavers written in GDScript (see [ResourceFormatSaver] for more information).
@@ -21,26 +21,26 @@
 		</method>
 		<method name="get_recognized_extensions">
 			<return type="PackedStringArray" />
-			<argument index="0" name="type" type="Resource" />
+			<param index="0" name="type" type="Resource" />
 			<description>
 				Returns the list of extensions available for saving a resource of a given type.
 			</description>
 		</method>
 		<method name="remove_resource_format_saver">
 			<return type="void" />
-			<argument index="0" name="format_saver" type="ResourceFormatSaver" />
+			<param index="0" name="format_saver" type="ResourceFormatSaver" />
 			<description>
 				Unregisters the given [ResourceFormatSaver].
 			</description>
 		</method>
 		<method name="save">
 			<return type="int" enum="Error" />
-			<argument index="0" name="resource" type="Resource" />
-			<argument index="1" name="path" type="String" default="&quot;&quot;" />
-			<argument index="2" name="flags" type="int" enum="ResourceSaver.SaverFlags" default="0" />
+			<param index="0" name="resource" type="Resource" />
+			<param index="1" name="path" type="String" default="&quot;&quot;" />
+			<param index="2" name="flags" type="int" enum="ResourceSaver.SaverFlags" default="0" />
 			<description>
-				Saves a resource to disk to the given path, using a [ResourceFormatSaver] that recognizes the resource object. If [code]path[/code] is empty, [ResourceSaver] will try to use [member Resource.resource_path].
-				The [code]flags[/code] bitmask can be specified to customize the save behavior using [enum SaverFlags] flags.
+				Saves a resource to disk to the given path, using a [ResourceFormatSaver] that recognizes the resource object. If [param path] is empty, [ResourceSaver] will try to use [member Resource.resource_path].
+				The [param flags] bitmask can be specified to customize the save behavior using [enum SaverFlags] flags.
 				Returns [constant OK] on success.
 			</description>
 		</method>
diff --git a/doc/classes/ResourceUID.xml b/doc/classes/ResourceUID.xml
index f91c39b512..7ac5dd58a8 100644
--- a/doc/classes/ResourceUID.xml
+++ b/doc/classes/ResourceUID.xml
@@ -1,64 +1,83 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="ResourceUID" inherits="Object" version="4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
+		Singleton for managing a cache of resource UIDs within a project.
 	</brief_description>
 	<description>
+		Resources can not only be referenced using their resource paths [code]res://[/code], but alternatively through a unique identifier specified via [code]uid://[/code].
+		Using UIDs allows for the engine to keep references between resources intact, even if the files get renamed or moved.
+		This singleton is responsible for keeping track of all registered resource UIDs of a project, generating new UIDs and converting between the string and integer representation.
 	</description>
 	<tutorials>
 	</tutorials>
 	<methods>
 		<method name="add_id">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="path" type="String" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="path" type="String" />
 			<description>
+				Adds a new UID value which is mapped to the given resource path.
+				Fails with an error if the UID already exists, so be sure to check [method has_id] beforehand, or use [method set_id] instead.
 			</description>
 		</method>
 		<method name="create_id">
 			<return type="int" />
 			<description>
+				Generates a random resource UID which is guaranteed to be unique within the list of currently loaded UIDs.
+				In order for this UID to be registered, you must call [method add_id] or [method set_id].
 			</description>
 		</method>
 		<method name="get_id_path" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
+				Returns the path that the given UID value refers to.
+				Fails with an error if the UID does not exist, so be sure to check [method has_id] beforehand.
 			</description>
 		</method>
 		<method name="has_id" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
+				Returns whether the given UID value is known to the cache.
 			</description>
 		</method>
 		<method name="id_to_text" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
+				Converts the given UID to a [code]uid://[/code] string value.
 			</description>
 		</method>
 		<method name="remove_id">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
+				Removes a loaded UID value from the cache.
+				Fails with an error if the UID does not exist, so be sure to check [method has_id] beforehand.
 			</description>
 		</method>
 		<method name="set_id">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="path" type="String" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="path" type="String" />
 			<description>
+				Updates the resource path of an existing UID.
+				Fails with an error if the UID does not exist, so be sure to check [method has_id] beforehand, or use [method add_id] instead.
 			</description>
 		</method>
 		<method name="text_to_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="text_id" type="String" />
+			<param index="0" name="text_id" type="String" />
 			<description>
+				Extracts the UID value from the given [code]uid://[/code] string.
 			</description>
 		</method>
 	</methods>
 	<constants>
 		<constant name="INVALID_ID" value="-1">
+			The value to use for an invalid UID, for example if the resource could not be loaded.
+			Its text representation is [code]uid://&lt;invalid&gt;[/code].
 		</constant>
 	</constants>
 </class>
diff --git a/doc/classes/RichTextEffect.xml b/doc/classes/RichTextEffect.xml
index 2256839378..c01546524d 100644
--- a/doc/classes/RichTextEffect.xml
+++ b/doc/classes/RichTextEffect.xml
@@ -25,9 +25,9 @@
 	<methods>
 		<method name="_process_custom_fx" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="char_fx" type="CharFXTransform" />
+			<param index="0" name="char_fx" type="CharFXTransform" />
 			<description>
-				Override this method to modify properties in [code]char_fx[/code]. The method must return [code]true[/code] if the character could be transformed successfully. If the method returns [code]false[/code], it will skip transformation to avoid displaying broken text.
+				Override this method to modify properties in [param char_fx]. The method must return [code]true[/code] if the character could be transformed successfully. If the method returns [code]false[/code], it will skip transformation to avoid displaying broken text.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/RichTextLabel.xml b/doc/classes/RichTextLabel.xml
index 8228bcc442..62142fce8b 100644
--- a/doc/classes/RichTextLabel.xml
+++ b/doc/classes/RichTextLabel.xml
@@ -18,28 +18,28 @@
 	<methods>
 		<method name="add_image">
 			<return type="void" />
-			<argument index="0" name="image" type="Texture2D" />
-			<argument index="1" name="width" type="int" default="0" />
-			<argument index="2" name="height" type="int" default="0" />
-			<argument index="3" name="color" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="4" name="inline_align" type="int" enum="InlineAlignment" default="5" />
+			<param index="0" name="image" type="Texture2D" />
+			<param index="1" name="width" type="int" default="0" />
+			<param index="2" name="height" type="int" default="0" />
+			<param index="3" name="color" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="4" name="inline_align" type="int" enum="InlineAlignment" default="5" />
 			<description>
-				Adds an image's opening and closing tags to the tag stack, optionally providing a [code]width[/code] and [code]height[/code] to resize the image and a [code]color[/code] to tint the image.
-				If [code]width[/code] or [code]height[/code] is set to 0, the image size will be adjusted in order to keep the original aspect ratio.
+				Adds an image's opening and closing tags to the tag stack, optionally providing a [param width] and [param height] to resize the image and a [param color] to tint the image.
+				If [param width] or [param height] is set to 0, the image size will be adjusted in order to keep the original aspect ratio.
 			</description>
 		</method>
 		<method name="add_text">
 			<return type="void" />
-			<argument index="0" name="text" type="String" />
+			<param index="0" name="text" type="String" />
 			<description>
 				Adds raw non-BBCode-parsed text to the tag stack.
 			</description>
 		</method>
 		<method name="append_text">
 			<return type="void" />
-			<argument index="0" name="bbcode" type="String" />
+			<param index="0" name="bbcode" type="String" />
 			<description>
-				Parses [code]bbcode[/code] and adds tags to the tag stack as needed.
+				Parses [param bbcode] and adds tags to the tag stack as needed.
 				[b]Note:[/b] Using this method, you can't close a tag that was opened in a previous [method append_text] call. This is done to improve performance, especially when updating large RichTextLabels since rebuilding the whole BBCode every time would be slower. If you absolutely need to close a tag in a future method call, append the [member text] instead of using [method append_text].
 			</description>
 		</method>
@@ -57,7 +57,7 @@
 		</method>
 		<method name="get_character_line">
 			<return type="int" />
-			<argument index="0" name="character" type="int" />
+			<param index="0" name="character" type="int" />
 			<description>
 				Returns the line number of the character position provided.
 				[b]Note:[/b] If [member threaded] is enabled, this method returns a value for the loaded part of the document. Use [method is_ready] or [signal finished] to determine whether document is fully loaded.
@@ -65,7 +65,7 @@
 		</method>
 		<method name="get_character_paragraph">
 			<return type="int" />
-			<argument index="0" name="character" type="int" />
+			<param index="0" name="character" type="int" />
 			<description>
 				Returns the paragraph number of the character position provided.
 				[b]Note:[/b] If [member threaded] is enabled, this method returns a value for the loaded part of the document. Use [method is_ready] or [signal finished] to determine whether document is fully loaded.
@@ -94,7 +94,7 @@
 		</method>
 		<method name="get_line_offset">
 			<return type="float" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns the vertical offset of the line found at the provided index.
 				[b]Note:[/b] If [member threaded] is enabled, this method returns a value for the loaded part of the document. Use [method is_ready] or [signal finished] to determine whether document is fully loaded.
@@ -115,7 +115,7 @@
 		</method>
 		<method name="get_paragraph_offset">
 			<return type="float" />
-			<argument index="0" name="paragraph" type="int" />
+			<param index="0" name="paragraph" type="int" />
 			<description>
 				Returns the vertical offset of the paragraph found at the provided index.
 				[b]Note:[/b] If [member threaded] is enabled, this method returns a value for the loaded part of the document. Use [method is_ready] or [signal finished] to determine whether document is fully loaded.
@@ -174,9 +174,9 @@
 		</method>
 		<method name="install_effect">
 			<return type="void" />
-			<argument index="0" name="effect" type="Variant" />
+			<param index="0" name="effect" type="Variant" />
 			<description>
-				Installs a custom effect. [code]effect[/code] should be a valid [RichTextEffect].
+				Installs a custom effect. [param effect] should be a valid [RichTextEffect].
 			</description>
 		</method>
 		<method name="is_menu_visible" qualifiers="const">
@@ -199,16 +199,16 @@
 		</method>
 		<method name="parse_bbcode">
 			<return type="void" />
-			<argument index="0" name="bbcode" type="String" />
+			<param index="0" name="bbcode" type="String" />
 			<description>
 				The assignment version of [method append_text]. Clears the tag stack and inserts the new content.
 			</description>
 		</method>
 		<method name="parse_expressions_for_values">
 			<return type="Dictionary" />
-			<argument index="0" name="expressions" type="PackedStringArray" />
+			<param index="0" name="expressions" type="PackedStringArray" />
 			<description>
-				Parses BBCode parameter [code]expressions[/code] into a dictionary.
+				Parses BBCode parameter [param expressions] into a dictionary.
 			</description>
 		</method>
 		<method name="pop">
@@ -219,7 +219,7 @@
 		</method>
 		<method name="push_bgcolor">
 			<return type="void" />
-			<argument index="0" name="bgcolor" type="Color" />
+			<param index="0" name="bgcolor" type="Color" />
 			<description>
 				Adds a [code][bgcolor][/code] tag to the tag stack.
 			</description>
@@ -244,57 +244,57 @@
 		</method>
 		<method name="push_color">
 			<return type="void" />
-			<argument index="0" name="color" type="Color" />
+			<param index="0" name="color" type="Color" />
 			<description>
 				Adds a [code][color][/code] tag to the tag stack.
 			</description>
 		</method>
 		<method name="push_dropcap">
 			<return type="void" />
-			<argument index="0" name="string" type="String" />
-			<argument index="1" name="font" type="Font" />
-			<argument index="2" name="size" type="int" />
-			<argument index="3" name="dropcap_margins" type="Rect2" default="Rect2(0, 0, 0, 0)" />
-			<argument index="4" name="color" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="5" name="outline_size" type="int" default="0" />
-			<argument index="6" name="outline_color" type="Color" default="Color(0, 0, 0, 0)" />
+			<param index="0" name="string" type="String" />
+			<param index="1" name="font" type="Font" />
+			<param index="2" name="size" type="int" />
+			<param index="3" name="dropcap_margins" type="Rect2" default="Rect2(0, 0, 0, 0)" />
+			<param index="4" name="color" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="5" name="outline_size" type="int" default="0" />
+			<param index="6" name="outline_color" type="Color" default="Color(0, 0, 0, 0)" />
 			<description>
 				Adds a [code][dropcap][/code] tag to the tag stack. Drop cap (dropped capital) is a decorative element at the beginning of a paragraph that is larger than the rest of the text.
 			</description>
 		</method>
 		<method name="push_fgcolor">
 			<return type="void" />
-			<argument index="0" name="fgcolor" type="Color" />
+			<param index="0" name="fgcolor" type="Color" />
 			<description>
 				Adds a [code][fgcolor][/code] tag to the tag stack.
 			</description>
 		</method>
 		<method name="push_font">
 			<return type="void" />
-			<argument index="0" name="font" type="Font" />
-			<argument index="1" name="font_size" type="int" />
+			<param index="0" name="font" type="Font" />
+			<param index="1" name="font_size" type="int" />
 			<description>
 				Adds a [code][font][/code] tag to the tag stack. Overrides default fonts for its duration.
 			</description>
 		</method>
 		<method name="push_font_size">
 			<return type="void" />
-			<argument index="0" name="font_size" type="int" />
+			<param index="0" name="font_size" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="push_hint">
 			<return type="void" />
-			<argument index="0" name="description" type="String" />
+			<param index="0" name="description" type="String" />
 			<description>
 				Adds a [code][hint][/code] tag to the tag stack. Same as BBCode [code][hint=something]{text}[/hint][/code].
 			</description>
 		</method>
 		<method name="push_indent">
 			<return type="void" />
-			<argument index="0" name="level" type="int" />
+			<param index="0" name="level" type="int" />
 			<description>
-				Adds an [code][indent][/code] tag to the tag stack. Multiplies [code]level[/code] by current [member tab_size] to determine new margin length.
+				Adds an [code][indent][/code] tag to the tag stack. Multiplies [param level] by current [member tab_size] to determine new margin length.
 			</description>
 		</method>
 		<method name="push_italics">
@@ -305,16 +305,16 @@
 		</method>
 		<method name="push_list">
 			<return type="void" />
-			<argument index="0" name="level" type="int" />
-			<argument index="1" name="type" type="int" enum="RichTextLabel.ListType" />
-			<argument index="2" name="capitalize" type="bool" />
+			<param index="0" name="level" type="int" />
+			<param index="1" name="type" type="int" enum="RichTextLabel.ListType" />
+			<param index="2" name="capitalize" type="bool" />
 			<description>
-				Adds [code][ol][/code] or [code][ul][/code] tag to the tag stack. Multiplies [code]level[/code] by current [member tab_size] to determine new margin length.
+				Adds [code][ol][/code] or [code][ul][/code] tag to the tag stack. Multiplies [param level] by current [member tab_size] to determine new margin length.
 			</description>
 		</method>
 		<method name="push_meta">
 			<return type="void" />
-			<argument index="0" name="data" type="Variant" />
+			<param index="0" name="data" type="Variant" />
 			<description>
 				Adds a [code][meta][/code] tag to the tag stack. Similar to the BBCode [code][url=something]{text}[/url][/code], but supports non-[String] metadata types.
 			</description>
@@ -333,24 +333,24 @@
 		</method>
 		<method name="push_outline_color">
 			<return type="void" />
-			<argument index="0" name="color" type="Color" />
+			<param index="0" name="color" type="Color" />
 			<description>
 				Adds a [code][outline_color][/code] tag to the tag stack. Adds text outline for its duration.
 			</description>
 		</method>
 		<method name="push_outline_size">
 			<return type="void" />
-			<argument index="0" name="outline_size" type="int" />
+			<param index="0" name="outline_size" type="int" />
 			<description>
 				Adds a [code][outline_size][/code] tag to the tag stack. Overrides default text outline size for its duration.
 			</description>
 		</method>
 		<method name="push_paragraph">
 			<return type="void" />
-			<argument index="0" name="alignment" type="int" enum="HorizontalAlignment" />
-			<argument index="1" name="base_direction" type="int" enum="Control.TextDirection" default="0" />
-			<argument index="2" name="language" type="String" default="&quot;&quot;" />
-			<argument index="3" name="st_parser" type="int" enum="TextServer.StructuredTextParser" default="0" />
+			<param index="0" name="alignment" type="int" enum="HorizontalAlignment" />
+			<param index="1" name="base_direction" type="int" enum="Control.TextDirection" default="0" />
+			<param index="2" name="language" type="String" default="&quot;&quot;" />
+			<param index="3" name="st_parser" type="int" enum="TextServer.StructuredTextParser" default="0" />
 			<description>
 				Adds a [code][p][/code] tag to the tag stack.
 			</description>
@@ -363,8 +363,8 @@
 		</method>
 		<method name="push_table">
 			<return type="void" />
-			<argument index="0" name="columns" type="int" />
-			<argument index="1" name="inline_align" type="int" enum="InlineAlignment" default="0" />
+			<param index="0" name="columns" type="int" />
+			<param index="1" name="inline_align" type="int" enum="InlineAlignment" default="0" />
 			<description>
 				Adds a [code][table=columns,inline_align][/code] tag to the tag stack.
 			</description>
@@ -377,24 +377,24 @@
 		</method>
 		<method name="remove_line">
 			<return type="bool" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Removes a line of content from the label. Returns [code]true[/code] if the line exists.
-				The [code]line[/code] argument is the index of the line to remove, it can take values in the interval [code][0, get_line_count() - 1][/code].
+				The [param line] argument is the index of the line to remove, it can take values in the interval [code][0, get_line_count() - 1][/code].
 			</description>
 		</method>
 		<method name="scroll_to_line">
 			<return type="void" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
-				Scrolls the window's top line to match [code]line[/code].
+				Scrolls the window's top line to match [param line].
 			</description>
 		</method>
 		<method name="scroll_to_paragraph">
 			<return type="void" />
-			<argument index="0" name="paragraph" type="int" />
+			<param index="0" name="paragraph" type="int" />
 			<description>
-				Scrolls the window's top line to match first line of the [code]paragraph[/code].
+				Scrolls the window's top line to match first line of the [param paragraph].
 			</description>
 		</method>
 		<method name="select_all">
@@ -406,43 +406,43 @@
 		</method>
 		<method name="set_cell_border_color">
 			<return type="void" />
-			<argument index="0" name="color" type="Color" />
+			<param index="0" name="color" type="Color" />
 			<description>
 				Sets color of a table cell border.
 			</description>
 		</method>
 		<method name="set_cell_padding">
 			<return type="void" />
-			<argument index="0" name="padding" type="Rect2" />
+			<param index="0" name="padding" type="Rect2" />
 			<description>
 				Sets inner padding of a table cell.
 			</description>
 		</method>
 		<method name="set_cell_row_background_color">
 			<return type="void" />
-			<argument index="0" name="odd_row_bg" type="Color" />
-			<argument index="1" name="even_row_bg" type="Color" />
+			<param index="0" name="odd_row_bg" type="Color" />
+			<param index="1" name="even_row_bg" type="Color" />
 			<description>
 				Sets color of a table cell. Separate colors for alternating rows can be specified.
 			</description>
 		</method>
 		<method name="set_cell_size_override">
 			<return type="void" />
-			<argument index="0" name="min_size" type="Vector2" />
-			<argument index="1" name="max_size" type="Vector2" />
+			<param index="0" name="min_size" type="Vector2" />
+			<param index="1" name="max_size" type="Vector2" />
 			<description>
 				Sets minimum and maximum size overrides for a table cell.
 			</description>
 		</method>
 		<method name="set_table_column_expand">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="expand" type="bool" />
-			<argument index="2" name="ratio" type="int" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="expand" type="bool" />
+			<param index="2" name="ratio" type="int" />
 			<description>
-				Edits the selected column's expansion options. If [code]expand[/code] is [code]true[/code], the column expands in proportion to its expansion ratio versus the other columns' ratios.
+				Edits the selected column's expansion options. If [param expand] is [code]true[/code], the column expands in proportion to its expansion ratio versus the other columns' ratios.
 				For example, 2 columns with ratios 3 and 4 plus 70 pixels in available width would expand 30 and 40 pixels, respectively.
-				If [code]expand[/code] is [code]false[/code], the column will not contribute to the total ratio.
+				If [param expand] is [code]false[/code], the column will not contribute to the total ratio.
 			</description>
 		</method>
 	</methods>
@@ -534,19 +534,19 @@
 			</description>
 		</signal>
 		<signal name="meta_clicked">
-			<argument index="0" name="meta" type="Variant" />
+			<param index="0" name="meta" type="Variant" />
 			<description>
 				Triggered when the user clicks on content between meta tags. If the meta is defined in text, e.g. [code][url={"data"="hi"}]hi[/url][/code], then the parameter for this signal will be a [String] type. If a particular type or an object is desired, the [method push_meta] method must be used to manually insert the data into the tag stack.
 			</description>
 		</signal>
 		<signal name="meta_hover_ended">
-			<argument index="0" name="meta" type="Variant" />
+			<param index="0" name="meta" type="Variant" />
 			<description>
 				Triggers when the mouse exits a meta tag.
 			</description>
 		</signal>
 		<signal name="meta_hover_started">
-			<argument index="0" name="meta" type="Variant" />
+			<param index="0" name="meta" type="Variant" />
 			<description>
 				Triggers when the mouse enters a meta tag.
 			</description>
diff --git a/doc/classes/RigidDynamicBody2D.xml b/doc/classes/RigidDynamicBody2D.xml
index 087156989e..445e6d94ea 100644
--- a/doc/classes/RigidDynamicBody2D.xml
+++ b/doc/classes/RigidDynamicBody2D.xml
@@ -17,14 +17,14 @@
 	<methods>
 		<method name="_integrate_forces" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="state" type="PhysicsDirectBodyState2D" />
+			<param index="0" name="state" type="PhysicsDirectBodyState2D" />
 			<description>
 				Allows you to read and safely modify the simulation state for the object. Use this instead of [method Node._physics_process] if you need to directly change the body's [code]position[/code] or other physics properties. By default, it works in addition to the usual physics behavior, but [member custom_integrator] allows you to disable the default behavior and write custom force integration for a body.
 			</description>
 		</method>
 		<method name="add_constant_central_force">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector2" />
+			<param index="0" name="force" type="Vector2" />
 			<description>
 				Adds a constant directional force without affecting rotation that keeps being applied over time until cleared with [code]constant_force = Vector2(0, 0)[/code].
 				This is equivalent to using [method add_constant_force] at the body's center of mass.
@@ -32,23 +32,23 @@
 		</method>
 		<method name="add_constant_force">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector2" />
-			<argument index="1" name="position" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="force" type="Vector2" />
+			<param index="1" name="position" type="Vector2" default="Vector2(0, 0)" />
 			<description>
 				Adds a constant positioned force to the body that keeps being applied over time until cleared with [code]constant_force = Vector2(0, 0)[/code].
-				[code]position[/code] is the offset from the body origin in global coordinates.
+				[param position] is the offset from the body origin in global coordinates.
 			</description>
 		</method>
 		<method name="add_constant_torque">
 			<return type="void" />
-			<argument index="0" name="torque" type="float" />
+			<param index="0" name="torque" type="float" />
 			<description>
 				Adds a constant rotational force without affecting position that keeps being applied over time until cleared with [code]constant_torque = 0[/code].
 			</description>
 		</method>
 		<method name="apply_central_force">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector2" />
+			<param index="0" name="force" type="Vector2" />
 			<description>
 				Applies a directional force without affecting rotation. A force is time dependent and meant to be applied every physics update.
 				This is equivalent to using [method apply_force] at the body's center of mass.
@@ -56,7 +56,7 @@
 		</method>
 		<method name="apply_central_impulse">
 			<return type="void" />
-			<argument index="0" name="impulse" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="impulse" type="Vector2" default="Vector2(0, 0)" />
 			<description>
 				Applies a directional impulse without affecting rotation.
 				An impulse is time-independent! Applying an impulse every frame would result in a framerate-dependent force. For this reason, it should only be used when simulating one-time impacts (use the "_force" functions otherwise).
@@ -65,33 +65,33 @@
 		</method>
 		<method name="apply_force">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector2" />
-			<argument index="1" name="position" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="force" type="Vector2" />
+			<param index="1" name="position" type="Vector2" default="Vector2(0, 0)" />
 			<description>
 				Applies a positioned force to the body. A force is time dependent and meant to be applied every physics update.
-				[code]position[/code] is the offset from the body origin in global coordinates.
+				[param position] is the offset from the body origin in global coordinates.
 			</description>
 		</method>
 		<method name="apply_impulse">
 			<return type="void" />
-			<argument index="0" name="impulse" type="Vector2" />
-			<argument index="1" name="position" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="impulse" type="Vector2" />
+			<param index="1" name="position" type="Vector2" default="Vector2(0, 0)" />
 			<description>
 				Applies a positioned impulse to the body.
 				An impulse is time-independent! Applying an impulse every frame would result in a framerate-dependent force. For this reason, it should only be used when simulating one-time impacts (use the "_force" functions otherwise).
-				[code]position[/code] is the offset from the body origin in global coordinates.
+				[param position] is the offset from the body origin in global coordinates.
 			</description>
 		</method>
 		<method name="apply_torque">
 			<return type="void" />
-			<argument index="0" name="torque" type="float" />
+			<param index="0" name="torque" type="float" />
 			<description>
 				Applies a rotational force without affecting position. A force is time dependent and meant to be applied every physics update.
 			</description>
 		</method>
 		<method name="apply_torque_impulse">
 			<return type="void" />
-			<argument index="0" name="torque" type="float" />
+			<param index="0" name="torque" type="float" />
 			<description>
 				Applies a rotational impulse to the body without affecting the position.
 				An impulse is time-independent! Applying an impulse every frame would result in a framerate-dependent force. For this reason, it should only be used when simulating one-time impacts (use the "_force" functions otherwise).
@@ -106,7 +106,7 @@
 		</method>
 		<method name="set_axis_velocity">
 			<return type="void" />
-			<argument index="0" name="axis_velocity" type="Vector2" />
+			<param index="0" name="axis_velocity" type="Vector2" />
 			<description>
 				Sets the body's velocity on the given axis. The velocity in the given vector axis will be set as the given vector length. This is useful for jumping behavior.
 			</description>
@@ -197,43 +197,43 @@
 	</members>
 	<signals>
 		<signal name="body_entered">
-			<argument index="0" name="body" type="Node" />
+			<param index="0" name="body" type="Node" />
 			<description>
 				Emitted when a collision with another [PhysicsBody2D] or [TileMap] occurs. Requires [member contact_monitor] to be set to [code]true[/code] and [member contacts_reported] to be set high enough to detect all the collisions. [TileMap]s are detected if the [TileSet] has Collision [Shape2D]s.
-				[code]body[/code] the [Node], if it exists in the tree, of the other [PhysicsBody2D] or [TileMap].
+				[param body] the [Node], if it exists in the tree, of the other [PhysicsBody2D] or [TileMap].
 			</description>
 		</signal>
 		<signal name="body_exited">
-			<argument index="0" name="body" type="Node" />
+			<param index="0" name="body" type="Node" />
 			<description>
 				Emitted when the collision with another [PhysicsBody2D] or [TileMap] ends. Requires [member contact_monitor] to be set to [code]true[/code] and [member contacts_reported] to be set high enough to detect all the collisions. [TileMap]s are detected if the [TileSet] has Collision [Shape2D]s.
-				[code]body[/code] the [Node], if it exists in the tree, of the other [PhysicsBody2D] or [TileMap].
+				[param body] the [Node], if it exists in the tree, of the other [PhysicsBody2D] or [TileMap].
 			</description>
 		</signal>
 		<signal name="body_shape_entered">
-			<argument index="0" name="body_rid" type="RID" />
-			<argument index="1" name="body" type="Node" />
-			<argument index="2" name="body_shape_index" type="int" />
-			<argument index="3" name="local_shape_index" type="int" />
+			<param index="0" name="body_rid" type="RID" />
+			<param index="1" name="body" type="Node" />
+			<param index="2" name="body_shape_index" type="int" />
+			<param index="3" name="local_shape_index" type="int" />
 			<description>
 				Emitted when one of this RigidDynamicBody2D's [Shape2D]s collides with another [PhysicsBody2D] or [TileMap]'s [Shape2D]s. Requires [member contact_monitor] to be set to [code]true[/code] and [member contacts_reported] to be set high enough to detect all the collisions. [TileMap]s are detected if the [TileSet] has Collision [Shape2D]s.
-				[code]body_rid[/code] the [RID] of the other [PhysicsBody2D] or [TileSet]'s [CollisionObject2D] used by the [PhysicsServer2D].
-				[code]body[/code] the [Node], if it exists in the tree, of the other [PhysicsBody2D] or [TileMap].
-				[code]body_shape_index[/code] the index of the [Shape2D] of the other [PhysicsBody2D] or [TileMap] used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]body.shape_owner_get_owner(body.shape_find_owner(body_shape_index))[/code].
-				[code]local_shape_index[/code] the index of the [Shape2D] of this RigidDynamicBody2D used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
+				[param body_rid] the [RID] of the other [PhysicsBody2D] or [TileSet]'s [CollisionObject2D] used by the [PhysicsServer2D].
+				[param body] the [Node], if it exists in the tree, of the other [PhysicsBody2D] or [TileMap].
+				[param body_shape_index] the index of the [Shape2D] of the other [PhysicsBody2D] or [TileMap] used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]body.shape_owner_get_owner(body.shape_find_owner(body_shape_index))[/code].
+				[param local_shape_index] the index of the [Shape2D] of this RigidDynamicBody2D used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
 			</description>
 		</signal>
 		<signal name="body_shape_exited">
-			<argument index="0" name="body_rid" type="RID" />
-			<argument index="1" name="body" type="Node" />
-			<argument index="2" name="body_shape_index" type="int" />
-			<argument index="3" name="local_shape_index" type="int" />
+			<param index="0" name="body_rid" type="RID" />
+			<param index="1" name="body" type="Node" />
+			<param index="2" name="body_shape_index" type="int" />
+			<param index="3" name="local_shape_index" type="int" />
 			<description>
 				Emitted when the collision between one of this RigidDynamicBody2D's [Shape2D]s and another [PhysicsBody2D] or [TileMap]'s [Shape2D]s ends. Requires [member contact_monitor] to be set to [code]true[/code] and [member contacts_reported] to be set high enough to detect all the collisions. [TileMap]s are detected if the [TileSet] has Collision [Shape2D]s.
-				[code]body_rid[/code] the [RID] of the other [PhysicsBody2D] or [TileSet]'s [CollisionObject2D] used by the [PhysicsServer2D].
-				[code]body[/code] the [Node], if it exists in the tree, of the other [PhysicsBody2D] or [TileMap].
-				[code]body_shape_index[/code] the index of the [Shape2D] of the other [PhysicsBody2D] or [TileMap] used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]body.shape_owner_get_owner(body.shape_find_owner(body_shape_index))[/code].
-				[code]local_shape_index[/code] the index of the [Shape2D] of this RigidDynamicBody2D used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
+				[param body_rid] the [RID] of the other [PhysicsBody2D] or [TileSet]'s [CollisionObject2D] used by the [PhysicsServer2D].
+				[param body] the [Node], if it exists in the tree, of the other [PhysicsBody2D] or [TileMap].
+				[param body_shape_index] the index of the [Shape2D] of the other [PhysicsBody2D] or [TileMap] used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]body.shape_owner_get_owner(body.shape_find_owner(body_shape_index))[/code].
+				[param local_shape_index] the index of the [Shape2D] of this RigidDynamicBody2D used by the [PhysicsServer2D]. Get the [CollisionShape2D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
 			</description>
 		</signal>
 		<signal name="sleeping_state_changed">
diff --git a/doc/classes/RigidDynamicBody3D.xml b/doc/classes/RigidDynamicBody3D.xml
index 285176b8b0..83f24be418 100644
--- a/doc/classes/RigidDynamicBody3D.xml
+++ b/doc/classes/RigidDynamicBody3D.xml
@@ -17,14 +17,14 @@
 	<methods>
 		<method name="_integrate_forces" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="state" type="PhysicsDirectBodyState3D" />
+			<param index="0" name="state" type="PhysicsDirectBodyState3D" />
 			<description>
 				Called during physics processing, allowing you to read and safely modify the simulation state for the object. By default, it works in addition to the usual physics behavior, but the [member custom_integrator] property allows you to disable the default behavior and do fully custom force integration for a body.
 			</description>
 		</method>
 		<method name="add_constant_central_force">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector3" />
+			<param index="0" name="force" type="Vector3" />
 			<description>
 				Adds a constant directional force without affecting rotation that keeps being applied over time until cleared with [code]constant_force = Vector3(0, 0, 0)[/code].
 				This is equivalent to using [method add_constant_force] at the body's center of mass.
@@ -32,23 +32,23 @@
 		</method>
 		<method name="add_constant_force">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector3" />
-			<argument index="1" name="position" type="Vector3" default="Vector3(0, 0, 0)" />
+			<param index="0" name="force" type="Vector3" />
+			<param index="1" name="position" type="Vector3" default="Vector3(0, 0, 0)" />
 			<description>
 				Adds a constant positioned force to the body that keeps being applied over time until cleared with [code]constant_force = Vector3(0, 0, 0)[/code].
-				[code]position[/code] is the offset from the body origin in global coordinates.
+				[param position] is the offset from the body origin in global coordinates.
 			</description>
 		</method>
 		<method name="add_constant_torque">
 			<return type="void" />
-			<argument index="0" name="torque" type="Vector3" />
+			<param index="0" name="torque" type="Vector3" />
 			<description>
 				Adds a constant rotational force without affecting position that keeps being applied over time until cleared with [code]constant_torque = Vector3(0, 0, 0)[/code].
 			</description>
 		</method>
 		<method name="apply_central_force">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector3" />
+			<param index="0" name="force" type="Vector3" />
 			<description>
 				Applies a directional force without affecting rotation. A force is time dependent and meant to be applied every physics update.
 				This is equivalent to using [method apply_force] at the body's center of mass.
@@ -56,7 +56,7 @@
 		</method>
 		<method name="apply_central_impulse">
 			<return type="void" />
-			<argument index="0" name="impulse" type="Vector3" />
+			<param index="0" name="impulse" type="Vector3" />
 			<description>
 				Applies a directional impulse without affecting rotation.
 				An impulse is time-independent! Applying an impulse every frame would result in a framerate-dependent force. For this reason, it should only be used when simulating one-time impacts (use the "_force" functions otherwise).
@@ -65,33 +65,33 @@
 		</method>
 		<method name="apply_force">
 			<return type="void" />
-			<argument index="0" name="force" type="Vector3" />
-			<argument index="1" name="position" type="Vector3" default="Vector3(0, 0, 0)" />
+			<param index="0" name="force" type="Vector3" />
+			<param index="1" name="position" type="Vector3" default="Vector3(0, 0, 0)" />
 			<description>
 				Applies a positioned force to the body. A force is time dependent and meant to be applied every physics update.
-				[code]position[/code] is the offset from the body origin in global coordinates.
+				[param position] is the offset from the body origin in global coordinates.
 			</description>
 		</method>
 		<method name="apply_impulse">
 			<return type="void" />
-			<argument index="0" name="impulse" type="Vector3" />
-			<argument index="1" name="position" type="Vector3" default="Vector3(0, 0, 0)" />
+			<param index="0" name="impulse" type="Vector3" />
+			<param index="1" name="position" type="Vector3" default="Vector3(0, 0, 0)" />
 			<description>
 				Applies a positioned impulse to the body.
 				An impulse is time-independent! Applying an impulse every frame would result in a framerate-dependent force. For this reason, it should only be used when simulating one-time impacts (use the "_force" functions otherwise).
-				[code]position[/code] is the offset from the body origin in global coordinates.
+				[param position] is the offset from the body origin in global coordinates.
 			</description>
 		</method>
 		<method name="apply_torque">
 			<return type="void" />
-			<argument index="0" name="torque" type="Vector3" />
+			<param index="0" name="torque" type="Vector3" />
 			<description>
 				Applies a rotational force without affecting position. A force is time dependent and meant to be applied every physics update.
 			</description>
 		</method>
 		<method name="apply_torque_impulse">
 			<return type="void" />
-			<argument index="0" name="impulse" type="Vector3" />
+			<param index="0" name="impulse" type="Vector3" />
 			<description>
 				Applies a rotational impulse to the body without affecting the position.
 				An impulse is time-independent! Applying an impulse every frame would result in a framerate-dependent force. For this reason, it should only be used when simulating one-time impacts (use the "_force" functions otherwise).
@@ -112,7 +112,7 @@
 		</method>
 		<method name="set_axis_velocity">
 			<return type="void" />
-			<argument index="0" name="axis_velocity" type="Vector3" />
+			<param index="0" name="axis_velocity" type="Vector3" />
 			<description>
 				Sets an axis velocity. The velocity in the given vector axis will be set as the given vector length. This is useful for jumping behavior.
 			</description>
@@ -203,43 +203,43 @@
 	</members>
 	<signals>
 		<signal name="body_entered">
-			<argument index="0" name="body" type="Node" />
+			<param index="0" name="body" type="Node" />
 			<description>
 				Emitted when a collision with another [PhysicsBody3D] or [GridMap] occurs. Requires [member contact_monitor] to be set to [code]true[/code] and [member contacts_reported] to be set high enough to detect all the collisions. [GridMap]s are detected if the [MeshLibrary] has Collision [Shape3D]s.
-				[code]body[/code] the [Node], if it exists in the tree, of the other [PhysicsBody3D] or [GridMap].
+				[param body] the [Node], if it exists in the tree, of the other [PhysicsBody3D] or [GridMap].
 			</description>
 		</signal>
 		<signal name="body_exited">
-			<argument index="0" name="body" type="Node" />
+			<param index="0" name="body" type="Node" />
 			<description>
 				Emitted when the collision with another [PhysicsBody3D] or [GridMap] ends. Requires [member contact_monitor] to be set to [code]true[/code] and [member contacts_reported] to be set high enough to detect all the collisions. [GridMap]s are detected if the [MeshLibrary] has Collision [Shape3D]s.
-				[code]body[/code] the [Node], if it exists in the tree, of the other [PhysicsBody3D] or [GridMap].
+				[param body] the [Node], if it exists in the tree, of the other [PhysicsBody3D] or [GridMap].
 			</description>
 		</signal>
 		<signal name="body_shape_entered">
-			<argument index="0" name="body_rid" type="RID" />
-			<argument index="1" name="body" type="Node" />
-			<argument index="2" name="body_shape_index" type="int" />
-			<argument index="3" name="local_shape_index" type="int" />
+			<param index="0" name="body_rid" type="RID" />
+			<param index="1" name="body" type="Node" />
+			<param index="2" name="body_shape_index" type="int" />
+			<param index="3" name="local_shape_index" type="int" />
 			<description>
 				Emitted when one of this RigidDynamicBody3D's [Shape3D]s collides with another [PhysicsBody3D] or [GridMap]'s [Shape3D]s. Requires [member contact_monitor] to be set to [code]true[/code] and [member contacts_reported] to be set high enough to detect all the collisions. [GridMap]s are detected if the [MeshLibrary] has Collision [Shape3D]s.
-				[code]body_rid[/code] the [RID] of the other [PhysicsBody3D] or [MeshLibrary]'s [CollisionObject3D] used by the [PhysicsServer3D].
-				[code]body[/code] the [Node], if it exists in the tree, of the other [PhysicsBody3D] or [GridMap].
-				[code]body_shape_index[/code] the index of the [Shape3D] of the other [PhysicsBody3D] or [GridMap] used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]body.shape_owner_get_owner(body.shape_find_owner(body_shape_index))[/code].
-				[code]local_shape_index[/code] the index of the [Shape3D] of this RigidDynamicBody3D used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
+				[param body_rid] the [RID] of the other [PhysicsBody3D] or [MeshLibrary]'s [CollisionObject3D] used by the [PhysicsServer3D].
+				[param body] the [Node], if it exists in the tree, of the other [PhysicsBody3D] or [GridMap].
+				[param body_shape_index] the index of the [Shape3D] of the other [PhysicsBody3D] or [GridMap] used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]body.shape_owner_get_owner(body.shape_find_owner(body_shape_index))[/code].
+				[param local_shape_index] the index of the [Shape3D] of this RigidDynamicBody3D used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
 			</description>
 		</signal>
 		<signal name="body_shape_exited">
-			<argument index="0" name="body_rid" type="RID" />
-			<argument index="1" name="body" type="Node" />
-			<argument index="2" name="body_shape_index" type="int" />
-			<argument index="3" name="local_shape_index" type="int" />
+			<param index="0" name="body_rid" type="RID" />
+			<param index="1" name="body" type="Node" />
+			<param index="2" name="body_shape_index" type="int" />
+			<param index="3" name="local_shape_index" type="int" />
 			<description>
 				Emitted when the collision between one of this RigidDynamicBody3D's [Shape3D]s and another [PhysicsBody3D] or [GridMap]'s [Shape3D]s ends. Requires [member contact_monitor] to be set to [code]true[/code] and [member contacts_reported] to be set high enough to detect all the collisions. [GridMap]s are detected if the [MeshLibrary] has Collision [Shape3D]s.
-				[code]body_rid[/code] the [RID] of the other [PhysicsBody3D] or [MeshLibrary]'s [CollisionObject3D] used by the [PhysicsServer3D]. [GridMap]s are detected if the Meshes have [Shape3D]s.
-				[code]body[/code] the [Node], if it exists in the tree, of the other [PhysicsBody3D] or [GridMap].
-				[code]body_shape_index[/code] the index of the [Shape3D] of the other [PhysicsBody3D] or [GridMap] used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]body.shape_owner_get_owner(body.shape_find_owner(body_shape_index))[/code].
-				[code]local_shape_index[/code] the index of the [Shape3D] of this RigidDynamicBody3D used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
+				[param body_rid] the [RID] of the other [PhysicsBody3D] or [MeshLibrary]'s [CollisionObject3D] used by the [PhysicsServer3D]. [GridMap]s are detected if the Meshes have [Shape3D]s.
+				[param body] the [Node], if it exists in the tree, of the other [PhysicsBody3D] or [GridMap].
+				[param body_shape_index] the index of the [Shape3D] of the other [PhysicsBody3D] or [GridMap] used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]body.shape_owner_get_owner(body.shape_find_owner(body_shape_index))[/code].
+				[param local_shape_index] the index of the [Shape3D] of this RigidDynamicBody3D used by the [PhysicsServer3D]. Get the [CollisionShape3D] node with [code]self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))[/code].
 			</description>
 		</signal>
 		<signal name="sleeping_state_changed">
diff --git a/doc/classes/SceneState.xml b/doc/classes/SceneState.xml
index d226577a95..acb29838ba 100644
--- a/doc/classes/SceneState.xml
+++ b/doc/classes/SceneState.xml
@@ -12,9 +12,9 @@
 	<methods>
 		<method name="get_connection_binds" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the list of bound parameters for the signal at [code]idx[/code].
+				Returns the list of bound parameters for the signal at [param idx].
 			</description>
 		</method>
 		<method name="get_connection_count" qualifiers="const">
@@ -26,44 +26,44 @@
 		</method>
 		<method name="get_connection_flags" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the connection flags for the signal at [code]idx[/code]. See [enum Object.ConnectFlags] constants.
+				Returns the connection flags for the signal at [param idx]. See [enum Object.ConnectFlags] constants.
 			</description>
 		</method>
 		<method name="get_connection_method" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the method connected to the signal at [code]idx[/code].
+				Returns the method connected to the signal at [param idx].
 			</description>
 		</method>
 		<method name="get_connection_signal" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the name of the signal at [code]idx[/code].
+				Returns the name of the signal at [param idx].
 			</description>
 		</method>
 		<method name="get_connection_source" qualifiers="const">
 			<return type="NodePath" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the path to the node that owns the signal at [code]idx[/code], relative to the root node.
+				Returns the path to the node that owns the signal at [param idx], relative to the root node.
 			</description>
 		</method>
 		<method name="get_connection_target" qualifiers="const">
 			<return type="NodePath" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the path to the node that owns the method connected to the signal at [code]idx[/code], relative to the root node.
+				Returns the path to the node that owns the method connected to the signal at [param idx], relative to the root node.
 			</description>
 		</method>
 		<method name="get_connection_unbinds" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the number of unbound parameters for the signal at [code]idx[/code].
+				Returns the number of unbound parameters for the signal at [param idx].
 			</description>
 		</method>
 		<method name="get_node_count" qualifiers="const">
@@ -75,91 +75,91 @@
 		</method>
 		<method name="get_node_groups" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the list of group names associated with the node at [code]idx[/code].
+				Returns the list of group names associated with the node at [param idx].
 			</description>
 		</method>
 		<method name="get_node_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the node's index, which is its position relative to its siblings. This is only relevant and saved in scenes for cases where new nodes are added to an instantiated or inherited scene among siblings from the base scene. Despite the name, this index is not related to the [code]idx[/code] argument used here and in other methods.
+				Returns the node's index, which is its position relative to its siblings. This is only relevant and saved in scenes for cases where new nodes are added to an instantiated or inherited scene among siblings from the base scene. Despite the name, this index is not related to the [param idx] argument used here and in other methods.
 			</description>
 		</method>
 		<method name="get_node_instance" qualifiers="const">
 			<return type="PackedScene" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns a [PackedScene] for the node at [code]idx[/code] (i.e. the whole branch starting at this node, with its child nodes and resources), or [code]null[/code] if the node is not an instance.
+				Returns a [PackedScene] for the node at [param idx] (i.e. the whole branch starting at this node, with its child nodes and resources), or [code]null[/code] if the node is not an instance.
 			</description>
 		</method>
 		<method name="get_node_instance_placeholder" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the path to the represented scene file if the node at [code]idx[/code] is an [InstancePlaceholder].
+				Returns the path to the represented scene file if the node at [param idx] is an [InstancePlaceholder].
 			</description>
 		</method>
 		<method name="get_node_name" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the name of the node at [code]idx[/code].
+				Returns the name of the node at [param idx].
 			</description>
 		</method>
 		<method name="get_node_owner_path" qualifiers="const">
 			<return type="NodePath" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the path to the owner of the node at [code]idx[/code], relative to the root node.
+				Returns the path to the owner of the node at [param idx], relative to the root node.
 			</description>
 		</method>
 		<method name="get_node_path" qualifiers="const">
 			<return type="NodePath" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="for_parent" type="bool" default="false" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="for_parent" type="bool" default="false" />
 			<description>
-				Returns the path to the node at [code]idx[/code].
-				If [code]for_parent[/code] is [code]true[/code], returns the path of the [code]idx[/code] node's parent instead.
+				Returns the path to the node at [param idx].
+				If [param for_parent] is [code]true[/code], returns the path of the [param idx] node's parent instead.
 			</description>
 		</method>
 		<method name="get_node_property_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the number of exported or overridden properties for the node at [code]idx[/code].
+				Returns the number of exported or overridden properties for the node at [param idx].
 				The [code]prop_idx[/code] argument used to query node property data in other [code]get_node_property_*[/code] methods in the interval [code][0, get_node_property_count() - 1][/code].
 			</description>
 		</method>
 		<method name="get_node_property_name" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="prop_idx" type="int" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="prop_idx" type="int" />
 			<description>
-				Returns the name of the property at [code]prop_idx[/code] for the node at [code]idx[/code].
+				Returns the name of the property at [param prop_idx] for the node at [param idx].
 			</description>
 		</method>
 		<method name="get_node_property_value" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="idx" type="int" />
-			<argument index="1" name="prop_idx" type="int" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="prop_idx" type="int" />
 			<description>
-				Returns the value of the property at [code]prop_idx[/code] for the node at [code]idx[/code].
+				Returns the value of the property at [param prop_idx] for the node at [param idx].
 			</description>
 		</method>
 		<method name="get_node_type" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the type of the node at [code]idx[/code].
+				Returns the type of the node at [param idx].
 			</description>
 		</method>
 		<method name="is_node_instance_placeholder" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns [code]true[/code] if the node at [code]idx[/code] is an [InstancePlaceholder].
+				Returns [code]true[/code] if the node at [param idx] is an [InstancePlaceholder].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/SceneTree.xml b/doc/classes/SceneTree.xml
index 9982cc0d60..0b358bd06f 100644
--- a/doc/classes/SceneTree.xml
+++ b/doc/classes/SceneTree.xml
@@ -15,39 +15,39 @@
 	<methods>
 		<method name="call_group" qualifiers="vararg">
 			<return type="void" />
-			<argument index="0" name="group" type="StringName" />
-			<argument index="1" name="method" type="StringName" />
+			<param index="0" name="group" type="StringName" />
+			<param index="1" name="method" type="StringName" />
 			<description>
-				Calls [code]method[/code] on each member of the given group. You can pass arguments to [code]method[/code] by specifying them at the end of the method call. If a node doesn't have the given method or the argument list does not match (either in count or in types), it will be skipped.
+				Calls [param method] on each member of the given group. You can pass arguments to [param method] by specifying them at the end of the method call. If a node doesn't have the given method or the argument list does not match (either in count or in types), it will be skipped.
 				[b]Note:[/b] [method call_group] will call methods immediately on all members at once, which can cause stuttering if an expensive method is called on lots of members. To wait for one frame after [method call_group] was called, use [method call_group_flags] with the [constant GROUP_CALL_DEFERRED] flag.
 			</description>
 		</method>
 		<method name="call_group_flags" qualifiers="vararg">
 			<return type="void" />
-			<argument index="0" name="flags" type="int" />
-			<argument index="1" name="group" type="StringName" />
-			<argument index="2" name="method" type="StringName" />
+			<param index="0" name="flags" type="int" />
+			<param index="1" name="group" type="StringName" />
+			<param index="2" name="method" type="StringName" />
 			<description>
-				Calls [code]method[/code] on each member of the given group, respecting the given [enum GroupCallFlags]. You can pass arguments to [code]method[/code] by specifying them at the end of the method call. If a node doesn't have the given method or the argument list does not match (either in count or in types), it will be skipped.
+				Calls [param method] on each member of the given group, respecting the given [enum GroupCallFlags]. You can pass arguments to [param method] by specifying them at the end of the method call. If a node doesn't have the given method or the argument list does not match (either in count or in types), it will be skipped.
 				[codeblock]
 				# Call the method in a deferred manner and in reverse order.
 				get_tree().call_group_flags(SceneTree.GROUP_CALL_DEFERRED | SceneTree.GROUP_CALL_REVERSE)
 				[/codeblock]
-				[b]Note:[/b] Group call flags are used to control the method calling behavior. By default, methods will be called immediately in a way similar to [method call_group]. However, if the [constant GROUP_CALL_DEFERRED] flag is present in the [code]flags[/code] argument, methods will be called with a one-frame delay in a way similar to [method Object.set_deferred].
+				[b]Note:[/b] Group call flags are used to control the method calling behavior. By default, methods will be called immediately in a way similar to [method call_group]. However, if the [constant GROUP_CALL_DEFERRED] flag is present in the [param flags] argument, methods will be called with a one-frame delay in a way similar to [method Object.set_deferred].
 			</description>
 		</method>
 		<method name="change_scene">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
-				Changes the running scene to the one at the given [code]path[/code], after loading it into a [PackedScene] and creating a new instance.
-				Returns [constant OK] on success, [constant ERR_CANT_OPEN] if the [code]path[/code] cannot be loaded into a [PackedScene], or [constant ERR_CANT_CREATE] if that scene cannot be instantiated.
+				Changes the running scene to the one at the given [param path], after loading it into a [PackedScene] and creating a new instance.
+				Returns [constant OK] on success, [constant ERR_CANT_OPEN] if the [param path] cannot be loaded into a [PackedScene], or [constant ERR_CANT_CREATE] if that scene cannot be instantiated.
 				[b]Note:[/b] The scene change is deferred, which means that the new scene node is added on the next idle frame. You won't be able to access it immediately after the [method change_scene] call.
 			</description>
 		</method>
 		<method name="change_scene_to">
 			<return type="int" enum="Error" />
-			<argument index="0" name="packed_scene" type="PackedScene" />
+			<param index="0" name="packed_scene" type="PackedScene" />
 			<description>
 				Changes the running scene to a new instance of the given [PackedScene].
 				Returns [constant OK] on success or [constant ERR_CANT_CREATE] if the scene cannot be instantiated.
@@ -56,10 +56,10 @@
 		</method>
 		<method name="create_timer">
 			<return type="SceneTreeTimer" />
-			<argument index="0" name="time_sec" type="float" />
-			<argument index="1" name="process_always" type="bool" default="true" />
+			<param index="0" name="time_sec" type="float" />
+			<param index="1" name="process_always" type="bool" default="true" />
 			<description>
-				Returns a [SceneTreeTimer] which will [signal SceneTreeTimer.timeout] after the given time in seconds elapsed in this [SceneTree]. If [code]process_always[/code] is set to [code]false[/code], pausing the [SceneTree] will also pause the timer.
+				Returns a [SceneTreeTimer] which will [signal SceneTreeTimer.timeout] after the given time in seconds elapsed in this [SceneTree]. If [param process_always] is set to [code]false[/code], pausing the [SceneTree] will also pause the timer.
 				Commonly used to create a one-shot delay timer as in the following example:
 				[codeblocks]
 				[gdscript]
@@ -88,7 +88,7 @@
 		</method>
 		<method name="get_first_node_in_group">
 			<return type="Node" />
-			<argument index="0" name="group" type="StringName" />
+			<param index="0" name="group" type="StringName" />
 			<description>
 				Returns the first node in the specified group, or [code]null[/code] if the group is empty or does not exist.
 			</description>
@@ -101,9 +101,9 @@
 		</method>
 		<method name="get_multiplayer" qualifiers="const">
 			<return type="MultiplayerAPI" />
-			<argument index="0" name="for_path" type="NodePath" default="NodePath(&quot;&quot;)" />
+			<param index="0" name="for_path" type="NodePath" default="NodePath(&quot;&quot;)" />
 			<description>
-				Return the [MultiplayerAPI] configured for the given path, or the default one if [code]for_path[/code] is empty.
+				Return the [MultiplayerAPI] configured for the given path, or the default one if [param for_path] is empty.
 			</description>
 		</method>
 		<method name="get_node_count" qualifiers="const">
@@ -114,7 +114,7 @@
 		</method>
 		<method name="get_nodes_in_group">
 			<return type="Array" />
-			<argument index="0" name="group" type="StringName" />
+			<param index="0" name="group" type="StringName" />
 			<description>
 				Returns a list of all nodes assigned to the given group.
 			</description>
@@ -127,42 +127,42 @@
 		</method>
 		<method name="has_group" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns [code]true[/code] if the given group exists.
 			</description>
 		</method>
 		<method name="notify_group">
 			<return type="void" />
-			<argument index="0" name="group" type="StringName" />
-			<argument index="1" name="notification" type="int" />
+			<param index="0" name="group" type="StringName" />
+			<param index="1" name="notification" type="int" />
 			<description>
-				Sends the given notification to all members of the [code]group[/code].
+				Sends the given notification to all members of the [param group].
 				[b]Note:[/b] [method notify_group] will immediately notify all members at once, which can cause stuttering if an expensive method is called as a result of sending the notification lots of members. To wait for one frame, use [method notify_group_flags] with the [constant GROUP_CALL_DEFERRED] flag.
 			</description>
 		</method>
 		<method name="notify_group_flags">
 			<return type="void" />
-			<argument index="0" name="call_flags" type="int" />
-			<argument index="1" name="group" type="StringName" />
-			<argument index="2" name="notification" type="int" />
+			<param index="0" name="call_flags" type="int" />
+			<param index="1" name="group" type="StringName" />
+			<param index="2" name="notification" type="int" />
 			<description>
-				Sends the given notification to all members of the [code]group[/code], respecting the given [enum GroupCallFlags].
-				[b]Note:[/b] Group call flags are used to control the notification sending behavior. By default, notifications will be sent immediately in a way similar to [method notify_group]. However, if the [constant GROUP_CALL_DEFERRED] flag is present in the [code]flags[/code] argument, notifications will be sent with a one-frame delay in a way similar to using [code]Object.call_deferred("notification", ...)[/code].
+				Sends the given notification to all members of the [param group], respecting the given [enum GroupCallFlags].
+				[b]Note:[/b] Group call flags are used to control the notification sending behavior. By default, notifications will be sent immediately in a way similar to [method notify_group]. However, if the [constant GROUP_CALL_DEFERRED] flag is present in the [param call_flags] argument, notifications will be sent with a one-frame delay in a way similar to using [code]Object.call_deferred("notification", ...)[/code].
 			</description>
 		</method>
 		<method name="queue_delete">
 			<return type="void" />
-			<argument index="0" name="obj" type="Object" />
+			<param index="0" name="obj" type="Object" />
 			<description>
 				Queues the given object for deletion, delaying the call to [method Object.free] to after the current frame.
 			</description>
 		</method>
 		<method name="quit">
 			<return type="void" />
-			<argument index="0" name="exit_code" type="int" default="0" />
+			<param index="0" name="exit_code" type="int" default="0" />
 			<description>
-				Quits the application at the end of the current iteration. Argument [code]exit_code[/code] can optionally be given (defaulting to 0) to customize the exit status code.
+				Quits the application at the end of the current iteration. Argument [param exit_code] can optionally be given (defaulting to 0) to customize the exit status code.
 				By convention, an exit code of [code]0[/code] indicates success whereas a non-zero exit code indicates an error.
 				For portability reasons, the exit code should be set between 0 and 125 (inclusive).
 				[b]Note:[/b] On iOS this method doesn't work. Instead, as recommended by the iOS Human Interface Guidelines, the user is expected to close apps via the Home button.
@@ -177,31 +177,31 @@
 		</method>
 		<method name="set_group">
 			<return type="void" />
-			<argument index="0" name="group" type="StringName" />
-			<argument index="1" name="property" type="String" />
-			<argument index="2" name="value" type="Variant" />
+			<param index="0" name="group" type="StringName" />
+			<param index="1" name="property" type="String" />
+			<param index="2" name="value" type="Variant" />
 			<description>
-				Sets the given [code]property[/code] to [code]value[/code] on all members of the given group.
+				Sets the given [param property] to [param value] on all members of the given group.
 				[b]Note:[/b] [method set_group] will set the property immediately on all members at once, which can cause stuttering if a property with an expensive setter is set on lots of members. To wait for one frame, use [method set_group_flags] with the [constant GROUP_CALL_DEFERRED] flag.
 			</description>
 		</method>
 		<method name="set_group_flags">
 			<return type="void" />
-			<argument index="0" name="call_flags" type="int" />
-			<argument index="1" name="group" type="StringName" />
-			<argument index="2" name="property" type="String" />
-			<argument index="3" name="value" type="Variant" />
+			<param index="0" name="call_flags" type="int" />
+			<param index="1" name="group" type="StringName" />
+			<param index="2" name="property" type="String" />
+			<param index="3" name="value" type="Variant" />
 			<description>
-				Sets the given [code]property[/code] to [code]value[/code] on all members of the given group, respecting the given [enum GroupCallFlags].
-				[b]Note:[/b] Group call flags are used to control the property setting behavior. By default, properties will be set immediately in a way similar to [method set_group]. However, if the [constant GROUP_CALL_DEFERRED] flag is present in the [code]flags[/code] argument, properties will be set with a one-frame delay in a way similar to [method Object.call_deferred].
+				Sets the given [param property] to [param value] on all members of the given group, respecting the given [enum GroupCallFlags].
+				[b]Note:[/b] Group call flags are used to control the property setting behavior. By default, properties will be set immediately in a way similar to [method set_group]. However, if the [constant GROUP_CALL_DEFERRED] flag is present in the [param call_flags] argument, properties will be set with a one-frame delay in a way similar to [method Object.call_deferred].
 			</description>
 		</method>
 		<method name="set_multiplayer">
 			<return type="void" />
-			<argument index="0" name="multiplayer" type="MultiplayerAPI" />
-			<argument index="1" name="root_path" type="NodePath" default="NodePath(&quot;&quot;)" />
+			<param index="0" name="multiplayer" type="MultiplayerAPI" />
+			<param index="1" name="root_path" type="NodePath" default="NodePath(&quot;&quot;)" />
 			<description>
-				Sets a custom [MultiplayerAPI] with the given [code]root_path[/code] (controlling also the relative subpaths), or override the default one if [code]root_path[/code] is empty.
+				Sets a custom [MultiplayerAPI] with the given [param root_path] (controlling also the relative subpaths), or override the default one if [param root_path] is empty.
 			</description>
 		</method>
 	</methods>
@@ -215,12 +215,15 @@
 		</member>
 		<member name="debug_collisions_hint" type="bool" setter="set_debug_collisions_hint" getter="is_debugging_collisions_hint" default="false">
 			If [code]true[/code], collision shapes will be visible when running the game from the editor for debugging purposes.
+			[b]Note:[/b] This property is not designed to be changed at run-time. Changing the value of [member debug_collisions_hint] while the project is running will not have the desired effect.
 		</member>
 		<member name="debug_navigation_hint" type="bool" setter="set_debug_navigation_hint" getter="is_debugging_navigation_hint" default="false">
 			If [code]true[/code], navigation polygons will be visible when running the game from the editor for debugging purposes.
+			[b]Note:[/b] This property is not designed to be changed at run-time. Changing the value of [member debug_navigation_hint] while the project is running will not have the desired effect.
 		</member>
 		<member name="debug_paths_hint" type="bool" setter="set_debug_paths_hint" getter="is_debugging_paths_hint" default="false">
 			If [code]true[/code], curves from [Path2D] and [Path3D] nodes will be visible when running the game from the editor for debugging purposes.
+			[b]Note:[/b] This property is not designed to be changed at run-time. Changing the value of [member debug_paths_hint] while the project is running will not have the desired effect.
 		</member>
 		<member name="edited_scene_root" type="Node" setter="set_edited_scene_root" getter="get_edited_scene_root">
 			The root of the edited scene.
@@ -244,25 +247,25 @@
 	</members>
 	<signals>
 		<signal name="node_added">
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
 				Emitted whenever a node is added to the [SceneTree].
 			</description>
 		</signal>
 		<signal name="node_configuration_warning_changed">
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
 				Emitted when a node's configuration changed. Only emitted in [code]tool[/code] mode.
 			</description>
 		</signal>
 		<signal name="node_removed">
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
 				Emitted whenever a node is removed from the [SceneTree].
 			</description>
 		</signal>
 		<signal name="node_renamed">
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
 				Emitted whenever a node is renamed.
 			</description>
diff --git a/doc/classes/Script.xml b/doc/classes/Script.xml
index cd8841c8c5..8202f9f536 100644
--- a/doc/classes/Script.xml
+++ b/doc/classes/Script.xml
@@ -32,7 +32,7 @@
 		</method>
 		<method name="get_property_default_value">
 			<return type="Variant" />
-			<argument index="0" name="property" type="StringName" />
+			<param index="0" name="property" type="StringName" />
 			<description>
 				Returns the default value of the specified property.
 			</description>
@@ -63,7 +63,7 @@
 		</method>
 		<method name="has_script_signal" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="signal_name" type="StringName" />
+			<param index="0" name="signal_name" type="StringName" />
 			<description>
 				Returns [code]true[/code] if the script, or a base class, defines a signal with the given name.
 			</description>
@@ -76,9 +76,9 @@
 		</method>
 		<method name="instance_has" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="base_object" type="Object" />
+			<param index="0" name="base_object" type="Object" />
 			<description>
-				Returns [code]true[/code] if [code]base_object[/code] is an instance of this script.
+				Returns [code]true[/code] if [param base_object] is an instance of this script.
 			</description>
 		</method>
 		<method name="is_tool" qualifiers="const">
@@ -89,7 +89,7 @@
 		</method>
 		<method name="reload">
 			<return type="int" enum="Error" />
-			<argument index="0" name="keep_state" type="bool" default="false" />
+			<param index="0" name="keep_state" type="bool" default="false" />
 			<description>
 				Reloads the script's class implementation. Returns an error code.
 			</description>
diff --git a/doc/classes/ScriptCreateDialog.xml b/doc/classes/ScriptCreateDialog.xml
index 79ee95719d..6b608aca4f 100644
--- a/doc/classes/ScriptCreateDialog.xml
+++ b/doc/classes/ScriptCreateDialog.xml
@@ -29,10 +29,10 @@
 	<methods>
 		<method name="config">
 			<return type="void" />
-			<argument index="0" name="inherits" type="String" />
-			<argument index="1" name="path" type="String" />
-			<argument index="2" name="built_in_enabled" type="bool" default="true" />
-			<argument index="3" name="load_enabled" type="bool" default="true" />
+			<param index="0" name="inherits" type="String" />
+			<param index="1" name="path" type="String" />
+			<param index="2" name="built_in_enabled" type="bool" default="true" />
+			<param index="3" name="load_enabled" type="bool" default="true" />
 			<description>
 				Prefills required fields to configure the ScriptCreateDialog for use.
 			</description>
@@ -45,7 +45,7 @@
 	</members>
 	<signals>
 		<signal name="script_created">
-			<argument index="0" name="script" type="Script" />
+			<param index="0" name="script" type="Script" />
 			<description>
 				Emitted when the user clicks the OK button.
 			</description>
diff --git a/doc/classes/ScriptEditor.xml b/doc/classes/ScriptEditor.xml
index 92488b2392..9118f38a3e 100644
--- a/doc/classes/ScriptEditor.xml
+++ b/doc/classes/ScriptEditor.xml
@@ -35,22 +35,22 @@
 		</method>
 		<method name="goto_line">
 			<return type="void" />
-			<argument index="0" name="line_number" type="int" />
+			<param index="0" name="line_number" type="int" />
 			<description>
 				Goes to the specified line in the current script.
 			</description>
 		</method>
 		<method name="open_script_create_dialog">
 			<return type="void" />
-			<argument index="0" name="base_name" type="String" />
-			<argument index="1" name="base_path" type="String" />
+			<param index="0" name="base_name" type="String" />
+			<param index="1" name="base_path" type="String" />
 			<description>
-				Opens the script create dialog. The script will extend [code]base_name[/code]. The file extension can be omitted from [code]base_path[/code]. It will be added based on the selected scripting language.
+				Opens the script create dialog. The script will extend [param base_name]. The file extension can be omitted from [param base_path]. It will be added based on the selected scripting language.
 			</description>
 		</method>
 		<method name="register_syntax_highlighter">
 			<return type="void" />
-			<argument index="0" name="syntax_highlighter" type="EditorSyntaxHighlighter" />
+			<param index="0" name="syntax_highlighter" type="EditorSyntaxHighlighter" />
 			<description>
 				Registers the [EditorSyntaxHighlighter] to the editor, the [EditorSyntaxHighlighter] will be available on all open scripts.
 				[b]Note:[/b] Does not apply to scripts that are already opened.
@@ -58,7 +58,7 @@
 		</method>
 		<method name="unregister_syntax_highlighter">
 			<return type="void" />
-			<argument index="0" name="syntax_highlighter" type="EditorSyntaxHighlighter" />
+			<param index="0" name="syntax_highlighter" type="EditorSyntaxHighlighter" />
 			<description>
 				Unregisters the [EditorSyntaxHighlighter] from the editor.
 				[b]Note:[/b] The [EditorSyntaxHighlighter] will still be applied to scripts that are already opened.
@@ -67,13 +67,13 @@
 	</methods>
 	<signals>
 		<signal name="editor_script_changed">
-			<argument index="0" name="script" type="Script" />
+			<param index="0" name="script" type="Script" />
 			<description>
 				Emitted when user changed active script. Argument is a freshly activated [Script].
 			</description>
 		</signal>
 		<signal name="script_close">
-			<argument index="0" name="script" type="Script" />
+			<param index="0" name="script" type="Script" />
 			<description>
 				Emitted when editor is about to close the active script. Argument is a [Script] that is going to be closed.
 			</description>
diff --git a/doc/classes/ScriptEditorBase.xml b/doc/classes/ScriptEditorBase.xml
index 3bed1127ee..c365e0971b 100644
--- a/doc/classes/ScriptEditorBase.xml
+++ b/doc/classes/ScriptEditorBase.xml
@@ -11,7 +11,7 @@
 	<methods>
 		<method name="add_syntax_highlighter">
 			<return type="void" />
-			<argument index="0" name="highlighter" type="EditorSyntaxHighlighter" />
+			<param index="0" name="highlighter" type="EditorSyntaxHighlighter" />
 			<description>
 				Adds a [EditorSyntaxHighlighter] to the open script.
 			</description>
@@ -30,7 +30,7 @@
 			</description>
 		</signal>
 		<signal name="go_to_help">
-			<argument index="0" name="what" type="String" />
+			<param index="0" name="what" type="String" />
 			<description>
 				Emitted when the user requests a specific documentation page.
 			</description>
@@ -41,20 +41,20 @@
 			</description>
 		</signal>
 		<signal name="replace_in_files_requested">
-			<argument index="0" name="text" type="String" />
+			<param index="0" name="text" type="String" />
 			<description>
 				Emitted when the user request to find and replace text in the file system. Not used by visual scripts.
 			</description>
 		</signal>
 		<signal name="request_help">
-			<argument index="0" name="topic" type="String" />
+			<param index="0" name="topic" type="String" />
 			<description>
 				Emitted when the user requests contextual help.
 			</description>
 		</signal>
 		<signal name="request_open_script_at_line">
-			<argument index="0" name="script" type="Object" />
-			<argument index="1" name="line" type="int" />
+			<param index="0" name="script" type="Object" />
+			<param index="1" name="line" type="int" />
 			<description>
 				Emitted when the user requests a script.
 			</description>
@@ -65,7 +65,7 @@
 			</description>
 		</signal>
 		<signal name="search_in_files_requested">
-			<argument index="0" name="text" type="String" />
+			<param index="0" name="text" type="String" />
 			<description>
 				Emitted when the user request to search text in the file system. Not used by visual scripts.
 			</description>
diff --git a/doc/classes/ScriptExtension.xml b/doc/classes/ScriptExtension.xml
index 4e432ca9a8..b59c49d785 100644
--- a/doc/classes/ScriptExtension.xml
+++ b/doc/classes/ScriptExtension.xml
@@ -44,7 +44,7 @@
 		</method>
 		<method name="_get_member_line" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="member" type="StringName" />
+			<param index="0" name="member" type="StringName" />
 			<description>
 			</description>
 		</method>
@@ -55,13 +55,13 @@
 		</method>
 		<method name="_get_method_info" qualifiers="virtual const">
 			<return type="Dictionary" />
-			<argument index="0" name="method" type="StringName" />
+			<param index="0" name="method" type="StringName" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_property_default_value" qualifiers="virtual const">
 			<return type="Variant" />
-			<argument index="0" name="property" type="StringName" />
+			<param index="0" name="property" type="StringName" />
 			<description>
 			</description>
 		</method>
@@ -92,13 +92,13 @@
 		</method>
 		<method name="_has_method" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="method" type="StringName" />
+			<param index="0" name="method" type="StringName" />
 			<description>
 			</description>
 		</method>
 		<method name="_has_script_signal" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="signal" type="StringName" />
+			<param index="0" name="signal" type="StringName" />
 			<description>
 			</description>
 		</method>
@@ -109,19 +109,19 @@
 		</method>
 		<method name="_inherits_script" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="script" type="Script" />
+			<param index="0" name="script" type="Script" />
 			<description>
 			</description>
 		</method>
 		<method name="_instance_create" qualifiers="virtual const">
 			<return type="void*" />
-			<argument index="0" name="for_object" type="Object" />
+			<param index="0" name="for_object" type="Object" />
 			<description>
 			</description>
 		</method>
 		<method name="_instance_has" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="object" type="Object" />
+			<param index="0" name="object" type="Object" />
 			<description>
 			</description>
 		</method>
@@ -142,25 +142,25 @@
 		</method>
 		<method name="_placeholder_erased" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="placeholder" type="void*" />
+			<param index="0" name="placeholder" type="void*" />
 			<description>
 			</description>
 		</method>
 		<method name="_placeholder_instance_create" qualifiers="virtual const">
 			<return type="void*" />
-			<argument index="0" name="for_object" type="Object" />
+			<param index="0" name="for_object" type="Object" />
 			<description>
 			</description>
 		</method>
 		<method name="_reload" qualifiers="virtual">
 			<return type="int" enum="Error" />
-			<argument index="0" name="keep_state" type="bool" />
+			<param index="0" name="keep_state" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_set_source_code" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="code" type="String" />
+			<param index="0" name="code" type="String" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/ScriptLanguageExtension.xml b/doc/classes/ScriptLanguageExtension.xml
index 45d4cf44fa..2d41f8e880 100644
--- a/doc/classes/ScriptLanguageExtension.xml
+++ b/doc/classes/ScriptLanguageExtension.xml
@@ -9,29 +9,29 @@
 	<methods>
 		<method name="_add_global_constant" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="value" type="Variant" />
 			<description>
 			</description>
 		</method>
 		<method name="_add_named_global_constant" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="value" type="Variant" />
 			<description>
 			</description>
 		</method>
 		<method name="_alloc_instance_binding_data" qualifiers="virtual">
 			<return type="void*" />
-			<argument index="0" name="object" type="Object" />
+			<param index="0" name="object" type="Object" />
 			<description>
 			</description>
 		</method>
 		<method name="_auto_indent_code" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="code" type="String" />
-			<argument index="1" name="from_line" type="int" />
-			<argument index="2" name="to_line" type="int" />
+			<param index="0" name="code" type="String" />
+			<param index="1" name="from_line" type="int" />
+			<param index="2" name="to_line" type="int" />
 			<description>
 			</description>
 		</method>
@@ -42,9 +42,9 @@
 		</method>
 		<method name="_complete_code" qualifiers="virtual const">
 			<return type="Dictionary" />
-			<argument index="0" name="code" type="String" />
-			<argument index="1" name="path" type="String" />
-			<argument index="2" name="owner" type="Object" />
+			<param index="0" name="code" type="String" />
+			<param index="1" name="path" type="String" />
+			<param index="2" name="owner" type="Object" />
 			<description>
 			</description>
 		</method>
@@ -65,8 +65,8 @@
 		</method>
 		<method name="_debug_get_globals" qualifiers="virtual">
 			<return type="Dictionary" />
-			<argument index="0" name="max_subitems" type="int" />
-			<argument index="1" name="max_depth" type="int" />
+			<param index="0" name="max_subitems" type="int" />
+			<param index="1" name="max_depth" type="int" />
 			<description>
 			</description>
 		</method>
@@ -77,57 +77,57 @@
 		</method>
 		<method name="_debug_get_stack_level_function" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="level" type="int" />
+			<param index="0" name="level" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_debug_get_stack_level_instance" qualifiers="virtual">
 			<return type="void*" />
-			<argument index="0" name="level" type="int" />
+			<param index="0" name="level" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_debug_get_stack_level_line" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="level" type="int" />
+			<param index="0" name="level" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_debug_get_stack_level_locals" qualifiers="virtual">
 			<return type="Dictionary" />
-			<argument index="0" name="level" type="int" />
-			<argument index="1" name="max_subitems" type="int" />
-			<argument index="2" name="max_depth" type="int" />
+			<param index="0" name="level" type="int" />
+			<param index="1" name="max_subitems" type="int" />
+			<param index="2" name="max_depth" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_debug_get_stack_level_members" qualifiers="virtual">
 			<return type="Dictionary" />
-			<argument index="0" name="level" type="int" />
-			<argument index="1" name="max_subitems" type="int" />
-			<argument index="2" name="max_depth" type="int" />
+			<param index="0" name="level" type="int" />
+			<param index="1" name="max_subitems" type="int" />
+			<param index="2" name="max_depth" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_debug_parse_stack_level_expression" qualifiers="virtual">
 			<return type="String" />
-			<argument index="0" name="level" type="int" />
-			<argument index="1" name="expression" type="String" />
-			<argument index="2" name="max_subitems" type="int" />
-			<argument index="3" name="max_depth" type="int" />
+			<param index="0" name="level" type="int" />
+			<param index="1" name="expression" type="String" />
+			<param index="2" name="max_subitems" type="int" />
+			<param index="3" name="max_depth" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_execute_file" qualifiers="virtual">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="_find_function" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="class_name" type="String" />
-			<argument index="1" name="function_name" type="String" />
+			<param index="0" name="class_name" type="String" />
+			<param index="1" name="function_name" type="String" />
 			<description>
 			</description>
 		</method>
@@ -143,13 +143,13 @@
 		</method>
 		<method name="_free_instance_binding_data" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="data" type="void*" />
+			<param index="0" name="data" type="void*" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_built_in_templates" qualifiers="virtual const">
 			<return type="Dictionary[]" />
-			<argument index="0" name="object" type="StringName" />
+			<param index="0" name="object" type="StringName" />
 			<description>
 			</description>
 		</method>
@@ -165,7 +165,7 @@
 		</method>
 		<method name="_get_global_class_name" qualifiers="virtual const">
 			<return type="Dictionary" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
@@ -211,7 +211,7 @@
 		</method>
 		<method name="_handles_global_class_type" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="type" type="String" />
+			<param index="0" name="type" type="String" />
 			<description>
 			</description>
 		</method>
@@ -227,7 +227,7 @@
 		</method>
 		<method name="_is_control_flow_keyword" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="keyword" type="String" />
+			<param index="0" name="keyword" type="String" />
 			<description>
 			</description>
 		</method>
@@ -238,34 +238,34 @@
 		</method>
 		<method name="_lookup_code" qualifiers="virtual const">
 			<return type="Dictionary" />
-			<argument index="0" name="code" type="String" />
-			<argument index="1" name="symbol" type="String" />
-			<argument index="2" name="path" type="String" />
-			<argument index="3" name="owner" type="Object" />
+			<param index="0" name="code" type="String" />
+			<param index="1" name="symbol" type="String" />
+			<param index="2" name="path" type="String" />
+			<param index="3" name="owner" type="Object" />
 			<description>
 			</description>
 		</method>
 		<method name="_make_function" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="class_name" type="String" />
-			<argument index="1" name="function_name" type="String" />
-			<argument index="2" name="function_args" type="PackedStringArray" />
+			<param index="0" name="class_name" type="String" />
+			<param index="1" name="function_name" type="String" />
+			<param index="2" name="function_args" type="PackedStringArray" />
 			<description>
 			</description>
 		</method>
 		<method name="_make_template" qualifiers="virtual const">
 			<return type="Script" />
-			<argument index="0" name="template" type="String" />
-			<argument index="1" name="class_name" type="String" />
-			<argument index="2" name="base_class_name" type="String" />
+			<param index="0" name="template" type="String" />
+			<param index="1" name="class_name" type="String" />
+			<param index="2" name="base_class_name" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="_open_in_external_editor" qualifiers="virtual">
 			<return type="int" enum="Error" />
-			<argument index="0" name="script" type="Script" />
-			<argument index="1" name="line" type="int" />
-			<argument index="2" name="column" type="int" />
+			<param index="0" name="script" type="Script" />
+			<param index="1" name="line" type="int" />
+			<param index="2" name="column" type="int" />
 			<description>
 			</description>
 		</method>
@@ -276,15 +276,15 @@
 		</method>
 		<method name="_profiling_get_accumulated_data" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="info_array" type="ScriptLanguageExtensionProfilingInfo*" />
-			<argument index="1" name="info_max" type="int" />
+			<param index="0" name="info_array" type="ScriptLanguageExtensionProfilingInfo*" />
+			<param index="1" name="info_max" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_profiling_get_frame_data" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="info_array" type="ScriptLanguageExtensionProfilingInfo*" />
-			<argument index="1" name="info_max" type="int" />
+			<param index="0" name="info_array" type="ScriptLanguageExtensionProfilingInfo*" />
+			<param index="1" name="info_max" type="int" />
 			<description>
 			</description>
 		</method>
@@ -300,13 +300,13 @@
 		</method>
 		<method name="_refcount_decremented_instance_binding" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="object" type="Object" />
+			<param index="0" name="object" type="Object" />
 			<description>
 			</description>
 		</method>
 		<method name="_refcount_incremented_instance_binding" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="object" type="Object" />
+			<param index="0" name="object" type="Object" />
 			<description>
 			</description>
 		</method>
@@ -317,14 +317,14 @@
 		</method>
 		<method name="_reload_tool_script" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="script" type="Script" />
-			<argument index="1" name="soft_reload" type="bool" />
+			<param index="0" name="script" type="Script" />
+			<param index="1" name="soft_reload" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_remove_named_global_constant" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 			</description>
 		</method>
@@ -350,18 +350,18 @@
 		</method>
 		<method name="_validate" qualifiers="virtual const">
 			<return type="Dictionary" />
-			<argument index="0" name="script" type="String" />
-			<argument index="1" name="path" type="String" />
-			<argument index="2" name="validate_functions" type="bool" />
-			<argument index="3" name="validate_errors" type="bool" />
-			<argument index="4" name="validate_warnings" type="bool" />
-			<argument index="5" name="validate_safe_lines" type="bool" />
+			<param index="0" name="script" type="String" />
+			<param index="1" name="path" type="String" />
+			<param index="2" name="validate_functions" type="bool" />
+			<param index="3" name="validate_errors" type="bool" />
+			<param index="4" name="validate_warnings" type="bool" />
+			<param index="5" name="validate_safe_lines" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_validate_path" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/ScrollContainer.xml b/doc/classes/ScrollContainer.xml
index 1bbf5cb91b..de586fc3d0 100644
--- a/doc/classes/ScrollContainer.xml
+++ b/doc/classes/ScrollContainer.xml
@@ -14,9 +14,9 @@
 	<methods>
 		<method name="ensure_control_visible">
 			<return type="void" />
-			<argument index="0" name="control" type="Control" />
+			<param index="0" name="control" type="Control" />
 			<description>
-				Ensures the given [code]control[/code] is visible (must be a direct or indirect child of the ScrollContainer). Used by [member follow_focus].
+				Ensures the given [param control] is visible (must be a direct or indirect child of the ScrollContainer). Used by [member follow_focus].
 				[b]Note:[/b] This will not work on a node that was just added during the same frame. If you want to scroll to a newly added child, you must wait until the next frame using [signal SceneTree.process_frame]:
 				[codeblock]
 				add_child(child_node)
diff --git a/doc/classes/Shader.xml b/doc/classes/Shader.xml
index 10deaf1c41..b7e6d80ccb 100644
--- a/doc/classes/Shader.xml
+++ b/doc/classes/Shader.xml
@@ -12,12 +12,12 @@
 	<methods>
 		<method name="get_default_texture_param" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="param" type="StringName" />
-			<argument index="1" name="index" type="int" default="0" />
+			<param index="0" name="param" type="StringName" />
+			<param index="1" name="index" type="int" default="0" />
 			<description>
 				Returns the texture that is set as default for the specified parameter.
-				[b]Note:[/b] [code]param[/code] must match the name of the uniform in the code exactly.
-				[b]Note:[/b] If the sampler array is used use [code]index[/code] to access the specified texture.
+				[b]Note:[/b] [param param] must match the name of the uniform in the code exactly.
+				[b]Note:[/b] If the sampler array is used use [param index] to access the specified texture.
 			</description>
 		</method>
 		<method name="get_mode" qualifiers="const">
@@ -26,23 +26,23 @@
 				Returns the shader mode for the shader, either [constant MODE_CANVAS_ITEM], [constant MODE_SPATIAL] or [constant MODE_PARTICLES].
 			</description>
 		</method>
-		<method name="has_param" qualifiers="const">
+		<method name="has_uniform" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns [code]true[/code] if the shader has this param defined as a uniform in its code.
-				[b]Note:[/b] [code]param[/code] must match the name of the uniform in the code exactly.
+				[b]Note:[/b] [param name] must match the name of the uniform in the code exactly.
 			</description>
 		</method>
 		<method name="set_default_texture_param">
 			<return type="void" />
-			<argument index="0" name="param" type="StringName" />
-			<argument index="1" name="texture" type="Texture2D" />
-			<argument index="2" name="index" type="int" default="0" />
+			<param index="0" name="param" type="StringName" />
+			<param index="1" name="texture" type="Texture2D" />
+			<param index="2" name="index" type="int" default="0" />
 			<description>
 				Sets the default texture to be used with a texture uniform. The default is used if a texture is not set in the [ShaderMaterial].
-				[b]Note:[/b] [code]param[/code] must match the name of the uniform in the code exactly.
-				[b]Note:[/b] If the sampler array is used use [code]index[/code] to access the specified texture.
+				[b]Note:[/b] [param param] must match the name of the uniform in the code exactly.
+				[b]Note:[/b] If the sampler array is used use [param index] to access the specified texture.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/ShaderMaterial.xml b/doc/classes/ShaderMaterial.xml
index 672b660c34..8d4df87b39 100644
--- a/doc/classes/ShaderMaterial.xml
+++ b/doc/classes/ShaderMaterial.xml
@@ -10,34 +10,20 @@
 		<link title="Shaders documentation index">$DOCS_URL/tutorials/shaders/index.html</link>
 	</tutorials>
 	<methods>
-		<method name="get_shader_param" qualifiers="const">
+		<method name="get_shader_uniform" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="param" type="StringName" />
+			<param index="0" name="param" type="StringName" />
 			<description>
 				Returns the current value set for this material of a uniform in the shader.
 			</description>
 		</method>
-		<method name="property_can_revert">
-			<return type="bool" />
-			<argument index="0" name="name" type="String" />
-			<description>
-				Returns [code]true[/code] if the property identified by [code]name[/code] can be reverted to a default value.
-			</description>
-		</method>
-		<method name="property_get_revert">
-			<return type="Variant" />
-			<argument index="0" name="name" type="String" />
-			<description>
-				Returns the default value of the material property with given [code]name[/code].
-			</description>
-		</method>
-		<method name="set_shader_param">
+		<method name="set_shader_uniform">
 			<return type="void" />
-			<argument index="0" name="param" type="StringName" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="param" type="StringName" />
+			<param index="1" name="value" type="Variant" />
 			<description>
 				Changes the value set for this material of a uniform in the shader.
-				[b]Note:[/b] [code]param[/code] must match the name of the uniform in the code exactly.
+				[b]Note:[/b] [param param] must match the name of the uniform in the code exactly.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/Shape2D.xml b/doc/classes/Shape2D.xml
index 94fb2d7dc7..4d7031ab86 100644
--- a/doc/classes/Shape2D.xml
+++ b/doc/classes/Shape2D.xml
@@ -12,58 +12,58 @@
 	<methods>
 		<method name="collide">
 			<return type="bool" />
-			<argument index="0" name="local_xform" type="Transform2D" />
-			<argument index="1" name="with_shape" type="Shape2D" />
-			<argument index="2" name="shape_xform" type="Transform2D" />
+			<param index="0" name="local_xform" type="Transform2D" />
+			<param index="1" name="with_shape" type="Shape2D" />
+			<param index="2" name="shape_xform" type="Transform2D" />
 			<description>
 				Returns [code]true[/code] if this shape is colliding with another.
-				This method needs the transformation matrix for this shape ([code]local_xform[/code]), the shape to check collisions with ([code]with_shape[/code]), and the transformation matrix of that shape ([code]shape_xform[/code]).
+				This method needs the transformation matrix for this shape ([param local_xform]), the shape to check collisions with ([param with_shape]), and the transformation matrix of that shape ([param shape_xform]).
 			</description>
 		</method>
 		<method name="collide_and_get_contacts">
 			<return type="Array" />
-			<argument index="0" name="local_xform" type="Transform2D" />
-			<argument index="1" name="with_shape" type="Shape2D" />
-			<argument index="2" name="shape_xform" type="Transform2D" />
+			<param index="0" name="local_xform" type="Transform2D" />
+			<param index="1" name="with_shape" type="Shape2D" />
+			<param index="2" name="shape_xform" type="Transform2D" />
 			<description>
 				Returns a list of contact point pairs where this shape touches another.
-				If there are no collisions, the returned list is empty. Otherwise, the returned list contains contact points arranged in pairs, with entries alternating between points on the boundary of this shape and points on the boundary of [code]with_shape[/code].
+				If there are no collisions, the returned list is empty. Otherwise, the returned list contains contact points arranged in pairs, with entries alternating between points on the boundary of this shape and points on the boundary of [param with_shape].
 				A collision pair A, B can be used to calculate the collision normal with [code](B - A).normalized()[/code], and the collision depth with [code](B - A).length()[/code]. This information is typically used to separate shapes, particularly in collision solvers.
-				This method needs the transformation matrix for this shape ([code]local_xform[/code]), the shape to check collisions with ([code]with_shape[/code]), and the transformation matrix of that shape ([code]shape_xform[/code]).
+				This method needs the transformation matrix for this shape ([param local_xform]), the shape to check collisions with ([param with_shape]), and the transformation matrix of that shape ([param shape_xform]).
 			</description>
 		</method>
 		<method name="collide_with_motion">
 			<return type="bool" />
-			<argument index="0" name="local_xform" type="Transform2D" />
-			<argument index="1" name="local_motion" type="Vector2" />
-			<argument index="2" name="with_shape" type="Shape2D" />
-			<argument index="3" name="shape_xform" type="Transform2D" />
-			<argument index="4" name="shape_motion" type="Vector2" />
+			<param index="0" name="local_xform" type="Transform2D" />
+			<param index="1" name="local_motion" type="Vector2" />
+			<param index="2" name="with_shape" type="Shape2D" />
+			<param index="3" name="shape_xform" type="Transform2D" />
+			<param index="4" name="shape_motion" type="Vector2" />
 			<description>
 				Returns whether this shape would collide with another, if a given movement was applied.
-				This method needs the transformation matrix for this shape ([code]local_xform[/code]), the movement to test on this shape ([code]local_motion[/code]), the shape to check collisions with ([code]with_shape[/code]), the transformation matrix of that shape ([code]shape_xform[/code]), and the movement to test onto the other object ([code]shape_motion[/code]).
+				This method needs the transformation matrix for this shape ([param local_xform]), the movement to test on this shape ([param local_motion]), the shape to check collisions with ([param with_shape]), the transformation matrix of that shape ([param shape_xform]), and the movement to test onto the other object ([param shape_motion]).
 			</description>
 		</method>
 		<method name="collide_with_motion_and_get_contacts">
 			<return type="Array" />
-			<argument index="0" name="local_xform" type="Transform2D" />
-			<argument index="1" name="local_motion" type="Vector2" />
-			<argument index="2" name="with_shape" type="Shape2D" />
-			<argument index="3" name="shape_xform" type="Transform2D" />
-			<argument index="4" name="shape_motion" type="Vector2" />
+			<param index="0" name="local_xform" type="Transform2D" />
+			<param index="1" name="local_motion" type="Vector2" />
+			<param index="2" name="with_shape" type="Shape2D" />
+			<param index="3" name="shape_xform" type="Transform2D" />
+			<param index="4" name="shape_motion" type="Vector2" />
 			<description>
 				Returns a list of contact point pairs where this shape would touch another, if a given movement was applied.
-				If there would be no collisions, the returned list is empty. Otherwise, the returned list contains contact points arranged in pairs, with entries alternating between points on the boundary of this shape and points on the boundary of [code]with_shape[/code].
+				If there would be no collisions, the returned list is empty. Otherwise, the returned list contains contact points arranged in pairs, with entries alternating between points on the boundary of this shape and points on the boundary of [param with_shape].
 				A collision pair A, B can be used to calculate the collision normal with [code](B - A).normalized()[/code], and the collision depth with [code](B - A).length()[/code]. This information is typically used to separate shapes, particularly in collision solvers.
-				This method needs the transformation matrix for this shape ([code]local_xform[/code]), the movement to test on this shape ([code]local_motion[/code]), the shape to check collisions with ([code]with_shape[/code]), the transformation matrix of that shape ([code]shape_xform[/code]), and the movement to test onto the other object ([code]shape_motion[/code]).
+				This method needs the transformation matrix for this shape ([param local_xform]), the movement to test on this shape ([param local_motion]), the shape to check collisions with ([param with_shape]), the transformation matrix of that shape ([param shape_xform]), and the movement to test onto the other object ([param shape_motion]).
 			</description>
 		</method>
 		<method name="draw">
 			<return type="void" />
-			<argument index="0" name="canvas_item" type="RID" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="canvas_item" type="RID" />
+			<param index="1" name="color" type="Color" />
 			<description>
-				Draws a solid shape onto a [CanvasItem] with the [RenderingServer] API filled with the specified [code]color[/code]. The exact drawing method is specific for each shape and cannot be configured.
+				Draws a solid shape onto a [CanvasItem] with the [RenderingServer] API filled with the specified [param color]. The exact drawing method is specific for each shape and cannot be configured.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/ShapeCast2D.xml b/doc/classes/ShapeCast2D.xml
index 70da03dc6e..36c3beecb1 100644
--- a/doc/classes/ShapeCast2D.xml
+++ b/doc/classes/ShapeCast2D.xml
@@ -14,14 +14,14 @@
 	<methods>
 		<method name="add_exception">
 			<return type="void" />
-			<argument index="0" name="node" type="CollisionObject2D" />
+			<param index="0" name="node" type="CollisionObject2D" />
 			<description>
 				Adds a collision exception so the shape does not report collisions with the specified [CollisionObject2D] node.
 			</description>
 		</method>
 		<method name="add_exception_rid">
 			<return type="void" />
-			<argument index="0" name="rid" type="RID" />
+			<param index="0" name="rid" type="RID" />
 			<description>
 				Adds a collision exception so the shape does not report collisions with the specified [RID].
 			</description>
@@ -53,16 +53,16 @@
 		</method>
 		<method name="get_collider" qualifiers="const">
 			<return type="Object" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the collided [Object] of one of the multiple collisions at [code]index[/code], or [code]null[/code] if no object is intersecting the shape (i.e. [method is_colliding] returns [code]false[/code]).
+				Returns the collided [Object] of one of the multiple collisions at [param index], or [code]null[/code] if no object is intersecting the shape (i.e. [method is_colliding] returns [code]false[/code]).
 			</description>
 		</method>
 		<method name="get_collider_shape" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the shape ID of the colliding shape of one of the multiple collisions at [code]index[/code], or [code]0[/code] if no object is intersecting the shape (i.e. [method is_colliding] returns [code]false[/code]).
+				Returns the shape ID of the colliding shape of one of the multiple collisions at [param index], or [code]0[/code] if no object is intersecting the shape (i.e. [method is_colliding] returns [code]false[/code]).
 			</description>
 		</method>
 		<method name="get_collision_count" qualifiers="const">
@@ -73,23 +73,23 @@
 		</method>
 		<method name="get_collision_mask_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
-				Returns whether or not the specified layer of the [member collision_mask] is enabled, given a [code]layer_number[/code] between 1 and 32.
+				Returns whether or not the specified layer of the [member collision_mask] is enabled, given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="get_collision_normal" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the normal of one of the multiple collisions at [code]index[/code] of the intersecting object.
+				Returns the normal of one of the multiple collisions at [param index] of the intersecting object.
 			</description>
 		</method>
 		<method name="get_collision_point" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the collision point of one of the multiple collisions at [code]index[/code] where the shape intersects the colliding object.
+				Returns the collision point of one of the multiple collisions at [param index] where the shape intersects the colliding object.
 				[b]Note:[/b] this point is in the [b]global[/b] coordinate system.
 			</description>
 		</method>
@@ -101,24 +101,24 @@
 		</method>
 		<method name="remove_exception">
 			<return type="void" />
-			<argument index="0" name="node" type="CollisionObject2D" />
+			<param index="0" name="node" type="CollisionObject2D" />
 			<description>
 				Removes a collision exception so the shape does report collisions with the specified [CollisionObject2D] node.
 			</description>
 		</method>
 		<method name="remove_exception_rid">
 			<return type="void" />
-			<argument index="0" name="rid" type="RID" />
+			<param index="0" name="rid" type="RID" />
 			<description>
 				Removes a collision exception so the shape does report collisions with the specified [RID].
 			</description>
 		</method>
 		<method name="set_collision_mask_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
-				Based on [code]value[/code], enables or disables the specified layer in the [member collision_mask], given a [code]layer_number[/code] between 1 and 32.
+				Based on [param value], enables or disables the specified layer in the [member collision_mask], given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/ShapeCast3D.xml b/doc/classes/ShapeCast3D.xml
index 085bc9acd1..cbdf660133 100644
--- a/doc/classes/ShapeCast3D.xml
+++ b/doc/classes/ShapeCast3D.xml
@@ -14,14 +14,14 @@
 	<methods>
 		<method name="add_exception">
 			<return type="void" />
-			<argument index="0" name="node" type="Object" />
+			<param index="0" name="node" type="Object" />
 			<description>
 				Adds a collision exception so the shape does not report collisions with the specified [CollisionObject3D] node.
 			</description>
 		</method>
 		<method name="add_exception_rid">
 			<return type="void" />
-			<argument index="0" name="rid" type="RID" />
+			<param index="0" name="rid" type="RID" />
 			<description>
 				Adds a collision exception so the shape does not report collisions with the specified [RID].
 			</description>
@@ -53,16 +53,16 @@
 		</method>
 		<method name="get_collider" qualifiers="const">
 			<return type="Object" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the collided [Object] of one of the multiple collisions at [code]index[/code], or [code]null[/code] if no object is intersecting the shape (i.e. [method is_colliding] returns [code]false[/code]).
+				Returns the collided [Object] of one of the multiple collisions at [param index], or [code]null[/code] if no object is intersecting the shape (i.e. [method is_colliding] returns [code]false[/code]).
 			</description>
 		</method>
 		<method name="get_collider_shape" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the shape ID of the colliding shape of one of the multiple collisions at [code]index[/code], or [code]0[/code] if no object is intersecting the shape (i.e. [method is_colliding] returns [code]false[/code]).
+				Returns the shape ID of the colliding shape of one of the multiple collisions at [param index], or [code]0[/code] if no object is intersecting the shape (i.e. [method is_colliding] returns [code]false[/code]).
 			</description>
 		</method>
 		<method name="get_collision_count" qualifiers="const">
@@ -73,23 +73,23 @@
 		</method>
 		<method name="get_collision_mask_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
-				Returns whether or not the specified layer of the [member collision_mask] is enabled, given a [code]layer_number[/code] between 1 and 32.
+				Returns whether or not the specified layer of the [member collision_mask] is enabled, given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="get_collision_normal" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the normal of one of the multiple collisions at [code]index[/code] of the intersecting object.
+				Returns the normal of one of the multiple collisions at [param index] of the intersecting object.
 			</description>
 		</method>
 		<method name="get_collision_point" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the collision point of one of the multiple collisions at [code]index[/code] where the shape intersects the colliding object.
+				Returns the collision point of one of the multiple collisions at [param index] where the shape intersects the colliding object.
 				[b]Note:[/b] this point is in the [b]global[/b] coordinate system.
 			</description>
 		</method>
@@ -101,31 +101,31 @@
 		</method>
 		<method name="remove_exception">
 			<return type="void" />
-			<argument index="0" name="node" type="Object" />
+			<param index="0" name="node" type="Object" />
 			<description>
 				Removes a collision exception so the shape does report collisions with the specified [CollisionObject3D] node.
 			</description>
 		</method>
 		<method name="remove_exception_rid">
 			<return type="void" />
-			<argument index="0" name="rid" type="RID" />
+			<param index="0" name="rid" type="RID" />
 			<description>
 				Removes a collision exception so the shape does report collisions with the specified [RID].
 			</description>
 		</method>
 		<method name="resource_changed">
 			<return type="void" />
-			<argument index="0" name="resource" type="Resource" />
+			<param index="0" name="resource" type="Resource" />
 			<description>
 				This method is used internally to update the debug gizmo in the editor. Any code placed in this function will be called whenever the [member shape] resource is modified.
 			</description>
 		</method>
 		<method name="set_collision_mask_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
-				Based on [code]value[/code], enables or disables the specified layer in the [member collision_mask], given a [code]layer_number[/code] between 1 and 32.
+				Based on [param value], enables or disables the specified layer in the [member collision_mask], given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/Shortcut.xml b/doc/classes/Shortcut.xml
index 46524a1d74..f30a5a5e7c 100644
--- a/doc/classes/Shortcut.xml
+++ b/doc/classes/Shortcut.xml
@@ -24,9 +24,9 @@
 		</method>
 		<method name="matches_event" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="event" type="InputEvent" />
+			<param index="0" name="event" type="InputEvent" />
 			<description>
-				Returns whether any [InputEvent] in [member events] equals [code]event[/code].
+				Returns whether any [InputEvent] in [member events] equals [param event].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/Signal.xml b/doc/classes/Signal.xml
index 049e7f8777..d99477ee95 100644
--- a/doc/classes/Signal.xml
+++ b/doc/classes/Signal.xml
@@ -18,25 +18,25 @@
 		</constructor>
 		<constructor name="Signal">
 			<return type="Signal" />
-			<argument index="0" name="from" type="Signal" />
+			<param index="0" name="from" type="Signal" />
 			<description>
 				Constructs a [Signal] as a copy of the given [Signal].
 			</description>
 		</constructor>
 		<constructor name="Signal">
 			<return type="Signal" />
-			<argument index="0" name="object" type="Object" />
-			<argument index="1" name="signal" type="StringName" />
+			<param index="0" name="object" type="Object" />
+			<param index="1" name="signal" type="StringName" />
 			<description>
-				Creates a new [Signal] with the name [code]signal[/code] in the specified [code]object[/code].
+				Creates a new [Signal] with the name [param signal] in the specified [param object].
 			</description>
 		</constructor>
 	</constructors>
 	<methods>
 		<method name="connect">
 			<return type="int" />
-			<argument index="0" name="callable" type="Callable" />
-			<argument index="1" name="flags" type="int" default="0" />
+			<param index="0" name="callable" type="Callable" />
+			<param index="1" name="flags" type="int" default="0" />
 			<description>
 				Connects this signal to the specified [Callable], optionally providing connection flags. You can provide additional arguments to the connected method call by using [method Callable.bind].
 				[codeblock]
@@ -50,7 +50,7 @@
 		</method>
 		<method name="disconnect">
 			<return type="void" />
-			<argument index="0" name="callable" type="Callable" />
+			<param index="0" name="callable" type="Callable" />
 			<description>
 				Disconnects this signal from the specified [Callable].
 			</description>
@@ -87,7 +87,7 @@
 		</method>
 		<method name="is_connected" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="callable" type="Callable" />
+			<param index="0" name="callable" type="Callable" />
 			<description>
 				Returns [code]true[/code] if the specified [Callable] is connected to this signal.
 			</description>
@@ -101,13 +101,13 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Signal" />
+			<param index="0" name="right" type="Signal" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="Signal" />
+			<param index="0" name="right" type="Signal" />
 			<description>
 			</description>
 		</operator>
diff --git a/doc/classes/Skeleton2D.xml b/doc/classes/Skeleton2D.xml
index 7867e5afa3..808f93b491 100644
--- a/doc/classes/Skeleton2D.xml
+++ b/doc/classes/Skeleton2D.xml
@@ -13,17 +13,17 @@
 	<methods>
 		<method name="execute_modifications">
 			<return type="void" />
-			<argument index="0" name="delta" type="float" />
-			<argument index="1" name="execution_mode" type="int" />
+			<param index="0" name="delta" type="float" />
+			<param index="1" name="execution_mode" type="int" />
 			<description>
 				Executes all the modifications on the [SkeletonModificationStack2D], if the Skeleton3D has one assigned.
 			</description>
 		</method>
 		<method name="get_bone">
 			<return type="Bone2D" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns a [Bone2D] from the node hierarchy parented by Skeleton2D. The object to return is identified by the parameter [code]idx[/code]. Bones are indexed by descending the node hierarchy from top to bottom, adding the children of each branch before moving to the next sibling.
+				Returns a [Bone2D] from the node hierarchy parented by Skeleton2D. The object to return is identified by the parameter [param idx]. Bones are indexed by descending the node hierarchy from top to bottom, adding the children of each branch before moving to the next sibling.
 			</description>
 		</method>
 		<method name="get_bone_count" qualifiers="const">
@@ -34,9 +34,9 @@
 		</method>
 		<method name="get_bone_local_pose_override">
 			<return type="Transform2D" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Returns the local pose override transform for [code]bone_idx[/code].
+				Returns the local pose override transform for [param bone_idx].
 			</description>
 		</method>
 		<method name="get_modification_stack" qualifiers="const">
@@ -53,19 +53,19 @@
 		</method>
 		<method name="set_bone_local_pose_override">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="override_pose" type="Transform2D" />
-			<argument index="2" name="strength" type="float" />
-			<argument index="3" name="persistent" type="bool" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="override_pose" type="Transform2D" />
+			<param index="2" name="strength" type="float" />
+			<param index="3" name="persistent" type="bool" />
 			<description>
-				Sets the local pose transform, [code]pose[/code], for the bone at [code]bone_idx[/code].
-				[code]amount[/code] is the interpolation strength that will be used when applying the pose, and [code]persistent[/code] determines if the applied pose will remain.
-				[b]Note:[/b] The pose transform needs to be a local transform relative to the [Bone2D] node at [code]bone_idx[/code]!
+				Sets the local pose transform, [param override_pose], for the bone at [param bone_idx].
+				[param strength] is the interpolation strength that will be used when applying the pose, and [param persistent] determines if the applied pose will remain.
+				[b]Note:[/b] The pose transform needs to be a local transform relative to the [Bone2D] node at [param bone_idx]!
 			</description>
 		</method>
 		<method name="set_modification_stack">
 			<return type="void" />
-			<argument index="0" name="modification_stack" type="SkeletonModificationStack2D" />
+			<param index="0" name="modification_stack" type="SkeletonModificationStack2D" />
 			<description>
 				Sets the [SkeletonModificationStack2D] attached to this skeleton.
 			</description>
diff --git a/doc/classes/Skeleton3D.xml b/doc/classes/Skeleton3D.xml
index 6295724aa2..e332618e9f 100644
--- a/doc/classes/Skeleton3D.xml
+++ b/doc/classes/Skeleton3D.xml
@@ -15,15 +15,15 @@
 	<methods>
 		<method name="add_bone">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
-				Adds a bone, with name [code]name[/code]. [method get_bone_count] will become the bone index.
+				Adds a bone, with name [param name]. [method get_bone_count] will become the bone index.
 			</description>
 		</method>
 		<method name="add_bone_child">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="child_bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="child_bone_idx" type="int" />
 			<description>
 				Takes the given bone pose/transform and converts it to a world transform, relative to the [Skeleton3D] node.
 				This is useful for using the bone transform in calculations with transforms from [Node3D]-based nodes.
@@ -54,17 +54,17 @@
 		</method>
 		<method name="execute_modifications">
 			<return type="void" />
-			<argument index="0" name="delta" type="float" />
-			<argument index="1" name="execution_mode" type="int" />
+			<param index="0" name="delta" type="float" />
+			<param index="1" name="execution_mode" type="int" />
 			<description>
 				Executes all the modifications on the [SkeletonModificationStack3D], if the Skeleton3D has one assigned.
 			</description>
 		</method>
 		<method name="find_bone" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
-				Returns the bone index that matches [code]name[/code] as its name.
+				Returns the bone index that matches [param name] as its name.
 			</description>
 		</method>
 		<method name="force_update_all_bone_transforms">
@@ -75,104 +75,104 @@
 		</method>
 		<method name="force_update_bone_child_transform">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Force updates the bone transform for the bone at [code]bone_idx[/code] and all of its children.
+				Force updates the bone transform for the bone at [param bone_idx] and all of its children.
 			</description>
 		</method>
 		<method name="get_bone_children">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Returns an array containing the bone indexes of all the children node of the passed in bone, [code]bone_idx[/code].
+				Returns an array containing the bone indexes of all the children node of the passed in bone, [param bone_idx].
 			</description>
 		</method>
 		<method name="get_bone_count" qualifiers="const">
 			<return type="int" />
 			<description>
-				Returns the amount of bones in the skeleton.
+				Returns the number of bones in the skeleton.
 			</description>
 		</method>
 		<method name="get_bone_global_pose" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
 				Returns the overall transform of the specified bone, with respect to the skeleton. Being relative to the skeleton frame, this is not the actual "global" transform of the bone.
 			</description>
 		</method>
 		<method name="get_bone_global_pose_no_override" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
 				Returns the overall transform of the specified bone, with respect to the skeleton, but without any global pose overrides. Being relative to the skeleton frame, this is not the actual "global" transform of the bone.
 			</description>
 		</method>
 		<method name="get_bone_global_pose_override" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Returns the global pose override transform for [code]bone_idx[/code].
+				Returns the global pose override transform for [param bone_idx].
 			</description>
 		</method>
 		<method name="get_bone_global_rest" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Returns the global rest transform for [code]bone_idx[/code].
+				Returns the global rest transform for [param bone_idx].
 			</description>
 		</method>
 		<method name="get_bone_local_pose_override" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Returns the local pose override transform for [code]bone_idx[/code].
+				Returns the local pose override transform for [param bone_idx].
 			</description>
 		</method>
 		<method name="get_bone_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Returns the name of the bone at index [code]index[/code].
+				Returns the name of the bone at index [param bone_idx].
 			</description>
 		</method>
 		<method name="get_bone_parent" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Returns the bone index which is the parent of the bone at [code]bone_idx[/code]. If -1, then bone has no parent.
-				[b]Note:[/b] The parent bone returned will always be less than [code]bone_idx[/code].
+				Returns the bone index which is the parent of the bone at [param bone_idx]. If -1, then bone has no parent.
+				[b]Note:[/b] The parent bone returned will always be less than [param bone_idx].
 			</description>
 		</method>
 		<method name="get_bone_pose" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
 				Returns the pose transform of the specified bone. Pose is applied on top of the custom pose, which is applied on top the rest pose.
 			</description>
 		</method>
 		<method name="get_bone_pose_position" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_bone_pose_rotation" qualifiers="const">
 			<return type="Quaternion" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_bone_pose_scale" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_bone_rest" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Returns the rest transform for a bone [code]bone_idx[/code].
+				Returns the rest transform for a bone [param bone_idx].
 			</description>
 		</method>
 		<method name="get_modification_stack">
@@ -189,8 +189,8 @@
 		</method>
 		<method name="global_pose_to_local_pose">
 			<return type="Transform3D" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="global_pose" type="Transform3D" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="global_pose" type="Transform3D" />
 			<description>
 				Takes the passed-in global pose and converts it to local pose transform.
 				This can be used to easily convert a global pose from [method get_bone_global_pose] to a global transform in [method set_bone_local_pose_override].
@@ -198,7 +198,7 @@
 		</method>
 		<method name="global_pose_to_world_transform">
 			<return type="Transform3D" />
-			<argument index="0" name="global_pose" type="Transform3D" />
+			<param index="0" name="global_pose" type="Transform3D" />
 			<description>
 				Takes the passed-in global pose and converts it to a world transform.
 				This can be used to easily convert a global pose from [method get_bone_global_pose] to a global transform usable with a node's transform, like [member Node3D.global_transform] for example.
@@ -206,26 +206,26 @@
 		</method>
 		<method name="global_pose_z_forward_to_bone_forward">
 			<return type="Basis" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="basis" type="Basis" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="basis" type="Basis" />
 			<description>
-				Rotates the given [Basis] so that the forward axis of the Basis is facing in the forward direction of the bone at [code]bone_idx[/code].
+				Rotates the given [Basis] so that the forward axis of the Basis is facing in the forward direction of the bone at [param bone_idx].
 				This is helper function to make using [method Transform3D.looking_at] easier with bone poses.
 			</description>
 		</method>
 		<method name="is_bone_enabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Returns whether the bone pose for the bone at [code]bone_idx[/code] is enabled.
+				Returns whether the bone pose for the bone at [param bone_idx] is enabled.
 			</description>
 		</method>
 		<method name="local_pose_to_global_pose">
 			<return type="Transform3D" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="local_pose" type="Transform3D" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="local_pose" type="Transform3D" />
 			<description>
-				Converts the passed-in local pose to a global pose relative to the inputted bone, [code]bone_idx[/code].
+				Converts the passed-in local pose to a global pose relative to the inputted bone, [param bone_idx].
 				This could be used to convert [method get_bone_pose] for use with the [method set_bone_global_pose_override] function.
 			</description>
 		</method>
@@ -237,7 +237,7 @@
 		</method>
 		<method name="physical_bones_add_collision_exception">
 			<return type="void" />
-			<argument index="0" name="exception" type="RID" />
+			<param index="0" name="exception" type="RID" />
 			<description>
 				Adds a collision exception to the physical bone.
 				Works just like the [RigidDynamicBody3D] node.
@@ -245,7 +245,7 @@
 		</method>
 		<method name="physical_bones_remove_collision_exception">
 			<return type="void" />
-			<argument index="0" name="exception" type="RID" />
+			<param index="0" name="exception" type="RID" />
 			<description>
 				Removes a collision exception to the physical bone.
 				Works just like the [RigidDynamicBody3D] node.
@@ -253,7 +253,7 @@
 		</method>
 		<method name="physical_bones_start_simulation">
 			<return type="void" />
-			<argument index="0" name="bones" type="StringName[]" default="[]" />
+			<param index="0" name="bones" type="StringName[]" default="[]" />
 			<description>
 				Tells the [PhysicalBone3D] nodes in the Skeleton to start simulating and reacting to the physics world.
 				Optionally, a list of bone names can be passed-in, allowing only the passed-in bones to be simulated.
@@ -267,122 +267,122 @@
 		</method>
 		<method name="register_skin">
 			<return type="SkinReference" />
-			<argument index="0" name="skin" type="Skin" />
+			<param index="0" name="skin" type="Skin" />
 			<description>
 				Binds the given Skin to the Skeleton.
 			</description>
 		</method>
 		<method name="remove_bone_child">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="child_bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="child_bone_idx" type="int" />
 			<description>
-				Removes the passed in child bone index, [code]child_bone_idx[/code], from the passed-in bone, [code]bone_idx[/code], if it exists.
+				Removes the passed in child bone index, [param child_bone_idx], from the passed-in bone, [param bone_idx], if it exists.
 				[b]Note:[/b] This does not remove the child bone, but instead it removes the connection it has to the parent bone.
 			</description>
 		</method>
 		<method name="set_bone_children">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="bone_children" type="PackedInt32Array" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="bone_children" type="PackedInt32Array" />
 			<description>
-				Sets the children for the passed in bone, [code]bone_idx[/code], to the passed-in array of bone indexes, [code]bone_children[/code].
+				Sets the children for the passed in bone, [param bone_idx], to the passed-in array of bone indexes, [param bone_children].
 			</description>
 		</method>
 		<method name="set_bone_enabled">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="enabled" type="bool" default="true" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="enabled" type="bool" default="true" />
 			<description>
-				Disables the pose for the bone at [code]bone_idx[/code] if [code]false[/code], enables the bone pose if [code]true[/code].
+				Disables the pose for the bone at [param bone_idx] if [code]false[/code], enables the bone pose if [code]true[/code].
 			</description>
 		</method>
 		<method name="set_bone_global_pose_override">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="pose" type="Transform3D" />
-			<argument index="2" name="amount" type="float" />
-			<argument index="3" name="persistent" type="bool" default="false" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="pose" type="Transform3D" />
+			<param index="2" name="amount" type="float" />
+			<param index="3" name="persistent" type="bool" default="false" />
 			<description>
-				Sets the global pose transform, [code]pose[/code], for the bone at [code]bone_idx[/code].
-				[code]amount[/code] is the interpolation strength that will be used when applying the pose, and [code]persistent[/code] determines if the applied pose will remain.
+				Sets the global pose transform, [param pose], for the bone at [param bone_idx].
+				[param amount] is the interpolation strength that will be used when applying the pose, and [param persistent] determines if the applied pose will remain.
 				[b]Note:[/b] The pose transform needs to be a global pose! Use [method world_transform_to_global_pose] to convert a world transform, like one you can get from a [Node3D], to a global pose.
 			</description>
 		</method>
 		<method name="set_bone_local_pose_override">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="pose" type="Transform3D" />
-			<argument index="2" name="amount" type="float" />
-			<argument index="3" name="persistent" type="bool" default="false" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="pose" type="Transform3D" />
+			<param index="2" name="amount" type="float" />
+			<param index="3" name="persistent" type="bool" default="false" />
 			<description>
-				Sets the local pose transform, [code]pose[/code], for the bone at [code]bone_idx[/code].
-				[code]amount[/code] is the interpolation strength that will be used when applying the pose, and [code]persistent[/code] determines if the applied pose will remain.
+				Sets the local pose transform, [param pose], for the bone at [param bone_idx].
+				[param amount] is the interpolation strength that will be used when applying the pose, and [param persistent] determines if the applied pose will remain.
 				[b]Note:[/b] The pose transform needs to be a local pose! Use [method global_pose_to_local_pose] to convert a global pose to a local pose.
 			</description>
 		</method>
 		<method name="set_bone_name">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="name" type="String" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="name" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="set_bone_parent">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="parent_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="parent_idx" type="int" />
 			<description>
-				Sets the bone index [code]parent_idx[/code] as the parent of the bone at [code]bone_idx[/code]. If -1, then bone has no parent.
-				[b]Note:[/b] [code]parent_idx[/code] must be less than [code]bone_idx[/code].
+				Sets the bone index [param parent_idx] as the parent of the bone at [param bone_idx]. If -1, then bone has no parent.
+				[b]Note:[/b] [param parent_idx] must be less than [param bone_idx].
 			</description>
 		</method>
 		<method name="set_bone_pose_position">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="position" type="Vector3" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="position" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="set_bone_pose_rotation">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="rotation" type="Quaternion" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="rotation" type="Quaternion" />
 			<description>
 			</description>
 		</method>
 		<method name="set_bone_pose_scale">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="scale" type="Vector3" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="scale" type="Vector3" />
 			<description>
 			</description>
 		</method>
 		<method name="set_bone_rest">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="rest" type="Transform3D" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="rest" type="Transform3D" />
 			<description>
-				Sets the rest transform for bone [code]bone_idx[/code].
+				Sets the rest transform for bone [param bone_idx].
 			</description>
 		</method>
 		<method name="set_modification_stack">
 			<return type="void" />
-			<argument index="0" name="modification_stack" type="SkeletonModificationStack3D" />
+			<param index="0" name="modification_stack" type="SkeletonModificationStack3D" />
 			<description>
-				Sets the modification stack for this skeleton to the passed-in modification stack, [code]modification_stack[/code].
+				Sets the modification stack for this skeleton to the passed-in modification stack, [param modification_stack].
 			</description>
 		</method>
 		<method name="unparent_bone_and_rest">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Unparents the bone at [code]bone_idx[/code] and sets its rest position to that of its parent prior to being reset.
+				Unparents the bone at [param bone_idx] and sets its rest position to that of its parent prior to being reset.
 			</description>
 		</method>
 		<method name="world_transform_to_global_pose">
 			<return type="Transform3D" />
-			<argument index="0" name="world_transform" type="Transform3D" />
+			<param index="0" name="world_transform" type="Transform3D" />
 			<description>
 				Takes the passed-in global transform and converts it to a global pose.
 				This can be used to easily convert a global transform from [member Node3D.global_transform] to a global pose usable with [method set_bone_global_pose_override], for example.
@@ -401,12 +401,12 @@
 	</members>
 	<signals>
 		<signal name="bone_enabled_changed">
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="bone_pose_changed">
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
 				This signal is emitted when one of the bones in the Skeleton3D node have changed their pose. This is used to inform nodes that rely on bone positions that one of the bones in the Skeleton3D have changed their transform/pose.
 			</description>
diff --git a/doc/classes/SkeletonIK3D.xml b/doc/classes/SkeletonIK3D.xml
index 0545469e4c..788ba3e248 100644
--- a/doc/classes/SkeletonIK3D.xml
+++ b/doc/classes/SkeletonIK3D.xml
@@ -20,7 +20,7 @@
 		</method>
 		<method name="start">
 			<return type="void" />
-			<argument index="0" name="one_time" type="bool" default="false" />
+			<param index="0" name="one_time" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/SkeletonModification2D.xml b/doc/classes/SkeletonModification2D.xml
index 8ce9bf5731..46d32aef41 100644
--- a/doc/classes/SkeletonModification2D.xml
+++ b/doc/classes/SkeletonModification2D.xml
@@ -19,26 +19,26 @@
 		</method>
 		<method name="_execute" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="delta" type="float" />
+			<param index="0" name="delta" type="float" />
 			<description>
 				Executes the given modification. This is where the modification performs whatever function it is designed to do.
 			</description>
 		</method>
 		<method name="_setup_modification" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="modification_stack" type="SkeletonModificationStack2D" />
+			<param index="0" name="modification_stack" type="SkeletonModificationStack2D" />
 			<description>
 				Called when the modification is setup. This is where the modification performs initialization.
 			</description>
 		</method>
 		<method name="clamp_angle">
 			<return type="float" />
-			<argument index="0" name="angle" type="float" />
-			<argument index="1" name="min" type="float" />
-			<argument index="2" name="max" type="float" />
-			<argument index="3" name="invert" type="bool" />
+			<param index="0" name="angle" type="float" />
+			<param index="1" name="min" type="float" />
+			<param index="2" name="max" type="float" />
+			<param index="3" name="invert" type="bool" />
 			<description>
-				Takes a angle and clamps it so it is within the passed-in [code]min[/code] and [code]max[/code] range. [code]invert[/code] will inversely clamp the angle, clamping it to the range outside of the given bounds.
+				Takes a angle and clamps it so it is within the passed-in [param min] and [param max] range. [param invert] will inversely clamp the angle, clamping it to the range outside of the given bounds.
 			</description>
 		</method>
 		<method name="get_editor_draw_gizmo" qualifiers="const">
@@ -61,14 +61,14 @@
 		</method>
 		<method name="set_editor_draw_gizmo">
 			<return type="void" />
-			<argument index="0" name="draw_gizmo" type="bool" />
+			<param index="0" name="draw_gizmo" type="bool" />
 			<description>
 				Sets whether this modification will call [method _draw_editor_gizmo] in the Godot editor to draw modification-specific gizmos.
 			</description>
 		</method>
 		<method name="set_is_setup">
 			<return type="void" />
-			<argument index="0" name="is_setup" type="bool" />
+			<param index="0" name="is_setup" type="bool" />
 			<description>
 				Manually allows you to set the setup state of the modification. This function should only rarely be used, as the [SkeletonModificationStack2D] the modification is bound to should handle setting the modification up.
 			</description>
diff --git a/doc/classes/SkeletonModification2DCCDIK.xml b/doc/classes/SkeletonModification2DCCDIK.xml
index a613787a3e..c8fee3f94d 100644
--- a/doc/classes/SkeletonModification2DCCDIK.xml
+++ b/doc/classes/SkeletonModification2DCCDIK.xml
@@ -14,114 +14,114 @@
 	<methods>
 		<method name="get_ccdik_joint_bone2d_node" qualifiers="const">
 			<return type="NodePath" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the [Bone2D] node assigned to the CCDIK joint at [code]joint_idx[/code].
+				Returns the [Bone2D] node assigned to the CCDIK joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_ccdik_joint_bone_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the index of the [Bone2D] node assigned to the CCDIK joint at [code]joint_idx[/code].
+				Returns the index of the [Bone2D] node assigned to the CCDIK joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_ccdik_joint_constraint_angle_invert" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns whether the CCDIK joint at [code]joint_idx[/code] uses an inverted joint constraint. See [method set_ccdik_joint_constraint_angle_invert] for details.
+				Returns whether the CCDIK joint at [param joint_idx] uses an inverted joint constraint. See [method set_ccdik_joint_constraint_angle_invert] for details.
 			</description>
 		</method>
 		<method name="get_ccdik_joint_constraint_angle_max" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the maximum angle constraint for the joint at [code]joint_idx[/code].
+				Returns the maximum angle constraint for the joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_ccdik_joint_constraint_angle_min" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the minimum angle constraint for the joint at [code]joint_idx[/code].
+				Returns the minimum angle constraint for the joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_ccdik_joint_enable_constraint" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns whether angle constraints on the CCDIK joint at [code]joint_idx[/code] are enabled.
+				Returns whether angle constraints on the CCDIK joint at [param joint_idx] are enabled.
 			</description>
 		</method>
 		<method name="get_ccdik_joint_rotate_from_joint" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns whether the joint at [code]joint_idx[/code] is set to rotate from the joint, [code]true[/code], or to rotate from the tip, [code]false[/code]. The default is to rotate from the tip.
+				Returns whether the joint at [param joint_idx] is set to rotate from the joint, [code]true[/code], or to rotate from the tip, [code]false[/code]. The default is to rotate from the tip.
 			</description>
 		</method>
 		<method name="set_ccdik_joint_bone2d_node">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="bone2d_nodepath" type="NodePath" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="bone2d_nodepath" type="NodePath" />
 			<description>
-				Sets the [Bone2D] node assigned to the CCDIK joint at [code]joint_idx[/code].
+				Sets the [Bone2D] node assigned to the CCDIK joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="set_ccdik_joint_bone_index">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="bone_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="bone_idx" type="int" />
 			<description>
-				Sets the bone index, [code]bone_index[/code], of the CCDIK joint at [code]joint_idx[/code]. When possible, this will also update the [code]bone2d_node[/code] of the CCDIK joint based on data provided by the linked skeleton.
+				Sets the bone index, [param bone_idx], of the CCDIK joint at [param joint_idx]. When possible, this will also update the [code]bone2d_node[/code] of the CCDIK joint based on data provided by the linked skeleton.
 			</description>
 		</method>
 		<method name="set_ccdik_joint_constraint_angle_invert">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="invert" type="bool" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="invert" type="bool" />
 			<description>
-				Sets whether the CCDIK joint at [code]joint_idx[/code] uses an inverted joint constraint.
+				Sets whether the CCDIK joint at [param joint_idx] uses an inverted joint constraint.
 				An inverted joint constraint only constraints the CCDIK joint to the angles [i]outside of[/i] the inputted minimum and maximum angles. For this reason, it is referred to as an inverted joint constraint, as it constraints the joint to the outside of the inputted values.
 			</description>
 		</method>
 		<method name="set_ccdik_joint_constraint_angle_max">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="angle_max" type="float" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="angle_max" type="float" />
 			<description>
-				Sets the maximum angle constraint for the joint at [code]joint_idx[/code].
+				Sets the maximum angle constraint for the joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="set_ccdik_joint_constraint_angle_min">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="angle_min" type="float" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="angle_min" type="float" />
 			<description>
-				Sets the minimum angle constraint for the joint at [code]joint_idx[/code].
+				Sets the minimum angle constraint for the joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="set_ccdik_joint_enable_constraint">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="enable_constraint" type="bool" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="enable_constraint" type="bool" />
 			<description>
-				Determines whether angle constraints on the CCDIK joint at [code]joint_idx[/code] are enabled. When [code]true[/code], constraints will be enabled and taken into account when solving.
+				Determines whether angle constraints on the CCDIK joint at [param joint_idx] are enabled. When [code]true[/code], constraints will be enabled and taken into account when solving.
 			</description>
 		</method>
 		<method name="set_ccdik_joint_rotate_from_joint">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="rotate_from_joint" type="bool" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="rotate_from_joint" type="bool" />
 			<description>
-				Sets whether the joint at [code]joint_idx[/code] is set to rotate from the joint, [code]true[/code], or to rotate from the tip, [code]false[/code].
+				Sets whether the joint at [param joint_idx] is set to rotate from the joint, [code]true[/code], or to rotate from the tip, [code]false[/code].
 			</description>
 		</method>
 	</methods>
 	<members>
 		<member name="ccdik_data_chain_length" type="int" setter="set_ccdik_data_chain_length" getter="get_ccdik_data_chain_length" default="0">
-			The amount of CCDIK joints in the CCDIK modification.
+			The number of CCDIK joints in the CCDIK modification.
 		</member>
 		<member name="target_nodepath" type="NodePath" setter="set_target_node" getter="get_target_node" default="NodePath(&quot;&quot;)">
 			The NodePath to the node that is the target for the CCDIK modification. This node is what the CCDIK chain will attempt to rotate the bone chain to.
diff --git a/doc/classes/SkeletonModification2DFABRIK.xml b/doc/classes/SkeletonModification2DFABRIK.xml
index 883d4aa04b..ff3a65fe1a 100644
--- a/doc/classes/SkeletonModification2DFABRIK.xml
+++ b/doc/classes/SkeletonModification2DFABRIK.xml
@@ -15,69 +15,69 @@
 	<methods>
 		<method name="get_fabrik_joint_bone2d_node" qualifiers="const">
 			<return type="NodePath" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the [Bone2D] node assigned to the FABRIK joint at [code]joint_idx[/code].
+				Returns the [Bone2D] node assigned to the FABRIK joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_fabrik_joint_bone_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the index of the [Bone2D] node assigned to the FABRIK joint at [code]joint_idx[/code].
+				Returns the index of the [Bone2D] node assigned to the FABRIK joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_fabrik_joint_magnet_position" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the magnet position vector for the joint at [code]joint_idx[/code].
+				Returns the magnet position vector for the joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_fabrik_joint_use_target_rotation" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
 				Returns whether the joint is using the target's rotation rather than allowing FABRIK to rotate the joint. This option only applies to the tip/final joint in the chain.
 			</description>
 		</method>
 		<method name="set_fabrik_joint_bone2d_node">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="bone2d_nodepath" type="NodePath" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="bone2d_nodepath" type="NodePath" />
 			<description>
-				Sets the [Bone2D] node assigned to the FABRIK joint at [code]joint_idx[/code].
+				Sets the [Bone2D] node assigned to the FABRIK joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="set_fabrik_joint_bone_index">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="bone_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="bone_idx" type="int" />
 			<description>
-				Sets the bone index, [code]bone_index[/code], of the FABRIK joint at [code]joint_idx[/code]. When possible, this will also update the [code]bone2d_node[/code] of the FABRIK joint based on data provided by the linked skeleton.
+				Sets the bone index, [param bone_idx], of the FABRIK joint at [param joint_idx]. When possible, this will also update the [code]bone2d_node[/code] of the FABRIK joint based on data provided by the linked skeleton.
 			</description>
 		</method>
 		<method name="set_fabrik_joint_magnet_position">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="magnet_position" type="Vector2" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="magnet_position" type="Vector2" />
 			<description>
-				Sets the magnet position vector for the joint at [code]joint_idx[/code].
+				Sets the magnet position vector for the joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="set_fabrik_joint_use_target_rotation">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="use_target_rotation" type="bool" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="use_target_rotation" type="bool" />
 			<description>
-				Sets whether the joint at [code]joint_idx[/code] will use the target node's rotation rather than letting FABRIK rotate the node.
+				Sets whether the joint at [param joint_idx] will use the target node's rotation rather than letting FABRIK rotate the node.
 				[b]Note:[/b] This option only works for the tip/final joint in the chain. For all other nodes, this option will be ignored.
 			</description>
 		</method>
 	</methods>
 	<members>
 		<member name="fabrik_data_chain_length" type="int" setter="set_fabrik_data_chain_length" getter="get_fabrik_data_chain_length" default="0">
-			The amount of FABRIK joints in the FABRIK modification.
+			The number of FABRIK joints in the FABRIK modification.
 		</member>
 		<member name="target_nodepath" type="NodePath" setter="set_target_node" getter="get_target_node" default="NodePath(&quot;&quot;)">
 			The NodePath to the node that is the target for the FABRIK modification. This node is what the FABRIK chain will attempt to rotate the bone chain to.
diff --git a/doc/classes/SkeletonModification2DJiggle.xml b/doc/classes/SkeletonModification2DJiggle.xml
index 9948239eb8..7329b2d865 100644
--- a/doc/classes/SkeletonModification2DJiggle.xml
+++ b/doc/classes/SkeletonModification2DJiggle.xml
@@ -19,58 +19,58 @@
 		</method>
 		<method name="get_jiggle_joint_bone2d_node" qualifiers="const">
 			<return type="NodePath" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the [Bone2D] node assigned to the Jiggle joint at [code]joint_idx[/code].
+				Returns the [Bone2D] node assigned to the Jiggle joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_jiggle_joint_bone_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the index of the [Bone2D] node assigned to the Jiggle joint at [code]joint_idx[/code].
+				Returns the index of the [Bone2D] node assigned to the Jiggle joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_jiggle_joint_damping" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the amount of damping of the Jiggle joint at [code]joint_idx[/code].
+				Returns the amount of damping of the Jiggle joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_jiggle_joint_gravity" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns a [Vector2] representing the amount of gravity the Jiggle joint at [code]joint_idx[/code] is influenced by.
+				Returns a [Vector2] representing the amount of gravity the Jiggle joint at [param joint_idx] is influenced by.
 			</description>
 		</method>
 		<method name="get_jiggle_joint_mass" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the amount of mass of the jiggle joint at [code]joint_idx[/code].
+				Returns the amount of mass of the jiggle joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_jiggle_joint_override" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns a boolean that indicates whether the joint at [code]joint_idx[/code] is overriding the default Jiggle joint data defined in the modification.
+				Returns a boolean that indicates whether the joint at [param joint_idx] is overriding the default Jiggle joint data defined in the modification.
 			</description>
 		</method>
 		<method name="get_jiggle_joint_stiffness" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the stiffness of the Jiggle joint at [code]joint_idx[/code].
+				Returns the stiffness of the Jiggle joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_jiggle_joint_use_gravity" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns a boolean that indicates whether the joint at [code]joint_idx[/code] is using gravity or not.
+				Returns a boolean that indicates whether the joint at [param joint_idx] is using gravity or not.
 			</description>
 		</method>
 		<method name="get_use_colliders" qualifiers="const">
@@ -81,78 +81,78 @@
 		</method>
 		<method name="set_collision_mask">
 			<return type="void" />
-			<argument index="0" name="collision_mask" type="int" />
+			<param index="0" name="collision_mask" type="int" />
 			<description>
 				Sets the collision mask that the Jiggle modifier will use when reacting to colliders, if the Jiggle modifier is set to take colliders into account.
 			</description>
 		</method>
 		<method name="set_jiggle_joint_bone2d_node">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="bone2d_node" type="NodePath" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="bone2d_node" type="NodePath" />
 			<description>
-				Sets the [Bone2D] node assigned to the Jiggle joint at [code]joint_idx[/code].
+				Sets the [Bone2D] node assigned to the Jiggle joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="set_jiggle_joint_bone_index">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="bone_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="bone_idx" type="int" />
 			<description>
-				Sets the bone index, [code]bone_index[/code], of the Jiggle joint at [code]joint_idx[/code]. When possible, this will also update the [code]bone2d_node[/code] of the Jiggle joint based on data provided by the linked skeleton.
+				Sets the bone index, [param bone_idx], of the Jiggle joint at [param joint_idx]. When possible, this will also update the [code]bone2d_node[/code] of the Jiggle joint based on data provided by the linked skeleton.
 			</description>
 		</method>
 		<method name="set_jiggle_joint_damping">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="damping" type="float" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="damping" type="float" />
 			<description>
-				Sets the amount of dampening of the Jiggle joint at [code]joint_idx[/code].
+				Sets the amount of dampening of the Jiggle joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="set_jiggle_joint_gravity">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="gravity" type="Vector2" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="gravity" type="Vector2" />
 			<description>
-				Sets the gravity vector of the Jiggle joint at [code]joint_idx[/code].
+				Sets the gravity vector of the Jiggle joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="set_jiggle_joint_mass">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="mass" type="float" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="mass" type="float" />
 			<description>
-				Sets the of mass of the Jiggle joint at [code]joint_idx[/code].
+				Sets the of mass of the Jiggle joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="set_jiggle_joint_override">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="override" type="bool" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="override" type="bool" />
 			<description>
-				Sets whether the Jiggle joint at [code]joint_idx[/code] should override the default Jiggle joint settings. Setting this to [code]true[/code] will make the joint use its own settings rather than the default ones attached to the modification.
+				Sets whether the Jiggle joint at [param joint_idx] should override the default Jiggle joint settings. Setting this to [code]true[/code] will make the joint use its own settings rather than the default ones attached to the modification.
 			</description>
 		</method>
 		<method name="set_jiggle_joint_stiffness">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="stiffness" type="float" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="stiffness" type="float" />
 			<description>
-				Sets the of stiffness of the Jiggle joint at [code]joint_idx[/code].
+				Sets the of stiffness of the Jiggle joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="set_jiggle_joint_use_gravity">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="use_gravity" type="bool" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="use_gravity" type="bool" />
 			<description>
-				Sets whether the Jiggle joint at [code]joint_idx[/code] should use gravity.
+				Sets whether the Jiggle joint at [param joint_idx] should use gravity.
 			</description>
 		</method>
 		<method name="set_use_colliders">
 			<return type="void" />
-			<argument index="0" name="use_colliders" type="bool" />
+			<param index="0" name="use_colliders" type="bool" />
 			<description>
 				If [code]true[/code], the Jiggle modifier will take colliders into account, keeping them from entering into these collision objects.
 			</description>
diff --git a/doc/classes/SkeletonModification2DLookAt.xml b/doc/classes/SkeletonModification2DLookAt.xml
index 802801fbef..4747b06056 100644
--- a/doc/classes/SkeletonModification2DLookAt.xml
+++ b/doc/classes/SkeletonModification2DLookAt.xml
@@ -41,14 +41,14 @@
 		</method>
 		<method name="set_additional_rotation">
 			<return type="void" />
-			<argument index="0" name="rotation" type="float" />
+			<param index="0" name="rotation" type="float" />
 			<description>
 				Sets the amount of additional rotation that is to be applied after executing the modification. This allows for offsetting the results by the inputted rotation amount.
 			</description>
 		</method>
 		<method name="set_constraint_angle_invert">
 			<return type="void" />
-			<argument index="0" name="invert" type="bool" />
+			<param index="0" name="invert" type="bool" />
 			<description>
 				When [code]true[/code], the modification will use an inverted joint constraint.
 				An inverted joint constraint only constraints the [Bone2D] to the angles [i]outside of[/i] the inputted minimum and maximum angles. For this reason, it is referred to as an inverted joint constraint, as it constraints the joint to the outside of the inputted values.
@@ -56,21 +56,21 @@
 		</method>
 		<method name="set_constraint_angle_max">
 			<return type="void" />
-			<argument index="0" name="angle_max" type="float" />
+			<param index="0" name="angle_max" type="float" />
 			<description>
 				Sets the constraint's maximum allowed angle.
 			</description>
 		</method>
 		<method name="set_constraint_angle_min">
 			<return type="void" />
-			<argument index="0" name="angle_min" type="float" />
+			<param index="0" name="angle_min" type="float" />
 			<description>
 				Sets the constraint's minimum allowed angle.
 			</description>
 		</method>
 		<method name="set_enable_constraint">
 			<return type="void" />
-			<argument index="0" name="enable_constraint" type="bool" />
+			<param index="0" name="enable_constraint" type="bool" />
 			<description>
 				Sets whether this modification will use constraints or not. When [code]true[/code], constraints will be applied when solving the LookAt modification.
 			</description>
diff --git a/doc/classes/SkeletonModification2DPhysicalBones.xml b/doc/classes/SkeletonModification2DPhysicalBones.xml
index 9fb7b6d215..d5f46b2ea0 100644
--- a/doc/classes/SkeletonModification2DPhysicalBones.xml
+++ b/doc/classes/SkeletonModification2DPhysicalBones.xml
@@ -17,23 +17,23 @@
 		</method>
 		<method name="get_physical_bone_node" qualifiers="const">
 			<return type="NodePath" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the [PhysicalBone2D] node at [code]joint_idx[/code].
+				Returns the [PhysicalBone2D] node at [param joint_idx].
 			</description>
 		</method>
 		<method name="set_physical_bone_node">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="physicalbone2d_node" type="NodePath" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="physicalbone2d_node" type="NodePath" />
 			<description>
-				Sets the [PhysicalBone2D] node at [code]joint_idx[/code].
+				Sets the [PhysicalBone2D] node at [param joint_idx].
 				[b]Note:[/b] This is just the index used for this modification, not the bone index used in the [Skeleton2D].
 			</description>
 		</method>
 		<method name="start_simulation">
 			<return type="void" />
-			<argument index="0" name="bones" type="StringName[]" default="[]" />
+			<param index="0" name="bones" type="StringName[]" default="[]" />
 			<description>
 				Tell the [PhysicalBone2D] nodes to start simulating and interacting with the physics world.
 				Optionally, an array of bone names can be passed to this function, and that will cause only [PhysicalBone2D] nodes with those names to start simulating.
@@ -41,7 +41,7 @@
 		</method>
 		<method name="stop_simulation">
 			<return type="void" />
-			<argument index="0" name="bones" type="StringName[]" default="[]" />
+			<param index="0" name="bones" type="StringName[]" default="[]" />
 			<description>
 				Tell the [PhysicalBone2D] nodes to stop simulating and interacting with the physics world.
 				Optionally, an array of bone names can be passed to this function, and that will cause only [PhysicalBone2D] nodes with those names to stop simulating.
@@ -50,7 +50,7 @@
 	</methods>
 	<members>
 		<member name="physical_bone_chain_length" type="int" setter="set_physical_bone_chain_length" getter="get_physical_bone_chain_length" default="0">
-			The amount of [PhysicalBone2D] nodes linked in this modification.
+			The number of [PhysicalBone2D] nodes linked in this modification.
 		</member>
 	</members>
 </class>
diff --git a/doc/classes/SkeletonModification2DStackHolder.xml b/doc/classes/SkeletonModification2DStackHolder.xml
index f66f88d6b5..791dea2fb1 100644
--- a/doc/classes/SkeletonModification2DStackHolder.xml
+++ b/doc/classes/SkeletonModification2DStackHolder.xml
@@ -18,7 +18,7 @@
 		</method>
 		<method name="set_held_modification_stack">
 			<return type="void" />
-			<argument index="0" name="held_modification_stack" type="SkeletonModificationStack2D" />
+			<param index="0" name="held_modification_stack" type="SkeletonModificationStack2D" />
 			<description>
 				Sets the [SkeletonModificationStack2D] that this modification is holding. This modification stack will then be executed when this modification is executed.
 			</description>
diff --git a/doc/classes/SkeletonModification2DTwoBoneIK.xml b/doc/classes/SkeletonModification2DTwoBoneIK.xml
index 956e94dce8..edd5431a0c 100644
--- a/doc/classes/SkeletonModification2DTwoBoneIK.xml
+++ b/doc/classes/SkeletonModification2DTwoBoneIK.xml
@@ -36,28 +36,28 @@
 		</method>
 		<method name="set_joint_one_bone2d_node">
 			<return type="void" />
-			<argument index="0" name="bone2d_node" type="NodePath" />
+			<param index="0" name="bone2d_node" type="NodePath" />
 			<description>
 				Sets the [Bone2D] node that is being used as the first bone in the TwoBoneIK modification.
 			</description>
 		</method>
 		<method name="set_joint_one_bone_idx">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
 				Sets the index of the [Bone2D] node that is being used as the first bone in the TwoBoneIK modification.
 			</description>
 		</method>
 		<method name="set_joint_two_bone2d_node">
 			<return type="void" />
-			<argument index="0" name="bone2d_node" type="NodePath" />
+			<param index="0" name="bone2d_node" type="NodePath" />
 			<description>
 				Sets the [Bone2D] node that is being used as the second bone in the TwoBoneIK modification.
 			</description>
 		</method>
 		<method name="set_joint_two_bone_idx">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
 				Sets the index of the [Bone2D] node that is being used as the second bone in the TwoBoneIK modification.
 			</description>
diff --git a/doc/classes/SkeletonModification3D.xml b/doc/classes/SkeletonModification3D.xml
index b21c9a2be9..8457179651 100644
--- a/doc/classes/SkeletonModification3D.xml
+++ b/doc/classes/SkeletonModification3D.xml
@@ -12,14 +12,14 @@
 	<methods>
 		<method name="_execute" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="delta" type="float" />
+			<param index="0" name="delta" type="float" />
 			<description>
 				Executes the given modification. This is where the modification performs whatever function it is designed to do.
 			</description>
 		</method>
 		<method name="_setup_modification" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="modification_stack" type="SkeletonModificationStack3D" />
+			<param index="0" name="modification_stack" type="SkeletonModificationStack3D" />
 			<description>
 				Sets up the modification so it can be executed. This function should be called automatically by the [SkeletonModificationStack3D] containing this modification.
 				If you need to initialize a modification before use, this is the place to do it!
@@ -27,12 +27,12 @@
 		</method>
 		<method name="clamp_angle">
 			<return type="float" />
-			<argument index="0" name="angle" type="float" />
-			<argument index="1" name="min" type="float" />
-			<argument index="2" name="max" type="float" />
-			<argument index="3" name="invert" type="bool" />
+			<param index="0" name="angle" type="float" />
+			<param index="1" name="min" type="float" />
+			<param index="2" name="max" type="float" />
+			<param index="3" name="invert" type="bool" />
 			<description>
-				Takes a angle and clamps it so it is within the passed-in [code]min[/code] and [code]max[/code] range. [code]invert[/code] will inversely clamp the angle, clamping it to the range outside of the given bounds.
+				Takes a angle and clamps it so it is within the passed-in [param min] and [param max] range. [param invert] will inversely clamp the angle, clamping it to the range outside of the given bounds.
 			</description>
 		</method>
 		<method name="get_is_setup" qualifiers="const">
@@ -49,7 +49,7 @@
 		</method>
 		<method name="set_is_setup">
 			<return type="void" />
-			<argument index="0" name="is_setup" type="bool" />
+			<param index="0" name="is_setup" type="bool" />
 			<description>
 				Manually allows you to set the setup state of the modification. This function should only rarely be used, as the [SkeletonModificationStack3D] the modification is bound to should handle setting the modification up.
 			</description>
diff --git a/doc/classes/SkeletonModification3DCCDIK.xml b/doc/classes/SkeletonModification3DCCDIK.xml
index 6f5409ed4d..dec0fbe99f 100644
--- a/doc/classes/SkeletonModification3DCCDIK.xml
+++ b/doc/classes/SkeletonModification3DCCDIK.xml
@@ -14,114 +14,114 @@
 	<methods>
 		<method name="get_ccdik_joint_bone_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the bone index of the bone assigned to the CCDIK joint at [code]joint_idx[/code].
+				Returns the bone index of the bone assigned to the CCDIK joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_ccdik_joint_bone_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the name of the bone that is assigned to the CCDIK joint at [code]joint_idx[/code].
+				Returns the name of the bone that is assigned to the CCDIK joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_ccdik_joint_ccdik_axis" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the integer representing the joint axis of the CCDIK joint at [code]joint_idx[/code].
+				Returns the integer representing the joint axis of the CCDIK joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_ccdik_joint_constraint_angle_max" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the maximum angle constraint for the joint at [code]joint_idx[/code]. [b]Note:[/b] This angle is in degrees!
+				Returns the maximum angle constraint for the joint at [param joint_idx]. [b]Note:[/b] This angle is in degrees!
 			</description>
 		</method>
 		<method name="get_ccdik_joint_constraint_angle_min" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the minimum angle constraint for the joint at [code]joint_idx[/code]. [b]Note:[/b] This angle is in degrees!
+				Returns the minimum angle constraint for the joint at [param joint_idx]. [b]Note:[/b] This angle is in degrees!
 			</description>
 		</method>
 		<method name="get_ccdik_joint_constraint_invert" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns whether the CCDIK joint at [code]joint_idx[/code] uses an inverted joint constraint. See [method set_ccdik_joint_constraint_invert] for details.
+				Returns whether the CCDIK joint at [param joint_idx] uses an inverted joint constraint. See [method set_ccdik_joint_constraint_invert] for details.
 			</description>
 		</method>
 		<method name="get_ccdik_joint_enable_joint_constraint" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Enables angle constraints to the CCDIK joint at [code]joint_idx[/code].
+				Enables angle constraints to the CCDIK joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="set_ccdik_joint_bone_index">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="bone_index" type="int" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="bone_index" type="int" />
 			<description>
-				Sets the bone index, [code]bone_index[/code], of the CCDIK joint at [code]joint_idx[/code]. When possible, this will also update the [code]bone_name[/code] of the CCDIK joint based on data provided by the linked skeleton.
+				Sets the bone index, [param bone_index], of the CCDIK joint at [param joint_idx]. When possible, this will also update the [code]bone_name[/code] of the CCDIK joint based on data provided by the linked skeleton.
 			</description>
 		</method>
 		<method name="set_ccdik_joint_bone_name">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="bone_name" type="String" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="bone_name" type="String" />
 			<description>
-				Sets the bone name, [code]bone_name[/code], of the CCDIK joint at [code]joint_idx[/code]. When possible, this will also update the [code]bone_index[/code] of the CCDIK joint based on data provided by the linked skeleton.
+				Sets the bone name, [param bone_name], of the CCDIK joint at [param joint_idx]. When possible, this will also update the [code]bone_index[/code] of the CCDIK joint based on data provided by the linked skeleton.
 			</description>
 		</method>
 		<method name="set_ccdik_joint_ccdik_axis">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="axis" type="int" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="axis" type="int" />
 			<description>
-				Sets the joint axis of the CCDIK joint at [code]joint_idx[/code] to the passed-in joint axis, [code]axis[/code].
+				Sets the joint axis of the CCDIK joint at [param joint_idx] to the passed-in joint axis, [param axis].
 			</description>
 		</method>
 		<method name="set_ccdik_joint_constraint_angle_max">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="max_angle" type="float" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="max_angle" type="float" />
 			<description>
-				Sets the maximum angle constraint for the joint at [code]joint_idx[/code]. [b]Note:[/b] This angle must be in radians!
+				Sets the maximum angle constraint for the joint at [param joint_idx]. [b]Note:[/b] This angle must be in radians!
 			</description>
 		</method>
 		<method name="set_ccdik_joint_constraint_angle_min">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="min_angle" type="float" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="min_angle" type="float" />
 			<description>
-				Sets the minimum angle constraint for the joint at [code]joint_idx[/code]. [b]Note:[/b] This angle must be in radians!
+				Sets the minimum angle constraint for the joint at [param joint_idx]. [b]Note:[/b] This angle must be in radians!
 			</description>
 		</method>
 		<method name="set_ccdik_joint_constraint_invert">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="invert" type="bool" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="invert" type="bool" />
 			<description>
-				Sets whether the CCDIK joint at [code]joint_idx[/code] uses an inverted joint constraint.
+				Sets whether the CCDIK joint at [param joint_idx] uses an inverted joint constraint.
 				An inverted joint constraint only constraints the CCDIK joint to the angles [i]outside of[/i] the inputted minimum and maximum angles. For this reason, it is referred to as an inverted joint constraint, as it constraints the joint to the outside of the inputted values.
 			</description>
 		</method>
 		<method name="set_ccdik_joint_enable_joint_constraint">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="enable" type="bool" />
 			<description>
-				Sets whether joint constraints are enabled for the CCDIK joint at [code]joint_idx[/code].
+				Sets whether joint constraints are enabled for the CCDIK joint at [param joint_idx].
 			</description>
 		</method>
 	</methods>
 	<members>
 		<member name="ccdik_data_chain_length" type="int" setter="set_ccdik_data_chain_length" getter="get_ccdik_data_chain_length" default="0">
-			The amount of CCDIK joints in the CCDIK modification.
+			The number of CCDIK joints in the CCDIK modification.
 		</member>
 		<member name="high_quality_solve" type="bool" setter="set_use_high_quality_solve" getter="get_use_high_quality_solve" default="true">
 			When true, the CCDIK algorithm will perform a higher quality solve that returns more natural results. A high quality solve requires more computation power to solve though, and therefore can be disabled to save performance.
diff --git a/doc/classes/SkeletonModification3DFABRIK.xml b/doc/classes/SkeletonModification3DFABRIK.xml
index 41f78fab41..325cc2a12e 100644
--- a/doc/classes/SkeletonModification3DFABRIK.xml
+++ b/doc/classes/SkeletonModification3DFABRIK.xml
@@ -15,56 +15,56 @@
 	<methods>
 		<method name="fabrik_joint_auto_calculate_length">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Will attempt to automatically calculate the length of the bone assigned to the FABRIK joint at [code]joint_idx[/code].
+				Will attempt to automatically calculate the length of the bone assigned to the FABRIK joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_fabrik_joint_auto_calculate_length" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns a boolean that indicates whether this modification will attempt to autocalculate the length of the bone assigned to the FABRIK joint at [code]joint_idx[/code].
+				Returns a boolean that indicates whether this modification will attempt to autocalculate the length of the bone assigned to the FABRIK joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_fabrik_joint_bone_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the bone index of the bone assigned to the FABRIK joint at [code]joint_idx[/code].
+				Returns the bone index of the bone assigned to the FABRIK joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_fabrik_joint_bone_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the name of the bone that is assigned to the FABRIK joint at [code]joint_idx[/code].
+				Returns the name of the bone that is assigned to the FABRIK joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_fabrik_joint_length" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the length of the FABRIK joint at [code]joint_idx[/code].
+				Returns the length of the FABRIK joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_fabrik_joint_magnet" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the magnet vector of the FABRIK joint at [code]joint_idx[/code].
+				Returns the magnet vector of the FABRIK joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_fabrik_joint_tip_node" qualifiers="const">
 			<return type="NodePath" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the [Node3D]-based node placed at the tip of the FABRIK joint at [code]joint_idx[/code], if one has been set.
+				Returns the [Node3D]-based node placed at the tip of the FABRIK joint at [param joint_idx], if one has been set.
 			</description>
 		</method>
 		<method name="get_fabrik_joint_use_target_basis" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
 				Returns a boolean indicating whether the FABRIK joint uses the target's [Basis] for its rotation.
 				[b]Note:[/b] This option is only available for the final bone in the FABRIK chain, with this setting being ignored for all other bones.
@@ -72,75 +72,75 @@
 		</method>
 		<method name="get_fabrik_joint_use_tip_node" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Sets the [Node3D]-based node that will be used as the tip of the FABRIK joint at [code]joint_idx[/code].
+				Sets the [Node3D]-based node that will be used as the tip of the FABRIK joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="set_fabrik_joint_auto_calculate_length">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="auto_calculate_length" type="bool" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="auto_calculate_length" type="bool" />
 			<description>
-				When [code]true[/code], this modification will attempt to automatically calculate the length of the bone for the FABRIK joint at [code]joint_idx[/code]. It does this by either using the tip node assigned, if there is one assigned, or the distance the of the bone's children, if the bone has any. If the bone has no children and no tip node is assigned, then the modification [b]cannot[/b] autocalculate the joint's length. In this case, the joint length should be entered manually or a tip node assigned.
+				When [code]true[/code], this modification will attempt to automatically calculate the length of the bone for the FABRIK joint at [param joint_idx]. It does this by either using the tip node assigned, if there is one assigned, or the distance the of the bone's children, if the bone has any. If the bone has no children and no tip node is assigned, then the modification [b]cannot[/b] autocalculate the joint's length. In this case, the joint length should be entered manually or a tip node assigned.
 			</description>
 		</method>
 		<method name="set_fabrik_joint_bone_index">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="bone_index" type="int" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="bone_index" type="int" />
 			<description>
-				Sets the bone index, [code]bone_index[/code], of the FABRIK joint at [code]joint_idx[/code]. When possible, this will also update the [code]bone_name[/code] of the FABRIK joint based on data provided by the [Skeleton3D].
+				Sets the bone index, [param bone_index], of the FABRIK joint at [param joint_idx]. When possible, this will also update the [code]bone_name[/code] of the FABRIK joint based on data provided by the [Skeleton3D].
 			</description>
 		</method>
 		<method name="set_fabrik_joint_bone_name">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="bone_name" type="String" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="bone_name" type="String" />
 			<description>
-				Sets the bone name, [code]bone_name[/code], of the FABRIK joint at [code]joint_idx[/code]. When possible, this will also update the [code]bone_index[/code] of the FABRIK joint based on data provided by the [Skeleton3D].
+				Sets the bone name, [param bone_name], of the FABRIK joint at [param joint_idx]. When possible, this will also update the [code]bone_index[/code] of the FABRIK joint based on data provided by the [Skeleton3D].
 			</description>
 		</method>
 		<method name="set_fabrik_joint_length">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="length" type="float" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="length" type="float" />
 			<description>
-				Sets the joint length, [code]length[/code], of the FABRIK joint at [code]joint_idx[/code].
+				Sets the joint length, [param length], of the FABRIK joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="set_fabrik_joint_magnet">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="magnet_position" type="Vector3" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="magnet_position" type="Vector3" />
 			<description>
-				Sets the magenet position to [code]magnet_position[/code] for the joint at [code]joint_idx[/code]. The magnet position is used to nudge the joint in that direction when solving, which gives some control over how that joint will bend when being solved.
+				Sets the magenet position to [param magnet_position] for the joint at [param joint_idx]. The magnet position is used to nudge the joint in that direction when solving, which gives some control over how that joint will bend when being solved.
 			</description>
 		</method>
 		<method name="set_fabrik_joint_tip_node">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="tip_node" type="NodePath" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="tip_node" type="NodePath" />
 			<description>
-				Sets the nodepath of the FARIK joint at [code]joint_idx[/code] to [code]tip_node[/code]. The tip node is used to calculate the length of the FABRIK joint when set to automatically calculate joint length.
+				Sets the nodepath of the FARIK joint at [param joint_idx] to [param tip_node]. The tip node is used to calculate the length of the FABRIK joint when set to automatically calculate joint length.
 				[b]Note:[/b] The tip node should generally be a child node of a [BoneAttachment3D] node attached to the bone that this FABRIK joint operates on, with the child node being offset so it is at the end of the bone.
 			</description>
 		</method>
 		<method name="set_fabrik_joint_use_target_basis">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="use_target_basis" type="bool" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="use_target_basis" type="bool" />
 			<description>
-				Sets whether the FABRIK joint at [code]joint_idx[/code] uses the target's [Basis] for its rotation.
+				Sets whether the FABRIK joint at [param joint_idx] uses the target's [Basis] for its rotation.
 				[b]Note:[/b] This option is only available for the final bone in the FABRIK chain, with this setting being ignored for all other bones.
 			</description>
 		</method>
 		<method name="set_fabrik_joint_use_tip_node">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="use_tip_node" type="bool" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="use_tip_node" type="bool" />
 			<description>
-				Sets whether the tip node should be used when autocalculating the joint length for the FABRIK joint at [code]joint_idx[/code]. This will only work if there is a node assigned to the tip nodepath for this joint.
+				Sets whether the tip node should be used when autocalculating the joint length for the FABRIK joint at [param joint_idx]. This will only work if there is a node assigned to the tip nodepath for this joint.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/SkeletonModification3DJiggle.xml b/doc/classes/SkeletonModification3DJiggle.xml
index 697de4a580..ef469d42ea 100644
--- a/doc/classes/SkeletonModification3DJiggle.xml
+++ b/doc/classes/SkeletonModification3DJiggle.xml
@@ -19,65 +19,65 @@
 		</method>
 		<method name="get_jiggle_joint_bone_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the bone index of the bone assigned to the Jiggle joint at [code]joint_idx[/code].
+				Returns the bone index of the bone assigned to the Jiggle joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_jiggle_joint_bone_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the name of the bone that is assigned to the Jiggle joint at [code]joint_idx[/code].
+				Returns the name of the bone that is assigned to the Jiggle joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_jiggle_joint_damping" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the amount of dampening of the Jiggle joint at [code]joint_idx[/code].
+				Returns the amount of dampening of the Jiggle joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_jiggle_joint_gravity" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns a [Vector3] representign the amount of gravity the Jiggle joint at [code]joint_idx[/code] is influenced by.
+				Returns a [Vector3] representign the amount of gravity the Jiggle joint at [param joint_idx] is influenced by.
 			</description>
 		</method>
 		<method name="get_jiggle_joint_mass" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the amount of mass of the Jiggle joint at [code]joint_idx[/code].
+				Returns the amount of mass of the Jiggle joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_jiggle_joint_override" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns a boolean that indicates whether the joint at [code]joint_idx[/code] is overriding the default jiggle joint data defined in the modification.
+				Returns a boolean that indicates whether the joint at [param joint_idx] is overriding the default jiggle joint data defined in the modification.
 			</description>
 		</method>
 		<method name="get_jiggle_joint_roll" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
 				Returns the amount of roll/twist applied to the bone that the Jiggle joint is applied to.
 			</description>
 		</method>
 		<method name="get_jiggle_joint_stiffness" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns the stiffness of the Jiggle joint at [code]joint_idx[/code].
+				Returns the stiffness of the Jiggle joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="get_jiggle_joint_use_gravity" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="joint_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
 			<description>
-				Returns a boolean that indicates whether the joint at [code]joint_idx[/code] is using gravity or not.
+				Returns a boolean that indicates whether the joint at [param joint_idx] is using gravity or not.
 			</description>
 		</method>
 		<method name="get_use_colliders" qualifiers="const">
@@ -88,86 +88,86 @@
 		</method>
 		<method name="set_collision_mask">
 			<return type="void" />
-			<argument index="0" name="mask" type="int" />
+			<param index="0" name="mask" type="int" />
 			<description>
 				Sets the collision mask that the Jiggle modifier takes into account when performing physics calculations.
 			</description>
 		</method>
 		<method name="set_jiggle_joint_bone_index">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="bone_idx" type="int" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="bone_idx" type="int" />
 			<description>
-				Sets the bone index, [code]bone_index[/code], of the Jiggle joint at [code]joint_idx[/code]. When possible, this will also update the [code]bone_name[/code] of the Jiggle joint based on data provided by the [Skeleton3D].
+				Sets the bone index, [param bone_idx], of the Jiggle joint at [param joint_idx]. When possible, this will also update the [code]bone_name[/code] of the Jiggle joint based on data provided by the [Skeleton3D].
 			</description>
 		</method>
 		<method name="set_jiggle_joint_bone_name">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="name" type="String" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="name" type="String" />
 			<description>
-				Sets the bone name, [code]bone_name[/code], of the Jiggle joint at [code]joint_idx[/code]. When possible, this will also update the [code]bone_index[/code] of the Jiggle joint based on data provided by the [Skeleton3D].
+				Sets the bone name, [param name], of the Jiggle joint at [param joint_idx]. When possible, this will also update the [code]bone_index[/code] of the Jiggle joint based on data provided by the [Skeleton3D].
 			</description>
 		</method>
 		<method name="set_jiggle_joint_damping">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="damping" type="float" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="damping" type="float" />
 			<description>
-				Sets the amount of dampening of the Jiggle joint at [code]joint_idx[/code].
+				Sets the amount of dampening of the Jiggle joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="set_jiggle_joint_gravity">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="gravity" type="Vector3" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="gravity" type="Vector3" />
 			<description>
-				Sets the gravity vector of the Jiggle joint at [code]joint_idx[/code].
+				Sets the gravity vector of the Jiggle joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="set_jiggle_joint_mass">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="mass" type="float" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="mass" type="float" />
 			<description>
-				Sets the of mass of the Jiggle joint at [code]joint_idx[/code].
+				Sets the of mass of the Jiggle joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="set_jiggle_joint_override">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="override" type="bool" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="override" type="bool" />
 			<description>
-				Sets whether the Jiggle joint at [code]joint_idx[/code] should override the default Jiggle joint settings. Setting this to true will make the joint use its own settings rather than the default ones attached to the modification.
+				Sets whether the Jiggle joint at [param joint_idx] should override the default Jiggle joint settings. Setting this to true will make the joint use its own settings rather than the default ones attached to the modification.
 			</description>
 		</method>
 		<method name="set_jiggle_joint_roll">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="roll" type="float" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="roll" type="float" />
 			<description>
 				Sets the amount of roll/twist on the bone the Jiggle joint is attached to.
 			</description>
 		</method>
 		<method name="set_jiggle_joint_stiffness">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="stiffness" type="float" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="stiffness" type="float" />
 			<description>
-				Sets the of stiffness of the Jiggle joint at [code]joint_idx[/code].
+				Sets the of stiffness of the Jiggle joint at [param joint_idx].
 			</description>
 		</method>
 		<method name="set_jiggle_joint_use_gravity">
 			<return type="void" />
-			<argument index="0" name="joint_idx" type="int" />
-			<argument index="1" name="use_gravity" type="bool" />
+			<param index="0" name="joint_idx" type="int" />
+			<param index="1" name="use_gravity" type="bool" />
 			<description>
-				Sets whether the Jiggle joint at [code]joint_idx[/code] should use gravity.
+				Sets whether the Jiggle joint at [param joint_idx] should use gravity.
 			</description>
 		</method>
 		<method name="set_use_colliders">
 			<return type="void" />
-			<argument index="0" name="use_colliders" type="bool" />
+			<param index="0" name="use_colliders" type="bool" />
 			<description>
 				When [code]true[/code], the Jiggle modifier will use raycasting to prevent the Jiggle joints from rotating themselves into collision objects when solving.
 			</description>
diff --git a/doc/classes/SkeletonModification3DLookAt.xml b/doc/classes/SkeletonModification3DLookAt.xml
index 90330c4cf0..3602cfad95 100644
--- a/doc/classes/SkeletonModification3DLookAt.xml
+++ b/doc/classes/SkeletonModification3DLookAt.xml
@@ -29,20 +29,20 @@
 		</method>
 		<method name="set_additional_rotation">
 			<return type="void" />
-			<argument index="0" name="additional_rotation" type="Vector3" />
+			<param index="0" name="additional_rotation" type="Vector3" />
 			<description>
 				Sets the amount of extra rotation to be applied after the LookAt modification executes. This allows you to adjust the finished result.
 			</description>
 		</method>
 		<method name="set_lock_rotation_plane">
 			<return type="void" />
-			<argument index="0" name="plane" type="int" />
+			<param index="0" name="plane" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_lock_rotation_to_plane">
 			<return type="void" />
-			<argument index="0" name="lock_to_plane" type="bool" />
+			<param index="0" name="lock_to_plane" type="bool" />
 			<description>
 				When [code]true[/code], the LookAt modification will limit its rotation to a single plane in 3D space. The plane used can be configured using the [code]set_lock_rotation_plane[/code] function.
 			</description>
diff --git a/doc/classes/SkeletonModification3DStackHolder.xml b/doc/classes/SkeletonModification3DStackHolder.xml
index d5ed770fc0..24240236a4 100644
--- a/doc/classes/SkeletonModification3DStackHolder.xml
+++ b/doc/classes/SkeletonModification3DStackHolder.xml
@@ -18,7 +18,7 @@
 		</method>
 		<method name="set_held_modification_stack">
 			<return type="void" />
-			<argument index="0" name="held_modification_stack" type="SkeletonModificationStack3D" />
+			<param index="0" name="held_modification_stack" type="SkeletonModificationStack3D" />
 			<description>
 				Sets the [SkeletonModificationStack3D] that this modification is holding. This modification stack will then be executed when this modification is executed.
 			</description>
diff --git a/doc/classes/SkeletonModification3DTwoBoneIK.xml b/doc/classes/SkeletonModification3DTwoBoneIK.xml
index 0576591e2e..6618ebbcfb 100644
--- a/doc/classes/SkeletonModification3DTwoBoneIK.xml
+++ b/doc/classes/SkeletonModification3DTwoBoneIK.xml
@@ -91,7 +91,7 @@
 		</method>
 		<method name="set_auto_calculate_joint_length">
 			<return type="void" />
-			<argument index="0" name="auto_calculate_joint_length" type="bool" />
+			<param index="0" name="auto_calculate_joint_length" type="bool" />
 			<description>
 				If true, the TwoBoneIK modification will attempt to autocalculate the lengths of the bones being used. The first bone will be calculated by using the distance from the origin of the first bone to the origin of the second bone.
 				The second bone will be calculated either using the tip node if that setting is enabled, or by using the distances of the second bone's children. If the tip node is not enabled and the bone has no children, then the length cannot be autocalculated. In this case, the length will either have to be manually inputted or a tip node used to calculate the length.
@@ -99,70 +99,70 @@
 		</method>
 		<method name="set_joint_one_bone_idx">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Sets the bone index, [code]bone_index[/code], of the first bone. When possible, this will also update the [code]bone_name[/code] of the first bone based on data provided by the [Skeleton3D].
+				Sets the bone index, [param bone_idx], of the first bone. When possible, this will also update the [code]bone_name[/code] of the first bone based on data provided by the [Skeleton3D].
 			</description>
 		</method>
 		<method name="set_joint_one_bone_name">
 			<return type="void" />
-			<argument index="0" name="bone_name" type="String" />
+			<param index="0" name="bone_name" type="String" />
 			<description>
-				Sets the bone name, [code]bone_name[/code], of the first bone. When possible, this will also update the [code]bone_index[/code] of the first bone based on data provided by the [Skeleton3D].
+				Sets the bone name, [param bone_name], of the first bone. When possible, this will also update the [code]bone_index[/code] of the first bone based on data provided by the [Skeleton3D].
 			</description>
 		</method>
 		<method name="set_joint_one_length">
 			<return type="void" />
-			<argument index="0" name="bone_length" type="float" />
+			<param index="0" name="bone_length" type="float" />
 			<description>
 				Sets the length of the first bone in the TwoBoneIK modification.
 			</description>
 		</method>
 		<method name="set_joint_one_roll">
 			<return type="void" />
-			<argument index="0" name="roll" type="float" />
+			<param index="0" name="roll" type="float" />
 			<description>
 				Sets the amount of roll/twist applied to the first bone in the TwoBoneIK modification.
 			</description>
 		</method>
 		<method name="set_joint_two_bone_idx">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Sets the bone index, [code]bone_index[/code], of the second bone. When possible, this will also update the [code]bone_name[/code] of the second bone based on data provided by the [Skeleton3D].
+				Sets the bone index, [param bone_idx], of the second bone. When possible, this will also update the [code]bone_name[/code] of the second bone based on data provided by the [Skeleton3D].
 			</description>
 		</method>
 		<method name="set_joint_two_bone_name">
 			<return type="void" />
-			<argument index="0" name="bone_name" type="String" />
+			<param index="0" name="bone_name" type="String" />
 			<description>
-				Sets the bone name, [code]bone_name[/code], of the second bone. When possible, this will also update the [code]bone_index[/code] of the second bone based on data provided by the [Skeleton3D].
+				Sets the bone name, [param bone_name], of the second bone. When possible, this will also update the [code]bone_index[/code] of the second bone based on data provided by the [Skeleton3D].
 			</description>
 		</method>
 		<method name="set_joint_two_length">
 			<return type="void" />
-			<argument index="0" name="bone_length" type="float" />
+			<param index="0" name="bone_length" type="float" />
 			<description>
 				Sets the length of the second bone in the TwoBoneIK modification.
 			</description>
 		</method>
 		<method name="set_joint_two_roll">
 			<return type="void" />
-			<argument index="0" name="roll" type="float" />
+			<param index="0" name="roll" type="float" />
 			<description>
 				Sets the amount of roll/twist applied to the second bone in the TwoBoneIK modification.
 			</description>
 		</method>
 		<method name="set_pole_node">
 			<return type="void" />
-			<argument index="0" name="pole_nodepath" type="NodePath" />
+			<param index="0" name="pole_nodepath" type="NodePath" />
 			<description>
 				Sets the node to be used as the for the pole of the TwoBoneIK. When a node is set and the modification is set to use the pole node, the TwoBoneIK modification will bend the nodes in the direction towards this node when the bones need to bend.
 			</description>
 		</method>
 		<method name="set_tip_node">
 			<return type="void" />
-			<argument index="0" name="tip_nodepath" type="NodePath" />
+			<param index="0" name="tip_nodepath" type="NodePath" />
 			<description>
 				Sets the node to be used as the tip for the second bone. This is used to calculate the length and position of the end of the second bone in the TwoBoneIK modification.
 				[b]Note:[/b] The tip node should generally be a child node of a [BoneAttachment3D] node attached to the second bone, with the child node being offset so it is at the end of the bone.
@@ -170,14 +170,14 @@
 		</method>
 		<method name="set_use_pole_node">
 			<return type="void" />
-			<argument index="0" name="use_pole_node" type="bool" />
+			<param index="0" name="use_pole_node" type="bool" />
 			<description>
 				When [code]true[/code], the TwoBoneIK modification will bend the bones towards the pole node, if one has been set. This gives control over the direction the TwoBoneIK solver will bend, which is helpful for joints like elbows that only bend in certain directions.
 			</description>
 		</method>
 		<method name="set_use_tip_node">
 			<return type="void" />
-			<argument index="0" name="use_tip_node" type="bool" />
+			<param index="0" name="use_tip_node" type="bool" />
 			<description>
 				When [code]true[/code], the TwoBoneIK modification will use the tip node to calculate the distance and position of the end/tip of the second bone. This is the most stable solution for knowing the tip position and length of the second bone.
 			</description>
diff --git a/doc/classes/SkeletonModificationStack2D.xml b/doc/classes/SkeletonModificationStack2D.xml
index 9ddb8856ce..950e52e622 100644
--- a/doc/classes/SkeletonModificationStack2D.xml
+++ b/doc/classes/SkeletonModificationStack2D.xml
@@ -13,31 +13,31 @@
 	<methods>
 		<method name="add_modification">
 			<return type="void" />
-			<argument index="0" name="modification" type="SkeletonModification2D" />
+			<param index="0" name="modification" type="SkeletonModification2D" />
 			<description>
 				Adds the passed-in [SkeletonModification2D] to the stack.
 			</description>
 		</method>
 		<method name="delete_modification">
 			<return type="void" />
-			<argument index="0" name="mod_idx" type="int" />
+			<param index="0" name="mod_idx" type="int" />
 			<description>
-				Deletes the [SkeletonModification2D] at the index position [code]mod_idx[/code], if it exists.
+				Deletes the [SkeletonModification2D] at the index position [param mod_idx], if it exists.
 			</description>
 		</method>
 		<method name="enable_all_modifications">
 			<return type="void" />
-			<argument index="0" name="enabled" type="bool" />
+			<param index="0" name="enabled" type="bool" />
 			<description>
 				Enables all [SkeletonModification2D]s in the stack.
 			</description>
 		</method>
 		<method name="execute">
 			<return type="void" />
-			<argument index="0" name="delta" type="float" />
-			<argument index="1" name="execution_mode" type="int" />
+			<param index="0" name="delta" type="float" />
+			<param index="1" name="execution_mode" type="int" />
 			<description>
-				Executes all of the [SkeletonModification2D]s in the stack that use the same execution mode as the passed-in [code]execution_mode[/code], starting from index [code]0[/code] to [member modification_count].
+				Executes all of the [SkeletonModification2D]s in the stack that use the same execution mode as the passed-in [param execution_mode], starting from index [code]0[/code] to [member modification_count].
 				[b]Note:[/b] The order of the modifications can matter depending on the modifications. For example, modifications on a spine should operate before modifications on the arms in order to get proper results.
 			</description>
 		</method>
@@ -49,9 +49,9 @@
 		</method>
 		<method name="get_modification" qualifiers="const">
 			<return type="SkeletonModification2D" />
-			<argument index="0" name="mod_idx" type="int" />
+			<param index="0" name="mod_idx" type="int" />
 			<description>
-				Returns the [SkeletonModification2D] at the passed-in index, [code]mod_idx[/code].
+				Returns the [SkeletonModification2D] at the passed-in index, [param mod_idx].
 			</description>
 		</method>
 		<method name="get_skeleton" qualifiers="const">
@@ -62,10 +62,10 @@
 		</method>
 		<method name="set_modification">
 			<return type="void" />
-			<argument index="0" name="mod_idx" type="int" />
-			<argument index="1" name="modification" type="SkeletonModification2D" />
+			<param index="0" name="mod_idx" type="int" />
+			<param index="1" name="modification" type="SkeletonModification2D" />
 			<description>
-				Sets the modification at [code]mod_idx[/code] to the passed-in modification, [code]modification[/code].
+				Sets the modification at [param mod_idx] to the passed-in modification, [param modification].
 			</description>
 		</method>
 		<method name="setup">
diff --git a/doc/classes/SkeletonModificationStack3D.xml b/doc/classes/SkeletonModificationStack3D.xml
index fc952f6864..34c7099bca 100644
--- a/doc/classes/SkeletonModificationStack3D.xml
+++ b/doc/classes/SkeletonModificationStack3D.xml
@@ -12,31 +12,31 @@
 	<methods>
 		<method name="add_modification">
 			<return type="void" />
-			<argument index="0" name="modification" type="SkeletonModification3D" />
+			<param index="0" name="modification" type="SkeletonModification3D" />
 			<description>
 				Adds the passed-in [SkeletonModification3D] to the stack.
 			</description>
 		</method>
 		<method name="delete_modification">
 			<return type="void" />
-			<argument index="0" name="mod_idx" type="int" />
+			<param index="0" name="mod_idx" type="int" />
 			<description>
-				Deletes the [SkeletonModification3D] at the index position [code]mod_idx[/code], if it exists.
+				Deletes the [SkeletonModification3D] at the index position [param mod_idx], if it exists.
 			</description>
 		</method>
 		<method name="enable_all_modifications">
 			<return type="void" />
-			<argument index="0" name="enabled" type="bool" />
+			<param index="0" name="enabled" type="bool" />
 			<description>
 				Enables all [SkeletonModification3D]s in the stack.
 			</description>
 		</method>
 		<method name="execute">
 			<return type="void" />
-			<argument index="0" name="delta" type="float" />
-			<argument index="1" name="execution_mode" type="int" />
+			<param index="0" name="delta" type="float" />
+			<param index="1" name="execution_mode" type="int" />
 			<description>
-				Executes all of the [SkeletonModification3D]s in the stack that use the same execution mode as the passed-in [code]execution_mode[/code], starting from index [code]0[/code] to [member modification_count].
+				Executes all of the [SkeletonModification3D]s in the stack that use the same execution mode as the passed-in [param execution_mode], starting from index [code]0[/code] to [member modification_count].
 				[b]Note:[/b] The order of the modifications can matter depending on the modifications. For example, modifications on a spine should operate before modifications on the arms in order to get proper results.
 			</description>
 		</method>
@@ -48,9 +48,9 @@
 		</method>
 		<method name="get_modification" qualifiers="const">
 			<return type="SkeletonModification3D" />
-			<argument index="0" name="mod_idx" type="int" />
+			<param index="0" name="mod_idx" type="int" />
 			<description>
-				Returns the [SkeletonModification3D] at the passed-in index, [code]mod_idx[/code].
+				Returns the [SkeletonModification3D] at the passed-in index, [param mod_idx].
 			</description>
 		</method>
 		<method name="get_skeleton" qualifiers="const">
@@ -61,10 +61,10 @@
 		</method>
 		<method name="set_modification">
 			<return type="void" />
-			<argument index="0" name="mod_idx" type="int" />
-			<argument index="1" name="modification" type="SkeletonModification3D" />
+			<param index="0" name="mod_idx" type="int" />
+			<param index="1" name="modification" type="SkeletonModification3D" />
 			<description>
-				Sets the modification at [code]mod_idx[/code] to the passed-in modification, [code]modification[/code].
+				Sets the modification at [param mod_idx] to the passed-in modification, [param modification].
 			</description>
 		</method>
 		<method name="setup">
@@ -79,7 +79,7 @@
 			When true, the modification's in the stack will be called. This is handled automatically through the [Skeleton3D] node.
 		</member>
 		<member name="modification_count" type="int" setter="set_modification_count" getter="get_modification_count" default="0">
-			The amount of modifications in the stack.
+			The number of modifications in the stack.
 		</member>
 		<member name="strength" type="float" setter="set_strength" getter="get_strength" default="1.0">
 			The interpolation strength of the modifications in stack. A value of [code]0[/code] will make it where the modifications are not applied, a strength of [code]0.5[/code] will be half applied, and a strength of [code]1[/code] will allow the modifications to be fully applied and override the skeleton bone poses.
diff --git a/doc/classes/SkeletonProfile.xml b/doc/classes/SkeletonProfile.xml
index 5c2d0eefb4..55d21f3224 100644
--- a/doc/classes/SkeletonProfile.xml
+++ b/doc/classes/SkeletonProfile.xml
@@ -11,149 +11,149 @@
 	<methods>
 		<method name="find_bone" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="bone_name" type="StringName" />
+			<param index="0" name="bone_name" type="StringName" />
 			<description>
-				Returns the bone index that matches [code]bone_name[/code] as its name.
+				Returns the bone index that matches [param bone_name] as its name.
 			</description>
 		</method>
 		<method name="get_bone_name" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Returns the name of the bone at [code]bone_idx[/code] that will be the key name in the [BoneMap].
+				Returns the name of the bone at [param bone_idx] that will be the key name in the [BoneMap].
 				In the retargeting process, the returned bone name is the bone name of the target skeleton.
 			</description>
 		</method>
 		<method name="get_bone_parent" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Returns the name of the bone which is the parent to the bone at [code]bone_idx[/code]. The result is empty if the bone has no parent.
+				Returns the name of the bone which is the parent to the bone at [param bone_idx]. The result is empty if the bone has no parent.
 			</description>
 		</method>
 		<method name="get_bone_tail" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Returns the name of the bone which is the tail of the bone at [code]bone_idx[/code].
+				Returns the name of the bone which is the tail of the bone at [param bone_idx].
 			</description>
 		</method>
 		<method name="get_group" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Returns the group of the bone at [code]bone_idx[/code].
+				Returns the group of the bone at [param bone_idx].
 			</description>
 		</method>
 		<method name="get_group_name" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="group_idx" type="int" />
+			<param index="0" name="group_idx" type="int" />
 			<description>
-				Returns the name of the group at [code]group_idx[/code] that will be the drawing group in the [BoneMap] editor.
+				Returns the name of the group at [param group_idx] that will be the drawing group in the [BoneMap] editor.
 			</description>
 		</method>
 		<method name="get_handle_offset" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Returns the offset of the bone at [code]bone_idx[/code] that will be the button position in the [BoneMap] editor.
+				Returns the offset of the bone at [param bone_idx] that will be the button position in the [BoneMap] editor.
 				This is the offset with origin at the top left corner of the square.
 			</description>
 		</method>
 		<method name="get_reference_pose" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Returns the reference pose transform for bone [code]bone_idx[/code].
+				Returns the reference pose transform for bone [param bone_idx].
 			</description>
 		</method>
 		<method name="get_tail_direction" qualifiers="const">
 			<return type="int" enum="SkeletonProfile.TailDirection" />
-			<argument index="0" name="bone_idx" type="int" />
+			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Returns the tail direction of the bone at [code]bone_idx[/code].
+				Returns the tail direction of the bone at [param bone_idx].
 			</description>
 		</method>
 		<method name="get_texture" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="group_idx" type="int" />
+			<param index="0" name="group_idx" type="int" />
 			<description>
-				Returns the texture of the group at [code]group_idx[/code] that will be the drawing group background image in the [BoneMap] editor.
+				Returns the texture of the group at [param group_idx] that will be the drawing group background image in the [BoneMap] editor.
 			</description>
 		</method>
 		<method name="set_bone_name">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="bone_name" type="StringName" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="bone_name" type="StringName" />
 			<description>
-				Sets the name of the bone at [code]bone_idx[/code] that will be the key name in the [BoneMap].
+				Sets the name of the bone at [param bone_idx] that will be the key name in the [BoneMap].
 				In the retargeting process, the setting bone name is the bone name of the target skeleton.
 			</description>
 		</method>
 		<method name="set_bone_parent">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="bone_parent" type="StringName" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="bone_parent" type="StringName" />
 			<description>
-				Sets the bone with name [code]bone_parent[/code] as the parent of the bone at [code]bone_idx[/code]. If an empty string is passed, then the bone has no parent.
+				Sets the bone with name [param bone_parent] as the parent of the bone at [param bone_idx]. If an empty string is passed, then the bone has no parent.
 			</description>
 		</method>
 		<method name="set_bone_tail">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="bone_tail" type="StringName" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="bone_tail" type="StringName" />
 			<description>
-				Sets the bone with name [code]bone_tail[/code] as the tail of the bone at [code]bone_idx[/code].
+				Sets the bone with name [param bone_tail] as the tail of the bone at [param bone_idx].
 			</description>
 		</method>
 		<method name="set_group">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="group" type="StringName" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="group" type="StringName" />
 			<description>
-				Sets the group of the bone at [code]bone_idx[/code].
+				Sets the group of the bone at [param bone_idx].
 			</description>
 		</method>
 		<method name="set_group_name">
 			<return type="void" />
-			<argument index="0" name="group_idx" type="int" />
-			<argument index="1" name="group_name" type="StringName" />
+			<param index="0" name="group_idx" type="int" />
+			<param index="1" name="group_name" type="StringName" />
 			<description>
-				Sets the name of the group at [code]group_idx[/code] that will be the drawing group in the [BoneMap] editor.
+				Sets the name of the group at [param group_idx] that will be the drawing group in the [BoneMap] editor.
 			</description>
 		</method>
 		<method name="set_handle_offset">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="handle_offset" type="Vector2" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="handle_offset" type="Vector2" />
 			<description>
-				Sets the offset of the bone at [code]bone_idx[/code] that will be the button position in the [BoneMap] editor.
+				Sets the offset of the bone at [param bone_idx] that will be the button position in the [BoneMap] editor.
 				This is the offset with origin at the top left corner of the square.
 			</description>
 		</method>
 		<method name="set_reference_pose">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="bone_name" type="Transform3D" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="bone_name" type="Transform3D" />
 			<description>
-				Sets the reference pose transform for bone [code]bone_idx[/code].
+				Sets the reference pose transform for bone [param bone_idx].
 			</description>
 		</method>
 		<method name="set_tail_direction">
 			<return type="void" />
-			<argument index="0" name="bone_idx" type="int" />
-			<argument index="1" name="tail_direction" type="int" enum="SkeletonProfile.TailDirection" />
+			<param index="0" name="bone_idx" type="int" />
+			<param index="1" name="tail_direction" type="int" enum="SkeletonProfile.TailDirection" />
 			<description>
-				Sets the tail direction of the bone at [code]bone_idx[/code].
+				Sets the tail direction of the bone at [param bone_idx].
 				[b]Note:[/b] This only specifies the method of calculation. The actual coordinates required should be stored in an external skeleton, so the calculation itself needs to be done externally.
 			</description>
 		</method>
 		<method name="set_texture">
 			<return type="void" />
-			<argument index="0" name="group_idx" type="int" />
-			<argument index="1" name="texture" type="Texture2D" />
+			<param index="0" name="group_idx" type="int" />
+			<param index="1" name="texture" type="Texture2D" />
 			<description>
-				Sets the texture of the group at [code]group_idx[/code] that will be the drawing group background image in the [BoneMap] editor.
+				Sets the texture of the group at [param group_idx] that will be the drawing group background image in the [BoneMap] editor.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/Skin.xml b/doc/classes/Skin.xml
index af1af7bad2..ea60bd707d 100644
--- a/doc/classes/Skin.xml
+++ b/doc/classes/Skin.xml
@@ -9,15 +9,15 @@
 	<methods>
 		<method name="add_bind">
 			<return type="void" />
-			<argument index="0" name="bone" type="int" />
-			<argument index="1" name="pose" type="Transform3D" />
+			<param index="0" name="bone" type="int" />
+			<param index="1" name="pose" type="Transform3D" />
 			<description>
 			</description>
 		</method>
 		<method name="add_named_bind">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="pose" type="Transform3D" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="pose" type="Transform3D" />
 			<description>
 			</description>
 		</method>
@@ -28,7 +28,7 @@
 		</method>
 		<method name="get_bind_bone" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="bind_index" type="int" />
+			<param index="0" name="bind_index" type="int" />
 			<description>
 			</description>
 		</method>
@@ -39,40 +39,40 @@
 		</method>
 		<method name="get_bind_name" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="bind_index" type="int" />
+			<param index="0" name="bind_index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_bind_pose" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="bind_index" type="int" />
+			<param index="0" name="bind_index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_bind_bone">
 			<return type="void" />
-			<argument index="0" name="bind_index" type="int" />
-			<argument index="1" name="bone" type="int" />
+			<param index="0" name="bind_index" type="int" />
+			<param index="1" name="bone" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_bind_count">
 			<return type="void" />
-			<argument index="0" name="bind_count" type="int" />
+			<param index="0" name="bind_count" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_bind_name">
 			<return type="void" />
-			<argument index="0" name="bind_index" type="int" />
-			<argument index="1" name="name" type="StringName" />
+			<param index="0" name="bind_index" type="int" />
+			<param index="1" name="name" type="StringName" />
 			<description>
 			</description>
 		</method>
 		<method name="set_bind_pose">
 			<return type="void" />
-			<argument index="0" name="bind_index" type="int" />
-			<argument index="1" name="pose" type="Transform3D" />
+			<param index="0" name="bind_index" type="int" />
+			<param index="1" name="pose" type="Transform3D" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/Slider.xml b/doc/classes/Slider.xml
index 4139530db1..c3dbd69e59 100644
--- a/doc/classes/Slider.xml
+++ b/doc/classes/Slider.xml
@@ -25,9 +25,9 @@
 	</members>
 	<signals>
 		<signal name="drag_ended">
-			<argument index="0" name="value_changed" type="bool" />
+			<param index="0" name="value_changed" type="bool" />
 			<description>
-				Emitted when dragging stops. If [code]value_changed[/code] is true, [member Range.value] is different from the value when you started the dragging.
+				Emitted when dragging stops. If [param value_changed] is true, [member Range.value] is different from the value when you started the dragging.
 			</description>
 		</signal>
 		<signal name="drag_started">
diff --git a/doc/classes/SliderJoint3D.xml b/doc/classes/SliderJoint3D.xml
index d62cf8aac4..7470f89979 100644
--- a/doc/classes/SliderJoint3D.xml
+++ b/doc/classes/SliderJoint3D.xml
@@ -11,14 +11,14 @@
 	<methods>
 		<method name="get_param" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="param" type="int" enum="SliderJoint3D.Param" />
+			<param index="0" name="param" type="int" enum="SliderJoint3D.Param" />
 			<description>
 			</description>
 		</method>
 		<method name="set_param">
 			<return type="void" />
-			<argument index="0" name="param" type="int" enum="SliderJoint3D.Param" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="param" type="int" enum="SliderJoint3D.Param" />
+			<param index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/SoftDynamicBody3D.xml b/doc/classes/SoftDynamicBody3D.xml
index 86552f30f6..87492704d7 100644
--- a/doc/classes/SoftDynamicBody3D.xml
+++ b/doc/classes/SoftDynamicBody3D.xml
@@ -13,7 +13,7 @@
 	<methods>
 		<method name="add_collision_exception_with">
 			<return type="void" />
-			<argument index="0" name="body" type="Node" />
+			<param index="0" name="body" type="Node" />
 			<description>
 				Adds a body to the list of bodies that this body can't collide with.
 			</description>
@@ -26,16 +26,16 @@
 		</method>
 		<method name="get_collision_layer_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
-				Returns whether or not the specified layer of the [member collision_layer] is enabled, given a [code]layer_number[/code] between 1 and 32.
+				Returns whether or not the specified layer of the [member collision_layer] is enabled, given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="get_collision_mask_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
-				Returns whether or not the specified layer of the [member collision_mask] is enabled, given a [code]layer_number[/code] between 1 and 32.
+				Returns whether or not the specified layer of the [member collision_mask] is enabled, given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="get_physics_rid" qualifiers="const">
@@ -45,48 +45,48 @@
 		</method>
 		<method name="get_point_transform">
 			<return type="Vector3" />
-			<argument index="0" name="point_index" type="int" />
+			<param index="0" name="point_index" type="int" />
 			<description>
 				Returns local translation of a vertex in the surface array.
 			</description>
 		</method>
 		<method name="is_point_pinned" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="point_index" type="int" />
+			<param index="0" name="point_index" type="int" />
 			<description>
 				Returns [code]true[/code] if vertex is set to pinned.
 			</description>
 		</method>
 		<method name="remove_collision_exception_with">
 			<return type="void" />
-			<argument index="0" name="body" type="Node" />
+			<param index="0" name="body" type="Node" />
 			<description>
 				Removes a body from the list of bodies that this body can't collide with.
 			</description>
 		</method>
 		<method name="set_collision_layer_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
-				Based on [code]value[/code], enables or disables the specified layer in the [member collision_layer], given a [code]layer_number[/code] between 1 and 32.
+				Based on [code]value[/code], enables or disables the specified layer in the [member collision_layer], given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="set_collision_mask_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
-				Based on [code]value[/code], enables or disables the specified layer in the [member collision_mask], given a [code]layer_number[/code] between 1 and 32.
+				Based on [code]value[/code], enables or disables the specified layer in the [member collision_mask], given a [param layer_number] between 1 and 32.
 			</description>
 		</method>
 		<method name="set_point_pinned">
 			<return type="void" />
-			<argument index="0" name="point_index" type="int" />
-			<argument index="1" name="pinned" type="bool" />
-			<argument index="2" name="attachment_path" type="NodePath" default="NodePath(&quot;&quot;)" />
+			<param index="0" name="point_index" type="int" />
+			<param index="1" name="pinned" type="bool" />
+			<param index="2" name="attachment_path" type="NodePath" default="NodePath(&quot;&quot;)" />
 			<description>
-				Sets the pinned state of a surface vertex. When set to [code]true[/code], the optional [code]attachment_path[/code] can define a [Node3D] the pinned vertex will be attached to.
+				Sets the pinned state of a surface vertex. When set to [code]true[/code], the optional [param attachment_path] can define a [Node3D] the pinned vertex will be attached to.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/SpinBox.xml b/doc/classes/SpinBox.xml
index e84f9c38ff..8df039794a 100644
--- a/doc/classes/SpinBox.xml
+++ b/doc/classes/SpinBox.xml
@@ -47,6 +47,9 @@
 	<members>
 		<member name="alignment" type="int" setter="set_horizontal_alignment" getter="get_horizontal_alignment" enum="HorizontalAlignment" default="0">
 		</member>
+		<member name="custom_arrow_step" type="float" setter="set_custom_arrow_step" getter="get_custom_arrow_step" default="0.0">
+			If not [code]0[/code], [code]value[/code] will always be rounded to a multiple of [code]custom_arrow_step[/code] when interacting with the arrow buttons of the [SpinBox].
+		</member>
 		<member name="editable" type="bool" setter="set_editable" getter="is_editable" default="true">
 			If [code]true[/code], the [SpinBox] will be editable. Otherwise, it will be read only.
 		</member>
diff --git a/doc/classes/SplitContainer.xml b/doc/classes/SplitContainer.xml
index f2bc65f8df..fb4b9466b5 100644
--- a/doc/classes/SplitContainer.xml
+++ b/doc/classes/SplitContainer.xml
@@ -30,7 +30,7 @@
 	</members>
 	<signals>
 		<signal name="dragged">
-			<argument index="0" name="offset" type="int" />
+			<param index="0" name="offset" type="int" />
 			<description>
 				Emitted when the dragger is dragged by user.
 			</description>
diff --git a/doc/classes/SpringArm3D.xml b/doc/classes/SpringArm3D.xml
index d89b8f4549..29331e3071 100644
--- a/doc/classes/SpringArm3D.xml
+++ b/doc/classes/SpringArm3D.xml
@@ -14,7 +14,7 @@
 	<methods>
 		<method name="add_excluded_object">
 			<return type="void" />
-			<argument index="0" name="RID" type="RID" />
+			<param index="0" name="RID" type="RID" />
 			<description>
 				Adds the [PhysicsBody3D] object with the given [RID] to the list of [PhysicsBody3D] objects excluded from the collision check.
 			</description>
@@ -33,7 +33,7 @@
 		</method>
 		<method name="remove_excluded_object">
 			<return type="bool" />
-			<argument index="0" name="RID" type="RID" />
+			<param index="0" name="RID" type="RID" />
 			<description>
 				Removes the given [RID] from the list of [PhysicsBody3D] objects excluded from the collision check.
 			</description>
diff --git a/doc/classes/Sprite2D.xml b/doc/classes/Sprite2D.xml
index 2edc13a12b..83532721b2 100644
--- a/doc/classes/Sprite2D.xml
+++ b/doc/classes/Sprite2D.xml
@@ -41,7 +41,7 @@
 		</method>
 		<method name="is_pixel_opaque" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="pos" type="Vector2" />
+			<param index="0" name="pos" type="Vector2" />
 			<description>
 				Returns [code]true[/code], if the pixel at the given position is opaque and [code]false[/code] in other case.
 				[b]Note:[/b] It also returns [code]false[/code], if the sprite's texture is [code]null[/code] or if the given position is invalid.
diff --git a/doc/classes/Sprite3D.xml b/doc/classes/Sprite3D.xml
index 22437027c5..956e646702 100644
--- a/doc/classes/Sprite3D.xml
+++ b/doc/classes/Sprite3D.xml
@@ -24,7 +24,7 @@
 			The region of the atlas texture to display. [member region_enabled] must be [code]true[/code].
 		</member>
 		<member name="texture" type="Texture2D" setter="set_texture" getter="get_texture">
-			[Texture2D] object to draw.
+			[Texture2D] object to draw. If [member GeometryInstance3D.material_override] is used, this will be overridden. The size information is still used.
 		</member>
 		<member name="vframes" type="int" setter="set_vframes" getter="get_vframes" default="1">
 			The number of rows in the sprite sheet.
diff --git a/doc/classes/SpriteBase3D.xml b/doc/classes/SpriteBase3D.xml
index bc381578d9..5fa984e7a0 100644
--- a/doc/classes/SpriteBase3D.xml
+++ b/doc/classes/SpriteBase3D.xml
@@ -17,7 +17,7 @@
 		</method>
 		<method name="get_draw_flag" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="flag" type="int" enum="SpriteBase3D.DrawFlags" />
+			<param index="0" name="flag" type="int" enum="SpriteBase3D.DrawFlags" />
 			<description>
 				Returns the value of the specified flag.
 			</description>
@@ -30,8 +30,8 @@
 		</method>
 		<method name="set_draw_flag">
 			<return type="void" />
-			<argument index="0" name="flag" type="int" enum="SpriteBase3D.DrawFlags" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="flag" type="int" enum="SpriteBase3D.DrawFlags" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				If [code]true[/code], the specified flag will be enabled. See [enum SpriteBase3D.DrawFlags] for a list of flags.
 			</description>
diff --git a/doc/classes/SpriteFrames.xml b/doc/classes/SpriteFrames.xml
index 0d423630d4..e9721495dd 100644
--- a/doc/classes/SpriteFrames.xml
+++ b/doc/classes/SpriteFrames.xml
@@ -12,23 +12,23 @@
 	<methods>
 		<method name="add_animation">
 			<return type="void" />
-			<argument index="0" name="anim" type="StringName" />
+			<param index="0" name="anim" type="StringName" />
 			<description>
 				Adds a new animation to the library.
 			</description>
 		</method>
 		<method name="add_frame">
 			<return type="void" />
-			<argument index="0" name="anim" type="StringName" />
-			<argument index="1" name="frame" type="Texture2D" />
-			<argument index="2" name="at_position" type="int" default="-1" />
+			<param index="0" name="anim" type="StringName" />
+			<param index="1" name="frame" type="Texture2D" />
+			<param index="2" name="at_position" type="int" default="-1" />
 			<description>
 				Adds a frame to the given animation.
 			</description>
 		</method>
 		<method name="clear">
 			<return type="void" />
-			<argument index="0" name="anim" type="StringName" />
+			<param index="0" name="anim" type="StringName" />
 			<description>
 				Removes all frames from the given animation.
 			</description>
@@ -41,7 +41,7 @@
 		</method>
 		<method name="get_animation_loop" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="anim" type="StringName" />
+			<param index="0" name="anim" type="StringName" />
 			<description>
 				Returns [code]true[/code] if the given animation is configured to loop when it finishes playing. Otherwise, returns [code]false[/code].
 			</description>
@@ -54,77 +54,77 @@
 		</method>
 		<method name="get_animation_speed" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="anim" type="StringName" />
+			<param index="0" name="anim" type="StringName" />
 			<description>
 				The animation's speed in frames per second.
 			</description>
 		</method>
 		<method name="get_frame" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="anim" type="StringName" />
-			<argument index="1" name="idx" type="int" />
+			<param index="0" name="anim" type="StringName" />
+			<param index="1" name="idx" type="int" />
 			<description>
 				Returns the animation's selected frame.
 			</description>
 		</method>
 		<method name="get_frame_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="anim" type="StringName" />
+			<param index="0" name="anim" type="StringName" />
 			<description>
 				Returns the number of frames in the animation.
 			</description>
 		</method>
 		<method name="has_animation" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="anim" type="StringName" />
+			<param index="0" name="anim" type="StringName" />
 			<description>
 				If [code]true[/code], the named animation exists.
 			</description>
 		</method>
 		<method name="remove_animation">
 			<return type="void" />
-			<argument index="0" name="anim" type="StringName" />
+			<param index="0" name="anim" type="StringName" />
 			<description>
 				Removes the given animation.
 			</description>
 		</method>
 		<method name="remove_frame">
 			<return type="void" />
-			<argument index="0" name="anim" type="StringName" />
-			<argument index="1" name="idx" type="int" />
+			<param index="0" name="anim" type="StringName" />
+			<param index="1" name="idx" type="int" />
 			<description>
 				Removes the animation's selected frame.
 			</description>
 		</method>
 		<method name="rename_animation">
 			<return type="void" />
-			<argument index="0" name="anim" type="StringName" />
-			<argument index="1" name="newname" type="StringName" />
+			<param index="0" name="anim" type="StringName" />
+			<param index="1" name="newname" type="StringName" />
 			<description>
-				Changes the animation's name to [code]newname[/code].
+				Changes the animation's name to [param newname].
 			</description>
 		</method>
 		<method name="set_animation_loop">
 			<return type="void" />
-			<argument index="0" name="anim" type="StringName" />
-			<argument index="1" name="loop" type="bool" />
+			<param index="0" name="anim" type="StringName" />
+			<param index="1" name="loop" type="bool" />
 			<description>
 				If [code]true[/code], the animation will loop.
 			</description>
 		</method>
 		<method name="set_animation_speed">
 			<return type="void" />
-			<argument index="0" name="anim" type="StringName" />
-			<argument index="1" name="speed" type="float" />
+			<param index="0" name="anim" type="StringName" />
+			<param index="1" name="speed" type="float" />
 			<description>
 				The animation's speed in frames per second.
 			</description>
 		</method>
 		<method name="set_frame">
 			<return type="void" />
-			<argument index="0" name="anim" type="StringName" />
-			<argument index="1" name="idx" type="int" />
-			<argument index="2" name="txt" type="Texture2D" />
+			<param index="0" name="anim" type="StringName" />
+			<param index="1" name="idx" type="int" />
+			<param index="2" name="txt" type="Texture2D" />
 			<description>
 				Sets the texture of the given frame.
 			</description>
diff --git a/doc/classes/StreamPeer.xml b/doc/classes/StreamPeer.xml
index bd69867001..4188563695 100644
--- a/doc/classes/StreamPeer.xml
+++ b/doc/classes/StreamPeer.xml
@@ -37,14 +37,14 @@
 		<method name="get_available_bytes" qualifiers="const">
 			<return type="int" />
 			<description>
-				Returns the amount of bytes this [StreamPeer] has available.
+				Returns the number of bytes this [StreamPeer] has available.
 			</description>
 		</method>
 		<method name="get_data">
 			<return type="Array" />
-			<argument index="0" name="bytes" type="int" />
+			<param index="0" name="bytes" type="int" />
 			<description>
-				Returns a chunk data with the received bytes. The amount of bytes to be received can be requested in the [code]bytes[/code] argument. If not enough bytes are available, the function will block until the desired amount is received. This function returns two values, an [enum @GlobalScope.Error] code and a data array.
+				Returns a chunk data with the received bytes. The number of bytes to be received can be requested in the [param bytes] argument. If not enough bytes are available, the function will block until the desired amount is received. This function returns two values, an [enum @GlobalScope.Error] code and a data array.
 			</description>
 		</method>
 		<method name="get_double">
@@ -61,16 +61,16 @@
 		</method>
 		<method name="get_partial_data">
 			<return type="Array" />
-			<argument index="0" name="bytes" type="int" />
+			<param index="0" name="bytes" type="int" />
 			<description>
-				Returns a chunk data with the received bytes. The amount of bytes to be received can be requested in the "bytes" argument. If not enough bytes are available, the function will return how many were actually received. This function returns two values, an [enum @GlobalScope.Error] code, and a data array.
+				Returns a chunk data with the received bytes. The number of bytes to be received can be requested in the "bytes" argument. If not enough bytes are available, the function will return how many were actually received. This function returns two values, an [enum @GlobalScope.Error] code, and a data array.
 			</description>
 		</method>
 		<method name="get_string">
 			<return type="String" />
-			<argument index="0" name="bytes" type="int" default="-1" />
+			<param index="0" name="bytes" type="int" default="-1" />
 			<description>
-				Gets an ASCII string with byte-length [code]bytes[/code] from the stream. If [code]bytes[/code] is negative (default) the length will be read from the stream using the reverse process of [method put_string].
+				Gets an ASCII string with byte-length [param bytes] from the stream. If [param bytes] is negative (default) the length will be read from the stream using the reverse process of [method put_string].
 			</description>
 		</method>
 		<method name="get_u16">
@@ -99,78 +99,78 @@
 		</method>
 		<method name="get_utf8_string">
 			<return type="String" />
-			<argument index="0" name="bytes" type="int" default="-1" />
+			<param index="0" name="bytes" type="int" default="-1" />
 			<description>
-				Gets an UTF-8 string with byte-length [code]bytes[/code] from the stream (this decodes the string sent as UTF-8). If [code]bytes[/code] is negative (default) the length will be read from the stream using the reverse process of [method put_utf8_string].
+				Gets an UTF-8 string with byte-length [param bytes] from the stream (this decodes the string sent as UTF-8). If [param bytes] is negative (default) the length will be read from the stream using the reverse process of [method put_utf8_string].
 			</description>
 		</method>
 		<method name="get_var">
 			<return type="Variant" />
-			<argument index="0" name="allow_objects" type="bool" default="false" />
+			<param index="0" name="allow_objects" type="bool" default="false" />
 			<description>
-				Gets a Variant from the stream. If [code]allow_objects[/code] is [code]true[/code], decoding objects is allowed.
+				Gets a Variant from the stream. If [param allow_objects] is [code]true[/code], decoding objects is allowed.
 				[b]Warning:[/b] Deserialized objects can contain code which gets executed. Do not use this option if the serialized object comes from untrusted sources to avoid potential security threats such as remote code execution.
 			</description>
 		</method>
 		<method name="put_16">
 			<return type="void" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Puts a signed 16-bit value into the stream.
 			</description>
 		</method>
 		<method name="put_32">
 			<return type="void" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Puts a signed 32-bit value into the stream.
 			</description>
 		</method>
 		<method name="put_64">
 			<return type="void" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Puts a signed 64-bit value into the stream.
 			</description>
 		</method>
 		<method name="put_8">
 			<return type="void" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Puts a signed byte into the stream.
 			</description>
 		</method>
 		<method name="put_data">
 			<return type="int" enum="Error" />
-			<argument index="0" name="data" type="PackedByteArray" />
+			<param index="0" name="data" type="PackedByteArray" />
 			<description>
 				Sends a chunk of data through the connection, blocking if necessary until the data is done sending. This function returns an [enum @GlobalScope.Error] code.
 			</description>
 		</method>
 		<method name="put_double">
 			<return type="void" />
-			<argument index="0" name="value" type="float" />
+			<param index="0" name="value" type="float" />
 			<description>
 				Puts a double-precision float into the stream.
 			</description>
 		</method>
 		<method name="put_float">
 			<return type="void" />
-			<argument index="0" name="value" type="float" />
+			<param index="0" name="value" type="float" />
 			<description>
 				Puts a single-precision float into the stream.
 			</description>
 		</method>
 		<method name="put_partial_data">
 			<return type="Array" />
-			<argument index="0" name="data" type="PackedByteArray" />
+			<param index="0" name="data" type="PackedByteArray" />
 			<description>
 				Sends a chunk of data through the connection. If all the data could not be sent at once, only part of it will. This function returns two values, an [enum @GlobalScope.Error] code and an integer, describing how much data was actually sent.
 			</description>
 		</method>
 		<method name="put_string">
 			<return type="void" />
-			<argument index="0" name="value" type="String" />
+			<param index="0" name="value" type="String" />
 			<description>
 				Puts a zero-terminated ASCII string into the stream prepended by a 32-bit unsigned integer representing its size.
 				[b]Note:[/b] To put an ASCII string without prepending its size, you can use [method put_data]:
@@ -186,35 +186,35 @@
 		</method>
 		<method name="put_u16">
 			<return type="void" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Puts an unsigned 16-bit value into the stream.
 			</description>
 		</method>
 		<method name="put_u32">
 			<return type="void" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Puts an unsigned 32-bit value into the stream.
 			</description>
 		</method>
 		<method name="put_u64">
 			<return type="void" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Puts an unsigned 64-bit value into the stream.
 			</description>
 		</method>
 		<method name="put_u8">
 			<return type="void" />
-			<argument index="0" name="value" type="int" />
+			<param index="0" name="value" type="int" />
 			<description>
 				Puts an unsigned byte into the stream.
 			</description>
 		</method>
 		<method name="put_utf8_string">
 			<return type="void" />
-			<argument index="0" name="value" type="String" />
+			<param index="0" name="value" type="String" />
 			<description>
 				Puts a zero-terminated UTF-8 string into the stream prepended by a 32 bits unsigned integer representing its size.
 				[b]Note:[/b] To put an UTF-8 string without prepending its size, you can use [method put_data]:
@@ -230,10 +230,10 @@
 		</method>
 		<method name="put_var">
 			<return type="void" />
-			<argument index="0" name="value" type="Variant" />
-			<argument index="1" name="full_objects" type="bool" default="false" />
+			<param index="0" name="value" type="Variant" />
+			<param index="1" name="full_objects" type="bool" default="false" />
 			<description>
-				Puts a Variant into the stream. If [code]full_objects[/code] is [code]true[/code] encoding objects is allowed (and can potentially include code).
+				Puts a Variant into the stream. If [param full_objects] is [code]true[/code] encoding objects is allowed (and can potentially include code).
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/StreamPeerBuffer.xml b/doc/classes/StreamPeerBuffer.xml
index de725aef5b..4bef9f44b7 100644
--- a/doc/classes/StreamPeerBuffer.xml
+++ b/doc/classes/StreamPeerBuffer.xml
@@ -36,16 +36,16 @@
 		</method>
 		<method name="resize">
 			<return type="void" />
-			<argument index="0" name="size" type="int" />
+			<param index="0" name="size" type="int" />
 			<description>
 				Resizes the [member data_array]. This [i]doesn't[/i] update the cursor.
 			</description>
 		</method>
 		<method name="seek">
 			<return type="void" />
-			<argument index="0" name="position" type="int" />
+			<param index="0" name="position" type="int" />
 			<description>
-				Moves the cursor to the specified position. [code]position[/code] must be a valid index of [member data_array].
+				Moves the cursor to the specified position. [param position] must be a valid index of [member data_array].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/StreamPeerExtension.xml b/doc/classes/StreamPeerExtension.xml
index a3a08c530c..46783de275 100644
--- a/doc/classes/StreamPeerExtension.xml
+++ b/doc/classes/StreamPeerExtension.xml
@@ -14,33 +14,33 @@
 		</method>
 		<method name="_get_data" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="r_buffer" type="uint8_t*" />
-			<argument index="1" name="r_bytes" type="int" />
-			<argument index="2" name="r_received" type="int32_t*" />
+			<param index="0" name="r_buffer" type="uint8_t*" />
+			<param index="1" name="r_bytes" type="int" />
+			<param index="2" name="r_received" type="int32_t*" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_partial_data" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="r_buffer" type="uint8_t*" />
-			<argument index="1" name="r_bytes" type="int" />
-			<argument index="2" name="r_received" type="int32_t*" />
+			<param index="0" name="r_buffer" type="uint8_t*" />
+			<param index="1" name="r_bytes" type="int" />
+			<param index="2" name="r_received" type="int32_t*" />
 			<description>
 			</description>
 		</method>
 		<method name="_put_data" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="p_data" type="const uint8_t*" />
-			<argument index="1" name="p_bytes" type="int" />
-			<argument index="2" name="r_sent" type="int32_t*" />
+			<param index="0" name="p_data" type="const uint8_t*" />
+			<param index="1" name="p_bytes" type="int" />
+			<param index="2" name="r_sent" type="int32_t*" />
 			<description>
 			</description>
 		</method>
 		<method name="_put_partial_data" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="p_data" type="const uint8_t*" />
-			<argument index="1" name="p_bytes" type="int" />
-			<argument index="2" name="r_sent" type="int32_t*" />
+			<param index="0" name="p_data" type="const uint8_t*" />
+			<param index="1" name="p_bytes" type="int" />
+			<param index="2" name="r_sent" type="int32_t*" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/StreamPeerSSL.xml b/doc/classes/StreamPeerSSL.xml
index 70762cbf6c..7fe9c54e3e 100644
--- a/doc/classes/StreamPeerSSL.xml
+++ b/doc/classes/StreamPeerSSL.xml
@@ -13,23 +13,23 @@
 	<methods>
 		<method name="accept_stream">
 			<return type="int" enum="Error" />
-			<argument index="0" name="stream" type="StreamPeer" />
-			<argument index="1" name="private_key" type="CryptoKey" />
-			<argument index="2" name="certificate" type="X509Certificate" />
-			<argument index="3" name="chain" type="X509Certificate" default="null" />
+			<param index="0" name="stream" type="StreamPeer" />
+			<param index="1" name="private_key" type="CryptoKey" />
+			<param index="2" name="certificate" type="X509Certificate" />
+			<param index="3" name="chain" type="X509Certificate" default="null" />
 			<description>
-				Accepts a peer connection as a server using the given [code]private_key[/code] and providing the given [code]certificate[/code] to the client. You can pass the optional [code]chain[/code] parameter to provide additional CA chain information along with the certificate.
+				Accepts a peer connection as a server using the given [param private_key] and providing the given [param certificate] to the client. You can pass the optional [param chain] parameter to provide additional CA chain information along with the certificate.
 			</description>
 		</method>
 		<method name="connect_to_stream">
 			<return type="int" enum="Error" />
-			<argument index="0" name="stream" type="StreamPeer" />
-			<argument index="1" name="validate_certs" type="bool" default="false" />
-			<argument index="2" name="for_hostname" type="String" default="&quot;&quot;" />
-			<argument index="3" name="valid_certificate" type="X509Certificate" default="null" />
+			<param index="0" name="stream" type="StreamPeer" />
+			<param index="1" name="validate_certs" type="bool" default="false" />
+			<param index="2" name="for_hostname" type="String" default="&quot;&quot;" />
+			<param index="3" name="valid_certificate" type="X509Certificate" default="null" />
 			<description>
-				Connects to a peer using an underlying [StreamPeer] [code]stream[/code]. If [code]validate_certs[/code] is [code]true[/code], [StreamPeerSSL] will validate that the certificate presented by the peer matches the [code]for_hostname[/code].
-				[b]Note:[/b] Specifying a custom [code]valid_certificate[/code] is not supported in HTML5 exports due to browsers restrictions.
+				Connects to a peer using an underlying [StreamPeer] [param stream]. If [param validate_certs] is [code]true[/code], [StreamPeerSSL] will validate that the certificate presented by the peer matches the [param for_hostname].
+				[b]Note:[/b] Specifying a custom [param valid_certificate] is not supported in HTML5 exports due to browsers restrictions.
 			</description>
 		</method>
 		<method name="disconnect_from_stream">
diff --git a/doc/classes/StreamPeerTCP.xml b/doc/classes/StreamPeerTCP.xml
index f06cf5c7a2..c08fb82797 100644
--- a/doc/classes/StreamPeerTCP.xml
+++ b/doc/classes/StreamPeerTCP.xml
@@ -12,17 +12,17 @@
 	<methods>
 		<method name="bind">
 			<return type="int" enum="Error" />
-			<argument index="0" name="port" type="int" />
-			<argument index="1" name="host" type="String" default="&quot;*&quot;" />
+			<param index="0" name="port" type="int" />
+			<param index="1" name="host" type="String" default="&quot;*&quot;" />
 			<description>
 				Opens the TCP socket, and binds it to the specified local address.
-				This method is generally not needed, and only used to force the subsequent call to [method connect_to_host] to use the specified [code]host[/code] and [code]port[/code] as source address. This can be desired in some NAT punchthrough techniques, or when forcing the source network interface.
+				This method is generally not needed, and only used to force the subsequent call to [method connect_to_host] to use the specified [param host] and [param port] as source address. This can be desired in some NAT punchthrough techniques, or when forcing the source network interface.
 			</description>
 		</method>
 		<method name="connect_to_host">
 			<return type="int" enum="Error" />
-			<argument index="0" name="host" type="String" />
-			<argument index="1" name="port" type="int" />
+			<param index="0" name="host" type="String" />
+			<param index="1" name="port" type="int" />
 			<description>
 				Connects to the specified [code]host:port[/code] pair. A hostname will be resolved if valid. Returns [constant OK] on success.
 			</description>
@@ -65,9 +65,9 @@
 		</method>
 		<method name="set_no_delay">
 			<return type="void" />
-			<argument index="0" name="enabled" type="bool" />
+			<param index="0" name="enabled" type="bool" />
 			<description>
-				If [code]enabled[/code] is [code]true[/code], packets will be sent immediately. If [code]enabled[/code] is [code]false[/code] (the default), packet transfers will be delayed and combined using [url=https://en.wikipedia.org/wiki/Nagle%27s_algorithm]Nagle's algorithm[/url].
+				If [param enabled] is [code]true[/code], packets will be sent immediately. If [param enabled] is [code]false[/code] (the default), packet transfers will be delayed and combined using [url=https://en.wikipedia.org/wiki/Nagle%27s_algorithm]Nagle's algorithm[/url].
 				[b]Note:[/b] It's recommended to leave this disabled for applications that send large packets or need to transfer a lot of data, as enabling this can decrease the total available bandwidth.
 			</description>
 		</method>
diff --git a/doc/classes/String.xml b/doc/classes/String.xml
index 9f197dae02..f1cd4d72f7 100644
--- a/doc/classes/String.xml
+++ b/doc/classes/String.xml
@@ -18,21 +18,21 @@
 		</constructor>
 		<constructor name="String">
 			<return type="String" />
-			<argument index="0" name="from" type="String" />
+			<param index="0" name="from" type="String" />
 			<description>
 				Constructs a [String] as a copy of the given [String].
 			</description>
 		</constructor>
 		<constructor name="String">
 			<return type="String" />
-			<argument index="0" name="from" type="NodePath" />
+			<param index="0" name="from" type="NodePath" />
 			<description>
 				Constructs a new String from the given [NodePath].
 			</description>
 		</constructor>
 		<constructor name="String">
 			<return type="String" />
-			<argument index="0" name="from" type="StringName" />
+			<param index="0" name="from" type="StringName" />
 			<description>
 				Constructs a new String from the given [StringName].
 			</description>
@@ -41,7 +41,7 @@
 	<methods>
 		<method name="begins_with" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="text" type="String" />
+			<param index="0" name="text" type="String" />
 			<description>
 				Returns [code]true[/code] if the string begins with the given string.
 			</description>
@@ -92,17 +92,17 @@
 		</method>
 		<method name="casecmp_to" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="to" type="String" />
+			<param index="0" name="to" type="String" />
 			<description>
 				Performs a case-sensitive comparison to another string. Returns [code]-1[/code] if less than, [code]1[/code] if greater than, or [code]0[/code] if equal. "less than" or "greater than" are determined by the [url=https://en.wikipedia.org/wiki/List_of_Unicode_characters]Unicode code points[/url] of each string, which roughly matches the alphabetical order.
-				[b]Behavior with different string lengths:[/b] Returns [code]1[/code] if the "base" string is longer than the [code]to[/code] string or [code]-1[/code] if the "base" string is shorter than the [code]to[/code] string. Keep in mind this length is determined by the number of Unicode codepoints, [i]not[/i] the actual visible characters.
-				[b]Behavior with empty strings:[/b] Returns [code]-1[/code] if the "base" string is empty, [code]1[/code] if the [code]to[/code] string is empty or [code]0[/code] if both strings are empty.
+				[b]Behavior with different string lengths:[/b] Returns [code]1[/code] if the "base" string is longer than the [param to] string or [code]-1[/code] if the "base" string is shorter than the [param to] string. Keep in mind this length is determined by the number of Unicode codepoints, [i]not[/i] the actual visible characters.
+				[b]Behavior with empty strings:[/b] Returns [code]-1[/code] if the "base" string is empty, [code]1[/code] if the [param to] string is empty or [code]0[/code] if both strings are empty.
 				To get a boolean result from a string comparison, use the [code]==[/code] operator instead. See also [method nocasecmp_to] and [method naturalnocasecmp_to].
 			</description>
 		</method>
 		<method name="chr" qualifiers="static">
 			<return type="String" />
-			<argument index="0" name="char" type="int" />
+			<param index="0" name="char" type="int" />
 			<description>
 				Directly converts an decimal integer to a unicode character. Tables of these characters can be found in various locations, for example [url=https://unicodelookup.com/]here.[/url]
 				[codeblock]
@@ -113,27 +113,27 @@
 		</method>
 		<method name="contains" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="what" type="String" />
+			<param index="0" name="what" type="String" />
 			<description>
 				Returns [code]true[/code] if the string contains the given string.
 			</description>
 		</method>
 		<method name="count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="what" type="String" />
-			<argument index="1" name="from" type="int" default="0" />
-			<argument index="2" name="to" type="int" default="0" />
+			<param index="0" name="what" type="String" />
+			<param index="1" name="from" type="int" default="0" />
+			<param index="2" name="to" type="int" default="0" />
 			<description>
-				Returns the number of occurrences of substring [code]what[/code] between [code]from[/code] and [code]to[/code] positions. If [code]from[/code] and [code]to[/code] equals 0 the whole string will be used. If only [code]to[/code] equals 0 the remained substring will be used.
+				Returns the number of occurrences of substring [param what] between [param from] and [param to] positions. If [param from] and [param to] equals 0 the whole string will be used. If only [param to] equals 0 the remained substring will be used.
 			</description>
 		</method>
 		<method name="countn" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="what" type="String" />
-			<argument index="1" name="from" type="int" default="0" />
-			<argument index="2" name="to" type="int" default="0" />
+			<param index="0" name="what" type="String" />
+			<param index="1" name="from" type="int" default="0" />
+			<param index="2" name="to" type="int" default="0" />
 			<description>
-				Returns the number of occurrences of substring [code]what[/code] (ignoring case) between [code]from[/code] and [code]to[/code] positions. If [code]from[/code] and [code]to[/code] equals 0 the whole string will be used. If only [code]to[/code] equals 0 the remained substring will be used.
+				Returns the number of occurrences of substring [param what] (ignoring case) between [param from] and [param to] positions. If [param from] and [param to] equals 0 the whole string will be used. If only [param to] equals 0 the remained substring will be used.
 			</description>
 		</method>
 		<method name="dedent" qualifiers="const">
@@ -144,15 +144,15 @@
 		</method>
 		<method name="ends_with" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="text" type="String" />
+			<param index="0" name="text" type="String" />
 			<description>
 				Returns [code]true[/code] if the string ends with the given string.
 			</description>
 		</method>
 		<method name="find" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="what" type="String" />
-			<argument index="1" name="from" type="int" default="0" />
+			<param index="0" name="what" type="String" />
+			<param index="1" name="from" type="int" default="0" />
 			<description>
 				Returns the index of the [b]first[/b] case-sensitive occurrence of the specified string in this instance, or [code]-1[/code]. Optionally, the starting search index can be specified, continuing to the end of the string.
 				[b]Note:[/b] If you just want to know whether a string contains a substring, use the [code]in[/code] operator as follows:
@@ -169,19 +169,19 @@
 		</method>
 		<method name="findn" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="what" type="String" />
-			<argument index="1" name="from" type="int" default="0" />
+			<param index="0" name="what" type="String" />
+			<param index="1" name="from" type="int" default="0" />
 			<description>
 				Returns the index of the [b]first[/b] case-insensitive occurrence of the specified string in this instance, or [code]-1[/code]. Optionally, the starting search index can be specified, continuing to the end of the string.
 			</description>
 		</method>
 		<method name="format" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="values" type="Variant" />
-			<argument index="1" name="placeholder" type="String" default="&quot;{_}&quot;" />
+			<param index="0" name="values" type="Variant" />
+			<param index="1" name="placeholder" type="String" default="&quot;{_}&quot;" />
 			<description>
-				Formats the string by replacing all occurrences of [code]placeholder[/code] with the elements of [code]values[/code].
-				[code]values[/code] can be a [Dictionary] or an [Array]. Any underscores in [code]placeholder[/code] will be replaced with the corresponding keys in advance. Array elements use their index as keys.
+				Formats the string by replacing all occurrences of [param placeholder] with the elements of [param values].
+				[param values] can be a [Dictionary] or an [Array]. Any underscores in [param placeholder] will be replaced with the corresponding keys in advance. Array elements use their index as keys.
 				[codeblock]
 				# Prints: Waiting for Godot is a play by Samuel Beckett, and Godot Engine is named after it.
 				var use_array_values = "Waiting for {0} is a play by {1}, and {0} Engine is named after it."
@@ -190,7 +190,7 @@
 				# Prints: User 42 is Godot.
 				print("User {id} is {name}.".format({"id": 42, "name": "Godot"}))
 				[/codeblock]
-				Some additional handling is performed when [code]values[/code] is an array. If [code]placeholder[/code] does not contain an underscore, the elements of the array will be used to replace one occurrence of the placeholder in turn; If an array element is another 2-element array, it'll be interpreted as a key-value pair.
+				Some additional handling is performed when [param values] is an array. If [param placeholder] does not contain an underscore, the elements of the array will be used to replace one occurrence of the placeholder in turn; If an array element is another 2-element array, it'll be interpreted as a key-value pair.
 				[codeblock]
 				# Prints: User 42 is Godot.
 				print("User {} is {}.".format([42, "Godot"], "{}"))
@@ -234,10 +234,10 @@
 		</method>
 		<method name="get_slice" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="delimiter" type="String" />
-			<argument index="1" name="slice" type="int" />
+			<param index="0" name="delimiter" type="String" />
+			<param index="1" name="slice" type="int" />
 			<description>
-				Splits a string using a [code]delimiter[/code] and returns a substring at index [code]slice[/code]. Returns an empty string if the index doesn't exist.
+				Splits a string using a [param delimiter] and returns a substring at index [param slice]. Returns an empty string if the index doesn't exist.
 				This is a more performant alternative to [method split] for cases when you need only one element from the array at a fixed index.
 				Example:
 				[codeblock]
@@ -247,17 +247,17 @@
 		</method>
 		<method name="get_slice_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="delimiter" type="String" />
+			<param index="0" name="delimiter" type="String" />
 			<description>
-				Splits a string using a [code]delimiter[/code] and returns a number of slices.
+				Splits a string using a [param delimiter] and returns a number of slices.
 			</description>
 		</method>
 		<method name="get_slicec" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="delimiter" type="int" />
-			<argument index="1" name="slice" type="int" />
+			<param index="0" name="delimiter" type="int" />
+			<param index="1" name="slice" type="int" />
 			<description>
-				Splits a string using a Unicode character with code [code]delimiter[/code] and returns a substring at index [code]slice[/code]. Returns an empty string if the index doesn't exist.
+				Splits a string using a Unicode character with code [param delimiter] and returns a substring at index [param slice]. Returns an empty string if the index doesn't exist.
 				This is a more performant alternative to [method split] for cases when you need only one element from the array at a fixed index.
 			</description>
 		</method>
@@ -286,7 +286,7 @@
 		</method>
 		<method name="humanize_size" qualifiers="static">
 			<return type="String" />
-			<argument index="0" name="size" type="int" />
+			<param index="0" name="size" type="int" />
 			<description>
 				Converts an integer representing a number of bytes into a human-readable form.
 				Note that this output is in [url=https://en.wikipedia.org/wiki/Binary_prefix#IEC_prefixes]IEC prefix format[/url], and includes [code]B[/code], [code]KiB[/code], [code]MiB[/code], [code]GiB[/code], [code]TiB[/code], [code]PiB[/code], and [code]EiB[/code].
@@ -294,19 +294,19 @@
 		</method>
 		<method name="indent" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="prefix" type="String" />
+			<param index="0" name="prefix" type="String" />
 			<description>
-				Returns a copy of the string with lines indented with [code]prefix[/code].
+				Returns a copy of the string with lines indented with [param prefix].
 				For example, the string can be indented with two tabs using [code]"\t\t"[/code], or four spaces using [code]"    "[/code]. The prefix can be any string so it can also be used to comment out strings with e.g. [code]"# "[/code]. See also [method dedent] to remove indentation.
 				[b]Note:[/b] Empty lines are kept empty.
 			</description>
 		</method>
 		<method name="insert" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="position" type="int" />
-			<argument index="1" name="what" type="String" />
+			<param index="0" name="position" type="int" />
+			<param index="1" name="what" type="String" />
 			<description>
-				Returns a copy of the string with the substring [code]what[/code] inserted at the given position.
+				Returns a copy of the string with the substring [param what] inserted at the given [param position].
 			</description>
 		</method>
 		<method name="is_absolute_path" qualifiers="const">
@@ -329,14 +329,14 @@
 		</method>
 		<method name="is_subsequence_of" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="text" type="String" />
+			<param index="0" name="text" type="String" />
 			<description>
 				Returns [code]true[/code] if this string is a subsequence of the given string.
 			</description>
 		</method>
 		<method name="is_subsequence_ofn" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="text" type="String" />
+			<param index="0" name="text" type="String" />
 			<description>
 				Returns [code]true[/code] if this string is a subsequence of the given string, without considering case.
 			</description>
@@ -362,9 +362,9 @@
 		</method>
 		<method name="is_valid_hex_number" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="with_prefix" type="bool" default="false" />
+			<param index="0" name="with_prefix" type="bool" default="false" />
 			<description>
-				Returns [code]true[/code] if this string contains a valid hexadecimal number. If [code]with_prefix[/code] is [code]true[/code], then a validity of the hexadecimal number is determined by [code]0x[/code] prefix, for instance: [code]0xDEADC0DE[/code].
+				Returns [code]true[/code] if this string contains a valid hexadecimal number. If [param with_prefix] is [code]true[/code], then a validity of the hexadecimal number is determined by [code]0x[/code] prefix, for instance: [code]0xDEADC0DE[/code].
 			</description>
 		</method>
 		<method name="is_valid_html_color" qualifiers="const">
@@ -405,9 +405,9 @@
 		</method>
 		<method name="join" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="parts" type="PackedStringArray" />
+			<param index="0" name="parts" type="PackedStringArray" />
 			<description>
-				Returns a [String] which is the concatenation of the [code]parts[/code]. The separator between elements is the string providing this method.
+				Returns a [String] which is the concatenation of the [param parts]. The separator between elements is the string providing this method.
 				Example:
 				[codeblocks]
 				[gdscript]
@@ -427,9 +427,9 @@
 		</method>
 		<method name="left" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="length" type="int" />
+			<param index="0" name="length" type="int" />
 			<description>
-				Returns a number of characters from the left of the string. If negative [code]length[/code] is used, the characters are counted downwards from [String]'s length.
+				Returns a number of characters from the left of the string. If negative [param length] is used, the characters are counted downwards from [String]'s length.
 				Examples:
 				[codeblock]
 				print("sample text".left(3)) #prints "sam"
@@ -440,35 +440,35 @@
 		<method name="length" qualifiers="const">
 			<return type="int" />
 			<description>
-				Returns the string's amount of characters.
+				Returns the number of characters in the string.
 			</description>
 		</method>
 		<method name="lpad" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="min_length" type="int" />
-			<argument index="1" name="character" type="String" default="&quot; &quot;" />
+			<param index="0" name="min_length" type="int" />
+			<param index="1" name="character" type="String" default="&quot; &quot;" />
 			<description>
-				Formats a string to be at least [code]min_length[/code] long by adding [code]character[/code]s to the left of the string.
+				Formats a string to be at least [param min_length] long by adding [param character]s to the left of the string.
 			</description>
 		</method>
 		<method name="lstrip" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="chars" type="String" />
+			<param index="0" name="chars" type="String" />
 			<description>
-				Returns a copy of the string with characters removed from the left. The [code]chars[/code] argument is a string specifying the set of characters to be removed.
-				[b]Note:[/b] The [code]chars[/code] is not a prefix. See [method trim_prefix] method that will remove a single prefix string rather than a set of characters.
+				Returns a copy of the string with characters removed from the left. The [param chars] argument is a string specifying the set of characters to be removed.
+				[b]Note:[/b] The [param chars] is not a prefix. See [method trim_prefix] method that will remove a single prefix string rather than a set of characters.
 			</description>
 		</method>
 		<method name="match" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="expr" type="String" />
+			<param index="0" name="expr" type="String" />
 			<description>
 				Does a simple case-sensitive expression match, where [code]"*"[/code] matches zero or more arbitrary characters and [code]"?"[/code] matches any single character except a period ([code]"."[/code]). An empty string or empty expression always evaluates to [code]false[/code].
 			</description>
 		</method>
 		<method name="matchn" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="expr" type="String" />
+			<param index="0" name="expr" type="String" />
 			<description>
 				Does a simple case-insensitive expression match, where [code]"*"[/code] matches zero or more arbitrary characters and [code]"?"[/code] matches any single character except a period ([code]"."[/code]). An empty string or empty expression always evaluates to [code]false[/code].
 			</description>
@@ -487,32 +487,32 @@
 		</method>
 		<method name="naturalnocasecmp_to" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="to" type="String" />
+			<param index="0" name="to" type="String" />
 			<description>
 				Performs a case-insensitive [i]natural order[/i] comparison to another string. Returns [code]-1[/code] if less than, [code]1[/code] if greater than, or [code]0[/code] if equal. "less than" or "greater than" are determined by the [url=https://en.wikipedia.org/wiki/List_of_Unicode_characters]Unicode code points[/url] of each string, which roughly matches the alphabetical order. Internally, lowercase characters will be converted to uppercase during the comparison.
 				When used for sorting, natural order comparison will order suites of numbers as expected by most people. If you sort the numbers from 1 to 10 using natural order, you will get [code][1, 2, 3, ...][/code] instead of [code][1, 10, 2, 3, ...][/code].
-				[b]Behavior with different string lengths:[/b] Returns [code]1[/code] if the "base" string is longer than the [code]to[/code] string or [code]-1[/code] if the "base" string is shorter than the [code]to[/code] string. Keep in mind this length is determined by the number of Unicode codepoints, [i]not[/i] the actual visible characters.
-				[b]Behavior with empty strings:[/b] Returns [code]-1[/code] if the "base" string is empty, [code]1[/code] if the [code]to[/code] string is empty or [code]0[/code] if both strings are empty.
+				[b]Behavior with different string lengths:[/b] Returns [code]1[/code] if the "base" string is longer than the [param to] string or [code]-1[/code] if the "base" string is shorter than the [param to] string. Keep in mind this length is determined by the number of Unicode codepoints, [i]not[/i] the actual visible characters.
+				[b]Behavior with empty strings:[/b] Returns [code]-1[/code] if the "base" string is empty, [code]1[/code] if the [param to] string is empty or [code]0[/code] if both strings are empty.
 				To get a boolean result from a string comparison, use the [code]==[/code] operator instead. See also [method nocasecmp_to] and [method casecmp_to].
 			</description>
 		</method>
 		<method name="nocasecmp_to" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="to" type="String" />
+			<param index="0" name="to" type="String" />
 			<description>
 				Performs a case-insensitive comparison to another string. Returns [code]-1[/code] if less than, [code]1[/code] if greater than, or [code]0[/code] if equal. "less than" or "greater than" are determined by the [url=https://en.wikipedia.org/wiki/List_of_Unicode_characters]Unicode code points[/url] of each string, which roughly matches the alphabetical order. Internally, lowercase characters will be converted to uppercase during the comparison.
-				[b]Behavior with different string lengths:[/b] Returns [code]1[/code] if the "base" string is longer than the [code]to[/code] string or [code]-1[/code] if the "base" string is shorter than the [code]to[/code] string. Keep in mind this length is determined by the number of Unicode codepoints, [i]not[/i] the actual visible characters.
-				[b]Behavior with empty strings:[/b] Returns [code]-1[/code] if the "base" string is empty, [code]1[/code] if the [code]to[/code] string is empty or [code]0[/code] if both strings are empty.
+				[b]Behavior with different string lengths:[/b] Returns [code]1[/code] if the "base" string is longer than the [param to] string or [code]-1[/code] if the "base" string is shorter than the [param to] string. Keep in mind this length is determined by the number of Unicode codepoints, [i]not[/i] the actual visible characters.
+				[b]Behavior with empty strings:[/b] Returns [code]-1[/code] if the "base" string is empty, [code]1[/code] if the [param to] string is empty or [code]0[/code] if both strings are empty.
 				To get a boolean result from a string comparison, use the [code]==[/code] operator instead. See also [method casecmp_to] and [method naturalnocasecmp_to].
 			</description>
 		</method>
 		<method name="num" qualifiers="static">
 			<return type="String" />
-			<argument index="0" name="number" type="float" />
-			<argument index="1" name="decimals" type="int" default="-1" />
+			<param index="0" name="number" type="float" />
+			<param index="1" name="decimals" type="int" default="-1" />
 			<description>
 				Converts a [float] to a string representation of a decimal number.
-				The number of decimal places can be specified with [code]decimals[/code]. If [code]decimals[/code] is [code]-1[/code] (default), decimal places will be automatically adjusted so that the string representation has 14 significant digits (counting both digits to the left and the right of the decimal point).
+				The number of decimal places can be specified with [param decimals]. If [param decimals] is [code]-1[/code] (default), decimal places will be automatically adjusted so that the string representation has 14 significant digits (counting both digits to the left and the right of the decimal point).
 				Trailing zeros are not included in the string. The last digit will be rounded and not truncated.
 				Some examples:
 				[codeblock]
@@ -522,7 +522,7 @@
 				# Last digit will be rounded up here, which reduces total digit count since
 				# trailing zeros are removed:
 				String.num(42.129999, 5) # "42.13"
-				# If `decimals` is not specified, the total amount of significant digits is 14:
+				# If `decimals` is not specified, the total number of significant digits is 14:
 				String.num(-0.0000012345432123454321)     # "-0.00000123454321"
 				String.num(-10000.0000012345432123454321) # "-10000.0000012345"
 				[/codeblock]
@@ -530,93 +530,93 @@
 		</method>
 		<method name="num_int64" qualifiers="static">
 			<return type="String" />
-			<argument index="0" name="number" type="int" />
-			<argument index="1" name="base" type="int" default="10" />
-			<argument index="2" name="capitalize_hex" type="bool" default="false" />
+			<param index="0" name="number" type="int" />
+			<param index="1" name="base" type="int" default="10" />
+			<param index="2" name="capitalize_hex" type="bool" default="false" />
 			<description>
 				Converts a signed [int] to a string representation of a number.
 			</description>
 		</method>
 		<method name="num_scientific" qualifiers="static">
 			<return type="String" />
-			<argument index="0" name="number" type="float" />
+			<param index="0" name="number" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="num_uint64" qualifiers="static">
 			<return type="String" />
-			<argument index="0" name="number" type="int" />
-			<argument index="1" name="base" type="int" default="10" />
-			<argument index="2" name="capitalize_hex" type="bool" default="false" />
+			<param index="0" name="number" type="int" />
+			<param index="1" name="base" type="int" default="10" />
+			<param index="2" name="capitalize_hex" type="bool" default="false" />
 			<description>
 				Converts a unsigned [int] to a string representation of a number.
 			</description>
 		</method>
 		<method name="pad_decimals" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="digits" type="int" />
+			<param index="0" name="digits" type="int" />
 			<description>
-				Formats a number to have an exact number of [code]digits[/code] after the decimal point.
+				Formats a number to have an exact number of [param digits] after the decimal point.
 			</description>
 		</method>
 		<method name="pad_zeros" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="digits" type="int" />
+			<param index="0" name="digits" type="int" />
 			<description>
-				Formats a number to have an exact number of [code]digits[/code] before the decimal point.
+				Formats a number to have an exact number of [param digits] before the decimal point.
 			</description>
 		</method>
 		<method name="plus_file" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="file" type="String" />
+			<param index="0" name="file" type="String" />
 			<description>
-				If the string is a path, this concatenates [code]file[/code] at the end of the string as a subpath. E.g. [code]"this/is".plus_file("path") == "this/is/path"[/code].
+				If the string is a path, this concatenates [param file] at the end of the string as a subpath. E.g. [code]"this/is".plus_file("path") == "this/is/path"[/code].
 			</description>
 		</method>
 		<method name="repeat" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="count" type="int" />
+			<param index="0" name="count" type="int" />
 			<description>
 				Returns original string repeated a number of times. The number of repetitions is given by the argument.
 			</description>
 		</method>
 		<method name="replace" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="what" type="String" />
-			<argument index="1" name="forwhat" type="String" />
+			<param index="0" name="what" type="String" />
+			<param index="1" name="forwhat" type="String" />
 			<description>
 				Replaces occurrences of a case-sensitive substring with the given one inside the string.
 			</description>
 		</method>
 		<method name="replacen" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="what" type="String" />
-			<argument index="1" name="forwhat" type="String" />
+			<param index="0" name="what" type="String" />
+			<param index="1" name="forwhat" type="String" />
 			<description>
 				Replaces occurrences of a case-insensitive substring with the given one inside the string.
 			</description>
 		</method>
 		<method name="rfind" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="what" type="String" />
-			<argument index="1" name="from" type="int" default="-1" />
+			<param index="0" name="what" type="String" />
+			<param index="1" name="from" type="int" default="-1" />
 			<description>
 				Returns the index of the [b]last[/b] case-sensitive occurrence of the specified string in this instance, or [code]-1[/code]. Optionally, the starting search index can be specified, continuing to the beginning of the string.
 			</description>
 		</method>
 		<method name="rfindn" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="what" type="String" />
-			<argument index="1" name="from" type="int" default="-1" />
+			<param index="0" name="what" type="String" />
+			<param index="1" name="from" type="int" default="-1" />
 			<description>
 				Returns the index of the [b]last[/b] case-insensitive occurrence of the specified string in this instance, or [code]-1[/code]. Optionally, the starting search index can be specified, continuing to the beginning of the string.
 			</description>
 		</method>
 		<method name="right" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="length" type="int" />
+			<param index="0" name="length" type="int" />
 			<description>
-				Returns a number of characters from the right of the string. If negative [code]length[/code] is used, the characters are counted downwards from [String]'s length.
+				Returns a number of characters from the right of the string. If negative [param length] is used, the characters are counted downwards from [String]'s length.
 				Examples:
 				[codeblock]
 				print("sample text".right(3)) #prints "ext"
@@ -626,21 +626,22 @@
 		</method>
 		<method name="rpad" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="min_length" type="int" />
-			<argument index="1" name="character" type="String" default="&quot; &quot;" />
+			<param index="0" name="min_length" type="int" />
+			<param index="1" name="character" type="String" default="&quot; &quot;" />
 			<description>
-				Formats a string to be at least [code]min_length[/code] long by adding [code]character[/code]s to the right of the string.
+				Formats a string to be at least [param min_length] long by adding [param character]s to the right of the string.
 			</description>
 		</method>
 		<method name="rsplit" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="delimiter" type="String" />
-			<argument index="1" name="allow_empty" type="bool" default="true" />
-			<argument index="2" name="maxsplit" type="int" default="0" />
+			<param index="0" name="delimiter" type="String" />
+			<param index="1" name="allow_empty" type="bool" default="true" />
+			<param index="2" name="maxsplit" type="int" default="0" />
 			<description>
-				Splits the string by a [code]delimiter[/code] string and returns an array of the substrings, starting from right.
+				Splits the string by a [param delimiter] string and returns an array of the substrings, starting from right.
 				The splits in the returned array are sorted in the same order as the original string, from left to right.
-				If [code]maxsplit[/code] is specified, it defines the number of splits to do from the right up to [code]maxsplit[/code]. The default value of 0 means that all items are split, thus giving the same result as [method split].
+				If [param allow_empty] is [code]true[/code], and there are two adjacent delimiters in the string, it will add an empty string to the array of substrings at this position.
+				If [param maxsplit] is specified, it defines the number of splits to do from the right up to [param maxsplit]. The default value of 0 means that all items are split, thus giving the same result as [method split].
 				Example:
 				[codeblocks]
 				[gdscript]
@@ -658,10 +659,10 @@
 		</method>
 		<method name="rstrip" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="chars" type="String" />
+			<param index="0" name="chars" type="String" />
 			<description>
-				Returns a copy of the string with characters removed from the right. The [code]chars[/code] argument is a string specifying the set of characters to be removed.
-				[b]Note:[/b] The [code]chars[/code] is not a suffix. See [method trim_suffix] method that will remove a single suffix string rather than a set of characters.
+				Returns a copy of the string with characters removed from the right. The [param chars] argument is a string specifying the set of characters to be removed.
+				[b]Note:[/b] The [param chars] is not a suffix. See [method trim_suffix] method that will remove a single suffix string rather than a set of characters.
 			</description>
 		</method>
 		<method name="sha1_buffer" qualifiers="const">
@@ -690,7 +691,7 @@
 		</method>
 		<method name="similarity" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="text" type="String" />
+			<param index="0" name="text" type="String" />
 			<description>
 				Returns the similarity index ([url=https://en.wikipedia.org/wiki/S%C3%B8rensen%E2%80%93Dice_coefficient]Sorensen-Dice coefficient[/url]) of this string compared to another. A result of 1.0 means totally similar, while 0.0 means totally dissimilar.
 				[codeblock]
@@ -709,12 +710,13 @@
 		</method>
 		<method name="split" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="delimiter" type="String" />
-			<argument index="1" name="allow_empty" type="bool" default="true" />
-			<argument index="2" name="maxsplit" type="int" default="0" />
+			<param index="0" name="delimiter" type="String" />
+			<param index="1" name="allow_empty" type="bool" default="true" />
+			<param index="2" name="maxsplit" type="int" default="0" />
 			<description>
-				Splits the string by a [code]delimiter[/code] string and returns an array of the substrings. The [code]delimiter[/code] can be of any length.
-				If [code]maxsplit[/code] is specified, it defines the number of splits to do from the left up to [code]maxsplit[/code]. The default value of [code]0[/code] means that all items are split.
+				Splits the string by a [param delimiter] string and returns an array of the substrings. The [param delimiter] can be of any length.
+				If [param allow_empty] is [code]true[/code], and there are two adjacent delimiters in the string, it will add an empty string to the array of substrings at this position.
+				If [param maxsplit] is specified, it defines the number of splits to do from the left up to [param maxsplit]. The default value of [code]0[/code] means that all items are split.
 				If you need only one element from the array at a specific index, [method get_slice] is a more performant option.
 				Example:
 				[codeblocks]
@@ -737,17 +739,18 @@
 		</method>
 		<method name="split_floats" qualifiers="const">
 			<return type="PackedFloat32Array" />
-			<argument index="0" name="delimiter" type="String" />
-			<argument index="1" name="allow_empty" type="bool" default="true" />
+			<param index="0" name="delimiter" type="String" />
+			<param index="1" name="allow_empty" type="bool" default="true" />
 			<description>
 				Splits the string in floats by using a delimiter string and returns an array of the substrings.
 				For example, [code]"1,2.5,3"[/code] will return [code][1,2.5,3][/code] if split by [code]","[/code].
+				If [param allow_empty] is [code]true[/code], and there are two adjacent delimiters in the string, it will add an empty string to the array of substrings at this position.
 			</description>
 		</method>
 		<method name="strip_edges" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="left" type="bool" default="true" />
-			<argument index="1" name="right" type="bool" default="true" />
+			<param index="0" name="left" type="bool" default="true" />
+			<param index="1" name="right" type="bool" default="true" />
 			<description>
 				Returns a copy of the string stripped of any non-printable character (including tabulations, spaces and line breaks) at the beginning and the end. The optional arguments are used to toggle stripping on the left and right edges respectively.
 			</description>
@@ -760,10 +763,10 @@
 		</method>
 		<method name="substr" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="from" type="int" />
-			<argument index="1" name="len" type="int" default="-1" />
+			<param index="0" name="from" type="int" />
+			<param index="1" name="len" type="int" default="-1" />
 			<description>
-				Returns part of the string from the position [code]from[/code] with length [code]len[/code]. Argument [code]len[/code] is optional and using [code]-1[/code] will return remaining characters from given position.
+				Returns part of the string from the position [param from] with length [param len]. Argument [param len] is optional and using [code]-1[/code] will return remaining characters from given position.
 			</description>
 		</method>
 		<method name="to_ascii_buffer" qualifiers="const">
@@ -827,23 +830,23 @@
 		</method>
 		<method name="trim_prefix" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="prefix" type="String" />
+			<param index="0" name="prefix" type="String" />
 			<description>
 				Removes a given string from the start if it starts with it or leaves the string unchanged.
 			</description>
 		</method>
 		<method name="trim_suffix" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="suffix" type="String" />
+			<param index="0" name="suffix" type="String" />
 			<description>
 				Removes a given string from the end if it ends with it or leaves the string unchanged.
 			</description>
 		</method>
 		<method name="unicode_at" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="at" type="int" />
+			<param index="0" name="at" type="int" />
 			<description>
-				Returns the character code at position [code]at[/code].
+				Returns the character code at position [param at].
 			</description>
 		</method>
 		<method name="uri_decode" qualifiers="const">
@@ -882,9 +885,9 @@
 		</method>
 		<method name="xml_escape" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="escape_quotes" type="bool" default="false" />
+			<param index="0" name="escape_quotes" type="bool" default="false" />
 			<description>
-				Returns a copy of the string with special characters escaped using the XML standard. If [code]escape_quotes[/code] is [code]true[/code], the single quote ([code]'[/code]) and double quote ([code]"[/code]) characters are also escaped.
+				Returns a copy of the string with special characters escaped using the XML standard. If [param escape_quotes] is [code]true[/code], the single quote ([code]'[/code]) and double quote ([code]"[/code]) characters are also escaped.
 			</description>
 		</method>
 		<method name="xml_unescape" qualifiers="const">
@@ -897,73 +900,73 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="String" />
+			<param index="0" name="right" type="String" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="StringName" />
+			<param index="0" name="right" type="StringName" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator %">
 			<return type="String" />
-			<argument index="0" name="right" type="Variant" />
+			<param index="0" name="right" type="Variant" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="String" />
-			<argument index="0" name="right" type="String" />
+			<param index="0" name="right" type="String" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="String" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator &lt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="String" />
+			<param index="0" name="right" type="String" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator &lt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="String" />
+			<param index="0" name="right" type="String" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="String" />
+			<param index="0" name="right" type="String" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="StringName" />
+			<param index="0" name="right" type="StringName" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator &gt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="String" />
+			<param index="0" name="right" type="String" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator &gt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="String" />
+			<param index="0" name="right" type="String" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator []">
 			<return type="String" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</operator>
diff --git a/doc/classes/StringName.xml b/doc/classes/StringName.xml
index a2bcac9788..c40d8929fc 100644
--- a/doc/classes/StringName.xml
+++ b/doc/classes/StringName.xml
@@ -19,14 +19,14 @@
 		</constructor>
 		<constructor name="StringName">
 			<return type="StringName" />
-			<argument index="0" name="from" type="StringName" />
+			<param index="0" name="from" type="StringName" />
 			<description>
 				Constructs a [StringName] as a copy of the given [StringName].
 			</description>
 		</constructor>
 		<constructor name="StringName">
 			<return type="StringName" />
-			<argument index="0" name="from" type="String" />
+			<param index="0" name="from" type="String" />
 			<description>
 				Creates a new [StringName] from the given [String]. [code]StringName("example")[/code] is equivalent to [code]&amp;"example"[/code].
 			</description>
@@ -43,49 +43,49 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="String" />
+			<param index="0" name="right" type="String" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="StringName" />
+			<param index="0" name="right" type="StringName" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator &lt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="StringName" />
+			<param index="0" name="right" type="StringName" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator &lt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="StringName" />
+			<param index="0" name="right" type="StringName" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="String" />
+			<param index="0" name="right" type="String" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="StringName" />
+			<param index="0" name="right" type="StringName" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator &gt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="StringName" />
+			<param index="0" name="right" type="StringName" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator &gt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="StringName" />
+			<param index="0" name="right" type="StringName" />
 			<description>
 			</description>
 		</operator>
diff --git a/doc/classes/StyleBox.xml b/doc/classes/StyleBox.xml
index d863e3c652..d9c19a0c86 100644
--- a/doc/classes/StyleBox.xml
+++ b/doc/classes/StyleBox.xml
@@ -12,8 +12,8 @@
 	<methods>
 		<method name="_draw" qualifiers="virtual const">
 			<return type="void" />
-			<argument index="0" name="to_canvas_item" type="RID" />
-			<argument index="1" name="rect" type="Rect2" />
+			<param index="0" name="to_canvas_item" type="RID" />
+			<param index="1" name="rect" type="Rect2" />
 			<description>
 			</description>
 		</method>
@@ -24,27 +24,27 @@
 		</method>
 		<method name="_get_draw_rect" qualifiers="virtual const">
 			<return type="Rect2" />
-			<argument index="0" name="rect" type="Rect2" />
+			<param index="0" name="rect" type="Rect2" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_style_margin" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="side" type="int" enum="Side" />
+			<param index="0" name="side" type="int" enum="Side" />
 			<description>
 			</description>
 		</method>
 		<method name="_test_mask" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="point" type="Vector2" />
-			<argument index="1" name="rect" type="Rect2" />
+			<param index="0" name="point" type="Vector2" />
+			<param index="1" name="rect" type="Rect2" />
 			<description>
 			</description>
 		</method>
 		<method name="draw" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="canvas_item" type="RID" />
-			<argument index="1" name="rect" type="Rect2" />
+			<param index="0" name="canvas_item" type="RID" />
+			<param index="1" name="rect" type="Rect2" />
 			<description>
 				Draws this stylebox using a canvas item identified by the given [RID].
 				The [RID] value can either be the result of [method CanvasItem.get_canvas_item] called on an existing [CanvasItem]-derived node, or directly from creating a canvas item in the [RenderingServer] with [method RenderingServer.canvas_item_create].
@@ -64,14 +64,14 @@
 		</method>
 		<method name="get_default_margin" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="margin" type="int" enum="Side" />
+			<param index="0" name="margin" type="int" enum="Side" />
 			<description>
 				Returns the default margin of the specified [enum Side].
 			</description>
 		</method>
 		<method name="get_margin" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="margin" type="int" enum="Side" />
+			<param index="0" name="margin" type="int" enum="Side" />
 			<description>
 				Returns the content margin offset for the specified [enum Side].
 				Positive values reduce size inwards, unlike [Control]'s margin values.
@@ -91,16 +91,16 @@
 		</method>
 		<method name="set_default_margin">
 			<return type="void" />
-			<argument index="0" name="margin" type="int" enum="Side" />
-			<argument index="1" name="offset" type="float" />
+			<param index="0" name="margin" type="int" enum="Side" />
+			<param index="1" name="offset" type="float" />
 			<description>
-				Sets the default value of the specified [enum Side] to [code]offset[/code] pixels.
+				Sets the default value of the specified [enum Side] to [param offset] pixels.
 			</description>
 		</method>
 		<method name="test_mask" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="point" type="Vector2" />
-			<argument index="1" name="rect" type="Rect2" />
+			<param index="0" name="point" type="Vector2" />
+			<param index="1" name="rect" type="Rect2" />
 			<description>
 				Test a position in a rectangle, return whether it passes the mask test.
 			</description>
diff --git a/doc/classes/StyleBoxFlat.xml b/doc/classes/StyleBoxFlat.xml
index c80f8dcbb1..c4024fa4b5 100644
--- a/doc/classes/StyleBoxFlat.xml
+++ b/doc/classes/StyleBoxFlat.xml
@@ -26,7 +26,7 @@
 	<methods>
 		<method name="get_border_width" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="margin" type="int" enum="Side" />
+			<param index="0" name="margin" type="int" enum="Side" />
 			<description>
 				Returns the specified [enum Side]'s border width.
 			</description>
@@ -39,81 +39,81 @@
 		</method>
 		<method name="get_corner_radius" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="corner" type="int" enum="Corner" />
+			<param index="0" name="corner" type="int" enum="Corner" />
 			<description>
-				Returns the given [code]corner[/code]'s radius. See [enum Corner] for possible values.
+				Returns the given [param corner]'s radius. See [enum Corner] for possible values.
 			</description>
 		</method>
 		<method name="get_expand_margin" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="margin" type="int" enum="Side" />
+			<param index="0" name="margin" type="int" enum="Side" />
 			<description>
 				Returns the size of the specified [enum Side]'s expand margin.
 			</description>
 		</method>
 		<method name="set_border_width">
 			<return type="void" />
-			<argument index="0" name="margin" type="int" enum="Side" />
-			<argument index="1" name="width" type="int" />
+			<param index="0" name="margin" type="int" enum="Side" />
+			<param index="1" name="width" type="int" />
 			<description>
-				Sets the specified [enum Side]'s border width to [code]width[/code] pixels.
+				Sets the specified [enum Side]'s border width to [param width] pixels.
 			</description>
 		</method>
 		<method name="set_border_width_all">
 			<return type="void" />
-			<argument index="0" name="width" type="int" />
+			<param index="0" name="width" type="int" />
 			<description>
-				Sets the border width to [code]width[/code] pixels for all sides.
+				Sets the border width to [param width] pixels for all sides.
 			</description>
 		</method>
 		<method name="set_corner_radius">
 			<return type="void" />
-			<argument index="0" name="corner" type="int" enum="Corner" />
-			<argument index="1" name="radius" type="int" />
+			<param index="0" name="corner" type="int" enum="Corner" />
+			<param index="1" name="radius" type="int" />
 			<description>
-				Sets the corner radius to [code]radius[/code] pixels for the given [code]corner[/code]. See [enum Corner] for possible values.
+				Sets the corner radius to [param radius] pixels for the given [param corner]. See [enum Corner] for possible values.
 			</description>
 		</method>
 		<method name="set_corner_radius_all">
 			<return type="void" />
-			<argument index="0" name="radius" type="int" />
+			<param index="0" name="radius" type="int" />
 			<description>
-				Sets the corner radius to [code]radius[/code] pixels for all corners.
+				Sets the corner radius to [param radius] pixels for all corners.
 			</description>
 		</method>
 		<method name="set_corner_radius_individual">
 			<return type="void" />
-			<argument index="0" name="radius_top_left" type="int" />
-			<argument index="1" name="radius_top_right" type="int" />
-			<argument index="2" name="radius_bottom_right" type="int" />
-			<argument index="3" name="radius_bottom_left" type="int" />
+			<param index="0" name="radius_top_left" type="int" />
+			<param index="1" name="radius_top_right" type="int" />
+			<param index="2" name="radius_bottom_right" type="int" />
+			<param index="3" name="radius_bottom_left" type="int" />
 			<description>
-				Sets the corner radius for each corner to [code]radius_top_left[/code], [code]radius_top_right[/code], [code]radius_bottom_right[/code], and [code]radius_bottom_left[/code] pixels.
+				Sets the corner radius for each corner to [param radius_top_left], [param radius_top_right], [param radius_bottom_right], and [param radius_bottom_left] pixels.
 			</description>
 		</method>
 		<method name="set_expand_margin">
 			<return type="void" />
-			<argument index="0" name="margin" type="int" enum="Side" />
-			<argument index="1" name="size" type="float" />
+			<param index="0" name="margin" type="int" enum="Side" />
+			<param index="1" name="size" type="float" />
 			<description>
-				Sets the expand margin to [code]size[/code] pixels for the specified [enum Side].
+				Sets the expand margin to [param size] pixels for the specified [enum Side].
 			</description>
 		</method>
 		<method name="set_expand_margin_all">
 			<return type="void" />
-			<argument index="0" name="size" type="float" />
+			<param index="0" name="size" type="float" />
 			<description>
-				Sets the expand margin to [code]size[/code] pixels for all margins.
+				Sets the expand margin to [param size] pixels for all margins.
 			</description>
 		</method>
 		<method name="set_expand_margin_individual">
 			<return type="void" />
-			<argument index="0" name="size_left" type="float" />
-			<argument index="1" name="size_top" type="float" />
-			<argument index="2" name="size_right" type="float" />
-			<argument index="3" name="size_bottom" type="float" />
+			<param index="0" name="size_left" type="float" />
+			<param index="1" name="size_top" type="float" />
+			<param index="2" name="size_right" type="float" />
+			<param index="3" name="size_bottom" type="float" />
 			<description>
-				Sets the expand margin for each margin to [code]size_left[/code], [code]size_top[/code], [code]size_right[/code], and [code]size_bottom[/code] pixels.
+				Sets the expand margin for each margin to [param size_left], [param size_top], [param size_right], and [param size_bottom] pixels.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/StyleBoxTexture.xml b/doc/classes/StyleBoxTexture.xml
index 8c324d4e37..7db70e630d 100644
--- a/doc/classes/StyleBoxTexture.xml
+++ b/doc/classes/StyleBoxTexture.xml
@@ -11,49 +11,49 @@
 	<methods>
 		<method name="get_expand_margin_size" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="margin" type="int" enum="Side" />
+			<param index="0" name="margin" type="int" enum="Side" />
 			<description>
 				Returns the expand margin size of the specified [enum Side].
 			</description>
 		</method>
 		<method name="get_margin_size" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="margin" type="int" enum="Side" />
+			<param index="0" name="margin" type="int" enum="Side" />
 			<description>
 				Returns the margin size of the specified [enum Side].
 			</description>
 		</method>
 		<method name="set_expand_margin_all">
 			<return type="void" />
-			<argument index="0" name="size" type="float" />
+			<param index="0" name="size" type="float" />
 			<description>
-				Sets the expand margin to [code]size[/code] pixels for all margins.
+				Sets the expand margin to [param size] pixels for all margins.
 			</description>
 		</method>
 		<method name="set_expand_margin_individual">
 			<return type="void" />
-			<argument index="0" name="size_left" type="float" />
-			<argument index="1" name="size_top" type="float" />
-			<argument index="2" name="size_right" type="float" />
-			<argument index="3" name="size_bottom" type="float" />
+			<param index="0" name="size_left" type="float" />
+			<param index="1" name="size_top" type="float" />
+			<param index="2" name="size_right" type="float" />
+			<param index="3" name="size_bottom" type="float" />
 			<description>
-				Sets the expand margin for each margin to [code]size_left[/code], [code]size_top[/code], [code]size_right[/code], and [code]size_bottom[/code] pixels.
+				Sets the expand margin for each margin to [param size_left], [param size_top], [param size_right], and [param size_bottom] pixels.
 			</description>
 		</method>
 		<method name="set_expand_margin_size">
 			<return type="void" />
-			<argument index="0" name="margin" type="int" enum="Side" />
-			<argument index="1" name="size" type="float" />
+			<param index="0" name="margin" type="int" enum="Side" />
+			<param index="1" name="size" type="float" />
 			<description>
-				Sets the expand margin to [code]size[/code] pixels for the specified [enum Side].
+				Sets the expand margin to [param size] pixels for the specified [enum Side].
 			</description>
 		</method>
 		<method name="set_margin_size">
 			<return type="void" />
-			<argument index="0" name="margin" type="int" enum="Side" />
-			<argument index="1" name="size" type="float" />
+			<param index="0" name="margin" type="int" enum="Side" />
+			<param index="1" name="size" type="float" />
 			<description>
-				Sets the margin to [code]size[/code] pixels for the specified [enum Side].
+				Sets the margin to [param size] pixels for the specified [enum Side].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/SurfaceTool.xml b/doc/classes/SurfaceTool.xml
index ad638a680b..ccec691107 100644
--- a/doc/classes/SurfaceTool.xml
+++ b/doc/classes/SurfaceTool.xml
@@ -33,19 +33,19 @@
 	<methods>
 		<method name="add_index">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Adds a vertex to index array if you are using indexed vertices. Does not need to be called before adding vertices.
 			</description>
 		</method>
 		<method name="add_triangle_fan">
 			<return type="void" />
-			<argument index="0" name="vertices" type="PackedVector3Array" />
-			<argument index="1" name="uvs" type="PackedVector2Array" default="PackedVector2Array()" />
-			<argument index="2" name="colors" type="PackedColorArray" default="PackedColorArray()" />
-			<argument index="3" name="uv2s" type="PackedVector2Array" default="PackedVector2Array()" />
-			<argument index="4" name="normals" type="PackedVector3Array" default="PackedVector3Array()" />
-			<argument index="5" name="tangents" type="Array" default="[]" />
+			<param index="0" name="vertices" type="PackedVector3Array" />
+			<param index="1" name="uvs" type="PackedVector2Array" default="PackedVector2Array()" />
+			<param index="2" name="colors" type="PackedColorArray" default="PackedColorArray()" />
+			<param index="3" name="uv2s" type="PackedVector2Array" default="PackedVector2Array()" />
+			<param index="4" name="normals" type="PackedVector3Array" default="PackedVector3Array()" />
+			<param index="5" name="tangents" type="Array" default="[]" />
 			<description>
 				Inserts a triangle fan made of array data into [Mesh] being constructed.
 				Requires the primitive type be set to [constant Mesh.PRIMITIVE_TRIANGLES].
@@ -53,23 +53,23 @@
 		</method>
 		<method name="add_vertex">
 			<return type="void" />
-			<argument index="0" name="vertex" type="Vector3" />
+			<param index="0" name="vertex" type="Vector3" />
 			<description>
 				Specifies the position of current vertex. Should be called after specifying other vertex properties (e.g. Color, UV).
 			</description>
 		</method>
 		<method name="append_from">
 			<return type="void" />
-			<argument index="0" name="existing" type="Mesh" />
-			<argument index="1" name="surface" type="int" />
-			<argument index="2" name="transform" type="Transform3D" />
+			<param index="0" name="existing" type="Mesh" />
+			<param index="1" name="surface" type="int" />
+			<param index="2" name="transform" type="Transform3D" />
 			<description>
 				Append vertices from a given [Mesh] surface onto the current vertex array with specified [Transform3D].
 			</description>
 		</method>
 		<method name="begin">
 			<return type="void" />
-			<argument index="0" name="primitive" type="int" enum="Mesh.PrimitiveType" />
+			<param index="0" name="primitive" type="int" enum="Mesh.PrimitiveType" />
 			<description>
 				Called before adding any vertices. Takes the primitive type as an argument (e.g. [constant Mesh.PRIMITIVE_TRIANGLES]).
 			</description>
@@ -82,11 +82,11 @@
 		</method>
 		<method name="commit">
 			<return type="ArrayMesh" />
-			<argument index="0" name="existing" type="ArrayMesh" default="null" />
-			<argument index="1" name="flags" type="int" default="0" />
+			<param index="0" name="existing" type="ArrayMesh" default="null" />
+			<param index="1" name="flags" type="int" default="0" />
 			<description>
 				Returns a constructed [ArrayMesh] from current information passed in. If an existing [ArrayMesh] is passed in as an argument, will add an extra surface to the existing [ArrayMesh].
-				[b]FIXME:[/b] Document possible values for [code]flags[/code], it changed in 4.0. Likely some combinations of [enum Mesh.ArrayFormat].
+				[b]FIXME:[/b] Document possible values for [param flags], it changed in 4.0. Likely some combinations of [enum Mesh.ArrayFormat].
 			</description>
 		</method>
 		<method name="commit_to_arrays">
@@ -97,17 +97,17 @@
 		</method>
 		<method name="create_from">
 			<return type="void" />
-			<argument index="0" name="existing" type="Mesh" />
-			<argument index="1" name="surface" type="int" />
+			<param index="0" name="existing" type="Mesh" />
+			<param index="1" name="surface" type="int" />
 			<description>
 				Creates a vertex array from an existing [Mesh].
 			</description>
 		</method>
 		<method name="create_from_blend_shape">
 			<return type="void" />
-			<argument index="0" name="existing" type="Mesh" />
-			<argument index="1" name="surface" type="int" />
-			<argument index="2" name="blend_shape" type="String" />
+			<param index="0" name="existing" type="Mesh" />
+			<param index="1" name="surface" type="int" />
+			<param index="2" name="blend_shape" type="String" />
 			<description>
 				Creates a vertex array from the specified blend shape of an existing [Mesh]. This can be used to extract a specific pose from a blend shape.
 			</description>
@@ -120,18 +120,18 @@
 		</method>
 		<method name="generate_lod">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="nd_threshold" type="float" />
-			<argument index="1" name="target_index_count" type="int" default="3" />
+			<param index="0" name="nd_threshold" type="float" />
+			<param index="1" name="target_index_count" type="int" default="3" />
 			<description>
-				Generates a LOD for a given [code]nd_threshold[/code] in linear units (square root of quadric error metric), using at most [code]target_index_count[/code] indices.
+				Generates a LOD for a given [param nd_threshold] in linear units (square root of quadric error metric), using at most [param target_index_count] indices.
 				Deprecated. Unused internally and neglects to preserve normals or UVs. Consider using [method ImporterMesh.generate_lods] instead.
 			</description>
 		</method>
 		<method name="generate_normals">
 			<return type="void" />
-			<argument index="0" name="flip" type="bool" default="false" />
+			<param index="0" name="flip" type="bool" default="false" />
 			<description>
-				Generates normals from vertices so you do not have to do it manually. If [code]flip[/code] is [code]true[/code], the resulting normals will be inverted. [method generate_normals] should be called [i]after[/i] generating geometry and [i]before[/i] committing the mesh using [method commit] or [method commit_to_arrays]. For correct display of normal-mapped surfaces, you will also have to generate tangents using [method generate_tangents].
+				Generates normals from vertices so you do not have to do it manually. If [param flip] is [code]true[/code], the resulting normals will be inverted. [method generate_normals] should be called [i]after[/i] generating geometry and [i]before[/i] committing the mesh using [method commit] or [method commit_to_arrays]. For correct display of normal-mapped surfaces, you will also have to generate tangents using [method generate_tangents].
 				[b]Note:[/b] [method generate_normals] only works if the primitive type to be set to [constant Mesh.PRIMITIVE_TRIANGLES].
 			</description>
 		</method>
@@ -149,9 +149,9 @@
 		</method>
 		<method name="get_custom_format" qualifiers="const">
 			<return type="int" enum="SurfaceTool.CustomFormat" />
-			<argument index="0" name="channel_index" type="int" />
+			<param index="0" name="channel_index" type="int" />
 			<description>
-				Returns the format for custom [code]channel_index[/code] (currently up to 4). Returns [constant CUSTOM_MAX] if this custom channel is unused.
+				Returns the format for custom [param channel_index] (currently up to 4). Returns [constant CUSTOM_MAX] if this custom channel is unused.
 			</description>
 		</method>
 		<method name="get_primitive_type" qualifiers="const">
@@ -182,14 +182,14 @@
 		</method>
 		<method name="set_bones">
 			<return type="void" />
-			<argument index="0" name="bones" type="PackedInt32Array" />
+			<param index="0" name="bones" type="PackedInt32Array" />
 			<description>
-				Specifies an array of bones to use for the [i]next[/i] vertex. [code]bones[/code] must contain 4 integers.
+				Specifies an array of bones to use for the [i]next[/i] vertex. [param bones] must contain 4 integers.
 			</description>
 		</method>
 		<method name="set_color">
 			<return type="void" />
-			<argument index="0" name="color" type="Color" />
+			<param index="0" name="color" type="Color" />
 			<description>
 				Specifies a [Color] to use for the [i]next[/i] vertex. If every vertex needs to have this information set and you fail to submit it for the first vertex, this information may not be used at all.
 				[b]Note:[/b] The material must have [member BaseMaterial3D.vertex_color_use_as_albedo] enabled for the vertex color to be visible.
@@ -197,39 +197,39 @@
 		</method>
 		<method name="set_custom">
 			<return type="void" />
-			<argument index="0" name="channel_index" type="int" />
-			<argument index="1" name="custom_color" type="Color" />
+			<param index="0" name="channel_index" type="int" />
+			<param index="1" name="custom_color" type="Color" />
 			<description>
-				Sets the custom value on this vertex for [code]channel_index[/code].
-				[method set_custom_format] must be called first for this [code]channel_index[/code]. Formats which are not RGBA will ignore other color channels.
+				Sets the custom value on this vertex for [param channel_index].
+				[method set_custom_format] must be called first for this [param channel_index]. Formats which are not RGBA will ignore other color channels.
 			</description>
 		</method>
 		<method name="set_custom_format">
 			<return type="void" />
-			<argument index="0" name="channel_index" type="int" />
-			<argument index="1" name="format" type="int" enum="SurfaceTool.CustomFormat" />
+			<param index="0" name="channel_index" type="int" />
+			<param index="1" name="format" type="int" enum="SurfaceTool.CustomFormat" />
 			<description>
-				Sets the color format for this custom [code]channel_index[/code]. Use [constant CUSTOM_MAX] to disable.
+				Sets the color format for this custom [param channel_index]. Use [constant CUSTOM_MAX] to disable.
 				Must be invoked after [method begin] and should be set before [method commit] or [method commit_to_arrays].
 			</description>
 		</method>
 		<method name="set_material">
 			<return type="void" />
-			<argument index="0" name="material" type="Material" />
+			<param index="0" name="material" type="Material" />
 			<description>
 				Sets [Material] to be used by the [Mesh] you are constructing.
 			</description>
 		</method>
 		<method name="set_normal">
 			<return type="void" />
-			<argument index="0" name="normal" type="Vector3" />
+			<param index="0" name="normal" type="Vector3" />
 			<description>
 				Specifies a normal to use for the [i]next[/i] vertex. If every vertex needs to have this information set and you fail to submit it for the first vertex, this information may not be used at all.
 			</description>
 		</method>
 		<method name="set_skin_weight_count">
 			<return type="void" />
-			<argument index="0" name="count" type="int" enum="SurfaceTool.SkinWeightCount" />
+			<param index="0" name="count" type="int" enum="SurfaceTool.SkinWeightCount" />
 			<description>
 				Set to [constant SKIN_8_WEIGHTS] to indicate that up to 8 bone influences per vertex may be used.
 				By default, only 4 bone influences are used ([constant SKIN_4_WEIGHTS])
@@ -238,37 +238,37 @@
 		</method>
 		<method name="set_smooth_group">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Specifies whether the current vertex (if using only vertex arrays) or current index (if also using index arrays) should use smooth normals for normal calculation.
 			</description>
 		</method>
 		<method name="set_tangent">
 			<return type="void" />
-			<argument index="0" name="tangent" type="Plane" />
+			<param index="0" name="tangent" type="Plane" />
 			<description>
 				Specifies a tangent to use for the [i]next[/i] vertex. If every vertex needs to have this information set and you fail to submit it for the first vertex, this information may not be used at all.
 			</description>
 		</method>
 		<method name="set_uv">
 			<return type="void" />
-			<argument index="0" name="uv" type="Vector2" />
+			<param index="0" name="uv" type="Vector2" />
 			<description>
 				Specifies a set of UV coordinates to use for the [i]next[/i] vertex. If every vertex needs to have this information set and you fail to submit it for the first vertex, this information may not be used at all.
 			</description>
 		</method>
 		<method name="set_uv2">
 			<return type="void" />
-			<argument index="0" name="uv2" type="Vector2" />
+			<param index="0" name="uv2" type="Vector2" />
 			<description>
 				Specifies an optional second set of UV coordinates to use for the [i]next[/i] vertex. If every vertex needs to have this information set and you fail to submit it for the first vertex, this information may not be used at all.
 			</description>
 		</method>
 		<method name="set_weights">
 			<return type="void" />
-			<argument index="0" name="weights" type="PackedFloat32Array" />
+			<param index="0" name="weights" type="PackedFloat32Array" />
 			<description>
-				Specifies weight values to use for the [i]next[/i] vertex. [code]weights[/code] must contain 4 values. If every vertex needs to have this information set and you fail to submit it for the first vertex, this information may not be used at all.
+				Specifies weight values to use for the [i]next[/i] vertex. [param weights] must contain 4 values. If every vertex needs to have this information set and you fail to submit it for the first vertex, this information may not be used at all.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/SyntaxHighlighter.xml b/doc/classes/SyntaxHighlighter.xml
index 70cbd83371..fcac96c04d 100644
--- a/doc/classes/SyntaxHighlighter.xml
+++ b/doc/classes/SyntaxHighlighter.xml
@@ -19,7 +19,7 @@
 		</method>
 		<method name="_get_line_syntax_highlighting" qualifiers="virtual const">
 			<return type="Dictionary" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Virtual method which can be overridden to return syntax highlighting data.
 				See [method get_line_syntax_highlighting] for more details.
@@ -40,7 +40,7 @@
 		</method>
 		<method name="get_line_syntax_highlighting">
 			<return type="Dictionary" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns syntax highlighting data for a single line. If the line is not cached, calls [method _get_line_syntax_highlighting] to calculate the data.
 				The return [Dictionary] is column number to [Dictionary]. The column number notes the start of a region, the region will end if another region is found, or at the end of the line. The nested [Dictionary] contains the data for that region, currently only the key "color" is supported.
diff --git a/doc/classes/SystemFont.xml b/doc/classes/SystemFont.xml
index b1b78f1705..b7454cc7d2 100644
--- a/doc/classes/SystemFont.xml
+++ b/doc/classes/SystemFont.xml
@@ -34,6 +34,9 @@
 		<member name="hinting" type="int" setter="set_hinting" getter="get_hinting" enum="TextServer.Hinting" default="1">
 			Font hinting mode.
 		</member>
+		<member name="multichannel_signed_distance_field" type="bool" setter="set_multichannel_signed_distance_field" getter="is_multichannel_signed_distance_field" default="false">
+			If set to [code]true[/code], glyphs of all sizes are rendered using single multichannel signed distance field generated from the dynamic font vector data.
+		</member>
 		<member name="oversampling" type="float" setter="set_oversampling" getter="get_oversampling" default="0.0">
 			Font oversampling factor, if set to [code]0.0[/code] global oversampling factor is used instead.
 		</member>
diff --git a/doc/classes/TCPServer.xml b/doc/classes/TCPServer.xml
index 06fe4de9e2..fbed80bcfa 100644
--- a/doc/classes/TCPServer.xml
+++ b/doc/classes/TCPServer.xml
@@ -30,13 +30,13 @@
 		</method>
 		<method name="listen">
 			<return type="int" enum="Error" />
-			<argument index="0" name="port" type="int" />
-			<argument index="1" name="bind_address" type="String" default="&quot;*&quot;" />
+			<param index="0" name="port" type="int" />
+			<param index="1" name="bind_address" type="String" default="&quot;*&quot;" />
 			<description>
-				Listen on the [code]port[/code] binding to [code]bind_address[/code].
-				If [code]bind_address[/code] is set as [code]"*"[/code] (default), the server will listen on all available addresses (both IPv4 and IPv6).
-				If [code]bind_address[/code] is set as [code]"0.0.0.0"[/code] (for IPv4) or [code]"::"[/code] (for IPv6), the server will listen on all available addresses matching that IP type.
-				If [code]bind_address[/code] is set to any valid address (e.g. [code]"192.168.1.101"[/code], [code]"::1"[/code], etc), the server will only listen on the interface with that addresses (or fail if no interface with the given address exists).
+				Listen on the [param port] binding to [param bind_address].
+				If [param bind_address] is set as [code]"*"[/code] (default), the server will listen on all available addresses (both IPv4 and IPv6).
+				If [param bind_address] is set as [code]"0.0.0.0"[/code] (for IPv4) or [code]"::"[/code] (for IPv6), the server will listen on all available addresses matching that IP type.
+				If [param bind_address] is set to any valid address (e.g. [code]"192.168.1.101"[/code], [code]"::1"[/code], etc), the server will only listen on the interface with that addresses (or fail if no interface with the given address exists).
 			</description>
 		</method>
 		<method name="stop">
diff --git a/doc/classes/TabBar.xml b/doc/classes/TabBar.xml
index 79d52b70fb..713c016651 100644
--- a/doc/classes/TabBar.xml
+++ b/doc/classes/TabBar.xml
@@ -11,15 +11,15 @@
 	<methods>
 		<method name="add_tab">
 			<return type="void" />
-			<argument index="0" name="title" type="String" default="&quot;&quot;" />
-			<argument index="1" name="icon" type="Texture2D" default="null" />
+			<param index="0" name="title" type="String" default="&quot;&quot;" />
+			<param index="1" name="icon" type="Texture2D" default="null" />
 			<description>
 				Adds a new tab.
 			</description>
 		</method>
 		<method name="ensure_tab_visible">
 			<return type="void" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Moves the scroll view to make the tab visible.
 			</description>
@@ -38,28 +38,28 @@
 		</method>
 		<method name="get_tab_button_icon" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="tab_idx" type="int" />
+			<param index="0" name="tab_idx" type="int" />
 			<description>
-				Returns the [Texture2D] for the right button of the tab at index [code]tab_idx[/code] or [code]null[/code] if the button has no [Texture2D].
+				Returns the [Texture2D] for the right button of the tab at index [param tab_idx] or [code]null[/code] if the button has no [Texture2D].
 			</description>
 		</method>
 		<method name="get_tab_icon" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="tab_idx" type="int" />
+			<param index="0" name="tab_idx" type="int" />
 			<description>
-				Returns the [Texture2D] for the tab at index [code]tab_idx[/code] or [code]null[/code] if the tab has no [Texture2D].
+				Returns the [Texture2D] for the tab at index [param tab_idx] or [code]null[/code] if the tab has no [Texture2D].
 			</description>
 		</method>
 		<method name="get_tab_idx_at_point" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="point" type="Vector2" />
+			<param index="0" name="point" type="Vector2" />
 			<description>
-				Returns the index of the tab at local coordinates [code]point[/code]. Returns [code]-1[/code] if the point is outside the control boundaries or if there's no tab at the queried position.
+				Returns the index of the tab at local coordinates [param point]. Returns [code]-1[/code] if the point is outside the control boundaries or if there's no tab at the queried position.
 			</description>
 		</method>
 		<method name="get_tab_language" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="tab_idx" type="int" />
+			<param index="0" name="tab_idx" type="int" />
 			<description>
 				Returns tab title language code.
 			</description>
@@ -72,108 +72,108 @@
 		</method>
 		<method name="get_tab_rect" qualifiers="const">
 			<return type="Rect2" />
-			<argument index="0" name="tab_idx" type="int" />
+			<param index="0" name="tab_idx" type="int" />
 			<description>
 				Returns tab [Rect2] with local position and size.
 			</description>
 		</method>
 		<method name="get_tab_text_direction" qualifiers="const">
 			<return type="int" enum="Control.TextDirection" />
-			<argument index="0" name="tab_idx" type="int" />
+			<param index="0" name="tab_idx" type="int" />
 			<description>
 				Returns tab title text base writing direction.
 			</description>
 		</method>
 		<method name="get_tab_title" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="tab_idx" type="int" />
+			<param index="0" name="tab_idx" type="int" />
 			<description>
-				Returns the title of the tab at index [code]tab_idx[/code].
+				Returns the title of the tab at index [param tab_idx].
 			</description>
 		</method>
 		<method name="is_tab_disabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="tab_idx" type="int" />
+			<param index="0" name="tab_idx" type="int" />
 			<description>
-				Returns [code]true[/code] if the tab at index [code]tab_idx[/code] is disabled.
+				Returns [code]true[/code] if the tab at index [param tab_idx] is disabled.
 			</description>
 		</method>
 		<method name="is_tab_hidden" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="tab_idx" type="int" />
+			<param index="0" name="tab_idx" type="int" />
 			<description>
-				Returns [code]true[/code] if the tab at index [code]tab_idx[/code] is hidden.
+				Returns [code]true[/code] if the tab at index [param tab_idx] is hidden.
 			</description>
 		</method>
 		<method name="move_tab">
 			<return type="void" />
-			<argument index="0" name="from" type="int" />
-			<argument index="1" name="to" type="int" />
+			<param index="0" name="from" type="int" />
+			<param index="1" name="to" type="int" />
 			<description>
-				Moves a tab from [code]from[/code] to [code]to[/code].
+				Moves a tab from [param from] to [param to].
 			</description>
 		</method>
 		<method name="remove_tab">
 			<return type="void" />
-			<argument index="0" name="tab_idx" type="int" />
+			<param index="0" name="tab_idx" type="int" />
 			<description>
-				Removes the tab at index [code]tab_idx[/code].
+				Removes the tab at index [param tab_idx].
 			</description>
 		</method>
 		<method name="set_tab_button_icon">
 			<return type="void" />
-			<argument index="0" name="tab_idx" type="int" />
-			<argument index="1" name="icon" type="Texture2D" />
+			<param index="0" name="tab_idx" type="int" />
+			<param index="1" name="icon" type="Texture2D" />
 			<description>
-				Sets an [code]icon[/code] for the button of the tab at index [code]tab_idx[/code] (located to the right, before the close button), making it visible and clickable (See [signal tab_button_pressed]). Giving it a [code]null[/code] value will hide the button.
+				Sets an [param icon] for the button of the tab at index [param tab_idx] (located to the right, before the close button), making it visible and clickable (See [signal tab_button_pressed]). Giving it a [code]null[/code] value will hide the button.
 			</description>
 		</method>
 		<method name="set_tab_disabled">
 			<return type="void" />
-			<argument index="0" name="tab_idx" type="int" />
-			<argument index="1" name="disabled" type="bool" />
+			<param index="0" name="tab_idx" type="int" />
+			<param index="1" name="disabled" type="bool" />
 			<description>
-				If [code]disabled[/code] is [code]true[/code], disables the tab at index [code]tab_idx[/code], making it non-interactable.
+				If [param disabled] is [code]true[/code], disables the tab at index [param tab_idx], making it non-interactable.
 			</description>
 		</method>
 		<method name="set_tab_hidden">
 			<return type="void" />
-			<argument index="0" name="tab_idx" type="int" />
-			<argument index="1" name="hidden" type="bool" />
+			<param index="0" name="tab_idx" type="int" />
+			<param index="1" name="hidden" type="bool" />
 			<description>
-				If [code]hidden[/code] is [code]true[/code], hides the tab at index [code]tab_idx[/code], making it disappear from the tab area.
+				If [param hidden] is [code]true[/code], hides the tab at index [param tab_idx], making it disappear from the tab area.
 			</description>
 		</method>
 		<method name="set_tab_icon">
 			<return type="void" />
-			<argument index="0" name="tab_idx" type="int" />
-			<argument index="1" name="icon" type="Texture2D" />
+			<param index="0" name="tab_idx" type="int" />
+			<param index="1" name="icon" type="Texture2D" />
 			<description>
-				Sets an [code]icon[/code] for the tab at index [code]tab_idx[/code].
+				Sets an [param icon] for the tab at index [param tab_idx].
 			</description>
 		</method>
 		<method name="set_tab_language">
 			<return type="void" />
-			<argument index="0" name="tab_idx" type="int" />
-			<argument index="1" name="language" type="String" />
+			<param index="0" name="tab_idx" type="int" />
+			<param index="1" name="language" type="String" />
 			<description>
 				Sets language code of tab title used for line-breaking and text shaping algorithms, if left empty current locale is used instead.
 			</description>
 		</method>
 		<method name="set_tab_text_direction">
 			<return type="void" />
-			<argument index="0" name="tab_idx" type="int" />
-			<argument index="1" name="direction" type="int" enum="Control.TextDirection" />
+			<param index="0" name="tab_idx" type="int" />
+			<param index="1" name="direction" type="int" enum="Control.TextDirection" />
 			<description>
 				Sets tab title base writing direction.
 			</description>
 		</method>
 		<method name="set_tab_title">
 			<return type="void" />
-			<argument index="0" name="tab_idx" type="int" />
-			<argument index="1" name="title" type="String" />
+			<param index="0" name="tab_idx" type="int" />
+			<param index="1" name="title" type="String" />
 			<description>
-				Sets a [code]title[/code] for the tab at index [code]tab_idx[/code].
+				Sets a [param title] for the tab at index [param tab_idx].
 			</description>
 		</method>
 	</methods>
@@ -215,31 +215,31 @@
 	</members>
 	<signals>
 		<signal name="active_tab_rearranged">
-			<argument index="0" name="idx_to" type="int" />
+			<param index="0" name="idx_to" type="int" />
 			<description>
 				Emitted when the active tab is rearranged via mouse drag. See [member drag_to_rearrange_enabled].
 			</description>
 		</signal>
 		<signal name="tab_button_pressed">
-			<argument index="0" name="tab" type="int" />
+			<param index="0" name="tab" type="int" />
 			<description>
 				Emitted when a tab's right button is pressed. See [method set_tab_button_icon].
 			</description>
 		</signal>
 		<signal name="tab_changed">
-			<argument index="0" name="tab" type="int" />
+			<param index="0" name="tab" type="int" />
 			<description>
 				Emitted when switching to another tab.
 			</description>
 		</signal>
 		<signal name="tab_clicked">
-			<argument index="0" name="tab" type="int" />
+			<param index="0" name="tab" type="int" />
 			<description>
 				Emitted when a tab is clicked, even if it is the current tab.
 			</description>
 		</signal>
 		<signal name="tab_close_pressed">
-			<argument index="0" name="tab" type="int" />
+			<param index="0" name="tab" type="int" />
 			<description>
 				Emitted when a tab's close button is pressed.
 				[b]Note:[/b] Tabs are not removed automatically once the close button is pressed, this behavior needs to be programmed manually. For example:
@@ -254,19 +254,19 @@
 			</description>
 		</signal>
 		<signal name="tab_hovered">
-			<argument index="0" name="tab" type="int" />
+			<param index="0" name="tab" type="int" />
 			<description>
 				Emitted when a tab is hovered by the mouse.
 			</description>
 		</signal>
 		<signal name="tab_rmb_clicked">
-			<argument index="0" name="tab" type="int" />
+			<param index="0" name="tab" type="int" />
 			<description>
 				Emitted when a tab is right-clicked. [member select_with_rmb] must be enabled.
 			</description>
 		</signal>
 		<signal name="tab_selected">
-			<argument index="0" name="tab" type="int" />
+			<param index="0" name="tab" type="int" />
 			<description>
 				Emitted when a tab is selected via click or script, even if it is the current tab.
 			</description>
diff --git a/doc/classes/TabContainer.xml b/doc/classes/TabContainer.xml
index 10b5f730ad..74f258072c 100644
--- a/doc/classes/TabContainer.xml
+++ b/doc/classes/TabContainer.xml
@@ -33,16 +33,16 @@
 		</method>
 		<method name="get_tab_button_icon" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="tab_idx" type="int" />
+			<param index="0" name="tab_idx" type="int" />
 			<description>
-				Returns the button icon from the tab at index [code]tab_idx[/code].
+				Returns the button icon from the tab at index [param tab_idx].
 			</description>
 		</method>
 		<method name="get_tab_control" qualifiers="const">
 			<return type="Control" />
-			<argument index="0" name="tab_idx" type="int" />
+			<param index="0" name="tab_idx" type="int" />
 			<description>
-				Returns the [Control] node from the tab at index [code]tab_idx[/code].
+				Returns the [Control] node from the tab at index [param tab_idx].
 			</description>
 		</method>
 		<method name="get_tab_count" qualifiers="const">
@@ -53,91 +53,91 @@
 		</method>
 		<method name="get_tab_icon" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="tab_idx" type="int" />
+			<param index="0" name="tab_idx" type="int" />
 			<description>
-				Returns the [Texture2D] for the tab at index [code]tab_idx[/code] or [code]null[/code] if the tab has no [Texture2D].
+				Returns the [Texture2D] for the tab at index [param tab_idx] or [code]null[/code] if the tab has no [Texture2D].
 			</description>
 		</method>
 		<method name="get_tab_idx_at_point" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="point" type="Vector2" />
+			<param index="0" name="point" type="Vector2" />
 			<description>
-				Returns the index of the tab at local coordinates [code]point[/code]. Returns [code]-1[/code] if the point is outside the control boundaries or if there's no tab at the queried position.
+				Returns the index of the tab at local coordinates [param point]. Returns [code]-1[/code] if the point is outside the control boundaries or if there's no tab at the queried position.
 			</description>
 		</method>
 		<method name="get_tab_idx_from_control" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="control" type="Control" />
+			<param index="0" name="control" type="Control" />
 			<description>
-				Returns the index of the tab tied to the given [code]control[/code]. The control must be a child of the [TabContainer].
+				Returns the index of the tab tied to the given [param control]. The control must be a child of the [TabContainer].
 			</description>
 		</method>
 		<method name="get_tab_title" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="tab_idx" type="int" />
+			<param index="0" name="tab_idx" type="int" />
 			<description>
-				Returns the title of the tab at index [code]tab_idx[/code]. Tab titles default to the name of the indexed child node, but this can be overridden with [method set_tab_title].
+				Returns the title of the tab at index [param tab_idx]. Tab titles default to the name of the indexed child node, but this can be overridden with [method set_tab_title].
 			</description>
 		</method>
 		<method name="is_tab_disabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="tab_idx" type="int" />
+			<param index="0" name="tab_idx" type="int" />
 			<description>
-				Returns [code]true[/code] if the tab at index [code]tab_idx[/code] is disabled.
+				Returns [code]true[/code] if the tab at index [param tab_idx] is disabled.
 			</description>
 		</method>
 		<method name="is_tab_hidden" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="tab_idx" type="int" />
+			<param index="0" name="tab_idx" type="int" />
 			<description>
-				Returns [code]true[/code] if the tab at index [code]tab_idx[/code] is hidden.
+				Returns [code]true[/code] if the tab at index [param tab_idx] is hidden.
 			</description>
 		</method>
 		<method name="set_popup">
 			<return type="void" />
-			<argument index="0" name="popup" type="Node" />
+			<param index="0" name="popup" type="Node" />
 			<description>
 				If set on a [Popup] node instance, a popup menu icon appears in the top-right corner of the [TabContainer] (setting it to [code]null[/code] will make it go away). Clicking it will expand the [Popup] node.
 			</description>
 		</method>
 		<method name="set_tab_button_icon">
 			<return type="void" />
-			<argument index="0" name="tab_idx" type="int" />
-			<argument index="1" name="icon" type="Texture2D" />
+			<param index="0" name="tab_idx" type="int" />
+			<param index="1" name="icon" type="Texture2D" />
 			<description>
-				Sets the button icon from the tab at index [code]tab_idx[/code].
+				Sets the button icon from the tab at index [param tab_idx].
 			</description>
 		</method>
 		<method name="set_tab_disabled">
 			<return type="void" />
-			<argument index="0" name="tab_idx" type="int" />
-			<argument index="1" name="disabled" type="bool" />
+			<param index="0" name="tab_idx" type="int" />
+			<param index="1" name="disabled" type="bool" />
 			<description>
-				If [code]disabled[/code] is [code]true[/code], disables the tab at index [code]tab_idx[/code], making it non-interactable.
+				If [param disabled] is [code]true[/code], disables the tab at index [param tab_idx], making it non-interactable.
 			</description>
 		</method>
 		<method name="set_tab_hidden">
 			<return type="void" />
-			<argument index="0" name="tab_idx" type="int" />
-			<argument index="1" name="hidden" type="bool" />
+			<param index="0" name="tab_idx" type="int" />
+			<param index="1" name="hidden" type="bool" />
 			<description>
-				If [code]hidden[/code] is [code]true[/code], hides the tab at index [code]tab_idx[/code], making it disappear from the tab area.
+				If [param hidden] is [code]true[/code], hides the tab at index [param tab_idx], making it disappear from the tab area.
 			</description>
 		</method>
 		<method name="set_tab_icon">
 			<return type="void" />
-			<argument index="0" name="tab_idx" type="int" />
-			<argument index="1" name="icon" type="Texture2D" />
+			<param index="0" name="tab_idx" type="int" />
+			<param index="1" name="icon" type="Texture2D" />
 			<description>
-				Sets an icon for the tab at index [code]tab_idx[/code].
+				Sets an icon for the tab at index [param tab_idx].
 			</description>
 		</method>
 		<method name="set_tab_title">
 			<return type="void" />
-			<argument index="0" name="tab_idx" type="int" />
-			<argument index="1" name="title" type="String" />
+			<param index="0" name="tab_idx" type="int" />
+			<param index="1" name="title" type="String" />
 			<description>
-				Sets a custom title for the tab at index [code]tab_idx[/code] (tab titles default to the name of the indexed child node). Set it back to the child's name to make the tab default to it again.
+				Sets a custom title for the tab at index [param tab_idx] (tab titles default to the name of the indexed child node). Set it back to the child's name to make the tab default to it again.
 			</description>
 		</method>
 	</methods>
@@ -175,19 +175,19 @@
 			</description>
 		</signal>
 		<signal name="tab_button_pressed">
-			<argument index="0" name="tab" type="int" />
+			<param index="0" name="tab" type="int" />
 			<description>
 				Emitted when the user clicks on the button icon on this tab.
 			</description>
 		</signal>
 		<signal name="tab_changed">
-			<argument index="0" name="tab" type="int" />
+			<param index="0" name="tab" type="int" />
 			<description>
 				Emitted when switching to another tab.
 			</description>
 		</signal>
 		<signal name="tab_selected">
-			<argument index="0" name="tab" type="int" />
+			<param index="0" name="tab" type="int" />
 			<description>
 				Emitted when a tab is selected, even if it is the current tab.
 			</description>
diff --git a/doc/classes/TextEdit.xml b/doc/classes/TextEdit.xml
index 18a4893f03..aa7ce85f3a 100644
--- a/doc/classes/TextEdit.xml
+++ b/doc/classes/TextEdit.xml
@@ -30,9 +30,9 @@
 		</method>
 		<method name="_handle_unicode_input" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="unicode_char" type="int" />
+			<param index="0" name="unicode_char" type="int" />
 			<description>
-				Override this method to define what happens when the types in the provided key [code]unicode[/code].
+				Override this method to define what happens when the user types in the provided key [param unicode_char].
 			</description>
 		</method>
 		<method name="_paste" qualifiers="virtual">
@@ -50,9 +50,9 @@
 		</method>
 		<method name="add_gutter">
 			<return type="void" />
-			<argument index="0" name="at" type="int" default="-1" />
+			<param index="0" name="at" type="int" default="-1" />
 			<description>
-				Register a new gutter to this [TextEdit]. Use [code]at[/code] to have a specific gutter order. A value of [code]-1[/code] appends the gutter to the right.
+				Register a new gutter to this [TextEdit]. Use [param at] to have a specific gutter order. A value of [code]-1[/code] appends the gutter to the right.
 			</description>
 		</method>
 		<method name="adjust_viewport_to_caret">
@@ -147,7 +147,7 @@
 		</method>
 		<method name="get_first_non_whitespace_column" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns the first column containing a non-whitespace character.
 			</description>
@@ -161,35 +161,35 @@
 		<method name="get_gutter_count" qualifiers="const">
 			<return type="int" />
 			<description>
-				Returns the total amount of gutters registered.
+				Returns the number of gutters registered.
 			</description>
 		</method>
 		<method name="get_gutter_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="gutter" type="int" />
+			<param index="0" name="gutter" type="int" />
 			<description>
 				Returns the name of the gutter at the given index.
 			</description>
 		</method>
 		<method name="get_gutter_type" qualifiers="const">
 			<return type="int" enum="TextEdit.GutterType" />
-			<argument index="0" name="gutter" type="int" />
+			<param index="0" name="gutter" type="int" />
 			<description>
 				Returns the type of the gutter at the given index.
 			</description>
 		</method>
 		<method name="get_gutter_width" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="gutter" type="int" />
+			<param index="0" name="gutter" type="int" />
 			<description>
 				Returns the width of the gutter at the given index.
 			</description>
 		</method>
 		<method name="get_indent_level" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
-				Returns the amount of spaces and [code]tab * tab_size[/code] before the first char.
+				Returns the number of spaces and [code]tab * tab_size[/code] before the first char.
 			</description>
 		</method>
 		<method name="get_last_full_visible_line" qualifiers="const">
@@ -212,62 +212,62 @@
 		</method>
 		<method name="get_line" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns the text of a specific line.
 			</description>
 		</method>
 		<method name="get_line_background_color" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns the current background color of the line. [code]Color(0, 0, 0, 0)[/code] is returned if no color is set.
 			</description>
 		</method>
 		<method name="get_line_column_at_pos" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="position" type="Vector2i" />
-			<argument index="1" name="allow_out_of_bounds" type="bool" default="true" />
+			<param index="0" name="position" type="Vector2i" />
+			<param index="1" name="allow_out_of_bounds" type="bool" default="true" />
 			<description>
-				Returns the line and column at the given position. In the returned vector, [code]x[/code] is the column, [code]y[/code] is the line. If [code]allow_out_of_bounds[/code] is [code]false[/code] and the position is not over the text, both vector values will be set to [code]-1[/code].
+				Returns the line and column at the given position. In the returned vector, [code]x[/code] is the column, [code]y[/code] is the line. If [param allow_out_of_bounds] is [code]false[/code] and the position is not over the text, both vector values will be set to [code]-1[/code].
 			</description>
 		</method>
 		<method name="get_line_count" qualifiers="const">
 			<return type="int" />
 			<description>
-				Returns the amount of total lines in the text.
+				Returns the number of lines in the text.
 			</description>
 		</method>
 		<method name="get_line_gutter_icon" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="gutter" type="int" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="gutter" type="int" />
 			<description>
-				Returns the icon currently in [code]gutter[/code] at [code]line[/code].
+				Returns the icon currently in [param gutter] at [param line].
 			</description>
 		</method>
 		<method name="get_line_gutter_item_color" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="gutter" type="int" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="gutter" type="int" />
 			<description>
-				Returns the color currently in [code]gutter[/code] at [code]line[/code].
+				Returns the color currently in [param gutter] at [param line].
 			</description>
 		</method>
 		<method name="get_line_gutter_metadata" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="gutter" type="int" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="gutter" type="int" />
 			<description>
-				Returns the metadata currently in [code]gutter[/code] at [code]line[/code].
+				Returns the metadata currently in [param gutter] at [param line].
 			</description>
 		</method>
 		<method name="get_line_gutter_text" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="gutter" type="int" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="gutter" type="int" />
 			<description>
-				Returns the text currently in [code]gutter[/code] at [code]line[/code].
+				Returns the text currently in [param gutter] at [param line].
 			</description>
 		</method>
 		<method name="get_line_height" qualifiers="const">
@@ -278,30 +278,30 @@
 		</method>
 		<method name="get_line_width" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="wrap_index" type="int" default="-1" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="wrap_index" type="int" default="-1" />
 			<description>
-				Returns the width in pixels of the [code]wrap_index[/code] on [code]line[/code].
+				Returns the width in pixels of the [param wrap_index] on [param line].
 			</description>
 		</method>
 		<method name="get_line_wrap_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns the number of times the given line is wrapped.
 			</description>
 		</method>
 		<method name="get_line_wrap_index_at_column" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="column" type="int" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="column" type="int" />
 			<description>
 				Returns the wrap index of the given line column.
 			</description>
 		</method>
 		<method name="get_line_wrapped_text" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns an array of [String]s representing each wrapped index.
 			</description>
@@ -321,49 +321,49 @@
 		</method>
 		<method name="get_minimap_line_at_pos" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="position" type="Vector2i" />
+			<param index="0" name="position" type="Vector2i" />
 			<description>
-				Returns the equivalent minimap line at [code]position[/code]
+				Returns the equivalent minimap line at [param position]
 			</description>
 		</method>
 		<method name="get_minimap_visible_lines" qualifiers="const">
 			<return type="int" />
 			<description>
-				Returns the total amount of lines that can be draw on the minimap.
+				Returns the number of lines that may be drawn on the minimap.
 			</description>
 		</method>
 		<method name="get_next_visible_line_index_offset_from" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="wrap_index" type="int" />
-			<argument index="2" name="visible_amount" type="int" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="wrap_index" type="int" />
+			<param index="2" name="visible_amount" type="int" />
 			<description>
 				Similar to [method get_next_visible_line_offset_from], but takes into account the line wrap indexes. In the returned vector, [code]x[/code] is the line, [code]y[/code] is the wrap index.
 			</description>
 		</method>
 		<method name="get_next_visible_line_offset_from" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="visible_amount" type="int" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="visible_amount" type="int" />
 			<description>
-				Returns the count to the next visible line from [code]line[/code] to [code]line + visible_amount[/code]. Can also count backwards. For example if a [TextEdit] has 5 lines with lines 2 and 3 hidden, calling this with [code]line = 1, visible_amount = 1[/code] would return 3.
+				Returns the count to the next visible line from [param line] to [code]line + visible_amount[/code]. Can also count backwards. For example if a [TextEdit] has 5 lines with lines 2 and 3 hidden, calling this with [code]line = 1, visible_amount = 1[/code] would return 3.
 			</description>
 		</method>
 		<method name="get_pos_at_line_column" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="column" type="int" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="column" type="int" />
 			<description>
-				Returns the local position for the given [code]line[/code] and [code]column[/code]. If [code]x[/code] or [code]y[/code] of the returned vector equal [code]-1[/code], the position is outside of the viewable area of the control.
+				Returns the local position for the given [param line] and [param column]. If [code]x[/code] or [code]y[/code] of the returned vector equal [code]-1[/code], the position is outside of the viewable area of the control.
 				[b]Note:[/b] The Y position corresponds to the bottom side of the line. Use [method get_rect_at_line_column] to get the top side position.
 			</description>
 		</method>
 		<method name="get_rect_at_line_column" qualifiers="const">
 			<return type="Rect2i" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="column" type="int" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="column" type="int" />
 			<description>
-				Returns the local position and size for the grapheme at the given [code]line[/code] and [code]column[/code]. If [code]x[/code] or [code]y[/code] position of the returned rect equal [code]-1[/code], the position is outside of the viewable area of the control.
+				Returns the local position and size for the grapheme at the given [param line] and [param column]. If [code]x[/code] or [code]y[/code] position of the returned rect equal [code]-1[/code], the position is outside of the viewable area of the control.
 				[b]Note:[/b] The Y position of the returned rect corresponds to the top side of the line, unlike [method get_pos_at_line_column] which returns the bottom side.
 			</description>
 		</method>
@@ -375,10 +375,10 @@
 		</method>
 		<method name="get_scroll_pos_for_line" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="wrap_index" type="int" default="0" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="wrap_index" type="int" default="0" />
 			<description>
-				Returns the scroll position for [code]wrap_index[/code] of [code]line[/code].
+				Returns the scroll position for [param wrap_index] of [param line].
 			</description>
 		</method>
 		<method name="get_selected_text" qualifiers="const">
@@ -444,7 +444,7 @@
 		<method name="get_total_visible_line_count" qualifiers="const">
 			<return type="int" />
 			<description>
-				Returns the total amount of lines that could be draw.
+				Returns the number of lines that may be drawn.
 			</description>
 		</method>
 		<method name="get_version" qualifiers="const">
@@ -461,17 +461,17 @@
 		</method>
 		<method name="get_visible_line_count_in_range" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="from_line" type="int" />
-			<argument index="1" name="to_line" type="int" />
+			<param index="0" name="from_line" type="int" />
+			<param index="1" name="to_line" type="int" />
 			<description>
 				Returns the total number of visible + wrapped lines between the two lines.
 			</description>
 		</method>
 		<method name="get_word_at_pos" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="position" type="Vector2" />
+			<param index="0" name="position" type="Vector2" />
 			<description>
-				Returns the word at [code]position[/code].
+				Returns the word at [param position].
 			</description>
 		</method>
 		<method name="get_word_under_caret" qualifiers="const">
@@ -506,15 +506,15 @@
 		</method>
 		<method name="insert_line_at">
 			<return type="void" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="text" type="String" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="text" type="String" />
 			<description>
-				Inserts a new line with [code]text[/code] at [code]line[/code].
+				Inserts a new line with [param text] at [param line].
 			</description>
 		</method>
 		<method name="insert_text_at_caret">
 			<return type="void" />
-			<argument index="0" name="text" type="String" />
+			<param index="0" name="text" type="String" />
 			<description>
 				Insert the specified text at the caret position.
 			</description>
@@ -533,36 +533,36 @@
 		</method>
 		<method name="is_gutter_clickable" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="gutter" type="int" />
+			<param index="0" name="gutter" type="int" />
 			<description>
 				Returns whether the gutter is clickable.
 			</description>
 		</method>
 		<method name="is_gutter_drawn" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="gutter" type="int" />
+			<param index="0" name="gutter" type="int" />
 			<description>
 				Returns whether the gutter is currently drawn.
 			</description>
 		</method>
 		<method name="is_gutter_overwritable" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="gutter" type="int" />
+			<param index="0" name="gutter" type="int" />
 			<description>
 				Returns whether the gutter is overwritable.
 			</description>
 		</method>
 		<method name="is_line_gutter_clickable" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="gutter" type="int" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="gutter" type="int" />
 			<description>
 				Returns whether the gutter on the given line is clickable.
 			</description>
 		</method>
 		<method name="is_line_wrapped" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns if the given line is wrapped.
 			</description>
@@ -575,9 +575,9 @@
 		</method>
 		<method name="is_mouse_over_selection" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="edges" type="bool" />
+			<param index="0" name="edges" type="bool" />
 			<description>
-				Returns whether the mouse is over selection. If [code]edges[/code] is [code]true[/code], the edges are considered part of the selection.
+				Returns whether the mouse is over selection. If [param edges] is [code]true[/code], the edges are considered part of the selection.
 			</description>
 		</method>
 		<method name="is_overtype_mode_enabled" qualifiers="const">
@@ -588,17 +588,17 @@
 		</method>
 		<method name="menu_option">
 			<return type="void" />
-			<argument index="0" name="option" type="int" />
+			<param index="0" name="option" type="int" />
 			<description>
 				Triggers a right-click menu action by the specified index. See [enum MenuItems] for a list of available indexes.
 			</description>
 		</method>
 		<method name="merge_gutters">
 			<return type="void" />
-			<argument index="0" name="from_line" type="int" />
-			<argument index="1" name="to_line" type="int" />
+			<param index="0" name="from_line" type="int" />
+			<param index="1" name="to_line" type="int" />
 			<description>
-				Merge the gutters from [code]from_line[/code] into [code]to_line[/code]. Only overwritable gutters will be copied.
+				Merge the gutters from [param from_line] into [param to_line]. Only overwritable gutters will be copied.
 			</description>
 		</method>
 		<method name="paste">
@@ -615,17 +615,17 @@
 		</method>
 		<method name="remove_gutter">
 			<return type="void" />
-			<argument index="0" name="gutter" type="int" />
+			<param index="0" name="gutter" type="int" />
 			<description>
 				Removes the gutter from this [TextEdit].
 			</description>
 		</method>
 		<method name="remove_text">
 			<return type="void" />
-			<argument index="0" name="from_line" type="int" />
-			<argument index="1" name="from_column" type="int" />
-			<argument index="2" name="to_line" type="int" />
-			<argument index="3" name="to_column" type="int" />
+			<param index="0" name="from_line" type="int" />
+			<param index="1" name="from_column" type="int" />
+			<param index="2" name="to_line" type="int" />
+			<param index="3" name="to_column" type="int" />
 			<description>
 				Removes text between the given positions.
 				[b]Note:[/b] This does not adjust the caret or selection, which as a result it can end up in an invalid position.
@@ -633,10 +633,10 @@
 		</method>
 		<method name="search" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="text" type="String" />
-			<argument index="1" name="flags" type="int" />
-			<argument index="2" name="from_line" type="int" />
-			<argument index="3" name="from_colum" type="int" />
+			<param index="0" name="text" type="String" />
+			<param index="1" name="flags" type="int" />
+			<param index="2" name="from_line" type="int" />
+			<param index="3" name="from_colum" type="int" />
 			<description>
 				Perform a search inside the text. Search flags can be specified in the [enum SearchFlags] enum.
 				In the returned vector, [code]x[/code] is the column, [code]y[/code] is the line. If no results are found, both are equal to [code]-1[/code].
@@ -662,10 +662,10 @@
 		</method>
 		<method name="select">
 			<return type="void" />
-			<argument index="0" name="from_line" type="int" />
-			<argument index="1" name="from_column" type="int" />
-			<argument index="2" name="to_line" type="int" />
-			<argument index="3" name="to_column" type="int" />
+			<param index="0" name="from_line" type="int" />
+			<param index="1" name="from_column" type="int" />
+			<param index="2" name="to_line" type="int" />
+			<param index="3" name="to_column" type="int" />
 			<description>
 				Perform selection, from line/column to line/column.
 				If [member selecting_enabled] is [code]false[/code], no selection will occur.
@@ -686,214 +686,214 @@
 		</method>
 		<method name="set_caret_column">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="adjust_viewport" type="bool" default="true" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="adjust_viewport" type="bool" default="true" />
 			<description>
-				Moves the caret to the specified [code]column[/code] index.
-				If [code]adjust_viewport[/code] is [code]true[/code], the viewport will center at the caret position after the move occurs.
+				Moves the caret to the specified [param column] index.
+				If [param adjust_viewport] is [code]true[/code], the viewport will center at the caret position after the move occurs.
 			</description>
 		</method>
 		<method name="set_caret_line">
 			<return type="void" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="adjust_viewport" type="bool" default="true" />
-			<argument index="2" name="can_be_hidden" type="bool" default="true" />
-			<argument index="3" name="wrap_index" type="int" default="0" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="adjust_viewport" type="bool" default="true" />
+			<param index="2" name="can_be_hidden" type="bool" default="true" />
+			<param index="3" name="wrap_index" type="int" default="0" />
 			<description>
-				Moves the caret to the specified [code]line[/code] index.
-				If [code]adjust_viewport[/code] is [code]true[/code], the viewport will center at the caret position after the move occurs.
-				If [code]can_be_hidden[/code] is [code]true[/code], the specified [code]line[/code] can be hidden.
+				Moves the caret to the specified [param line] index.
+				If [param adjust_viewport] is [code]true[/code], the viewport will center at the caret position after the move occurs.
+				If [param can_be_hidden] is [code]true[/code], the specified [code]line[/code] can be hidden.
 			</description>
 		</method>
 		<method name="set_gutter_clickable">
 			<return type="void" />
-			<argument index="0" name="gutter" type="int" />
-			<argument index="1" name="clickable" type="bool" />
+			<param index="0" name="gutter" type="int" />
+			<param index="1" name="clickable" type="bool" />
 			<description>
 				Sets the gutter as clickable. This will change the mouse cursor to a pointing hand when hovering over the gutter.
 			</description>
 		</method>
 		<method name="set_gutter_custom_draw">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="draw_callback" type="Callable" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="draw_callback" type="Callable" />
 			<description>
 				Set a custom draw method for the gutter. The callback method must take the following args: [code]line: int, gutter: int, Area: Rect2[/code].
 			</description>
 		</method>
 		<method name="set_gutter_draw">
 			<return type="void" />
-			<argument index="0" name="gutter" type="int" />
-			<argument index="1" name="draw" type="bool" />
+			<param index="0" name="gutter" type="int" />
+			<param index="1" name="draw" type="bool" />
 			<description>
 				Sets whether the gutter should be drawn.
 			</description>
 		</method>
 		<method name="set_gutter_name">
 			<return type="void" />
-			<argument index="0" name="gutter" type="int" />
-			<argument index="1" name="name" type="String" />
+			<param index="0" name="gutter" type="int" />
+			<param index="1" name="name" type="String" />
 			<description>
 				Sets the name of the gutter.
 			</description>
 		</method>
 		<method name="set_gutter_overwritable">
 			<return type="void" />
-			<argument index="0" name="gutter" type="int" />
-			<argument index="1" name="overwritable" type="bool" />
+			<param index="0" name="gutter" type="int" />
+			<param index="1" name="overwritable" type="bool" />
 			<description>
 				Sets the gutter to overwritable. See [method merge_gutters].
 			</description>
 		</method>
 		<method name="set_gutter_type">
 			<return type="void" />
-			<argument index="0" name="gutter" type="int" />
-			<argument index="1" name="type" type="int" enum="TextEdit.GutterType" />
+			<param index="0" name="gutter" type="int" />
+			<param index="1" name="type" type="int" enum="TextEdit.GutterType" />
 			<description>
 				Sets the type of gutter.
 			</description>
 		</method>
 		<method name="set_gutter_width">
 			<return type="void" />
-			<argument index="0" name="gutter" type="int" />
-			<argument index="1" name="width" type="int" />
+			<param index="0" name="gutter" type="int" />
+			<param index="1" name="width" type="int" />
 			<description>
 				Set the width of the gutter.
 			</description>
 		</method>
 		<method name="set_line">
 			<return type="void" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="new_text" type="String" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="new_text" type="String" />
 			<description>
 				Sets the text for a specific line.
 			</description>
 		</method>
 		<method name="set_line_as_center_visible">
 			<return type="void" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="wrap_index" type="int" default="0" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="wrap_index" type="int" default="0" />
 			<description>
-				Positions the [code]wrap_index[/code] of [code]line[/code] at the center of the viewport.
+				Positions the [param wrap_index] of [param line] at the center of the viewport.
 			</description>
 		</method>
 		<method name="set_line_as_first_visible">
 			<return type="void" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="wrap_index" type="int" default="0" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="wrap_index" type="int" default="0" />
 			<description>
-				Positions the [code]wrap_index[/code] of [code]line[/code] at the top of the viewport.
+				Positions the [param wrap_index] of [param line] at the top of the viewport.
 			</description>
 		</method>
 		<method name="set_line_as_last_visible">
 			<return type="void" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="wrap_index" type="int" default="0" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="wrap_index" type="int" default="0" />
 			<description>
-				Positions the [code]wrap_index[/code] of [code]line[/code] at the bottom of the viewport.
+				Positions the [param wrap_index] of [param line] at the bottom of the viewport.
 			</description>
 		</method>
 		<method name="set_line_background_color">
 			<return type="void" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="color" type="Color" />
 			<description>
 				Sets the current background color of the line. Set to [code]Color(0, 0, 0, 0)[/code] for no color.
 			</description>
 		</method>
 		<method name="set_line_gutter_clickable">
 			<return type="void" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="gutter" type="int" />
-			<argument index="2" name="clickable" type="bool" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="gutter" type="int" />
+			<param index="2" name="clickable" type="bool" />
 			<description>
-				Sets the [code]gutter[/code] on [code]line[/code] as clickable.
+				If [param clickable] is [code]true[/code], makes the [param gutter] on [param line] clickable. See [signal gutter_clicked].
 			</description>
 		</method>
 		<method name="set_line_gutter_icon">
 			<return type="void" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="gutter" type="int" />
-			<argument index="2" name="icon" type="Texture2D" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="gutter" type="int" />
+			<param index="2" name="icon" type="Texture2D" />
 			<description>
-				Sets the icon for [code]gutter[/code] on [code]line[/code].
+				Sets the icon for [param gutter] on [param line] to [param icon].
 			</description>
 		</method>
 		<method name="set_line_gutter_item_color">
 			<return type="void" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="gutter" type="int" />
-			<argument index="2" name="color" type="Color" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="gutter" type="int" />
+			<param index="2" name="color" type="Color" />
 			<description>
-				Sets the color for [code]gutter[/code] on [code]line[/code].
+				Sets the color for [param gutter] on [param line] to [param color].
 			</description>
 		</method>
 		<method name="set_line_gutter_metadata">
 			<return type="void" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="gutter" type="int" />
-			<argument index="2" name="metadata" type="Variant" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="gutter" type="int" />
+			<param index="2" name="metadata" type="Variant" />
 			<description>
-				Sets the metadata for [code]gutter[/code] on [code]line[/code].
+				Sets the metadata for [param gutter] on [param line] to [param metadata].
 			</description>
 		</method>
 		<method name="set_line_gutter_text">
 			<return type="void" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="gutter" type="int" />
-			<argument index="2" name="text" type="String" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="gutter" type="int" />
+			<param index="2" name="text" type="String" />
 			<description>
-				Sets the text for [code]gutter[/code] on [code]line[/code].
+				Sets the text for [param gutter] on [param line] to [param text].
 			</description>
 		</method>
 		<method name="set_overtype_mode_enabled">
 			<return type="void" />
-			<argument index="0" name="enabled" type="bool" />
+			<param index="0" name="enabled" type="bool" />
 			<description>
 				If [code]true[/code], sets the user into overtype mode. When the user types in this mode, it will override existing text.
 			</description>
 		</method>
 		<method name="set_search_flags">
 			<return type="void" />
-			<argument index="0" name="flags" type="int" />
+			<param index="0" name="flags" type="int" />
 			<description>
-				Sets the search flags. This is used with [method set_search_text] to highlight occurrences of the searched text. Search flags can be specified from the [enum SearchFlags] enum.
+				Sets the search [param flags]. This is used with [method set_search_text] to highlight occurrences of the searched text. Search flags can be specified from the [enum SearchFlags] enum.
 			</description>
 		</method>
 		<method name="set_search_text">
 			<return type="void" />
-			<argument index="0" name="search_text" type="String" />
+			<param index="0" name="search_text" type="String" />
 			<description>
 				Sets the search text. See [method set_search_flags].
 			</description>
 		</method>
 		<method name="set_selection_mode">
 			<return type="void" />
-			<argument index="0" name="mode" type="int" enum="TextEdit.SelectionMode" />
-			<argument index="1" name="line" type="int" default="-1" />
-			<argument index="2" name="column" type="int" default="-1" />
+			<param index="0" name="mode" type="int" enum="TextEdit.SelectionMode" />
+			<param index="1" name="line" type="int" default="-1" />
+			<param index="2" name="column" type="int" default="-1" />
 			<description>
 				Sets the current selection mode.
 			</description>
 		</method>
 		<method name="set_tab_size">
 			<return type="void" />
-			<argument index="0" name="size" type="int" />
+			<param index="0" name="size" type="int" />
 			<description>
 				Sets the tab size for the [TextEdit] to use.
 			</description>
 		</method>
 		<method name="set_tooltip_request_func">
 			<return type="void" />
-			<argument index="0" name="callback" type="Callable" />
+			<param index="0" name="callback" type="Callable" />
 			<description>
 				Provide custom tooltip text. The callback method must take the following args: [code]hovered_word: String[/code]
 			</description>
 		</method>
 		<method name="swap_lines">
 			<return type="void" />
-			<argument index="0" name="from_line" type="int" />
-			<argument index="1" name="to_line" type="int" />
+			<param index="0" name="from_line" type="int" />
+			<param index="1" name="to_line" type="int" />
 			<description>
 				Swaps the two lines.
 			</description>
@@ -1036,8 +1036,8 @@
 			</description>
 		</signal>
 		<signal name="gutter_clicked">
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="gutter" type="int" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="gutter" type="int" />
 			<description>
 				Emitted when a gutter is clicked.
 			</description>
@@ -1048,11 +1048,11 @@
 			</description>
 		</signal>
 		<signal name="lines_edited_from">
-			<argument index="0" name="from_line" type="int" />
-			<argument index="1" name="to_line" type="int" />
+			<param index="0" name="from_line" type="int" />
+			<param index="1" name="to_line" type="int" />
 			<description>
 				Emitted immediately when the text changes.
-				When text is added [code]from_line[/code] will be less then [code]to_line[/code]. On a remove [code]to_line[/code] will be less then [code]from_line[/code].
+				When text is added [param from_line] will be less then [param to_line]. On a remove [param to_line] will be less then [param from_line].
 			</description>
 		</signal>
 		<signal name="text_changed">
diff --git a/doc/classes/TextLine.xml b/doc/classes/TextLine.xml
index 601650db2e..471c1a9040 100644
--- a/doc/classes/TextLine.xml
+++ b/doc/classes/TextLine.xml
@@ -11,21 +11,21 @@
 	<methods>
 		<method name="add_object">
 			<return type="bool" />
-			<argument index="0" name="key" type="Variant" />
-			<argument index="1" name="size" type="Vector2" />
-			<argument index="2" name="inline_align" type="int" enum="InlineAlignment" default="5" />
-			<argument index="3" name="length" type="int" default="1" />
+			<param index="0" name="key" type="Variant" />
+			<param index="1" name="size" type="Vector2" />
+			<param index="2" name="inline_align" type="int" enum="InlineAlignment" default="5" />
+			<param index="3" name="length" type="int" default="1" />
 			<description>
-				Adds inline object to the text buffer, [code]key[/code] must be unique. In the text, object is represented as [code]length[/code] object replacement characters.
+				Adds inline object to the text buffer, [param key] must be unique. In the text, object is represented as [param length] object replacement characters.
 			</description>
 		</method>
 		<method name="add_string">
 			<return type="bool" />
-			<argument index="0" name="text" type="String" />
-			<argument index="1" name="font" type="Font" />
-			<argument index="2" name="font_size" type="int" />
-			<argument index="3" name="language" type="String" default="&quot;&quot;" />
-			<argument index="4" name="meta" type="Variant" default="null" />
+			<param index="0" name="text" type="String" />
+			<param index="1" name="font" type="Font" />
+			<param index="2" name="font_size" type="int" />
+			<param index="3" name="language" type="String" default="&quot;&quot;" />
+			<param index="4" name="meta" type="Variant" default="null" />
 			<description>
 				Adds text span and font to draw it.
 			</description>
@@ -38,21 +38,21 @@
 		</method>
 		<method name="draw" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="canvas" type="RID" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="color" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="canvas" type="RID" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="color" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
-				Draw text into a canvas item at a given position, with [code]color[/code]. [code]pos[/code] specifies the top left corner of the bounding box.
+				Draw text into a canvas item at a given position, with [param color]. [param pos] specifies the top left corner of the bounding box.
 			</description>
 		</method>
 		<method name="draw_outline" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="canvas" type="RID" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="outline_size" type="int" default="1" />
-			<argument index="3" name="color" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="canvas" type="RID" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="outline_size" type="int" default="1" />
+			<param index="3" name="color" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
-				Draw text into a canvas item at a given position, with [code]color[/code]. [code]pos[/code] specifies the top left corner of the bounding box.
+				Draw text into a canvas item at a given position, with [param color]. [param pos] specifies the top left corner of the bounding box.
 			</description>
 		</method>
 		<method name="get_line_ascent" qualifiers="const">
@@ -87,7 +87,7 @@
 		</method>
 		<method name="get_object_rect" qualifiers="const">
 			<return type="Rect2" />
-			<argument index="0" name="key" type="Variant" />
+			<param index="0" name="key" type="Variant" />
 			<description>
 				Returns bounding rectangle of the inline object.
 			</description>
@@ -112,23 +112,23 @@
 		</method>
 		<method name="hit_test" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="coords" type="float" />
+			<param index="0" name="coords" type="float" />
 			<description>
 				Returns caret character offset at the specified pixel offset at the baseline. This function always returns a valid position.
 			</description>
 		</method>
 		<method name="resize_object">
 			<return type="bool" />
-			<argument index="0" name="key" type="Variant" />
-			<argument index="1" name="size" type="Vector2" />
-			<argument index="2" name="inline_align" type="int" enum="InlineAlignment" default="5" />
+			<param index="0" name="key" type="Variant" />
+			<param index="1" name="size" type="Vector2" />
+			<param index="2" name="inline_align" type="int" enum="InlineAlignment" default="5" />
 			<description>
 				Sets new size and alignment of embedded object.
 			</description>
 		</method>
 		<method name="set_bidi_override">
 			<return type="void" />
-			<argument index="0" name="override" type="Array" />
+			<param index="0" name="override" type="Array" />
 			<description>
 				Overrides BiDi for the structured text.
 				Override ranges should cover full source text without overlaps. BiDi algorithm will be used on each range separately.
@@ -136,7 +136,7 @@
 		</method>
 		<method name="tab_align">
 			<return type="void" />
-			<argument index="0" name="tab_stops" type="PackedFloat32Array" />
+			<param index="0" name="tab_stops" type="PackedFloat32Array" />
 			<description>
 				Aligns text to the given tab-stops.
 			</description>
diff --git a/doc/classes/TextParagraph.xml b/doc/classes/TextParagraph.xml
index c733d8fcee..e0729ba844 100644
--- a/doc/classes/TextParagraph.xml
+++ b/doc/classes/TextParagraph.xml
@@ -11,21 +11,21 @@
 	<methods>
 		<method name="add_object">
 			<return type="bool" />
-			<argument index="0" name="key" type="Variant" />
-			<argument index="1" name="size" type="Vector2" />
-			<argument index="2" name="inline_align" type="int" enum="InlineAlignment" default="5" />
-			<argument index="3" name="length" type="int" default="1" />
+			<param index="0" name="key" type="Variant" />
+			<param index="1" name="size" type="Vector2" />
+			<param index="2" name="inline_align" type="int" enum="InlineAlignment" default="5" />
+			<param index="3" name="length" type="int" default="1" />
 			<description>
-				Adds inline object to the text buffer, [code]key[/code] must be unique. In the text, object is represented as [code]length[/code] object replacement characters.
+				Adds inline object to the text buffer, [param key] must be unique. In the text, object is represented as [param length] object replacement characters.
 			</description>
 		</method>
 		<method name="add_string">
 			<return type="bool" />
-			<argument index="0" name="text" type="String" />
-			<argument index="1" name="font" type="Font" />
-			<argument index="2" name="font_size" type="int" />
-			<argument index="3" name="language" type="String" default="&quot;&quot;" />
-			<argument index="4" name="meta" type="Variant" default="null" />
+			<param index="0" name="text" type="String" />
+			<param index="1" name="font" type="Font" />
+			<param index="2" name="font_size" type="int" />
+			<param index="3" name="language" type="String" default="&quot;&quot;" />
+			<param index="4" name="meta" type="Variant" default="null" />
 			<description>
 				Adds text span and font to draw it.
 			</description>
@@ -44,63 +44,63 @@
 		</method>
 		<method name="draw" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="canvas" type="RID" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="color" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="3" name="dc_color" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="canvas" type="RID" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="color" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="3" name="dc_color" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
-				Draw all lines of the text and drop cap into a canvas item at a given position, with [code]color[/code]. [code]pos[/code] specifies the top left corner of the bounding box.
+				Draw all lines of the text and drop cap into a canvas item at a given position, with [param color]. [param pos] specifies the top left corner of the bounding box.
 			</description>
 		</method>
 		<method name="draw_dropcap" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="canvas" type="RID" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="color" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="canvas" type="RID" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="color" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
-				Draw drop cap into a canvas item at a given position, with [code]color[/code]. [code]pos[/code] specifies the top left corner of the bounding box.
+				Draw drop cap into a canvas item at a given position, with [param color]. [param pos] specifies the top left corner of the bounding box.
 			</description>
 		</method>
 		<method name="draw_dropcap_outline" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="canvas" type="RID" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="outline_size" type="int" default="1" />
-			<argument index="3" name="color" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="canvas" type="RID" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="outline_size" type="int" default="1" />
+			<param index="3" name="color" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
-				Draw drop cap outline into a canvas item at a given position, with [code]color[/code]. [code]pos[/code] specifies the top left corner of the bounding box.
+				Draw drop cap outline into a canvas item at a given position, with [param color]. [param pos] specifies the top left corner of the bounding box.
 			</description>
 		</method>
 		<method name="draw_line" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="canvas" type="RID" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="line" type="int" />
-			<argument index="3" name="color" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="canvas" type="RID" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="line" type="int" />
+			<param index="3" name="color" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
-				Draw single line of text into a canvas item at a given position, with [code]color[/code]. [code]pos[/code] specifies the top left corner of the bounding box.
+				Draw single line of text into a canvas item at a given position, with [param color]. [param pos] specifies the top left corner of the bounding box.
 			</description>
 		</method>
 		<method name="draw_line_outline" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="canvas" type="RID" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="line" type="int" />
-			<argument index="3" name="outline_size" type="int" default="1" />
-			<argument index="4" name="color" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="canvas" type="RID" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="line" type="int" />
+			<param index="3" name="outline_size" type="int" default="1" />
+			<param index="4" name="color" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
-				Draw outline of the single line of text into a canvas item at a given position, with [code]color[/code]. [code]pos[/code] specifies the top left corner of the bounding box.
+				Draw outline of the single line of text into a canvas item at a given position, with [param color]. [param pos] specifies the top left corner of the bounding box.
 			</description>
 		</method>
 		<method name="draw_outline" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="canvas" type="RID" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="outline_size" type="int" default="1" />
-			<argument index="3" name="color" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="4" name="dc_color" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="canvas" type="RID" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="outline_size" type="int" default="1" />
+			<param index="3" name="color" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="4" name="dc_color" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
-				Draw outlines of all lines of the text and drop cap into a canvas item at a given position, with [code]color[/code]. [code]pos[/code] specifies the top left corner of the bounding box.
+				Draw outlines of all lines of the text and drop cap into a canvas item at a given position, with [param color]. [param pos] specifies the top left corner of the bounding box.
 			</description>
 		</method>
 		<method name="get_dropcap_lines" qualifiers="const">
@@ -123,7 +123,7 @@
 		</method>
 		<method name="get_line_ascent" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns the text line ascent (number of pixels above the baseline for horizontal layout or to the left of baseline for vertical).
 			</description>
@@ -136,64 +136,64 @@
 		</method>
 		<method name="get_line_descent" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns the text line descent (number of pixels below the baseline for horizontal layout or to the right of baseline for vertical).
 			</description>
 		</method>
 		<method name="get_line_object_rect" qualifiers="const">
 			<return type="Rect2" />
-			<argument index="0" name="line" type="int" />
-			<argument index="1" name="key" type="Variant" />
+			<param index="0" name="line" type="int" />
+			<param index="1" name="key" type="Variant" />
 			<description>
 				Returns bounding rectangle of the inline object.
 			</description>
 		</method>
 		<method name="get_line_objects" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns array of inline objects in the line.
 			</description>
 		</method>
 		<method name="get_line_range" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns character range of the line.
 			</description>
 		</method>
 		<method name="get_line_rid" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns TextServer line buffer RID.
 			</description>
 		</method>
 		<method name="get_line_size" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns size of the bounding box of the line of text.
 			</description>
 		</method>
 		<method name="get_line_underline_position" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns pixel offset of the underline below the baseline.
 			</description>
 		</method>
 		<method name="get_line_underline_thickness" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns thickness of the underline.
 			</description>
 		</method>
 		<method name="get_line_width" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="line" type="int" />
+			<param index="0" name="line" type="int" />
 			<description>
 				Returns width (for horizontal layout) or height (for vertical) of the line of text.
 			</description>
@@ -218,23 +218,23 @@
 		</method>
 		<method name="hit_test" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="coords" type="Vector2" />
+			<param index="0" name="coords" type="Vector2" />
 			<description>
 				Returns caret character offset at the specified coordinates. This function always returns a valid position.
 			</description>
 		</method>
 		<method name="resize_object">
 			<return type="bool" />
-			<argument index="0" name="key" type="Variant" />
-			<argument index="1" name="size" type="Vector2" />
-			<argument index="2" name="inline_align" type="int" enum="InlineAlignment" default="5" />
+			<param index="0" name="key" type="Variant" />
+			<param index="1" name="size" type="Vector2" />
+			<param index="2" name="inline_align" type="int" enum="InlineAlignment" default="5" />
 			<description>
 				Sets new size and alignment of embedded object.
 			</description>
 		</method>
 		<method name="set_bidi_override">
 			<return type="void" />
-			<argument index="0" name="override" type="Array" />
+			<param index="0" name="override" type="Array" />
 			<description>
 				Overrides BiDi for the structured text.
 				Override ranges should cover full source text without overlaps. BiDi algorithm will be used on each range separately.
@@ -242,18 +242,18 @@
 		</method>
 		<method name="set_dropcap">
 			<return type="bool" />
-			<argument index="0" name="text" type="String" />
-			<argument index="1" name="font" type="Font" />
-			<argument index="2" name="font_size" type="int" />
-			<argument index="3" name="dropcap_margins" type="Rect2" default="Rect2(0, 0, 0, 0)" />
-			<argument index="4" name="language" type="String" default="&quot;&quot;" />
+			<param index="0" name="text" type="String" />
+			<param index="1" name="font" type="Font" />
+			<param index="2" name="font_size" type="int" />
+			<param index="3" name="dropcap_margins" type="Rect2" default="Rect2(0, 0, 0, 0)" />
+			<param index="4" name="language" type="String" default="&quot;&quot;" />
 			<description>
 				Sets drop cap, overrides previously set drop cap. Drop cap (dropped capital) is a decorative element at the beginning of a paragraph that is larger than the rest of the text.
 			</description>
 		</method>
 		<method name="tab_align">
 			<return type="void" />
-			<argument index="0" name="tab_stops" type="PackedFloat32Array" />
+			<param index="0" name="tab_stops" type="PackedFloat32Array" />
 			<description>
 				Aligns paragraph to the given tab-stops.
 			</description>
diff --git a/doc/classes/TextServer.xml b/doc/classes/TextServer.xml
index 9f35ddc353..ee3c87b8e6 100644
--- a/doc/classes/TextServer.xml
+++ b/doc/classes/TextServer.xml
@@ -17,29 +17,29 @@
 		</method>
 		<method name="create_shaped_text">
 			<return type="RID" />
-			<argument index="0" name="direction" type="int" enum="TextServer.Direction" default="0" />
-			<argument index="1" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
+			<param index="0" name="direction" type="int" enum="TextServer.Direction" default="0" />
+			<param index="1" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
-				Creates new buffer for complex text layout, with the given [code]direction[/code] and [code]orientation[/code]. To free the resulting buffer, use [method free_rid] method.
+				Creates new buffer for complex text layout, with the given [param direction] and [param orientation]. To free the resulting buffer, use [method free_rid] method.
 				[b]Note:[/b] Direction is ignored if server does not support [constant FEATURE_BIDI_LAYOUT] feature (supported by [TextServerAdvanced]).
 				[b]Note:[/b] Orientation is ignored if server does not support [constant FEATURE_VERTICAL_LAYOUT] feature (supported by [TextServerAdvanced]).
 			</description>
 		</method>
 		<method name="draw_hex_code_box" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="canvas" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="pos" type="Vector2" />
-			<argument index="3" name="index" type="int" />
-			<argument index="4" name="color" type="Color" />
+			<param index="0" name="canvas" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="pos" type="Vector2" />
+			<param index="3" name="index" type="int" />
+			<param index="4" name="color" type="Color" />
 			<description>
 				Draws box displaying character hexadecimal code. Used for replacing missing characters.
 			</description>
 		</method>
 		<method name="font_clear_glyphs">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
 			<description>
 				Removes all rendered glyphs information from the cache entry.
 				[b]Note:[/b] This function will not remove textures associated with the glyphs, use [method font_remove_texture] to remove them manually.
@@ -47,23 +47,23 @@
 		</method>
 		<method name="font_clear_kerning_map">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
 			<description>
 				Removes all kerning overrides.
 			</description>
 		</method>
 		<method name="font_clear_size_cache">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Removes all font sizes from the cache entry.
 			</description>
 		</method>
 		<method name="font_clear_textures">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
 			<description>
 				Removes all textures from font cache entry.
 				[b]Note:[/b] This function will not remove glyphs associated with the texture, use [method font_remove_glyph] to remove them manually.
@@ -71,80 +71,80 @@
 		</method>
 		<method name="font_draw_glyph" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="canvas" type="RID" />
-			<argument index="2" name="size" type="int" />
-			<argument index="3" name="pos" type="Vector2" />
-			<argument index="4" name="index" type="int" />
-			<argument index="5" name="color" type="Color" default="Color(1, 1, 1, 1)" />
-			<description>
-				Draws single glyph into a canvas item at the position, using [code]font_rid[/code] at the size [code]size[/code].
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="canvas" type="RID" />
+			<param index="2" name="size" type="int" />
+			<param index="3" name="pos" type="Vector2" />
+			<param index="4" name="index" type="int" />
+			<param index="5" name="color" type="Color" default="Color(1, 1, 1, 1)" />
+			<description>
+				Draws single glyph into a canvas item at the position, using [param font_rid] at the size [param size].
 				[b]Note:[/b] Glyph index is specific to the font, use glyphs indices returned by [method shaped_text_get_glyphs] or [method font_get_glyph_index].
 				[b]Note:[/b] If there are pending glyphs to render, calling this function might trigger the texture cache update.
 			</description>
 		</method>
 		<method name="font_draw_glyph_outline" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="canvas" type="RID" />
-			<argument index="2" name="size" type="int" />
-			<argument index="3" name="outline_size" type="int" />
-			<argument index="4" name="pos" type="Vector2" />
-			<argument index="5" name="index" type="int" />
-			<argument index="6" name="color" type="Color" default="Color(1, 1, 1, 1)" />
-			<description>
-				Draws single glyph outline of size [code]outline_size[/code] into a canvas item at the position, using [code]font_rid[/code] at the size [code]size[/code].
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="canvas" type="RID" />
+			<param index="2" name="size" type="int" />
+			<param index="3" name="outline_size" type="int" />
+			<param index="4" name="pos" type="Vector2" />
+			<param index="5" name="index" type="int" />
+			<param index="6" name="color" type="Color" default="Color(1, 1, 1, 1)" />
+			<description>
+				Draws single glyph outline of size [param outline_size] into a canvas item at the position, using [param font_rid] at the size [param size].
 				[b]Note:[/b] Glyph index is specific to the font, use glyphs indices returned by [method shaped_text_get_glyphs] or [method font_get_glyph_index].
 				[b]Note:[/b] If there are pending glyphs to render, calling this function might trigger the texture cache update.
 			</description>
 		</method>
 		<method name="font_get_ascent" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
 			<description>
 				Returns the font ascent (number of pixels above the baseline).
 			</description>
 		</method>
 		<method name="font_get_descent" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
 			<description>
 				Returns the font descent (number of pixels below the baseline).
 			</description>
 		</method>
 		<method name="font_get_embolden" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns font embolden strength.
 			</description>
 		</method>
 		<method name="font_get_face_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns number of faces in the TrueType / OpenType collection.
 			</description>
 		</method>
 		<method name="font_get_face_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Recturns an active face index in the TrueType / OpenType collection.
 			</description>
 		</method>
 		<method name="font_get_fixed_size" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns bitmap font fixed size.
 			</description>
 		</method>
 		<method name="font_get_generate_mipmaps" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns [code]true[/code] if font texture mipmap generation is enabled.
 			</description>
@@ -157,9 +157,9 @@
 		</method>
 		<method name="font_get_glyph_advance" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Returns glyph advance (offset of the next glyph).
 				[b]Note:[/b] Advance for glyphs outlines is the same as the base glyph advance and is not saved.
@@ -167,9 +167,9 @@
 		</method>
 		<method name="font_get_glyph_contours" qualifiers="const">
 			<return type="Dictionary" />
-			<argument index="0" name="font" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="index" type="int" />
+			<param index="0" name="font" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="index" type="int" />
 			<description>
 				Returns outline contours of the glyph as a [code]Dictionary[/code] with the following contents:
 				[code]points[/code]         - [PackedVector3Array], containing outline points. [code]x[/code] and [code]y[/code] are point coordinates. [code]z[/code] is the type of the point, using the [enum ContourPointTag] values.
@@ -179,54 +179,54 @@
 		</method>
 		<method name="font_get_glyph_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="char" type="int" />
-			<argument index="3" name="variation_selector" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="char" type="int" />
+			<param index="3" name="variation_selector" type="int" />
 			<description>
-				Returns the glyph index of a [code]char[/code], optionally modified by the [code]variation_selector[/code].
+				Returns the glyph index of a [param char], optionally modified by the [param variation_selector].
 			</description>
 		</method>
 		<method name="font_get_glyph_list" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
 			<description>
 				Returns list of rendered glyphs in the cache entry.
 			</description>
 		</method>
 		<method name="font_get_glyph_offset" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Returns glyph offset from the baseline.
 			</description>
 		</method>
 		<method name="font_get_glyph_size" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Returns size of the glyph.
 			</description>
 		</method>
 		<method name="font_get_glyph_texture_idx" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Returns index of the cache texture containing the glyph.
 			</description>
 		</method>
 		<method name="font_get_glyph_texture_rid" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Returns resource id of the cache texture containing the glyph.
 				[b]Note:[/b] If there are pending glyphs to render, calling this function might trigger the texture cache update.
@@ -234,9 +234,9 @@
 		</method>
 		<method name="font_get_glyph_texture_size" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Returns size of the cache texture containing the glyph.
 				[b]Note:[/b] If there are pending glyphs to render, calling this function might trigger the texture cache update.
@@ -244,251 +244,251 @@
 		</method>
 		<method name="font_get_glyph_uv_rect" qualifiers="const">
 			<return type="Rect2" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Returns rectangle in the cache texture containing the glyph.
 			</description>
 		</method>
 		<method name="font_get_hinting" qualifiers="const">
 			<return type="int" enum="TextServer.Hinting" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns the font hinting mode. Used by dynamic fonts only.
 			</description>
 		</method>
 		<method name="font_get_kerning" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="glyph_pair" type="Vector2i" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="glyph_pair" type="Vector2i" />
 			<description>
 				Returns kerning for the pair of glyphs.
 			</description>
 		</method>
 		<method name="font_get_kerning_list" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
 			<description>
 				Returns list of the kerning overrides.
 			</description>
 		</method>
 		<method name="font_get_language_support_override">
 			<return type="bool" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="language" type="String" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="language" type="String" />
 			<description>
-				Returns [code]true[/code] if support override is enabled for the [code]language[/code].
+				Returns [code]true[/code] if support override is enabled for the [param language].
 			</description>
 		</method>
 		<method name="font_get_language_support_overrides">
 			<return type="PackedStringArray" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns list of language support overrides.
 			</description>
 		</method>
 		<method name="font_get_msdf_pixel_range" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns the width of the range around the shape between the minimum and maximum representable signed distance.
 			</description>
 		</method>
 		<method name="font_get_msdf_size" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns source font size used to generate MSDF textures.
 			</description>
 		</method>
 		<method name="font_get_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns font family name.
 			</description>
 		</method>
 		<method name="font_get_opentype_feature_overrides" qualifiers="const">
 			<return type="Dictionary" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns font OpenType feature set override.
 			</description>
 		</method>
 		<method name="font_get_oversampling" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns font oversampling factor, if set to [code]0.0[/code] global oversampling factor is used instead. Used by dynamic fonts only.
 			</description>
 		</method>
 		<method name="font_get_scale" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
 			<description>
 				Returns scaling factor of the color bitmap font.
 			</description>
 		</method>
 		<method name="font_get_script_support_override">
 			<return type="bool" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="script" type="String" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="script" type="String" />
 			<description>
-				Returns [code]true[/code] if support override is enabled for the [code]script[/code].
+				Returns [code]true[/code] if support override is enabled for the [param script].
 			</description>
 		</method>
 		<method name="font_get_script_support_overrides">
 			<return type="PackedStringArray" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns list of script support overrides.
 			</description>
 		</method>
 		<method name="font_get_size_cache_list" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns list of the font sizes in the cache. Each size is [code]Vector2i[/code] with font size and outline size.
 			</description>
 		</method>
 		<method name="font_get_style" qualifiers="const">
 			<return type="int" enum="TextServer.FontStyle" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns font style flags, see [enum FontStyle].
 			</description>
 		</method>
 		<method name="font_get_style_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns font style name.
 			</description>
 		</method>
 		<method name="font_get_subpixel_positioning" qualifiers="const">
 			<return type="int" enum="TextServer.SubpixelPositioning" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns font sub-pixel glyph positioning mode.
 			</description>
 		</method>
 		<method name="font_get_supported_chars" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns a string containing all the characters available in the font.
 			</description>
 		</method>
 		<method name="font_get_texture_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
 			<description>
 				Returns number of textures used by font cache entry.
 			</description>
 		</method>
 		<method name="font_get_texture_image" qualifiers="const">
 			<return type="Image" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="texture_index" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="texture_index" type="int" />
 			<description>
 				Returns font cache texture image data.
 			</description>
 		</method>
 		<method name="font_get_texture_offsets" qualifiers="const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="texture_index" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="texture_index" type="int" />
 			<description>
 				Returns array containing the first free pixel in the each column of texture. Should be the same size as texture width or empty.
 			</description>
 		</method>
 		<method name="font_get_transform" qualifiers="const">
 			<return type="Transform2D" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns 2D transform applied to the font outlines.
 			</description>
 		</method>
 		<method name="font_get_underline_position" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
 			<description>
 				Returns pixel offset of the underline below the baseline.
 			</description>
 		</method>
 		<method name="font_get_underline_thickness" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
 			<description>
 				Returns thickness of the underline in pixels.
 			</description>
 		</method>
 		<method name="font_get_variation_coordinates" qualifiers="const">
 			<return type="Dictionary" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns variation coordinates for the specified font cache entry. See [method font_supported_variation_list] for more info.
 			</description>
 		</method>
 		<method name="font_has_char" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="char" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="char" type="int" />
 			<description>
-				Returns [code]true[/code] if a Unicode [code]char[/code] is available in the font.
+				Returns [code]true[/code] if a Unicode [param char] is available in the font.
 			</description>
 		</method>
 		<method name="font_is_antialiased" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns [code]true[/code] if font 8-bit anitialiased glyph rendering is supported and enabled.
 			</description>
 		</method>
 		<method name="font_is_force_autohinter" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns [code]true[/code] if auto-hinting is supported and preferred over font built-in hinting. Used by dynamic fonts only.
 			</description>
 		</method>
 		<method name="font_is_language_supported" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="language" type="String" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="language" type="String" />
 			<description>
 				Returns [code]true[/code], if font supports given language ([url=https://en.wikipedia.org/wiki/ISO_639-1]ISO 639[/url] code).
 			</description>
 		</method>
 		<method name="font_is_multichannel_signed_distance_field" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns [code]true[/code] if glyphs of all sizes are rendered using single multichannel signed distance field generated from the dynamic font vector data.
 			</description>
 		</method>
 		<method name="font_is_script_supported" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="script" type="String" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="script" type="String" />
 			<description>
 				Returns [code]true[/code], if font supports given script (ISO 15924 code).
 			</description>
 		</method>
 		<method name="font_remove_glyph">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Removes specified rendered glyph information from the cache entry.
 				[b]Note:[/b] This function will not remove textures associated with the glyphs, use [method font_remove_texture] to remove them manually.
@@ -496,42 +496,42 @@
 		</method>
 		<method name="font_remove_kerning">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="glyph_pair" type="Vector2i" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="glyph_pair" type="Vector2i" />
 			<description>
 				Removes kerning override for the pair of glyphs.
 			</description>
 		</method>
 		<method name="font_remove_language_support_override">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="language" type="String" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="language" type="String" />
 			<description>
 				Remove language support override.
 			</description>
 		</method>
 		<method name="font_remove_script_support_override">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="script" type="String" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="script" type="String" />
 			<description>
 				Removes script support override.
 			</description>
 		</method>
 		<method name="font_remove_size_cache">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
 			<description>
 				Removes specified font size from the cache entry.
 			</description>
 		</method>
 		<method name="font_remove_texture">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="texture_index" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="texture_index" type="int" />
 			<description>
 				Removes specified texture from the cache entry.
 				[b]Note:[/b] This function will not remove glyphs associated with the texture, remove them manually, using [method font_remove_glyph].
@@ -539,100 +539,100 @@
 		</method>
 		<method name="font_render_glyph">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="index" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="index" type="int" />
 			<description>
 				Renders specified glyph to the font cache texture.
 			</description>
 		</method>
 		<method name="font_render_range">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="start" type="int" />
-			<argument index="3" name="end" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="start" type="int" />
+			<param index="3" name="end" type="int" />
 			<description>
 				Renders the range of characters to the font cache texture.
 			</description>
 		</method>
 		<method name="font_set_antialiased">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="antialiased" type="bool" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="antialiased" type="bool" />
 			<description>
 				If set to [code]true[/code], 8-bit antialiased glyph rendering is used, otherwise 1-bit rendering is used. Used by dynamic fonts only.
 			</description>
 		</method>
 		<method name="font_set_ascent">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="ascent" type="float" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="ascent" type="float" />
 			<description>
 				Sets the font ascent (number of pixels above the baseline).
 			</description>
 		</method>
 		<method name="font_set_data">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="data" type="PackedByteArray" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="data" type="PackedByteArray" />
 			<description>
 				Sets font source data, e.g contents of the dynamic font source file.
 			</description>
 		</method>
 		<method name="font_set_descent">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="descent" type="float" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="descent" type="float" />
 			<description>
 				Sets the font descent (number of pixels below the baseline).
 			</description>
 		</method>
 		<method name="font_set_embolden">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="strength" type="float" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="strength" type="float" />
 			<description>
-				Sets font embolden strength. If [code]strength[/code] is not equal to zero, emboldens the font outlines. Negative values reduce the outline thickness.
+				Sets font embolden strength. If [param strength] is not equal to zero, emboldens the font outlines. Negative values reduce the outline thickness.
 			</description>
 		</method>
 		<method name="font_set_face_index">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="face_index" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="face_index" type="int" />
 			<description>
 				Sets an active face index in the TrueType / OpenType collection.
 			</description>
 		</method>
 		<method name="font_set_fixed_size">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="fixed_size" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="fixed_size" type="int" />
 			<description>
 				Sets bitmap font fixed size. If set to value greater than zero, same cache entry will be used for all font sizes.
 			</description>
 		</method>
 		<method name="font_set_force_autohinter">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="force_autohinter" type="bool" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="force_autohinter" type="bool" />
 			<description>
 				If set to [code]true[/code] auto-hinting is preferred over font built-in hinting.
 			</description>
 		</method>
 		<method name="font_set_generate_mipmaps">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="generate_mipmaps" type="bool" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="generate_mipmaps" type="bool" />
 			<description>
 				If set to [code]true[/code] font texture mipmap generation is enabled.
 			</description>
 		</method>
 		<method name="font_set_global_oversampling">
 			<return type="void" />
-			<argument index="0" name="oversampling" type="float" />
+			<param index="0" name="oversampling" type="float" />
 			<description>
 				Sets oversampling factor, shared by all font in the TextServer.
 				[b]Note:[/b] This value can be automatically changed by display server.
@@ -640,10 +640,10 @@
 		</method>
 		<method name="font_set_glyph_advance">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="glyph" type="int" />
-			<argument index="3" name="advance" type="Vector2" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="glyph" type="int" />
+			<param index="3" name="advance" type="Vector2" />
 			<description>
 				Sets glyph advance (offset of the next glyph).
 				[b]Note:[/b] Advance for glyphs outlines is the same as the base glyph advance and is not saved.
@@ -651,91 +651,91 @@
 		</method>
 		<method name="font_set_glyph_offset">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
-			<argument index="3" name="offset" type="Vector2" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
+			<param index="3" name="offset" type="Vector2" />
 			<description>
 				Sets glyph offset from the baseline.
 			</description>
 		</method>
 		<method name="font_set_glyph_size">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
-			<argument index="3" name="gl_size" type="Vector2" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
+			<param index="3" name="gl_size" type="Vector2" />
 			<description>
 				Sets size of the glyph.
 			</description>
 		</method>
 		<method name="font_set_glyph_texture_idx">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
-			<argument index="3" name="texture_idx" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
+			<param index="3" name="texture_idx" type="int" />
 			<description>
 				Sets index of the cache texture containing the glyph.
 			</description>
 		</method>
 		<method name="font_set_glyph_uv_rect">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
-			<argument index="3" name="uv_rect" type="Rect2" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
+			<param index="3" name="uv_rect" type="Rect2" />
 			<description>
 				Sets rectangle in the cache texture containing the glyph.
 			</description>
 		</method>
 		<method name="font_set_hinting">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="hinting" type="int" enum="TextServer.Hinting" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="hinting" type="int" enum="TextServer.Hinting" />
 			<description>
 				Sets font hinting mode. Used by dynamic fonts only.
 			</description>
 		</method>
 		<method name="font_set_kerning">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="glyph_pair" type="Vector2i" />
-			<argument index="3" name="kerning" type="Vector2" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="glyph_pair" type="Vector2i" />
+			<param index="3" name="kerning" type="Vector2" />
 			<description>
 				Sets kerning for the pair of glyphs.
 			</description>
 		</method>
 		<method name="font_set_language_support_override">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="language" type="String" />
-			<argument index="2" name="supported" type="bool" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="language" type="String" />
+			<param index="2" name="supported" type="bool" />
 			<description>
 				Adds override for [method font_is_language_supported].
 			</description>
 		</method>
 		<method name="font_set_msdf_pixel_range">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="msdf_pixel_range" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="msdf_pixel_range" type="int" />
 			<description>
 				Sets the width of the range around the shape between the minimum and maximum representable signed distance.
 			</description>
 		</method>
 		<method name="font_set_msdf_size">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="msdf_size" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="msdf_size" type="int" />
 			<description>
 				Sets source font size used to generate MSDF textures.
 			</description>
 		</method>
 		<method name="font_set_multichannel_signed_distance_field">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="msdf" type="bool" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="msdf" type="bool" />
 			<description>
 				If set to [code]true[/code], glyphs of all sizes are rendered using single multichannel signed distance field generated from the dynamic font vector data. MSDF rendering allows displaying the font at any scaling factor without blurriness, and without incurring a CPU cost when the font size changes (since the font no longer needs to be rasterized on the CPU). As a downside, font hinting is not available with MSDF. The lack of font hinting may result in less crisp and less readable fonts at small sizes.
 				[b]Note:[/b] MSDF font rendering does not render glyphs with overlapping shapes correctly. Overlapping shapes are not valid per the OpenType standard, but are still commonly found in many font files, especially those converted by Google Fonts. To avoid issues with overlapping glyphs, consider downloading the font file directly from the type foundry instead of relying on Google Fonts.
@@ -743,94 +743,94 @@
 		</method>
 		<method name="font_set_name">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="name" type="String" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="name" type="String" />
 			<description>
 				Sets the font family name.
 			</description>
 		</method>
 		<method name="font_set_opentype_feature_overrides">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="overrides" type="Dictionary" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="overrides" type="Dictionary" />
 			<description>
 				Sets font OpenType feature set override.
 			</description>
 		</method>
 		<method name="font_set_oversampling">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="oversampling" type="float" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="oversampling" type="float" />
 			<description>
 				Sets font oversampling factor, if set to [code]0.0[/code] global oversampling factor is used instead. Used by dynamic fonts only.
 			</description>
 		</method>
 		<method name="font_set_scale">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="scale" type="float" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="scale" type="float" />
 			<description>
 				Sets scaling factor of the color bitmap font.
 			</description>
 		</method>
 		<method name="font_set_script_support_override">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="script" type="String" />
-			<argument index="2" name="supported" type="bool" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="script" type="String" />
+			<param index="2" name="supported" type="bool" />
 			<description>
 				Adds override for [method font_is_script_supported].
 			</description>
 		</method>
 		<method name="font_set_style">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="style" type="int" enum="TextServer.FontStyle" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="style" type="int" enum="TextServer.FontStyle" />
 			<description>
 				Sets the font style flags, see [enum FontStyle].
 			</description>
 		</method>
 		<method name="font_set_style_name">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="name" type="String" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="name" type="String" />
 			<description>
 				Sets the font style name.
 			</description>
 		</method>
 		<method name="font_set_subpixel_positioning">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="subpixel_positioning" type="int" enum="TextServer.SubpixelPositioning" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="subpixel_positioning" type="int" enum="TextServer.SubpixelPositioning" />
 			<description>
 				Sets font sub-pixel glyph positioning mode.
 			</description>
 		</method>
 		<method name="font_set_texture_image">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="texture_index" type="int" />
-			<argument index="3" name="image" type="Image" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="texture_index" type="int" />
+			<param index="3" name="image" type="Image" />
 			<description>
 				Sets font cache texture image data.
 			</description>
 		</method>
 		<method name="font_set_texture_offsets">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="texture_index" type="int" />
-			<argument index="3" name="offset" type="PackedInt32Array" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="texture_index" type="int" />
+			<param index="3" name="offset" type="PackedInt32Array" />
 			<description>
 				Sets array containing the first free pixel in the each column of texture. Should be the same size as texture width or empty.
 			</description>
 		</method>
 		<method name="font_set_transform">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="transform" type="Transform2D" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="transform" type="Transform2D" />
 			<description>
 				Sets 2D transform, applied to the font outlines, can be used for slanting, flipping and rotating glyphs.
 				For example, to simulate italic typeface by slanting, apply the following transform [code]Transform2D(1.0, slant, 0.0, 1.0, 0.0, 0.0)[/code].
@@ -838,55 +838,55 @@
 		</method>
 		<method name="font_set_underline_position">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="underline_position" type="float" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="underline_position" type="float" />
 			<description>
 				Sets pixel offset of the underline below the baseline.
 			</description>
 		</method>
 		<method name="font_set_underline_thickness">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="underline_thickness" type="float" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="underline_thickness" type="float" />
 			<description>
 				Sets thickness of the underline in pixels.
 			</description>
 		</method>
 		<method name="font_set_variation_coordinates">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="variation_coordinates" type="Dictionary" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="variation_coordinates" type="Dictionary" />
 			<description>
 				Sets variation coordinates for the specified font cache entry. See [method font_supported_variation_list] for more info.
 			</description>
 		</method>
 		<method name="font_supported_feature_list" qualifiers="const">
 			<return type="Dictionary" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns the dictionary of the supported OpenType features.
 			</description>
 		</method>
 		<method name="font_supported_variation_list" qualifiers="const">
 			<return type="Dictionary" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns the dictionary of the supported OpenType variation coordinates.
 			</description>
 		</method>
 		<method name="format_number" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="number" type="String" />
-			<argument index="1" name="language" type="String" default="&quot;&quot;" />
+			<param index="0" name="number" type="String" />
+			<param index="1" name="language" type="String" default="&quot;&quot;" />
 			<description>
-				Converts a number from the Western Arabic (0..9) to the numeral systems used in [code]language[/code].
+				Converts a number from the Western Arabic (0..9) to the numeral systems used in [param language].
 			</description>
 		</method>
 		<method name="free_rid">
 			<return type="void" />
-			<argument index="0" name="rid" type="RID" />
+			<param index="0" name="rid" type="RID" />
 			<description>
 				Frees an object created by this [TextServer].
 			</description>
@@ -899,8 +899,8 @@
 		</method>
 		<method name="get_hex_code_box_size" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="size" type="int" />
-			<argument index="1" name="index" type="int" />
+			<param index="0" name="size" type="int" />
+			<param index="1" name="index" type="int" />
 			<description>
 				Returns size of the replacement character (box with character hexadecimal code that is drawn in place of invalid characters).
 			</description>
@@ -925,40 +925,40 @@
 		</method>
 		<method name="has">
 			<return type="bool" />
-			<argument index="0" name="rid" type="RID" />
+			<param index="0" name="rid" type="RID" />
 			<description>
-				Returns [code]true[/code] if [code]rid[/code] is valid resource owned by this text server.
+				Returns [code]true[/code] if [param rid] is valid resource owned by this text server.
 			</description>
 		</method>
 		<method name="has_feature" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="feature" type="int" enum="TextServer.Feature" />
+			<param index="0" name="feature" type="int" enum="TextServer.Feature" />
 			<description>
 				Returns [code]true[/code] if the server supports a feature.
 			</description>
 		</method>
 		<method name="is_confusable" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="string" type="String" />
-			<argument index="1" name="dict" type="PackedStringArray" />
+			<param index="0" name="string" type="String" />
+			<param index="1" name="dict" type="PackedStringArray" />
 			<description>
-				Returns index of the first string in [code]dict[/dict] which is visually confusable with the [code]string[/string], or [code]-1[/code] if none is found.
+				Returns index of the first string in [param dict] which is visually confusable with the [param string], or [code]-1[/code] if none is found.
 				[b]Note:[/b] This method doesn't detect invisible characters, for spoof detection use it in combination with [method spoof_check].
 				[b]Note:[/b] Always returns [code]-1[/code] if the server does not support the [constant FEATURE_UNICODE_SECURITY] feature.
 			</description>
 		</method>
 		<method name="is_locale_right_to_left" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="locale" type="String" />
+			<param index="0" name="locale" type="String" />
 			<description>
 				Returns [code]true[/code] if locale is right-to-left.
 			</description>
 		</method>
 		<method name="is_valid_identifier" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="string" type="String" />
+			<param index="0" name="string" type="String" />
 			<description>
-				Returns [code]true[/code] is [code]string[/code] is a valid identifier.
+				Returns [code]true[/code] is [param string] is a valid identifier.
 				If the text server supports the [constant FEATURE_UNICODE_IDENTIFIERS] feature, a valid identifier must:
 				- Conform to normalization form C.
 				- Begin with a Unicode character of class XID_Start or [code]"_"[/code].
@@ -971,7 +971,7 @@
 		</method>
 		<method name="load_support_data">
 			<return type="bool" />
-			<argument index="0" name="filename" type="String" />
+			<param index="0" name="filename" type="String" />
 			<description>
 				Loads optional TextServer database (e.g. ICU break iterators and dictionaries).
 				[b]Note:[/b] This function should be called before any other TextServer functions used, otherwise it won't have any effect.
@@ -979,38 +979,38 @@
 		</method>
 		<method name="name_to_tag" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Converts readable feature, variation, script or language name to OpenType tag.
 			</description>
 		</method>
 		<method name="parse_number" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="number" type="String" />
-			<argument index="1" name="language" type="String" default="&quot;&quot;" />
+			<param index="0" name="number" type="String" />
+			<param index="1" name="language" type="String" default="&quot;&quot;" />
 			<description>
-				Converts a number from the numeral systems used in [code]language[/code] to Western Arabic (0..9).
+				Converts [param number] from the numeral systems used in [param language] to Western Arabic (0..9).
 			</description>
 		</method>
 		<method name="parse_structured_text" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="parser_type" type="int" enum="TextServer.StructuredTextParser" />
-			<argument index="1" name="args" type="Array" />
-			<argument index="2" name="text" type="String" />
+			<param index="0" name="parser_type" type="int" enum="TextServer.StructuredTextParser" />
+			<param index="1" name="args" type="Array" />
+			<param index="2" name="text" type="String" />
 			<description>
 				Default implementation of the BiDi algorithm override function. See [enum StructuredTextParser] for more info.
 			</description>
 		</method>
 		<method name="percent_sign" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="language" type="String" default="&quot;&quot;" />
+			<param index="0" name="language" type="String" default="&quot;&quot;" />
 			<description>
-				Returns percent sign used in the [code]language[/code].
+				Returns percent sign used in the [param language].
 			</description>
 		</method>
 		<method name="save_support_data" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="filename" type="String" />
+			<param index="0" name="filename" type="String" />
 			<description>
 				Saves optional TextServer database (e.g. ICU break iterators and dictionaries) to the file.
 				[b]Note:[/b] This function is used by during project export, to include TextServer database.
@@ -1018,98 +1018,98 @@
 		</method>
 		<method name="shaped_get_span_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns number of text spans added using [method shaped_text_add_string] or [method shaped_text_add_object].
 			</description>
 		</method>
 		<method name="shaped_get_span_meta" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="index" type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
 			<description>
 				Returns text span metadata.
 			</description>
 		</method>
 		<method name="shaped_set_span_update_font">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="index" type="int" />
-			<argument index="2" name="fonts" type="Array" />
-			<argument index="3" name="size" type="int" />
-			<argument index="4" name="opentype_features" type="Dictionary" default="{}" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
+			<param index="2" name="fonts" type="Array" />
+			<param index="3" name="size" type="int" />
+			<param index="4" name="opentype_features" type="Dictionary" default="{}" />
 			<description>
 				Changes text span font, font size and OpenType features, without changing the text.
 			</description>
 		</method>
 		<method name="shaped_text_add_object">
 			<return type="bool" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="key" type="Variant" />
-			<argument index="2" name="size" type="Vector2" />
-			<argument index="3" name="inline_align" type="int" enum="InlineAlignment" default="5" />
-			<argument index="4" name="length" type="int" default="1" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="key" type="Variant" />
+			<param index="2" name="size" type="Vector2" />
+			<param index="3" name="inline_align" type="int" enum="InlineAlignment" default="5" />
+			<param index="4" name="length" type="int" default="1" />
 			<description>
-				Adds inline object to the text buffer, [code]key[/code] must be unique. In the text, object is represented as [code]length[/code] object replacement characters.
+				Adds inline object to the text buffer, [param key] must be unique. In the text, object is represented as [param length] object replacement characters.
 			</description>
 		</method>
 		<method name="shaped_text_add_string">
 			<return type="bool" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="text" type="String" />
-			<argument index="2" name="fonts" type="Array" />
-			<argument index="3" name="size" type="int" />
-			<argument index="4" name="opentype_features" type="Dictionary" default="{}" />
-			<argument index="5" name="language" type="String" default="&quot;&quot;" />
-			<argument index="6" name="meta" type="Variant" default="null" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="text" type="String" />
+			<param index="2" name="fonts" type="Array" />
+			<param index="3" name="size" type="int" />
+			<param index="4" name="opentype_features" type="Dictionary" default="{}" />
+			<param index="5" name="language" type="String" default="&quot;&quot;" />
+			<param index="6" name="meta" type="Variant" default="null" />
 			<description>
 				Adds text span and font to draw it to the text buffer.
 			</description>
 		</method>
 		<method name="shaped_text_clear">
 			<return type="void" />
-			<argument index="0" name="rid" type="RID" />
+			<param index="0" name="rid" type="RID" />
 			<description>
 				Clears text buffer (removes text and inline objects).
 			</description>
 		</method>
 		<method name="shaped_text_draw" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="canvas" type="RID" />
-			<argument index="2" name="pos" type="Vector2" />
-			<argument index="3" name="clip_l" type="float" default="-1" />
-			<argument index="4" name="clip_r" type="float" default="-1" />
-			<argument index="5" name="color" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="canvas" type="RID" />
+			<param index="2" name="pos" type="Vector2" />
+			<param index="3" name="clip_l" type="float" default="-1" />
+			<param index="4" name="clip_r" type="float" default="-1" />
+			<param index="5" name="color" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
-				Draw shaped text into a canvas item at a given position, with [code]color[/code]. [code]pos[/code] specifies the leftmost point of the baseline (for horizontal layout) or topmost point of the baseline (for vertical layout).
+				Draw shaped text into a canvas item at a given position, with [param color]. [param pos] specifies the leftmost point of the baseline (for horizontal layout) or topmost point of the baseline (for vertical layout).
 			</description>
 		</method>
 		<method name="shaped_text_draw_outline" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="canvas" type="RID" />
-			<argument index="2" name="pos" type="Vector2" />
-			<argument index="3" name="clip_l" type="float" default="-1" />
-			<argument index="4" name="clip_r" type="float" default="-1" />
-			<argument index="5" name="outline_size" type="int" default="1" />
-			<argument index="6" name="color" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="canvas" type="RID" />
+			<param index="2" name="pos" type="Vector2" />
+			<param index="3" name="clip_l" type="float" default="-1" />
+			<param index="4" name="clip_r" type="float" default="-1" />
+			<param index="5" name="outline_size" type="int" default="1" />
+			<param index="6" name="color" type="Color" default="Color(1, 1, 1, 1)" />
 			<description>
-				Draw the outline of the shaped text into a canvas item at a given position, with [code]color[/code]. [code]pos[/code] specifies the leftmost point of the baseline (for horizontal layout) or topmost point of the baseline (for vertical layout).
+				Draw the outline of the shaped text into a canvas item at a given position, with [param color]. [param pos] specifies the leftmost point of the baseline (for horizontal layout) or topmost point of the baseline (for vertical layout).
 			</description>
 		</method>
 		<method name="shaped_text_fit_to_width">
 			<return type="float" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="width" type="float" />
-			<argument index="2" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="width" type="float" />
+			<param index="2" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
 			<description>
 				Adjusts text with to fit to specified width, returns new text width.
 			</description>
 		</method>
 		<method name="shaped_text_get_ascent" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns the text ascent (number of pixels above the baseline for horizontal layout or to the left of baseline for vertical).
 				[b]Note:[/b] Overall ascent can be higher than font ascent, if some glyphs are displaced from the baseline.
@@ -1117,22 +1117,22 @@
 		</method>
 		<method name="shaped_text_get_carets" qualifiers="const">
 			<return type="Dictionary" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="position" type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="position" type="int" />
 			<description>
-				Returns shapes of the carets corresponding to the character offset [code]position[/code] in the text. Returned caret shape is 1 pixel wide rectangle.
+				Returns shapes of the carets corresponding to the character offset [param position] in the text. Returned caret shape is 1 pixel wide rectangle.
 			</description>
 		</method>
 		<method name="shaped_text_get_custom_punctuation" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns custom punctuation character list, used for word breaking. If set to empty string, server defaults are used.
 			</description>
 		</method>
 		<method name="shaped_text_get_descent" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns the text descent (number of pixels below the baseline for horizontal layout or to the right of baseline for vertical).
 				[b]Note:[/b] Overall descent can be higher than font descent, if some glyphs are displaced from the baseline.
@@ -1140,130 +1140,130 @@
 		</method>
 		<method name="shaped_text_get_direction" qualifiers="const">
 			<return type="int" enum="TextServer.Direction" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns direction of the text.
 			</description>
 		</method>
 		<method name="shaped_text_get_dominant_direction_in_range" qualifiers="const">
 			<return type="int" enum="TextServer.Direction" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="start" type="int" />
-			<argument index="2" name="end" type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="start" type="int" />
+			<param index="2" name="end" type="int" />
 			<description>
 				Returns dominant direction of in the range of text.
 			</description>
 		</method>
 		<method name="shaped_text_get_ellipsis_glyph_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns number of glyphs in the ellipsis.
 			</description>
 		</method>
 		<method name="shaped_text_get_ellipsis_glyphs" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns array of the glyphs in the ellipsis.
 			</description>
 		</method>
 		<method name="shaped_text_get_ellipsis_pos" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns position of the ellipsis.
 			</description>
 		</method>
 		<method name="shaped_text_get_glyph_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns number of glyphs in the buffer.
 			</description>
 		</method>
 		<method name="shaped_text_get_glyphs" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns an array of glyphs in the visual order.
 			</description>
 		</method>
 		<method name="shaped_text_get_grapheme_bounds" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="pos" type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="pos" type="int" />
 			<description>
 				Returns composite character's bounds as offsets from the start of the line.
 			</description>
 		</method>
 		<method name="shaped_text_get_inferred_direction" qualifiers="const">
 			<return type="int" enum="TextServer.Direction" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns direction of the text, inferred by the BiDi algorithm.
 			</description>
 		</method>
 		<method name="shaped_text_get_line_breaks" qualifiers="const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="width" type="float" />
-			<argument index="2" name="start" type="int" default="0" />
-			<argument index="3" name="break_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="width" type="float" />
+			<param index="2" name="start" type="int" default="0" />
+			<param index="3" name="break_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
 			<description>
 				Breaks text to the lines and returns character ranges for each line.
 			</description>
 		</method>
 		<method name="shaped_text_get_line_breaks_adv" qualifiers="const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="width" type="PackedFloat32Array" />
-			<argument index="2" name="start" type="int" default="0" />
-			<argument index="3" name="once" type="bool" default="true" />
-			<argument index="4" name="break_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="width" type="PackedFloat32Array" />
+			<param index="2" name="start" type="int" default="0" />
+			<param index="3" name="once" type="bool" default="true" />
+			<param index="4" name="break_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
 			<description>
 				Breaks text to the lines and columns. Returns character ranges for each segment.
 			</description>
 		</method>
 		<method name="shaped_text_get_object_rect" qualifiers="const">
 			<return type="Rect2" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="key" type="Variant" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="key" type="Variant" />
 			<description>
 				Returns bounding rectangle of the inline object.
 			</description>
 		</method>
 		<method name="shaped_text_get_objects" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns array of inline objects.
 			</description>
 		</method>
 		<method name="shaped_text_get_orientation" qualifiers="const">
 			<return type="int" enum="TextServer.Orientation" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns text orientation.
 			</description>
 		</method>
 		<method name="shaped_text_get_parent" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns the parent buffer from which the substring originates.
 			</description>
 		</method>
 		<method name="shaped_text_get_preserve_control" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns [code]true[/code] if text buffer is configured to display control characters.
 			</description>
 		</method>
 		<method name="shaped_text_get_preserve_invalid" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns [code]true[/code] if text buffer is configured to display hexadecimal codes in place of invalid characters.
 				[b]Note:[/b] If set to [code]false[/code], nothing is displayed in place of invalid characters.
@@ -1271,133 +1271,133 @@
 		</method>
 		<method name="shaped_text_get_range" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns substring buffer character range in the parent buffer.
 			</description>
 		</method>
 		<method name="shaped_text_get_selection" qualifiers="const">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="start" type="int" />
-			<argument index="2" name="end" type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="start" type="int" />
+			<param index="2" name="end" type="int" />
 			<description>
 				Returns selection rectangles for the specified character range.
 			</description>
 		</method>
 		<method name="shaped_text_get_size" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns size of the text.
 			</description>
 		</method>
 		<method name="shaped_text_get_spacing" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="spacing" type="int" enum="TextServer.SpacingType" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="spacing" type="int" enum="TextServer.SpacingType" />
 			<description>
 				Returns extra spacing added between glyphs or lines in pixels.
 			</description>
 		</method>
 		<method name="shaped_text_get_trim_pos" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns the position of the overrun trim.
 			</description>
 		</method>
 		<method name="shaped_text_get_underline_position" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns pixel offset of the underline below the baseline.
 			</description>
 		</method>
 		<method name="shaped_text_get_underline_thickness" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns thickness of the underline.
 			</description>
 		</method>
 		<method name="shaped_text_get_width" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns width (for horizontal layout) or height (for vertical) of the text.
 			</description>
 		</method>
 		<method name="shaped_text_get_word_breaks" qualifiers="const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="grapheme_flags" type="int" enum="TextServer.GraphemeFlag" default="264" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="grapheme_flags" type="int" enum="TextServer.GraphemeFlag" default="264" />
 			<description>
-				Breaks text into words and returns array of character ranges. Use [code]grapheme_flags[/code] to set what characters are used for breaking (see [enum GraphemeFlag]).
+				Breaks text into words and returns array of character ranges. Use [param grapheme_flags] to set what characters are used for breaking (see [enum GraphemeFlag]).
 			</description>
 		</method>
 		<method name="shaped_text_hit_test_grapheme" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="coords" type="float" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="coords" type="float" />
 			<description>
 				Returns grapheme index at the specified pixel offset at the baseline, or [code]-1[/code] if none is found.
 			</description>
 		</method>
 		<method name="shaped_text_hit_test_position" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="coords" type="float" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="coords" type="float" />
 			<description>
 				Returns caret character offset at the specified pixel offset at the baseline. This function always returns a valid position.
 			</description>
 		</method>
 		<method name="shaped_text_is_ready" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns [code]true[/code] if buffer is successfully shaped.
 			</description>
 		</method>
 		<method name="shaped_text_next_grapheme_pos" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="pos" type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="pos" type="int" />
 			<description>
-				Returns composite character end position closest to the [code]pos[/code].
+				Returns composite character end position closest to the [param pos].
 			</description>
 		</method>
 		<method name="shaped_text_overrun_trim_to_width">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="width" type="float" default="0" />
-			<argument index="2" name="overrun_trim_flags" type="int" enum="TextServer.TextOverrunFlag" default="0" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="width" type="float" default="0" />
+			<param index="2" name="overrun_trim_flags" type="int" enum="TextServer.TextOverrunFlag" default="0" />
 			<description>
 				Trims text if it exceeds the given width.
 			</description>
 		</method>
 		<method name="shaped_text_prev_grapheme_pos" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="pos" type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="pos" type="int" />
 			<description>
-				Returns composite character start position closest to the [code]pos[/code].
+				Returns composite character start position closest to the [param pos].
 			</description>
 		</method>
 		<method name="shaped_text_resize_object">
 			<return type="bool" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="key" type="Variant" />
-			<argument index="2" name="size" type="Vector2" />
-			<argument index="3" name="inline_align" type="int" enum="InlineAlignment" default="5" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="key" type="Variant" />
+			<param index="2" name="size" type="Vector2" />
+			<param index="3" name="inline_align" type="int" enum="InlineAlignment" default="5" />
 			<description>
 				Sets new size and alignment of embedded object.
 			</description>
 		</method>
 		<method name="shaped_text_set_bidi_override">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="override" type="Array" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="override" type="Array" />
 			<description>
 				Overrides BiDi for the structured text.
 				Override ranges should cover full source text without overlaps. BiDi algorithm will be used on each range separately.
@@ -1405,16 +1405,16 @@
 		</method>
 		<method name="shaped_text_set_custom_punctuation">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="punct" type="String" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="punct" type="String" />
 			<description>
 				Sets custom punctuation character list, used for word breaking. If set to empty string, server defaults are used.
 			</description>
 		</method>
 		<method name="shaped_text_set_direction">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="direction" type="int" enum="TextServer.Direction" default="0" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="direction" type="int" enum="TextServer.Direction" default="0" />
 			<description>
 				Sets desired text direction. If set to [code]TEXT_DIRECTION_AUTO[/code], direction will be detected based on the buffer contents and current locale.
 				[b]Note:[/b] Direction is ignored if server does not support [constant FEATURE_BIDI_LAYOUT] feature (supported by [TextServerAdvanced]).
@@ -1422,8 +1422,8 @@
 		</method>
 		<method name="shaped_text_set_orientation">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
 				Sets desired text orientation.
 				[b]Note:[/b] Orientation is ignored if server does not support [constant FEATURE_VERTICAL_LAYOUT] feature (supported by [TextServerAdvanced]).
@@ -1431,32 +1431,32 @@
 		</method>
 		<method name="shaped_text_set_preserve_control">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				If set to [code]true[/code] text buffer will display control characters.
 			</description>
 		</method>
 		<method name="shaped_text_set_preserve_invalid">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				If set to [code]true[/code] text buffer will display invalid characters as hexadecimal codes, otherwise nothing is displayed.
 			</description>
 		</method>
 		<method name="shaped_text_set_spacing">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="spacing" type="int" enum="TextServer.SpacingType" />
-			<argument index="2" name="value" type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="spacing" type="int" enum="TextServer.SpacingType" />
+			<param index="2" name="value" type="int" />
 			<description>
 				Sets extra spacing added between glyphs or lines in pixels.
 			</description>
 		</method>
 		<method name="shaped_text_shape">
 			<return type="bool" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Shapes buffer if it's not shaped. Returns [code]true[/code] if the string is shaped successfully.
 				[b]Note:[/b] It is not necessary to call this function manually, buffer will be shaped automatically as soon as any of its output data is requested.
@@ -1464,48 +1464,48 @@
 		</method>
 		<method name="shaped_text_sort_logical">
 			<return type="Array" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns text glyphs in the logical order.
 			</description>
 		</method>
 		<method name="shaped_text_substr" qualifiers="const">
 			<return type="RID" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="start" type="int" />
-			<argument index="2" name="length" type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="start" type="int" />
+			<param index="2" name="length" type="int" />
 			<description>
-				Returns text buffer for the substring of the text in the [code]shaped[/code] text buffer (including inline objects).
+				Returns text buffer for the substring of the text in the [param shaped] text buffer (including inline objects).
 			</description>
 		</method>
 		<method name="shaped_text_tab_align">
 			<return type="float" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="tab_stops" type="PackedFloat32Array" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="tab_stops" type="PackedFloat32Array" />
 			<description>
 				Aligns shaped text to the given tab-stops.
 			</description>
 		</method>
 		<method name="spoof_check" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="string" type="String" />
+			<param index="0" name="string" type="String" />
 			<description>
-				Returns [code]true[/code] if [code]string[/code] is likely to be an attempt at confusing the reader.
+				Returns [code]true[/code] if [param string] is likely to be an attempt at confusing the reader.
 				[b]Note:[/b] Always returns [code]false[/code] if the server does not support the [constant FEATURE_UNICODE_SECURITY] feature.
 			</description>
 		</method>
 		<method name="string_get_word_breaks" qualifiers="const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="string" type="String" />
-			<argument index="1" name="language" type="String" default="&quot;&quot;" />
+			<param index="0" name="string" type="String" />
+			<param index="1" name="language" type="String" default="&quot;&quot;" />
 			<description>
 				Returns array of the word break character offsets.
 			</description>
 		</method>
 		<method name="string_to_lower" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="string" type="String" />
-			<argument index="1" name="language" type="String" default="&quot;&quot;" />
+			<param index="0" name="string" type="String" />
+			<param index="1" name="language" type="String" default="&quot;&quot;" />
 			<description>
 				Returns the string converted to lowercase.
 				[b]Note:[/b] Casing is locale dependent and context sensitive if server support [constant FEATURE_CONTEXT_SENSITIVE_CASE_CONVERSION] feature (supported by [TextServerAdvanced]).
@@ -1514,8 +1514,8 @@
 		</method>
 		<method name="string_to_upper" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="string" type="String" />
-			<argument index="1" name="language" type="String" default="&quot;&quot;" />
+			<param index="0" name="string" type="String" />
+			<param index="1" name="language" type="String" default="&quot;&quot;" />
 			<description>
 				Returns the string converted to uppercase.
 				[b]Note:[/b] Casing is locale dependent and context sensitive if server support [constant FEATURE_CONTEXT_SENSITIVE_CASE_CONVERSION] feature (supported by [TextServerAdvanced]).
@@ -1524,7 +1524,7 @@
 		</method>
 		<method name="strip_diacritics" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="string" type="String" />
+			<param index="0" name="string" type="String" />
 			<description>
 				Strips diacritics from the string.
 				[b]Note:[/b] The result may be longer or shorter than the original.
@@ -1532,7 +1532,7 @@
 		</method>
 		<method name="tag_to_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="tag" type="int" />
+			<param index="0" name="tag" type="int" />
 			<description>
 				Converts OpenType tag to readable feature, variation, script or language name.
 			</description>
@@ -1679,6 +1679,9 @@
 		<constant name="GRAPHEME_IS_CONNECTED" value="1024" enum="GraphemeFlag" is_bitfield="true">
 			Grapheme is connected to the previous grapheme. Breaking line before this grapheme is not safe.
 		</constant>
+		<constant name="GRAPHEME_IS_SAFE_TO_INSERT_TATWEEL" value="2048" enum="GraphemeFlag" is_bitfield="true">
+			It is safe to insert a U+0640 before this grapheme for elongation.
+		</constant>
 		<constant name="HINTING_NONE" value="0" enum="Hinting">
 			Disables font hinting (smoother but less crisp).
 		</constant>
@@ -1704,10 +1707,10 @@
 			Glyph horizontal position is rounded to one quarter of the pixel size, each glyph is rasterized up to four times.
 		</constant>
 		<constant name="SUBPIXEL_POSITIONING_ONE_HALF_MAX_SIZE" value="20" enum="SubpixelPositioning">
-			Maximum font size which will use one half of the pixel subpixel positioning in [constants SUBPIXEL_POSITIONING_AUTO] mode.
+			Maximum font size which will use one half of the pixel subpixel positioning in [constant SUBPIXEL_POSITIONING_AUTO] mode.
 		</constant>
 		<constant name="SUBPIXEL_POSITIONING_ONE_QUARTER_MAX_SIZE" value="16" enum="SubpixelPositioning">
-			Maximum font size which will use one quarter of the pixel subpixel positioning in [constants SUBPIXEL_POSITIONING_AUTO] mode.
+			Maximum font size which will use one quarter of the pixel subpixel positioning in [constant SUBPIXEL_POSITIONING_AUTO] mode.
 		</constant>
 		<constant name="FEATURE_SIMPLE_LAYOUT" value="1" enum="Feature">
 			TextServer supports simple text layouts.
diff --git a/doc/classes/TextServerExtension.xml b/doc/classes/TextServerExtension.xml
index c686a06e5e..219052d3d5 100644
--- a/doc/classes/TextServerExtension.xml
+++ b/doc/classes/TextServerExtension.xml
@@ -17,19 +17,19 @@
 		</method>
 		<method name="create_shaped_text" qualifiers="virtual">
 			<return type="RID" />
-			<argument index="0" name="direction" type="int" enum="TextServer.Direction" />
-			<argument index="1" name="orientation" type="int" enum="TextServer.Orientation" />
+			<param index="0" name="direction" type="int" enum="TextServer.Direction" />
+			<param index="1" name="orientation" type="int" enum="TextServer.Orientation" />
 			<description>
-				Creates new buffer for complex text layout, with the given [code]direction[/code] and [code]orientation[/code]. To free the resulting buffer, use [method free_rid] method.
+				Creates new buffer for complex text layout, with the given [param direction] and [param orientation]. To free the resulting buffer, use [method free_rid] method.
 			</description>
 		</method>
 		<method name="draw_hex_code_box" qualifiers="virtual const">
 			<return type="void" />
-			<argument index="0" name="canvas" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="pos" type="Vector2" />
-			<argument index="3" name="index" type="int" />
-			<argument index="4" name="color" type="Color" />
+			<param index="0" name="canvas" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="pos" type="Vector2" />
+			<param index="3" name="index" type="int" />
+			<param index="4" name="color" type="Color" />
 			<description>
 				Draws box displaying character hexadecimal code. Used for replacing missing characters.
 				[b]Note:[/b] If this method is not implemented in the plugin, the default implementation will be used.
@@ -37,107 +37,107 @@
 		</method>
 		<method name="font_clear_glyphs" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
 			<description>
 				Removes all rendered glyphs information from the cache entry.
 			</description>
 		</method>
 		<method name="font_clear_kerning_map" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
 			<description>
 				Removes all kerning overrides.
 			</description>
 		</method>
 		<method name="font_clear_size_cache" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Removes all font sizes from the cache entry.
 			</description>
 		</method>
 		<method name="font_clear_textures" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
 			<description>
 				Removes all textures from font cache entry.
 			</description>
 		</method>
 		<method name="font_draw_glyph" qualifiers="virtual const">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="canvas" type="RID" />
-			<argument index="2" name="size" type="int" />
-			<argument index="3" name="pos" type="Vector2" />
-			<argument index="4" name="index" type="int" />
-			<argument index="5" name="color" type="Color" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="canvas" type="RID" />
+			<param index="2" name="size" type="int" />
+			<param index="3" name="pos" type="Vector2" />
+			<param index="4" name="index" type="int" />
+			<param index="5" name="color" type="Color" />
 			<description>
-				Draws single glyph into a canvas item at the position, using [code]font_rid[/code] at the size [code]size[/code].
+				Draws single glyph into a canvas item at the position, using [param font_rid] at the size [param size].
 			</description>
 		</method>
 		<method name="font_draw_glyph_outline" qualifiers="virtual const">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="canvas" type="RID" />
-			<argument index="2" name="size" type="int" />
-			<argument index="3" name="outline_size" type="int" />
-			<argument index="4" name="pos" type="Vector2" />
-			<argument index="5" name="index" type="int" />
-			<argument index="6" name="color" type="Color" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="canvas" type="RID" />
+			<param index="2" name="size" type="int" />
+			<param index="3" name="outline_size" type="int" />
+			<param index="4" name="pos" type="Vector2" />
+			<param index="5" name="index" type="int" />
+			<param index="6" name="color" type="Color" />
 			<description>
-				Draws single glyph outline of size [code]outline_size[/code] into a canvas item at the position, using [code]font_rid[/code] at the size [code]size[/code].
+				Draws single glyph outline of size [param outline_size] into a canvas item at the position, using [param font_rid] at the size [param size].
 			</description>
 		</method>
 		<method name="font_get_ascent" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
 			<description>
 				Returns the font ascent (number of pixels above the baseline).
 			</description>
 		</method>
 		<method name="font_get_descent" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
 			<description>
 				Returns the font descent (number of pixels below the baseline).
 			</description>
 		</method>
 		<method name="font_get_embolden" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns font embolden strength.
 			</description>
 		</method>
 		<method name="font_get_face_count" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns number of faces in the TrueType / OpenType collection.
 			</description>
 		</method>
 		<method name="font_get_face_index" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns an active face index in the TrueType / OpenType collection.
 			</description>
 		</method>
 		<method name="font_get_fixed_size" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns bitmap font fixed size.
 			</description>
 		</method>
 		<method name="font_get_generate_mipmaps" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns [code]true[/code] if font texture mipmap generation is enabled.
 			</description>
@@ -150,18 +150,18 @@
 		</method>
 		<method name="font_get_glyph_advance" qualifiers="virtual const">
 			<return type="Vector2" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Returns glyph advance (offset of the next glyph).
 			</description>
 		</method>
 		<method name="font_get_glyph_contours" qualifiers="virtual const">
 			<return type="Dictionary" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="index" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="index" type="int" />
 			<description>
 				Returns outline contours of the glyph as a [code]Dictionary[/code] with the following contents:
 				[code]points[/code]         - [PackedVector3Array], containing outline points. [code]x[/code] and [code]y[/code] are point coordinates. [code]z[/code] is the type of the point, using the [enum TextServer.ContourPointTag] values.
@@ -171,465 +171,465 @@
 		</method>
 		<method name="font_get_glyph_index" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="char" type="int" />
-			<argument index="3" name="variation_selector" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="char" type="int" />
+			<param index="3" name="variation_selector" type="int" />
 			<description>
-				Returns the glyph index of a [code]char[/code], optionally modified by the [code]variation_selector[/code].
+				Returns the glyph index of a [param char], optionally modified by the [param variation_selector].
 			</description>
 		</method>
 		<method name="font_get_glyph_list" qualifiers="virtual const">
 			<return type="Array" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
 			<description>
 				Returns list of rendered glyphs in the cache entry.
 			</description>
 		</method>
 		<method name="font_get_glyph_offset" qualifiers="virtual const">
 			<return type="Vector2" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Returns glyph offset from the baseline.
 			</description>
 		</method>
 		<method name="font_get_glyph_size" qualifiers="virtual const">
 			<return type="Vector2" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Returns size of the glyph.
 			</description>
 		</method>
 		<method name="font_get_glyph_texture_idx" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Returns index of the cache texture containing the glyph.
 			</description>
 		</method>
 		<method name="font_get_glyph_texture_rid" qualifiers="virtual const">
 			<return type="RID" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Returns resource id of the cache texture containing the glyph.
 			</description>
 		</method>
 		<method name="font_get_glyph_texture_size" qualifiers="virtual const">
 			<return type="Vector2" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Returns size of the cache texture containing the glyph.
 			</description>
 		</method>
 		<method name="font_get_glyph_uv_rect" qualifiers="virtual const">
 			<return type="Rect2" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Returns rectangle in the cache texture containing the glyph.
 			</description>
 		</method>
 		<method name="font_get_hinting" qualifiers="virtual const">
 			<return type="int" enum="TextServer.Hinting" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns the font hinting mode. Used by dynamic fonts only.
 			</description>
 		</method>
 		<method name="font_get_kerning" qualifiers="virtual const">
 			<return type="Vector2" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="glyph_pair" type="Vector2i" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="glyph_pair" type="Vector2i" />
 			<description>
 				Returns kerning for the pair of glyphs.
 			</description>
 		</method>
 		<method name="font_get_kerning_list" qualifiers="virtual const">
 			<return type="Array" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
 			<description>
 				Returns list of the kerning overrides.
 			</description>
 		</method>
 		<method name="font_get_language_support_override" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="language" type="String" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="language" type="String" />
 			<description>
-				Returns [code]true[/code] if support override is enabled for the [code]language[/code].
+				Returns [code]true[/code] if support override is enabled for the [param language].
 			</description>
 		</method>
 		<method name="font_get_language_support_overrides" qualifiers="virtual">
 			<return type="PackedStringArray" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns list of language support overrides.
 			</description>
 		</method>
 		<method name="font_get_msdf_pixel_range" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns the width of the range around the shape between the minimum and maximum representable signed distance.
 			</description>
 		</method>
 		<method name="font_get_msdf_size" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns source font size used to generate MSDF textures.
 			</description>
 		</method>
 		<method name="font_get_name" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns font family name.
 			</description>
 		</method>
 		<method name="font_get_opentype_feature_overrides" qualifiers="virtual const">
 			<return type="Dictionary" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns font OpenType feature set override.
 			</description>
 		</method>
 		<method name="font_get_oversampling" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns font oversampling factor, if set to [code]0.0[/code] global oversampling factor is used instead. Used by dynamic fonts only.
 			</description>
 		</method>
 		<method name="font_get_scale" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
 			<description>
 				Returns scaling factor of the color bitmap font.
 			</description>
 		</method>
 		<method name="font_get_script_support_override" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="script" type="String" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="script" type="String" />
 			<description>
-				Returns [code]true[/code] if support override is enabled for the [code]script[/code].
+				Returns [code]true[/code] if support override is enabled for the [param script].
 			</description>
 		</method>
 		<method name="font_get_script_support_overrides" qualifiers="virtual">
 			<return type="PackedStringArray" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns list of script support overrides.
 			</description>
 		</method>
 		<method name="font_get_size_cache_list" qualifiers="virtual const">
 			<return type="Array" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns list of the font sizes in the cache. Each size is [code]Vector2i[/code] with font size and outline size.
 			</description>
 		</method>
 		<method name="font_get_style" qualifiers="virtual const">
 			<return type="int" enum="TextServer.FontStyle" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns font style flags, see [enum TextServer.FontStyle].
 			</description>
 		</method>
 		<method name="font_get_style_name" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns font style name.
 			</description>
 		</method>
 		<method name="font_get_subpixel_positioning" qualifiers="virtual const">
 			<return type="int" enum="TextServer.SubpixelPositioning" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns font sub-pixel glyph positioning mode.
 			</description>
 		</method>
 		<method name="font_get_supported_chars" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns a string containing all the characters available in the font.
 			</description>
 		</method>
 		<method name="font_get_texture_count" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
 			<description>
 				Returns number of textures used by font cache entry.
 			</description>
 		</method>
 		<method name="font_get_texture_image" qualifiers="virtual const">
 			<return type="Image" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="texture_index" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="texture_index" type="int" />
 			<description>
 				Returns font cache texture image data.
 			</description>
 		</method>
 		<method name="font_get_texture_offsets" qualifiers="virtual const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="texture_index" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="texture_index" type="int" />
 			<description>
 				Returns array containing the first free pixel in the each column of texture. Should be the same size as texture width or empty.
 			</description>
 		</method>
 		<method name="font_get_transform" qualifiers="virtual const">
 			<return type="Transform2D" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns 2D transform applied to the font outlines.
 			</description>
 		</method>
 		<method name="font_get_underline_position" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
 			<description>
 				Returns pixel offset of the underline below the baseline.
 			</description>
 		</method>
 		<method name="font_get_underline_thickness" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
 			<description>
 				Returns thickness of the underline in pixels.
 			</description>
 		</method>
 		<method name="font_get_variation_coordinates" qualifiers="virtual const">
 			<return type="Dictionary" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns variation coordinates for the specified font cache entry. See [method font_supported_variation_list] for more info.
 			</description>
 		</method>
 		<method name="font_has_char" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="char" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="char" type="int" />
 			<description>
-				Returns [code]true[/code] if a Unicode [code]char[/code] is available in the font.
+				Returns [code]true[/code] if a Unicode [param char] is available in the font.
 			</description>
 		</method>
 		<method name="font_is_antialiased" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns [code]true[/code] if font 8-bit anitialiased glyph rendering is supported and enabled.
 			</description>
 		</method>
 		<method name="font_is_force_autohinter" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns [code]true[/code] if auto-hinting is supported and preferred over font built-in hinting. Used by dynamic fonts only.
 			</description>
 		</method>
 		<method name="font_is_language_supported" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="language" type="String" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="language" type="String" />
 			<description>
 				Returns [code]true[/code], if font supports given language ([url=https://en.wikipedia.org/wiki/ISO_639-1]ISO 639[/url] code).
 			</description>
 		</method>
 		<method name="font_is_multichannel_signed_distance_field" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns [code]true[/code] if glyphs of all sizes are rendered using single multichannel signed distance field generated from the dynamic font vector data.
 			</description>
 		</method>
 		<method name="font_is_script_supported" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="script" type="String" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="script" type="String" />
 			<description>
 				Returns [code]true[/code], if font supports given script (ISO 15924 code).
 			</description>
 		</method>
 		<method name="font_remove_glyph" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
 			<description>
 				Removes specified rendered glyph information from the cache entry.
 			</description>
 		</method>
 		<method name="font_remove_kerning" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="glyph_pair" type="Vector2i" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="glyph_pair" type="Vector2i" />
 			<description>
 				Removes kerning override for the pair of glyphs.
 			</description>
 		</method>
 		<method name="font_remove_language_support_override" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="language" type="String" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="language" type="String" />
 			<description>
 				Remove language support override.
 			</description>
 		</method>
 		<method name="font_remove_script_support_override" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="script" type="String" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="script" type="String" />
 			<description>
 				Removes script support override.
 			</description>
 		</method>
 		<method name="font_remove_size_cache" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
 			<description>
 				Removes specified font size from the cache entry.
 			</description>
 		</method>
 		<method name="font_remove_texture" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="texture_index" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="texture_index" type="int" />
 			<description>
 				Removes specified texture from the cache entry.
 			</description>
 		</method>
 		<method name="font_render_glyph" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="index" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="index" type="int" />
 			<description>
 				Renders specified glyph to the font cache texture.
 			</description>
 		</method>
 		<method name="font_render_range" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="start" type="int" />
-			<argument index="3" name="end" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="start" type="int" />
+			<param index="3" name="end" type="int" />
 			<description>
 				Renders the range of characters to the font cache texture.
 			</description>
 		</method>
 		<method name="font_set_antialiased" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="antialiased" type="bool" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="antialiased" type="bool" />
 			<description>
 				If set to [code]true[/code], 8-bit antialiased glyph rendering is used, otherwise 1-bit rendering is used. Used by dynamic fonts only.
 			</description>
 		</method>
 		<method name="font_set_ascent" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="ascent" type="float" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="ascent" type="float" />
 			<description>
 				Sets the font ascent (number of pixels above the baseline).
 			</description>
 		</method>
 		<method name="font_set_data" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="data" type="PackedByteArray" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="data" type="PackedByteArray" />
 			<description>
 				Sets font source data, e.g contents of the dynamic font source file.
 			</description>
 		</method>
 		<method name="font_set_data_ptr" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="data_ptr" type="const uint8_t*" />
-			<argument index="2" name="data_size" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="data_ptr" type="const uint8_t*" />
+			<param index="2" name="data_size" type="int" />
 			<description>
-				Sets font source data, e.g contents of the dynamic font source file. [code]data_ptr[/code] memory buffer must remain accessible during font lifetime.
+				Sets font source data, e.g contents of the dynamic font source file. [param data_ptr] memory buffer must remain accessible during font lifetime.
 			</description>
 		</method>
 		<method name="font_set_descent" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="descent" type="float" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="descent" type="float" />
 			<description>
 				Sets the font descent (number of pixels below the baseline).
 			</description>
 		</method>
 		<method name="font_set_embolden" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="strength" type="float" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="strength" type="float" />
 			<description>
-				Sets font embolden strength. If [code]strength[/code] is not equal to zero, emboldens the font outlines. Negative values reduce the outline thickness.
+				Sets font embolden strength. If [param strength] is not equal to zero, emboldens the font outlines. Negative values reduce the outline thickness.
 			</description>
 		</method>
 		<method name="font_set_face_index" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="face_index" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="face_index" type="int" />
 			<description>
 				Sets an active face index in the TrueType / OpenType collection.
 			</description>
 		</method>
 		<method name="font_set_fixed_size" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="fixed_size" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="fixed_size" type="int" />
 			<description>
 				Sets bitmap font fixed size. If set to value greater than zero, same cache entry will be used for all font sizes.
 			</description>
 		</method>
 		<method name="font_set_force_autohinter" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="force_autohinter" type="bool" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="force_autohinter" type="bool" />
 			<description>
 				If set to [code]true[/code] auto-hinting is preferred over font built-in hinting.
 			</description>
 		</method>
 		<method name="font_set_generate_mipmaps" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="generate_mipmaps" type="bool" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="generate_mipmaps" type="bool" />
 			<description>
 				If set to [code]true[/code] font texture mipmap generation is enabled.
 			</description>
 		</method>
 		<method name="font_set_global_oversampling" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="oversampling" type="float" />
+			<param index="0" name="oversampling" type="float" />
 			<description>
 				Sets oversampling factor, shared by all font in the TextServer.
 				[b]Note:[/b] This value can be automatically changed by display server.
@@ -637,101 +637,101 @@
 		</method>
 		<method name="font_set_glyph_advance" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="glyph" type="int" />
-			<argument index="3" name="advance" type="Vector2" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="glyph" type="int" />
+			<param index="3" name="advance" type="Vector2" />
 			<description>
 				Sets glyph advance (offset of the next glyph).
 			</description>
 		</method>
 		<method name="font_set_glyph_offset" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
-			<argument index="3" name="offset" type="Vector2" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
+			<param index="3" name="offset" type="Vector2" />
 			<description>
 				Sets glyph offset from the baseline.
 			</description>
 		</method>
 		<method name="font_set_glyph_size" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
-			<argument index="3" name="gl_size" type="Vector2" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
+			<param index="3" name="gl_size" type="Vector2" />
 			<description>
 				Sets size of the glyph.
 			</description>
 		</method>
 		<method name="font_set_glyph_texture_idx" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
-			<argument index="3" name="texture_idx" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
+			<param index="3" name="texture_idx" type="int" />
 			<description>
 				Sets index of the cache texture containing the glyph.
 			</description>
 		</method>
 		<method name="font_set_glyph_uv_rect" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="glyph" type="int" />
-			<argument index="3" name="uv_rect" type="Rect2" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="glyph" type="int" />
+			<param index="3" name="uv_rect" type="Rect2" />
 			<description>
 				Sets rectangle in the cache texture containing the glyph.
 			</description>
 		</method>
 		<method name="font_set_hinting" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="hinting" type="int" enum="TextServer.Hinting" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="hinting" type="int" enum="TextServer.Hinting" />
 			<description>
 				Sets font hinting mode. Used by dynamic fonts only.
 			</description>
 		</method>
 		<method name="font_set_kerning" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="glyph_pair" type="Vector2i" />
-			<argument index="3" name="kerning" type="Vector2" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="glyph_pair" type="Vector2i" />
+			<param index="3" name="kerning" type="Vector2" />
 			<description>
 				Sets kerning for the pair of glyphs.
 			</description>
 		</method>
 		<method name="font_set_language_support_override" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="language" type="String" />
-			<argument index="2" name="supported" type="bool" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="language" type="String" />
+			<param index="2" name="supported" type="bool" />
 			<description>
 				Adds override for [method font_is_language_supported].
 			</description>
 		</method>
 		<method name="font_set_msdf_pixel_range" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="msdf_pixel_range" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="msdf_pixel_range" type="int" />
 			<description>
 				Sets the width of the range around the shape between the minimum and maximum representable signed distance.
 			</description>
 		</method>
 		<method name="font_set_msdf_size" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="msdf_size" type="int" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="msdf_size" type="int" />
 			<description>
 				Sets source font size used to generate MSDF textures.
 			</description>
 		</method>
 		<method name="font_set_multichannel_signed_distance_field" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="msdf" type="bool" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="msdf" type="bool" />
 			<description>
 				If set to [code]true[/code], glyphs of all sizes are rendered using single multichannel signed distance field generated from the dynamic font vector data. MSDF rendering allows displaying the font at any scaling factor without blurriness, and without incurring a CPU cost when the font size changes (since the font no longer needs to be rasterized on the CPU). As a downside, font hinting is not available with MSDF. The lack of font hinting may result in less crisp and less readable fonts at small sizes.
 				[b]Note:[/b] MSDF font rendering does not render glyphs with overlapping shapes correctly. Overlapping shapes are not valid per the OpenType standard, but are still commonly found in many font files, especially those converted by Google Fonts. To avoid issues with overlapping glyphs, consider downloading the font file directly from the type foundry instead of relying on Google Fonts.
@@ -739,94 +739,94 @@
 		</method>
 		<method name="font_set_name" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="name" type="String" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="name" type="String" />
 			<description>
 				Sets the font family name.
 			</description>
 		</method>
 		<method name="font_set_opentype_feature_overrides" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="overrides" type="Dictionary" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="overrides" type="Dictionary" />
 			<description>
 				Sets font OpenType feature set override.
 			</description>
 		</method>
 		<method name="font_set_oversampling" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="oversampling" type="float" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="oversampling" type="float" />
 			<description>
 				Sets font oversampling factor, if set to [code]0.0[/code] global oversampling factor is used instead. Used by dynamic fonts only.
 			</description>
 		</method>
 		<method name="font_set_scale" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="scale" type="float" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="scale" type="float" />
 			<description>
 				Sets scaling factor of the color bitmap font.
 			</description>
 		</method>
 		<method name="font_set_script_support_override" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="script" type="String" />
-			<argument index="2" name="supported" type="bool" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="script" type="String" />
+			<param index="2" name="supported" type="bool" />
 			<description>
 				Adds override for [method font_is_script_supported].
 			</description>
 		</method>
 		<method name="font_set_style" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="style" type="int" enum="TextServer.FontStyle" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="style" type="int" enum="TextServer.FontStyle" />
 			<description>
 				Sets the font style flags, see [enum TextServer.FontStyle].
 			</description>
 		</method>
 		<method name="font_set_style_name" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="name_style" type="String" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="name_style" type="String" />
 			<description>
 				Sets the font style name.
 			</description>
 		</method>
 		<method name="font_set_subpixel_positioning" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="subpixel_positioning" type="int" enum="TextServer.SubpixelPositioning" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="subpixel_positioning" type="int" enum="TextServer.SubpixelPositioning" />
 			<description>
 				Sets font sub-pixel glyph positioning mode.
 			</description>
 		</method>
 		<method name="font_set_texture_image" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="texture_index" type="int" />
-			<argument index="3" name="image" type="Image" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="texture_index" type="int" />
+			<param index="3" name="image" type="Image" />
 			<description>
 				Sets font cache texture image data.
 			</description>
 		</method>
 		<method name="font_set_texture_offsets" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="texture_index" type="int" />
-			<argument index="3" name="offset" type="PackedInt32Array" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="texture_index" type="int" />
+			<param index="3" name="offset" type="PackedInt32Array" />
 			<description>
 				Sets array containing the first free pixel in the each column of texture. Should be the same size as texture width or empty.
 			</description>
 		</method>
 		<method name="font_set_transform" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="transform" type="Transform2D" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="transform" type="Transform2D" />
 			<description>
 				Sets 2D transform, applied to the font outlines, can be used for slanting, flipping and rotating glyphs.
 				For example, to simulate italic typeface by slanting, apply the following transform [code]Transform2D(1.0, slant, 0.0, 1.0, 0.0, 0.0)[/code].
@@ -834,55 +834,55 @@
 		</method>
 		<method name="font_set_underline_position" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="underline_position" type="float" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="underline_position" type="float" />
 			<description>
 				Sets pixel offset of the underline below the baseline.
 			</description>
 		</method>
 		<method name="font_set_underline_thickness" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="size" type="int" />
-			<argument index="2" name="underline_thickness" type="float" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="size" type="int" />
+			<param index="2" name="underline_thickness" type="float" />
 			<description>
 				Sets thickness of the underline in pixels.
 			</description>
 		</method>
 		<method name="font_set_variation_coordinates" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="variation_coordinates" type="Dictionary" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="variation_coordinates" type="Dictionary" />
 			<description>
 				Sets variation coordinates for the specified font cache entry. See [method font_supported_variation_list] for more info.
 			</description>
 		</method>
 		<method name="font_supported_feature_list" qualifiers="virtual const">
 			<return type="Dictionary" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns the dictionary of the supported OpenType features.
 			</description>
 		</method>
 		<method name="font_supported_variation_list" qualifiers="virtual const">
 			<return type="Dictionary" />
-			<argument index="0" name="font_rid" type="RID" />
+			<param index="0" name="font_rid" type="RID" />
 			<description>
 				Returns the dictionary of the supported OpenType variation coordinates.
 			</description>
 		</method>
 		<method name="format_number" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="string" type="String" />
-			<argument index="1" name="language" type="String" />
+			<param index="0" name="string" type="String" />
+			<param index="1" name="language" type="String" />
 			<description>
-				Converts a number from the Western Arabic (0..9) to the numeral systems used in [code]language[/code].
+				Converts a number from the Western Arabic (0..9) to the numeral systems used in [param language].
 			</description>
 		</method>
 		<method name="free_rid" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="rid" type="RID" />
+			<param index="0" name="rid" type="RID" />
 			<description>
 				Frees an object created by this [TextServer].
 			</description>
@@ -895,8 +895,8 @@
 		</method>
 		<method name="get_hex_code_box_size" qualifiers="virtual const">
 			<return type="Vector2" />
-			<argument index="0" name="size" type="int" />
-			<argument index="1" name="index" type="int" />
+			<param index="0" name="size" type="int" />
+			<param index="1" name="index" type="int" />
 			<description>
 				Returns size of the replacement character (box with character hexadecimal code that is drawn in place of invalid characters).
 				[b]Note:[/b] If this method is not implemented in the plugin, the default implementation will be used.
@@ -922,80 +922,80 @@
 		</method>
 		<method name="has" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="rid" type="RID" />
+			<param index="0" name="rid" type="RID" />
 			<description>
-				Returns [code]true[/code] if [code]rid[/code] is valid resource owned by this text server.
+				Returns [code]true[/code] if [param rid] is valid resource owned by this text server.
 			</description>
 		</method>
 		<method name="has_feature" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="feature" type="int" enum="TextServer.Feature" />
+			<param index="0" name="feature" type="int" enum="TextServer.Feature" />
 			<description>
 				Returns [code]true[/code] if the server supports a feature.
 			</description>
 		</method>
 		<method name="is_confusable" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="string" type="String" />
-			<argument index="1" name="dict" type="PackedStringArray" />
+			<param index="0" name="string" type="String" />
+			<param index="1" name="dict" type="PackedStringArray" />
 			<description>
-				Returns index of the first string in [code]dict[/dict] which is visually confusable with the [code]string[/string], or [code]-1[/code] if none is found.
+				Returns index of the first string in [param dict] which is visually confusable with the [param string], or [code]-1[/code] if none is found.
 			</description>
 		</method>
 		<method name="is_locale_right_to_left" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="locale" type="String" />
+			<param index="0" name="locale" type="String" />
 			<description>
 				Returns [code]true[/code] if locale is right-to-left.
 			</description>
 		</method>
 		<method name="is_valid_identifier" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="string" type="String" />
+			<param index="0" name="string" type="String" />
 			<description>
-				Returns [code]true[/code] is [code]string[/code] is a valid identifier.
+				Returns [code]true[/code] is [param string] is a valid identifier.
 			</description>
 		</method>
 		<method name="load_support_data" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="filename" type="String" />
+			<param index="0" name="filename" type="String" />
 			<description>
 				Loads optional TextServer database (e.g. ICU break iterators and dictionaries).
 			</description>
 		</method>
 		<method name="name_to_tag" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Converts readable feature, variation, script or language name to OpenType tag.
 			</description>
 		</method>
 		<method name="parse_number" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="string" type="String" />
-			<argument index="1" name="language" type="String" />
+			<param index="0" name="string" type="String" />
+			<param index="1" name="language" type="String" />
 			<description>
-				Converts a number from the numeral systems used in [code]language[/code] to Western Arabic (0..9).
+				Converts a number from the numeral systems used in [param language] to Western Arabic (0..9).
 			</description>
 		</method>
 		<method name="parse_structured_text" qualifiers="virtual const">
 			<return type="Array" />
-			<argument index="0" name="parser_type" type="int" enum="TextServer.StructuredTextParser" />
-			<argument index="1" name="args" type="Array" />
-			<argument index="2" name="text" type="String" />
+			<param index="0" name="parser_type" type="int" enum="TextServer.StructuredTextParser" />
+			<param index="1" name="args" type="Array" />
+			<param index="2" name="text" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="percent_sign" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="language" type="String" />
+			<param index="0" name="language" type="String" />
 			<description>
-				Returns percent sign used in the [code]language[/code].
+				Returns percent sign used in the [param language].
 			</description>
 		</method>
 		<method name="save_support_data" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="filename" type="String" />
+			<param index="0" name="filename" type="String" />
 			<description>
 				Saves optional TextServer database (e.g. ICU break iterators and dictionaries) to the file.
 				[b]Note:[/b] This function is used by during project export, to include TextServer database.
@@ -1003,140 +1003,140 @@
 		</method>
 		<method name="shaped_get_span_count" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns number of text spans added using [method shaped_text_add_string] or [method shaped_text_add_object].
 			</description>
 		</method>
 		<method name="shaped_get_span_meta" qualifiers="virtual const">
 			<return type="Variant" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="index" type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
 			<description>
 				Returns text span metadata.
 			</description>
 		</method>
 		<method name="shaped_set_span_update_font" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="index" type="int" />
-			<argument index="2" name="fonts" type="Array" />
-			<argument index="3" name="size" type="int" />
-			<argument index="4" name="opentype_features" type="Dictionary" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
+			<param index="2" name="fonts" type="Array" />
+			<param index="3" name="size" type="int" />
+			<param index="4" name="opentype_features" type="Dictionary" />
 			<description>
 				Changes text span font, font size and OpenType features, without changing the text.
 			</description>
 		</method>
 		<method name="shaped_text_add_object" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="key" type="Variant" />
-			<argument index="2" name="size" type="Vector2" />
-			<argument index="3" name="inline_align" type="int" enum="InlineAlignment" />
-			<argument index="4" name="length" type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="key" type="Variant" />
+			<param index="2" name="size" type="Vector2" />
+			<param index="3" name="inline_align" type="int" enum="InlineAlignment" />
+			<param index="4" name="length" type="int" />
 			<description>
-				Adds inline object to the text buffer, [code]key[/code] must be unique. In the text, object is represented as [code]length[/code] object replacement characters.
+				Adds inline object to the text buffer, [param key] must be unique. In the text, object is represented as [param length] object replacement characters.
 			</description>
 		</method>
 		<method name="shaped_text_add_string" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="text" type="String" />
-			<argument index="2" name="fonts" type="Array" />
-			<argument index="3" name="size" type="int" />
-			<argument index="4" name="opentype_features" type="Dictionary" />
-			<argument index="5" name="language" type="String" />
-			<argument index="6" name="meta" type="Variant" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="text" type="String" />
+			<param index="2" name="fonts" type="Array" />
+			<param index="3" name="size" type="int" />
+			<param index="4" name="opentype_features" type="Dictionary" />
+			<param index="5" name="language" type="String" />
+			<param index="6" name="meta" type="Variant" />
 			<description>
 				Adds text span and font to draw it to the text buffer.
 			</description>
 		</method>
 		<method name="shaped_text_clear" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Clears text buffer (removes text and inline objects).
 			</description>
 		</method>
 		<method name="shaped_text_draw" qualifiers="virtual const">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="canvas" type="RID" />
-			<argument index="2" name="pos" type="Vector2" />
-			<argument index="3" name="clip_l" type="float" />
-			<argument index="4" name="clip_r" type="float" />
-			<argument index="5" name="color" type="Color" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="canvas" type="RID" />
+			<param index="2" name="pos" type="Vector2" />
+			<param index="3" name="clip_l" type="float" />
+			<param index="4" name="clip_r" type="float" />
+			<param index="5" name="color" type="Color" />
 			<description>
-				Draw shaped text into a canvas item at a given position, with [code]color[/code]. [code]pos[/code] specifies the leftmost point of the baseline (for horizontal layout) or topmost point of the baseline (for vertical layout).
+				Draw shaped text into a canvas item at a given position, with [param color]. [param pos] specifies the leftmost point of the baseline (for horizontal layout) or topmost point of the baseline (for vertical layout).
 				[b]Note:[/b] If this method is not implemented in the plugin, the default implementation will be used.
 			</description>
 		</method>
 		<method name="shaped_text_draw_outline" qualifiers="virtual const">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="canvas" type="RID" />
-			<argument index="2" name="pos" type="Vector2" />
-			<argument index="3" name="clip_l" type="float" />
-			<argument index="4" name="clip_r" type="float" />
-			<argument index="5" name="outline_size" type="int" />
-			<argument index="6" name="color" type="Color" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="canvas" type="RID" />
+			<param index="2" name="pos" type="Vector2" />
+			<param index="3" name="clip_l" type="float" />
+			<param index="4" name="clip_r" type="float" />
+			<param index="5" name="outline_size" type="int" />
+			<param index="6" name="color" type="Color" />
 			<description>
-				Draw the outline of the shaped text into a canvas item at a given position, with [code]color[/code]. [code]pos[/code] specifies the leftmost point of the baseline (for horizontal layout) or topmost point of the baseline (for vertical layout).
+				Draw the outline of the shaped text into a canvas item at a given position, with [param color]. [param pos] specifies the leftmost point of the baseline (for horizontal layout) or topmost point of the baseline (for vertical layout).
 				[b]Note:[/b] If this method is not implemented in the plugin, the default implementation will be used.
 			</description>
 		</method>
 		<method name="shaped_text_fit_to_width" qualifiers="virtual">
 			<return type="float" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="width" type="float" />
-			<argument index="2" name="jst_flags" type="int" enum="TextServer.JustificationFlag" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="width" type="float" />
+			<param index="2" name="jst_flags" type="int" enum="TextServer.JustificationFlag" />
 			<description>
 				Adjusts text with to fit to specified width, returns new text width.
 			</description>
 		</method>
 		<method name="shaped_text_get_ascent" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns the text ascent (number of pixels above the baseline for horizontal layout or to the left of baseline for vertical).
 			</description>
 		</method>
 		<method name="shaped_text_get_carets" qualifiers="virtual const">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="position" type="int" />
-			<argument index="2" name="caret" type="CaretInfo*" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="position" type="int" />
+			<param index="2" name="caret" type="CaretInfo*" />
 			<description>
-				Returns shapes of the carets corresponding to the character offset [code]position[/code] in the text. Returned caret shape is 1 pixel wide rectangle.
+				Returns shapes of the carets corresponding to the character offset [param position] in the text. Returned caret shape is 1 pixel wide rectangle.
 				[b]Note:[/b] If this method is not implemented in the plugin, the default implementation will be used.
 			</description>
 		</method>
 		<method name="shaped_text_get_custom_punctuation" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns custom punctuation character list, used for word breaking. If set to empty string, server defaults are used.
 			</description>
 		</method>
 		<method name="shaped_text_get_descent" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns the text descent (number of pixels below the baseline for horizontal layout or to the right of baseline for vertical).
 			</description>
 		</method>
 		<method name="shaped_text_get_direction" qualifiers="virtual const">
 			<return type="int" enum="TextServer.Direction" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns direction of the text.
 			</description>
 		</method>
 		<method name="shaped_text_get_dominant_direction_in_range" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="start" type="int" />
-			<argument index="2" name="end" type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="start" type="int" />
+			<param index="2" name="end" type="int" />
 			<description>
 				Returns dominant direction of in the range of text.
 				[b]Note:[/b] If this method is not implemented in the plugin, the default implementation will be used.
@@ -1144,43 +1144,43 @@
 		</method>
 		<method name="shaped_text_get_ellipsis_glyph_count" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns number of glyphs in the ellipsis.
 			</description>
 		</method>
 		<method name="shaped_text_get_ellipsis_glyphs" qualifiers="virtual const">
 			<return type="const Glyph*" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns array of the glyphs in the ellipsis.
 			</description>
 		</method>
 		<method name="shaped_text_get_ellipsis_pos" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns position of the ellipsis.
 			</description>
 		</method>
 		<method name="shaped_text_get_glyph_count" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns number of glyphs in the buffer.
 			</description>
 		</method>
 		<method name="shaped_text_get_glyphs" qualifiers="virtual const">
 			<return type="const Glyph*" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns an array of glyphs in the visual order.
 			</description>
 		</method>
 		<method name="shaped_text_get_grapheme_bounds" qualifiers="virtual const">
 			<return type="Vector2" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="pos" type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="pos" type="int" />
 			<description>
 				Returns composite character's bounds as offsets from the start of the line.
 				[b]Note:[/b] If this method is not implemented in the plugin, the default implementation will be used.
@@ -1188,17 +1188,17 @@
 		</method>
 		<method name="shaped_text_get_inferred_direction" qualifiers="virtual const">
 			<return type="int" enum="TextServer.Direction" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns direction of the text, inferred by the BiDi algorithm.
 			</description>
 		</method>
 		<method name="shaped_text_get_line_breaks" qualifiers="virtual const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="width" type="float" />
-			<argument index="2" name="start" type="int" />
-			<argument index="3" name="break_flags" type="int" enum="TextServer.LineBreakFlag" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="width" type="float" />
+			<param index="2" name="start" type="int" />
+			<param index="3" name="break_flags" type="int" enum="TextServer.LineBreakFlag" />
 			<description>
 				Breaks text to the lines and returns character ranges for each line.
 				[b]Note:[/b] If this method is not implemented in the plugin, the default implementation will be used.
@@ -1206,11 +1206,11 @@
 		</method>
 		<method name="shaped_text_get_line_breaks_adv" qualifiers="virtual const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="width" type="PackedFloat32Array" />
-			<argument index="2" name="start" type="int" />
-			<argument index="3" name="once" type="bool" />
-			<argument index="4" name="break_flags" type="int" enum="TextServer.LineBreakFlag" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="width" type="PackedFloat32Array" />
+			<param index="2" name="start" type="int" />
+			<param index="3" name="once" type="bool" />
+			<param index="4" name="break_flags" type="int" enum="TextServer.LineBreakFlag" />
 			<description>
 				Breaks text to the lines and columns. Returns character ranges for each segment.
 				[b]Note:[/b] If this method is not implemented in the plugin, the default implementation will be used.
@@ -1218,43 +1218,43 @@
 		</method>
 		<method name="shaped_text_get_object_rect" qualifiers="virtual const">
 			<return type="Rect2" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="key" type="Variant" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="key" type="Variant" />
 			<description>
 				Returns bounding rectangle of the inline object.
 			</description>
 		</method>
 		<method name="shaped_text_get_objects" qualifiers="virtual const">
 			<return type="Array" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns array of inline objects.
 			</description>
 		</method>
 		<method name="shaped_text_get_orientation" qualifiers="virtual const">
 			<return type="int" enum="TextServer.Orientation" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				eturns text orientation.
 			</description>
 		</method>
 		<method name="shaped_text_get_parent" qualifiers="virtual const">
 			<return type="RID" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns the parent buffer from which the substring originates.
 			</description>
 		</method>
 		<method name="shaped_text_get_preserve_control" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns [code]true[/code] if text buffer is configured to display control characters.
 			</description>
 		</method>
 		<method name="shaped_text_get_preserve_invalid" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns [code]true[/code] if text buffer is configured to display hexadecimal codes in place of invalid characters.
 				[b]Note:[/b] If set to [code]false[/code], nothing is displayed in place of invalid characters.
@@ -1262,16 +1262,16 @@
 		</method>
 		<method name="shaped_text_get_range" qualifiers="virtual const">
 			<return type="Vector2i" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns substring buffer character range in the parent buffer.
 			</description>
 		</method>
 		<method name="shaped_text_get_selection" qualifiers="virtual const">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="start" type="int" />
-			<argument index="2" name="end" type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="start" type="int" />
+			<param index="2" name="end" type="int" />
 			<description>
 				Returns selection rectangles for the specified character range.
 				[b]Note:[/b] If this method is not implemented in the plugin, the default implementation will be used.
@@ -1279,51 +1279,51 @@
 		</method>
 		<method name="shaped_text_get_size" qualifiers="virtual const">
 			<return type="Vector2" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns size of the text.
 			</description>
 		</method>
 		<method name="shaped_text_get_spacing" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="spacing" type="int" enum="TextServer.SpacingType" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="spacing" type="int" enum="TextServer.SpacingType" />
 			<description>
 				Returns extra spacing added between glyphs or lines in pixels.
 			</description>
 		</method>
 		<method name="shaped_text_get_trim_pos" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns the position of the overrun trim.
 			</description>
 		</method>
 		<method name="shaped_text_get_underline_position" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns pixel offset of the underline below the baseline.
 			</description>
 		</method>
 		<method name="shaped_text_get_underline_thickness" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns thickness of the underline.
 			</description>
 		</method>
 		<method name="shaped_text_get_width" qualifiers="virtual const">
 			<return type="float" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns width (for horizontal layout) or height (for vertical) of the text.
 			</description>
 		</method>
 		<method name="shaped_text_get_word_breaks" qualifiers="virtual const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="grapheme_flags" type="int" enum="TextServer.GraphemeFlag" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="grapheme_flags" type="int" enum="TextServer.GraphemeFlag" />
 			<description>
 				Breaks text into words and returns array of character ranges.
 				[b]Note:[/b] If this method is not implemented in the plugin, the default implementation will be used.
@@ -1331,8 +1331,8 @@
 		</method>
 		<method name="shaped_text_hit_test_grapheme" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="coord" type="float" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="coord" type="float" />
 			<description>
 				Returns grapheme index at the specified pixel offset at the baseline, or [code]-1[/code] if none is found.
 				[b]Note:[/b] If this method is not implemented in the plugin, the default implementation will be used.
@@ -1340,8 +1340,8 @@
 		</method>
 		<method name="shaped_text_hit_test_position" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="coord" type="float" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="coord" type="float" />
 			<description>
 				Returns caret character offset at the specified pixel offset at the baseline. This function always returns a valid position.
 				[b]Note:[/b] If this method is not implemented in the plugin, the default implementation will be used.
@@ -1349,52 +1349,52 @@
 		</method>
 		<method name="shaped_text_is_ready" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns [code]true[/code] if buffer is successfully shaped.
 			</description>
 		</method>
 		<method name="shaped_text_next_grapheme_pos" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="pos" type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="pos" type="int" />
 			<description>
-				Returns composite character end position closest to the [code]pos[/code].
+				Returns composite character end position closest to the [param pos].
 				[b]Note:[/b] If this method is not implemented in the plugin, the default implementation will be used.
 			</description>
 		</method>
 		<method name="shaped_text_overrun_trim_to_width" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="width" type="float" />
-			<argument index="2" name="trim_flags" type="int" enum="TextServer.TextOverrunFlag" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="width" type="float" />
+			<param index="2" name="trim_flags" type="int" enum="TextServer.TextOverrunFlag" />
 			<description>
 				Trims text if it exceeds the given width.
 			</description>
 		</method>
 		<method name="shaped_text_prev_grapheme_pos" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="pos" type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="pos" type="int" />
 			<description>
-				Returns composite character start position closest to the [code]pos[/code].
+				Returns composite character start position closest to the [param pos].
 				[b]Note:[/b] If this method is not implemented in the plugin, the default implementation will be used.
 			</description>
 		</method>
 		<method name="shaped_text_resize_object" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="key" type="Variant" />
-			<argument index="2" name="size" type="Vector2" />
-			<argument index="3" name="inline_align" type="int" enum="InlineAlignment" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="key" type="Variant" />
+			<param index="2" name="size" type="Vector2" />
+			<param index="3" name="inline_align" type="int" enum="InlineAlignment" />
 			<description>
 				Sets new size and alignment of embedded object.
 			</description>
 		</method>
 		<method name="shaped_text_set_bidi_override" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="override" type="Array" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="override" type="Array" />
 			<description>
 				Overrides BiDi for the structured text.
 				Override ranges should cover full source text without overlaps. BiDi algorithm will be used on each range separately.
@@ -1402,87 +1402,87 @@
 		</method>
 		<method name="shaped_text_set_custom_punctuation" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="punct" type="String" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="punct" type="String" />
 			<description>
 				Sets custom punctuation character list, used for word breaking. If set to empty string, server defaults are used.
 			</description>
 		</method>
 		<method name="shaped_text_set_direction" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="direction" type="int" enum="TextServer.Direction" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="direction" type="int" enum="TextServer.Direction" />
 			<description>
-				Sets desired text direction. If set to [code]TEXT_DIRECTION_AUTO[/code], direction will be detected based on the buffer contents and current locale.
+				Sets desired text [param direction]. If set to [code]TEXT_DIRECTION_AUTO[/code], direction will be detected based on the buffer contents and current locale.
 			</description>
 		</method>
 		<method name="shaped_text_set_orientation" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="orientation" type="int" enum="TextServer.Orientation" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="orientation" type="int" enum="TextServer.Orientation" />
 			<description>
 				Sets desired text orientation.
 			</description>
 		</method>
 		<method name="shaped_text_set_preserve_control" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				If set to [code]true[/code] text buffer will display control characters.
 			</description>
 		</method>
 		<method name="shaped_text_set_preserve_invalid" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				If set to [code]true[/code] text buffer will display invalid characters as hexadecimal codes, otherwise nothing is displayed.
 			</description>
 		</method>
 		<method name="shaped_text_set_spacing" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="spacing" type="int" enum="TextServer.SpacingType" />
-			<argument index="2" name="value" type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="spacing" type="int" enum="TextServer.SpacingType" />
+			<param index="2" name="value" type="int" />
 			<description>
 				Sets extra spacing added between glyphs or lines in pixels.
 			</description>
 		</method>
 		<method name="shaped_text_shape" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Shapes buffer if it's not shaped. Returns [code]true[/code] if the string is shaped successfully.
 			</description>
 		</method>
 		<method name="shaped_text_sort_logical" qualifiers="virtual">
 			<return type="const Glyph*" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Returns text glyphs in the logical order.
 			</description>
 		</method>
 		<method name="shaped_text_substr" qualifiers="virtual const">
 			<return type="RID" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="start" type="int" />
-			<argument index="2" name="length" type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="start" type="int" />
+			<param index="2" name="length" type="int" />
 			<description>
-				Returns text buffer for the substring of the text in the [code]shaped[/code] text buffer (including inline objects).
+				Returns text buffer for the substring of the text in the [param shaped] text buffer (including inline objects).
 			</description>
 		</method>
 		<method name="shaped_text_tab_align" qualifiers="virtual">
 			<return type="float" />
-			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="tab_stops" type="PackedFloat32Array" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="tab_stops" type="PackedFloat32Array" />
 			<description>
 				Aligns shaped text to the given tab-stops.
 			</description>
 		</method>
 		<method name="shaped_text_update_breaks" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Updates line breaking positions in the text buffer.
 				[b]Note:[/b] This method is used by default line/word breaking methods, and its implementation might be omitted if custom line breaking in implemented.
@@ -1490,7 +1490,7 @@
 		</method>
 		<method name="shaped_text_update_justification_ops" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="shaped" type="RID" />
+			<param index="0" name="shaped" type="RID" />
 			<description>
 				Updates line justification positions (word breaks and elongations) in the text buffer.
 				[b]Note:[/b] This method is used by default line/word breaking methods, and its implementation might be omitted if custom line breaking in implemented.
@@ -1498,38 +1498,38 @@
 		</method>
 		<method name="spoof_check" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="string" type="String" />
+			<param index="0" name="string" type="String" />
 			<description>
-				Returns [code]true[/code] if [code]string[/code] is likely to be an attempt at confusing the reader.
+				Returns [code]true[/code] if [param string] is likely to be an attempt at confusing the reader.
 			</description>
 		</method>
 		<method name="string_get_word_breaks" qualifiers="virtual const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="string" type="String" />
-			<argument index="1" name="language" type="String" />
+			<param index="0" name="string" type="String" />
+			<param index="1" name="language" type="String" />
 			<description>
 				Returns array of the word break character offsets.
 			</description>
 		</method>
 		<method name="string_to_lower" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="string" type="String" />
-			<argument index="1" name="language" type="String" />
+			<param index="0" name="string" type="String" />
+			<param index="1" name="language" type="String" />
 			<description>
 				Returns the string converted to lowercase.
 			</description>
 		</method>
 		<method name="string_to_upper" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="string" type="String" />
-			<argument index="1" name="language" type="String" />
+			<param index="0" name="string" type="String" />
+			<param index="1" name="language" type="String" />
 			<description>
 				Returns the string converted to uppercase.
 			</description>
 		</method>
 		<method name="strip_diacritics" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="string" type="String" />
+			<param index="0" name="string" type="String" />
 			<description>
 				Strips diacritics from the string.
 				[b]Note:[/b] If this method is not implemented in the plugin, the default implementation will be used.
@@ -1537,7 +1537,7 @@
 		</method>
 		<method name="tag_to_name" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="tag" type="int" />
+			<param index="0" name="tag" type="int" />
 			<description>
 				Converts OpenType tag to readable feature, variation, script or language name.
 			</description>
diff --git a/doc/classes/TextServerManager.xml b/doc/classes/TextServerManager.xml
index 7eff19038c..19b0e9e6f2 100644
--- a/doc/classes/TextServerManager.xml
+++ b/doc/classes/TextServerManager.xml
@@ -12,21 +12,21 @@
 	<methods>
 		<method name="add_interface">
 			<return type="void" />
-			<argument index="0" name="interface" type="TextServer" />
+			<param index="0" name="interface" type="TextServer" />
 			<description>
 				Registers an [TextServer] interface.
 			</description>
 		</method>
 		<method name="find_interface" qualifiers="const">
 			<return type="TextServer" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Finds an interface by its name.
 			</description>
 		</method>
 		<method name="get_interface" qualifiers="const">
 			<return type="TextServer" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns the interface registered at a given index.
 			</description>
@@ -51,14 +51,14 @@
 		</method>
 		<method name="remove_interface">
 			<return type="void" />
-			<argument index="0" name="interface" type="TextServer" />
+			<param index="0" name="interface" type="TextServer" />
 			<description>
 				Removes interface. All fonts and shaped text caches should be freed before removing interface.
 			</description>
 		</method>
 		<method name="set_primary_interface">
 			<return type="void" />
-			<argument index="0" name="index" type="TextServer" />
+			<param index="0" name="index" type="TextServer" />
 			<description>
 				Sets the primary [TextServer] interface.
 			</description>
@@ -66,13 +66,13 @@
 	</methods>
 	<signals>
 		<signal name="interface_added">
-			<argument index="0" name="interface_name" type="StringName" />
+			<param index="0" name="interface_name" type="StringName" />
 			<description>
 				Emitted when a new interface has been added.
 			</description>
 		</signal>
 		<signal name="interface_removed">
-			<argument index="0" name="interface_name" type="StringName" />
+			<param index="0" name="interface_name" type="StringName" />
 			<description>
 				Emitted when an interface is removed.
 			</description>
diff --git a/doc/classes/Texture2D.xml b/doc/classes/Texture2D.xml
index 3721058d25..14e89a1b74 100644
--- a/doc/classes/Texture2D.xml
+++ b/doc/classes/Texture2D.xml
@@ -14,31 +14,31 @@
 	<methods>
 		<method name="_draw" qualifiers="virtual const">
 			<return type="void" />
-			<argument index="0" name="to_canvas_item" type="RID" />
-			<argument index="1" name="pos" type="Vector2" />
-			<argument index="2" name="modulate" type="Color" />
-			<argument index="3" name="transpose" type="bool" />
+			<param index="0" name="to_canvas_item" type="RID" />
+			<param index="1" name="pos" type="Vector2" />
+			<param index="2" name="modulate" type="Color" />
+			<param index="3" name="transpose" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_draw_rect" qualifiers="virtual const">
 			<return type="void" />
-			<argument index="0" name="to_canvas_item" type="RID" />
-			<argument index="1" name="rect" type="Rect2" />
-			<argument index="2" name="tile" type="bool" />
-			<argument index="3" name="modulate" type="Color" />
-			<argument index="4" name="transpose" type="bool" />
+			<param index="0" name="to_canvas_item" type="RID" />
+			<param index="1" name="rect" type="Rect2" />
+			<param index="2" name="tile" type="bool" />
+			<param index="3" name="modulate" type="Color" />
+			<param index="4" name="transpose" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_draw_rect_region" qualifiers="virtual const">
 			<return type="void" />
-			<argument index="0" name="tp_canvas_item" type="RID" />
-			<argument index="1" name="rect" type="Rect2" />
-			<argument index="2" name="src_rect" type="Rect2" />
-			<argument index="3" name="modulate" type="Color" />
-			<argument index="4" name="transpose" type="bool" />
-			<argument index="5" name="clip_uv" type="bool" />
+			<param index="0" name="tp_canvas_item" type="RID" />
+			<param index="1" name="rect" type="Rect2" />
+			<param index="2" name="src_rect" type="Rect2" />
+			<param index="3" name="modulate" type="Color" />
+			<param index="4" name="transpose" type="bool" />
+			<param index="5" name="clip_uv" type="bool" />
 			<description>
 			</description>
 		</method>
@@ -59,40 +59,40 @@
 		</method>
 		<method name="_is_pixel_opaque" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="x" type="int" />
-			<argument index="1" name="y" type="int" />
+			<param index="0" name="x" type="int" />
+			<param index="1" name="y" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="draw" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="canvas_item" type="RID" />
-			<argument index="1" name="position" type="Vector2" />
-			<argument index="2" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="3" name="transpose" type="bool" default="false" />
+			<param index="0" name="canvas_item" type="RID" />
+			<param index="1" name="position" type="Vector2" />
+			<param index="2" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="3" name="transpose" type="bool" default="false" />
 			<description>
-				Draws the texture using a [CanvasItem] with the [RenderingServer] API at the specified [code]position[/code].
+				Draws the texture using a [CanvasItem] with the [RenderingServer] API at the specified [param position].
 			</description>
 		</method>
 		<method name="draw_rect" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="canvas_item" type="RID" />
-			<argument index="1" name="rect" type="Rect2" />
-			<argument index="2" name="tile" type="bool" />
-			<argument index="3" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="4" name="transpose" type="bool" default="false" />
+			<param index="0" name="canvas_item" type="RID" />
+			<param index="1" name="rect" type="Rect2" />
+			<param index="2" name="tile" type="bool" />
+			<param index="3" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="4" name="transpose" type="bool" default="false" />
 			<description>
 				Draws the texture using a [CanvasItem] with the [RenderingServer] API.
 			</description>
 		</method>
 		<method name="draw_rect_region" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="canvas_item" type="RID" />
-			<argument index="1" name="rect" type="Rect2" />
-			<argument index="2" name="src_rect" type="Rect2" />
-			<argument index="3" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="4" name="transpose" type="bool" default="false" />
-			<argument index="5" name="clip_uv" type="bool" default="true" />
+			<param index="0" name="canvas_item" type="RID" />
+			<param index="1" name="rect" type="Rect2" />
+			<param index="2" name="src_rect" type="Rect2" />
+			<param index="3" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
+			<param index="4" name="transpose" type="bool" default="false" />
+			<param index="5" name="clip_uv" type="bool" default="true" />
 			<description>
 				Draws a part of the texture using a [CanvasItem] with the [RenderingServer] API.
 			</description>
diff --git a/doc/classes/TextureLayered.xml b/doc/classes/TextureLayered.xml
index 3445329f32..7b528e2082 100644
--- a/doc/classes/TextureLayered.xml
+++ b/doc/classes/TextureLayered.xml
@@ -21,7 +21,7 @@
 		</method>
 		<method name="_get_layer_data" qualifiers="virtual const">
 			<return type="Image" />
-			<argument index="0" name="layer_index" type="int" />
+			<param index="0" name="layer_index" type="int" />
 			<description>
 			</description>
 		</method>
@@ -59,9 +59,9 @@
 		</method>
 		<method name="get_layer_data" qualifiers="const">
 			<return type="Image" />
-			<argument index="0" name="layer" type="int" />
+			<param index="0" name="layer" type="int" />
 			<description>
-				Returns an [Image] resource with the data from specified [code]layer[/code].
+				Returns an [Image] resource with the data from specified [param layer].
 			</description>
 		</method>
 		<method name="get_layered_type" qualifiers="const">
diff --git a/doc/classes/TextureProgressBar.xml b/doc/classes/TextureProgressBar.xml
index 4ea072a25f..fcdb18e10d 100644
--- a/doc/classes/TextureProgressBar.xml
+++ b/doc/classes/TextureProgressBar.xml
@@ -11,14 +11,14 @@
 	<methods>
 		<method name="get_stretch_margin" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="margin" type="int" enum="Side" />
+			<param index="0" name="margin" type="int" enum="Side" />
 			<description>
 			</description>
 		</method>
 		<method name="set_stretch_margin">
 			<return type="void" />
-			<argument index="0" name="margin" type="int" enum="Side" />
-			<argument index="1" name="value" type="int" />
+			<param index="0" name="margin" type="int" enum="Side" />
+			<param index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/Theme.xml b/doc/classes/Theme.xml
index 7f4e0645c8..868933bdf7 100644
--- a/doc/classes/Theme.xml
+++ b/doc/classes/Theme.xml
@@ -15,7 +15,7 @@
 	<methods>
 		<method name="add_type">
 			<return type="void" />
-			<argument index="0" name="theme_type" type="StringName" />
+			<param index="0" name="theme_type" type="StringName" />
 			<description>
 				Adds an empty theme type for every valid data type.
 				[b]Note:[/b] Empty types are not saved with the theme. This method only exists to perform in-memory changes to the resource. Use available [code]set_*[/code] methods to add theme items.
@@ -29,90 +29,90 @@
 		</method>
 		<method name="clear_color">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
 			<description>
-				Removes the [Color] property defined by [code]name[/code] and [code]theme_type[/code], if it exists.
+				Removes the [Color] property defined by [param name] and [param theme_type], if it exists.
 				Fails if it doesn't exist. Use [method has_color] to check for existence.
 			</description>
 		</method>
 		<method name="clear_constant">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
 			<description>
-				Removes the constant property defined by [code]name[/code] and [code]theme_type[/code], if it exists.
+				Removes the constant property defined by [param name] and [param theme_type], if it exists.
 				Fails if it doesn't exist. Use [method has_constant] to check for existence.
 			</description>
 		</method>
 		<method name="clear_font">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
 			<description>
-				Removes the [Font] property defined by [code]name[/code] and [code]theme_type[/code], if it exists.
+				Removes the [Font] property defined by [param name] and [param theme_type], if it exists.
 				Fails if it doesn't exist. Use [method has_font] to check for existence.
 			</description>
 		</method>
 		<method name="clear_font_size">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
 			<description>
-				Removes the font size property defined by [code]name[/code] and [code]theme_type[/code], if it exists.
+				Removes the font size property defined by [param name] and [param theme_type], if it exists.
 				Fails if it doesn't exist. Use [method has_font_size] to check for existence.
 			</description>
 		</method>
 		<method name="clear_icon">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
 			<description>
-				Removes the icon property defined by [code]name[/code] and [code]theme_type[/code], if it exists.
+				Removes the icon property defined by [param name] and [param theme_type], if it exists.
 				Fails if it doesn't exist. Use [method has_icon] to check for existence.
 			</description>
 		</method>
 		<method name="clear_stylebox">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
 			<description>
-				Removes the [StyleBox] property defined by [code]name[/code] and [code]theme_type[/code], if it exists.
+				Removes the [StyleBox] property defined by [param name] and [param theme_type], if it exists.
 				Fails if it doesn't exist. Use [method has_stylebox] to check for existence.
 			</description>
 		</method>
 		<method name="clear_theme_item">
 			<return type="void" />
-			<argument index="0" name="data_type" type="int" enum="Theme.DataType" />
-			<argument index="1" name="name" type="StringName" />
-			<argument index="2" name="theme_type" type="StringName" />
+			<param index="0" name="data_type" type="int" enum="Theme.DataType" />
+			<param index="1" name="name" type="StringName" />
+			<param index="2" name="theme_type" type="StringName" />
 			<description>
-				Removes the theme property of [code]data_type[/code] defined by [code]name[/code] and [code]theme_type[/code], if it exists.
+				Removes the theme property of [param data_type] defined by [param name] and [param theme_type], if it exists.
 				Fails if it doesn't exist. Use [method has_theme_item] to check for existence.
 				[b]Note:[/b] This method is analogous to calling the corresponding data type specific method, but can be used for more generalized logic.
 			</description>
 		</method>
 		<method name="clear_type_variation">
 			<return type="void" />
-			<argument index="0" name="theme_type" type="StringName" />
+			<param index="0" name="theme_type" type="StringName" />
 			<description>
-				Unmarks [code]theme_type[/code] as being a variation of another theme type. See [method set_type_variation].
+				Unmarks [param theme_type] as being a variation of another theme type. See [method set_type_variation].
 			</description>
 		</method>
 		<method name="get_color" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
 			<description>
-				Returns the [Color] property defined by [code]name[/code] and [code]theme_type[/code], if it exists.
+				Returns the [Color] property defined by [param name] and [param theme_type], if it exists.
 				Returns the default color value if the property doesn't exist. Use [method has_color] to check for existence.
 			</description>
 		</method>
 		<method name="get_color_list" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="theme_type" type="String" />
+			<param index="0" name="theme_type" type="String" />
 			<description>
-				Returns a list of names for [Color] properties defined with [code]theme_type[/code]. Use [method get_color_type_list] to get a list of possible theme type names.
+				Returns a list of names for [Color] properties defined with [param theme_type]. Use [method get_color_type_list] to get a list of possible theme type names.
 			</description>
 		</method>
 		<method name="get_color_type_list" qualifiers="const">
@@ -123,18 +123,18 @@
 		</method>
 		<method name="get_constant" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
 			<description>
-				Returns the constant property defined by [code]name[/code] and [code]theme_type[/code], if it exists.
+				Returns the constant property defined by [param name] and [param theme_type], if it exists.
 				Returns [code]0[/code] if the property doesn't exist. Use [method has_constant] to check for existence.
 			</description>
 		</method>
 		<method name="get_constant_list" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="theme_type" type="String" />
+			<param index="0" name="theme_type" type="String" />
 			<description>
-				Returns a list of names for constant properties defined with [code]theme_type[/code]. Use [method get_constant_type_list] to get a list of possible theme type names.
+				Returns a list of names for constant properties defined with [param theme_type]. Use [method get_constant_type_list] to get a list of possible theme type names.
 			</description>
 		</method>
 		<method name="get_constant_type_list" qualifiers="const">
@@ -145,36 +145,36 @@
 		</method>
 		<method name="get_font" qualifiers="const">
 			<return type="Font" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
 			<description>
-				Returns the [Font] property defined by [code]name[/code] and [code]theme_type[/code], if it exists.
+				Returns the [Font] property defined by [param name] and [param theme_type], if it exists.
 				Returns the default theme font if the property doesn't exist and the default theme font is set up (see [member default_font]). Use [method has_font] to check for existence of the property and [method has_default_font] to check for existence of the default theme font.
 				Returns the engine fallback font value, if neither exist.
 			</description>
 		</method>
 		<method name="get_font_list" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="theme_type" type="String" />
+			<param index="0" name="theme_type" type="String" />
 			<description>
-				Returns a list of names for [Font] properties defined with [code]theme_type[/code]. Use [method get_font_type_list] to get a list of possible theme type names.
+				Returns a list of names for [Font] properties defined with [param theme_type]. Use [method get_font_type_list] to get a list of possible theme type names.
 			</description>
 		</method>
 		<method name="get_font_size" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
 			<description>
-				Returns the font size property defined by [code]name[/code] and [code]theme_type[/code], if it exists.
+				Returns the font size property defined by [param name] and [param theme_type], if it exists.
 				Returns the default theme font size if the property doesn't exist and the default theme font size is set up (see [member default_font_size]). Use [method has_font_size] to check for existence of the property and [method has_default_font_size] to check for existence of the default theme font.
 				Returns the engine fallback font size value, if neither exist.
 			</description>
 		</method>
 		<method name="get_font_size_list" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="theme_type" type="String" />
+			<param index="0" name="theme_type" type="String" />
 			<description>
-				Returns a list of names for font size properties defined with [code]theme_type[/code]. Use [method get_font_size_type_list] to get a list of possible theme type names.
+				Returns a list of names for font size properties defined with [param theme_type]. Use [method get_font_size_type_list] to get a list of possible theme type names.
 			</description>
 		</method>
 		<method name="get_font_size_type_list" qualifiers="const">
@@ -191,18 +191,18 @@
 		</method>
 		<method name="get_icon" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
 			<description>
-				Returns the icon property defined by [code]name[/code] and [code]theme_type[/code], if it exists.
+				Returns the icon property defined by [param name] and [param theme_type], if it exists.
 				Returns the engine fallback icon value if the property doesn't exist. Use [method has_icon] to check for existence.
 			</description>
 		</method>
 		<method name="get_icon_list" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="theme_type" type="String" />
+			<param index="0" name="theme_type" type="String" />
 			<description>
-				Returns a list of names for icon properties defined with [code]theme_type[/code]. Use [method get_icon_type_list] to get a list of possible theme type names.
+				Returns a list of names for icon properties defined with [param theme_type]. Use [method get_icon_type_list] to get a list of possible theme type names.
 			</description>
 		</method>
 		<method name="get_icon_type_list" qualifiers="const">
@@ -213,18 +213,18 @@
 		</method>
 		<method name="get_stylebox" qualifiers="const">
 			<return type="StyleBox" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
 			<description>
-				Returns the [StyleBox] property defined by [code]name[/code] and [code]theme_type[/code], if it exists.
+				Returns the [StyleBox] property defined by [param name] and [param theme_type], if it exists.
 				Returns the engine fallback stylebox value if the property doesn't exist. Use [method has_stylebox] to check for existence.
 			</description>
 		</method>
 		<method name="get_stylebox_list" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="theme_type" type="String" />
+			<param index="0" name="theme_type" type="String" />
 			<description>
-				Returns a list of names for [StyleBox] properties defined with [code]theme_type[/code]. Use [method get_stylebox_type_list] to get a list of possible theme type names.
+				Returns a list of names for [StyleBox] properties defined with [param theme_type]. Use [method get_stylebox_type_list] to get a list of possible theme type names.
 			</description>
 		</method>
 		<method name="get_stylebox_type_list" qualifiers="const">
@@ -235,29 +235,29 @@
 		</method>
 		<method name="get_theme_item" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="data_type" type="int" enum="Theme.DataType" />
-			<argument index="1" name="name" type="StringName" />
-			<argument index="2" name="theme_type" type="StringName" />
+			<param index="0" name="data_type" type="int" enum="Theme.DataType" />
+			<param index="1" name="name" type="StringName" />
+			<param index="2" name="theme_type" type="StringName" />
 			<description>
-				Returns the theme property of [code]data_type[/code] defined by [code]name[/code] and [code]theme_type[/code], if it exists.
+				Returns the theme property of [param data_type] defined by [param name] and [param theme_type], if it exists.
 				Returns the engine fallback icon value if the property doesn't exist. Use [method has_theme_item] to check for existence.
 				[b]Note:[/b] This method is analogous to calling the corresponding data type specific method, but can be used for more generalized logic.
 			</description>
 		</method>
 		<method name="get_theme_item_list" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="data_type" type="int" enum="Theme.DataType" />
-			<argument index="1" name="theme_type" type="String" />
+			<param index="0" name="data_type" type="int" enum="Theme.DataType" />
+			<param index="1" name="theme_type" type="String" />
 			<description>
-				Returns a list of names for properties of [code]data_type[/code] defined with [code]theme_type[/code]. Use [method get_theme_item_type_list] to get a list of possible theme type names.
+				Returns a list of names for properties of [param data_type] defined with [param theme_type]. Use [method get_theme_item_type_list] to get a list of possible theme type names.
 				[b]Note:[/b] This method is analogous to calling the corresponding data type specific method, but can be used for more generalized logic.
 			</description>
 		</method>
 		<method name="get_theme_item_type_list" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="data_type" type="int" enum="Theme.DataType" />
+			<param index="0" name="data_type" type="int" enum="Theme.DataType" />
 			<description>
-				Returns a list of all unique theme type names for [code]data_type[/code] properties. Use [method get_type_list] to get a list of all unique theme types.
+				Returns a list of all unique theme type names for [param data_type] properties. Use [method get_type_list] to get a list of all unique theme types.
 				[b]Note:[/b] This method is analogous to calling the corresponding data type specific method, but can be used for more generalized logic.
 			</description>
 		</method>
@@ -269,33 +269,33 @@
 		</method>
 		<method name="get_type_variation_base" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="theme_type" type="StringName" />
+			<param index="0" name="theme_type" type="StringName" />
 			<description>
-				Returns the name of the base theme type if [code]theme_type[/code] is a valid variation type. Returns an empty string otherwise.
+				Returns the name of the base theme type if [param theme_type] is a valid variation type. Returns an empty string otherwise.
 			</description>
 		</method>
 		<method name="get_type_variation_list" qualifiers="const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="base_type" type="StringName" />
+			<param index="0" name="base_type" type="StringName" />
 			<description>
-				Returns a list of all type variations for the given [code]base_type[/code].
+				Returns a list of all type variations for the given [param base_type].
 			</description>
 		</method>
 		<method name="has_color" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
 			<description>
-				Returns [code]true[/code] if the [Color] property defined by [code]name[/code] and [code]theme_type[/code] exists.
+				Returns [code]true[/code] if the [Color] property defined by [param name] and [param theme_type] exists.
 				Returns [code]false[/code] if it doesn't exist. Use [method set_color] to define it.
 			</description>
 		</method>
 		<method name="has_constant" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
 			<description>
-				Returns [code]true[/code] if the constant property defined by [code]name[/code] and [code]theme_type[/code] exists.
+				Returns [code]true[/code] if the constant property defined by [param name] and [param theme_type] exists.
 				Returns [code]false[/code] if it doesn't exist. Use [method set_constant] to define it.
 			</description>
 		</method>
@@ -322,221 +322,220 @@
 		</method>
 		<method name="has_font" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
 			<description>
-				Returns [code]true[/code] if the [Font] property defined by [code]name[/code] and [code]theme_type[/code] exists, or if the default theme font is set up (see [method has_default_font]).
+				Returns [code]true[/code] if the [Font] property defined by [param name] and [param theme_type] exists, or if the default theme font is set up (see [method has_default_font]).
 				Returns [code]false[/code] if neither exist. Use [method set_font] to define the property.
 			</description>
 		</method>
 		<method name="has_font_size" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
 			<description>
-				Returns [code]true[/code] if [member default_font_size] has a valid value.
-				Returns [code]false[/code] if it doesn't. The value must be greater than [code]0[/code] to be considered valid.
+				Returns [code]true[/code] if the font size property defined by [param name] and [param theme_type] exists, or if the default theme font size is set up (see [method has_default_font_size]).
+				Returns [code]false[/code] if neither exist. Use [method set_font_size] to define the property.
 			</description>
 		</method>
 		<method name="has_icon" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
 			<description>
-				Returns [code]true[/code] if the icon property defined by [code]name[/code] and [code]theme_type[/code] exists.
+				Returns [code]true[/code] if the icon property defined by [param name] and [param theme_type] exists.
 				Returns [code]false[/code] if it doesn't exist. Use [method set_icon] to define it.
 			</description>
 		</method>
 		<method name="has_stylebox" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
 			<description>
-				Returns [code]true[/code] if the [StyleBox] property defined by [code]name[/code] and [code]theme_type[/code] exists.
+				Returns [code]true[/code] if the [StyleBox] property defined by [param name] and [param theme_type] exists.
 				Returns [code]false[/code] if it doesn't exist. Use [method set_stylebox] to define it.
 			</description>
 		</method>
 		<method name="has_theme_item" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="data_type" type="int" enum="Theme.DataType" />
-			<argument index="1" name="name" type="StringName" />
-			<argument index="2" name="theme_type" type="StringName" />
+			<param index="0" name="data_type" type="int" enum="Theme.DataType" />
+			<param index="1" name="name" type="StringName" />
+			<param index="2" name="theme_type" type="StringName" />
 			<description>
-				Returns [code]true[/code] if the theme property of [code]data_type[/code] defined by [code]name[/code] and [code]theme_type[/code] exists.
+				Returns [code]true[/code] if the theme property of [param data_type] defined by [param name] and [param theme_type] exists.
 				Returns [code]false[/code] if it doesn't exist. Use [method set_theme_item] to define it.
 				[b]Note:[/b] This method is analogous to calling the corresponding data type specific method, but can be used for more generalized logic.
 			</description>
 		</method>
 		<method name="is_type_variation" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="theme_type" type="StringName" />
-			<argument index="1" name="base_type" type="StringName" />
+			<param index="0" name="theme_type" type="StringName" />
+			<param index="1" name="base_type" type="StringName" />
 			<description>
-				Returns [code]true[/code] if [code]theme_type[/code] is marked as a variation of [code]base_type[/code].
+				Returns [code]true[/code] if [param theme_type] is marked as a variation of [param base_type].
 			</description>
 		</method>
 		<method name="merge_with">
 			<return type="void" />
-			<argument index="0" name="other" type="Theme" />
+			<param index="0" name="other" type="Theme" />
 			<description>
-				Adds missing and overrides existing definitions with values from the [code]other[/code] theme resource.
+				Adds missing and overrides existing definitions with values from the [param other] theme resource.
 				[b]Note:[/b] This modifies the current theme. If you want to merge two themes together without modifying either one, create a new empty theme and merge the other two into it one after another.
 			</description>
 		</method>
 		<method name="remove_type">
 			<return type="void" />
-			<argument index="0" name="theme_type" type="StringName" />
+			<param index="0" name="theme_type" type="StringName" />
 			<description>
 				Removes the theme type, gracefully discarding defined theme items. If the type is a variation, this information is also erased. If the type is a base for type variations, those variations lose their base.
 			</description>
 		</method>
 		<method name="rename_color">
 			<return type="void" />
-			<argument index="0" name="old_name" type="StringName" />
-			<argument index="1" name="name" type="StringName" />
-			<argument index="2" name="theme_type" type="StringName" />
+			<param index="0" name="old_name" type="StringName" />
+			<param index="1" name="name" type="StringName" />
+			<param index="2" name="theme_type" type="StringName" />
 			<description>
-				Renames the [Color] property defined by [code]old_name[/code] and [code]theme_type[/code] to [code]name[/code], if it exists.
+				Renames the [Color] property defined by [param old_name] and [param theme_type] to [param name], if it exists.
 				Fails if it doesn't exist, or if a similar property with the new name already exists. Use [method has_color] to check for existence, and [method clear_color] to remove the existing property.
 			</description>
 		</method>
 		<method name="rename_constant">
 			<return type="void" />
-			<argument index="0" name="old_name" type="StringName" />
-			<argument index="1" name="name" type="StringName" />
-			<argument index="2" name="theme_type" type="StringName" />
+			<param index="0" name="old_name" type="StringName" />
+			<param index="1" name="name" type="StringName" />
+			<param index="2" name="theme_type" type="StringName" />
 			<description>
-				Renames the constant property defined by [code]old_name[/code] and [code]theme_type[/code] to [code]name[/code], if it exists.
+				Renames the constant property defined by [param old_name] and [param theme_type] to [param name], if it exists.
 				Fails if it doesn't exist, or if a similar property with the new name already exists. Use [method has_constant] to check for existence, and [method clear_constant] to remove the existing property.
 			</description>
 		</method>
 		<method name="rename_font">
 			<return type="void" />
-			<argument index="0" name="old_name" type="StringName" />
-			<argument index="1" name="name" type="StringName" />
-			<argument index="2" name="theme_type" type="StringName" />
+			<param index="0" name="old_name" type="StringName" />
+			<param index="1" name="name" type="StringName" />
+			<param index="2" name="theme_type" type="StringName" />
 			<description>
-				Renames the [Font] property defined by [code]old_name[/code] and [code]theme_type[/code] to [code]name[/code], if it exists.
+				Renames the [Font] property defined by [param old_name] and [param theme_type] to [param name], if it exists.
 				Fails if it doesn't exist, or if a similar property with the new name already exists. Use [method has_font] to check for existence, and [method clear_font] to remove the existing property.
 			</description>
 		</method>
 		<method name="rename_font_size">
 			<return type="void" />
-			<argument index="0" name="old_name" type="StringName" />
-			<argument index="1" name="name" type="StringName" />
-			<argument index="2" name="theme_type" type="StringName" />
+			<param index="0" name="old_name" type="StringName" />
+			<param index="1" name="name" type="StringName" />
+			<param index="2" name="theme_type" type="StringName" />
 			<description>
-				Returns [code]true[/code] if the font size property defined by [code]name[/code] and [code]theme_type[/code] exists, or if the default theme font size is set up (see [method has_default_font_size]).
-				Returns [code]false[/code] if neither exist. Use [method set_font_size] to define the property.
+				Renames the font size property defined by [param old_name] and [param theme_type] to [param name], if it exists.
+				Fails if it doesn't exist, or if a similar property with the new name already exists. Use [method has_font_size] to check for existence, and [method clear_font_size] to remove the existing property.
 			</description>
 		</method>
 		<method name="rename_icon">
 			<return type="void" />
-			<argument index="0" name="old_name" type="StringName" />
-			<argument index="1" name="name" type="StringName" />
-			<argument index="2" name="theme_type" type="StringName" />
+			<param index="0" name="old_name" type="StringName" />
+			<param index="1" name="name" type="StringName" />
+			<param index="2" name="theme_type" type="StringName" />
 			<description>
-				Renames the icon property defined by [code]old_name[/code] and [code]theme_type[/code] to [code]name[/code], if it exists.
+				Renames the icon property defined by [param old_name] and [param theme_type] to [param name], if it exists.
 				Fails if it doesn't exist, or if a similar property with the new name already exists. Use [method has_icon] to check for existence, and [method clear_icon] to remove the existing property.
 			</description>
 		</method>
 		<method name="rename_stylebox">
 			<return type="void" />
-			<argument index="0" name="old_name" type="StringName" />
-			<argument index="1" name="name" type="StringName" />
-			<argument index="2" name="theme_type" type="StringName" />
+			<param index="0" name="old_name" type="StringName" />
+			<param index="1" name="name" type="StringName" />
+			<param index="2" name="theme_type" type="StringName" />
 			<description>
-				Renames the [StyleBox] property defined by [code]old_name[/code] and [code]theme_type[/code] to [code]name[/code], if it exists.
+				Renames the [StyleBox] property defined by [param old_name] and [param theme_type] to [param name], if it exists.
 				Fails if it doesn't exist, or if a similar property with the new name already exists. Use [method has_stylebox] to check for existence, and [method clear_stylebox] to remove the existing property.
 			</description>
 		</method>
 		<method name="rename_theme_item">
 			<return type="void" />
-			<argument index="0" name="data_type" type="int" enum="Theme.DataType" />
-			<argument index="1" name="old_name" type="StringName" />
-			<argument index="2" name="name" type="StringName" />
-			<argument index="3" name="theme_type" type="StringName" />
+			<param index="0" name="data_type" type="int" enum="Theme.DataType" />
+			<param index="1" name="old_name" type="StringName" />
+			<param index="2" name="name" type="StringName" />
+			<param index="3" name="theme_type" type="StringName" />
 			<description>
-				Renames the theme property of [code]data_type[/code] defined by [code]old_name[/code] and [code]theme_type[/code] to [code]name[/code], if it exists.
+				Renames the theme property of [param data_type] defined by [param old_name] and [param theme_type] to [param name], if it exists.
 				Fails if it doesn't exist, or if a similar property with the new name already exists. Use [method has_theme_item] to check for existence, and [method clear_theme_item] to remove the existing property.
 				[b]Note:[/b] This method is analogous to calling the corresponding data type specific method, but can be used for more generalized logic.
 			</description>
 		</method>
 		<method name="set_color">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
-			<argument index="2" name="color" type="Color" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
+			<param index="2" name="color" type="Color" />
 			<description>
-				Creates or changes the value of the [Color] property defined by [code]name[/code] and [code]theme_type[/code]. Use [method clear_color] to remove the property.
+				Creates or changes the value of the [Color] property defined by [param name] and [param theme_type]. Use [method clear_color] to remove the property.
 			</description>
 		</method>
 		<method name="set_constant">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
-			<argument index="2" name="constant" type="int" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
+			<param index="2" name="constant" type="int" />
 			<description>
-				Creates or changes the value of the constant property defined by [code]name[/code] and [code]theme_type[/code]. Use [method clear_constant] to remove the property.
+				Creates or changes the value of the constant property defined by [param name] and [param theme_type]. Use [method clear_constant] to remove the property.
 			</description>
 		</method>
 		<method name="set_font">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
-			<argument index="2" name="font" type="Font" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
+			<param index="2" name="font" type="Font" />
 			<description>
-				Creates or changes the value of the [Font] property defined by [code]name[/code] and [code]theme_type[/code]. Use [method clear_font] to remove the property.
+				Creates or changes the value of the [Font] property defined by [param name] and [param theme_type]. Use [method clear_font] to remove the property.
 			</description>
 		</method>
 		<method name="set_font_size">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
-			<argument index="2" name="font_size" type="int" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
+			<param index="2" name="font_size" type="int" />
 			<description>
-				Renames the font size property defined by [code]old_name[/code] and [code]theme_type[/code] to [code]name[/code], if it exists.
-				Fails if it doesn't exist, or if a similar property with the new name already exists. Use [method has_font_size] to check for existence, and [method clear_font_size] to remove the existing property.
+				Creates or changes the value of the font size property defined by [param name] and [param theme_type]. Use [method clear_font_size] to remove the property.
 			</description>
 		</method>
 		<method name="set_icon">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
-			<argument index="2" name="texture" type="Texture2D" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
+			<param index="2" name="texture" type="Texture2D" />
 			<description>
-				Creates or changes the value of the icon property defined by [code]name[/code] and [code]theme_type[/code]. Use [method clear_icon] to remove the property.
+				Creates or changes the value of the icon property defined by [param name] and [param theme_type]. Use [method clear_icon] to remove the property.
 			</description>
 		</method>
 		<method name="set_stylebox">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" />
-			<argument index="2" name="texture" type="StyleBox" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" />
+			<param index="2" name="texture" type="StyleBox" />
 			<description>
-				Creates or changes the value of the [StyleBox] property defined by [code]name[/code] and [code]theme_type[/code]. Use [method clear_stylebox] to remove the property.
+				Creates or changes the value of the [StyleBox] property defined by [param name] and [param theme_type]. Use [method clear_stylebox] to remove the property.
 			</description>
 		</method>
 		<method name="set_theme_item">
 			<return type="void" />
-			<argument index="0" name="data_type" type="int" enum="Theme.DataType" />
-			<argument index="1" name="name" type="StringName" />
-			<argument index="2" name="theme_type" type="StringName" />
-			<argument index="3" name="value" type="Variant" />
+			<param index="0" name="data_type" type="int" enum="Theme.DataType" />
+			<param index="1" name="name" type="StringName" />
+			<param index="2" name="theme_type" type="StringName" />
+			<param index="3" name="value" type="Variant" />
 			<description>
-				Creates or changes the value of the theme property of [code]data_type[/code] defined by [code]name[/code] and [code]theme_type[/code]. Use [method clear_theme_item] to remove the property.
-				Fails if the [code]value[/code] type is not accepted by [code]data_type[/code].
+				Creates or changes the value of the theme property of [param data_type] defined by [param name] and [param theme_type]. Use [method clear_theme_item] to remove the property.
+				Fails if the [param value] type is not accepted by [param data_type].
 				[b]Note:[/b] This method is analogous to calling the corresponding data type specific method, but can be used for more generalized logic.
 			</description>
 		</method>
 		<method name="set_type_variation">
 			<return type="void" />
-			<argument index="0" name="theme_type" type="StringName" />
-			<argument index="1" name="base_type" type="StringName" />
+			<param index="0" name="theme_type" type="StringName" />
+			<param index="1" name="base_type" type="StringName" />
 			<description>
-				Marks [code]theme_type[/code] as a variation of [code]base_type[/code].
-				This adds [code]theme_type[/code] as a suggested option for [member Control.theme_type_variation] on a [Control] that is of the [code]base_type[/code] class.
-				Variations can also be nested, i.e. [code]base_type[/code] can be another variation. If a chain of variations ends with a [code]base_type[/code] matching the class of the [Control], the whole chain is going to be suggested as options.
+				Marks [param theme_type] as a variation of [param base_type].
+				This adds [param theme_type] as a suggested option for [member Control.theme_type_variation] on a [Control] that is of the [param base_type] class.
+				Variations can also be nested, i.e. [param base_type] can be another variation. If a chain of variations ends with a [param base_type] matching the class of the [Control], the whole chain is going to be suggested as options.
 				[b]Note:[/b] Suggestions only show up if this theme resource is set as the project default theme. See [member ProjectSettings.gui/theme/custom].
 			</description>
 		</method>
diff --git a/doc/classes/Thread.xml b/doc/classes/Thread.xml
index 513daff37c..846dae0bae 100644
--- a/doc/classes/Thread.xml
+++ b/doc/classes/Thread.xml
@@ -34,12 +34,12 @@
 		</method>
 		<method name="start">
 			<return type="int" enum="Error" />
-			<argument index="0" name="callable" type="Callable" />
-			<argument index="1" name="priority" type="int" enum="Thread.Priority" default="1" />
+			<param index="0" name="callable" type="Callable" />
+			<param index="1" name="priority" type="int" enum="Thread.Priority" default="1" />
 			<description>
-				Starts a new [Thread] that calls [code]callable[/code].
+				Starts a new [Thread] that calls [param callable].
 				If the method takes some arguments, you can pass them using [method Callable.bind].
-				The [code]priority[/code] of the [Thread] can be changed by passing a value from the [enum Priority] enum.
+				The [param priority] of the [Thread] can be changed by passing a value from the [enum Priority] enum.
 				Returns [constant OK] on success, or [constant ERR_CANT_CREATE] on failure.
 			</description>
 		</method>
diff --git a/doc/classes/TileData.xml b/doc/classes/TileData.xml
index 66cf602e5d..798a536a88 100644
--- a/doc/classes/TileData.xml
+++ b/doc/classes/TileData.xml
@@ -9,188 +9,188 @@
 	<methods>
 		<method name="add_collision_polygon">
 			<return type="void" />
-			<argument index="0" name="layer_id" type="int" />
+			<param index="0" name="layer_id" type="int" />
 			<description>
 				Adds a collision polygon to the tile on the given TileSet physics layer.
 			</description>
 		</method>
 		<method name="get_collision_polygon_one_way_margin" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="layer_id" type="int" />
-			<argument index="1" name="polygon_index" type="int" />
+			<param index="0" name="layer_id" type="int" />
+			<param index="1" name="polygon_index" type="int" />
 			<description>
-				Returns the one-way margin (for one-way platforms) of the polygon at index [code]polygon_index[/code] for TileSet physics layer with index [code]layer_id[/code].
+				Returns the one-way margin (for one-way platforms) of the polygon at index [param polygon_index] for TileSet physics layer with index [param layer_id].
 			</description>
 		</method>
 		<method name="get_collision_polygon_points" qualifiers="const">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="layer_id" type="int" />
-			<argument index="1" name="polygon_index" type="int" />
+			<param index="0" name="layer_id" type="int" />
+			<param index="1" name="polygon_index" type="int" />
 			<description>
-				Returns the points of the polygon at index [code]polygon_index[/code] for TileSet physics layer with index [code]layer_id[/code].
+				Returns the points of the polygon at index [param polygon_index] for TileSet physics layer with index [param layer_id].
 			</description>
 		</method>
 		<method name="get_collision_polygons_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="layer_id" type="int" />
+			<param index="0" name="layer_id" type="int" />
 			<description>
-				Returns how many polygons the tile has for TileSet physics layer with index [code]layer_id[/code].
+				Returns how many polygons the tile has for TileSet physics layer with index [param layer_id].
 			</description>
 		</method>
 		<method name="get_constant_angular_velocity" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="layer_id" type="int" />
+			<param index="0" name="layer_id" type="int" />
 			<description>
 				Returns the constant angular velocity applied to objects colliding with this tile.
 			</description>
 		</method>
 		<method name="get_constant_linear_velocity" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="layer_id" type="int" />
+			<param index="0" name="layer_id" type="int" />
 			<description>
 				Returns the constant linear velocity applied to objects colliding with this tile.
 			</description>
 		</method>
 		<method name="get_custom_data" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="layer_name" type="String" />
+			<param index="0" name="layer_name" type="String" />
 			<description>
-				Returns the custom data value for custom data layer named [code]layer_name[/code].
+				Returns the custom data value for custom data layer named [param layer_name].
 			</description>
 		</method>
 		<method name="get_custom_data_by_layer_id" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="layer_id" type="int" />
+			<param index="0" name="layer_id" type="int" />
 			<description>
-				Returns the custom data value for custom data layer with index [code]layer_id[/code].
+				Returns the custom data value for custom data layer with index [param layer_id].
 			</description>
 		</method>
 		<method name="get_navigation_polygon" qualifiers="const">
 			<return type="NavigationPolygon" />
-			<argument index="0" name="layer_id" type="int" />
+			<param index="0" name="layer_id" type="int" />
 			<description>
-				Returns the navigation polygon of the tile for the TileSet navigation layer with index [code]layer_id[/code].
+				Returns the navigation polygon of the tile for the TileSet navigation layer with index [param layer_id].
 			</description>
 		</method>
 		<method name="get_occluder" qualifiers="const">
 			<return type="OccluderPolygon2D" />
-			<argument index="0" name="layer_id" type="int" />
+			<param index="0" name="layer_id" type="int" />
 			<description>
-				Returns the occluder polygon of the tile for the TileSet occlusion layer with index [code]layer_id[/code].
+				Returns the occluder polygon of the tile for the TileSet occlusion layer with index [param layer_id].
 			</description>
 		</method>
 		<method name="get_terrain_peering_bit" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="peering_bit" type="int" enum="TileSet.CellNeighbor" />
+			<param index="0" name="peering_bit" type="int" enum="TileSet.CellNeighbor" />
 			<description>
-				Returns the tile's terrain bit for the given [code]peering_bit[/code] direction.
+				Returns the tile's terrain bit for the given [param peering_bit] direction.
 			</description>
 		</method>
 		<method name="is_collision_polygon_one_way" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_id" type="int" />
-			<argument index="1" name="polygon_index" type="int" />
+			<param index="0" name="layer_id" type="int" />
+			<param index="1" name="polygon_index" type="int" />
 			<description>
-				Returns whether one-way collisions are enabled for the polygon at index [code]polygon_index[/code] for TileSet physics layer with index [code]layer_id[/code].
+				Returns whether one-way collisions are enabled for the polygon at index [param polygon_index] for TileSet physics layer with index [param layer_id].
 			</description>
 		</method>
 		<method name="remove_collision_polygon">
 			<return type="void" />
-			<argument index="0" name="layer_id" type="int" />
-			<argument index="1" name="polygon_index" type="int" />
+			<param index="0" name="layer_id" type="int" />
+			<param index="1" name="polygon_index" type="int" />
 			<description>
-				Removes the polygon at index [code]polygon_index[/code] for TileSet physics layer with index [code]layer_id[/code].
+				Removes the polygon at index [param polygon_index] for TileSet physics layer with index [param layer_id].
 			</description>
 		</method>
 		<method name="set_collision_polygon_one_way">
 			<return type="void" />
-			<argument index="0" name="layer_id" type="int" />
-			<argument index="1" name="polygon_index" type="int" />
-			<argument index="2" name="one_way" type="bool" />
+			<param index="0" name="layer_id" type="int" />
+			<param index="1" name="polygon_index" type="int" />
+			<param index="2" name="one_way" type="bool" />
 			<description>
-				Enables/disables one-way collisions on the polygon at index [code]polygon_index[/code] for TileSet physics layer with index [code]layer_id[/code].
+				Enables/disables one-way collisions on the polygon at index [param polygon_index] for TileSet physics layer with index [param layer_id].
 			</description>
 		</method>
 		<method name="set_collision_polygon_one_way_margin">
 			<return type="void" />
-			<argument index="0" name="layer_id" type="int" />
-			<argument index="1" name="polygon_index" type="int" />
-			<argument index="2" name="one_way_margin" type="float" />
+			<param index="0" name="layer_id" type="int" />
+			<param index="1" name="polygon_index" type="int" />
+			<param index="2" name="one_way_margin" type="float" />
 			<description>
-				Enables/disables one-way collisions on the polygon at index [code]polygon_index[/code] for TileSet physics layer with index [code]layer_id[/code].
+				Enables/disables one-way collisions on the polygon at index [param polygon_index] for TileSet physics layer with index [param layer_id].
 			</description>
 		</method>
 		<method name="set_collision_polygon_points">
 			<return type="void" />
-			<argument index="0" name="layer_id" type="int" />
-			<argument index="1" name="polygon_index" type="int" />
-			<argument index="2" name="polygon" type="PackedVector2Array" />
+			<param index="0" name="layer_id" type="int" />
+			<param index="1" name="polygon_index" type="int" />
+			<param index="2" name="polygon" type="PackedVector2Array" />
 			<description>
-				Sets the points of the polygon at index [code]polygon_index[/code] for TileSet physics layer with index [code]layer_id[/code].
+				Sets the points of the polygon at index [param polygon_index] for TileSet physics layer with index [param layer_id].
 			</description>
 		</method>
 		<method name="set_collision_polygons_count">
 			<return type="void" />
-			<argument index="0" name="layer_id" type="int" />
-			<argument index="1" name="polygons_count" type="int" />
+			<param index="0" name="layer_id" type="int" />
+			<param index="1" name="polygons_count" type="int" />
 			<description>
-				Sets the polygons count for TileSet physics layer with index [code]layer_id[/code].
+				Sets the polygons count for TileSet physics layer with index [param layer_id].
 			</description>
 		</method>
 		<method name="set_constant_angular_velocity">
 			<return type="void" />
-			<argument index="0" name="layer_id" type="int" />
-			<argument index="1" name="velocity" type="float" />
+			<param index="0" name="layer_id" type="int" />
+			<param index="1" name="velocity" type="float" />
 			<description>
 				Sets the constant angular velocity. This does not rotate the tile. This angular velocity is applied to objects colliding with this tile.
 			</description>
 		</method>
 		<method name="set_constant_linear_velocity">
 			<return type="void" />
-			<argument index="0" name="layer_id" type="int" />
-			<argument index="1" name="velocity" type="Vector2" />
+			<param index="0" name="layer_id" type="int" />
+			<param index="1" name="velocity" type="Vector2" />
 			<description>
 				Sets the constant linear velocity. This does not move the tile. This linear velocity is applied to objects colliding with this tile. This is useful to create conveyor belts.
 			</description>
 		</method>
 		<method name="set_custom_data">
 			<return type="void" />
-			<argument index="0" name="layer_name" type="String" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="layer_name" type="String" />
+			<param index="1" name="value" type="Variant" />
 			<description>
-				Sets the tile's custom data value for the TileSet custom data layer with name [code]layer_name[/code].
+				Sets the tile's custom data value for the TileSet custom data layer with name [param layer_name].
 			</description>
 		</method>
 		<method name="set_custom_data_by_layer_id">
 			<return type="void" />
-			<argument index="0" name="layer_id" type="int" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="layer_id" type="int" />
+			<param index="1" name="value" type="Variant" />
 			<description>
-				Sets the tile's custom data value for the TileSet custom data layer with index [code]layer_id[/code].
+				Sets the tile's custom data value for the TileSet custom data layer with index [param layer_id].
 			</description>
 		</method>
 		<method name="set_navigation_polygon">
 			<return type="void" />
-			<argument index="0" name="layer_id" type="int" />
-			<argument index="1" name="navigation_polygon" type="NavigationPolygon" />
+			<param index="0" name="layer_id" type="int" />
+			<param index="1" name="navigation_polygon" type="NavigationPolygon" />
 			<description>
-				Sets the navigation polygon for the TileSet navigation layer with index [code]layer_id[/code].
+				Sets the navigation polygon for the TileSet navigation layer with index [param layer_id].
 			</description>
 		</method>
 		<method name="set_occluder">
 			<return type="void" />
-			<argument index="0" name="layer_id" type="int" />
-			<argument index="1" name="occluder_polygon" type="OccluderPolygon2D" />
+			<param index="0" name="layer_id" type="int" />
+			<param index="1" name="occluder_polygon" type="OccluderPolygon2D" />
 			<description>
-				Sets the occluder for the TileSet occlusion layer with index [code]layer_id[/code].
+				Sets the occluder for the TileSet occlusion layer with index [param layer_id].
 			</description>
 		</method>
 		<method name="set_terrain_peering_bit">
 			<return type="void" />
-			<argument index="0" name="peering_bit" type="int" enum="TileSet.CellNeighbor" />
-			<argument index="1" name="terrain" type="int" />
+			<param index="0" name="peering_bit" type="int" enum="TileSet.CellNeighbor" />
+			<param index="1" name="terrain" type="int" />
 			<description>
-				Sets the tile's terrain bit for the given [code]peering_bit[/code] direction.
+				Sets the tile's terrain bit for the given [param peering_bit] direction.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/TileMap.xml b/doc/classes/TileMap.xml
index d532f583e6..ae57a08ef8 100644
--- a/doc/classes/TileMap.xml
+++ b/doc/classes/TileMap.xml
@@ -18,30 +18,30 @@
 	<methods>
 		<method name="_tile_data_runtime_update" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="layer" type="int" />
-			<argument index="1" name="coords" type="Vector2i" />
-			<argument index="2" name="tile_data" type="TileData" />
+			<param index="0" name="layer" type="int" />
+			<param index="1" name="coords" type="Vector2i" />
+			<param index="2" name="tile_data" type="TileData" />
 			<description>
 				Called with a TileData object about to be used internally by the TileMap, allowing its modification at runtime.
-				This method is only called if [method _use_tile_data_runtime_update] is implemented and returns [code]true[/code] for the given tile [code]coords[/coords] and [code]layer[/code].
-				[b]Warning:[/b] The [code]tile_data[/code] object's sub-resources are the same as the one in the TileSet. Modifying them might impact the whole TileSet. Instead, make sure to duplicate those resources.
-				[b]Note:[/b] If the properties of [code]tile_data[/code] object should change over time, use [method force_update] to trigger a TileMap update.
+				This method is only called if [method _use_tile_data_runtime_update] is implemented and returns [code]true[/code] for the given tile [param coords] and [param layer].
+				[b]Warning:[/b] The [param tile_data] object's sub-resources are the same as the one in the TileSet. Modifying them might impact the whole TileSet. Instead, make sure to duplicate those resources.
+				[b]Note:[/b] If the properties of [param tile_data] object should change over time, use [method force_update] to trigger a TileMap update.
 			</description>
 		</method>
 		<method name="_use_tile_data_runtime_update" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="layer" type="int" />
-			<argument index="1" name="coords" type="Vector2i" />
+			<param index="0" name="layer" type="int" />
+			<param index="1" name="coords" type="Vector2i" />
 			<description>
-				Should return [code]true[/code] if the tile at coordinates [code]coords[/coords] on layer [code]layer[/code] requires a runtime update.
+				Should return [code]true[/code] if the tile at coordinates [param coords] on layer [param layer] requires a runtime update.
 				[b]Warning:[/b] Make sure this function only return [code]true[/code] when needed. Any tile processed at runtime without a need for it will imply a significant performance penalty.
 			</description>
 		</method>
 		<method name="add_layer">
 			<return type="void" />
-			<argument index="0" name="to_position" type="int" />
+			<param index="0" name="to_position" type="int" />
 			<description>
-				Adds a layer at the given position [code]to_position[/code] in the array. If [code]to_position[/code] is -1, adds it at the end of the array.
+				Adds a layer at the given position [param to_position] in the array. If [param to_position] is -1, adds it at the end of the array.
 			</description>
 		</method>
 		<method name="clear">
@@ -52,17 +52,17 @@
 		</method>
 		<method name="clear_layer">
 			<return type="void" />
-			<argument index="0" name="layer" type="int" />
+			<param index="0" name="layer" type="int" />
 			<description>
 				Clears all cells on the given layer.
 			</description>
 		</method>
 		<method name="erase_cell">
 			<return type="void" />
-			<argument index="0" name="layer" type="int" />
-			<argument index="1" name="coords" type="Vector2i" />
+			<param index="0" name="layer" type="int" />
+			<param index="1" name="coords" type="Vector2i" />
 			<description>
-				Erases the cell on layer [code]layer[/code] at coordinates [code]coords[/code].
+				Erases the cell on layer [param layer] at coordinates [param coords].
 			</description>
 		</method>
 		<method name="fix_invalid_tiles">
@@ -73,71 +73,71 @@
 		</method>
 		<method name="force_update">
 			<return type="void" />
-			<argument index="0" name="layer" type="int" default="-1" />
+			<param index="0" name="layer" type="int" default="-1" />
 			<description>
-				Triggers an update of the TileMap. If [code]layer[/code] is provided, only updates the given layer.
+				Triggers an update of the TileMap. If [param layer] is provided, only updates the given layer.
 				[b]Note:[/b] The TileMap node updates automatically when one of its properties is modified. A manual update is only needed if runtime modifications (implemented in [method _tile_data_runtime_update]) need to be applied.
-				[b]Warning:[/b] Updating the TileMap is a performance demanding task. Limit occurrences of those updates to the minimum and limit the amount tiles they impact (by segregating tiles updated often to a dedicated layer for example).
+				[b]Warning:[/b] Updating the TileMap is computationally expensive and may impact performance. Try to limit the number of updates and the tiles they impact (by placing frequently updated tiles in a dedicated layer for example).
 			</description>
 		</method>
 		<method name="get_cell_alternative_tile" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="layer" type="int" />
-			<argument index="1" name="coords" type="Vector2i" />
-			<argument index="2" name="use_proxies" type="bool" />
+			<param index="0" name="layer" type="int" />
+			<param index="1" name="coords" type="Vector2i" />
+			<param index="2" name="use_proxies" type="bool" />
 			<description>
-				Returns the tile alternative ID of the cell on layer [code]layer[/code] at [code]coords[/code]. If [code]use_proxies[/code] is [code]false[/code], ignores the [TileSet]'s tile proxies, returning the raw alternative identifier. See [method TileSet.map_tile_proxy].
+				Returns the tile alternative ID of the cell on layer [param layer] at [param coords]. If [param use_proxies] is [code]false[/code], ignores the [TileSet]'s tile proxies, returning the raw alternative identifier. See [method TileSet.map_tile_proxy].
 			</description>
 		</method>
 		<method name="get_cell_atlas_coords" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="layer" type="int" />
-			<argument index="1" name="coords" type="Vector2i" />
-			<argument index="2" name="use_proxies" type="bool" />
+			<param index="0" name="layer" type="int" />
+			<param index="1" name="coords" type="Vector2i" />
+			<param index="2" name="use_proxies" type="bool" />
 			<description>
-				Returns the tile atlas coordinates ID of the cell on layer [code]layer[/code] at coordinates [code]coords[/code]. If [code]use_proxies[/code] is [code]false[/code], ignores the [TileSet]'s tile proxies, returning the raw alternative identifier. See [method TileSet.map_tile_proxy].
+				Returns the tile atlas coordinates ID of the cell on layer [param layer] at coordinates [param coords]. If [param use_proxies] is [code]false[/code], ignores the [TileSet]'s tile proxies, returning the raw alternative identifier. See [method TileSet.map_tile_proxy].
 			</description>
 		</method>
 		<method name="get_cell_source_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="layer" type="int" />
-			<argument index="1" name="coords" type="Vector2i" />
-			<argument index="2" name="use_proxies" type="bool" />
+			<param index="0" name="layer" type="int" />
+			<param index="1" name="coords" type="Vector2i" />
+			<param index="2" name="use_proxies" type="bool" />
 			<description>
-				Returns the tile source ID of the cell on layer [code]layer[/code] at coordinates [code]coords[/code]. If [code]use_proxies[/code] is [code]false[/code], ignores the [TileSet]'s tile proxies, returning the raw alternative identifier. See [method TileSet.map_tile_proxy].
+				Returns the tile source ID of the cell on layer [param layer] at coordinates [param coords]. If [param use_proxies] is [code]false[/code], ignores the [TileSet]'s tile proxies, returning the raw alternative identifier. See [method TileSet.map_tile_proxy].
 			</description>
 		</method>
 		<method name="get_coords_for_body_rid">
 			<return type="Vector2i" />
-			<argument index="0" name="body" type="RID" />
+			<param index="0" name="body" type="RID" />
 			<description>
 				Returns the coordinates of the tile for given physics body RID. Such RID can be retrieved from [method KinematicCollision2D.get_collider_rid], when colliding with a tile.
 			</description>
 		</method>
 		<method name="get_layer_modulate" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="layer" type="int" />
+			<param index="0" name="layer" type="int" />
 			<description>
 				Returns a TileMap layer's modulate.
 			</description>
 		</method>
 		<method name="get_layer_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="layer" type="int" />
+			<param index="0" name="layer" type="int" />
 			<description>
 				Returns a TileMap layer's name.
 			</description>
 		</method>
 		<method name="get_layer_y_sort_origin" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="layer" type="int" />
+			<param index="0" name="layer" type="int" />
 			<description>
 				Returns a TileMap layer's Y sort origin.
 			</description>
 		</method>
 		<method name="get_layer_z_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="layer" type="int" />
+			<param index="0" name="layer" type="int" />
 			<description>
 				Returns a TileMap layer's Z-index value.
 			</description>
@@ -149,30 +149,30 @@
 		</method>
 		<method name="get_neighbor_cell" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="coords" type="Vector2i" />
-			<argument index="1" name="neighbor" type="int" enum="TileSet.CellNeighbor" />
+			<param index="0" name="coords" type="Vector2i" />
+			<param index="1" name="neighbor" type="int" enum="TileSet.CellNeighbor" />
 			<description>
-				Returns the neighboring cell to the one at coordinates [code]coords[/code], identified by the [code]neighbor[/code] direction. This method takes into account the different layouts a TileMap can take.
+				Returns the neighboring cell to the one at coordinates [param coords], identified by the [param neighbor] direction. This method takes into account the different layouts a TileMap can take.
 			</description>
 		</method>
 		<method name="get_pattern">
 			<return type="TileMapPattern" />
-			<argument index="0" name="layer" type="int" />
-			<argument index="1" name="coords_array" type="Vector2i[]" />
+			<param index="0" name="layer" type="int" />
+			<param index="1" name="coords_array" type="Vector2i[]" />
 			<description>
 				Creates a new [TileMapPattern] from the given layer and set of cells.
 			</description>
 		</method>
 		<method name="get_surrounding_tiles">
 			<return type="Vector2i[]" />
-			<argument index="0" name="coords" type="Vector2i" />
+			<param index="0" name="coords" type="Vector2i" />
 			<description>
-				Returns the list of all neighbourings cells to the one at [code]coords[/code]
+				Returns the list of all neighbourings cells to the one at [param coords]
 			</description>
 		</method>
 		<method name="get_used_cells" qualifiers="const">
 			<return type="Vector2i[]" />
-			<argument index="0" name="layer" type="int" />
+			<param index="0" name="layer" type="int" />
 			<description>
 				Returns a [Vector2] array with the positions of all cells containing a tile in the given layer. A cell is considered empty if its source identifier equals -1, its atlas coordinates identifiers is [code]Vector2(-1, -1)[/code] and its alternative identifier is -1.
 			</description>
@@ -185,30 +185,30 @@
 		</method>
 		<method name="is_layer_enabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer" type="int" />
+			<param index="0" name="layer" type="int" />
 			<description>
 				Returns if a layer is enabled.
 			</description>
 		</method>
 		<method name="is_layer_y_sort_enabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer" type="int" />
+			<param index="0" name="layer" type="int" />
 			<description>
 				Returns if a layer Y-sorts its tiles.
 			</description>
 		</method>
 		<method name="map_pattern">
 			<return type="Vector2i" />
-			<argument index="0" name="position_in_tilemap" type="Vector2i" />
-			<argument index="1" name="coords_in_pattern" type="Vector2i" />
-			<argument index="2" name="pattern" type="TileMapPattern" />
+			<param index="0" name="position_in_tilemap" type="Vector2i" />
+			<param index="1" name="coords_in_pattern" type="Vector2i" />
+			<param index="2" name="pattern" type="TileMapPattern" />
 			<description>
-				Returns for the given coordinate [code]coords_in_pattern[/code] in a [TileMapPattern] the corresponding cell coordinates if the pattern was pasted at the [code]position_in_tilemap[/code] coordinates (see [method set_pattern]). This mapping is required as in half-offset tile shapes, the mapping might not work by calculating [code]position_in_tile_map + coords_in_pattern[/code]
+				Returns for the given coordinate [param coords_in_pattern] in a [TileMapPattern] the corresponding cell coordinates if the pattern was pasted at the [param position_in_tilemap] coordinates (see [method set_pattern]). This mapping is required as in half-offset tile shapes, the mapping might not work by calculating [code]position_in_tile_map + coords_in_pattern[/code]
 			</description>
 		</method>
 		<method name="map_to_world" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="map_position" type="Vector2i" />
+			<param index="0" name="map_position" type="Vector2i" />
 			<description>
 				Returns a local position of the center of the cell at the given tilemap (grid-based) coordinates.
 				[b]Note:[/b] This doesn't correspond to the visual position of the tile, i.e. it ignores the [member TileData.texture_offset] property of individual tiles.
@@ -216,87 +216,88 @@
 		</method>
 		<method name="move_layer">
 			<return type="void" />
-			<argument index="0" name="layer" type="int" />
-			<argument index="1" name="to_position" type="int" />
+			<param index="0" name="layer" type="int" />
+			<param index="1" name="to_position" type="int" />
 			<description>
-				Moves the layer at index [code]layer_index[/code] to the given position [code]to_position[/code] in the array.
+				Moves the layer at index [param layer] to the given position [param to_position] in the array.
 			</description>
 		</method>
 		<method name="remove_layer">
 			<return type="void" />
-			<argument index="0" name="layer" type="int" />
+			<param index="0" name="layer" type="int" />
 			<description>
-				Removes the layer at index [code]layer[/code].
+				Removes the layer at index [param layer].
 			</description>
 		</method>
 		<method name="set_cell">
 			<return type="void" />
-			<argument index="0" name="layer" type="int" />
-			<argument index="1" name="coords" type="Vector2i" />
-			<argument index="2" name="source_id" type="int" default="-1" />
-			<argument index="3" name="atlas_coords" type="Vector2i" default="Vector2i(-1, -1)" />
-			<argument index="4" name="alternative_tile" type="int" default="0" />
+			<param index="0" name="layer" type="int" />
+			<param index="1" name="coords" type="Vector2i" />
+			<param index="2" name="source_id" type="int" default="-1" />
+			<param index="3" name="atlas_coords" type="Vector2i" default="Vector2i(-1, -1)" />
+			<param index="4" name="alternative_tile" type="int" default="0" />
 			<description>
-				Sets the tile indentifiers for the cell on layer [code]layer[/code] at coordinates [code]coords[/code]. Each tile of the [TileSet] is identified using three parts:
-				- The source identifier [code]source_id[/code] identifies a [TileSetSource] identifier. See [method TileSet.set_source_id],
-				- The atlas coordinates identifier [code]atlas_coords[/code] identifies a tile coordinates in the atlas (if the source is a [TileSetAtlasSource]. For [TileSetScenesCollectionSource] it should be 0),
-				- The alternative tile identifier [code]alternative_tile[/code] identifies a tile alternative the source is a [TileSetAtlasSource], and the scene for a [TileSetScenesCollectionSource].
+				Sets the tile indentifiers for the cell on layer [param layer] at coordinates [param coords]. Each tile of the [TileSet] is identified using three parts:
+				- The source identifier [param source_id] identifies a [TileSetSource] identifier. See [method TileSet.set_source_id],
+				- The atlas coordinates identifier [param atlas_coords] identifies a tile coordinates in the atlas (if the source is a [TileSetAtlasSource]. For [TileSetScenesCollectionSource] it should be 0),
+				- The alternative tile identifier [param alternative_tile] identifies a tile alternative the source is a [TileSetAtlasSource], and the scene for a [TileSetScenesCollectionSource].
 			</description>
 		</method>
 		<method name="set_cells_terrain_connect">
 			<return type="void" />
-			<argument index="0" name="layer" type="int" />
-			<argument index="1" name="cells" type="Vector2i[]" />
-			<argument index="2" name="terrain_set" type="int" />
-			<argument index="3" name="terrain" type="int" />
-			<argument index="4" name="ignore_empty_terrains" type="bool" default="true" />
-			<description>
-				Update all the cells in the [code]cells[/code] coordinates array so that they use the given [code]terrain[/code] for the given [code]terrain_set[/code]. If an updated cell has the same terrain as one of its neighboring cells, this function tries to join the two. This function might update neighboring tiles if needed to create correct terrain transitions.				If [code]ignore_empty_terrains[/code] is true, empty terrains will be ignored when trying to find the best fitting tile for the given terrain constraints.
-				If [code]ignore_empty_terrains[/code] is true, empty terrains will be ignored when trying to find the best fitting tile for the given terrain constraints.
+			<param index="0" name="layer" type="int" />
+			<param index="1" name="cells" type="Vector2i[]" />
+			<param index="2" name="terrain_set" type="int" />
+			<param index="3" name="terrain" type="int" />
+			<param index="4" name="ignore_empty_terrains" type="bool" default="true" />
+			<description>
+				Update all the cells in the [param cells] coordinates array so that they use the given [param terrain] for the given [param terrain_set]. If an updated cell has the same terrain as one of its neighboring cells, this function tries to join the two. This function might update neighboring tiles if needed to create correct terrain transitions.
+				If [param ignore_empty_terrains] is true, empty terrains will be ignored when trying to find the best fitting tile for the given terrain constraints.
+				If [param ignore_empty_terrains] is true, empty terrains will be ignored when trying to find the best fitting tile for the given terrain constraints.
 				[b]Note:[/b] To work correctly, [code]set_cells_terrain_connect[/code] requires the TileMap's TileSet to have terrains set up with all required terrain combinations. Otherwise, it may produce unexpected results.
 			</description>
 		</method>
 		<method name="set_cells_terrain_path">
 			<return type="void" />
-			<argument index="0" name="layer" type="int" />
-			<argument index="1" name="path" type="Vector2i[]" />
-			<argument index="2" name="terrain_set" type="int" />
-			<argument index="3" name="terrain" type="int" />
-			<argument index="4" name="ignore_empty_terrains" type="bool" default="true" />
-			<description>
-				Update all the cells in the [code]cells[/code] coordinates array so that they use the given [code]terrain[/code] for the given [code]terrain_set[/code]. The function will also connect two successive cell in the path with the same terrain. This function might update neighboring tiles if needed to create correct terrain transitions.
-				If [code]ignore_empty_terrains[/code] is true, empty terrains will be ignored when trying to find the best fitting tile for the given terrain constraints.
+			<param index="0" name="layer" type="int" />
+			<param index="1" name="path" type="Vector2i[]" />
+			<param index="2" name="terrain_set" type="int" />
+			<param index="3" name="terrain" type="int" />
+			<param index="4" name="ignore_empty_terrains" type="bool" default="true" />
+			<description>
+				Update all the cells in the [param path] coordinates array so that they use the given [param terrain] for the given [param terrain_set]. The function will also connect two successive cell in the path with the same terrain. This function might update neighboring tiles if needed to create correct terrain transitions.
+				If [param ignore_empty_terrains] is true, empty terrains will be ignored when trying to find the best fitting tile for the given terrain constraints.
 				[b]Note:[/b] To work correctly, [code]set_cells_terrain_path[/code] requires the TileMap's TileSet to have terrains set up with all required terrain combinations. Otherwise, it may produce unexpected results.
 			</description>
 		</method>
 		<method name="set_layer_enabled">
 			<return type="void" />
-			<argument index="0" name="layer" type="int" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="layer" type="int" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
-				Enables or disables the layer [code]layer[/code]. A disabled layer is not processed at all (no rendering, no physics, etc...).
+				Enables or disables the layer [param layer]. A disabled layer is not processed at all (no rendering, no physics, etc...).
 			</description>
 		</method>
 		<method name="set_layer_modulate">
 			<return type="void" />
-			<argument index="0" name="layer" type="int" />
-			<argument index="1" name="enabled" type="Color" />
+			<param index="0" name="layer" type="int" />
+			<param index="1" name="enabled" type="Color" />
 			<description>
 				Sets a layer's color. It will be multiplied by tile's color and TileMap's modulate.
 			</description>
 		</method>
 		<method name="set_layer_name">
 			<return type="void" />
-			<argument index="0" name="layer" type="int" />
-			<argument index="1" name="name" type="String" />
+			<param index="0" name="layer" type="int" />
+			<param index="1" name="name" type="String" />
 			<description>
 				Sets a layer's name. This is mostly useful in the editor.
 			</description>
 		</method>
 		<method name="set_layer_y_sort_enabled">
 			<return type="void" />
-			<argument index="0" name="layer" type="int" />
-			<argument index="1" name="y_sort_enabled" type="bool" />
+			<param index="0" name="layer" type="int" />
+			<param index="1" name="y_sort_enabled" type="bool" />
 			<description>
 				Enables or disables a layer's Y-sorting. If a layer is Y-sorted, the layer will behave as a CanvasItem node where each of its tile gets Y-sorted.
 				Y-sorted layers should usually be on different Z-index values than not Y-sorted layers, otherwise, each of those layer will be Y-sorted as whole with the Y-sorted one. This is usually an undesired behvaior.
@@ -304,8 +305,8 @@
 		</method>
 		<method name="set_layer_y_sort_origin">
 			<return type="void" />
-			<argument index="0" name="layer" type="int" />
-			<argument index="1" name="y_sort_origin" type="int" />
+			<param index="0" name="layer" type="int" />
+			<param index="1" name="y_sort_origin" type="int" />
 			<description>
 				Sets a layer's Y-sort origin value. This Y-sort origin value is added to each tile's Y-sort origin value.
 				This allows, for example, to fake a different height level on each layer. This can be useful for top-down view games.
@@ -313,24 +314,24 @@
 		</method>
 		<method name="set_layer_z_index">
 			<return type="void" />
-			<argument index="0" name="layer" type="int" />
-			<argument index="1" name="z_index" type="int" />
+			<param index="0" name="layer" type="int" />
+			<param index="1" name="z_index" type="int" />
 			<description>
 				Sets a layers Z-index value. This Z-index is added to each tile's Z-index value.
 			</description>
 		</method>
 		<method name="set_pattern">
 			<return type="void" />
-			<argument index="0" name="layer" type="int" />
-			<argument index="1" name="position" type="Vector2i" />
-			<argument index="2" name="pattern" type="TileMapPattern" />
+			<param index="0" name="layer" type="int" />
+			<param index="1" name="position" type="Vector2i" />
+			<param index="2" name="pattern" type="TileMapPattern" />
 			<description>
-				Paste the given [TileMapPattern] at the given [code]position[/code] and [code]layer[/code] in the tile map.
+				Paste the given [TileMapPattern] at the given [param position] and [param layer] in the tile map.
 			</description>
 		</method>
 		<method name="world_to_map" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="world_position" type="Vector2" />
+			<param index="0" name="world_position" type="Vector2" />
 			<description>
 				Returns the tilemap (grid-based) coordinates corresponding to the given local position.
 			</description>
diff --git a/doc/classes/TileMapPattern.xml b/doc/classes/TileMapPattern.xml
index 5fe514d3da..30bb174313 100644
--- a/doc/classes/TileMapPattern.xml
+++ b/doc/classes/TileMapPattern.xml
@@ -12,23 +12,23 @@
 	<methods>
 		<method name="get_cell_alternative_tile" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="coords" type="Vector2i" />
+			<param index="0" name="coords" type="Vector2i" />
 			<description>
-				Returns the tile alternative ID of the cell at [code]coords[/code].
+				Returns the tile alternative ID of the cell at [param coords].
 			</description>
 		</method>
 		<method name="get_cell_atlas_coords" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="coords" type="Vector2i" />
+			<param index="0" name="coords" type="Vector2i" />
 			<description>
-				Returns the tile atlas coordinates ID of the cell at [code]coords[/code].
+				Returns the tile atlas coordinates ID of the cell at [param coords].
 			</description>
 		</method>
 		<method name="get_cell_source_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="coords" type="Vector2i" />
+			<param index="0" name="coords" type="Vector2i" />
 			<description>
-				Returns the tile source ID of the cell at [code]coords[/code].
+				Returns the tile source ID of the cell at [param coords].
 			</description>
 		</method>
 		<method name="get_size" qualifiers="const">
@@ -45,7 +45,7 @@
 		</method>
 		<method name="has_cell" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="coords" type="Vector2i" />
+			<param index="0" name="coords" type="Vector2i" />
 			<description>
 				Returns whether the pattern has a tile at the given coordinates.
 			</description>
@@ -58,25 +58,25 @@
 		</method>
 		<method name="remove_cell">
 			<return type="void" />
-			<argument index="0" name="coords" type="Vector2i" />
-			<argument index="1" name="update_size" type="bool" />
+			<param index="0" name="coords" type="Vector2i" />
+			<param index="1" name="update_size" type="bool" />
 			<description>
 				Remove the cell at the given coordinates.
 			</description>
 		</method>
 		<method name="set_cell">
 			<return type="void" />
-			<argument index="0" name="coords" type="Vector2i" />
-			<argument index="1" name="source_id" type="int" default="-1" />
-			<argument index="2" name="atlas_coords" type="Vector2i" default="Vector2i(-1, -1)" />
-			<argument index="3" name="alternative_tile" type="int" default="-1" />
+			<param index="0" name="coords" type="Vector2i" />
+			<param index="1" name="source_id" type="int" default="-1" />
+			<param index="2" name="atlas_coords" type="Vector2i" default="Vector2i(-1, -1)" />
+			<param index="3" name="alternative_tile" type="int" default="-1" />
 			<description>
-				Sets the tile indentifiers for the cell at coordinates [code]coords[/code]. See [method TileMap.set_cell].
+				Sets the tile indentifiers for the cell at coordinates [param coords]. See [method TileMap.set_cell].
 			</description>
 		</method>
 		<method name="set_size">
 			<return type="void" />
-			<argument index="0" name="size" type="Vector2i" />
+			<param index="0" name="size" type="Vector2i" />
 			<description>
 				Sets the size of the pattern.
 			</description>
diff --git a/doc/classes/TileSet.xml b/doc/classes/TileSet.xml
index 180e868ef8..7ced16d1af 100644
--- a/doc/classes/TileSet.xml
+++ b/doc/classes/TileSet.xml
@@ -24,66 +24,66 @@
 	<methods>
 		<method name="add_custom_data_layer">
 			<return type="void" />
-			<argument index="0" name="to_position" type="int" default="-1" />
+			<param index="0" name="to_position" type="int" default="-1" />
 			<description>
-				Adds a custom data layer to the TileSet at the given position [code]to_position[/code] in the array. If [code]to_position[/code] is -1, adds it at the end of the array.
+				Adds a custom data layer to the TileSet at the given position [param to_position] in the array. If [param to_position] is -1, adds it at the end of the array.
 				Custom data layers allow assigning custom properties to atlas tiles.
 			</description>
 		</method>
 		<method name="add_navigation_layer">
 			<return type="void" />
-			<argument index="0" name="to_position" type="int" default="-1" />
+			<param index="0" name="to_position" type="int" default="-1" />
 			<description>
-				Adds a navigation layer to the TileSet at the given position [code]to_position[/code] in the array. If [code]to_position[/code] is -1, adds it at the end of the array.
+				Adds a navigation layer to the TileSet at the given position [param to_position] in the array. If [param to_position] is -1, adds it at the end of the array.
 				Navigation layers allow assigning a navigable area to atlas tiles.
 			</description>
 		</method>
 		<method name="add_occlusion_layer">
 			<return type="void" />
-			<argument index="0" name="to_position" type="int" default="-1" />
+			<param index="0" name="to_position" type="int" default="-1" />
 			<description>
-				Adds an occlusion layer to the TileSet at the given position [code]to_position[/code] in the array. If [code]to_position[/code] is -1, adds it at the end of the array.
+				Adds an occlusion layer to the TileSet at the given position [param to_position] in the array. If [param to_position] is -1, adds it at the end of the array.
 				Occlusion layers allow assigning occlusion polygons to atlas tiles.
 			</description>
 		</method>
 		<method name="add_pattern">
 			<return type="int" />
-			<argument index="0" name="pattern" type="TileMapPattern" />
-			<argument index="1" name="index" type="int" default="-1" />
+			<param index="0" name="pattern" type="TileMapPattern" />
+			<param index="1" name="index" type="int" default="-1" />
 			<description>
-				Adds a [TileMapPattern] to be stored in the TileSet resource. If provided, insert it at the given [code]index[/code].
+				Adds a [TileMapPattern] to be stored in the TileSet resource. If provided, insert it at the given [param index].
 			</description>
 		</method>
 		<method name="add_physics_layer">
 			<return type="void" />
-			<argument index="0" name="to_position" type="int" default="-1" />
+			<param index="0" name="to_position" type="int" default="-1" />
 			<description>
-				Adds a physics layer to the TileSet at the given position [code]to_position[/code] in the array. If [code]to_position[/code] is -1, adds it at the end of the array.
+				Adds a physics layer to the TileSet at the given position [param to_position] in the array. If [param to_position] is -1, adds it at the end of the array.
 				Physics layers allow assigning collision polygons to atlas tiles.
 			</description>
 		</method>
 		<method name="add_source">
 			<return type="int" />
-			<argument index="0" name="source" type="TileSetSource" />
-			<argument index="1" name="atlas_source_id_override" type="int" default="-1" />
+			<param index="0" name="source" type="TileSetSource" />
+			<param index="1" name="atlas_source_id_override" type="int" default="-1" />
 			<description>
-				Adds a [TileSetSource] to the TileSet. If [code]atlas_source_id_override[/code] is not -1, also set its source ID. Otherwise, a unique identifier is automatically generated.
+				Adds a [TileSetSource] to the TileSet. If [param atlas_source_id_override] is not -1, also set its source ID. Otherwise, a unique identifier is automatically generated.
 				The function returns the added source source ID or -1 if the source could not be added.
 			</description>
 		</method>
 		<method name="add_terrain">
 			<return type="void" />
-			<argument index="0" name="terrain_set" type="int" />
-			<argument index="1" name="to_position" type="int" default="-1" />
+			<param index="0" name="terrain_set" type="int" />
+			<param index="1" name="to_position" type="int" default="-1" />
 			<description>
-				Adds a new terrain to the given terrain set [code]terrain_set[/code] at the given position [code]to_position[/code] in the array. If [code]to_position[/code] is -1, adds it at the end of the array.
+				Adds a new terrain to the given terrain set [param terrain_set] at the given position [param to_position] in the array. If [param to_position] is -1, adds it at the end of the array.
 			</description>
 		</method>
 		<method name="add_terrain_set">
 			<return type="void" />
-			<argument index="0" name="to_position" type="int" default="-1" />
+			<param index="0" name="to_position" type="int" default="-1" />
 			<description>
-				Adds a new terrain set at the given position [code]to_position[/code] in the array. If [code]to_position[/code] is -1, adds it at the end of the array.
+				Adds a new terrain set at the given position [param to_position] in the array. If [param to_position] is -1, adds it at the end of the array.
 			</description>
 		</method>
 		<method name="cleanup_invalid_tile_proxies">
@@ -100,9 +100,9 @@
 		</method>
 		<method name="get_alternative_level_tile_proxy">
 			<return type="Array" />
-			<argument index="0" name="source_from" type="int" />
-			<argument index="1" name="coords_from" type="Vector2i" />
-			<argument index="2" name="alternative_from" type="int" />
+			<param index="0" name="source_from" type="int" />
+			<param index="1" name="coords_from" type="Vector2i" />
+			<param index="2" name="alternative_from" type="int" />
 			<description>
 				Returns the alternative-level proxy for the given identifiers. The returned array contains the three proxie's target identifiers (source ID, atlas coords ID and alternative tile ID).
 				If the TileSet has no proxy for the given identifiers, returns an empty Array.
@@ -110,8 +110,8 @@
 		</method>
 		<method name="get_coords_level_tile_proxy">
 			<return type="Array" />
-			<argument index="0" name="source_from" type="int" />
-			<argument index="1" name="coords_from" type="Vector2i" />
+			<param index="0" name="source_from" type="int" />
+			<param index="1" name="coords_from" type="Vector2i" />
 			<description>
 				Returns the coordinate-level proxy for the given identifiers. The returned array contains the two target identifiers of the proxy (source ID and atlas coordinates ID).
 				If the TileSet has no proxy for the given identifiers, returns an empty Array.
@@ -119,21 +119,21 @@
 		</method>
 		<method name="get_custom_data_layer_by_name" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="layer_name" type="String" />
+			<param index="0" name="layer_name" type="String" />
 			<description>
 				Returns the index of the custom data layer identified by the given name.
 			</description>
 		</method>
 		<method name="get_custom_data_layer_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="layer_index" type="int" />
+			<param index="0" name="layer_index" type="int" />
 			<description>
 				Returns the name of the custom data layer identified by the given index.
 			</description>
 		</method>
 		<method name="get_custom_data_layer_type" qualifiers="const">
 			<return type="int" enum="Variant.Type" />
-			<argument index="0" name="layer_index" type="int" />
+			<param index="0" name="layer_index" type="int" />
 			<description>
 				Returns the type of the custom data layer identified by the given index.
 			</description>
@@ -146,7 +146,7 @@
 		</method>
 		<method name="get_navigation_layer_layers" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="layer_index" type="int" />
+			<param index="0" name="layer_index" type="int" />
 			<description>
 				Returns the navigation layers (as in the Navigation server) of the gives TileSet navigation layer.
 			</description>
@@ -165,14 +165,14 @@
 		</method>
 		<method name="get_occlusion_layer_light_mask" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="layer_index" type="int" />
+			<param index="0" name="layer_index" type="int" />
 			<description>
 				Returns the light mask of the occlusion layer.
 			</description>
 		</method>
 		<method name="get_occlusion_layer_sdf_collision" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_index" type="int" />
+			<param index="0" name="layer_index" type="int" />
 			<description>
 				Returns if the occluders from this layer use [code]sdf_collision[/code].
 			</description>
@@ -185,9 +185,9 @@
 		</method>
 		<method name="get_pattern">
 			<return type="TileMapPattern" />
-			<argument index="0" name="index" type="int" default="-1" />
+			<param index="0" name="index" type="int" default="-1" />
 			<description>
-				Returns the [TileMapPattern] at the given [code]index[/code].
+				Returns the [TileMapPattern] at the given [param index].
 			</description>
 		</method>
 		<method name="get_patterns_count">
@@ -198,21 +198,21 @@
 		</method>
 		<method name="get_physics_layer_collision_layer" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="layer_index" type="int" />
+			<param index="0" name="layer_index" type="int" />
 			<description>
 				Returns the collision layer (as in the physics server) bodies on the given TileSet's physics layer are in.
 			</description>
 		</method>
 		<method name="get_physics_layer_collision_mask" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="layer_index" type="int" />
+			<param index="0" name="layer_index" type="int" />
 			<description>
 				Returns the collision mask of bodies on the given TileSet's physics layer.
 			</description>
 		</method>
 		<method name="get_physics_layer_physics_material" qualifiers="const">
 			<return type="PhysicsMaterial" />
-			<argument index="0" name="layer_index" type="int" />
+			<param index="0" name="layer_index" type="int" />
 			<description>
 				Returns the physics material of bodies on the given TileSet's physics layer.
 			</description>
@@ -225,9 +225,9 @@
 		</method>
 		<method name="get_source" qualifiers="const">
 			<return type="TileSetSource" />
-			<argument index="0" name="source_id" type="int" />
+			<param index="0" name="source_id" type="int" />
 			<description>
-				Returns the [TileSetSource] with ID [code]source_id[/code].
+				Returns the [TileSetSource] with ID [param source_id].
 			</description>
 		</method>
 		<method name="get_source_count" qualifiers="const">
@@ -238,14 +238,14 @@
 		</method>
 		<method name="get_source_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the source ID for source with index [code]index[/code].
+				Returns the source ID for source with index [param index].
 			</description>
 		</method>
 		<method name="get_source_level_tile_proxy">
 			<return type="int" />
-			<argument index="0" name="source_from" type="int" />
+			<param index="0" name="source_from" type="int" />
 			<description>
 				Returns the source-level proxy for the given source identifier.
 				If the TileSet has no proxy for the given identifier, returns -1.
@@ -253,23 +253,23 @@
 		</method>
 		<method name="get_terrain_color" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="terrain_set" type="int" />
-			<argument index="1" name="terrain_index" type="int" />
+			<param index="0" name="terrain_set" type="int" />
+			<param index="1" name="terrain_index" type="int" />
 			<description>
 				Returns a terrain's color.
 			</description>
 		</method>
 		<method name="get_terrain_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="terrain_set" type="int" />
-			<argument index="1" name="terrain_index" type="int" />
+			<param index="0" name="terrain_set" type="int" />
+			<param index="1" name="terrain_index" type="int" />
 			<description>
 				Returns a terrain's name.
 			</description>
 		</method>
 		<method name="get_terrain_set_mode" qualifiers="const">
 			<return type="int" enum="TileSet.TerrainMode" />
-			<argument index="0" name="terrain_set" type="int" />
+			<param index="0" name="terrain_set" type="int" />
 			<description>
 				Returns a terrain set mode.
 			</description>
@@ -282,47 +282,47 @@
 		</method>
 		<method name="get_terrains_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="terrain_set" type="int" />
+			<param index="0" name="terrain_set" type="int" />
 			<description>
 				Returns the number of terrains in the given terrain set.
 			</description>
 		</method>
 		<method name="has_alternative_level_tile_proxy">
 			<return type="bool" />
-			<argument index="0" name="source_from" type="int" />
-			<argument index="1" name="coords_from" type="Vector2i" />
-			<argument index="2" name="alternative_from" type="int" />
+			<param index="0" name="source_from" type="int" />
+			<param index="1" name="coords_from" type="Vector2i" />
+			<param index="2" name="alternative_from" type="int" />
 			<description>
 				Returns if there is and alternative-level proxy for the given identifiers.
 			</description>
 		</method>
 		<method name="has_coords_level_tile_proxy">
 			<return type="bool" />
-			<argument index="0" name="source_from" type="int" />
-			<argument index="1" name="coords_from" type="Vector2i" />
+			<param index="0" name="source_from" type="int" />
+			<param index="1" name="coords_from" type="Vector2i" />
 			<description>
 				Returns if there is a coodinates-level proxy for the given identifiers.
 			</description>
 		</method>
 		<method name="has_source" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="source_id" type="int" />
+			<param index="0" name="source_id" type="int" />
 			<description>
 				Returns if this TileSet has a source for the given source ID.
 			</description>
 		</method>
 		<method name="has_source_level_tile_proxy">
 			<return type="bool" />
-			<argument index="0" name="source_from" type="int" />
+			<param index="0" name="source_from" type="int" />
 			<description>
 				Returns if there is a source-level proxy for the given source ID.
 			</description>
 		</method>
 		<method name="map_tile_proxy" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="source_from" type="int" />
-			<argument index="1" name="coords_from" type="Vector2i" />
-			<argument index="2" name="alternative_from" type="int" />
+			<param index="0" name="source_from" type="int" />
+			<param index="1" name="coords_from" type="Vector2i" />
+			<param index="2" name="alternative_from" type="int" />
 			<description>
 				According to the configured proxies, maps the provided indentifiers to a new set of identifiers. The source ID, atlas coordinates ID and alternative tile ID are returned as a 3 elements Array.
 				This function first look for matching alternative-level proxies, then coordinates-level proxies, then source-level proxies.
@@ -331,142 +331,142 @@
 		</method>
 		<method name="move_custom_data_layer">
 			<return type="void" />
-			<argument index="0" name="layer_index" type="int" />
-			<argument index="1" name="to_position" type="int" />
+			<param index="0" name="layer_index" type="int" />
+			<param index="1" name="to_position" type="int" />
 			<description>
-				Moves the custom data layer at index [code]layer_index[/code] to the given position [code]to_position[/code] in the array. Also updates the atlas tiles accordingly.
+				Moves the custom data layer at index [param layer_index] to the given position [param to_position] in the array. Also updates the atlas tiles accordingly.
 			</description>
 		</method>
 		<method name="move_navigation_layer">
 			<return type="void" />
-			<argument index="0" name="layer_index" type="int" />
-			<argument index="1" name="to_position" type="int" />
+			<param index="0" name="layer_index" type="int" />
+			<param index="1" name="to_position" type="int" />
 			<description>
-				Moves the navigation layer at index [code]layer_index[/code] to the given position [code]to_position[/code] in the array. Also updates the atlas tiles accordingly.
+				Moves the navigation layer at index [param layer_index] to the given position [param to_position] in the array. Also updates the atlas tiles accordingly.
 			</description>
 		</method>
 		<method name="move_occlusion_layer">
 			<return type="void" />
-			<argument index="0" name="layer_index" type="int" />
-			<argument index="1" name="to_position" type="int" />
+			<param index="0" name="layer_index" type="int" />
+			<param index="1" name="to_position" type="int" />
 			<description>
-				Moves the occlusion layer at index [code]layer_index[/code] to the given position [code]to_position[/code] in the array. Also updates the atlas tiles accordingly.
+				Moves the occlusion layer at index [param layer_index] to the given position [param to_position] in the array. Also updates the atlas tiles accordingly.
 			</description>
 		</method>
 		<method name="move_physics_layer">
 			<return type="void" />
-			<argument index="0" name="layer_index" type="int" />
-			<argument index="1" name="to_position" type="int" />
+			<param index="0" name="layer_index" type="int" />
+			<param index="1" name="to_position" type="int" />
 			<description>
-				Moves the physics layer at index [code]layer_index[/code] to the given position [code]to_position[/code] in the array. Also updates the atlas tiles accordingly.
+				Moves the physics layer at index [param layer_index] to the given position [param to_position] in the array. Also updates the atlas tiles accordingly.
 			</description>
 		</method>
 		<method name="move_terrain">
 			<return type="void" />
-			<argument index="0" name="terrain_set" type="int" />
-			<argument index="1" name="terrain_index" type="int" />
-			<argument index="2" name="to_position" type="int" />
+			<param index="0" name="terrain_set" type="int" />
+			<param index="1" name="terrain_index" type="int" />
+			<param index="2" name="to_position" type="int" />
 			<description>
-				Moves the terrain at index [code]terrain_index[/code] for terrain set [code]terrain_set[/code] to the given position [code]to_position[/code] in the array. Also updates the atlas tiles accordingly.
+				Moves the terrain at index [param terrain_index] for terrain set [param terrain_set] to the given position [param to_position] in the array. Also updates the atlas tiles accordingly.
 			</description>
 		</method>
 		<method name="move_terrain_set">
 			<return type="void" />
-			<argument index="0" name="terrain_set" type="int" />
-			<argument index="1" name="to_position" type="int" />
+			<param index="0" name="terrain_set" type="int" />
+			<param index="1" name="to_position" type="int" />
 			<description>
-				Moves the terrain set at index [code]terrain_set[/code] to the given position [code]to_position[/code] in the array. Also updates the atlas tiles accordingly.
+				Moves the terrain set at index [param terrain_set] to the given position [param to_position] in the array. Also updates the atlas tiles accordingly.
 			</description>
 		</method>
 		<method name="remove_alternative_level_tile_proxy">
 			<return type="void" />
-			<argument index="0" name="source_from" type="int" />
-			<argument index="1" name="coords_from" type="Vector2i" />
-			<argument index="2" name="alternative_from" type="int" />
+			<param index="0" name="source_from" type="int" />
+			<param index="1" name="coords_from" type="Vector2i" />
+			<param index="2" name="alternative_from" type="int" />
 			<description>
 				Removes an alternative-level proxy for the given identifiers.
 			</description>
 		</method>
 		<method name="remove_coords_level_tile_proxy">
 			<return type="void" />
-			<argument index="0" name="source_from" type="int" />
-			<argument index="1" name="coords_from" type="Vector2i" />
+			<param index="0" name="source_from" type="int" />
+			<param index="1" name="coords_from" type="Vector2i" />
 			<description>
 				Removes a coordinates-level proxy for the given identifiers.
 			</description>
 		</method>
 		<method name="remove_custom_data_layer">
 			<return type="void" />
-			<argument index="0" name="layer_index" type="int" />
+			<param index="0" name="layer_index" type="int" />
 			<description>
-				Removes the custom data layer at index [code]layer_index[/code]. Also updates the atlas tiles accordingly.
+				Removes the custom data layer at index [param layer_index]. Also updates the atlas tiles accordingly.
 			</description>
 		</method>
 		<method name="remove_navigation_layer">
 			<return type="void" />
-			<argument index="0" name="layer_index" type="int" />
+			<param index="0" name="layer_index" type="int" />
 			<description>
-				Removes the navigation layer at index [code]layer_index[/code]. Also updates the atlas tiles accordingly.
+				Removes the navigation layer at index [param layer_index]. Also updates the atlas tiles accordingly.
 			</description>
 		</method>
 		<method name="remove_occlusion_layer">
 			<return type="void" />
-			<argument index="0" name="layer_index" type="int" />
+			<param index="0" name="layer_index" type="int" />
 			<description>
-				Removes the occlusion layer at index [code]layer_index[/code]. Also updates the atlas tiles accordingly.
+				Removes the occlusion layer at index [param layer_index]. Also updates the atlas tiles accordingly.
 			</description>
 		</method>
 		<method name="remove_pattern">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Remove the [TileMapPattern] at the given index.
 			</description>
 		</method>
 		<method name="remove_physics_layer">
 			<return type="void" />
-			<argument index="0" name="layer_index" type="int" />
+			<param index="0" name="layer_index" type="int" />
 			<description>
-				Removes the physics layer at index [code]layer_index[/code]. Also updates the atlas tiles accordingly.
+				Removes the physics layer at index [param layer_index]. Also updates the atlas tiles accordingly.
 			</description>
 		</method>
 		<method name="remove_source">
 			<return type="void" />
-			<argument index="0" name="source_id" type="int" />
+			<param index="0" name="source_id" type="int" />
 			<description>
 				Removes the source with the given source ID.
 			</description>
 		</method>
 		<method name="remove_source_level_tile_proxy">
 			<return type="void" />
-			<argument index="0" name="source_from" type="int" />
+			<param index="0" name="source_from" type="int" />
 			<description>
 				Removes a source-level tile proxy.
 			</description>
 		</method>
 		<method name="remove_terrain">
 			<return type="void" />
-			<argument index="0" name="terrain_set" type="int" />
-			<argument index="1" name="terrain_index" type="int" />
+			<param index="0" name="terrain_set" type="int" />
+			<param index="1" name="terrain_index" type="int" />
 			<description>
-				Removes the terrain at index [code]terrain_index[/code] in the given terrain set [code]terrain_set[/code]. Also updates the atlas tiles accordingly.
+				Removes the terrain at index [param terrain_index] in the given terrain set [param terrain_set]. Also updates the atlas tiles accordingly.
 			</description>
 		</method>
 		<method name="remove_terrain_set">
 			<return type="void" />
-			<argument index="0" name="terrain_set" type="int" />
+			<param index="0" name="terrain_set" type="int" />
 			<description>
-				Removes the terrain set at index [code]terrain_set[/code]. Also updates the atlas tiles accordingly.
+				Removes the terrain set at index [param terrain_set]. Also updates the atlas tiles accordingly.
 			</description>
 		</method>
 		<method name="set_alternative_level_tile_proxy">
 			<return type="void" />
-			<argument index="0" name="source_from" type="int" />
-			<argument index="1" name="coords_from" type="Vector2i" />
-			<argument index="2" name="alternative_from" type="int" />
-			<argument index="3" name="source_to" type="int" />
-			<argument index="4" name="coords_to" type="Vector2i" />
-			<argument index="5" name="alternative_to" type="int" />
+			<param index="0" name="source_from" type="int" />
+			<param index="1" name="coords_from" type="Vector2i" />
+			<param index="2" name="alternative_from" type="int" />
+			<param index="3" name="source_to" type="int" />
+			<param index="4" name="coords_to" type="Vector2i" />
+			<param index="5" name="alternative_to" type="int" />
 			<description>
 				Create an alternative-level proxy for the given identifiers. A proxy will map set of tile identifiers to another set of identifiers.
 				This can be used to replace a tile in all TileMaps using this TileSet, as TileMap nodes will find and use the proxy's target tile when one is available.
@@ -475,10 +475,10 @@
 		</method>
 		<method name="set_coords_level_tile_proxy">
 			<return type="void" />
-			<argument index="0" name="p_source_from" type="int" />
-			<argument index="1" name="coords_from" type="Vector2i" />
-			<argument index="2" name="source_to" type="int" />
-			<argument index="3" name="coords_to" type="Vector2i" />
+			<param index="0" name="p_source_from" type="int" />
+			<param index="1" name="coords_from" type="Vector2i" />
+			<param index="2" name="source_to" type="int" />
+			<param index="3" name="coords_to" type="Vector2i" />
 			<description>
 				Creates a coordinates-level proxy for the given identifiers. A proxy will map set of tile identifiers to another set of identifiers. The alternative tile ID is kept the same when using coordinates-level proxies.
 				This can be used to replace a tile in all TileMaps using this TileSet, as TileMap nodes will find and use the proxy's target tile when one is available.
@@ -487,80 +487,80 @@
 		</method>
 		<method name="set_custom_data_layer_name">
 			<return type="void" />
-			<argument index="0" name="layer_index" type="int" />
-			<argument index="1" name="layer_name" type="String" />
+			<param index="0" name="layer_index" type="int" />
+			<param index="1" name="layer_name" type="String" />
 			<description>
 				Sets the name of the custom data layer identified by the given index. Names are identifiers of the layer therefore if the name is already taken it will fail and raise an error.
 			</description>
 		</method>
 		<method name="set_custom_data_layer_type">
 			<return type="void" />
-			<argument index="0" name="layer_index" type="int" />
-			<argument index="1" name="layer_type" type="int" enum="Variant.Type" />
+			<param index="0" name="layer_index" type="int" />
+			<param index="1" name="layer_type" type="int" enum="Variant.Type" />
 			<description>
 				Sets the type of the custom data layer identified by the given index.
 			</description>
 		</method>
 		<method name="set_navigation_layer_layers">
 			<return type="void" />
-			<argument index="0" name="layer_index" type="int" />
-			<argument index="1" name="layers" type="int" />
+			<param index="0" name="layer_index" type="int" />
+			<param index="1" name="layers" type="int" />
 			<description>
 				Sets the navigation layers (as in the navigation server) for navigation regions is the given TileSet navigation layer.
 			</description>
 		</method>
 		<method name="set_occlusion_layer_light_mask">
 			<return type="void" />
-			<argument index="0" name="layer_index" type="int" />
-			<argument index="1" name="light_mask" type="int" />
+			<param index="0" name="layer_index" type="int" />
+			<param index="1" name="light_mask" type="int" />
 			<description>
 				Sets the occlusion layer (as in the rendering server) for occluders in the given TileSet occlusion layer.
 			</description>
 		</method>
 		<method name="set_occlusion_layer_sdf_collision">
 			<return type="void" />
-			<argument index="0" name="layer_index" type="int" />
-			<argument index="1" name="sdf_collision" type="bool" />
+			<param index="0" name="layer_index" type="int" />
+			<param index="1" name="sdf_collision" type="bool" />
 			<description>
 				Enables or disables sdf collision for occluders in the given TileSet occlusion layer.
 			</description>
 		</method>
 		<method name="set_physics_layer_collision_layer">
 			<return type="void" />
-			<argument index="0" name="layer_index" type="int" />
-			<argument index="1" name="layer" type="int" />
+			<param index="0" name="layer_index" type="int" />
+			<param index="1" name="layer" type="int" />
 			<description>
 				Sets the physics layer (as in the physics server) for bodies in the given TileSet physics layer.
 			</description>
 		</method>
 		<method name="set_physics_layer_collision_mask">
 			<return type="void" />
-			<argument index="0" name="layer_index" type="int" />
-			<argument index="1" name="mask" type="int" />
+			<param index="0" name="layer_index" type="int" />
+			<param index="1" name="mask" type="int" />
 			<description>
 				Sets the physics layer (as in the physics server) for bodies in the given TileSet physics layer.
 			</description>
 		</method>
 		<method name="set_physics_layer_physics_material">
 			<return type="void" />
-			<argument index="0" name="layer_index" type="int" />
-			<argument index="1" name="physics_material" type="PhysicsMaterial" />
+			<param index="0" name="layer_index" type="int" />
+			<param index="1" name="physics_material" type="PhysicsMaterial" />
 			<description>
 				Sets the physics material for bodies in the given TileSet physics layer.
 			</description>
 		</method>
 		<method name="set_source_id">
 			<return type="void" />
-			<argument index="0" name="source_id" type="int" />
-			<argument index="1" name="new_source_id" type="int" />
+			<param index="0" name="source_id" type="int" />
+			<param index="1" name="new_source_id" type="int" />
 			<description>
 				Changes a source's ID.
 			</description>
 		</method>
 		<method name="set_source_level_tile_proxy">
 			<return type="void" />
-			<argument index="0" name="source_from" type="int" />
-			<argument index="1" name="source_to" type="int" />
+			<param index="0" name="source_from" type="int" />
+			<param index="1" name="source_to" type="int" />
 			<description>
 				Creates a source-level proxy for the given source ID. A proxy will map set of tile identifiers to another set of identifiers. Both the atlac coordinates ID and the alternative tile ID are kept the same when using source-level proxies.
 				This can be used to replace a source in all TileMaps using this TileSet, as TileMap nodes will find and use the proxy's target source when one is available.
@@ -569,26 +569,26 @@
 		</method>
 		<method name="set_terrain_color">
 			<return type="void" />
-			<argument index="0" name="terrain_set" type="int" />
-			<argument index="1" name="terrain_index" type="int" />
-			<argument index="2" name="color" type="Color" />
+			<param index="0" name="terrain_set" type="int" />
+			<param index="1" name="terrain_index" type="int" />
+			<param index="2" name="color" type="Color" />
 			<description>
 				Sets a terrain's color. This color is used for identifying the different terrains in the TileSet editor.
 			</description>
 		</method>
 		<method name="set_terrain_name">
 			<return type="void" />
-			<argument index="0" name="terrain_set" type="int" />
-			<argument index="1" name="terrain_index" type="int" />
-			<argument index="2" name="name" type="String" />
+			<param index="0" name="terrain_set" type="int" />
+			<param index="1" name="terrain_index" type="int" />
+			<param index="2" name="name" type="String" />
 			<description>
 				Sets a terrain's name.
 			</description>
 		</method>
 		<method name="set_terrain_set_mode">
 			<return type="void" />
-			<argument index="0" name="terrain_set" type="int" />
-			<argument index="1" name="mode" type="int" enum="TileSet.TerrainMode" />
+			<param index="0" name="terrain_set" type="int" />
+			<param index="1" name="mode" type="int" enum="TileSet.TerrainMode" />
 			<description>
 				Sets a terrain mode. Each mode determines which bits of a tile shape is used to match the neighbouring tiles' terrains.
 			</description>
diff --git a/doc/classes/TileSetAtlasSource.xml b/doc/classes/TileSetAtlasSource.xml
index db4e52f661..df469cd030 100644
--- a/doc/classes/TileSetAtlasSource.xml
+++ b/doc/classes/TileSetAtlasSource.xml
@@ -17,19 +17,19 @@
 	<methods>
 		<method name="create_alternative_tile">
 			<return type="int" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
-			<argument index="1" name="alternative_id_override" type="int" default="-1" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
+			<param index="1" name="alternative_id_override" type="int" default="-1" />
 			<description>
-				Creates an alternative tile for the tile at coords [code]atlas_coords[/code]. If [code]alternative_id_override[/code] is -1, give it an automatically generated unique ID, or assigns it the given ID otherwise.
-				Returns the new alternative identifier, or -1 if the alternative could not be created with a provided [code]alternative_id_override[/code].
+				Creates an alternative tile for the tile at coordinates [param atlas_coords]. If [param alternative_id_override] is -1, give it an automatically generated unique ID, or assigns it the given ID otherwise.
+				Returns the new alternative identifier, or -1 if the alternative could not be created with a provided [param alternative_id_override].
 			</description>
 		</method>
 		<method name="create_tile">
 			<return type="void" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
-			<argument index="1" name="size" type="Vector2i" default="Vector2i(1, 1)" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
+			<param index="1" name="size" type="Vector2i" default="Vector2i(1, 1)" />
 			<description>
-				Creates a new tile at coords [code]atlas_coords[/code] with size [code]size[/code].
+				Creates a new tile at coordinates [param atlas_coords] with the given [param size].
 			</description>
 		</method>
 		<method name="get_atlas_grid_size" qualifiers="const">
@@ -40,7 +40,7 @@
 		</method>
 		<method name="get_next_alternative_tile_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
 			<description>
 				Returns the alternative ID a following call to [method create_alternative_tile] would return.
 			</description>
@@ -53,184 +53,184 @@
 		</method>
 		<method name="get_runtime_tile_texture_region" qualifiers="const">
 			<return type="Rect2i" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
-			<argument index="1" name="frame" type="int" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
+			<param index="1" name="frame" type="int" />
 			<description>
-				Returns the region of the tile at coordinates [code]atlas_coords[/code] for frame [code]frame[/code] inside the texture returned by [method get_runtime_texture].
+				Returns the region of the tile at coordinates [param atlas_coords] for the given [param frame] inside the texture returned by [method get_runtime_texture].
 				[b]Note:[/b] If [member use_texture_padding] is [code]false[/code], returns the same as [method get_tile_texture_region].
 			</description>
 		</method>
 		<method name="get_tile_animation_columns" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
 			<description>
-				Returns how many columns the tile at [code]atlas_coords[/code] has in its animation layout.
+				Returns how many columns the tile at [param atlas_coords] has in its animation layout.
 			</description>
 		</method>
 		<method name="get_tile_animation_frame_duration" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
-			<argument index="1" name="frame_index" type="int" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
+			<param index="1" name="frame_index" type="int" />
 			<description>
-				Returns the animation frame duration of frame [code]frame_index[/code] for the tile at coordinates [code]atlas_coords[/code].
+				Returns the animation frame duration of frame [param frame_index] for the tile at coordinates [param atlas_coords].
 			</description>
 		</method>
 		<method name="get_tile_animation_frames_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
 			<description>
-				Returns how many animation frames has the tile at coordinates [code]atlas_coords[/code].
+				Returns how many animation frames has the tile at coordinates [param atlas_coords].
 			</description>
 		</method>
 		<method name="get_tile_animation_separation" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
 			<description>
-				Returns the separation (as in the atlas grid) between each frame of an animated tile at coordinates [code]atlas_coords[/code].
+				Returns the separation (as in the atlas grid) between each frame of an animated tile at coordinates [param atlas_coords].
 			</description>
 		</method>
 		<method name="get_tile_animation_speed" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
 			<description>
-				Returns the animation speed of the tile at coordinates [code]atlas_coords[/code].
+				Returns the animation speed of the tile at coordinates [param atlas_coords].
 			</description>
 		</method>
 		<method name="get_tile_animation_total_duration" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
 			<description>
-				Returns the sum of the sum of the frame durations of the tile at coordinates [code]atlas_coords[/code]. This value needs to be divided by the animation speed to get the actual animation loop duration.
+				Returns the sum of the sum of the frame durations of the tile at coordinates [param atlas_coords]. This value needs to be divided by the animation speed to get the actual animation loop duration.
 			</description>
 		</method>
 		<method name="get_tile_at_coords" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
 			<description>
-				If there is a tile covering the [code]atlas_coords[/code] coordinates, returns the top-left coordinates of the tile (thus its coordinate ID). Returns [code]Vector2i(-1, -1)[/code] otherwise.
+				If there is a tile covering the [param atlas_coords] coordinates, returns the top-left coordinates of the tile (thus its coordinate ID). Returns [code]Vector2i(-1, -1)[/code] otherwise.
 			</description>
 		</method>
 		<method name="get_tile_data" qualifiers="const">
 			<return type="TileData" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
-			<argument index="1" name="alternative_tile" type="int" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
+			<param index="1" name="alternative_tile" type="int" />
 			<description>
 				Returns the [TileData] object for the given atlas coordinates and alternative ID.
 			</description>
 		</method>
 		<method name="get_tile_size_in_atlas" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
 			<description>
-				Returns the size of the tile (in the grid coordinates system) at coordinates [code]atlas_coords[/code].
+				Returns the size of the tile (in the grid coordinates system) at coordinates [param atlas_coords].
 			</description>
 		</method>
 		<method name="get_tile_texture_region" qualifiers="const">
 			<return type="Rect2i" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
-			<argument index="1" name="frame" type="int" default="0" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
+			<param index="1" name="frame" type="int" default="0" />
 			<description>
-				Returns a tile's texture region in the atlas texture. For animated tiles, a [code]frame[/code] argument might be provided for the different frames of the animation.
+				Returns a tile's texture region in the atlas texture. For animated tiles, a [param frame] argument might be provided for the different frames of the animation.
 			</description>
 		</method>
 		<method name="get_tiles_to_be_removed_on_change">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="texture" type="Texture2D" />
-			<argument index="1" name="margins" type="Vector2i" />
-			<argument index="2" name="separation" type="Vector2i" />
-			<argument index="3" name="texture_region_size" type="Vector2i" />
+			<param index="0" name="texture" type="Texture2D" />
+			<param index="1" name="margins" type="Vector2i" />
+			<param index="2" name="separation" type="Vector2i" />
+			<param index="3" name="texture_region_size" type="Vector2i" />
 			<description>
-				Returns an array of tiles coordinates ID that will be automatically removed when modifying one or several of those properties: [code]texture[/code], [code]margins[/code], [code]separation[/code] or [code]texture_region_size[/code]. This can be used to undo changes that would have caused tiles data loss.
+				Returns an array of tiles coordinates ID that will be automatically removed when modifying one or several of those properties: [param texture], [param margins], [param separation] or [param texture_region_size]. This can be used to undo changes that would have caused tiles data loss.
 			</description>
 		</method>
 		<method name="has_room_for_tile" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
-			<argument index="1" name="size" type="Vector2i" />
-			<argument index="2" name="animation_columns" type="int" />
-			<argument index="3" name="animation_separation" type="Vector2i" />
-			<argument index="4" name="frames_count" type="int" />
-			<argument index="5" name="ignored_tile" type="Vector2i" default="Vector2i(-1, -1)" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
+			<param index="1" name="size" type="Vector2i" />
+			<param index="2" name="animation_columns" type="int" />
+			<param index="3" name="animation_separation" type="Vector2i" />
+			<param index="4" name="frames_count" type="int" />
+			<param index="5" name="ignored_tile" type="Vector2i" default="Vector2i(-1, -1)" />
 			<description>
-				Returns whether there is enough room in an atlas to create/modify a tile with the given properties. If [code]ignored_tile[/code] is provided, act as is the given tile was not present in the atlas. This may be used when you want to modify a tile's properties.
+				Returns whether there is enough room in an atlas to create/modify a tile with the given properties. If [param ignored_tile] is provided, act as is the given tile was not present in the atlas. This may be used when you want to modify a tile's properties.
 			</description>
 		</method>
 		<method name="move_tile_in_atlas">
 			<return type="void" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
-			<argument index="1" name="new_atlas_coords" type="Vector2i" default="Vector2i(-1, -1)" />
-			<argument index="2" name="new_size" type="Vector2i" default="Vector2i(-1, -1)" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
+			<param index="1" name="new_atlas_coords" type="Vector2i" default="Vector2i(-1, -1)" />
+			<param index="2" name="new_size" type="Vector2i" default="Vector2i(-1, -1)" />
 			<description>
-				Move the tile and its alternatives at the [code]atlas_coords[/code] coordinates to the [code]new_atlas_coords[/code] coordinates with the [code]new_size[/code] size. This functions will fail if a tile is already present in the given area.
-				If [code]new_atlas_coords[/code] is [code]Vector2i(-1, -1)[/code], keeps the tile's coordinates. If [code]new_size[/code] is [code]Vector2i(-1, -1)[/code], keeps the tile's size.
+				Move the tile and its alternatives at the [param atlas_coords] coordinates to the [param new_atlas_coords] coordinates with the [param new_size] size. This functions will fail if a tile is already present in the given area.
+				If [param new_atlas_coords] is [code]Vector2i(-1, -1)[/code], keeps the tile's coordinates. If [param new_size] is [code]Vector2i(-1, -1)[/code], keeps the tile's size.
 				To avoid an error, first check if a move is possible using [method has_room_for_tile].
 			</description>
 		</method>
 		<method name="remove_alternative_tile">
 			<return type="void" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
-			<argument index="1" name="alternative_tile" type="int" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
+			<param index="1" name="alternative_tile" type="int" />
 			<description>
-				Remove a tile's alternative with alternative ID [code]alternative_tile[/code].
-				Calling this function with [code]alternative_tile[/code] equals to 0 will fail, as the base tile alternative cannot be removed.
+				Remove a tile's alternative with alternative ID [param alternative_tile].
+				Calling this function with [param alternative_tile] equals to 0 will fail, as the base tile alternative cannot be removed.
 			</description>
 		</method>
 		<method name="remove_tile">
 			<return type="void" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
 			<description>
-				Remove a tile and its alternative at coordinates [code]atlas_coords[/code].
+				Remove a tile and its alternative at coordinates [param atlas_coords].
 			</description>
 		</method>
 		<method name="set_alternative_tile_id">
 			<return type="void" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
-			<argument index="1" name="alternative_tile" type="int" />
-			<argument index="2" name="new_id" type="int" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
+			<param index="1" name="alternative_tile" type="int" />
+			<param index="2" name="new_id" type="int" />
 			<description>
-				Change a tile's alternative ID from [code]alternative_tile[/code] to [code]new_id[/code].
-				Calling this function with [code]alternative_id[/code] equals to 0 will fail, as the base tile alternative cannot be moved.
+				Change a tile's alternative ID from [param alternative_tile] to [param new_id].
+				Calling this function with [param new_id] of 0 will fail, as the base tile alternative cannot be moved.
 			</description>
 		</method>
 		<method name="set_tile_animation_columns">
 			<return type="void" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
-			<argument index="1" name="frame_columns" type="int" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
+			<param index="1" name="frame_columns" type="int" />
 			<description>
-				Sets the number of columns in the animation layout of the tile at coordinates [code]atlas_coords[/code]. If set to 0, then the different frames of the animation are laid out as a single horizontal line in the atlas.
+				Sets the number of columns in the animation layout of the tile at coordinates [param atlas_coords]. If set to 0, then the different frames of the animation are laid out as a single horizontal line in the atlas.
 			</description>
 		</method>
 		<method name="set_tile_animation_frame_duration">
 			<return type="void" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
-			<argument index="1" name="frame_index" type="int" />
-			<argument index="2" name="duration" type="float" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
+			<param index="1" name="frame_index" type="int" />
+			<param index="2" name="duration" type="float" />
 			<description>
-				Sets the animation frame duration of frame [code]frame_index[/code] for the tile at coordinates [code]atlas_coords[/code].
+				Sets the animation frame [param duration] of frame [param frame_index] for the tile at coordinates [param atlas_coords].
 			</description>
 		</method>
 		<method name="set_tile_animation_frames_count">
 			<return type="void" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
-			<argument index="1" name="frames_count" type="int" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
+			<param index="1" name="frames_count" type="int" />
 			<description>
-				Sets how many animation frames the tile at coordinates [code]atlas_coords[/code] has.
+				Sets how many animation frames the tile at coordinates [param atlas_coords] has.
 			</description>
 		</method>
 		<method name="set_tile_animation_separation">
 			<return type="void" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
-			<argument index="1" name="separation" type="Vector2i" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
+			<param index="1" name="separation" type="Vector2i" />
 			<description>
-				Sets the margin (in grid tiles) between each tile in the animation layout of the tile at coordinates [code]atlas_coords[/code] has.
+				Sets the margin (in grid tiles) between each tile in the animation layout of the tile at coordinates [param atlas_coords] has.
 			</description>
 		</method>
 		<method name="set_tile_animation_speed">
 			<return type="void" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
-			<argument index="1" name="speed" type="float" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
+			<param index="1" name="speed" type="float" />
 			<description>
-				Sets the animation speed of the tile at coordinates [code]atlas_coords[/code] has.
+				Sets the animation speed of the tile at coordinates [param atlas_coords] has.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/TileSetScenesCollectionSource.xml b/doc/classes/TileSetScenesCollectionSource.xml
index a8ef253933..ec8fe2ad54 100644
--- a/doc/classes/TileSetScenesCollectionSource.xml
+++ b/doc/classes/TileSetScenesCollectionSource.xml
@@ -12,8 +12,8 @@
 	<methods>
 		<method name="create_scene_tile">
 			<return type="int" />
-			<argument index="0" name="packed_scene" type="PackedScene" />
-			<argument index="1" name="id_override" type="int" default="-1" />
+			<param index="0" name="packed_scene" type="PackedScene" />
+			<param index="1" name="id_override" type="int" default="-1" />
 			<description>
 				Creates a scene-based tile out of the given scene.
 				Returns a newly generated unique ID.
@@ -27,23 +27,23 @@
 		</method>
 		<method name="get_scene_tile_display_placeholder" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
-				Returns whether the scene tile with id [code]id[/code] displays a placeholder in the editor.
+				Returns whether the scene tile with [param id] displays a placeholder in the editor.
 			</description>
 		</method>
 		<method name="get_scene_tile_id">
 			<return type="int" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the scene tile ID of the scene tile at index [code]index[/code].
+				Returns the scene tile ID of the scene tile at [param index].
 			</description>
 		</method>
 		<method name="get_scene_tile_scene" qualifiers="const">
 			<return type="PackedScene" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
-				Returns the [PackedScene] resource of scene tile with id [code]id[/code].
+				Returns the [PackedScene] resource of scene tile with [param id].
 			</description>
 		</method>
 		<method name="get_scene_tiles_count">
@@ -54,40 +54,40 @@
 		</method>
 		<method name="has_scene_tile_id">
 			<return type="bool" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
-				Returns whether this TileSet source has a scene tile with id [code]id[/code].
+				Returns whether this TileSet source has a scene tile with [param id].
 			</description>
 		</method>
 		<method name="remove_scene_tile">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
-				Remove the scene tile with id [code]id[/code].
+				Remove the scene tile with [param id].
 			</description>
 		</method>
 		<method name="set_scene_tile_display_placeholder">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="display_placeholder" type="bool" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="display_placeholder" type="bool" />
 			<description>
-				Sets whether or not the scene tile with id [code]id[/code] should display a placeholder in the editor. This might be useful for scenes that are not visible.
+				Sets whether or not the scene tile with [param id] should display a placeholder in the editor. This might be useful for scenes that are not visible.
 			</description>
 		</method>
 		<method name="set_scene_tile_id">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="new_id" type="int" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="new_id" type="int" />
 			<description>
-				Changes a scene tile's ID from [code]id[/code] to [code]new_id[/code]. This will fail if there is already a tile with a ID equal to [code]new_id[/code].
+				Changes a scene tile's ID from [param id] to [param new_id]. This will fail if there is already a tile with a ID equal to [param new_id].
 			</description>
 		</method>
 		<method name="set_scene_tile_scene">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="packed_scene" type="PackedScene" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="packed_scene" type="PackedScene" />
 			<description>
-				Assigns a [PackedScene] resource to the scene tile with id [code]id[/code]. This will fail if the scene does not extend CanvasItem, as positioning properties are needed to place the scene on the TileMap.
+				Assigns a [PackedScene] resource to the scene tile with [param id]. This will fail if the scene does not extend CanvasItem, as positioning properties are needed to place the scene on the TileMap.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/TileSetSource.xml b/doc/classes/TileSetSource.xml
index 3d23975e37..e88e725bf4 100644
--- a/doc/classes/TileSetSource.xml
+++ b/doc/classes/TileSetSource.xml
@@ -15,26 +15,26 @@
 	<methods>
 		<method name="get_alternative_tile_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
-			<argument index="1" name="index" type="int" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
+			<param index="1" name="index" type="int" />
 			<description>
-				Returns the alternative ID for the tile with coordinates ID [code]atlas_coords[/code] at index [code]index[/code].
+				Returns the alternative ID for the tile with coordinates ID [param atlas_coords] at index [param index].
 			</description>
 		</method>
 		<method name="get_alternative_tiles_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
 			<description>
-				Returns the number of alternatives tiles for the coordinates ID [code]atlas_coords[/code].
+				Returns the number of alternatives tiles for the coordinates ID [param atlas_coords].
 				For [TileSetAtlasSource], this always return at least 1, as the base tile with ID 0 is always part of the alternatives list.
 				Returns -1 if there is not tile at the given coords.
 			</description>
 		</method>
 		<method name="get_tile_id" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Returns the tile coordinates ID of the tile with index [code]index[/code].
+				Returns the tile coordinates ID of the tile with index [param index].
 			</description>
 		</method>
 		<method name="get_tiles_count" qualifiers="const">
@@ -45,17 +45,17 @@
 		</method>
 		<method name="has_alternative_tile" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
-			<argument index="1" name="alternative_tile" type="int" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
+			<param index="1" name="alternative_tile" type="int" />
 			<description>
-				Returns if the base tile at coordinates [code]atlas_coords[/code] has an alternative with ID [code]alternative_tile[/code].
+				Returns if the base tile at coordinates [param atlas_coords] has an alternative with ID [param alternative_tile].
 			</description>
 		</method>
 		<method name="has_tile" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="atlas_coords" type="Vector2i" />
+			<param index="0" name="atlas_coords" type="Vector2i" />
 			<description>
-				Returns if this atlas has a tile with coordinates ID [code]atlas_coordinates[/code].
+				Returns if this atlas has a tile with coordinates ID [param atlas_coords].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/Time.xml b/doc/classes/Time.xml
index 5fc85c869b..cdbe30c444 100644
--- a/doc/classes/Time.xml
+++ b/doc/classes/Time.xml
@@ -15,54 +15,54 @@
 	<methods>
 		<method name="get_date_dict_from_system" qualifiers="const">
 			<return type="Dictionary" />
-			<argument index="0" name="utc" type="bool" default="false" />
+			<param index="0" name="utc" type="bool" default="false" />
 			<description>
 				Returns the current date as a dictionary of keys: [code]year[/code], [code]month[/code], [code]day[/code], [code]weekday[/code], and [code]dst[/code] (Daylight Savings Time).
-				The returned values are in the system's local time when [code]utc[/code] is false, otherwise they are in UTC.
+				The returned values are in the system's local time when [param utc] is [code]false[/code], otherwise they are in UTC.
 			</description>
 		</method>
 		<method name="get_date_dict_from_unix_time" qualifiers="const">
 			<return type="Dictionary" />
-			<argument index="0" name="unix_time_val" type="int" />
+			<param index="0" name="unix_time_val" type="int" />
 			<description>
 				Converts the given Unix timestamp to a dictionary of keys: [code]year[/code], [code]month[/code], [code]day[/code], and [code]weekday[/code].
 			</description>
 		</method>
 		<method name="get_date_string_from_system" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="utc" type="bool" default="false" />
+			<param index="0" name="utc" type="bool" default="false" />
 			<description>
 				Returns the current date as an ISO 8601 date string (YYYY-MM-DD).
-				The returned values are in the system's local time when [code]utc[/code] is false, otherwise they are in UTC.
+				The returned values are in the system's local time when [param utc] is [code]false[/code], otherwise they are in UTC.
 			</description>
 		</method>
 		<method name="get_date_string_from_unix_time" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="unix_time_val" type="int" />
+			<param index="0" name="unix_time_val" type="int" />
 			<description>
 				Converts the given Unix timestamp to an ISO 8601 date string (YYYY-MM-DD).
 			</description>
 		</method>
 		<method name="get_datetime_dict_from_datetime_string" qualifiers="const">
 			<return type="Dictionary" />
-			<argument index="0" name="datetime" type="String" />
-			<argument index="1" name="weekday" type="bool" />
+			<param index="0" name="datetime" type="String" />
+			<param index="1" name="weekday" type="bool" />
 			<description>
 				Converts the given ISO 8601 date and time string (YYYY-MM-DDTHH:MM:SS) to a dictionary of keys: [code]year[/code], [code]month[/code], [code]day[/code], [code]weekday[/code], [code]hour[/code], [code]minute[/code], and [code]second[/code].
-				If [code]weekday[/code] is false, then the [code]weekday[/code] entry is excluded (the calculation is relatively expensive).
+				If [param weekday] is [code]false[/code], then the [code]weekday[/code] entry is excluded (the calculation is relatively expensive).
 				[b]Note:[/b] Any decimal fraction in the time string will be ignored silently.
 			</description>
 		</method>
 		<method name="get_datetime_dict_from_system" qualifiers="const">
 			<return type="Dictionary" />
-			<argument index="0" name="utc" type="bool" default="false" />
+			<param index="0" name="utc" type="bool" default="false" />
 			<description>
 				Returns the current date as a dictionary of keys: [code]year[/code], [code]month[/code], [code]day[/code], [code]weekday[/code], [code]hour[/code], [code]minute[/code], and [code]second[/code].
 			</description>
 		</method>
 		<method name="get_datetime_dict_from_unix_time" qualifiers="const">
 			<return type="Dictionary" />
-			<argument index="0" name="unix_time_val" type="int" />
+			<param index="0" name="unix_time_val" type="int" />
 			<description>
 				Converts the given Unix timestamp to a dictionary of keys: [code]year[/code], [code]month[/code], [code]day[/code], and [code]weekday[/code].
 				The returned Dictionary's values will be the same as the [method get_datetime_dict_from_system] if the Unix timestamp is the current time, with the exception of Daylight Savings Time as it cannot be determined from the epoch.
@@ -70,37 +70,37 @@
 		</method>
 		<method name="get_datetime_string_from_datetime_dict" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="datetime" type="Dictionary" />
-			<argument index="1" name="use_space" type="bool" />
+			<param index="0" name="datetime" type="Dictionary" />
+			<param index="1" name="use_space" type="bool" />
 			<description>
 				Converts the given dictionary of keys to an ISO 8601 date and time string (YYYY-MM-DDTHH:MM:SS).
 				The given dictionary can be populated with the following keys: [code]year[/code], [code]month[/code], [code]day[/code], [code]hour[/code], [code]minute[/code], and [code]second[/code]. Any other entries (including [code]dst[/code]) are ignored.
 				If the dictionary is empty, [code]0[/code] is returned. If some keys are omitted, they default to the equivalent values for the Unix epoch timestamp 0 (1970-01-01 at 00:00:00).
-				If [code]use_space[/code] is true, use a space instead of the letter T in the middle.
+				If [param use_space] is [code]true[/code], the date and time bits are separated by an empty space character instead of the letter T.
 			</description>
 		</method>
 		<method name="get_datetime_string_from_system" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="utc" type="bool" default="false" />
-			<argument index="1" name="use_space" type="bool" default="false" />
+			<param index="0" name="utc" type="bool" default="false" />
+			<param index="1" name="use_space" type="bool" default="false" />
 			<description>
 				Returns the current date and time as an ISO 8601 date and time string (YYYY-MM-DDTHH:MM:SS).
-				The returned values are in the system's local time when [code]utc[/code] is false, otherwise they are in UTC.
-				If [code]use_space[/code] is true, use a space instead of the letter T in the middle.
+				The returned values are in the system's local time when [param utc] is [code]false[/code], otherwise they are in UTC.
+				If [param use_space] is [code]true[/code], the date and time bits are separated by an empty space character instead of the letter T.
 			</description>
 		</method>
 		<method name="get_datetime_string_from_unix_time" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="unix_time_val" type="int" />
-			<argument index="1" name="use_space" type="bool" default="false" />
+			<param index="0" name="unix_time_val" type="int" />
+			<param index="1" name="use_space" type="bool" default="false" />
 			<description>
 				Converts the given Unix timestamp to an ISO 8601 date and time string (YYYY-MM-DDTHH:MM:SS).
-				If [code]use_space[/code] is true, use a space instead of the letter T in the middle.
+				If [param use_space] is [code]true[/code], the date and time bits are separated by an empty space character instead of the letter T.
 			</description>
 		</method>
 		<method name="get_offset_string_from_offset_minutes" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="offset_minutes" type="int" />
+			<param index="0" name="offset_minutes" type="int" />
 			<description>
 				Converts the given timezone offset in minutes to a timezone offset string. For example, -480 returns "-08:00", 345 returns "+05:45", and 0 returns "+00:00".
 			</description>
@@ -121,30 +121,30 @@
 		</method>
 		<method name="get_time_dict_from_system" qualifiers="const">
 			<return type="Dictionary" />
-			<argument index="0" name="utc" type="bool" default="false" />
+			<param index="0" name="utc" type="bool" default="false" />
 			<description>
 				Returns the current time as a dictionary of keys: [code]hour[/code], [code]minute[/code], and [code]second[/code].
-				The returned values are in the system's local time when [code]utc[/code] is false, otherwise they are in UTC.
+				The returned values are in the system's local time when [param utc] is [code]false[/code], otherwise they are in UTC.
 			</description>
 		</method>
 		<method name="get_time_dict_from_unix_time" qualifiers="const">
 			<return type="Dictionary" />
-			<argument index="0" name="unix_time_val" type="int" />
+			<param index="0" name="unix_time_val" type="int" />
 			<description>
 				Converts the given time to a dictionary of keys: [code]hour[/code], [code]minute[/code], and [code]second[/code].
 			</description>
 		</method>
 		<method name="get_time_string_from_system" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="utc" type="bool" default="false" />
+			<param index="0" name="utc" type="bool" default="false" />
 			<description>
 				Returns the current time as an ISO 8601 time string (HH:MM:SS).
-				The returned values are in the system's local time when [code]utc[/code] is false, otherwise they are in UTC.
+				The returned values are in the system's local time when [param utc] is [code]false[/code], otherwise they are in UTC.
 			</description>
 		</method>
 		<method name="get_time_string_from_unix_time" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="unix_time_val" type="int" />
+			<param index="0" name="unix_time_val" type="int" />
 			<description>
 				Converts the given Unix timestamp to an ISO 8601 time string (HH:MM:SS).
 			</description>
@@ -157,7 +157,7 @@
 		</method>
 		<method name="get_unix_time_from_datetime_dict" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="datetime" type="Dictionary" />
+			<param index="0" name="datetime" type="Dictionary" />
 			<description>
 				Converts a dictionary of time values to a Unix timestamp.
 				The given dictionary can be populated with the following keys: [code]year[/code], [code]month[/code], [code]day[/code], [code]hour[/code], [code]minute[/code], and [code]second[/code]. Any other entries (including [code]dst[/code]) are ignored.
@@ -168,7 +168,7 @@
 		</method>
 		<method name="get_unix_time_from_datetime_string" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="datetime" type="String" />
+			<param index="0" name="datetime" type="String" />
 			<description>
 				Converts the given ISO 8601 date and/or time string to a Unix timestamp. The string can contain a date only, a time only, or both.
 				[b]Note:[/b] Unix timestamps are often in UTC. This method does not do any timezone conversion, so the timestamp will be in the same timezone as the given datetime string.
diff --git a/doc/classes/Timer.xml b/doc/classes/Timer.xml
index ebe25ed55e..d171797e80 100644
--- a/doc/classes/Timer.xml
+++ b/doc/classes/Timer.xml
@@ -19,9 +19,9 @@
 		</method>
 		<method name="start">
 			<return type="void" />
-			<argument index="0" name="time_sec" type="float" default="-1" />
+			<param index="0" name="time_sec" type="float" default="-1" />
 			<description>
-				Starts the timer. Sets [member wait_time] to [code]time_sec[/code] if [code]time_sec &gt; 0[/code]. This also resets the remaining time to [member wait_time].
+				Starts the timer. Sets [member wait_time] to [param time_sec] if [code]time_sec &gt; 0[/code]. This also resets the remaining time to [member wait_time].
 				[b]Note:[/b] This method will not resume a paused timer. See [member paused].
 			</description>
 		</method>
diff --git a/doc/classes/TorusMesh.xml b/doc/classes/TorusMesh.xml
new file mode 100644
index 0000000000..6b83152793
--- /dev/null
+++ b/doc/classes/TorusMesh.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="TorusMesh" inherits="PrimitiveMesh" version="4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+	<brief_description>
+		Class representing a torus [PrimitiveMesh].
+	</brief_description>
+	<description>
+		Class representing a torus [PrimitiveMesh].
+	</description>
+	<tutorials>
+	</tutorials>
+	<members>
+		<member name="inner_radius" type="float" setter="set_inner_radius" getter="get_inner_radius" default="0.5">
+			The inner radius of the torus.
+		</member>
+		<member name="outer_radius" type="float" setter="set_outer_radius" getter="get_outer_radius" default="1.0">
+			The outer radius of the torus.
+		</member>
+		<member name="ring_segments" type="int" setter="set_ring_segments" getter="get_ring_segments" default="32">
+			The number of edges each ring of the torus is constructed of.
+		</member>
+		<member name="rings" type="int" setter="set_rings" getter="get_rings" default="64">
+			The number of slices the torus is constructed of.
+		</member>
+	</members>
+</class>
diff --git a/doc/classes/Transform2D.xml b/doc/classes/Transform2D.xml
index 9979a73527..905b3d77af 100644
--- a/doc/classes/Transform2D.xml
+++ b/doc/classes/Transform2D.xml
@@ -22,34 +22,34 @@
 		</constructor>
 		<constructor name="Transform2D">
 			<return type="Transform2D" />
-			<argument index="0" name="from" type="Transform2D" />
+			<param index="0" name="from" type="Transform2D" />
 			<description>
 				Constructs a [Transform2D] as a copy of the given [Transform2D].
 			</description>
 		</constructor>
 		<constructor name="Transform2D">
 			<return type="Transform2D" />
-			<argument index="0" name="rotation" type="float" />
-			<argument index="1" name="position" type="Vector2" />
+			<param index="0" name="rotation" type="float" />
+			<param index="1" name="position" type="Vector2" />
 			<description>
 				Constructs the transform from a given angle (in radians) and position.
 			</description>
 		</constructor>
 		<constructor name="Transform2D">
 			<return type="Transform2D" />
-			<argument index="0" name="rotation" type="float" />
-			<argument index="1" name="scale" type="Vector2" />
-			<argument index="2" name="skew" type="float" />
-			<argument index="3" name="position" type="Vector2" />
+			<param index="0" name="rotation" type="float" />
+			<param index="1" name="scale" type="Vector2" />
+			<param index="2" name="skew" type="float" />
+			<param index="3" name="position" type="Vector2" />
 			<description>
 				Constructs the transform from a given angle (in radians), scale, skew (in radians) and position.
 			</description>
 		</constructor>
 		<constructor name="Transform2D">
 			<return type="Transform2D" />
-			<argument index="0" name="x_axis" type="Vector2" />
-			<argument index="1" name="y_axis" type="Vector2" />
-			<argument index="2" name="origin" type="Vector2" />
+			<param index="0" name="x_axis" type="Vector2" />
+			<param index="1" name="y_axis" type="Vector2" />
+			<param index="2" name="origin" type="Vector2" />
 			<description>
 				Constructs the transform from 3 [Vector2] values representing [member x], [member y], and the [member origin] (the three column vectors).
 			</description>
@@ -64,7 +64,7 @@
 		</method>
 		<method name="basis_xform" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="v" type="Vector2" />
+			<param index="0" name="v" type="Vector2" />
 			<description>
 				Returns a vector transformed (multiplied) by the basis matrix.
 				This method does not account for translation (the origin vector).
@@ -72,7 +72,7 @@
 		</method>
 		<method name="basis_xform_inv" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="v" type="Vector2" />
+			<param index="0" name="v" type="Vector2" />
 			<description>
 				Returns a vector transformed (multiplied) by the inverse basis matrix.
 				This method does not account for translation (the origin vector).
@@ -104,10 +104,10 @@
 		</method>
 		<method name="interpolate_with" qualifiers="const">
 			<return type="Transform2D" />
-			<argument index="0" name="xform" type="Transform2D" />
-			<argument index="1" name="weight" type="float" />
+			<param index="0" name="xform" type="Transform2D" />
+			<param index="1" name="weight" type="float" />
 			<description>
-				Returns a transform interpolated between this transform and another by a given [code]weight[/code] (on the range of 0.0 to 1.0).
+				Returns a transform interpolated between this transform and another by a given [param weight] (on the range of 0.0 to 1.0).
 			</description>
 		</method>
 		<method name="inverse" qualifiers="const">
@@ -118,16 +118,16 @@
 		</method>
 		<method name="is_equal_approx" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="xform" type="Transform2D" />
+			<param index="0" name="xform" type="Transform2D" />
 			<description>
 				Returns [code]true[/code] if this transform and [code]transform[/code] are approximately equal, by calling [code]is_equal_approx[/code] on each component.
 			</description>
 		</method>
 		<method name="looking_at" qualifiers="const">
 			<return type="Transform2D" />
-			<argument index="0" name="target" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="target" type="Vector2" default="Vector2(0, 0)" />
 			<description>
-				Returns a copy of the transform rotated such that it's rotation on the X-axis points towards the [code]target[/code] position.
+				Returns a copy of the transform rotated such that it's rotation on the X-axis points towards the [param target] position.
 				Operations take place in global space.
 			</description>
 		</method>
@@ -139,9 +139,9 @@
 		</method>
 		<method name="rotated" qualifiers="const">
 			<return type="Transform2D" />
-			<argument index="0" name="angle" type="float" />
+			<param index="0" name="angle" type="float" />
 			<description>
-				Returns a copy of the transform rotated by the given [code]angle[/code] (in radians).
+				Returns a copy of the transform rotated by the given [param angle] (in radians).
 				This method is an optimized version of multiplying the given transform [code]X[/code]
 				with a corresponding rotation transform [code]R[/code] from the left, i.e., [code]R * X[/code].
 				This can be seen as transforming with respect to the global/parent frame.
@@ -149,9 +149,9 @@
 		</method>
 		<method name="rotated_local" qualifiers="const">
 			<return type="Transform2D" />
-			<argument index="0" name="angle" type="float" />
+			<param index="0" name="angle" type="float" />
 			<description>
-				Returns a copy of the transform rotated by the given [code]angle[/code] (in radians).
+				Returns a copy of the transform rotated by the given [param angle] (in radians).
 				This method is an optimized version of multiplying the given transform [code]X[/code]
 				with a corresponding rotation transform [code]R[/code] from the right, i.e., [code]X * R[/code].
 				This can be seen as transforming with respect to the local frame.
@@ -159,9 +159,9 @@
 		</method>
 		<method name="scaled" qualifiers="const">
 			<return type="Transform2D" />
-			<argument index="0" name="scale" type="Vector2" />
+			<param index="0" name="scale" type="Vector2" />
 			<description>
-				Returns a copy of the transform scaled by the given [code]scale[/code] factor.
+				Returns a copy of the transform scaled by the given [param scale] factor.
 				This method is an optimized version of multiplying the given transform [code]X[/code]
 				with a corresponding scaling transform [code]S[/code] from the left, i.e., [code]S * X[/code].
 				This can be seen as transforming with respect to the global/parent frame.
@@ -169,9 +169,9 @@
 		</method>
 		<method name="scaled_local" qualifiers="const">
 			<return type="Transform2D" />
-			<argument index="0" name="scale" type="Vector2" />
+			<param index="0" name="scale" type="Vector2" />
 			<description>
-				Returns a copy of the transform scaled by the given [code]scale[/code] factor.
+				Returns a copy of the transform scaled by the given [param scale] factor.
 				This method is an optimized version of multiplying the given transform [code]X[/code]
 				with a corresponding scaling transform [code]S[/code] from the right, i.e., [code]X * S[/code].
 				This can be seen as transforming with respect to the local frame.
@@ -179,14 +179,14 @@
 		</method>
 		<method name="set_rotation">
 			<return type="void" />
-			<argument index="0" name="rotation" type="float" />
+			<param index="0" name="rotation" type="float" />
 			<description>
 				Sets the transform's rotation (in radians).
 			</description>
 		</method>
 		<method name="set_scale">
 			<return type="void" />
-			<argument index="0" name="scale" type="Vector2" />
+			<param index="0" name="scale" type="Vector2" />
 			<description>
 				Sets the transform's scale.
 				[b]Note:[/b] Negative X scales in 2D are not decomposable from the transformation matrix. Due to the way scale is represented with transformation matrices in Godot, negative scales on the X axis will be changed to negative scales on the Y axis and a rotation of 180 degrees when decomposed.
@@ -194,16 +194,16 @@
 		</method>
 		<method name="set_skew">
 			<return type="void" />
-			<argument index="0" name="skew" type="float" />
+			<param index="0" name="skew" type="float" />
 			<description>
 				Sets the transform's skew (in radians).
 			</description>
 		</method>
 		<method name="translated" qualifiers="const">
 			<return type="Transform2D" />
-			<argument index="0" name="offset" type="Vector2" />
+			<param index="0" name="offset" type="Vector2" />
 			<description>
-				Returns a copy of the transform translated by the given [code]offset[/code].
+				Returns a copy of the transform translated by the given [param offset].
 				This method is an optimized version of multiplying the given transform [code]X[/code]
 				with a corresponding translation transform [code]T[/code] from the left, i.e., [code]T * X[/code].
 				This can be seen as transforming with respect to the global/parent frame.
@@ -211,9 +211,9 @@
 		</method>
 		<method name="translated_local" qualifiers="const">
 			<return type="Transform2D" />
-			<argument index="0" name="offset" type="Vector2" />
+			<param index="0" name="offset" type="Vector2" />
 			<description>
-				Returns a copy of the transform translated by the given [code]offset[/code].
+				Returns a copy of the transform translated by the given [param offset].
 				This method is an optimized version of multiplying the given transform [code]X[/code]
 				with a corresponding translation transform [code]T[/code] from the right, i.e., [code]X * T[/code].
 				This can be seen as transforming with respect to the local frame.
@@ -245,7 +245,7 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Transform2D" />
+			<param index="0" name="right" type="Transform2D" />
 			<description>
 				Returns [code]true[/code] if the transforms are not equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
@@ -253,49 +253,49 @@
 		</operator>
 		<operator name="operator *">
 			<return type="PackedVector2Array" />
-			<argument index="0" name="right" type="PackedVector2Array" />
+			<param index="0" name="right" type="PackedVector2Array" />
 			<description>
 				Transforms (multiplies) each element of the [Vector2] array by the given [Transform2D] matrix.
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Rect2" />
-			<argument index="0" name="right" type="Rect2" />
+			<param index="0" name="right" type="Rect2" />
 			<description>
 				Transforms (multiplies) the [Rect2] by the given [Transform2D] matrix.
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Transform2D" />
-			<argument index="0" name="right" type="Transform2D" />
+			<param index="0" name="right" type="Transform2D" />
 			<description>
 				Composes these two transformation matrices by multiplying them together. This has the effect of transforming the second transform (the child) by the first transform (the parent).
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector2" />
-			<argument index="0" name="right" type="Vector2" />
+			<param index="0" name="right" type="Vector2" />
 			<description>
 				Transforms (multiplies) the [Vector2] by the given [Transform2D] matrix.
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Transform2D" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				This operator multiplies all components of the [Transform2D], including the origin vector, which scales it uniformly.
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Transform2D" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				This operator multiplies all components of the [Transform2D], including the origin vector, which scales it uniformly.
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="Transform2D" />
+			<param index="0" name="right" type="Transform2D" />
 			<description>
 				Returns [code]true[/code] if the transforms are exactly equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
@@ -303,7 +303,7 @@
 		</operator>
 		<operator name="operator []">
 			<return type="Vector2" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Access transform components using their index. [code]t[0][/code] is equivalent to [code]t.x[/code], [code]t[1][/code] is equivalent to [code]t.y[/code], and [code]t[2][/code] is equivalent to [code]t.origin[/code].
 			</description>
diff --git a/doc/classes/Transform3D.xml b/doc/classes/Transform3D.xml
index 9b673701ae..14aa72b80c 100644
--- a/doc/classes/Transform3D.xml
+++ b/doc/classes/Transform3D.xml
@@ -24,31 +24,31 @@
 		</constructor>
 		<constructor name="Transform3D">
 			<return type="Transform3D" />
-			<argument index="0" name="from" type="Transform3D" />
+			<param index="0" name="from" type="Transform3D" />
 			<description>
 				Constructs a [Transform3D] as a copy of the given [Transform3D].
 			</description>
 		</constructor>
 		<constructor name="Transform3D">
 			<return type="Transform3D" />
-			<argument index="0" name="basis" type="Basis" />
-			<argument index="1" name="origin" type="Vector3" />
+			<param index="0" name="basis" type="Basis" />
+			<param index="1" name="origin" type="Vector3" />
 			<description>
 				Constructs a Transform3D from a [Basis] and [Vector3].
 			</description>
 		</constructor>
 		<constructor name="Transform3D">
 			<return type="Transform3D" />
-			<argument index="0" name="from" type="Projection" />
+			<param index="0" name="from" type="Projection" />
 			<description>
 			</description>
 		</constructor>
 		<constructor name="Transform3D">
 			<return type="Transform3D" />
-			<argument index="0" name="x_axis" type="Vector3" />
-			<argument index="1" name="y_axis" type="Vector3" />
-			<argument index="2" name="z_axis" type="Vector3" />
-			<argument index="3" name="origin" type="Vector3" />
+			<param index="0" name="x_axis" type="Vector3" />
+			<param index="1" name="y_axis" type="Vector3" />
+			<param index="2" name="z_axis" type="Vector3" />
+			<param index="3" name="origin" type="Vector3" />
 			<description>
 				Constructs a Transform3D from four [Vector3] values (matrix columns). Each axis corresponds to local basis vectors (some of which may be scaled).
 			</description>
@@ -63,10 +63,10 @@
 		</method>
 		<method name="interpolate_with" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="xform" type="Transform3D" />
-			<argument index="1" name="weight" type="float" />
+			<param index="0" name="xform" type="Transform3D" />
+			<param index="1" name="weight" type="float" />
 			<description>
-				Returns a transform interpolated between this transform and another by a given [code]weight[/code] (on the range of 0.0 to 1.0).
+				Returns a transform interpolated between this transform and another by a given [param weight] (on the range of 0.0 to 1.0).
 			</description>
 		</method>
 		<method name="inverse" qualifiers="const">
@@ -77,18 +77,18 @@
 		</method>
 		<method name="is_equal_approx" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="xform" type="Transform3D" />
+			<param index="0" name="xform" type="Transform3D" />
 			<description>
 				Returns [code]true[/code] if this transform and [code]transform[/code] are approximately equal, by calling [code]is_equal_approx[/code] on each component.
 			</description>
 		</method>
 		<method name="looking_at" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="target" type="Vector3" />
-			<argument index="1" name="up" type="Vector3" default="Vector3(0, 1, 0)" />
+			<param index="0" name="target" type="Vector3" />
+			<param index="1" name="up" type="Vector3" default="Vector3(0, 1, 0)" />
 			<description>
-				Returns a copy of the transform rotated such that the forward axis (-Z) points towards the [code]target[/code] position.
-				The up axis (+Y) points as close to the [code]up[/code] vector as possible while staying perpendicular to the forward axis. The resulting transform is orthonormalized. The existing rotation, scale, and skew information from the original transform is discarded. The [code]target[/code] and [code]up[/code] vectors cannot be zero, cannot be parallel to each other, and are defined in global/parent space.
+				Returns a copy of the transform rotated such that the forward axis (-Z) points towards the [param target] position.
+				The up axis (+Y) points as close to the [param up] vector as possible while staying perpendicular to the forward axis. The resulting transform is orthonormalized. The existing rotation, scale, and skew information from the original transform is discarded. The [param target] and [param up] vectors cannot be zero, cannot be parallel to each other, and are defined in global/parent space.
 			</description>
 		</method>
 		<method name="orthonormalized" qualifiers="const">
@@ -99,11 +99,11 @@
 		</method>
 		<method name="rotated" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="axis" type="Vector3" />
-			<argument index="1" name="angle" type="float" />
+			<param index="0" name="axis" type="Vector3" />
+			<param index="1" name="angle" type="float" />
 			<description>
-				Returns a copy of the transform rotated around the given [code]axis[/code] by the given [code]angle[/code] (in radians).
-				The [code]axis[/code] must be a normalized vector.
+				Returns a copy of the transform rotated around the given [param axis] by the given [param angle] (in radians).
+				The [param axis] must be a normalized vector.
 				This method is an optimized version of multiplying the given transform [code]X[/code]
 				with a corresponding rotation transform [code]R[/code] from the left, i.e., [code]R * X[/code].
 				This can be seen as transforming with respect to the global/parent frame.
@@ -111,11 +111,11 @@
 		</method>
 		<method name="rotated_local" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="axis" type="Vector3" />
-			<argument index="1" name="angle" type="float" />
+			<param index="0" name="axis" type="Vector3" />
+			<param index="1" name="angle" type="float" />
 			<description>
-				Returns a copy of the transform rotated around the given [code]axis[/code] by the given [code]angle[/code] (in radians).
-				The [code]axis[/code] must be a normalized vector.
+				Returns a copy of the transform rotated around the given [param axis] by the given [param angle] (in radians).
+				The [param axis] must be a normalized vector.
 				This method is an optimized version of multiplying the given transform [code]X[/code]
 				with a corresponding rotation transform [code]R[/code] from the right, i.e., [code]X * R[/code].
 				This can be seen as transforming with respect to the local frame.
@@ -123,9 +123,9 @@
 		</method>
 		<method name="scaled" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="scale" type="Vector3" />
+			<param index="0" name="scale" type="Vector3" />
 			<description>
-				Returns a copy of the transform scaled by the given [code]scale[/code] factor.
+				Returns a copy of the transform scaled by the given [param scale] factor.
 				This method is an optimized version of multiplying the given transform [code]X[/code]
 				with a corresponding scaling transform [code]S[/code] from the left, i.e., [code]S * X[/code].
 				This can be seen as transforming with respect to the global/parent frame.
@@ -133,9 +133,9 @@
 		</method>
 		<method name="scaled_local" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="scale" type="Vector3" />
+			<param index="0" name="scale" type="Vector3" />
 			<description>
-				Returns a copy of the transform scaled by the given [code]scale[/code] factor.
+				Returns a copy of the transform scaled by the given [param scale] factor.
 				This method is an optimized version of multiplying the given transform [code]X[/code]
 				with a corresponding scaling transform [code]S[/code] from the right, i.e., [code]X * S[/code].
 				This can be seen as transforming with respect to the local frame.
@@ -143,17 +143,17 @@
 		</method>
 		<method name="spherical_interpolate_with" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="xform" type="Transform3D" />
-			<argument index="1" name="weight" type="float" />
+			<param index="0" name="xform" type="Transform3D" />
+			<param index="1" name="weight" type="float" />
 			<description>
-				Returns a transform spherically interpolated between this transform and another by a given [code]weight[/code] (on the range of 0.0 to 1.0).
+				Returns a transform spherically interpolated between this transform and another by a given [param weight] (on the range of 0.0 to 1.0).
 			</description>
 		</method>
 		<method name="translated" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="offset" type="Vector3" />
+			<param index="0" name="offset" type="Vector3" />
 			<description>
-				Returns a copy of the transform translated by the given [code]offset[/code].
+				Returns a copy of the transform translated by the given [param offset].
 				This method is an optimized version of multiplying the given transform [code]X[/code]
 				with a corresponding translation transform [code]T[/code] from the left, i.e., [code]T * X[/code].
 				This can be seen as transforming with respect to the global/parent frame.
@@ -161,9 +161,9 @@
 		</method>
 		<method name="translated_local" qualifiers="const">
 			<return type="Transform3D" />
-			<argument index="0" name="offset" type="Vector3" />
+			<param index="0" name="offset" type="Vector3" />
 			<description>
-				Returns a copy of the transform translated by the given [code]offset[/code].
+				Returns a copy of the transform translated by the given [param offset].
 				This method is an optimized version of multiplying the given transform [code]X[/code]
 				with a corresponding translation transform [code]T[/code] from the right, i.e., [code]X * T[/code].
 				This can be seen as transforming with respect to the local frame.
@@ -195,7 +195,7 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Transform3D" />
+			<param index="0" name="right" type="Transform3D" />
 			<description>
 				Returns [code]true[/code] if the transforms are not equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
@@ -203,49 +203,56 @@
 		</operator>
 		<operator name="operator *">
 			<return type="AABB" />
-			<argument index="0" name="right" type="AABB" />
+			<param index="0" name="right" type="AABB" />
 			<description>
 				Transforms (multiplies) the [AABB] by the given [Transform3D] matrix.
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="PackedVector3Array" />
-			<argument index="0" name="right" type="PackedVector3Array" />
+			<param index="0" name="right" type="PackedVector3Array" />
 			<description>
 				Transforms (multiplies) each element of the [Vector3] array by the given [Transform3D] matrix.
 			</description>
 		</operator>
 		<operator name="operator *">
+			<return type="Plane" />
+			<param index="0" name="right" type="Plane" />
+			<description>
+				Transforms (multiplies) the [Plane] by the given [Transform3D] transformation matrix.
+			</description>
+		</operator>
+		<operator name="operator *">
 			<return type="Transform3D" />
-			<argument index="0" name="right" type="Transform3D" />
+			<param index="0" name="right" type="Transform3D" />
 			<description>
 				Composes these two transformation matrices by multiplying them together. This has the effect of transforming the second transform (the child) by the first transform (the parent).
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector3" />
-			<argument index="0" name="right" type="Vector3" />
+			<param index="0" name="right" type="Vector3" />
 			<description>
 				Transforms (multiplies) the [Vector3] by the given [Transform3D] matrix.
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Transform3D" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				This operator multiplies all components of the [Transform3D], including the origin vector, which scales it uniformly.
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Transform3D" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				This operator multiplies all components of the [Transform3D], including the origin vector, which scales it uniformly.
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="Transform3D" />
+			<param index="0" name="right" type="Transform3D" />
 			<description>
 				Returns [code]true[/code] if the transforms are exactly equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
diff --git a/doc/classes/Translation.xml b/doc/classes/Translation.xml
index 7aafbc68c6..314be9adf8 100644
--- a/doc/classes/Translation.xml
+++ b/doc/classes/Translation.xml
@@ -13,27 +13,27 @@
 	<methods>
 		<method name="_get_message" qualifiers="virtual const">
 			<return type="StringName" />
-			<argument index="0" name="src_message" type="StringName" />
-			<argument index="1" name="context" type="StringName" />
+			<param index="0" name="src_message" type="StringName" />
+			<param index="1" name="context" type="StringName" />
 			<description>
 				Virtual method to override [method get_message].
 			</description>
 		</method>
 		<method name="_get_plural_message" qualifiers="virtual const">
 			<return type="StringName" />
-			<argument index="0" name="src_message" type="StringName" />
-			<argument index="1" name="src_plural_message" type="StringName" />
-			<argument index="2" name="n" type="int" />
-			<argument index="3" name="context" type="StringName" />
+			<param index="0" name="src_message" type="StringName" />
+			<param index="1" name="src_plural_message" type="StringName" />
+			<param index="2" name="n" type="int" />
+			<param index="3" name="context" type="StringName" />
 			<description>
 				Virtual method to override [method get_plural_message].
 			</description>
 		</method>
 		<method name="add_message">
 			<return type="void" />
-			<argument index="0" name="src_message" type="StringName" />
-			<argument index="1" name="xlated_message" type="StringName" />
-			<argument index="2" name="context" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="src_message" type="StringName" />
+			<param index="1" name="xlated_message" type="StringName" />
+			<param index="2" name="context" type="StringName" default="&quot;&quot;" />
 			<description>
 				Adds a message if nonexistent, followed by its translation.
 				An additional context could be used to specify the translation context or differentiate polysemic words.
@@ -41,9 +41,9 @@
 		</method>
 		<method name="add_plural_message">
 			<return type="void" />
-			<argument index="0" name="src_message" type="StringName" />
-			<argument index="1" name="xlated_messages" type="PackedStringArray" />
-			<argument index="2" name="context" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="src_message" type="StringName" />
+			<param index="1" name="xlated_messages" type="PackedStringArray" />
+			<param index="2" name="context" type="StringName" default="&quot;&quot;" />
 			<description>
 				Adds a message involving plural translation if nonexistent, followed by its translation.
 				An additional context could be used to specify the translation context or differentiate polysemic words.
@@ -51,16 +51,16 @@
 		</method>
 		<method name="erase_message">
 			<return type="void" />
-			<argument index="0" name="src_message" type="StringName" />
-			<argument index="1" name="context" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="src_message" type="StringName" />
+			<param index="1" name="context" type="StringName" default="&quot;&quot;" />
 			<description>
 				Erases a message.
 			</description>
 		</method>
 		<method name="get_message" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="src_message" type="StringName" />
-			<argument index="1" name="context" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="src_message" type="StringName" />
+			<param index="1" name="context" type="StringName" default="&quot;&quot;" />
 			<description>
 				Returns a message's translation.
 			</description>
@@ -79,13 +79,13 @@
 		</method>
 		<method name="get_plural_message" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="src_message" type="StringName" />
-			<argument index="1" name="src_plural_message" type="StringName" />
-			<argument index="2" name="n" type="int" />
-			<argument index="3" name="context" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="src_message" type="StringName" />
+			<param index="1" name="src_plural_message" type="StringName" />
+			<param index="2" name="n" type="int" />
+			<param index="3" name="context" type="StringName" default="&quot;&quot;" />
 			<description>
 				Returns a message's translation involving plurals.
-				The number [code]n[/code] is the number or quantity of the plural object. It will be used to guide the translation system to fetch the correct plural form for the selected language.
+				The number [param n] is the number or quantity of the plural object. It will be used to guide the translation system to fetch the correct plural form for the selected language.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/TranslationServer.xml b/doc/classes/TranslationServer.xml
index a4cf070ede..3da9096555 100644
--- a/doc/classes/TranslationServer.xml
+++ b/doc/classes/TranslationServer.xml
@@ -13,7 +13,7 @@
 	<methods>
 		<method name="add_translation">
 			<return type="void" />
-			<argument index="0" name="translation" type="Translation" />
+			<param index="0" name="translation" type="Translation" />
 			<description>
 				Adds a [Translation] resource.
 			</description>
@@ -26,8 +26,8 @@
 		</method>
 		<method name="compare_locales" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="locale_a" type="String" />
-			<argument index="1" name="locale_b" type="String" />
+			<param index="0" name="locale_a" type="String" />
+			<param index="1" name="locale_b" type="String" />
 			<description>
 				Compares two locales and return similarity score between [code]0[/code](no match) and [code]10[/code](full match).
 			</description>
@@ -52,16 +52,16 @@
 		</method>
 		<method name="get_country_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="country" type="String" />
+			<param index="0" name="country" type="String" />
 			<description>
-				Returns readable country name for the [code]country[/code] code.
+				Returns readable country name for the [param country] code.
 			</description>
 		</method>
 		<method name="get_language_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="language" type="String" />
+			<param index="0" name="language" type="String" />
 			<description>
-				Returns readable language name for the [code]language[/code] code.
+				Returns readable language name for the [param language] code.
 			</description>
 		</method>
 		<method name="get_loaded_locales" qualifiers="const">
@@ -79,16 +79,16 @@
 		</method>
 		<method name="get_locale_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="locale" type="String" />
+			<param index="0" name="locale" type="String" />
 			<description>
 				Returns a locale's language and its variant (e.g. [code]"en_US"[/code] would return [code]"English (United States)"[/code]).
 			</description>
 		</method>
 		<method name="get_script_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="script" type="String" />
+			<param index="0" name="script" type="String" />
 			<description>
-				Returns readable script name for the [code]script[/code] code.
+				Returns readable script name for the [param script] code.
 			</description>
 		</method>
 		<method name="get_tool_locale">
@@ -100,17 +100,17 @@
 		</method>
 		<method name="get_translation_object">
 			<return type="Translation" />
-			<argument index="0" name="locale" type="String" />
+			<param index="0" name="locale" type="String" />
 			<description>
-				Returns the [Translation] instance based on the [code]locale[/code] passed in.
-				It will return [code]null[/code] if there is no [Translation] instance that matches the [code]locale[/code].
+				Returns the [Translation] instance based on the [param locale] passed in.
+				It will return [code]null[/code] if there is no [Translation] instance that matches the [param locale].
 			</description>
 		</method>
 		<method name="pseudolocalize" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="message" type="StringName" />
+			<param index="0" name="message" type="StringName" />
 			<description>
-				Returns the pseudolocalized string based on the [code]p_message[/code] passed in.
+				Returns the pseudolocalized string based on the [param message] passed in.
 			</description>
 		</method>
 		<method name="reload_pseudolocalization">
@@ -121,43 +121,43 @@
 		</method>
 		<method name="remove_translation">
 			<return type="void" />
-			<argument index="0" name="translation" type="Translation" />
+			<param index="0" name="translation" type="Translation" />
 			<description>
 				Removes the given translation from the server.
 			</description>
 		</method>
 		<method name="set_locale">
 			<return type="void" />
-			<argument index="0" name="locale" type="String" />
+			<param index="0" name="locale" type="String" />
 			<description>
-				Sets the locale of the project. The [code]locale[/code] string will be standardized to match known locales (e.g. [code]en-US[/code] would be matched to [code]en_US[/code]).
+				Sets the locale of the project. The [param locale] string will be standardized to match known locales (e.g. [code]en-US[/code] would be matched to [code]en_US[/code]).
 				If translations have been loaded beforehand for the new locale, they will be applied.
 			</description>
 		</method>
 		<method name="standardize_locale" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="locale" type="String" />
+			<param index="0" name="locale" type="String" />
 			<description>
-				Returns [code]locale[/code] string standardized to match known locales (e.g. [code]en-US[/code] would be matched to [code]en_US[/code]).
+				Returns [param locale] string standardized to match known locales (e.g. [code]en-US[/code] would be matched to [code]en_US[/code]).
 			</description>
 		</method>
 		<method name="translate" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="message" type="StringName" />
-			<argument index="1" name="context" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="message" type="StringName" />
+			<param index="1" name="context" type="StringName" default="&quot;&quot;" />
 			<description>
 				Returns the current locale's translation for the given message (key) and context.
 			</description>
 		</method>
 		<method name="translate_plural" qualifiers="const">
 			<return type="StringName" />
-			<argument index="0" name="message" type="StringName" />
-			<argument index="1" name="plural_message" type="StringName" />
-			<argument index="2" name="n" type="int" />
-			<argument index="3" name="context" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="message" type="StringName" />
+			<param index="1" name="plural_message" type="StringName" />
+			<param index="2" name="n" type="int" />
+			<param index="3" name="context" type="StringName" default="&quot;&quot;" />
 			<description>
 				Returns the current locale's translation for the given message (key), plural_message and context.
-				The number [code]n[/code] is the number or quantity of the plural object. It will be used to guide the translation system to fetch the correct plural form for the selected language.
+				The number [param n] is the number or quantity of the plural object. It will be used to guide the translation system to fetch the correct plural form for the selected language.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/Tree.xml b/doc/classes/Tree.xml
index b06be0cf99..efa0e4e393 100644
--- a/doc/classes/Tree.xml
+++ b/doc/classes/Tree.xml
@@ -44,12 +44,12 @@
 		</method>
 		<method name="create_item">
 			<return type="TreeItem" />
-			<argument index="0" name="parent" type="TreeItem" default="null" />
-			<argument index="1" name="idx" type="int" default="-1" />
+			<param index="0" name="parent" type="TreeItem" default="null" />
+			<param index="1" name="idx" type="int" default="-1" />
 			<description>
-				Creates an item in the tree and adds it as a child of [code]parent[/code], which can be either a valid [TreeItem] or [code]null[/code].
-				If [code]parent[/code] is [code]null[/code], the root item will be the parent, or the new item will be the root itself if the tree is empty.
-				The new item will be the [code]idx[/code]th child of parent, or it will be the last child if there are not enough siblings.
+				Creates an item in the tree and adds it as a child of [param parent], which can be either a valid [TreeItem] or [code]null[/code].
+				If [param parent] is [code]null[/code], the root item will be the parent, or the new item will be the root itself if the tree is empty.
+				The new item will be the [param idx]th child of parent, or it will be the last child if there are not enough siblings.
 			</description>
 		</method>
 		<method name="edit_selected">
@@ -68,48 +68,48 @@
 		</method>
 		<method name="get_button_id_at_position" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="position" type="Vector2" />
+			<param index="0" name="position" type="Vector2" />
 			<description>
-				Returns the button id at [code]position[/code], or -1 if no button is there.
+				Returns the button id at [param position], or -1 if no button is there.
 			</description>
 		</method>
 		<method name="get_column_at_position" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="position" type="Vector2" />
+			<param index="0" name="position" type="Vector2" />
 			<description>
-				Returns the column index at [code]position[/code], or -1 if no item is there.
+				Returns the column index at [param position], or -1 if no item is there.
 			</description>
 		</method>
 		<method name="get_column_expand_ratio" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_column_title" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Returns the column's title.
 			</description>
 		</method>
 		<method name="get_column_title_direction" qualifiers="const">
 			<return type="int" enum="Control.TextDirection" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Returns column title base writing direction.
 			</description>
 		</method>
 		<method name="get_column_title_language" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Returns column title language code.
 			</description>
 		</method>
 		<method name="get_column_width" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Returns the column's width in pixels.
 			</description>
@@ -122,9 +122,9 @@
 		</method>
 		<method name="get_drop_section_at_position" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="position" type="Vector2" />
+			<param index="0" name="position" type="Vector2" />
 			<description>
-				Returns the drop section at [code]position[/code], or -100 if no item is there.
+				Returns the drop section at [param position], or -100 if no item is there.
 				Values -1, 0, or 1 will be returned for the "above item", "on item", and "below item" drop sections, respectively. See [enum DropModeFlags] for a description of each drop section.
 				To get the item which the returned drop section is relative to, use [method get_item_at_position].
 			</description>
@@ -163,26 +163,26 @@
 		</method>
 		<method name="get_item_area_rect" qualifiers="const">
 			<return type="Rect2" />
-			<argument index="0" name="item" type="TreeItem" />
-			<argument index="1" name="column" type="int" default="-1" />
-			<argument index="2" name="button_index" type="int" default="-1" />
+			<param index="0" name="item" type="TreeItem" />
+			<param index="1" name="column" type="int" default="-1" />
+			<param index="2" name="button_index" type="int" default="-1" />
 			<description>
-				Returns the rectangle area for the specified [TreeItem]. If [code]column[/code] is specified, only get the position and size of that column, otherwise get the rectangle containing all columns. If a button index is specified, the rectangle of that button will be returned.
+				Returns the rectangle area for the specified [TreeItem]. If [param column] is specified, only get the position and size of that column, otherwise get the rectangle containing all columns. If a button index is specified, the rectangle of that button will be returned.
 			</description>
 		</method>
 		<method name="get_item_at_position" qualifiers="const">
 			<return type="TreeItem" />
-			<argument index="0" name="position" type="Vector2" />
+			<param index="0" name="position" type="Vector2" />
 			<description>
 				Returns the tree item at the specified position (relative to the tree origin position).
 			</description>
 		</method>
 		<method name="get_next_selected">
 			<return type="TreeItem" />
-			<argument index="0" name="from" type="TreeItem" />
+			<param index="0" name="from" type="TreeItem" />
 			<description>
 				Returns the next selected [TreeItem] after the given one, or [code]null[/code] if the end is reached.
-				If [code]from[/code] is [code]null[/code], this returns the first selected item.
+				If [param from] is [code]null[/code], this returns the first selected item.
 			</description>
 		</method>
 		<method name="get_pressed_button" qualifiers="const">
@@ -221,74 +221,74 @@
 		</method>
 		<method name="is_column_clipping_content" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="is_column_expanding" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="scroll_to_item">
 			<return type="void" />
-			<argument index="0" name="item" type="TreeItem" />
-			<argument index="1" name="center_on_item" type="bool" default="false" />
+			<param index="0" name="item" type="TreeItem" />
+			<param index="1" name="center_on_item" type="bool" default="false" />
 			<description>
 				Causes the [Tree] to jump to the specified [TreeItem].
 			</description>
 		</method>
 		<method name="set_column_clip_content">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="set_column_custom_minimum_width">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="min_width" type="int" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="min_width" type="int" />
 			<description>
 				Overrides the calculated minimum width of a column. It can be set to `0` to restore the default behavior. Columns that have the "Expand" flag will use their "min_width" in a similar fashion to [member Control.size_flags_stretch_ratio].
 			</description>
 		</method>
 		<method name="set_column_expand">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="expand" type="bool" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="expand" type="bool" />
 			<description>
 				If [code]true[/code], the column will have the "Expand" flag of [Control]. Columns that have the "Expand" flag will use their "min_width" in a similar fashion to [member Control.size_flags_stretch_ratio].
 			</description>
 		</method>
 		<method name="set_column_expand_ratio">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="ratio" type="int" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="ratio" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_column_title">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="title" type="String" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="title" type="String" />
 			<description>
 				Sets the title of a column.
 			</description>
 		</method>
 		<method name="set_column_title_direction">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="direction" type="int" enum="Control.TextDirection" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="direction" type="int" enum="Control.TextDirection" />
 			<description>
 				Sets column title base writing direction.
 			</description>
 		</method>
 		<method name="set_column_title_language">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="language" type="String" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="language" type="String" />
 			<description>
 				Sets language code of column title used for line-breaking and text shaping algorithms, if left empty current locale is used instead.
 			</description>
@@ -331,10 +331,10 @@
 	</members>
 	<signals>
 		<signal name="button_clicked">
-			<argument index="0" name="item" type="TreeItem" />
-			<argument index="1" name="column" type="int" />
-			<argument index="2" name="id" type="int" />
-			<argument index="3" name="mouse_button_index" type="int" />
+			<param index="0" name="item" type="TreeItem" />
+			<param index="1" name="column" type="int" />
+			<param index="2" name="id" type="int" />
+			<param index="3" name="mouse_button_index" type="int" />
 			<description>
 				Emitted when a button on the tree was pressed (see [method TreeItem.add_button]).
 			</description>
@@ -345,33 +345,33 @@
 			</description>
 		</signal>
 		<signal name="check_propagated_to_item">
-			<argument index="0" name="item" type="TreeItem" />
-			<argument index="1" name="column" type="int" />
+			<param index="0" name="item" type="TreeItem" />
+			<param index="1" name="column" type="int" />
 			<description>
 				Emitted when [method TreeItem.propagate_check] is called. Connect to this signal to process the items that are affected when [method TreeItem.propagate_check] is invoked. The order that the items affected will be processed is as follows: the item that invoked the method, children of that item, and finally parents of that item.
 			</description>
 		</signal>
 		<signal name="column_title_pressed">
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Emitted when a column's title is pressed.
 			</description>
 		</signal>
 		<signal name="custom_item_clicked">
-			<argument index="0" name="mouse_button_index" type="int" />
+			<param index="0" name="mouse_button_index" type="int" />
 			<description>
 				Emitted when an item with [constant TreeItem.CELL_MODE_CUSTOM] is clicked with a mouse button.
 			</description>
 		</signal>
 		<signal name="custom_popup_edited">
-			<argument index="0" name="arrow_clicked" type="bool" />
+			<param index="0" name="arrow_clicked" type="bool" />
 			<description>
 				Emitted when a cell with the [constant TreeItem.CELL_MODE_CUSTOM] is clicked to be edited.
 			</description>
 		</signal>
 		<signal name="empty_clicked">
-			<argument index="0" name="position" type="Vector2" />
-			<argument index="1" name="mouse_button_index" type="int" />
+			<param index="0" name="position" type="Vector2" />
+			<param index="1" name="mouse_button_index" type="int" />
 			<description>
 				Emitted when a mouse button is clicked in the empty space of the tree.
 			</description>
@@ -382,7 +382,7 @@
 			</description>
 		</signal>
 		<signal name="item_collapsed">
-			<argument index="0" name="item" type="TreeItem" />
+			<param index="0" name="item" type="TreeItem" />
 			<description>
 				Emitted when an item is collapsed by a click on the folding arrow.
 			</description>
@@ -403,8 +403,8 @@
 			</description>
 		</signal>
 		<signal name="item_mouse_selected">
-			<argument index="0" name="position" type="Vector2" />
-			<argument index="1" name="mouse_button_index" type="int" />
+			<param index="0" name="position" type="Vector2" />
+			<param index="1" name="mouse_button_index" type="int" />
 			<description>
 				Emitted when an item is selected with a mouse button.
 			</description>
@@ -415,9 +415,9 @@
 			</description>
 		</signal>
 		<signal name="multi_selected">
-			<argument index="0" name="item" type="TreeItem" />
-			<argument index="1" name="column" type="int" />
-			<argument index="2" name="selected" type="bool" />
+			<param index="0" name="item" type="TreeItem" />
+			<param index="1" name="column" type="int" />
+			<param index="2" name="selected" type="bool" />
 			<description>
 				Emitted instead of [code]item_selected[/code] if [code]select_mode[/code] is [constant SELECT_MULTI].
 			</description>
@@ -461,7 +461,7 @@
 		<theme_item name="custom_button_font_highlight" data_type="color" type="Color" default="Color(0.95, 0.95, 0.95, 1)">
 			Text [Color] for a [constant TreeItem.CELL_MODE_CUSTOM] mode cell when it's hovered.
 		</theme_item>
-		<theme_item name="drop_position_color" data_type="color" type="Color" default="Color(1, 0.3, 0.2, 1)">
+		<theme_item name="drop_position_color" data_type="color" type="Color" default="Color(1, 1, 1, 1)">
 			[Color] used to draw possible drop locations. See [enum DropModeFlags] constants for further description of drop locations.
 		</theme_item>
 		<theme_item name="font_color" data_type="color" type="Color" default="Color(0.7, 0.7, 0.7, 1)">
diff --git a/doc/classes/TreeItem.xml b/doc/classes/TreeItem.xml
index fbba1147a2..6207477441 100644
--- a/doc/classes/TreeItem.xml
+++ b/doc/classes/TreeItem.xml
@@ -12,108 +12,108 @@
 	<methods>
 		<method name="add_button">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="button" type="Texture2D" />
-			<argument index="2" name="id" type="int" default="-1" />
-			<argument index="3" name="disabled" type="bool" default="false" />
-			<argument index="4" name="tooltip" type="String" default="&quot;&quot;" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="button" type="Texture2D" />
+			<param index="2" name="id" type="int" default="-1" />
+			<param index="3" name="disabled" type="bool" default="false" />
+			<param index="4" name="tooltip" type="String" default="&quot;&quot;" />
 			<description>
-				Adds a button with [Texture2D] [code]button[/code] at column [code]column[/code]. The [code]id[/code] is used to identify the button. If not specified, the next available index is used, which may be retrieved by calling [method get_button_count] immediately before this method. Optionally, the button can be [code]disabled[/code] and have a [code]tooltip[/code].
+				Adds a button with [Texture2D] [param button] at column [param column]. The [param id] is used to identify the button. If not specified, the next available index is used, which may be retrieved by calling [method get_button_count] immediately before this method. Optionally, the button can be [param disabled] and have a [param tooltip].
 			</description>
 		</method>
 		<method name="call_recursive" qualifiers="vararg">
 			<return type="void" />
-			<argument index="0" name="method" type="StringName" />
+			<param index="0" name="method" type="StringName" />
 			<description>
-				Calls the [code]method[/code] on the actual TreeItem and its children recursively. Pass parameters as a comma separated list.
+				Calls the [param method] on the actual TreeItem and its children recursively. Pass parameters as a comma separated list.
 			</description>
 		</method>
 		<method name="clear_custom_bg_color">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Resets the background color for the given column to default.
 			</description>
 		</method>
 		<method name="clear_custom_color">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Resets the color for the given column to default.
 			</description>
 		</method>
 		<method name="create_child">
 			<return type="TreeItem" />
-			<argument index="0" name="idx" type="int" default="-1" />
+			<param index="0" name="idx" type="int" default="-1" />
 			<description>
 				Creates an item and adds it as a child.
-				The new item will be inserted as position [code]idx[/code] (the default value [code]-1[/code] means the last position), or it will be the last child if [code]idx[/code] is higher than the child count.
+				The new item will be inserted as position [param idx] (the default value [code]-1[/code] means the last position), or it will be the last child if [param idx] is higher than the child count.
 			</description>
 		</method>
 		<method name="deselect">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Deselects the given column.
 			</description>
 		</method>
 		<method name="erase_button">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="button_idx" type="int" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="button_idx" type="int" />
 			<description>
-				Removes the button at index [code]button_idx[/code] in column [code]column[/code].
+				Removes the button at index [param button_idx] in column [param column].
 			</description>
 		</method>
 		<method name="get_button" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="button_idx" type="int" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="button_idx" type="int" />
 			<description>
-				Returns the [Texture2D] of the button at index [code]button_idx[/code] in column [code]column[/code].
+				Returns the [Texture2D] of the button at index [param button_idx] in column [param column].
 			</description>
 		</method>
 		<method name="get_button_by_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="id" type="int" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="id" type="int" />
 			<description>
-				Returns the button index if there is a button with id [code]id[/code] in column [code]column[/code], otherwise returns -1.
+				Returns the button index if there is a button with id [param id] in column [param column], otherwise returns -1.
 			</description>
 		</method>
 		<method name="get_button_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
-				Returns the number of buttons in column [code]column[/code].
+				Returns the number of buttons in column [param column].
 			</description>
 		</method>
 		<method name="get_button_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="button_idx" type="int" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="button_idx" type="int" />
 			<description>
-				Returns the id for the button at index [code]button_idx[/code] in column [code]column[/code].
+				Returns the id for the button at index [param button_idx] in column [param column].
 			</description>
 		</method>
 		<method name="get_button_tooltip" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="button_idx" type="int" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="button_idx" type="int" />
 			<description>
-				Returns the tooltip string for the button at index [code]button_idx[/code] in column [code]column[/code].
+				Returns the tooltip string for the button at index [param button_idx] in column [param column].
 			</description>
 		</method>
 		<method name="get_cell_mode" qualifiers="const">
 			<return type="int" enum="TreeItem.TreeCellMode" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Returns the column's cell mode.
 			</description>
 		</method>
 		<method name="get_child">
 			<return type="TreeItem" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Returns a child item by its index (see [method get_child_count]). This method is often used for iterating all children of an item.
 				Negative indices access the children from the last one.
@@ -133,35 +133,35 @@
 		</method>
 		<method name="get_custom_bg_color" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
-				Returns the custom background color of column [code]column[/code].
+				Returns the custom background color of column [param column].
 			</description>
 		</method>
 		<method name="get_custom_color" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
-				Returns the custom color of column [code]column[/code].
+				Returns the custom color of column [param column].
 			</description>
 		</method>
 		<method name="get_custom_font" qualifiers="const">
 			<return type="Font" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
-				Returns custom font used to draw text in the column [code]column[/code].
+				Returns custom font used to draw text in the column [param column].
 			</description>
 		</method>
 		<method name="get_custom_font_size" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
-				Returns custom font size used to draw text in the column [code]column[/code].
+				Returns custom font size used to draw text in the column [param column].
 			</description>
 		</method>
 		<method name="get_expand_right" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Returns [code]true[/code] if [code]expand_right[/code] is set.
 			</description>
@@ -174,28 +174,28 @@
 		</method>
 		<method name="get_icon" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Returns the given column's icon [Texture2D]. Error if no icon is set.
 			</description>
 		</method>
 		<method name="get_icon_max_width" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Returns the column's icon's maximum width.
 			</description>
 		</method>
 		<method name="get_icon_modulate" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Returns the [Color] modulating the column's icon.
 			</description>
 		</method>
 		<method name="get_icon_region" qualifiers="const">
 			<return type="Rect2" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Returns the icon [Texture2D] region as [Rect2].
 			</description>
@@ -208,14 +208,14 @@
 		</method>
 		<method name="get_language" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Returns item's text language code.
 			</description>
 		</method>
 		<method name="get_metadata" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Returns the metadata value that was set for the given column using [method set_metadata].
 			</description>
@@ -228,10 +228,10 @@
 		</method>
 		<method name="get_next_visible">
 			<return type="TreeItem" />
-			<argument index="0" name="wrap" type="bool" default="false" />
+			<param index="0" name="wrap" type="bool" default="false" />
 			<description>
 				Returns the next visible sibling TreeItem in the tree or a null object if there is none.
-				If [code]wrap[/code] is enabled, the method will wrap around to the first visible element in the tree when called on the last visible element, otherwise it returns [code]null[/code].
+				If [param wrap] is enabled, the method will wrap around to the first visible element in the tree when called on the last visible element, otherwise it returns [code]null[/code].
 			</description>
 		</method>
 		<method name="get_parent" qualifiers="const">
@@ -248,69 +248,69 @@
 		</method>
 		<method name="get_prev_visible">
 			<return type="TreeItem" />
-			<argument index="0" name="wrap" type="bool" default="false" />
+			<param index="0" name="wrap" type="bool" default="false" />
 			<description>
 				Returns the previous visible sibling TreeItem in the tree or a null object if there is none.
-				If [code]wrap[/code] is enabled, the method will wrap around to the last visible element in the tree when called on the first visible element, otherwise it returns [code]null[/code].
+				If [param wrap] is enabled, the method will wrap around to the last visible element in the tree when called on the first visible element, otherwise it returns [code]null[/code].
 			</description>
 		</method>
 		<method name="get_range" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Returns the value of a [constant CELL_MODE_RANGE] column.
 			</description>
 		</method>
 		<method name="get_range_config">
 			<return type="Dictionary" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Returns a dictionary containing the range parameters for a given column. The keys are "min", "max", "step", and "expr".
 			</description>
 		</method>
 		<method name="get_structured_text_bidi_override" qualifiers="const">
 			<return type="int" enum="TextServer.StructuredTextParser" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_structured_text_bidi_override_options" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_suffix" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Gets the suffix string shown after the column value.
 			</description>
 		</method>
 		<method name="get_text" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Returns the given column's text.
 			</description>
 		</method>
 		<method name="get_text_alignment" qualifiers="const">
 			<return type="int" enum="HorizontalAlignment" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Returns the given column's text alignment.
 			</description>
 		</method>
 		<method name="get_text_direction" qualifiers="const">
 			<return type="int" enum="Control.TextDirection" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Returns item's text base writing direction.
 			</description>
 		</method>
 		<method name="get_tooltip" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 				Returns the given column's tooltip.
 			</description>
@@ -323,326 +323,326 @@
 		</method>
 		<method name="is_button_disabled" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="button_idx" type="int" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="button_idx" type="int" />
 			<description>
-				Returns [code]true[/code] if the button at index [code]button_idx[/code] for the given column is disabled.
+				Returns [code]true[/code] if the button at index [param button_idx] for the given [param column] is disabled.
 			</description>
 		</method>
 		<method name="is_checked" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
-				Returns [code]true[/code] if the given column is checked.
+				Returns [code]true[/code] if the given [param column] is checked.
 			</description>
 		</method>
 		<method name="is_custom_set_as_button" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="is_editable">
 			<return type="bool" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
-				Returns [code]true[/code] if column [code]column[/code] is editable.
+				Returns [code]true[/code] if the given [param column] is editable.
 			</description>
 		</method>
 		<method name="is_indeterminate" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
-				Returns [code]true[/code] if the given column is indeterminate.
+				Returns [code]true[/code] if the given [param column] is indeterminate.
 			</description>
 		</method>
 		<method name="is_selectable" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
-				Returns [code]true[/code] if column [code]column[/code] is selectable.
+				Returns [code]true[/code] if the given [param column] is selectable.
 			</description>
 		</method>
 		<method name="is_selected">
 			<return type="bool" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
-				Returns [code]true[/code] if column [code]column[/code] is selected.
+				Returns [code]true[/code] if the given [param column] is selected.
 			</description>
 		</method>
 		<method name="move_after">
 			<return type="void" />
-			<argument index="0" name="item" type="TreeItem" />
+			<param index="0" name="item" type="TreeItem" />
 			<description>
-				Moves this TreeItem right after the given [code]item[/code].
+				Moves this TreeItem right after the given [param item].
 				[b]Note:[/b] You can't move to the root or move the root.
 			</description>
 		</method>
 		<method name="move_before">
 			<return type="void" />
-			<argument index="0" name="item" type="TreeItem" />
+			<param index="0" name="item" type="TreeItem" />
 			<description>
-				Moves this TreeItem right before the given [code]item[/code].
+				Moves this TreeItem right before the given [param item].
 				[b]Note:[/b] You can't move to the root or move the root.
 			</description>
 		</method>
 		<method name="propagate_check">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="emit_signal" type="bool" default="true" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="emit_signal" type="bool" default="true" />
 			<description>
-				Propagates this item's checked status to its children and parents for the given [code]column[/code]. It is possible to process the items affected by this method call by connecting to [signal Tree.check_propagated_to_item]. The order that the items affected will be processed is as follows: the item invoking this method, children of that item, and finally parents of that item. If [code]emit_signal[/code] is [code]false[/code], then [signal Tree.check_propagated_to_item] will not be emitted.
+				Propagates this item's checked status to its children and parents for the given [param column]. It is possible to process the items affected by this method call by connecting to [signal Tree.check_propagated_to_item]. The order that the items affected will be processed is as follows: the item invoking this method, children of that item, and finally parents of that item. If [param emit_signal] is [code]false[/code], then [signal Tree.check_propagated_to_item] will not be emitted.
 			</description>
 		</method>
 		<method name="remove_child">
 			<return type="void" />
-			<argument index="0" name="child" type="TreeItem" />
+			<param index="0" name="child" type="TreeItem" />
 			<description>
 				Removes the given child [TreeItem] and all its children from the [Tree]. Note that it doesn't free the item from memory, so it can be reused later. To completely remove a [TreeItem] use [method Object.free].
 			</description>
 		</method>
 		<method name="select">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
+			<param index="0" name="column" type="int" />
 			<description>
-				Selects the column [code]column[/code].
+				Selects the given [param column].
 			</description>
 		</method>
 		<method name="set_button">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="button_idx" type="int" />
-			<argument index="2" name="button" type="Texture2D" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="button_idx" type="int" />
+			<param index="2" name="button" type="Texture2D" />
 			<description>
-				Sets the given column's button [Texture2D] at index [code]button_idx[/code] to [code]button[/code].
+				Sets the given column's button [Texture2D] at index [param button_idx] to [param button].
 			</description>
 		</method>
 		<method name="set_button_disabled">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="button_idx" type="int" />
-			<argument index="2" name="disabled" type="bool" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="button_idx" type="int" />
+			<param index="2" name="disabled" type="bool" />
 			<description>
-				If [code]true[/code], disables the button at index [code]button_idx[/code] in column [code]column[/code].
+				If [code]true[/code], disables the button at index [param button_idx] in the given [param column].
 			</description>
 		</method>
 		<method name="set_cell_mode">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="mode" type="int" enum="TreeItem.TreeCellMode" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="mode" type="int" enum="TreeItem.TreeCellMode" />
 			<description>
-				Sets the given column's cell mode to [code]mode[/code]. See [enum TreeCellMode] constants.
+				Sets the given column's cell mode to [param mode]. See [enum TreeCellMode] constants.
 			</description>
 		</method>
 		<method name="set_checked">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="checked" type="bool" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="checked" type="bool" />
 			<description>
-				If [code]true[/code], the column [code]column[/code] is checked. Clears column's indeterminate status.
+				If [code]true[/code], the given [param column] is checked. Clears column's indeterminate status.
 			</description>
 		</method>
 		<method name="set_custom_as_button">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="set_custom_bg_color">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="color" type="Color" />
-			<argument index="2" name="just_outline" type="bool" default="false" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="color" type="Color" />
+			<param index="2" name="just_outline" type="bool" default="false" />
 			<description>
 				Sets the given column's custom background color and whether to just use it as an outline.
 			</description>
 		</method>
 		<method name="set_custom_color">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="color" type="Color" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="color" type="Color" />
 			<description>
 				Sets the given column's custom color.
 			</description>
 		</method>
 		<method name="set_custom_draw">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="object" type="Object" />
-			<argument index="2" name="callback" type="StringName" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="object" type="Object" />
+			<param index="2" name="callback" type="StringName" />
 			<description>
-				Sets the given column's custom draw callback to [code]callback[/code] method on [code]object[/code].
-				The [code]callback[/code] should accept two arguments: the [TreeItem] that is drawn and its position and size as a [Rect2].
+				Sets the given column's custom draw callback to [param callback] method on [param object].
+				The [param callback] should accept two arguments: the [TreeItem] that is drawn and its position and size as a [Rect2].
 			</description>
 		</method>
 		<method name="set_custom_font">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="font" type="Font" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="font" type="Font" />
 			<description>
-				Sets custom font used to draw text in the column [code]column[/code].
+				Sets custom font used to draw text in the given [param column].
 			</description>
 		</method>
 		<method name="set_custom_font_size">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="font_size" type="int" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="font_size" type="int" />
 			<description>
-				Sets custom font size used to draw text in the column [code]column[/code].
+				Sets custom font size used to draw text in the given [param column].
 			</description>
 		</method>
 		<method name="set_editable">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
-				If [code]true[/code], column [code]column[/code] is editable.
+				If [code]true[/code], the given [param column] is editable.
 			</description>
 		</method>
 		<method name="set_expand_right">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="enable" type="bool" />
 			<description>
-				If [code]true[/code], column [code]column[/code] is expanded to the right.
+				If [code]true[/code], the given [param column] is expanded to the right.
 			</description>
 		</method>
 		<method name="set_icon">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="texture" type="Texture2D" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="texture" type="Texture2D" />
 			<description>
 				Sets the given column's icon [Texture2D].
 			</description>
 		</method>
 		<method name="set_icon_max_width">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="width" type="int" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="width" type="int" />
 			<description>
 				Sets the given column's icon's maximum width.
 			</description>
 		</method>
 		<method name="set_icon_modulate">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="modulate" type="Color" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="modulate" type="Color" />
 			<description>
-				Modulates the given column's icon with [code]modulate[/code].
+				Modulates the given column's icon with [param modulate].
 			</description>
 		</method>
 		<method name="set_icon_region">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="region" type="Rect2" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="region" type="Rect2" />
 			<description>
 				Sets the given column's icon's texture region.
 			</description>
 		</method>
 		<method name="set_indeterminate">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="indeterminate" type="bool" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="indeterminate" type="bool" />
 			<description>
-				If [code]true[/code], the column [code]column[/code] is marked indeterminate.
+				If [code]true[/code], the given [param column] is marked [param indeterminate].
 				[b]Note:[/b] If set [code]true[/code] from [code]false[/code], then column is cleared of checked status.
 			</description>
 		</method>
 		<method name="set_language">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="language" type="String" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="language" type="String" />
 			<description>
 				Sets language code of item's text used for line-breaking and text shaping algorithms, if left empty current locale is used instead.
 			</description>
 		</method>
 		<method name="set_metadata">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="meta" type="Variant" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="meta" type="Variant" />
 			<description>
 				Sets the metadata value for the given column, which can be retrieved later using [method get_metadata]. This can be used, for example, to store a reference to the original data.
 			</description>
 		</method>
 		<method name="set_range">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="value" type="float" />
 			<description>
 				Sets the value of a [constant CELL_MODE_RANGE] column.
 			</description>
 		</method>
 		<method name="set_range_config">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="min" type="float" />
-			<argument index="2" name="max" type="float" />
-			<argument index="3" name="step" type="float" />
-			<argument index="4" name="expr" type="bool" default="false" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="min" type="float" />
+			<param index="2" name="max" type="float" />
+			<param index="3" name="step" type="float" />
+			<param index="4" name="expr" type="bool" default="false" />
 			<description>
 				Sets the range of accepted values for a column. The column must be in the [constant CELL_MODE_RANGE] mode.
-				If [code]expr[/code] is [code]true[/code], the edit mode slider will use an exponential scale as with [member Range.exp_edit].
+				If [param expr] is [code]true[/code], the edit mode slider will use an exponential scale as with [member Range.exp_edit].
 			</description>
 		</method>
 		<method name="set_selectable">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="selectable" type="bool" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="selectable" type="bool" />
 			<description>
 				If [code]true[/code], the given column is selectable.
 			</description>
 		</method>
 		<method name="set_structured_text_bidi_override">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="parser" type="int" enum="TextServer.StructuredTextParser" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="parser" type="int" enum="TextServer.StructuredTextParser" />
 			<description>
 			</description>
 		</method>
 		<method name="set_structured_text_bidi_override_options">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="args" type="Array" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="args" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_suffix">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="text" type="String" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="text" type="String" />
 			<description>
 				Sets a string to be shown after a column's value (for example, a unit abbreviation).
 			</description>
 		</method>
 		<method name="set_text">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="text" type="String" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="text" type="String" />
 			<description>
 				Sets the given column's text value.
 			</description>
 		</method>
 		<method name="set_text_alignment">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="text_alignment" type="int" enum="HorizontalAlignment" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="text_alignment" type="int" enum="HorizontalAlignment" />
 			<description>
 				Sets the given column's text alignment. See [enum HorizontalAlignment] for possible values.
 			</description>
 		</method>
 		<method name="set_text_direction">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="direction" type="int" enum="Control.TextDirection" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="direction" type="int" enum="Control.TextDirection" />
 			<description>
 				Sets item's text base writing direction.
 			</description>
 		</method>
 		<method name="set_tooltip">
 			<return type="void" />
-			<argument index="0" name="column" type="int" />
-			<argument index="1" name="tooltip" type="String" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="tooltip" type="String" />
 			<description>
 				Sets the given column's tooltip text.
 			</description>
diff --git a/doc/classes/Tween.xml b/doc/classes/Tween.xml
index b18232f5c3..c7fc78c1d3 100644
--- a/doc/classes/Tween.xml
+++ b/doc/classes/Tween.xml
@@ -45,9 +45,9 @@
 	<methods>
 		<method name="bind_node">
 			<return type="Tween" />
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
-				Binds this [Tween] with the given [code]node[/code]. [Tween]s are processed directly by the [SceneTree], so they run independently of the animated nodes. When you bind a [Node] with the [Tween], the [Tween] will halt the animation when the object is not inside tree and the [Tween] will be automatically killed when the bound object is freed. Also [constant TWEEN_PAUSE_BOUND] will make the pausing behavior dependent on the bound node.
+				Binds this [Tween] with the given [param node]. [Tween]s are processed directly by the [SceneTree], so they run independently of the animated nodes. When you bind a [Node] with the [Tween], the [Tween] will halt the animation when the object is not inside tree and the [Tween] will be automatically killed when the bound object is freed. Also [constant TWEEN_PAUSE_BOUND] will make the pausing behavior dependent on the bound node.
 				For a shorter way to create and bind a [Tween], you can use [method Node.create_tween].
 			</description>
 		</method>
@@ -65,9 +65,9 @@
 		</method>
 		<method name="custom_step">
 			<return type="bool" />
-			<argument index="0" name="delta" type="float" />
+			<param index="0" name="delta" type="float" />
 			<description>
-				Processes the [Tween] by the given [code]delta[/code] value, in seconds. This is mostly useful for manual control when the [Tween] is paused. It can also be used to end the [Tween] animation immediately, by setting [code]delta[/code] longer than the whole duration of the [Tween] animation.
+				Processes the [Tween] by the given [param delta] value, in seconds. This is mostly useful for manual control when the [Tween] is paused. It can also be used to end the [Tween] animation immediately, by setting [param delta] longer than the whole duration of the [Tween] animation.
 				Returns [code]true[/code] if the [Tween] still has [Tweener]s that haven't finished.
 				[b]Note:[/b] The [Tween] will become invalid in the next processing frame after its animation finishes. Calling [method stop] after performing [method custom_step] instead keeps and resets the [Tween].
 			</description>
@@ -81,19 +81,19 @@
 		</method>
 		<method name="interpolate_value" qualifiers="static">
 			<return type="Variant" />
-			<argument index="0" name="initial_value" type="Variant" />
-			<argument index="1" name="delta_value" type="Variant" />
-			<argument index="2" name="elapsed_time" type="float" />
-			<argument index="3" name="duration" type="float" />
-			<argument index="4" name="trans_type" type="int" enum="Tween.TransitionType" />
-			<argument index="5" name="ease_type" type="int" enum="Tween.EaseType" />
+			<param index="0" name="initial_value" type="Variant" />
+			<param index="1" name="delta_value" type="Variant" />
+			<param index="2" name="elapsed_time" type="float" />
+			<param index="3" name="duration" type="float" />
+			<param index="4" name="trans_type" type="int" enum="Tween.TransitionType" />
+			<param index="5" name="ease_type" type="int" enum="Tween.EaseType" />
 			<description>
 				This method can be used for manual interpolation of a value, when you don't want [Tween] to do animating for you. It's similar to [method @GlobalScope.lerp], but with support for custom transition and easing.
-				[code]initial_value[/code] is the starting value of the interpolation.
-				[code]delta_value[/code] is the change of the value in the interpolation, i.e. it's equal to [code]final_value - initial_value[/code].
-				[code]elapsed_time[/code] is the time in seconds that passed after the interpolation started and it's used to control the position of the interpolation. E.g. when it's equal to half of the [code]duration[/code], the interpolated value will be halfway between initial and final values. This value can also be greater than [code]duration[/code] or lower than 0, which will extrapolate the value.
-				[code]duration[/code] is the total time of the interpolation.
-				[b]Note:[/b] If [code]duration[/code] is equal to [code]0[/code], the method will always return the final value, regardless of [code]elapsed_time[/code] provided.
+				[param initial_value] is the starting value of the interpolation.
+				[param delta_value] is the change of the value in the interpolation, i.e. it's equal to [code]final_value - initial_value[/code].
+				[param elapsed_time] is the time in seconds that passed after the interpolation started and it's used to control the position of the interpolation. E.g. when it's equal to half of the [param duration], the interpolated value will be halfway between initial and final values. This value can also be greater than [param duration] or lower than 0, which will extrapolate the value.
+				[param duration] is the total time of the interpolation.
+				[b]Note:[/b] If [param duration] is equal to [code]0[/code], the method will always return the final value, regardless of [param elapsed_time] provided.
 			</description>
 		</method>
 		<method name="is_running">
@@ -142,14 +142,14 @@
 		</method>
 		<method name="set_ease">
 			<return type="Tween" />
-			<argument index="0" name="ease" type="int" enum="Tween.EaseType" />
+			<param index="0" name="ease" type="int" enum="Tween.EaseType" />
 			<description>
 				Sets the default ease type for [PropertyTweener]s and [MethodTweener]s animated by this [Tween].
 			</description>
 		</method>
 		<method name="set_loops">
 			<return type="Tween" />
-			<argument index="0" name="loops" type="int" default="0" />
+			<param index="0" name="loops" type="int" default="0" />
 			<description>
 				Sets the number of times the tweening sequence will be repeated, i.e. [code]set_loops(2)[/code] will run the animation twice.
 				Calling this method without arguments will make the [Tween] run infinitely, until either it is killed with [method kill], the [Tween]'s bound node is freed, or all the animated objects have been freed (which makes further animation impossible).
@@ -158,14 +158,14 @@
 		</method>
 		<method name="set_parallel">
 			<return type="Tween" />
-			<argument index="0" name="parallel" type="bool" default="true" />
+			<param index="0" name="parallel" type="bool" default="true" />
 			<description>
-				If [code]parallel[/code] is [code]true[/code], the [Tweener]s appended after this method will by default run simultaneously, as opposed to sequentially.
+				If [param parallel] is [code]true[/code], the [Tweener]s appended after this method will by default run simultaneously, as opposed to sequentially.
 			</description>
 		</method>
 		<method name="set_pause_mode">
 			<return type="Tween" />
-			<argument index="0" name="mode" type="int" enum="Tween.TweenPauseMode" />
+			<param index="0" name="mode" type="int" enum="Tween.TweenPauseMode" />
 			<description>
 				Determines the behavior of the [Tween] when the [SceneTree] is paused. Check [enum TweenPauseMode] for options.
 				Default value is [constant TWEEN_PAUSE_BOUND].
@@ -173,7 +173,7 @@
 		</method>
 		<method name="set_process_mode">
 			<return type="Tween" />
-			<argument index="0" name="mode" type="int" enum="Tween.TweenProcessMode" />
+			<param index="0" name="mode" type="int" enum="Tween.TweenProcessMode" />
 			<description>
 				Determines whether the [Tween] should run during idle frame (see [method Node._process]) or physics frame (see [method Node._physics_process].
 				Default value is [constant TWEEN_PROCESS_IDLE].
@@ -181,14 +181,14 @@
 		</method>
 		<method name="set_speed_scale">
 			<return type="Tween" />
-			<argument index="0" name="speed" type="float" />
+			<param index="0" name="speed" type="float" />
 			<description>
 				Scales the speed of tweening. This affects all [Tweener]s and their delays.
 			</description>
 		</method>
 		<method name="set_trans">
 			<return type="Tween" />
-			<argument index="0" name="trans" type="int" enum="Tween.TransitionType" />
+			<param index="0" name="trans" type="int" enum="Tween.TransitionType" />
 			<description>
 				Sets the default transition type for [PropertyTweener]s and [MethodTweener]s animated by this [Tween].
 			</description>
@@ -201,7 +201,7 @@
 		</method>
 		<method name="tween_callback">
 			<return type="CallbackTweener" />
-			<argument index="0" name="callback" type="Callable" />
+			<param index="0" name="callback" type="Callable" />
 			<description>
 				Creates and appends a [CallbackTweener]. This method can be used to call an arbitrary method in any object. Use [method Callable.bind] to bind additional arguments for the call.
 				Example: object that keeps shooting every 1 second.
@@ -219,9 +219,9 @@
 		</method>
 		<method name="tween_interval">
 			<return type="IntervalTweener" />
-			<argument index="0" name="time" type="float" />
+			<param index="0" name="time" type="float" />
 			<description>
-				Creates and appends an [IntervalTweener]. This method can be used to create delays in the tween animation, as an alternative to using the delay in other [Tweener]s, or when there's no animation (in which case the [Tween] acts as a timer). [code]time[/code] is the length of the interval, in seconds.
+				Creates and appends an [IntervalTweener]. This method can be used to create delays in the tween animation, as an alternative to using the delay in other [Tweener]s, or when there's no animation (in which case the [Tween] acts as a timer). [param time] is the length of the interval, in seconds.
 				Example: creating an interval in code execution.
 				[codeblock]
 				# ... some code
@@ -242,12 +242,12 @@
 		</method>
 		<method name="tween_method">
 			<return type="MethodTweener" />
-			<argument index="0" name="method" type="Callable" />
-			<argument index="1" name="from" type="Variant" />
-			<argument index="2" name="to" type="Variant" />
-			<argument index="3" name="duration" type="float" />
+			<param index="0" name="method" type="Callable" />
+			<param index="1" name="from" type="Variant" />
+			<param index="2" name="to" type="Variant" />
+			<param index="3" name="duration" type="float" />
 			<description>
-				Creates and appends a [MethodTweener]. This method is similar to a combination of [method tween_callback] and [method tween_property]. It calls a method over time with a tweened value provided as an argument. The value is tweened between [code]from[/code] and [code]to[/code] over the time specified by [code]duration[/code], in seconds. Use [method Callable.bind] to bind additional arguments for the call. You can use [method MethodTweener.set_ease] and [method MethodTweener.set_trans] to tweak the easing and transition of the value or [method MethodTweener.set_delay] to delay the tweening.
+				Creates and appends a [MethodTweener]. This method is similar to a combination of [method tween_callback] and [method tween_property]. It calls a method over time with a tweened value provided as an argument. The value is tweened between [param from] and [param to] over the time specified by [param duration], in seconds. Use [method Callable.bind] to bind additional arguments for the call. You can use [method MethodTweener.set_ease] and [method MethodTweener.set_trans] to tweak the easing and transition of the value or [method MethodTweener.set_delay] to delay the tweening.
 				Example: making a 3D object look from one point to another point.
 				[codeblock]
 				var tween = create_tween()
@@ -266,12 +266,12 @@
 		</method>
 		<method name="tween_property">
 			<return type="PropertyTweener" />
-			<argument index="0" name="object" type="Object" />
-			<argument index="1" name="property" type="NodePath" />
-			<argument index="2" name="final_val" type="Variant" />
-			<argument index="3" name="duration" type="float" />
+			<param index="0" name="object" type="Object" />
+			<param index="1" name="property" type="NodePath" />
+			<param index="2" name="final_val" type="Variant" />
+			<param index="3" name="duration" type="float" />
 			<description>
-				Creates and appends a [PropertyTweener]. This method tweens a [code]property[/code] of an [code]object[/code] between an initial value and [code]final_val[/code] in a span of time equal to [code]duration[/code], in seconds. The initial value by default is the property's value at the time the tweening of the [PropertyTweener] starts. For example:
+				Creates and appends a [PropertyTweener]. This method tweens a [param property] of an [param object] between an initial value and [param final_val] in a span of time equal to [param duration], in seconds. The initial value by default is the property's value at the time the tweening of the [PropertyTweener] starts. For example:
 				[codeblock]
 				var tween = create_tween()
 				tween.tween_property($Sprite, "position", Vector2(100, 200), 1)
@@ -296,13 +296,13 @@
 			</description>
 		</signal>
 		<signal name="loop_finished">
-			<argument index="0" name="loop_count" type="int" />
+			<param index="0" name="loop_count" type="int" />
 			<description>
 				Emitted when a full loop is complete (see [method set_loops]), providing the loop index. This signal is not emitted after the final loop, use [signal finished] instead for this case.
 			</description>
 		</signal>
 		<signal name="step_finished">
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Emitted when one step of the [Tween] is complete, providing the step index. One step is either a single [Tweener] or a group of [Tweener]s running in parallel.
 			</description>
diff --git a/doc/classes/UDPServer.xml b/doc/classes/UDPServer.xml
index 6fb4d50c0c..c3a3a49a80 100644
--- a/doc/classes/UDPServer.xml
+++ b/doc/classes/UDPServer.xml
@@ -143,10 +143,10 @@
 		</method>
 		<method name="listen">
 			<return type="int" enum="Error" />
-			<argument index="0" name="port" type="int" />
-			<argument index="1" name="bind_address" type="String" default="&quot;*&quot;" />
+			<param index="0" name="port" type="int" />
+			<param index="1" name="bind_address" type="String" default="&quot;*&quot;" />
 			<description>
-				Starts the server by opening a UDP socket listening on the given port. You can optionally specify a [code]bind_address[/code] to only listen for packets sent to that address. See also [method PacketPeerUDP.bind].
+				Starts the server by opening a UDP socket listening on the given [param port]. You can optionally specify a [param bind_address] to only listen for packets sent to that address. See also [method PacketPeerUDP.bind].
 			</description>
 		</method>
 		<method name="poll">
diff --git a/doc/classes/UndoRedo.xml b/doc/classes/UndoRedo.xml
index 80a548ceaf..3ef59b1c39 100644
--- a/doc/classes/UndoRedo.xml
+++ b/doc/classes/UndoRedo.xml
@@ -64,74 +64,74 @@
 	<methods>
 		<method name="add_do_method" qualifiers="vararg">
 			<return type="void" />
-			<argument index="0" name="object" type="Object" />
-			<argument index="1" name="method" type="StringName" />
+			<param index="0" name="object" type="Object" />
+			<param index="1" name="method" type="StringName" />
 			<description>
-				Register a method that will be called when the action is committed.
+				Register a [param method] that will be called when the action is committed.
 			</description>
 		</method>
 		<method name="add_do_property">
 			<return type="void" />
-			<argument index="0" name="object" type="Object" />
-			<argument index="1" name="property" type="StringName" />
-			<argument index="2" name="value" type="Variant" />
+			<param index="0" name="object" type="Object" />
+			<param index="1" name="property" type="StringName" />
+			<param index="2" name="value" type="Variant" />
 			<description>
-				Register a property value change for "do".
+				Register a [param property] that would change its value to [param value] when the action is committed.
 			</description>
 		</method>
 		<method name="add_do_reference">
 			<return type="void" />
-			<argument index="0" name="object" type="Object" />
+			<param index="0" name="object" type="Object" />
 			<description>
 				Register a reference for "do" that will be erased if the "do" history is lost. This is useful mostly for new nodes created for the "do" call. Do not use for resources.
 			</description>
 		</method>
 		<method name="add_undo_method" qualifiers="vararg">
 			<return type="void" />
-			<argument index="0" name="object" type="Object" />
-			<argument index="1" name="method" type="StringName" />
+			<param index="0" name="object" type="Object" />
+			<param index="1" name="method" type="StringName" />
 			<description>
-				Register a method that will be called when the action is undone.
+				Register a [param method] that will be called when the action is undone.
 			</description>
 		</method>
 		<method name="add_undo_property">
 			<return type="void" />
-			<argument index="0" name="object" type="Object" />
-			<argument index="1" name="property" type="StringName" />
-			<argument index="2" name="value" type="Variant" />
+			<param index="0" name="object" type="Object" />
+			<param index="1" name="property" type="StringName" />
+			<param index="2" name="value" type="Variant" />
 			<description>
-				Register a property value change for "undo".
+				Register a [param property] that would change its value to [param value] when the action is undone.
 			</description>
 		</method>
 		<method name="add_undo_reference">
 			<return type="void" />
-			<argument index="0" name="object" type="Object" />
+			<param index="0" name="object" type="Object" />
 			<description>
 				Register a reference for "undo" that will be erased if the "undo" history is lost. This is useful mostly for nodes removed with the "do" call (not the "undo" call!).
 			</description>
 		</method>
 		<method name="clear_history">
 			<return type="void" />
-			<argument index="0" name="increase_version" type="bool" default="true" />
+			<param index="0" name="increase_version" type="bool" default="true" />
 			<description>
 				Clear the undo/redo history and associated references.
-				Passing [code]false[/code] to [code]increase_version[/code] will prevent the version number to be increased from this.
+				Passing [code]false[/code] to [param increase_version] will prevent the version number from increasing when the history is cleared.
 			</description>
 		</method>
 		<method name="commit_action">
 			<return type="void" />
-			<argument index="0" name="execute" type="bool" default="true" />
+			<param index="0" name="execute" type="bool" default="true" />
 			<description>
-				Commit the action. If [code]execute[/code] is true (default), all "do" methods/properties are called/set when this function is called.
+				Commit the action. If [param execute] is [code]true[/code] (which it is by default), all "do" methods/properties are called/set when this function is called.
 			</description>
 		</method>
 		<method name="create_action">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="merge_mode" type="int" enum="UndoRedo.MergeMode" default="0" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="merge_mode" type="int" enum="UndoRedo.MergeMode" default="0" />
 			<description>
 				Create a new action. After this is called, do all your calls to [method add_do_method], [method add_undo_method], [method add_do_property], and [method add_undo_property], then commit the action with [method commit_action].
-				The way actions are merged is dictated by the [code]merge_mode[/code] argument. See [enum MergeMode] for details.
+				The way actions are merged is dictated by [param merge_mode]. See [enum MergeMode] for details.
 			</description>
 		</method>
 		<method name="end_force_keep_in_merge_ends">
@@ -142,7 +142,7 @@
 		</method>
 		<method name="get_action_name">
 			<return type="String" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Gets the action name from its index.
 			</description>
diff --git a/doc/classes/Vector2.xml b/doc/classes/Vector2.xml
index 454db51919..904fc6d9e9 100644
--- a/doc/classes/Vector2.xml
+++ b/doc/classes/Vector2.xml
@@ -25,24 +25,24 @@
 		</constructor>
 		<constructor name="Vector2">
 			<return type="Vector2" />
-			<argument index="0" name="from" type="Vector2" />
+			<param index="0" name="from" type="Vector2" />
 			<description>
 				Constructs a [Vector2] as a copy of the given [Vector2].
 			</description>
 		</constructor>
 		<constructor name="Vector2">
 			<return type="Vector2" />
-			<argument index="0" name="from" type="Vector2i" />
+			<param index="0" name="from" type="Vector2i" />
 			<description>
 				Constructs a new [Vector2] from [Vector2i].
 			</description>
 		</constructor>
 		<constructor name="Vector2">
 			<return type="Vector2" />
-			<argument index="0" name="x" type="float" />
-			<argument index="1" name="y" type="float" />
+			<param index="0" name="x" type="float" />
+			<param index="1" name="y" type="float" />
 			<description>
-				Constructs a new [Vector2] from the given [code]x[/code] and [code]y[/code].
+				Constructs a new [Vector2] from the given [param x] and [param y].
 			</description>
 		</constructor>
 	</constructors>
@@ -64,7 +64,7 @@
 		</method>
 		<method name="angle_to" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="to" type="Vector2" />
+			<param index="0" name="to" type="Vector2" />
 			<description>
 				Returns the angle to the given vector, in radians.
 				[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/vector2_angle_to.png]Illustration of the returned angle.[/url]
@@ -72,7 +72,7 @@
 		</method>
 		<method name="angle_to_point" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="to" type="Vector2" />
+			<param index="0" name="to" type="Vector2" />
 			<description>
 				Returns the angle between the line connecting the two points and the X axis, in radians.
 				[code]a.angle_to_point(b)[/code] is equivalent of doing [code](b - a).angle()[/code].
@@ -87,17 +87,17 @@
 		</method>
 		<method name="bezier_interpolate" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="control_1" type="Vector2" />
-			<argument index="1" name="control_2" type="Vector2" />
-			<argument index="2" name="end" type="Vector2" />
-			<argument index="3" name="t" type="float" />
+			<param index="0" name="control_1" type="Vector2" />
+			<param index="1" name="control_2" type="Vector2" />
+			<param index="2" name="end" type="Vector2" />
+			<param index="3" name="t" type="float" />
 			<description>
-				Returns the point at the given [code]t[/code] on the [url=https://en.wikipedia.org/wiki/B%C3%A9zier_curve]Bezier curve[/url] defined by this vector and the given [code]control_1[/code], [code]control_2[/code], and [code]end[/code] points.
+				Returns the point at the given [param t] on the [url=https://en.wikipedia.org/wiki/B%C3%A9zier_curve]Bezier curve[/url] defined by this vector and the given [param control_1], [param control_2], and [param end] points.
 			</description>
 		</method>
 		<method name="bounce" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="n" type="Vector2" />
+			<param index="0" name="n" type="Vector2" />
 			<description>
 				Returns the vector "bounced off" from a plane defined by the given normal.
 			</description>
@@ -110,58 +110,58 @@
 		</method>
 		<method name="clamp" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="min" type="Vector2" />
-			<argument index="1" name="max" type="Vector2" />
+			<param index="0" name="min" type="Vector2" />
+			<param index="1" name="max" type="Vector2" />
 			<description>
-				Returns a new vector with all components clamped between the components of [code]min[/code] and [code]max[/code], by running [method @GlobalScope.clamp] on each component.
+				Returns a new vector with all components clamped between the components of [param min] and [param max], by running [method @GlobalScope.clamp] on each component.
 			</description>
 		</method>
 		<method name="cross" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="with" type="Vector2" />
+			<param index="0" name="with" type="Vector2" />
 			<description>
-				Returns the 2D analog of the cross product for this vector and [code]with[/code].
+				Returns the 2D analog of the cross product for this vector and [param with].
 				This is the signed area of the parallelogram formed by the two vectors. If the second vector is clockwise from the first vector, then the cross product is the positive area. If counter-clockwise, the cross product is the negative area.
 				[b]Note:[/b] Cross product is not defined in 2D mathematically. This method embeds the 2D vectors in the XY plane of 3D space and uses their cross product's Z component as the analog.
 			</description>
 		</method>
 		<method name="cubic_interpolate" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="b" type="Vector2" />
-			<argument index="1" name="pre_a" type="Vector2" />
-			<argument index="2" name="post_b" type="Vector2" />
-			<argument index="3" name="weight" type="float" />
+			<param index="0" name="b" type="Vector2" />
+			<param index="1" name="pre_a" type="Vector2" />
+			<param index="2" name="post_b" type="Vector2" />
+			<param index="3" name="weight" type="float" />
 			<description>
-				Cubically interpolates between this vector and [code]b[/code] using [code]pre_a[/code] and [code]post_b[/code] as handles, and returns the result at position [code]weight[/code]. [code]weight[/code] is on the range of 0.0 to 1.0, representing the amount of interpolation.
+				Cubically interpolates between this vector and [param b] using [param pre_a] and [param post_b] as handles, and returns the result at position [param weight]. [param weight] is on the range of 0.0 to 1.0, representing the amount of interpolation.
 			</description>
 		</method>
 		<method name="direction_to" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="to" type="Vector2" />
+			<param index="0" name="to" type="Vector2" />
 			<description>
-				Returns the normalized vector pointing from this vector to [code]to[/code]. This is equivalent to using [code](b - a).normalized()[/code].
+				Returns the normalized vector pointing from this vector to [param to]. This is equivalent to using [code](b - a).normalized()[/code].
 			</description>
 		</method>
 		<method name="distance_squared_to" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="to" type="Vector2" />
+			<param index="0" name="to" type="Vector2" />
 			<description>
-				Returns the squared distance between this vector and [code]to[/code].
+				Returns the squared distance between this vector and [param to].
 				This method runs faster than [method distance_to], so prefer it if you need to compare vectors or need the squared distance for some formula.
 			</description>
 		</method>
 		<method name="distance_to" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="to" type="Vector2" />
+			<param index="0" name="to" type="Vector2" />
 			<description>
-				Returns the distance between this vector and [code]to[/code].
+				Returns the distance between this vector and [param to].
 			</description>
 		</method>
 		<method name="dot" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="with" type="Vector2" />
+			<param index="0" name="with" type="Vector2" />
 			<description>
-				Returns the dot product of this vector and [code]with[/code]. This can be used to compare the angle between two vectors. For example, this can be used to determine whether an enemy is facing the player.
+				Returns the dot product of this vector and [param with]. This can be used to compare the angle between two vectors. For example, this can be used to determine whether an enemy is facing the player.
 				The dot product will be [code]0[/code] for a straight angle (90 degrees), greater than 0 for angles narrower than 90 degrees and lower than 0 for angles wider than 90 degrees.
 				When using unit (normalized) vectors, the result will always be between [code]-1.0[/code] (180 degree angle) when the vectors are facing opposite directions, and [code]1.0[/code] (0 degree angle) when the vectors are aligned.
 				[b]Note:[/b] [code]a.dot(b)[/code] is equivalent to [code]b.dot(a)[/code].
@@ -175,9 +175,9 @@
 		</method>
 		<method name="from_angle" qualifiers="static">
 			<return type="Vector2" />
-			<argument index="0" name="angle" type="float" />
+			<param index="0" name="angle" type="float" />
 			<description>
-				Creates a unit [Vector2] rotated to the given [code]angle[/code] in radians. This is equivalent to doing [code]Vector2(cos(angle), sin(angle))[/code] or [code]Vector2.RIGHT.rotated(angle)[/code].
+				Creates a unit [Vector2] rotated to the given [param angle] in radians. This is equivalent to doing [code]Vector2(cos(angle), sin(angle))[/code] or [code]Vector2.RIGHT.rotated(angle)[/code].
 				[codeblock]
 				print(Vector2.from_angle(0)) # Prints (1, 0).
 				print(Vector2(1, 0).angle()) # Prints 0, which is the angle used above.
@@ -187,7 +187,7 @@
 		</method>
 		<method name="is_equal_approx" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="to" type="Vector2" />
+			<param index="0" name="to" type="Vector2" />
 			<description>
 				Returns [code]true[/code] if this vector and [code]v[/code] are approximately equal, by running [method @GlobalScope.is_equal_approx] on each component.
 			</description>
@@ -213,17 +213,17 @@
 		</method>
 		<method name="lerp" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="to" type="Vector2" />
-			<argument index="1" name="weight" type="float" />
+			<param index="0" name="to" type="Vector2" />
+			<param index="1" name="weight" type="float" />
 			<description>
-				Returns the result of the linear interpolation between this vector and [code]to[/code] by amount [code]weight[/code]. [code]weight[/code] is on the range of 0.0 to 1.0, representing the amount of interpolation.
+				Returns the result of the linear interpolation between this vector and [param to] by amount [param weight]. [param weight] is on the range of 0.0 to 1.0, representing the amount of interpolation.
 			</description>
 		</method>
 		<method name="limit_length" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="length" type="float" default="1.0" />
+			<param index="0" name="length" type="float" default="1.0" />
 			<description>
-				Returns the vector with a maximum length by limiting its length to [code]length[/code].
+				Returns the vector with a maximum length by limiting its length to [param length].
 			</description>
 		</method>
 		<method name="max_axis_index" qualifiers="const">
@@ -240,10 +240,10 @@
 		</method>
 		<method name="move_toward" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="to" type="Vector2" />
-			<argument index="1" name="delta" type="float" />
+			<param index="0" name="to" type="Vector2" />
+			<param index="1" name="delta" type="float" />
 			<description>
-				Returns a new vector moved toward [code]to[/code] by the fixed [code]delta[/code] amount. Will not go past the final value.
+				Returns a new vector moved toward [param to] by the fixed [param delta] amount. Will not go past the final value.
 			</description>
 		</method>
 		<method name="normalized" qualifiers="const">
@@ -260,37 +260,37 @@
 		</method>
 		<method name="posmod" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="mod" type="float" />
+			<param index="0" name="mod" type="float" />
 			<description>
-				Returns a vector composed of the [method @GlobalScope.fposmod] of this vector's components and [code]mod[/code].
+				Returns a vector composed of the [method @GlobalScope.fposmod] of this vector's components and [param mod].
 			</description>
 		</method>
 		<method name="posmodv" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="modv" type="Vector2" />
+			<param index="0" name="modv" type="Vector2" />
 			<description>
-				Returns a vector composed of the [method @GlobalScope.fposmod] of this vector's components and [code]modv[/code]'s components.
+				Returns a vector composed of the [method @GlobalScope.fposmod] of this vector's components and [param modv]'s components.
 			</description>
 		</method>
 		<method name="project" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="b" type="Vector2" />
+			<param index="0" name="b" type="Vector2" />
 			<description>
 				Returns this vector projected onto the vector [code]b[/code].
 			</description>
 		</method>
 		<method name="reflect" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="n" type="Vector2" />
+			<param index="0" name="n" type="Vector2" />
 			<description>
-				Returns the vector reflected (i.e. mirrored, or symmetric) over a line defined by the given direction vector [code]n[/code].
+				Returns the vector reflected (i.e. mirrored, or symmetric) over a line defined by the given direction vector [param n].
 			</description>
 		</method>
 		<method name="rotated" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="angle" type="float" />
+			<param index="0" name="angle" type="float" />
 			<description>
-				Returns the vector rotated by [code]angle[/code] (in radians). See also [method @GlobalScope.deg2rad].
+				Returns the vector rotated by [param angle] (in radians). See also [method @GlobalScope.deg2rad].
 			</description>
 		</method>
 		<method name="round" qualifiers="const">
@@ -307,25 +307,25 @@
 		</method>
 		<method name="slerp" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="to" type="Vector2" />
-			<argument index="1" name="weight" type="float" />
+			<param index="0" name="to" type="Vector2" />
+			<param index="1" name="weight" type="float" />
 			<description>
-				Returns the result of spherical linear interpolation between this vector and [code]to[/code], by amount [code]weight[/code]. [code]weight[/code] is on the range of 0.0 to 1.0, representing the amount of interpolation.
+				Returns the result of spherical linear interpolation between this vector and [param to], by amount [param weight]. [param weight] is on the range of 0.0 to 1.0, representing the amount of interpolation.
 				This method also handles interpolating the lengths if the input vectors have different lengths. For the special case of one or both input vectors having zero length, this method behaves like [method lerp].
 			</description>
 		</method>
 		<method name="slide" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="n" type="Vector2" />
+			<param index="0" name="n" type="Vector2" />
 			<description>
 				Returns this vector slid along a plane defined by the given normal.
 			</description>
 		</method>
 		<method name="snapped" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="step" type="Vector2" />
+			<param index="0" name="step" type="Vector2" />
 			<description>
-				Returns this vector with each component snapped to the nearest multiple of [code]step[/code]. This can also be used to round to an arbitrary number of decimals.
+				Returns this vector with each component snapped to the nearest multiple of [param step]. This can also be used to round to an arbitrary number of decimals.
 			</description>
 		</method>
 	</methods>
@@ -369,7 +369,7 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector2" />
+			<param index="0" name="right" type="Vector2" />
 			<description>
 				Returns [code]true[/code] if the vectors are not equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
@@ -377,14 +377,14 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Vector2" />
-			<argument index="0" name="right" type="Transform2D" />
+			<param index="0" name="right" type="Transform2D" />
 			<description>
 				Inversely transforms (multiplies) the [Vector2] by the given [Transform2D] transformation matrix.
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector2" />
-			<argument index="0" name="right" type="Vector2" />
+			<param index="0" name="right" type="Vector2" />
 			<description>
 				Multiplies each component of the [Vector2] by the components of the given [Vector2].
 				[codeblock]
@@ -394,21 +394,21 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Vector2" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Multiplies each component of the [Vector2] by the given [float].
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector2" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Multiplies each component of the [Vector2] by the given [int].
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="Vector2" />
-			<argument index="0" name="right" type="Vector2" />
+			<param index="0" name="right" type="Vector2" />
 			<description>
 				Adds each component of the [Vector2] by the components of the given [Vector2].
 				[codeblock]
@@ -418,7 +418,7 @@
 		</operator>
 		<operator name="operator -">
 			<return type="Vector2" />
-			<argument index="0" name="right" type="Vector2" />
+			<param index="0" name="right" type="Vector2" />
 			<description>
 				Subtracts each component of the [Vector2] by the components of the given [Vector2].
 				[codeblock]
@@ -428,7 +428,7 @@
 		</operator>
 		<operator name="operator /">
 			<return type="Vector2" />
-			<argument index="0" name="right" type="Vector2" />
+			<param index="0" name="right" type="Vector2" />
 			<description>
 				Divides each component of the [Vector2] by the components of the given [Vector2].
 				[codeblock]
@@ -438,35 +438,35 @@
 		</operator>
 		<operator name="operator /">
 			<return type="Vector2" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Divides each component of the [Vector2] by the given [float].
 			</description>
 		</operator>
 		<operator name="operator /">
 			<return type="Vector2" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Divides each component of the [Vector2] by the given [int].
 			</description>
 		</operator>
 		<operator name="operator &lt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector2" />
+			<param index="0" name="right" type="Vector2" />
 			<description>
-				Compares two [Vector2] vectors by first checking if the X value of the left vector is less than the X value of the [code]right[/code] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors. This operator is useful for sorting vectors.
+				Compares two [Vector2] vectors by first checking if the X value of the left vector is less than the X value of the [param right] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors. This operator is useful for sorting vectors.
 			</description>
 		</operator>
 		<operator name="operator &lt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector2" />
+			<param index="0" name="right" type="Vector2" />
 			<description>
-				Compares two [Vector2] vectors by first checking if the X value of the left vector is less than or equal to the X value of the [code]right[/code] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors. This operator is useful for sorting vectors.
+				Compares two [Vector2] vectors by first checking if the X value of the left vector is less than or equal to the X value of the [param right] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors. This operator is useful for sorting vectors.
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector2" />
+			<param index="0" name="right" type="Vector2" />
 			<description>
 				Returns [code]true[/code] if the vectors are exactly equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
@@ -474,23 +474,23 @@
 		</operator>
 		<operator name="operator &gt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector2" />
+			<param index="0" name="right" type="Vector2" />
 			<description>
-				Compares two [Vector2] vectors by first checking if the X value of the left vector is greater than the X value of the [code]right[/code] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors. This operator is useful for sorting vectors.
+				Compares two [Vector2] vectors by first checking if the X value of the left vector is greater than the X value of the [param right] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors. This operator is useful for sorting vectors.
 			</description>
 		</operator>
 		<operator name="operator &gt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector2" />
+			<param index="0" name="right" type="Vector2" />
 			<description>
-				Compares two [Vector2] vectors by first checking if the X value of the left vector is greater than or equal to the X value of the [code]right[/code] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors. This operator is useful for sorting vectors.
+				Compares two [Vector2] vectors by first checking if the X value of the left vector is greater than or equal to the X value of the [param right] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors. This operator is useful for sorting vectors.
 			</description>
 		</operator>
 		<operator name="operator []">
 			<return type="float" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Access vector components using their index. [code]v[0][/code] is equivalent to [code]v.x[/code], and [code]v[1][/code] is equivalent to [code]v.y[/code].
+				Access vector components using their [param index]. [code]v[0][/code] is equivalent to [code]v.x[/code], and [code]v[1][/code] is equivalent to [code]v.y[/code].
 			</description>
 		</operator>
 		<operator name="operator unary+">
diff --git a/doc/classes/Vector2i.xml b/doc/classes/Vector2i.xml
index 28d68b6e44..eab880e57f 100644
--- a/doc/classes/Vector2i.xml
+++ b/doc/classes/Vector2i.xml
@@ -22,24 +22,24 @@
 		</constructor>
 		<constructor name="Vector2i">
 			<return type="Vector2i" />
-			<argument index="0" name="from" type="Vector2i" />
+			<param index="0" name="from" type="Vector2i" />
 			<description>
 				Constructs a [Vector2i] as a copy of the given [Vector2i].
 			</description>
 		</constructor>
 		<constructor name="Vector2i">
 			<return type="Vector2i" />
-			<argument index="0" name="from" type="Vector2" />
+			<param index="0" name="from" type="Vector2" />
 			<description>
 				Constructs a new [Vector2i] from [Vector2]. The floating point coordinates will be truncated.
 			</description>
 		</constructor>
 		<constructor name="Vector2i">
 			<return type="Vector2i" />
-			<argument index="0" name="x" type="int" />
-			<argument index="1" name="y" type="int" />
+			<param index="0" name="x" type="int" />
+			<param index="1" name="y" type="int" />
 			<description>
-				Constructs a new [Vector2i] from the given [code]x[/code] and [code]y[/code].
+				Constructs a new [Vector2i] from the given [param x] and [param y].
 			</description>
 		</constructor>
 	</constructors>
@@ -58,10 +58,10 @@
 		</method>
 		<method name="clamp" qualifiers="const">
 			<return type="Vector2i" />
-			<argument index="0" name="min" type="Vector2i" />
-			<argument index="1" name="max" type="Vector2i" />
+			<param index="0" name="min" type="Vector2i" />
+			<param index="1" name="max" type="Vector2i" />
 			<description>
-				Returns a new vector with all components clamped between the components of [code]min[/code] and [code]max[/code], by running [method @GlobalScope.clamp] on each component.
+				Returns a new vector with all components clamped between the components of [param min] and [param max], by running [method @GlobalScope.clamp] on each component.
 			</description>
 		</method>
 		<method name="length" qualifiers="const">
@@ -133,14 +133,14 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector2i" />
+			<param index="0" name="right" type="Vector2i" />
 			<description>
 				Returns [code]true[/code] if the vectors are not equal.
 			</description>
 		</operator>
 		<operator name="operator %">
 			<return type="Vector2i" />
-			<argument index="0" name="right" type="Vector2i" />
+			<param index="0" name="right" type="Vector2i" />
 			<description>
 				Gets the remainder of each component of the [Vector2i] with the components of the given [Vector2i]. This operation uses truncated division, which is often not desired as it does not work well with negative numbers. Consider using [method @GlobalScope.posmod] instead if you want to handle negative numbers.
 				[codeblock]
@@ -150,7 +150,7 @@
 		</operator>
 		<operator name="operator %">
 			<return type="Vector2i" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Gets the remainder of each component of the [Vector2i] with the the given [int]. This operation uses truncated division, which is often not desired as it does not work well with negative numbers. Consider using [method @GlobalScope.posmod] instead if you want to handle negative numbers.
 				[codeblock]
@@ -160,7 +160,7 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Vector2i" />
-			<argument index="0" name="right" type="Vector2i" />
+			<param index="0" name="right" type="Vector2i" />
 			<description>
 				Multiplies each component of the [Vector2i] by the components of the given [Vector2i].
 				[codeblock]
@@ -170,7 +170,7 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Vector2" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Multiplies each component of the [Vector2i] by the given [float]. Returns a [Vector2].
 				[codeblock]
@@ -180,14 +180,14 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Vector2i" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Multiplies each component of the [Vector2i] by the given [int].
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="Vector2i" />
-			<argument index="0" name="right" type="Vector2i" />
+			<param index="0" name="right" type="Vector2i" />
 			<description>
 				Adds each component of the [Vector2i] by the components of the given [Vector2i].
 				[codeblock]
@@ -197,7 +197,7 @@
 		</operator>
 		<operator name="operator -">
 			<return type="Vector2i" />
-			<argument index="0" name="right" type="Vector2i" />
+			<param index="0" name="right" type="Vector2i" />
 			<description>
 				Subtracts each component of the [Vector2i] by the components of the given [Vector2i].
 				[codeblock]
@@ -207,7 +207,7 @@
 		</operator>
 		<operator name="operator /">
 			<return type="Vector2i" />
-			<argument index="0" name="right" type="Vector2i" />
+			<param index="0" name="right" type="Vector2i" />
 			<description>
 				Divides each component of the [Vector2i] by the components of the given [Vector2i].
 				[codeblock]
@@ -217,7 +217,7 @@
 		</operator>
 		<operator name="operator /">
 			<return type="Vector2" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Divides each component of the [Vector2i] by the given [float]. Returns a [Vector2].
 				[codeblock]
@@ -227,51 +227,51 @@
 		</operator>
 		<operator name="operator /">
 			<return type="Vector2i" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Divides each component of the [Vector2i] by the given [int].
 			</description>
 		</operator>
 		<operator name="operator &lt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector2i" />
+			<param index="0" name="right" type="Vector2i" />
 			<description>
-				Compares two [Vector2i] vectors by first checking if the X value of the left vector is less than the X value of the [code]right[/code] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors. This operator is useful for sorting vectors.
+				Compares two [Vector2i] vectors by first checking if the X value of the left vector is less than the X value of the [param right] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors. This operator is useful for sorting vectors.
 			</description>
 		</operator>
 		<operator name="operator &lt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector2i" />
+			<param index="0" name="right" type="Vector2i" />
 			<description>
-				Compares two [Vector2i] vectors by first checking if the X value of the left vector is less than or equal to the X value of the [code]right[/code] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors. This operator is useful for sorting vectors.
+				Compares two [Vector2i] vectors by first checking if the X value of the left vector is less than or equal to the X value of the [param right] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors. This operator is useful for sorting vectors.
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector2i" />
+			<param index="0" name="right" type="Vector2i" />
 			<description>
 				Returns [code]true[/code] if the vectors are equal.
 			</description>
 		</operator>
 		<operator name="operator &gt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector2i" />
+			<param index="0" name="right" type="Vector2i" />
 			<description>
-				Compares two [Vector2i] vectors by first checking if the X value of the left vector is greater than the X value of the [code]right[/code] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors. This operator is useful for sorting vectors.
+				Compares two [Vector2i] vectors by first checking if the X value of the left vector is greater than the X value of the [param right] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors. This operator is useful for sorting vectors.
 			</description>
 		</operator>
 		<operator name="operator &gt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector2i" />
+			<param index="0" name="right" type="Vector2i" />
 			<description>
-				Compares two [Vector2i] vectors by first checking if the X value of the left vector is greater than or equal to the X value of the [code]right[/code] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors. This operator is useful for sorting vectors.
+				Compares two [Vector2i] vectors by first checking if the X value of the left vector is greater than or equal to the X value of the [param right] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors. This operator is useful for sorting vectors.
 			</description>
 		</operator>
 		<operator name="operator []">
 			<return type="int" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Access vector components using their index. [code]v[0][/code] is equivalent to [code]v.x[/code], and [code]v[1][/code] is equivalent to [code]v.y[/code].
+				Access vector components using their [param index]. [code]v[0][/code] is equivalent to [code]v.x[/code], and [code]v[1][/code] is equivalent to [code]v.y[/code].
 			</description>
 		</operator>
 		<operator name="operator unary+">
diff --git a/doc/classes/Vector3.xml b/doc/classes/Vector3.xml
index c181720a66..208e9935e3 100644
--- a/doc/classes/Vector3.xml
+++ b/doc/classes/Vector3.xml
@@ -25,23 +25,23 @@
 		</constructor>
 		<constructor name="Vector3">
 			<return type="Vector3" />
-			<argument index="0" name="from" type="Vector3" />
+			<param index="0" name="from" type="Vector3" />
 			<description>
 				Constructs a [Vector3] as a copy of the given [Vector3].
 			</description>
 		</constructor>
 		<constructor name="Vector3">
 			<return type="Vector3" />
-			<argument index="0" name="from" type="Vector3i" />
+			<param index="0" name="from" type="Vector3i" />
 			<description>
 				Constructs a new [Vector3] from [Vector3i].
 			</description>
 		</constructor>
 		<constructor name="Vector3">
 			<return type="Vector3" />
-			<argument index="0" name="x" type="float" />
-			<argument index="1" name="y" type="float" />
-			<argument index="2" name="z" type="float" />
+			<param index="0" name="x" type="float" />
+			<param index="1" name="y" type="float" />
+			<param index="2" name="z" type="float" />
 			<description>
 				Returns a [Vector3] with the given components.
 			</description>
@@ -56,24 +56,24 @@
 		</method>
 		<method name="angle_to" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="to" type="Vector3" />
+			<param index="0" name="to" type="Vector3" />
 			<description>
 				Returns the unsigned minimum angle to the given vector, in radians.
 			</description>
 		</method>
 		<method name="bezier_interpolate" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="control_1" type="Vector3" />
-			<argument index="1" name="control_2" type="Vector3" />
-			<argument index="2" name="end" type="Vector3" />
-			<argument index="3" name="t" type="float" />
+			<param index="0" name="control_1" type="Vector3" />
+			<param index="1" name="control_2" type="Vector3" />
+			<param index="2" name="end" type="Vector3" />
+			<param index="3" name="t" type="float" />
 			<description>
-				Returns the point at the given [code]t[/code] on the [url=https://en.wikipedia.org/wiki/B%C3%A9zier_curve]Bezier curve[/url] defined by this vector and the given [code]control_1[/code], [code]control_2[/code], and [code]end[/code] points.
+				Returns the point at the given [param t] on the [url=https://en.wikipedia.org/wiki/B%C3%A9zier_curve]Bezier curve[/url] defined by this vector and the given [param control_1], [param control_2], and [param end] points.
 			</description>
 		</method>
 		<method name="bounce" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="n" type="Vector3" />
+			<param index="0" name="n" type="Vector3" />
 			<description>
 				Returns the vector "bounced off" from a plane defined by the given normal.
 			</description>
@@ -86,56 +86,56 @@
 		</method>
 		<method name="clamp" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="min" type="Vector3" />
-			<argument index="1" name="max" type="Vector3" />
+			<param index="0" name="min" type="Vector3" />
+			<param index="1" name="max" type="Vector3" />
 			<description>
-				Returns a new vector with all components clamped between the components of [code]min[/code] and [code]max[/code], by running [method @GlobalScope.clamp] on each component.
+				Returns a new vector with all components clamped between the components of [param min] and [param max], by running [method @GlobalScope.clamp] on each component.
 			</description>
 		</method>
 		<method name="cross" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="with" type="Vector3" />
+			<param index="0" name="with" type="Vector3" />
 			<description>
-				Returns the cross product of this vector and [code]with[/code].
+				Returns the cross product of this vector and [param with].
 			</description>
 		</method>
 		<method name="cubic_interpolate" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="b" type="Vector3" />
-			<argument index="1" name="pre_a" type="Vector3" />
-			<argument index="2" name="post_b" type="Vector3" />
-			<argument index="3" name="weight" type="float" />
+			<param index="0" name="b" type="Vector3" />
+			<param index="1" name="pre_a" type="Vector3" />
+			<param index="2" name="post_b" type="Vector3" />
+			<param index="3" name="weight" type="float" />
 			<description>
-				Performs a cubic interpolation between this vector and [code]b[/code] using [code]pre_a[/code] and [code]post_b[/code] as handles, and returns the result at position [code]weight[/code]. [code]weight[/code] is on the range of 0.0 to 1.0, representing the amount of interpolation.
+				Performs a cubic interpolation between this vector and [param b] using [param pre_a] and [param post_b] as handles, and returns the result at position [param weight]. [param weight] is on the range of 0.0 to 1.0, representing the amount of interpolation.
 			</description>
 		</method>
 		<method name="direction_to" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="to" type="Vector3" />
+			<param index="0" name="to" type="Vector3" />
 			<description>
-				Returns the normalized vector pointing from this vector to [code]to[/code]. This is equivalent to using [code](b - a).normalized()[/code].
+				Returns the normalized vector pointing from this vector to [param to]. This is equivalent to using [code](b - a).normalized()[/code].
 			</description>
 		</method>
 		<method name="distance_squared_to" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="to" type="Vector3" />
+			<param index="0" name="to" type="Vector3" />
 			<description>
-				Returns the squared distance between this vector and [code]to[/code].
+				Returns the squared distance between this vector and [param to].
 				This method runs faster than [method distance_to], so prefer it if you need to compare vectors or need the squared distance for some formula.
 			</description>
 		</method>
 		<method name="distance_to" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="to" type="Vector3" />
+			<param index="0" name="to" type="Vector3" />
 			<description>
-				Returns the distance between this vector and [code]to[/code].
+				Returns the distance between this vector and [param to].
 			</description>
 		</method>
 		<method name="dot" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="with" type="Vector3" />
+			<param index="0" name="with" type="Vector3" />
 			<description>
-				Returns the dot product of this vector and [code]with[/code]. This can be used to compare the angle between two vectors. For example, this can be used to determine whether an enemy is facing the player.
+				Returns the dot product of this vector and [param with]. This can be used to compare the angle between two vectors. For example, this can be used to determine whether an enemy is facing the player.
 				The dot product will be [code]0[/code] for a straight angle (90 degrees), greater than 0 for angles narrower than 90 degrees and lower than 0 for angles wider than 90 degrees.
 				When using unit (normalized) vectors, the result will always be between [code]-1.0[/code] (180 degree angle) when the vectors are facing opposite directions, and [code]1.0[/code] (0 degree angle) when the vectors are aligned.
 				[b]Note:[/b] [code]a.dot(b)[/code] is equivalent to [code]b.dot(a)[/code].
@@ -155,9 +155,9 @@
 		</method>
 		<method name="is_equal_approx" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="to" type="Vector3" />
+			<param index="0" name="to" type="Vector3" />
 			<description>
-				Returns [code]true[/code] if this vector and [code]v[/code] are approximately equal, by running [method @GlobalScope.is_equal_approx] on each component.
+				Returns [code]true[/code] if this vector and [param to] are approximately equal, by running [method @GlobalScope.is_equal_approx] on each component.
 			</description>
 		</method>
 		<method name="is_normalized" qualifiers="const">
@@ -181,17 +181,17 @@
 		</method>
 		<method name="lerp" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="to" type="Vector3" />
-			<argument index="1" name="weight" type="float" />
+			<param index="0" name="to" type="Vector3" />
+			<param index="1" name="weight" type="float" />
 			<description>
-				Returns the result of the linear interpolation between this vector and [code]to[/code] by amount [code]weight[/code]. [code]weight[/code] is on the range of 0.0 to 1.0, representing the amount of interpolation.
+				Returns the result of the linear interpolation between this vector and [param to] by amount [param weight]. [param weight] is on the range of 0.0 to 1.0, representing the amount of interpolation.
 			</description>
 		</method>
 		<method name="limit_length" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="length" type="float" default="1.0" />
+			<param index="0" name="length" type="float" default="1.0" />
 			<description>
-				Returns the vector with a maximum length by limiting its length to [code]length[/code].
+				Returns the vector with a maximum length by limiting its length to [param length].
 			</description>
 		</method>
 		<method name="max_axis_index" qualifiers="const">
@@ -208,10 +208,10 @@
 		</method>
 		<method name="move_toward" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="to" type="Vector3" />
-			<argument index="1" name="delta" type="float" />
+			<param index="0" name="to" type="Vector3" />
+			<param index="1" name="delta" type="float" />
 			<description>
-				Returns a new vector moved toward [code]to[/code] by the fixed [code]delta[/code] amount. Will not go past the final value.
+				Returns a new vector moved toward [param to] by the fixed [param delta] amount. Will not go past the final value.
 			</description>
 		</method>
 		<method name="normalized" qualifiers="const">
@@ -222,7 +222,7 @@
 		</method>
 		<method name="octahedron_decode" qualifiers="static">
 			<return type="Vector3" />
-			<argument index="0" name="uv" type="Vector2" />
+			<param index="0" name="uv" type="Vector2" />
 			<description>
 			</description>
 		</method>
@@ -233,45 +233,45 @@
 		</method>
 		<method name="outer" qualifiers="const">
 			<return type="Basis" />
-			<argument index="0" name="with" type="Vector3" />
+			<param index="0" name="with" type="Vector3" />
 			<description>
-				Returns the outer product with [code]with[/code].
+				Returns the outer product with [param with].
 			</description>
 		</method>
 		<method name="posmod" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="mod" type="float" />
+			<param index="0" name="mod" type="float" />
 			<description>
-				Returns a vector composed of the [method @GlobalScope.fposmod] of this vector's components and [code]mod[/code].
+				Returns a vector composed of the [method @GlobalScope.fposmod] of this vector's components and [param mod].
 			</description>
 		</method>
 		<method name="posmodv" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="modv" type="Vector3" />
+			<param index="0" name="modv" type="Vector3" />
 			<description>
-				Returns a vector composed of the [method @GlobalScope.fposmod] of this vector's components and [code]modv[/code]'s components.
+				Returns a vector composed of the [method @GlobalScope.fposmod] of this vector's components and [param modv]'s components.
 			</description>
 		</method>
 		<method name="project" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="b" type="Vector3" />
+			<param index="0" name="b" type="Vector3" />
 			<description>
-				Returns this vector projected onto the vector [code]b[/code].
+				Returns this vector projected onto the vector [param b].
 			</description>
 		</method>
 		<method name="reflect" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="n" type="Vector3" />
+			<param index="0" name="n" type="Vector3" />
 			<description>
 				Returns this vector reflected from a plane defined by the given normal.
 			</description>
 		</method>
 		<method name="rotated" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="axis" type="Vector3" />
-			<argument index="1" name="angle" type="float" />
+			<param index="0" name="axis" type="Vector3" />
+			<param index="1" name="angle" type="float" />
 			<description>
-				Rotates this vector around a given axis by [code]angle[/code] (in radians). The axis must be a normalized vector.
+				Rotates this vector around a given axis by [param angle] (in radians). The axis must be a normalized vector.
 			</description>
 		</method>
 		<method name="round" qualifiers="const">
@@ -288,33 +288,33 @@
 		</method>
 		<method name="signed_angle_to" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="to" type="Vector3" />
-			<argument index="1" name="axis" type="Vector3" />
+			<param index="0" name="to" type="Vector3" />
+			<param index="1" name="axis" type="Vector3" />
 			<description>
-				Returns the signed angle to the given vector, in radians. The sign of the angle is positive in a counter-clockwise direction and negative in a clockwise direction when viewed from the side specified by the [code]axis[/code].
+				Returns the signed angle to the given vector, in radians. The sign of the angle is positive in a counter-clockwise direction and negative in a clockwise direction when viewed from the side specified by the [param axis].
 			</description>
 		</method>
 		<method name="slerp" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="to" type="Vector3" />
-			<argument index="1" name="weight" type="float" />
+			<param index="0" name="to" type="Vector3" />
+			<param index="1" name="weight" type="float" />
 			<description>
-				Returns the result of spherical linear interpolation between this vector and [code]to[/code], by amount [code]weight[/code]. [code]weight[/code] is on the range of 0.0 to 1.0, representing the amount of interpolation.
+				Returns the result of spherical linear interpolation between this vector and [param to], by amount [param weight]. [param weight] is on the range of 0.0 to 1.0, representing the amount of interpolation.
 				This method also handles interpolating the lengths if the input vectors have different lengths. For the special case of one or both input vectors having zero length, this method behaves like [method lerp].
 			</description>
 		</method>
 		<method name="slide" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="n" type="Vector3" />
+			<param index="0" name="n" type="Vector3" />
 			<description>
 				Returns this vector slid along a plane defined by the given normal.
 			</description>
 		</method>
 		<method name="snapped" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="step" type="Vector3" />
+			<param index="0" name="step" type="Vector3" />
 			<description>
-				Returns this vector with each component snapped to the nearest multiple of [code]step[/code]. This can also be used to round to an arbitrary number of decimals.
+				Returns this vector with each component snapped to the nearest multiple of [param step]. This can also be used to round to an arbitrary number of decimals.
 			</description>
 		</method>
 	</methods>
@@ -370,7 +370,7 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector3" />
+			<param index="0" name="right" type="Vector3" />
 			<description>
 				Returns [code]true[/code] if the vectors are not equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
@@ -378,28 +378,28 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Vector3" />
-			<argument index="0" name="right" type="Basis" />
+			<param index="0" name="right" type="Basis" />
 			<description>
 				Inversely transforms (multiplies) the [Vector3] by the given [Basis] matrix.
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector3" />
-			<argument index="0" name="right" type="Quaternion" />
+			<param index="0" name="right" type="Quaternion" />
 			<description>
 				Inversely transforms (multiplies) the [Vector3] by the given [Quaternion].
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector3" />
-			<argument index="0" name="right" type="Transform3D" />
+			<param index="0" name="right" type="Transform3D" />
 			<description>
 				Inversely transforms (multiplies) the [Vector3] by the given [Transform3D] transformation matrix.
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector3" />
-			<argument index="0" name="right" type="Vector3" />
+			<param index="0" name="right" type="Vector3" />
 			<description>
 				Multiplies each component of the [Vector3] by the components of the given [Vector3].
 				[codeblock]
@@ -409,21 +409,21 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Vector3" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Multiplies each component of the [Vector3] by the given [float].
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector3" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Multiplies each component of the [Vector3] by the given [int].
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="Vector3" />
-			<argument index="0" name="right" type="Vector3" />
+			<param index="0" name="right" type="Vector3" />
 			<description>
 				Adds each component of the [Vector3] by the components of the given [Vector3].
 				[codeblock]
@@ -433,7 +433,7 @@
 		</operator>
 		<operator name="operator -">
 			<return type="Vector3" />
-			<argument index="0" name="right" type="Vector3" />
+			<param index="0" name="right" type="Vector3" />
 			<description>
 				Subtracts each component of the [Vector3] by the components of the given [Vector3].
 				[codeblock]
@@ -443,7 +443,7 @@
 		</operator>
 		<operator name="operator /">
 			<return type="Vector3" />
-			<argument index="0" name="right" type="Vector3" />
+			<param index="0" name="right" type="Vector3" />
 			<description>
 				Divides each component of the [Vector3] by the components of the given [Vector3].
 				[codeblock]
@@ -453,35 +453,35 @@
 		</operator>
 		<operator name="operator /">
 			<return type="Vector3" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Divides each component of the [Vector3] by the given [float].
 			</description>
 		</operator>
 		<operator name="operator /">
 			<return type="Vector3" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Divides each component of the [Vector3] by the given [int].
 			</description>
 		</operator>
 		<operator name="operator &lt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector3" />
+			<param index="0" name="right" type="Vector3" />
 			<description>
-				Compares two [Vector3] vectors by first checking if the X value of the left vector is less than the X value of the [code]right[/code] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, and then with the Z values. This operator is useful for sorting vectors.
+				Compares two [Vector3] vectors by first checking if the X value of the left vector is less than the X value of the [param right] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, and then with the Z values. This operator is useful for sorting vectors.
 			</description>
 		</operator>
 		<operator name="operator &lt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector3" />
+			<param index="0" name="right" type="Vector3" />
 			<description>
-				Compares two [Vector3] vectors by first checking if the X value of the left vector is less than or equal to the X value of the [code]right[/code] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, and then with the Z values. This operator is useful for sorting vectors.
+				Compares two [Vector3] vectors by first checking if the X value of the left vector is less than or equal to the X value of the [param right] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, and then with the Z values. This operator is useful for sorting vectors.
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector3" />
+			<param index="0" name="right" type="Vector3" />
 			<description>
 				Returns [code]true[/code] if the vectors are exactly equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
@@ -489,23 +489,23 @@
 		</operator>
 		<operator name="operator &gt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector3" />
+			<param index="0" name="right" type="Vector3" />
 			<description>
-				Compares two [Vector3] vectors by first checking if the X value of the left vector is greater than the X value of the [code]right[/code] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, and then with the Z values. This operator is useful for sorting vectors.
+				Compares two [Vector3] vectors by first checking if the X value of the left vector is greater than the X value of the [param right] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, and then with the Z values. This operator is useful for sorting vectors.
 			</description>
 		</operator>
 		<operator name="operator &gt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector3" />
+			<param index="0" name="right" type="Vector3" />
 			<description>
-				Compares two [Vector3] vectors by first checking if the X value of the left vector is greater than or equal to the X value of the [code]right[/code] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, and then with the Z values. This operator is useful for sorting vectors.
+				Compares two [Vector3] vectors by first checking if the X value of the left vector is greater than or equal to the X value of the [param right] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, and then with the Z values. This operator is useful for sorting vectors.
 			</description>
 		</operator>
 		<operator name="operator []">
 			<return type="float" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Access vector components using their index. [code]v[0][/code] is equivalent to [code]v.x[/code], [code]v[1][/code] is equivalent to [code]v.y[/code], and [code]v[2][/code] is equivalent to [code]v.z[/code].
+				Access vector components using their [param index]. [code]v[0][/code] is equivalent to [code]v.x[/code], [code]v[1][/code] is equivalent to [code]v.y[/code], and [code]v[2][/code] is equivalent to [code]v.z[/code].
 			</description>
 		</operator>
 		<operator name="operator unary+">
diff --git a/doc/classes/Vector3i.xml b/doc/classes/Vector3i.xml
index ebb518792f..1c2a033f7a 100644
--- a/doc/classes/Vector3i.xml
+++ b/doc/classes/Vector3i.xml
@@ -22,23 +22,23 @@
 		</constructor>
 		<constructor name="Vector3i">
 			<return type="Vector3i" />
-			<argument index="0" name="from" type="Vector3i" />
+			<param index="0" name="from" type="Vector3i" />
 			<description>
 				Constructs a [Vector3i] as a copy of the given [Vector3i].
 			</description>
 		</constructor>
 		<constructor name="Vector3i">
 			<return type="Vector3i" />
-			<argument index="0" name="from" type="Vector3" />
+			<param index="0" name="from" type="Vector3" />
 			<description>
 				Constructs a new [Vector3i] from [Vector3]. The floating point coordinates will be truncated.
 			</description>
 		</constructor>
 		<constructor name="Vector3i">
 			<return type="Vector3i" />
-			<argument index="0" name="x" type="int" />
-			<argument index="1" name="y" type="int" />
-			<argument index="2" name="z" type="int" />
+			<param index="0" name="x" type="int" />
+			<param index="1" name="y" type="int" />
+			<param index="2" name="z" type="int" />
 			<description>
 				Returns a [Vector3i] with the given components.
 			</description>
@@ -53,10 +53,10 @@
 		</method>
 		<method name="clamp" qualifiers="const">
 			<return type="Vector3i" />
-			<argument index="0" name="min" type="Vector3i" />
-			<argument index="1" name="max" type="Vector3i" />
+			<param index="0" name="min" type="Vector3i" />
+			<param index="1" name="max" type="Vector3i" />
 			<description>
-				Returns a new vector with all components clamped between the components of [code]min[/code] and [code]max[/code], by running [method @GlobalScope.clamp] on each component.
+				Returns a new vector with all components clamped between the components of [param min] and [param max], by running [method @GlobalScope.clamp] on each component.
 			</description>
 		</method>
 		<method name="length" qualifiers="const">
@@ -140,14 +140,14 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector3i" />
+			<param index="0" name="right" type="Vector3i" />
 			<description>
 				Returns [code]true[/code] if the vectors are not equal.
 			</description>
 		</operator>
 		<operator name="operator %">
 			<return type="Vector3i" />
-			<argument index="0" name="right" type="Vector3i" />
+			<param index="0" name="right" type="Vector3i" />
 			<description>
 				Gets the remainder of each component of the [Vector3i] with the components of the given [Vector3i]. This operation uses truncated division, which is often not desired as it does not work well with negative numbers. Consider using [method @GlobalScope.posmod] instead if you want to handle negative numbers.
 				[codeblock]
@@ -157,7 +157,7 @@
 		</operator>
 		<operator name="operator %">
 			<return type="Vector3i" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Gets the remainder of each component of the [Vector3i] with the the given [int]. This operation uses truncated division, which is often not desired as it does not work well with negative numbers. Consider using [method @GlobalScope.posmod] instead if you want to handle negative numbers.
 				[codeblock]
@@ -167,7 +167,7 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Vector3i" />
-			<argument index="0" name="right" type="Vector3i" />
+			<param index="0" name="right" type="Vector3i" />
 			<description>
 				Multiplies each component of the [Vector3i] by the components of the given [Vector3i].
 				[codeblock]
@@ -177,7 +177,7 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Vector3" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Multiplies each component of the [Vector3i] by the given [float]. Returns a [Vector3].
 				[codeblock]
@@ -187,14 +187,14 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Vector3i" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Multiplies each component of the [Vector3i] by the given [int].
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="Vector3i" />
-			<argument index="0" name="right" type="Vector3i" />
+			<param index="0" name="right" type="Vector3i" />
 			<description>
 				Adds each component of the [Vector3i] by the components of the given [Vector3i].
 				[codeblock]
@@ -204,7 +204,7 @@
 		</operator>
 		<operator name="operator -">
 			<return type="Vector3i" />
-			<argument index="0" name="right" type="Vector3i" />
+			<param index="0" name="right" type="Vector3i" />
 			<description>
 				Subtracts each component of the [Vector3i] by the components of the given [Vector3i].
 				[codeblock]
@@ -214,7 +214,7 @@
 		</operator>
 		<operator name="operator /">
 			<return type="Vector3i" />
-			<argument index="0" name="right" type="Vector3i" />
+			<param index="0" name="right" type="Vector3i" />
 			<description>
 				Divides each component of the [Vector3i] by the components of the given [Vector3i].
 				[codeblock]
@@ -224,7 +224,7 @@
 		</operator>
 		<operator name="operator /">
 			<return type="Vector3" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Divides each component of the [Vector3i] by the given [float]. Returns a [Vector3].
 				[codeblock]
@@ -234,51 +234,51 @@
 		</operator>
 		<operator name="operator /">
 			<return type="Vector3i" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Divides each component of the [Vector3i] by the given [int].
 			</description>
 		</operator>
 		<operator name="operator &lt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector3i" />
+			<param index="0" name="right" type="Vector3i" />
 			<description>
-				Compares two [Vector3i] vectors by first checking if the X value of the left vector is less than the X value of the [code]right[/code] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, and then with the Z values. This operator is useful for sorting vectors.
+				Compares two [Vector3i] vectors by first checking if the X value of the left vector is less than the X value of the [param right] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, and then with the Z values. This operator is useful for sorting vectors.
 			</description>
 		</operator>
 		<operator name="operator &lt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector3i" />
+			<param index="0" name="right" type="Vector3i" />
 			<description>
-				Compares two [Vector3i] vectors by first checking if the X value of the left vector is less than or equal to the X value of the [code]right[/code] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, and then with the Z values. This operator is useful for sorting vectors.
+				Compares two [Vector3i] vectors by first checking if the X value of the left vector is less than or equal to the X value of the [param right] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, and then with the Z values. This operator is useful for sorting vectors.
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector3i" />
+			<param index="0" name="right" type="Vector3i" />
 			<description>
 				Returns [code]true[/code] if the vectors are equal.
 			</description>
 		</operator>
 		<operator name="operator &gt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector3i" />
+			<param index="0" name="right" type="Vector3i" />
 			<description>
-				Compares two [Vector3i] vectors by first checking if the X value of the left vector is greater than the X value of the [code]right[/code] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, and then with the Z values. This operator is useful for sorting vectors.
+				Compares two [Vector3i] vectors by first checking if the X value of the left vector is greater than the X value of the [param right] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, and then with the Z values. This operator is useful for sorting vectors.
 			</description>
 		</operator>
 		<operator name="operator &gt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector3i" />
+			<param index="0" name="right" type="Vector3i" />
 			<description>
-				Compares two [Vector3i] vectors by first checking if the X value of the left vector is greater than or equal to the X value of the [code]right[/code] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, and then with the Z values. This operator is useful for sorting vectors.
+				Compares two [Vector3i] vectors by first checking if the X value of the left vector is greater than or equal to the X value of the [param right] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, and then with the Z values. This operator is useful for sorting vectors.
 			</description>
 		</operator>
 		<operator name="operator []">
 			<return type="int" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Access vector components using their index. [code]v[0][/code] is equivalent to [code]v.x[/code], [code]v[1][/code] is equivalent to [code]v.y[/code], and [code]v[2][/code] is equivalent to [code]v.z[/code].
+				Access vector components using their [param index]. [code]v[0][/code] is equivalent to [code]v.x[/code], [code]v[1][/code] is equivalent to [code]v.y[/code], and [code]v[2][/code] is equivalent to [code]v.z[/code].
 			</description>
 		</operator>
 		<operator name="operator unary+">
diff --git a/doc/classes/Vector4.xml b/doc/classes/Vector4.xml
index da0df2672e..538cdd4138 100644
--- a/doc/classes/Vector4.xml
+++ b/doc/classes/Vector4.xml
@@ -19,24 +19,24 @@
 		</constructor>
 		<constructor name="Vector4">
 			<return type="Vector4" />
-			<argument index="0" name="from" type="Vector4" />
+			<param index="0" name="from" type="Vector4" />
 			<description>
 				Constructs a [Vector4] as a copy of the given [Vector4].
 			</description>
 		</constructor>
 		<constructor name="Vector4">
 			<return type="Vector4" />
-			<argument index="0" name="from" type="Vector4i" />
+			<param index="0" name="from" type="Vector4i" />
 			<description>
 				Constructs a new [Vector4] from [Vector4i].
 			</description>
 		</constructor>
 		<constructor name="Vector4">
 			<return type="Vector4" />
-			<argument index="0" name="x" type="float" />
-			<argument index="1" name="y" type="float" />
-			<argument index="2" name="z" type="float" />
-			<argument index="3" name="w" type="float" />
+			<param index="0" name="x" type="float" />
+			<param index="1" name="y" type="float" />
+			<param index="2" name="z" type="float" />
+			<param index="3" name="w" type="float" />
 			<description>
 				Returns a [Vector4] with the given components.
 			</description>
@@ -57,17 +57,49 @@
 		</method>
 		<method name="clamp" qualifiers="const">
 			<return type="Vector4" />
-			<argument index="0" name="min" type="Vector4" />
-			<argument index="1" name="max" type="Vector4" />
+			<param index="0" name="min" type="Vector4" />
+			<param index="1" name="max" type="Vector4" />
 			<description>
-				Returns a new vector with all components clamped between the components of [code]min[/code] and [code]max[/code], by running [method @GlobalScope.clamp] on each component.
+				Returns a new vector with all components clamped between the components of [param min] and [param max], by running [method @GlobalScope.clamp] on each component.
+			</description>
+		</method>
+		<method name="cubic_interpolate" qualifiers="const">
+			<return type="Vector4" />
+			<param index="0" name="b" type="Vector4" />
+			<param index="1" name="pre_a" type="Vector4" />
+			<param index="2" name="post_b" type="Vector4" />
+			<param index="3" name="weight" type="float" />
+			<description>
+				Performs a cubic interpolation between this vector and [param b] using [param pre_a] and [param post_b] as handles, and returns the result at position [param weight]. [param weight] is on the range of 0.0 to 1.0, representing the amount of interpolation.
+			</description>
+		</method>
+		<method name="direction_to" qualifiers="const">
+			<return type="Vector4" />
+			<param index="0" name="to" type="Vector4" />
+			<description>
+				Returns the normalized vector pointing from this vector to [param to]. This is equivalent to using [code](b - a).normalized()[/code].
+			</description>
+		</method>
+		<method name="distance_squared_to" qualifiers="const">
+			<return type="float" />
+			<param index="0" name="to" type="Vector4" />
+			<description>
+				Returns the squared distance between this vector and [param to].
+				This method runs faster than [method distance_to], so prefer it if you need to compare vectors or need the squared distance for some formula.
+			</description>
+		</method>
+		<method name="distance_to" qualifiers="const">
+			<return type="float" />
+			<param index="0" name="to" type="Vector4" />
+			<description>
+				Returns the distance between this vector and [param to].
 			</description>
 		</method>
 		<method name="dot" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="with" type="Vector4" />
+			<param index="0" name="with" type="Vector4" />
 			<description>
-				Returns the dot product of this vector and [code]with[/code].
+				Returns the dot product of this vector and [param with].
 			</description>
 		</method>
 		<method name="floor" qualifiers="const">
@@ -84,9 +116,9 @@
 		</method>
 		<method name="is_equal_approx" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="with" type="Vector4" />
+			<param index="0" name="with" type="Vector4" />
 			<description>
-				Returns [code]true[/code] if this vector and [code]v[/code] are approximately equal, by running [method @GlobalScope.is_equal_approx] on each component.
+				Returns [code]true[/code] if this vector and [param with] are approximately equal, by running [method @GlobalScope.is_equal_approx] on each component.
 			</description>
 		</method>
 		<method name="is_normalized" qualifiers="const">
@@ -109,10 +141,10 @@
 		</method>
 		<method name="lerp" qualifiers="const">
 			<return type="Vector4" />
-			<argument index="0" name="to" type="Vector4" />
-			<argument index="1" name="weight" type="float" />
+			<param index="0" name="to" type="Vector4" />
+			<param index="1" name="weight" type="float" />
 			<description>
-				Returns the result of the linear interpolation between this vector and [code]to[/code] by amount [code]weight[/code]. [code]weight[/code] is on the range of [code]0.0[/code] to [code]1.0[/code], representing the amount of interpolation.
+				Returns the result of the linear interpolation between this vector and [param to] by amount [param weight]. [param weight] is on the range of [code]0.0[/code] to [code]1.0[/code], representing the amount of interpolation.
 			</description>
 		</method>
 		<method name="max_axis_index" qualifiers="const">
@@ -133,6 +165,20 @@
 				Returns the vector scaled to unit length. Equivalent to [code]v / v.length()[/code].
 			</description>
 		</method>
+		<method name="posmod" qualifiers="const">
+			<return type="Vector4" />
+			<param index="0" name="mod" type="float" />
+			<description>
+				Returns a vector composed of the [method @GlobalScope.fposmod] of this vector's components and [param mod].
+			</description>
+		</method>
+		<method name="posmodv" qualifiers="const">
+			<return type="Vector4" />
+			<param index="0" name="modv" type="Vector4" />
+			<description>
+				Returns a vector composed of the [method @GlobalScope.fposmod] of this vector's components and [param modv]'s components.
+			</description>
+		</method>
 		<method name="round" qualifiers="const">
 			<return type="Vector4" />
 			<description>
@@ -145,6 +191,13 @@
 				Returns a new vector with each component set to one or negative one, depending on the signs of the components, or zero if the component is zero, by calling [method @GlobalScope.sign] on each component.
 			</description>
 		</method>
+		<method name="snapped" qualifiers="const">
+			<return type="Vector4" />
+			<param index="0" name="step" type="Vector4" />
+			<description>
+				Returns this vector with each component snapped to the nearest multiple of [param step]. This can also be used to round to an arbitrary number of decimals.
+			</description>
+		</method>
 	</methods>
 	<members>
 		<member name="w" type="float" setter="" getter="" default="0.0">
@@ -186,7 +239,7 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector4" />
+			<param index="0" name="right" type="Vector4" />
 			<description>
 				Returns [code]true[/code] if the vectors are not equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
@@ -194,14 +247,14 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Vector4" />
-			<argument index="0" name="right" type="Projection" />
+			<param index="0" name="right" type="Projection" />
 			<description>
 				Inversely transforms (multiplies) the [Vector4] by the given [Projection] matrix.
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector4" />
-			<argument index="0" name="right" type="Vector4" />
+			<param index="0" name="right" type="Vector4" />
 			<description>
 				Multiplies each component of the [Vector4] by the components of the given [Vector4].
 				[codeblock]
@@ -211,7 +264,7 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Vector4" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Multiplies each component of the [Vector4] by the given [float].
 				[codeblock]
@@ -221,14 +274,14 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Vector4" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Multiplies each component of the [Vector4] by the given [int].
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="Vector4" />
-			<argument index="0" name="right" type="Vector4" />
+			<param index="0" name="right" type="Vector4" />
 			<description>
 				Adds each component of the [Vector4] by the components of the given [Vector4].
 				[codeblock]
@@ -238,7 +291,7 @@
 		</operator>
 		<operator name="operator -">
 			<return type="Vector4" />
-			<argument index="0" name="right" type="Vector4" />
+			<param index="0" name="right" type="Vector4" />
 			<description>
 				Subtracts each component of the [Vector4] by the components of the given [Vector4].
 				[codeblock]
@@ -248,7 +301,7 @@
 		</operator>
 		<operator name="operator /">
 			<return type="Vector4" />
-			<argument index="0" name="right" type="Vector4" />
+			<param index="0" name="right" type="Vector4" />
 			<description>
 				Divides each component of the [Vector4] by the components of the given [Vector4].
 				[codeblock]
@@ -258,7 +311,7 @@
 		</operator>
 		<operator name="operator /">
 			<return type="Vector4" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Divides each component of the [Vector4] by the given [float].
 				[codeblock]
@@ -268,28 +321,28 @@
 		</operator>
 		<operator name="operator /">
 			<return type="Vector4" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Divides each component of the [Vector4] by the given [int].
 			</description>
 		</operator>
 		<operator name="operator &lt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector4" />
+			<param index="0" name="right" type="Vector4" />
 			<description>
-				Compares two [Vector4] vectors by first checking if the X value of the left vector is less than the X value of the [code]right[/code] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, Z values of the two vectors, and then with the W values. This operator is useful for sorting vectors.
+				Compares two [Vector4] vectors by first checking if the X value of the left vector is less than the X value of the [param right] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, Z values of the two vectors, and then with the W values. This operator is useful for sorting vectors.
 			</description>
 		</operator>
 		<operator name="operator &lt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector4" />
+			<param index="0" name="right" type="Vector4" />
 			<description>
-				Compares two [Vector4] vectors by first checking if the X value of the left vector is less than or equal to the X value of the [code]right[/code] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, Z values of the two vectors, and then with the W values. This operator is useful for sorting vectors.
+				Compares two [Vector4] vectors by first checking if the X value of the left vector is less than or equal to the X value of the [param right] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, Z values of the two vectors, and then with the W values. This operator is useful for sorting vectors.
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector4" />
+			<param index="0" name="right" type="Vector4" />
 			<description>
 				Returns [code]true[/code] if the vectors are exactly equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method is_equal_approx] instead, which is more reliable.
@@ -297,23 +350,23 @@
 		</operator>
 		<operator name="operator &gt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector4" />
+			<param index="0" name="right" type="Vector4" />
 			<description>
-				Compares two [Vector4] vectors by first checking if the X value of the left vector is greater than the X value of the [code]right[/code] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, Z values of the two vectors, and then with the W values. This operator is useful for sorting vectors.
+				Compares two [Vector4] vectors by first checking if the X value of the left vector is greater than the X value of the [param right] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, Z values of the two vectors, and then with the W values. This operator is useful for sorting vectors.
 			</description>
 		</operator>
 		<operator name="operator &gt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector4" />
+			<param index="0" name="right" type="Vector4" />
 			<description>
-				Access vector components using their index. [code]v[0][/code] is equivalent to [code]v.x[/code], [code]v[1][/code] is equivalent to [code]v.y[/code], and [code]v[2][/code] is equivalent to [code]v.z[/code].
+				Compares two [Vector4] vectors by first checking if the X value of the left vector is greater than or equal to the X value of the [param right] vector. If the X values are exactly equal, then it repeats this check with the Y values of the two vectors, Z values of the two vectors, and then with the W values. This operator is useful for sorting vectors.
 			</description>
 		</operator>
 		<operator name="operator []">
 			<return type="float" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
-				Access vector components using their index. [code]v[0][/code] is equivalent to [code]v.x[/code], [code]v[1][/code] is equivalent to [code]v.y[/code], [code]v[2][/code] is equivalent to [code]v.z[/code], and [code]v[3][/code] is equivalent to [code]v.w[/code].
+				Access vector components using their [param index]. [code]v[0][/code] is equivalent to [code]v.x[/code], [code]v[1][/code] is equivalent to [code]v.y[/code], [code]v[2][/code] is equivalent to [code]v.z[/code], and [code]v[3][/code] is equivalent to [code]v.w[/code].
 			</description>
 		</operator>
 		<operator name="operator unary+">
diff --git a/doc/classes/Vector4i.xml b/doc/classes/Vector4i.xml
index 6acce12e9f..9a36c3c4fa 100644
--- a/doc/classes/Vector4i.xml
+++ b/doc/classes/Vector4i.xml
@@ -14,22 +14,22 @@
 		</constructor>
 		<constructor name="Vector4i">
 			<return type="Vector4i" />
-			<argument index="0" name="from" type="Vector4i" />
+			<param index="0" name="from" type="Vector4i" />
 			<description>
 			</description>
 		</constructor>
 		<constructor name="Vector4i">
 			<return type="Vector4i" />
-			<argument index="0" name="from" type="Vector4" />
+			<param index="0" name="from" type="Vector4" />
 			<description>
 			</description>
 		</constructor>
 		<constructor name="Vector4i">
 			<return type="Vector4i" />
-			<argument index="0" name="x" type="int" />
-			<argument index="1" name="y" type="int" />
-			<argument index="2" name="z" type="int" />
-			<argument index="3" name="w" type="int" />
+			<param index="0" name="x" type="int" />
+			<param index="1" name="y" type="int" />
+			<param index="2" name="z" type="int" />
+			<param index="3" name="w" type="int" />
 			<description>
 			</description>
 		</constructor>
@@ -42,8 +42,8 @@
 		</method>
 		<method name="clamp" qualifiers="const">
 			<return type="Vector4i" />
-			<argument index="0" name="min" type="Vector4i" />
-			<argument index="1" name="max" type="Vector4i" />
+			<param index="0" name="min" type="Vector4i" />
+			<param index="1" name="max" type="Vector4i" />
 			<description>
 			</description>
 		</method>
@@ -100,103 +100,103 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector4i" />
+			<param index="0" name="right" type="Vector4i" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator %">
 			<return type="Vector4i" />
-			<argument index="0" name="right" type="Vector4i" />
+			<param index="0" name="right" type="Vector4i" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator %">
 			<return type="Vector4i" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector4i" />
-			<argument index="0" name="right" type="Vector4i" />
+			<param index="0" name="right" type="Vector4i" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector4" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector4i" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="Vector4i" />
-			<argument index="0" name="right" type="Vector4i" />
+			<param index="0" name="right" type="Vector4i" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator -">
 			<return type="Vector4i" />
-			<argument index="0" name="right" type="Vector4i" />
+			<param index="0" name="right" type="Vector4i" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator /">
 			<return type="Vector4i" />
-			<argument index="0" name="right" type="Vector4i" />
+			<param index="0" name="right" type="Vector4i" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator /">
 			<return type="Vector4" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator /">
 			<return type="Vector4i" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator &lt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector4i" />
+			<param index="0" name="right" type="Vector4i" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator &lt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector4i" />
+			<param index="0" name="right" type="Vector4i" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector4i" />
+			<param index="0" name="right" type="Vector4i" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator &gt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector4i" />
+			<param index="0" name="right" type="Vector4i" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator &gt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="Vector4i" />
+			<param index="0" name="right" type="Vector4i" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator []">
 			<return type="int" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 			</description>
 		</operator>
diff --git a/doc/classes/VelocityTracker3D.xml b/doc/classes/VelocityTracker3D.xml
deleted file mode 100644
index 45ded446eb..0000000000
--- a/doc/classes/VelocityTracker3D.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="VelocityTracker3D" inherits="RefCounted" version="4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
-	<brief_description>
-	</brief_description>
-	<description>
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-		<method name="get_tracked_linear_velocity" qualifiers="const">
-			<return type="Vector3" />
-			<description>
-			</description>
-		</method>
-		<method name="reset">
-			<return type="void" />
-			<argument index="0" name="position" type="Vector3" />
-			<description>
-			</description>
-		</method>
-		<method name="update_position">
-			<return type="void" />
-			<argument index="0" name="position" type="Vector3" />
-			<description>
-			</description>
-		</method>
-	</methods>
-	<members>
-		<member name="track_physics_step" type="bool" setter="set_track_physics_step" getter="is_tracking_physics_step" default="false">
-		</member>
-	</members>
-</class>
diff --git a/doc/classes/Viewport.xml b/doc/classes/Viewport.xml
index 0808a8f1cf..93e7e20f5a 100644
--- a/doc/classes/Viewport.xml
+++ b/doc/classes/Viewport.xml
@@ -59,15 +59,15 @@
 		</method>
 		<method name="get_positional_shadow_atlas_quadrant_subdiv" qualifiers="const">
 			<return type="int" enum="Viewport.PositionalShadowAtlasQuadrantSubdiv" />
-			<argument index="0" name="quadrant" type="int" />
+			<param index="0" name="quadrant" type="int" />
 			<description>
 				Returns the [enum PositionalShadowAtlasQuadrantSubdiv] of the specified quadrant.
 			</description>
 		</method>
 		<method name="get_render_info">
 			<return type="int" />
-			<argument index="0" name="type" type="int" enum="Viewport.RenderInfoType" />
-			<argument index="1" name="info" type="int" enum="Viewport.RenderInfo" />
+			<param index="0" name="type" type="int" enum="Viewport.RenderInfoType" />
+			<param index="1" name="info" type="int" enum="Viewport.RenderInfo" />
 			<description>
 			</description>
 		</method>
@@ -133,22 +133,21 @@
 		</method>
 		<method name="push_input">
 			<return type="void" />
-			<argument index="0" name="event" type="InputEvent" />
-			<argument index="1" name="in_local_coords" type="bool" default="false" />
+			<param index="0" name="event" type="InputEvent" />
+			<param index="1" name="in_local_coords" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
 		<method name="push_text_input">
 			<return type="void" />
-			<argument index="0" name="text" type="String" />
+			<param index="0" name="text" type="String" />
 			<description>
-				Returns [code]true[/code] if the viewport is currently embedding windows.
 			</description>
 		</method>
 		<method name="push_unhandled_input">
 			<return type="void" />
-			<argument index="0" name="event" type="InputEvent" />
-			<argument index="1" name="in_local_coords" type="bool" default="false" />
+			<param index="0" name="event" type="InputEvent" />
+			<param index="1" name="in_local_coords" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
@@ -160,15 +159,15 @@
 		</method>
 		<method name="set_positional_shadow_atlas_quadrant_subdiv">
 			<return type="void" />
-			<argument index="0" name="quadrant" type="int" />
-			<argument index="1" name="subdiv" type="int" enum="Viewport.PositionalShadowAtlasQuadrantSubdiv" />
+			<param index="0" name="quadrant" type="int" />
+			<param index="1" name="subdiv" type="int" enum="Viewport.PositionalShadowAtlasQuadrantSubdiv" />
 			<description>
 				Sets the number of subdivisions to use in the specified quadrant. A higher number of subdivisions allows you to have more shadows in the scene at once, but reduces the quality of the shadows. A good practice is to have quadrants with a varying number of subdivisions and to have as few subdivisions as possible.
 			</description>
 		</method>
 		<method name="warp_mouse">
 			<return type="void" />
-			<argument index="0" name="position" type="Vector2" />
+			<param index="0" name="position" type="Vector2" />
 			<description>
 				Moves the mouse pointer to the specified position in this [Viewport] using the coordinate system of this [Viewport].
 			</description>
@@ -268,7 +267,7 @@
 		</member>
 		<member name="texture_mipmap_bias" type="float" setter="set_texture_mipmap_bias" getter="get_texture_mipmap_bias" default="0.0">
 			Affects the final texture sharpness by reading from a lower or higher mipmap (also called "texture LOD bias"). Negative values make mipmapped textures sharper but grainier when viewed at a distance, while positive values make mipmapped textures blurrier (even when up close). To get sharper textures at a distance without introducing too much graininess, set this between [code]-0.75[/code] and [code]0.0[/code]. Enabling temporal antialiasing ([member ProjectSettings.rendering/anti_aliasing/quality/use_taa]) can help reduce the graininess visible when using negative mipmap bias.
-			[b]Note:[/b] When the 3D scaling mode is set to FSR 1.0, this value is used to adjust the automatic mipmap bias which is calculated internally based on the scale factor. The formula for this is [code]-log2(1.0 / scale) + mipmap_bias[/code].
+			[b]Note:[/b] If [member scaling_3d_scale] is lower than [code]1.0[/code] (exclusive), [member texture_mipmap_bias] is used to adjust the automatic mipmap bias which is calculated internally based on the scale factor. The formula for this is [code]log2(scaling_3d_scale) + mipmap_bias[/code].
 			To control this property on the root viewport, set the [member ProjectSettings.rendering/textures/default_filters/texture_mipmap_bias] project setting.
 		</member>
 		<member name="transparent_bg" type="bool" setter="set_transparent_background" getter="has_transparent_background" default="false">
@@ -302,7 +301,7 @@
 	</members>
 	<signals>
 		<signal name="gui_focus_changed">
-			<argument index="0" name="node" type="Control" />
+			<param index="0" name="node" type="Control" />
 			<description>
 				Emitted when a Control node grabs keyboard focus.
 			</description>
diff --git a/doc/classes/VisualInstance3D.xml b/doc/classes/VisualInstance3D.xml
index 2468042850..9574686506 100644
--- a/doc/classes/VisualInstance3D.xml
+++ b/doc/classes/VisualInstance3D.xml
@@ -34,7 +34,7 @@
 		</method>
 		<method name="get_layer_mask_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
 				Returns whether or not the specified layer of the [member layers] is enabled, given a [code]layer_number[/code] between 1 and 20.
 			</description>
@@ -48,17 +48,17 @@
 		</method>
 		<method name="set_base">
 			<return type="void" />
-			<argument index="0" name="base" type="RID" />
+			<param index="0" name="base" type="RID" />
 			<description>
 				Sets the resource that is instantiated by this [VisualInstance3D], which changes how the engine handles the [VisualInstance3D] under the hood. Equivalent to [method RenderingServer.instance_set_base].
 			</description>
 		</method>
 		<method name="set_layer_mask_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
-				Based on [code]value[/code], enables or disables the specified layer in the [member layers], given a [code]layer_number[/code] between 1 and 20.
+				Based on [param value], enables or disables the specified layer in the [member layers], given a [param layer_number] between 1 and 20.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/VisualShader.xml b/doc/classes/VisualShader.xml
index 64d901cd79..558b1086b7 100644
--- a/doc/classes/VisualShader.xml
+++ b/doc/classes/VisualShader.xml
@@ -12,154 +12,154 @@
 	<methods>
 		<method name="add_node">
 			<return type="void" />
-			<argument index="0" name="type" type="int" enum="VisualShader.Type" />
-			<argument index="1" name="node" type="VisualShaderNode" />
-			<argument index="2" name="position" type="Vector2" />
-			<argument index="3" name="id" type="int" />
+			<param index="0" name="type" type="int" enum="VisualShader.Type" />
+			<param index="1" name="node" type="VisualShaderNode" />
+			<param index="2" name="position" type="Vector2" />
+			<param index="3" name="id" type="int" />
 			<description>
-				Adds the specified node to the shader.
+				Adds the specified [param node] to the shader.
 			</description>
 		</method>
 		<method name="add_varying">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="mode" type="int" enum="VisualShader.VaryingMode" />
-			<argument index="2" name="type" type="int" enum="VisualShader.VaryingType" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="mode" type="int" enum="VisualShader.VaryingMode" />
+			<param index="2" name="type" type="int" enum="VisualShader.VaryingType" />
 			<description>
 			</description>
 		</method>
 		<method name="can_connect_nodes" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="type" type="int" enum="VisualShader.Type" />
-			<argument index="1" name="from_node" type="int" />
-			<argument index="2" name="from_port" type="int" />
-			<argument index="3" name="to_node" type="int" />
-			<argument index="4" name="to_port" type="int" />
+			<param index="0" name="type" type="int" enum="VisualShader.Type" />
+			<param index="1" name="from_node" type="int" />
+			<param index="2" name="from_port" type="int" />
+			<param index="3" name="to_node" type="int" />
+			<param index="4" name="to_port" type="int" />
 			<description>
 				Returns [code]true[/code] if the specified nodes and ports can be connected together.
 			</description>
 		</method>
 		<method name="connect_nodes">
 			<return type="int" enum="Error" />
-			<argument index="0" name="type" type="int" enum="VisualShader.Type" />
-			<argument index="1" name="from_node" type="int" />
-			<argument index="2" name="from_port" type="int" />
-			<argument index="3" name="to_node" type="int" />
-			<argument index="4" name="to_port" type="int" />
+			<param index="0" name="type" type="int" enum="VisualShader.Type" />
+			<param index="1" name="from_node" type="int" />
+			<param index="2" name="from_port" type="int" />
+			<param index="3" name="to_node" type="int" />
+			<param index="4" name="to_port" type="int" />
 			<description>
 				Connects the specified nodes and ports.
 			</description>
 		</method>
 		<method name="connect_nodes_forced">
 			<return type="void" />
-			<argument index="0" name="type" type="int" enum="VisualShader.Type" />
-			<argument index="1" name="from_node" type="int" />
-			<argument index="2" name="from_port" type="int" />
-			<argument index="3" name="to_node" type="int" />
-			<argument index="4" name="to_port" type="int" />
+			<param index="0" name="type" type="int" enum="VisualShader.Type" />
+			<param index="1" name="from_node" type="int" />
+			<param index="2" name="from_port" type="int" />
+			<param index="3" name="to_node" type="int" />
+			<param index="4" name="to_port" type="int" />
 			<description>
 				Connects the specified nodes and ports, even if they can't be connected. Such connection is invalid and will not function properly.
 			</description>
 		</method>
 		<method name="disconnect_nodes">
 			<return type="void" />
-			<argument index="0" name="type" type="int" enum="VisualShader.Type" />
-			<argument index="1" name="from_node" type="int" />
-			<argument index="2" name="from_port" type="int" />
-			<argument index="3" name="to_node" type="int" />
-			<argument index="4" name="to_port" type="int" />
+			<param index="0" name="type" type="int" enum="VisualShader.Type" />
+			<param index="1" name="from_node" type="int" />
+			<param index="2" name="from_port" type="int" />
+			<param index="3" name="to_node" type="int" />
+			<param index="4" name="to_port" type="int" />
 			<description>
 				Connects the specified nodes and ports.
 			</description>
 		</method>
 		<method name="get_node" qualifiers="const">
 			<return type="VisualShaderNode" />
-			<argument index="0" name="type" type="int" enum="VisualShader.Type" />
-			<argument index="1" name="id" type="int" />
+			<param index="0" name="type" type="int" enum="VisualShader.Type" />
+			<param index="1" name="id" type="int" />
 			<description>
-				Returns the shader node instance with specified [code]type[/code] and [code]id[/code].
+				Returns the shader node instance with specified [param type] and [param id].
 			</description>
 		</method>
 		<method name="get_node_connections" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="type" type="int" enum="VisualShader.Type" />
+			<param index="0" name="type" type="int" enum="VisualShader.Type" />
 			<description>
 				Returns the list of connected nodes with the specified type.
 			</description>
 		</method>
 		<method name="get_node_list" qualifiers="const">
 			<return type="PackedInt32Array" />
-			<argument index="0" name="type" type="int" enum="VisualShader.Type" />
+			<param index="0" name="type" type="int" enum="VisualShader.Type" />
 			<description>
 				Returns the list of all nodes in the shader with the specified type.
 			</description>
 		</method>
 		<method name="get_node_position" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="type" type="int" enum="VisualShader.Type" />
-			<argument index="1" name="id" type="int" />
+			<param index="0" name="type" type="int" enum="VisualShader.Type" />
+			<param index="1" name="id" type="int" />
 			<description>
 				Returns the position of the specified node within the shader graph.
 			</description>
 		</method>
 		<method name="get_valid_node_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="type" type="int" enum="VisualShader.Type" />
+			<param index="0" name="type" type="int" enum="VisualShader.Type" />
 			<description>
 			</description>
 		</method>
 		<method name="has_varying" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="is_node_connection" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="type" type="int" enum="VisualShader.Type" />
-			<argument index="1" name="from_node" type="int" />
-			<argument index="2" name="from_port" type="int" />
-			<argument index="3" name="to_node" type="int" />
-			<argument index="4" name="to_port" type="int" />
+			<param index="0" name="type" type="int" enum="VisualShader.Type" />
+			<param index="1" name="from_node" type="int" />
+			<param index="2" name="from_port" type="int" />
+			<param index="3" name="to_node" type="int" />
+			<param index="4" name="to_port" type="int" />
 			<description>
 				Returns [code]true[/code] if the specified node and port connection exist.
 			</description>
 		</method>
 		<method name="remove_node">
 			<return type="void" />
-			<argument index="0" name="type" type="int" enum="VisualShader.Type" />
-			<argument index="1" name="id" type="int" />
+			<param index="0" name="type" type="int" enum="VisualShader.Type" />
+			<param index="1" name="id" type="int" />
 			<description>
 				Removes the specified node from the shader.
 			</description>
 		</method>
 		<method name="remove_varying">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="replace_node">
 			<return type="void" />
-			<argument index="0" name="type" type="int" enum="VisualShader.Type" />
-			<argument index="1" name="id" type="int" />
-			<argument index="2" name="new_class" type="StringName" />
+			<param index="0" name="type" type="int" enum="VisualShader.Type" />
+			<param index="1" name="id" type="int" />
+			<param index="2" name="new_class" type="StringName" />
 			<description>
 				Replaces the specified node with a node of new class type.
 			</description>
 		</method>
 		<method name="set_mode">
 			<return type="void" />
-			<argument index="0" name="mode" type="int" enum="Shader.Mode" />
+			<param index="0" name="mode" type="int" enum="Shader.Mode" />
 			<description>
 				Sets the mode of this shader.
 			</description>
 		</method>
 		<method name="set_node_position">
 			<return type="void" />
-			<argument index="0" name="type" type="int" enum="VisualShader.Type" />
-			<argument index="1" name="id" type="int" />
-			<argument index="2" name="position" type="Vector2" />
+			<param index="0" name="type" type="int" enum="VisualShader.Type" />
+			<param index="1" name="id" type="int" />
+			<param index="2" name="position" type="Vector2" />
 			<description>
 				Sets the position of the specified node.
 			</description>
diff --git a/doc/classes/VisualShaderNode.xml b/doc/classes/VisualShaderNode.xml
index 7220731a8a..1f3397f39c 100644
--- a/doc/classes/VisualShaderNode.xml
+++ b/doc/classes/VisualShaderNode.xml
@@ -24,32 +24,32 @@
 		</method>
 		<method name="get_input_port_default_value" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="port" type="int" />
+			<param index="0" name="port" type="int" />
 			<description>
-				Returns the default value of the input [code]port[/code].
+				Returns the default value of the input [param port].
 			</description>
 		</method>
 		<method name="remove_input_port_default_value">
 			<return type="void" />
-			<argument index="0" name="port" type="int" />
+			<param index="0" name="port" type="int" />
 			<description>
-				Removes the default value of the input [code]port[/code].
+				Removes the default value of the input [param port].
 			</description>
 		</method>
 		<method name="set_default_input_values">
 			<return type="void" />
-			<argument index="0" name="values" type="Array" />
+			<param index="0" name="values" type="Array" />
 			<description>
 				Sets the default input ports values using an [Array] of the form [code][index0, value0, index1, value1, ...][/code]. For example: [code][0, Vector3(0, 0, 0), 1, Vector3(0, 0, 0)][/code].
 			</description>
 		</method>
 		<method name="set_input_port_default_value">
 			<return type="void" />
-			<argument index="0" name="port" type="int" />
-			<argument index="1" name="value" type="Variant" />
-			<argument index="2" name="prev_value" type="Variant" default="null" />
+			<param index="0" name="port" type="int" />
+			<param index="1" name="value" type="Variant" />
+			<param index="2" name="prev_value" type="Variant" default="null" />
 			<description>
-				Sets the default value for the selected input [code]port[/code].
+				Sets the default [param value] for the selected input [param port].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/VisualShaderNodeCustom.xml b/doc/classes/VisualShaderNodeCustom.xml
index 0a962a4aa4..d96969b383 100644
--- a/doc/classes/VisualShaderNodeCustom.xml
+++ b/doc/classes/VisualShaderNodeCustom.xml
@@ -25,15 +25,15 @@
 		</method>
 		<method name="_get_code" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="input_vars" type="String[]" />
-			<argument index="1" name="output_vars" type="String[]" />
-			<argument index="2" name="mode" type="int" enum="Shader.Mode" />
-			<argument index="3" name="type" type="int" enum="VisualShader.Type" />
+			<param index="0" name="input_vars" type="String[]" />
+			<param index="1" name="output_vars" type="String[]" />
+			<param index="2" name="mode" type="int" enum="Shader.Mode" />
+			<param index="3" name="type" type="int" enum="VisualShader.Type" />
 			<description>
 				Override this method to define the actual shader code of the associated custom node. The shader code should be returned as a string, which can have multiple lines (the [code]"""[/code] multiline string construct can be used for convenience).
-				The [code]input_vars[/code] and [code]output_vars[/code] arrays contain the string names of the various input and output variables, as defined by [code]_get_input_*[/code] and [code]_get_output_*[/code] virtual methods in this class.
+				The [param input_vars] and [param output_vars] arrays contain the string names of the various input and output variables, as defined by [code]_get_input_*[/code] and [code]_get_output_*[/code] virtual methods in this class.
 				The output ports can be assigned values in the shader code. For example, [code]return output_vars[0] + " = " + input_vars[0] + ";"[/code].
-				You can customize the generated code based on the shader [code]mode[/code] (see [enum Shader.Mode]) and/or [code]type[/code] (see [enum VisualShader.Type]).
+				You can customize the generated code based on the shader [param mode] (see [enum Shader.Mode]) and/or [param type] (see [enum VisualShader.Type]).
 				Defining this method is [b]required[/b].
 			</description>
 		</method>
@@ -46,35 +46,35 @@
 		</method>
 		<method name="_get_func_code" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="mode" type="int" enum="Shader.Mode" />
-			<argument index="1" name="type" type="int" enum="VisualShader.Type" />
+			<param index="0" name="mode" type="int" enum="Shader.Mode" />
+			<param index="1" name="type" type="int" enum="VisualShader.Type" />
 			<description>
 				Override this method to add a shader code to the beginning of each shader function (once). The shader code should be returned as a string, which can have multiple lines (the [code]"""[/code] multiline string construct can be used for convenience).
 				If there are multiple custom nodes of different types which use this feature the order of each insertion is undefined.
-				You can customize the generated code based on the shader [code]mode[/code] (see [enum Shader.Mode]) and/or [code]type[/code] (see [enum VisualShader.Type]).
+				You can customize the generated code based on the shader [param mode] (see [enum Shader.Mode]) and/or [param type] (see [enum VisualShader.Type]).
 				Defining this method is [b]optional[/b].
 			</description>
 		</method>
 		<method name="_get_global_code" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="mode" type="int" enum="Shader.Mode" />
+			<param index="0" name="mode" type="int" enum="Shader.Mode" />
 			<description>
 				Override this method to add shader code on top of the global shader, to define your own standard library of reusable methods, varyings, constants, uniforms, etc. The shader code should be returned as a string, which can have multiple lines (the [code]"""[/code] multiline string construct can be used for convenience).
 				Be careful with this functionality as it can cause name conflicts with other custom nodes, so be sure to give the defined entities unique names.
-				You can customize the generated code based on the shader [code]mode[/code] (see [enum Shader.Mode]).
+				You can customize the generated code based on the shader [param mode] (see [enum Shader.Mode]).
 				Defining this method is [b]optional[/b].
 			</description>
 		</method>
 		<method name="_get_input_port_count" qualifiers="virtual const">
 			<return type="int" />
 			<description>
-				Override this method to define the amount of input ports of the associated custom node.
+				Override this method to define the number of input ports of the associated custom node.
 				Defining this method is [b]required[/b]. If not overridden, the node has no input ports.
 			</description>
 		</method>
 		<method name="_get_input_port_name" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="port" type="int" />
+			<param index="0" name="port" type="int" />
 			<description>
 				Override this method to define the names of input ports of the associated custom node. The names are used both for the input slots in the editor and as identifiers in the shader code, and are passed in the [code]input_vars[/code] array in [method _get_code].
 				Defining this method is [b]optional[/b], but recommended. If not overridden, input ports are named as [code]"in" + str(port)[/code].
@@ -82,7 +82,7 @@
 		</method>
 		<method name="_get_input_port_type" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="port" type="int" />
+			<param index="0" name="port" type="int" />
 			<description>
 				Override this method to define the returned type of each input port of the associated custom node (see [enum VisualShaderNode.PortType] for possible types).
 				Defining this method is [b]optional[/b], but recommended. If not overridden, input ports will return the [constant VisualShaderNode.PORT_TYPE_SCALAR] type.
@@ -98,13 +98,13 @@
 		<method name="_get_output_port_count" qualifiers="virtual const">
 			<return type="int" />
 			<description>
-				Override this method to define the amount of output ports of the associated custom node.
+				Override this method to define the number of output ports of the associated custom node.
 				Defining this method is [b]required[/b]. If not overridden, the node has no output ports.
 			</description>
 		</method>
 		<method name="_get_output_port_name" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="port" type="int" />
+			<param index="0" name="port" type="int" />
 			<description>
 				Override this method to define the names of output ports of the associated custom node. The names are used both for the output slots in the editor and as identifiers in the shader code, and are passed in the [code]output_vars[/code] array in [method _get_code].
 				Defining this method is [b]optional[/b], but recommended. If not overridden, output ports are named as [code]"out" + str(port)[/code].
@@ -112,7 +112,7 @@
 		</method>
 		<method name="_get_output_port_type" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="port" type="int" />
+			<param index="0" name="port" type="int" />
 			<description>
 				Override this method to define the returned type of each output port of the associated custom node (see [enum VisualShaderNode.PortType] for possible types).
 				Defining this method is [b]optional[/b], but recommended. If not overridden, output ports will return the [constant VisualShaderNode.PORT_TYPE_SCALAR] type.
@@ -127,10 +127,10 @@
 		</method>
 		<method name="_is_available" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="mode" type="int" enum="Shader.Mode" />
-			<argument index="1" name="type" type="int" enum="VisualShader.Type" />
+			<param index="0" name="mode" type="int" enum="Shader.Mode" />
+			<param index="1" name="type" type="int" enum="VisualShader.Type" />
 			<description>
-				Override this method to prevent the node to be visible in the member dialog for the certain [code]mode[/code] (see [enum Shader.Mode]) and/or [code]type[/code] (see [enum VisualShader.Type]).
+				Override this method to prevent the node to be visible in the member dialog for the certain [param mode] (see [enum Shader.Mode]) and/or [param type] (see [enum VisualShader.Type]).
 				Defining this method is [b]optional[/b]. If not overridden, it's [code]true[/code].
 			</description>
 		</method>
diff --git a/doc/classes/VisualShaderNodeExpression.xml b/doc/classes/VisualShaderNodeExpression.xml
index c4f010f3c0..6b2dc2f2cb 100644
--- a/doc/classes/VisualShaderNodeExpression.xml
+++ b/doc/classes/VisualShaderNodeExpression.xml
@@ -4,7 +4,7 @@
 		A custom visual shader graph expression written in Godot Shading Language.
 	</brief_description>
 	<description>
-		Custom Godot Shading Language expression, with a custom amount of input and output ports.
+		Custom Godot Shading Language expression, with a custom number of input and output ports.
 		The provided code is directly injected into the graph's matching shader function ([code]vertex[/code], [code]fragment[/code], or [code]light[/code]), so it cannot be used to declare functions, varyings, uniforms, or global constants. See [VisualShaderNodeGlobalExpression] for such global definitions.
 	</description>
 	<tutorials>
diff --git a/doc/classes/VisualShaderNodeGroupBase.xml b/doc/classes/VisualShaderNodeGroupBase.xml
index 1b724b00d6..dcc94f0b24 100644
--- a/doc/classes/VisualShaderNodeGroupBase.xml
+++ b/doc/classes/VisualShaderNodeGroupBase.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="VisualShaderNodeGroupBase" inherits="VisualShaderNodeResizableBase" version="4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Base class for a family of nodes with variable amount of input and output ports within the visual shader graph.
+		Base class for a family of nodes with variable number of input and output ports within the visual shader graph.
 	</brief_description>
 	<description>
 		Currently, has no direct usage, use the derived classes instead.
@@ -11,20 +11,20 @@
 	<methods>
 		<method name="add_input_port">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="type" type="int" />
-			<argument index="2" name="name" type="String" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="type" type="int" />
+			<param index="2" name="name" type="String" />
 			<description>
-				Adds an input port with the specified [code]type[/code] (see [enum VisualShaderNode.PortType]) and [code]name[/code].
+				Adds an input port with the specified [param type] (see [enum VisualShaderNode.PortType]) and [param name].
 			</description>
 		</method>
 		<method name="add_output_port">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="type" type="int" />
-			<argument index="2" name="name" type="String" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="type" type="int" />
+			<param index="2" name="name" type="String" />
 			<description>
-				Adds an output port with the specified [code]type[/code] (see [enum VisualShaderNode.PortType]) and [code]name[/code].
+				Adds an output port with the specified [param type] (see [enum VisualShaderNode.PortType]) and [param name].
 			</description>
 		</method>
 		<method name="clear_input_ports">
@@ -77,81 +77,81 @@
 		</method>
 		<method name="has_input_port" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns [code]true[/code] if the specified input port exists.
 			</description>
 		</method>
 		<method name="has_output_port" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns [code]true[/code] if the specified output port exists.
 			</description>
 		</method>
 		<method name="is_valid_port_name" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Returns [code]true[/code] if the specified port name does not override an existed port name and is valid within the shader.
 			</description>
 		</method>
 		<method name="remove_input_port">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Removes the specified input port.
 			</description>
 		</method>
 		<method name="remove_output_port">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Removes the specified output port.
 			</description>
 		</method>
 		<method name="set_input_port_name">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="name" type="String" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="name" type="String" />
 			<description>
 				Renames the specified input port.
 			</description>
 		</method>
 		<method name="set_input_port_type">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="type" type="int" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="type" type="int" />
 			<description>
 				Sets the specified input port's type (see [enum VisualShaderNode.PortType]).
 			</description>
 		</method>
 		<method name="set_inputs">
 			<return type="void" />
-			<argument index="0" name="inputs" type="String" />
+			<param index="0" name="inputs" type="String" />
 			<description>
 				Defines all input ports using a [String] formatted as a colon-separated list: [code]id,type,name;[/code] (see [method add_input_port]).
 			</description>
 		</method>
 		<method name="set_output_port_name">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="name" type="String" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="name" type="String" />
 			<description>
 				Renames the specified output port.
 			</description>
 		</method>
 		<method name="set_output_port_type">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="type" type="int" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="type" type="int" />
 			<description>
 				Sets the specified output port's type (see [enum VisualShaderNode.PortType]).
 			</description>
 		</method>
 		<method name="set_outputs">
 			<return type="void" />
-			<argument index="0" name="outputs" type="String" />
+			<param index="0" name="outputs" type="String" />
 			<description>
 				Defines all output ports using a [String] formatted as a colon-separated list: [code]id,type,name;[/code] (see [method add_output_port]).
 			</description>
diff --git a/doc/classes/VisualShaderNodeUVFunc.xml b/doc/classes/VisualShaderNodeUVFunc.xml
index 37a9769a10..541991b790 100644
--- a/doc/classes/VisualShaderNodeUVFunc.xml
+++ b/doc/classes/VisualShaderNodeUVFunc.xml
@@ -17,7 +17,7 @@
 			Translates [code]uv[/code] by using [code]scale[/code] and [code]offset[/code] values using the following formula: [code]uv = uv + offset * scale[/code]. [code]uv[/code] port is connected to [code]UV[/code] built-in by default.
 		</constant>
 		<constant name="FUNC_SCALING" value="1" enum="Function">
-			Scales [code]uv[/uv] by using [code]scale[/code] and [code]pivot[/code] values using the following formula: [code]uv = (uv - pivot) * scale + pivot[/code]. [code]uv[/code] port is connected to [code]UV[/code] built-in by default.
+			Scales [code]uv[/code] by using [code]scale[/code] and [code]pivot[/code] values using the following formula: [code]uv = (uv - pivot) * scale + pivot[/code]. [code]uv[/code] port is connected to [code]UV[/code] built-in by default.
 		</constant>
 		<constant name="FUNC_MAX" value="2" enum="Function">
 			Represents the size of the [enum Function] enum.
diff --git a/doc/classes/VisualShaderNodeVectorRefract.xml b/doc/classes/VisualShaderNodeVectorRefract.xml
index d12188ea55..003b505671 100644
--- a/doc/classes/VisualShaderNodeVectorRefract.xml
+++ b/doc/classes/VisualShaderNodeVectorRefract.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeVectorRefract" inherits="VisualShaderNode" version="4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeVectorRefract" inherits="VisualShaderNodeVectorBase" version="4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Returns the [Vector3] that points in the direction of refraction. For use within the visual shader graph.
+		Returns the vector that points in the direction of refraction. For use within the visual shader graph.
 	</brief_description>
 	<description>
 		Translated to [code]refract(I, N, eta)[/code] in the shader language, where [code]I[/code] is the incident vector, [code]N[/code] is the normal vector and [code]eta[/code] is the ratio of the indices of the refraction.
diff --git a/doc/classes/VoxelGI.xml b/doc/classes/VoxelGI.xml
index d941185d33..ba4995a5fb 100644
--- a/doc/classes/VoxelGI.xml
+++ b/doc/classes/VoxelGI.xml
@@ -16,8 +16,8 @@
 	<methods>
 		<method name="bake">
 			<return type="void" />
-			<argument index="0" name="from_node" type="Node" default="null" />
-			<argument index="1" name="create_visual_debug" type="bool" default="false" />
+			<param index="0" name="from_node" type="Node" default="null" />
+			<param index="1" name="create_visual_debug" type="bool" default="false" />
 			<description>
 				Bakes the effect from all [GeometryInstance3D]s marked with [constant GeometryInstance3D.GI_MODE_STATIC] and [Light3D]s marked with either [constant Light3D.BAKE_STATIC] or [constant Light3D.BAKE_DYNAMIC]. If [code]create_visual_debug[/code] is [code]true[/code], after baking the light, this will generate a [MultiMesh] that has a cube representing each solid cell with each cube colored to the cell's albedo color. This can be used to visualize the [VoxelGI]'s data and debug any issues that may be occurring.
 				[b]Note:[/b] [method bake] works from the editor and in exported projects. This makes it suitable for procedurally generated or user-built levels. Baking a [VoxelGI] node generally takes from 5 to 20 seconds in most scenes. Reducing [member subdiv] can speed up baking.
diff --git a/doc/classes/VoxelGIData.xml b/doc/classes/VoxelGIData.xml
index 9198da4bc6..92b2e66e5a 100644
--- a/doc/classes/VoxelGIData.xml
+++ b/doc/classes/VoxelGIData.xml
@@ -13,13 +13,13 @@
 	<methods>
 		<method name="allocate">
 			<return type="void" />
-			<argument index="0" name="to_cell_xform" type="Transform3D" />
-			<argument index="1" name="aabb" type="AABB" />
-			<argument index="2" name="octree_size" type="Vector3" />
-			<argument index="3" name="octree_cells" type="PackedByteArray" />
-			<argument index="4" name="data_cells" type="PackedByteArray" />
-			<argument index="5" name="distance_field" type="PackedByteArray" />
-			<argument index="6" name="level_counts" type="PackedInt32Array" />
+			<param index="0" name="to_cell_xform" type="Transform3D" />
+			<param index="1" name="aabb" type="AABB" />
+			<param index="2" name="octree_size" type="Vector3" />
+			<param index="3" name="octree_cells" type="PackedByteArray" />
+			<param index="4" name="data_cells" type="PackedByteArray" />
+			<param index="5" name="distance_field" type="PackedByteArray" />
+			<param index="6" name="level_counts" type="PackedInt32Array" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/Window.xml b/doc/classes/Window.xml
index f4eaaac2e1..ce7ad1e64e 100644
--- a/doc/classes/Window.xml
+++ b/doc/classes/Window.xml
@@ -30,9 +30,9 @@
 		</method>
 		<method name="get_flag" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="flag" type="int" enum="Window.Flags" />
+			<param index="0" name="flag" type="int" enum="Window.Flags" />
 			<description>
-				Returns [code]true[/code] if the flag is set.
+				Returns [code]true[/code] if the [param flag] is set.
 			</description>
 		</method>
 		<method name="get_layout_direction" qualifiers="const">
@@ -49,19 +49,19 @@
 		</method>
 		<method name="get_theme_color" qualifiers="const">
 			<return type="Color" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns the [Color] at [code]name[/code] if the theme has [code]theme_type[/code].
+				Returns the [Color] at [param name] if the theme has [param theme_type].
 				See [method Control.get_theme_color] for more details.
 			</description>
 		</method>
 		<method name="get_theme_constant" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns the constant at [code]name[/code] if the theme has [code]theme_type[/code].
+				Returns the constant at [param name] if the theme has [param theme_type].
 				See [method Control.get_theme_color] for more details.
 			</description>
 		</method>
@@ -88,37 +88,37 @@
 		</method>
 		<method name="get_theme_font" qualifiers="const">
 			<return type="Font" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns the [Font] at [code]name[/code] if the theme has [code]theme_type[/code].
+				Returns the [Font] at [param name] if the theme has [param theme_type].
 				See [method Control.get_theme_color] for more details.
 			</description>
 		</method>
 		<method name="get_theme_font_size" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns the font size at [code]name[/code] if the theme has [code]theme_type[/code].
+				Returns the font size at [param name] if the theme has [param theme_type].
 				See [method Control.get_theme_color] for more details.
 			</description>
 		</method>
 		<method name="get_theme_icon" qualifiers="const">
 			<return type="Texture2D" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns the icon at [code]name[/code] if the theme has [code]theme_type[/code].
+				Returns the icon at [param name] if the theme has [param theme_type].
 				See [method Control.get_theme_color] for more details.
 			</description>
 		</method>
 		<method name="get_theme_stylebox" qualifiers="const">
 			<return type="StyleBox" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns the [StyleBox] at [code]name[/code] if the theme has [code]theme_type[/code].
+				Returns the [StyleBox] at [param name] if the theme has [param theme_type].
 				See [method Control.get_theme_color] for more details.
 			</description>
 		</method>
@@ -136,50 +136,50 @@
 		</method>
 		<method name="has_theme_color" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns [code]true[/code] if [Color] with [code]name[/code] is in [code]theme_type[/code].
+				Returns [code]true[/code] if [Color] with [param name] is in [param theme_type].
 			</description>
 		</method>
 		<method name="has_theme_constant" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns [code]true[/code] if constant with [code]name[/code] is in [code]theme_type[/code].
+				Returns [code]true[/code] if constant with [param name] is in [param theme_type].
 			</description>
 		</method>
 		<method name="has_theme_font" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns [code]true[/code] if [Font] with [code]name[/code] is in [code]theme_type[/code].
+				Returns [code]true[/code] if [Font] with [param name] is in [param theme_type].
 			</description>
 		</method>
 		<method name="has_theme_font_size" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns [code]true[/code] if font size with [code]name[/code] is in [code]theme_type[/code].
+				Returns [code]true[/code] if font size with [param name] is in [param theme_type].
 			</description>
 		</method>
 		<method name="has_theme_icon" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns [code]true[/code] if icon with [code]name[/code] is in [code]theme_type[/code].
+				Returns [code]true[/code] if icon with [param name] is in [param theme_type].
 			</description>
 		</method>
 		<method name="has_theme_stylebox" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="theme_type" type="StringName" default="&quot;&quot;" />
 			<description>
-				Returns [code]true[/code] if [StyleBox] with [code]name[/code] is in [code]theme_type[/code].
+				Returns [code]true[/code] if [StyleBox] with [param name] is in [param theme_type].
 			</description>
 		</method>
 		<method name="hide">
@@ -220,15 +220,15 @@
 		</method>
 		<method name="popup">
 			<return type="void" />
-			<argument index="0" name="rect" type="Rect2i" default="Rect2i(0, 0, 0, 0)" />
+			<param index="0" name="rect" type="Rect2i" default="Rect2i(0, 0, 0, 0)" />
 			<description>
-				Shows the [Window] and makes it transient (see [member transient]). If [code]rect[/code] is provided, it will be set as the [Window]'s size.
+				Shows the [Window] and makes it transient (see [member transient]). If [param rect] is provided, it will be set as the [Window]'s size.
 				Fails if called on the main window.
 			</description>
 		</method>
 		<method name="popup_centered">
 			<return type="void" />
-			<argument index="0" name="minsize" type="Vector2i" default="Vector2i(0, 0)" />
+			<param index="0" name="minsize" type="Vector2i" default="Vector2i(0, 0)" />
 			<description>
 				Popups the [Window] at the center of the current screen, with optionally given minimum size.
 				If the [Window] is embedded, it will be centered in the parent [Viewport] instead.
@@ -236,8 +236,8 @@
 		</method>
 		<method name="popup_centered_clamped">
 			<return type="void" />
-			<argument index="0" name="minsize" type="Vector2i" default="Vector2i(0, 0)" />
-			<argument index="1" name="fallback_ratio" type="float" default="0.75" />
+			<param index="0" name="minsize" type="Vector2i" default="Vector2i(0, 0)" />
+			<param index="1" name="fallback_ratio" type="float" default="0.75" />
 			<description>
 				Popups the [Window] centered inside its parent [Window].
 				[code]fallback_ratio[/code] determines the maximum size of the [Window], in relation to its parent.
@@ -245,14 +245,14 @@
 		</method>
 		<method name="popup_centered_ratio">
 			<return type="void" />
-			<argument index="0" name="ratio" type="float" default="0.8" />
+			<param index="0" name="ratio" type="float" default="0.8" />
 			<description>
-				Popups the [Window] centered inside its parent [Window] and sets its size as a [code]ratio[/code] of parent's size.
+				Popups the [Window] centered inside its parent [Window] and sets its size as a [param ratio] of parent's size.
 			</description>
 		</method>
 		<method name="popup_on_parent">
 			<return type="void" />
-			<argument index="0" name="parent_rect" type="Rect2i" />
+			<param index="0" name="parent_rect" type="Rect2i" />
 			<description>
 				Popups the [Window] with a position shifted by parent [Window]'s position.
 				If the [Window] is embedded, has the same effect as [method popup].
@@ -272,36 +272,36 @@
 		</method>
 		<method name="set_flag">
 			<return type="void" />
-			<argument index="0" name="flag" type="int" enum="Window.Flags" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="flag" type="int" enum="Window.Flags" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				Sets a specified window flag.
 			</description>
 		</method>
 		<method name="set_ime_active">
 			<return type="void" />
-			<argument index="0" name="active" type="bool" />
+			<param index="0" name="active" type="bool" />
 			<description>
-				If [code]active[/code] is [code]true[/code], enables system's native IME (Input Method Editor).
+				If [param active] is [code]true[/code], enables system's native IME (Input Method Editor).
 			</description>
 		</method>
 		<method name="set_ime_position">
 			<return type="void" />
-			<argument index="0" name="position" type="Vector2i" />
+			<param index="0" name="position" type="Vector2i" />
 			<description>
 				Moves IME to the given position.
 			</description>
 		</method>
 		<method name="set_layout_direction">
 			<return type="void" />
-			<argument index="0" name="direction" type="int" enum="Window.LayoutDirection" />
+			<param index="0" name="direction" type="int" enum="Window.LayoutDirection" />
 			<description>
 				Sets layout direction and text writing direction. Right-to-left layouts are necessary for certain languages (e.g. Arabic and Hebrew).
 			</description>
 		</method>
 		<method name="set_use_font_oversampling">
 			<return type="void" />
-			<argument index="0" name="enable" type="bool" />
+			<param index="0" name="enable" type="bool" />
 			<description>
 				Enables font oversampling. This makes fonts look better when they are scaled up.
 			</description>
@@ -344,9 +344,11 @@
 		</member>
 		<member name="max_size" type="Vector2i" setter="set_max_size" getter="get_max_size" default="Vector2i(0, 0)">
 			If non-zero, the [Window] can't be resized to be bigger than this size.
+			[b]Note:[/b] This property will be ignored if the value is lower than [member min_size].
 		</member>
 		<member name="min_size" type="Vector2i" setter="set_min_size" getter="get_min_size" default="Vector2i(0, 0)">
 			If non-zero, the [Window] can't be resized to be smaller than this size.
+			[b]Note:[/b] This property will be ignored in favor of [method get_contents_minimum_size] if [member wrap_controls] is enabled and if its size is bigger.
 		</member>
 		<member name="mode" type="int" setter="set_mode" getter="get_mode" enum="Window.Mode" default="0">
 			Set's the window's current mode.
@@ -388,7 +390,7 @@
 			If [code]true[/code], the window is visible.
 		</member>
 		<member name="wrap_controls" type="bool" setter="set_wrap_controls" getter="is_wrapping_controls" default="false">
-			If [code]true[/code], the window's size will automatically update when a child node is added or removed.
+			If [code]true[/code], the window's size will automatically update when a child node is added or removed, ignoring [member min_size] if the new size is bigger.
 			If [code]false[/code], you need to call [method child_controls_changed] manually.
 		</member>
 	</members>
@@ -405,7 +407,7 @@
 			</description>
 		</signal>
 		<signal name="files_dropped">
-			<argument index="0" name="files" type="PackedStringArray" />
+			<param index="0" name="files" type="PackedStringArray" />
 			<description>
 				Emitted when files are dragged from the OS file manager and dropped in the game window. The argument is a list of file paths.
 				Note that this method only works with non-embedded windows, i.e. the main window and [Window]-derived nodes when [member Viewport.gui_embed_subwindows] is disabled in the main viewport.
@@ -455,7 +457,7 @@
 			</description>
 		</signal>
 		<signal name="window_input">
-			<argument index="0" name="event" type="InputEvent" />
+			<param index="0" name="event" type="InputEvent" />
 			<description>
 				Emitted when the [Window] is currently focused and receives any input, passing the received event as an argument.
 			</description>
diff --git a/doc/classes/WorkerThreadPool.xml b/doc/classes/WorkerThreadPool.xml
index 4f614bdadb..fced54ae7f 100644
--- a/doc/classes/WorkerThreadPool.xml
+++ b/doc/classes/WorkerThreadPool.xml
@@ -9,49 +9,49 @@
 	<methods>
 		<method name="add_group_task">
 			<return type="int" />
-			<argument index="0" name="action" type="Callable" />
-			<argument index="1" name="elements" type="int" />
-			<argument index="2" name="tasks_needed" type="int" default="-1" />
-			<argument index="3" name="high_priority" type="bool" default="false" />
-			<argument index="4" name="description" type="String" default="&quot;&quot;" />
+			<param index="0" name="action" type="Callable" />
+			<param index="1" name="elements" type="int" />
+			<param index="2" name="tasks_needed" type="int" default="-1" />
+			<param index="3" name="high_priority" type="bool" default="false" />
+			<param index="4" name="description" type="String" default="&quot;&quot;" />
 			<description>
 			</description>
 		</method>
 		<method name="add_task">
 			<return type="int" />
-			<argument index="0" name="action" type="Callable" />
-			<argument index="1" name="high_priority" type="bool" default="false" />
-			<argument index="2" name="description" type="String" default="&quot;&quot;" />
+			<param index="0" name="action" type="Callable" />
+			<param index="1" name="high_priority" type="bool" default="false" />
+			<param index="2" name="description" type="String" default="&quot;&quot;" />
 			<description>
 			</description>
 		</method>
 		<method name="get_group_processed_element_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="group_id" type="int" />
+			<param index="0" name="group_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="is_group_task_completed" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="group_id" type="int" />
+			<param index="0" name="group_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="is_task_completed" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="task_id" type="int" />
+			<param index="0" name="task_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="wait_for_group_task_completion">
 			<return type="void" />
-			<argument index="0" name="group_id" type="int" />
+			<param index="0" name="group_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="wait_for_task_completion">
 			<return type="void" />
-			<argument index="0" name="task_id" type="int" />
+			<param index="0" name="task_id" type="int" />
 			<description>
 			</description>
 		</method>
diff --git a/doc/classes/X509Certificate.xml b/doc/classes/X509Certificate.xml
index 581aba05e4..d8f54d0ec5 100644
--- a/doc/classes/X509Certificate.xml
+++ b/doc/classes/X509Certificate.xml
@@ -12,16 +12,16 @@
 	<methods>
 		<method name="load">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
-				Loads a certificate from [code]path[/code] ("*.crt" file).
+				Loads a certificate from [param path] ("*.crt" file).
 			</description>
 		</method>
 		<method name="save">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
-				Saves a certificate to the given [code]path[/code] (should be a "*.crt" file).
+				Saves a certificate to the given [param path] (should be a "*.crt" file).
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/XMLParser.xml b/doc/classes/XMLParser.xml
index 79ab33045f..26480f0c18 100644
--- a/doc/classes/XMLParser.xml
+++ b/doc/classes/XMLParser.xml
@@ -12,21 +12,21 @@
 		<method name="get_attribute_count" qualifiers="const">
 			<return type="int" />
 			<description>
-				Gets the amount of attributes in the current element.
+				Gets the number of attributes in the current element.
 			</description>
 		</method>
 		<method name="get_attribute_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Gets the name of the attribute specified by the index in [code]idx[/code] argument.
+				Gets the name of the attribute specified by the [param idx] index.
 			</description>
 		</method>
 		<method name="get_attribute_value" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Gets the value of the attribute specified by the index in [code]idx[/code] argument.
+				Gets the value of the attribute specified by the [param idx] index.
 			</description>
 		</method>
 		<method name="get_current_line" qualifiers="const">
@@ -37,16 +37,16 @@
 		</method>
 		<method name="get_named_attribute_value" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
-				Gets the value of a certain attribute of the current element by name. This will raise an error if the element has no such attribute.
+				Gets the value of a certain attribute of the current element by [param name]. This will raise an error if the element has no such attribute.
 			</description>
 		</method>
 		<method name="get_named_attribute_value_safe" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
-				Gets the value of a certain attribute of the current element by name. This will return an empty [String] if the attribute is not found.
+				Gets the value of a certain attribute of the current element by [param name]. This will return an empty [String] if the attribute is not found.
 			</description>
 		</method>
 		<method name="get_node_data" qualifiers="const">
@@ -75,7 +75,7 @@
 		</method>
 		<method name="has_attribute" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Check whether the current element has a certain attribute.
 			</description>
@@ -88,16 +88,16 @@
 		</method>
 		<method name="open">
 			<return type="int" enum="Error" />
-			<argument index="0" name="file" type="String" />
+			<param index="0" name="file" type="String" />
 			<description>
-				Opens an XML file for parsing. This returns an error code.
+				Opens an XML [param file] for parsing. This returns an error code.
 			</description>
 		</method>
 		<method name="open_buffer">
 			<return type="int" enum="Error" />
-			<argument index="0" name="buffer" type="PackedByteArray" />
+			<param index="0" name="buffer" type="PackedByteArray" />
 			<description>
-				Opens an XML raw buffer for parsing. This returns an error code.
+				Opens an XML raw [param buffer] for parsing. This returns an error code.
 			</description>
 		</method>
 		<method name="read">
@@ -108,7 +108,7 @@
 		</method>
 		<method name="seek">
 			<return type="int" enum="Error" />
-			<argument index="0" name="position" type="int" />
+			<param index="0" name="position" type="int" />
 			<description>
 				Moves the buffer cursor to a certain offset (since the beginning) and read the next node there. This returns an error code.
 			</description>
diff --git a/doc/classes/XRController3D.xml b/doc/classes/XRController3D.xml
index ff4aec46e1..9e192177e5 100644
--- a/doc/classes/XRController3D.xml
+++ b/doc/classes/XRController3D.xml
@@ -15,9 +15,9 @@
 	<methods>
 		<method name="get_axis" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns a [Vector2] for the input with the given [code]name[/code]. This is used for thumbsticks and thumbpads found on many controllers.
+				Returns a [Vector2] for the input with the given [param name]. This is used for thumbsticks and thumbpads found on many controllers.
 			</description>
 		</method>
 		<method name="get_tracker_hand" qualifiers="const">
@@ -28,42 +28,42 @@
 		</method>
 		<method name="get_value" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns a numeric value for the input with the given [code]name[/code]. This is used for triggers and grip sensors.
+				Returns a numeric value for the input with the given [param name]. This is used for triggers and grip sensors.
 			</description>
 		</method>
 		<method name="is_button_pressed" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns [code]true[/code] if the button with the given [code]name[/code] is pressed.
+				Returns [code]true[/code] if the button with the given [param name] is pressed.
 			</description>
 		</method>
 	</methods>
 	<signals>
 		<signal name="button_pressed">
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Emitted when a button on this controller is pressed.
 			</description>
 		</signal>
 		<signal name="button_released">
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Emitted when a button on this controller is released.
 			</description>
 		</signal>
 		<signal name="input_axis_changed">
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="value" type="Vector2" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="value" type="Vector2" />
 			<description>
 				Emitted when a thumbstick or thumbpad on this controller is moved.
 			</description>
 		</signal>
 		<signal name="input_value_changed">
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="value" type="float" />
 			<description>
 				Emitted when a trigger or similar input on this controller changes value.
 			</description>
diff --git a/doc/classes/XRInterface.xml b/doc/classes/XRInterface.xml
index 26b7699af2..6296b95e6c 100644
--- a/doc/classes/XRInterface.xml
+++ b/doc/classes/XRInterface.xml
@@ -71,30 +71,30 @@
 		</method>
 		<method name="set_play_area_mode">
 			<return type="bool" />
-			<argument index="0" name="mode" type="int" enum="XRInterface.PlayAreaMode" />
+			<param index="0" name="mode" type="int" enum="XRInterface.PlayAreaMode" />
 			<description>
 				Sets the active play area mode, will return [code]false[/code] if the mode can't be used with this interface.
 			</description>
 		</method>
 		<method name="supports_play_area_mode">
 			<return type="bool" />
-			<argument index="0" name="mode" type="int" enum="XRInterface.PlayAreaMode" />
+			<param index="0" name="mode" type="int" enum="XRInterface.PlayAreaMode" />
 			<description>
 				Call this to find out if a given play area mode is supported by this interface.
 			</description>
 		</method>
 		<method name="trigger_haptic_pulse">
 			<return type="void" />
-			<argument index="0" name="action_name" type="String" />
-			<argument index="1" name="tracker_name" type="StringName" />
-			<argument index="2" name="frequency" type="float" />
-			<argument index="3" name="amplitude" type="float" />
-			<argument index="4" name="duration_sec" type="float" />
-			<argument index="5" name="delay_sec" type="float" />
+			<param index="0" name="action_name" type="String" />
+			<param index="1" name="tracker_name" type="StringName" />
+			<param index="2" name="frequency" type="float" />
+			<param index="3" name="amplitude" type="float" />
+			<param index="4" name="duration_sec" type="float" />
+			<param index="5" name="delay_sec" type="float" />
 			<description>
 				Triggers a haptic pulse on a device associated with this interface.
-				[code]action_name[/code] is the name of the action for this pulse.
-				[code]tracker_name[/code] is optional and can be used to direct the pulse to a specific device provided that device is bound to this haptic.
+				[param action_name] is the name of the action for this pulse.
+				[param tracker_name] is optional and can be used to direct the pulse to a specific device provided that device is bound to this haptic.
 			</description>
 		</method>
 		<method name="uninitialize">
@@ -117,7 +117,7 @@
 	</members>
 	<signals>
 		<signal name="play_area_changed">
-			<argument index="0" name="mode" type="int" />
+			<param index="0" name="mode" type="int" />
 			<description>
 				Emitted when the play area is changed. This can be a result of the player resetting the boundary or entering a new play area, the player changing the play area mode, the world scale changing or the player resetting their headset orientation.
 			</description>
diff --git a/doc/classes/XRInterfaceExtension.xml b/doc/classes/XRInterfaceExtension.xml
index 1642ae61f7..06ef18b534 100644
--- a/doc/classes/XRInterfaceExtension.xml
+++ b/doc/classes/XRInterfaceExtension.xml
@@ -59,10 +59,10 @@
 		</method>
 		<method name="_get_projection_for_view" qualifiers="virtual">
 			<return type="PackedFloat64Array" />
-			<argument index="0" name="view" type="int" />
-			<argument index="1" name="aspect" type="float" />
-			<argument index="2" name="z_near" type="float" />
-			<argument index="3" name="z_far" type="float" />
+			<param index="0" name="view" type="int" />
+			<param index="1" name="aspect" type="float" />
+			<param index="2" name="z_near" type="float" />
+			<param index="3" name="z_far" type="float" />
 			<description>
 				Returns the projection matrix for the given view as a [PackedFloat64Array].
 			</description>
@@ -75,7 +75,7 @@
 		</method>
 		<method name="_get_suggested_pose_names" qualifiers="virtual const">
 			<return type="PackedStringArray" />
-			<argument index="0" name="tracker_name" type="StringName" />
+			<param index="0" name="tracker_name" type="StringName" />
 			<description>
 				Returns a [PackedStringArray] with pose names configured by this interface. Note that user configuration can override this list.
 			</description>
@@ -94,8 +94,8 @@
 		</method>
 		<method name="_get_transform_for_view" qualifiers="virtual">
 			<return type="Transform3D" />
-			<argument index="0" name="view" type="int" />
-			<argument index="1" name="cam_transform" type="Transform3D" />
+			<param index="0" name="view" type="int" />
+			<param index="1" name="cam_transform" type="Transform3D" />
 			<description>
 				Returns a [Transform3D] for a given view.
 			</description>
@@ -125,22 +125,22 @@
 		</method>
 		<method name="_notification" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="what" type="int" />
+			<param index="0" name="what" type="int" />
 			<description>
 				Informs the interface of an applicable system notification.
 			</description>
 		</method>
 		<method name="_post_draw_viewport" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="render_target" type="RID" />
-			<argument index="1" name="screen_rect" type="Rect2" />
+			<param index="0" name="render_target" type="RID" />
+			<param index="1" name="screen_rect" type="Rect2" />
 			<description>
 				Called after the XR [Viewport] draw logic has completed.
 			</description>
 		</method>
 		<method name="_pre_draw_viewport" qualifiers="virtual">
 			<return type="bool" />
-			<argument index="0" name="render_target" type="RID" />
+			<param index="0" name="render_target" type="RID" />
 			<description>
 				Called if this is our primary [XRInterfaceExtension] before we start processing a [Viewport] for every active XR [Viewport], returns [code]true[/code] if that viewport should be rendered. An XR interface may return [code]false[/code] if the user has taken off their headset and we can pause rendering.
 			</description>
@@ -159,33 +159,33 @@
 		</method>
 		<method name="_set_anchor_detection_is_enabled" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="enabled" type="bool" />
+			<param index="0" name="enabled" type="bool" />
 			<description>
 				Enables anchor detection on this interface if supported.
 			</description>
 		</method>
 		<method name="_set_play_area_mode" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="mode" type="int" />
+			<param index="0" name="mode" type="int" />
 			<description>
 				Set the play area mode for this interface.
 			</description>
 		</method>
 		<method name="_supports_play_area_mode" qualifiers="virtual const">
 			<return type="bool" />
-			<argument index="0" name="mode" type="int" enum="XRInterface.PlayAreaMode" />
+			<param index="0" name="mode" type="int" enum="XRInterface.PlayAreaMode" />
 			<description>
 				Returns [code]true[/code] if this interface supports this play area mode.
 			</description>
 		</method>
 		<method name="_trigger_haptic_pulse" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="action_name" type="String" />
-			<argument index="1" name="tracker_name" type="StringName" />
-			<argument index="2" name="frequency" type="float" />
-			<argument index="3" name="amplitude" type="float" />
-			<argument index="4" name="duration_sec" type="float" />
-			<argument index="5" name="delay_sec" type="float" />
+			<param index="0" name="action_name" type="String" />
+			<param index="1" name="tracker_name" type="StringName" />
+			<param index="2" name="frequency" type="float" />
+			<param index="3" name="amplitude" type="float" />
+			<param index="4" name="duration_sec" type="float" />
+			<param index="5" name="delay_sec" type="float" />
 			<description>
 				Triggers a haptic pulse to be emitted on the specified tracker.
 			</description>
@@ -198,24 +198,24 @@
 		</method>
 		<method name="add_blit">
 			<return type="void" />
-			<argument index="0" name="render_target" type="RID" />
-			<argument index="1" name="src_rect" type="Rect2" />
-			<argument index="2" name="dst_rect" type="Rect2i" />
-			<argument index="3" name="use_layer" type="bool" />
-			<argument index="4" name="layer" type="int" />
-			<argument index="5" name="apply_lens_distortion" type="bool" />
-			<argument index="6" name="eye_center" type="Vector2" />
-			<argument index="7" name="k1" type="float" />
-			<argument index="8" name="k2" type="float" />
-			<argument index="9" name="upscale" type="float" />
-			<argument index="10" name="aspect_ratio" type="float" />
+			<param index="0" name="render_target" type="RID" />
+			<param index="1" name="src_rect" type="Rect2" />
+			<param index="2" name="dst_rect" type="Rect2i" />
+			<param index="3" name="use_layer" type="bool" />
+			<param index="4" name="layer" type="int" />
+			<param index="5" name="apply_lens_distortion" type="bool" />
+			<param index="6" name="eye_center" type="Vector2" />
+			<param index="7" name="k1" type="float" />
+			<param index="8" name="k2" type="float" />
+			<param index="9" name="upscale" type="float" />
+			<param index="10" name="aspect_ratio" type="float" />
 			<description>
 				Blits our render results to screen optionally applying lens distortion. This can only be called while processing [code]_commit_views[/code].
 			</description>
 		</method>
 		<method name="get_render_target_texture">
 			<return type="RID" />
-			<argument index="0" name="render_target" type="RID" />
+			<param index="0" name="render_target" type="RID" />
 			<description>
 				Returns a valid [RID] for a texture to which we should render the current frame if supported by the interface.
 			</description>
diff --git a/doc/classes/XRNode3D.xml b/doc/classes/XRNode3D.xml
index bb9dccc2e0..1507a3fe45 100644
--- a/doc/classes/XRNode3D.xml
+++ b/doc/classes/XRNode3D.xml
@@ -29,14 +29,14 @@
 		</method>
 		<method name="trigger_haptic_pulse">
 			<return type="void" />
-			<argument index="0" name="action_name" type="String" />
-			<argument index="1" name="frequency" type="float" />
-			<argument index="2" name="amplitude" type="float" />
-			<argument index="3" name="duration_sec" type="float" />
-			<argument index="4" name="delay_sec" type="float" />
+			<param index="0" name="action_name" type="String" />
+			<param index="1" name="frequency" type="float" />
+			<param index="2" name="amplitude" type="float" />
+			<param index="3" name="duration_sec" type="float" />
+			<param index="4" name="delay_sec" type="float" />
 			<description>
 				Triggers a haptic pulse on a device associated with this interface.
-				[code]action_name[/code] is the name of the action for this pulse.
+				[param action_name] is the name of the action for this pulse.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/XRPositionalTracker.xml b/doc/classes/XRPositionalTracker.xml
index c146b27fcb..db2910f25e 100644
--- a/doc/classes/XRPositionalTracker.xml
+++ b/doc/classes/XRPositionalTracker.xml
@@ -14,47 +14,47 @@
 	<methods>
 		<method name="get_input" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns an input for this tracker. It can return a boolean, float or [Vector2] value depending on whether the input is a button, trigger or thumbstick/thumbpad.
 			</description>
 		</method>
 		<method name="get_pose" qualifiers="const">
 			<return type="XRPose" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns the current [XRPose] state object for the bound [code]pose[/code].
+				Returns the current [XRPose] state object for the bound [param name] pose.
 			</description>
 		</method>
 		<method name="has_pose" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
-				Returns [code]true[/code] if the bound [code]tracker[/code] is available and is currently tracking the bound [code]pose[/code].
+				Returns [code]true[/code] if the tracker is available and is currently tracking the bound [param name] pose.
 			</description>
 		</method>
 		<method name="invalidate_pose">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Marks this pose as invalid, we don't clear the last reported state but it allows users to decide if trackers need to be hidden if we loose tracking or just remain at their last known position.
 			</description>
 		</method>
 		<method name="set_input">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="value" type="Variant" />
 			<description>
 				Changes the value for the given input. This method is called by a [XRInterface] implementation and should not be used directly.
 			</description>
 		</method>
 		<method name="set_pose">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="transform" type="Transform3D" />
-			<argument index="2" name="linear_velocity" type="Vector3" />
-			<argument index="3" name="angular_velocity" type="Vector3" />
-			<argument index="4" name="tracking_confidence" type="int" enum="XRPose.TrackingConfidence" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="transform" type="Transform3D" />
+			<param index="2" name="linear_velocity" type="Vector3" />
+			<param index="3" name="angular_velocity" type="Vector3" />
+			<param index="4" name="tracking_confidence" type="int" enum="XRPose.TrackingConfidence" />
 			<description>
 				Sets the transform, linear velocity, angular velocity and tracking confidence for the given pose. This method is called by a [XRInterface] implementation and should not be used directly.
 			</description>
@@ -81,39 +81,39 @@
 	</members>
 	<signals>
 		<signal name="button_pressed">
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Emitted when a button on this tracker is pressed. Note that many XR runtimes allow other inputs to be mapped to buttons.
 			</description>
 		</signal>
 		<signal name="button_released">
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Emitted when a button on this tracker is released.
 			</description>
 		</signal>
 		<signal name="input_axis_changed">
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="vector" type="Vector2" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="vector" type="Vector2" />
 			<description>
 				Emitted when a thumbstick or thumbpad on this tracker moves.
 			</description>
 		</signal>
 		<signal name="input_value_changed">
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="value" type="float" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="value" type="float" />
 			<description>
 				Emitted when a trigger or similar input on this tracker changes value.
 			</description>
 		</signal>
 		<signal name="pose_changed">
-			<argument index="0" name="pose" type="XRPose" />
+			<param index="0" name="pose" type="XRPose" />
 			<description>
 				Emitted when the state of a pose tracked by this tracker changes.
 			</description>
 		</signal>
 		<signal name="profile_changed">
-			<argument index="0" name="role" type="String" />
+			<param index="0" name="role" type="String" />
 			<description>
 				Emitted when the profile of our tracker changes.
 			</description>
diff --git a/doc/classes/XRServer.xml b/doc/classes/XRServer.xml
index d3cb958cbc..7e96b33edd 100644
--- a/doc/classes/XRServer.xml
+++ b/doc/classes/XRServer.xml
@@ -12,22 +12,22 @@
 	<methods>
 		<method name="add_interface">
 			<return type="void" />
-			<argument index="0" name="interface" type="XRInterface" />
+			<param index="0" name="interface" type="XRInterface" />
 			<description>
 				Registers an [XRInterface] object.
 			</description>
 		</method>
 		<method name="add_tracker">
 			<return type="void" />
-			<argument index="0" name="tracker" type="XRPositionalTracker" />
+			<param index="0" name="tracker" type="XRPositionalTracker" />
 			<description>
 				Registers a new [XRPositionalTracker] that tracks a spatial location in real space.
 			</description>
 		</method>
 		<method name="center_on_hmd">
 			<return type="void" />
-			<argument index="0" name="rotation_mode" type="int" enum="XRServer.RotationMode" />
-			<argument index="1" name="keep_height" type="bool" />
+			<param index="0" name="rotation_mode" type="int" enum="XRServer.RotationMode" />
+			<param index="1" name="keep_height" type="bool" />
 			<description>
 				This is an important function to understand correctly. AR and VR platforms all handle positioning slightly differently.
 				For platforms that do not offer spatial tracking, our origin point (0,0,0) is the location of our HMD, but you have little control over the direction the player is facing in the real world.
@@ -39,9 +39,9 @@
 		</method>
 		<method name="find_interface" qualifiers="const">
 			<return type="XRInterface" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
-				Finds an interface by its name. For instance, if your project uses capabilities of an AR/VR platform, you can find the interface for that platform by name and initialize it.
+				Finds an interface by its [param name]. For instance, if your project uses capabilities of an AR/VR platform, you can find the interface for that platform by name and initialize it.
 			</description>
 		</method>
 		<method name="get_hmd_transform">
@@ -52,9 +52,9 @@
 		</method>
 		<method name="get_interface" qualifiers="const">
 			<return type="XRInterface" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
-				Returns the interface registered at a given index in our list of interfaces.
+				Returns the interface registered at the given [param idx] index in the list of interfaces.
 			</description>
 		</method>
 		<method name="get_interface_count" qualifiers="const">
@@ -77,30 +77,30 @@
 		</method>
 		<method name="get_tracker" qualifiers="const">
 			<return type="XRPositionalTracker" />
-			<argument index="0" name="tracker_name" type="StringName" />
+			<param index="0" name="tracker_name" type="StringName" />
 			<description>
-				Returns the positional tracker with this name.
+				Returns the positional tracker with the given [param tracker_name].
 			</description>
 		</method>
 		<method name="get_trackers">
 			<return type="Dictionary" />
-			<argument index="0" name="tracker_types" type="int" />
+			<param index="0" name="tracker_types" type="int" />
 			<description>
-				Returns a dictionary of trackers for this type.
+				Returns a dictionary of trackers for [param tracker_types].
 			</description>
 		</method>
 		<method name="remove_interface">
 			<return type="void" />
-			<argument index="0" name="interface" type="XRInterface" />
+			<param index="0" name="interface" type="XRInterface" />
 			<description>
-				Removes this interface.
+				Removes this [param interface].
 			</description>
 		</method>
 		<method name="remove_tracker">
 			<return type="void" />
-			<argument index="0" name="tracker" type="XRPositionalTracker" />
+			<param index="0" name="tracker" type="XRPositionalTracker" />
 			<description>
-				Removes this positional tracker.
+				Removes this positional [param tracker].
 			</description>
 		</method>
 	</methods>
@@ -114,34 +114,34 @@
 	</members>
 	<signals>
 		<signal name="interface_added">
-			<argument index="0" name="interface_name" type="StringName" />
+			<param index="0" name="interface_name" type="StringName" />
 			<description>
 				Emitted when a new interface has been added.
 			</description>
 		</signal>
 		<signal name="interface_removed">
-			<argument index="0" name="interface_name" type="StringName" />
+			<param index="0" name="interface_name" type="StringName" />
 			<description>
 				Emitted when an interface is removed.
 			</description>
 		</signal>
 		<signal name="tracker_added">
-			<argument index="0" name="tracker_name" type="StringName" />
-			<argument index="1" name="type" type="int" />
+			<param index="0" name="tracker_name" type="StringName" />
+			<param index="1" name="type" type="int" />
 			<description>
 				Emitted when a new tracker has been added. If you don't use a fixed number of controllers or if you're using [XRAnchor3D]s for an AR solution, it is important to react to this signal to add the appropriate [XRController3D] or [XRAnchor3D] nodes related to this new tracker.
 			</description>
 		</signal>
 		<signal name="tracker_removed">
-			<argument index="0" name="tracker_name" type="StringName" />
-			<argument index="1" name="type" type="int" />
+			<param index="0" name="tracker_name" type="StringName" />
+			<param index="1" name="type" type="int" />
 			<description>
 				Emitted when a tracker is removed. You should remove any [XRController3D] or [XRAnchor3D] points if applicable. This is not mandatory, the nodes simply become inactive and will be made active again when a new tracker becomes available (i.e. a new controller is switched on that takes the place of the previous one).
 			</description>
 		</signal>
 		<signal name="tracker_updated">
-			<argument index="0" name="tracker_name" type="StringName" />
-			<argument index="1" name="type" type="int" />
+			<param index="0" name="tracker_name" type="StringName" />
+			<param index="1" name="type" type="int" />
 			<description>
 				Emitted when an existing tracker has been updated. This can happen if the user switches controllers.
 			</description>
diff --git a/doc/classes/bool.xml b/doc/classes/bool.xml
index 374b703636..d0ef664281 100644
--- a/doc/classes/bool.xml
+++ b/doc/classes/bool.xml
@@ -100,21 +100,21 @@
 		</constructor>
 		<constructor name="bool">
 			<return type="bool" />
-			<argument index="0" name="from" type="bool" />
+			<param index="0" name="from" type="bool" />
 			<description>
 				Constructs a [bool] as a copy of the given [bool].
 			</description>
 		</constructor>
 		<constructor name="bool">
 			<return type="bool" />
-			<argument index="0" name="from" type="float" />
+			<param index="0" name="from" type="float" />
 			<description>
 				Cast a [float] value to a boolean value, this method will return [code]false[/code] if [code]0.0[/code] is passed in, and [code]true[/code] for all other floats.
 			</description>
 		</constructor>
 		<constructor name="bool">
 			<return type="bool" />
-			<argument index="0" name="from" type="int" />
+			<param index="0" name="from" type="int" />
 			<description>
 				Cast an [int] value to a boolean value, this method will return [code]false[/code] if [code]0[/code] is passed in, and [code]true[/code] for all other ints.
 			</description>
@@ -123,28 +123,28 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="bool" />
+			<param index="0" name="right" type="bool" />
 			<description>
 				Returns [code]true[/code] if two bools are different, i.e. one is [code]true[/code] and the other is [code]false[/code].
 			</description>
 		</operator>
 		<operator name="operator &lt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="bool" />
+			<param index="0" name="right" type="bool" />
 			<description>
 				Returns [code]true[/code] if the left operand is [code]false[/code] and the right operand is [code]true[/code].
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="bool" />
+			<param index="0" name="right" type="bool" />
 			<description>
 				Returns [code]true[/code] if two bools are equal, i.e. both are [code]true[/code] or both are [code]false[/code].
 			</description>
 		</operator>
 		<operator name="operator &gt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="bool" />
+			<param index="0" name="right" type="bool" />
 			<description>
 				Returns [code]true[/code] if the left operand is [code]true[/code] and the right operand is [code]false[/code].
 			</description>
diff --git a/doc/classes/float.xml b/doc/classes/float.xml
index a7c6533ef5..9d685b9cd0 100644
--- a/doc/classes/float.xml
+++ b/doc/classes/float.xml
@@ -21,21 +21,21 @@
 		</constructor>
 		<constructor name="float">
 			<return type="float" />
-			<argument index="0" name="from" type="float" />
+			<param index="0" name="from" type="float" />
 			<description>
 				Constructs a [float] as a copy of the given [float].
 			</description>
 		</constructor>
 		<constructor name="float">
 			<return type="float" />
-			<argument index="0" name="from" type="bool" />
+			<param index="0" name="from" type="bool" />
 			<description>
 				Cast a [bool] value to a floating-point value, [code]float(true)[/code] will be equal to 1.0 and [code]float(false)[/code] will be equal to 0.0.
 			</description>
 		</constructor>
 		<constructor name="float">
 			<return type="float" />
-			<argument index="0" name="from" type="int" />
+			<param index="0" name="from" type="int" />
 			<description>
 				Cast an [int] value to a floating-point value, [code]float(1)[/code] will be equal to [code]1.0[/code].
 			</description>
@@ -44,21 +44,21 @@
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Returns [code]true[/code] if two floats are different from each other.
 			</description>
 		</operator>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Returns [code]true[/code] if the integer has different value than the float.
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Color" />
-			<argument index="0" name="right" type="Color" />
+			<param index="0" name="right" type="Color" />
 			<description>
 				Multiplies each component of the [Color] by the given [float].
 				[codeblock]
@@ -68,14 +68,14 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Quaternion" />
-			<argument index="0" name="right" type="Quaternion" />
+			<param index="0" name="right" type="Quaternion" />
 			<description>
 				Multiplies each component of the [Quaternion] by the given [float]. This operation is not meaningful on its own, but it can be used as a part of a larger expression.
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector2" />
-			<argument index="0" name="right" type="Vector2" />
+			<param index="0" name="right" type="Vector2" />
 			<description>
 				Multiplies each component of the [Vector2] by the given [float].
 				[codeblock]
@@ -85,7 +85,7 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Vector2" />
-			<argument index="0" name="right" type="Vector2i" />
+			<param index="0" name="right" type="Vector2i" />
 			<description>
 				Multiplies each component of the [Vector2i] by the given [float]. Returns a [Vector2].
 				[codeblock]
@@ -95,14 +95,14 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Vector3" />
-			<argument index="0" name="right" type="Vector3" />
+			<param index="0" name="right" type="Vector3" />
 			<description>
 				Multiplies each component of the [Vector3] by the given [float].
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector3" />
-			<argument index="0" name="right" type="Vector3i" />
+			<param index="0" name="right" type="Vector3i" />
 			<description>
 				Multiplies each component of the [Vector3i] by the given [float]. Returns a [Vector3].
 				[codeblock]
@@ -112,115 +112,115 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Vector4" />
-			<argument index="0" name="right" type="Vector4" />
+			<param index="0" name="right" type="Vector4" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector4" />
-			<argument index="0" name="right" type="Vector4i" />
+			<param index="0" name="right" type="Vector4i" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="float" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Multiplies two [float]s.
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="float" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Multiplies a [float] and an [int]. The result is a [float].
 			</description>
 		</operator>
 		<operator name="operator **">
 			<return type="float" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator **">
 			<return type="float" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="float" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Adds two floats.
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="float" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Adds a [float] and an [int]. The result is a [float].
 			</description>
 		</operator>
 		<operator name="operator -">
 			<return type="float" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Subtracts a float from a float.
 			</description>
 		</operator>
 		<operator name="operator -">
 			<return type="float" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Subtracts an [int] from a [float]. The result is a [float].
 			</description>
 		</operator>
 		<operator name="operator /">
 			<return type="float" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Divides two floats.
 			</description>
 		</operator>
 		<operator name="operator /">
 			<return type="float" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Divides a [float] by an [int]. The result is a [float].
 			</description>
 		</operator>
 		<operator name="operator &lt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Returns [code]true[/code] the left float is less than the right one.
 			</description>
 		</operator>
 		<operator name="operator &lt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Returns [code]true[/code] if this [float] is less than the given [int].
 			</description>
 		</operator>
 		<operator name="operator &lt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Returns [code]true[/code] the left integer is less than or equal to the right one.
 			</description>
 		</operator>
 		<operator name="operator &lt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Returns [code]true[/code] if this [float] is less than or equal to the given [int].
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Returns [code]true[/code] if both floats are exactly equal.
 				[b]Note:[/b] Due to floating-point precision errors, consider using [method @GlobalScope.is_equal_approx] or [method @GlobalScope.is_zero_approx] instead, which are more reliable.
@@ -228,35 +228,35 @@
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Returns [code]true[/code] if the [float] and the given [int] are equal.
 			</description>
 		</operator>
 		<operator name="operator &gt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Returns [code]true[/code] the left float is greater than the right one.
 			</description>
 		</operator>
 		<operator name="operator &gt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Returns [code]true[/code] if this [float] is greater than the given [int].
 			</description>
 		</operator>
 		<operator name="operator &gt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Returns [code]true[/code] the left float is greater than or equal to the right one.
 			</description>
 		</operator>
 		<operator name="operator &gt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Returns [code]true[/code] if this [float] is greater than or equal to the given [int].
 			</description>
diff --git a/doc/classes/int.xml b/doc/classes/int.xml
index 6b492ca923..78e2e7d18f 100644
--- a/doc/classes/int.xml
+++ b/doc/classes/int.xml
@@ -47,44 +47,44 @@
 		</constructor>
 		<constructor name="int">
 			<return type="int" />
-			<argument index="0" name="from" type="int" />
+			<param index="0" name="from" type="int" />
 			<description>
 				Constructs an [int] as a copy of the given [int].
 			</description>
 		</constructor>
 		<constructor name="int">
 			<return type="int" />
-			<argument index="0" name="from" type="bool" />
+			<param index="0" name="from" type="bool" />
 			<description>
 				Cast a [bool] value to an integer value, [code]int(true)[/code] will be equals to 1 and [code]int(false)[/code] will be equals to 0.
 			</description>
 		</constructor>
 		<constructor name="int">
 			<return type="int" />
-			<argument index="0" name="from" type="float" />
+			<param index="0" name="from" type="float" />
 			<description>
-				Cast a float value to an integer value, this method simply removes the number fractions (i.e. rounds [code]from[/code] towards zero), so for example [code]int(2.7)[/code] will be equals to 2, [code]int(0.1)[/code] will be equals to 0 and [code]int(-2.7)[/code] will be equals to -2. This operation is also called truncation.
+				Cast a float value to an integer value, this method simply removes the number fractions (i.e. rounds [param from] towards zero), so for example [code]int(2.7)[/code] will be equals to 2, [code]int(0.1)[/code] will be equals to 0 and [code]int(-2.7)[/code] will be equals to -2. This operation is also called truncation.
 			</description>
 		</constructor>
 	</constructors>
 	<operators>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Returns [code]true[/code] if operands are different from each other.
 			</description>
 		</operator>
 		<operator name="operator !=">
 			<return type="bool" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Returns [code]true[/code] if operands are different from each other.
 			</description>
 		</operator>
 		<operator name="operator %">
 			<return type="int" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Returns the remainder after dividing two integers. This operation uses truncated division, which is often not desired as it does not work well with negative numbers. Consider using [method @GlobalScope.posmod] instead if you want to handle negative numbers.
 				[codeblock]
@@ -96,7 +96,7 @@
 		</operator>
 		<operator name="operator &amp;">
 			<return type="int" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Returns the result of bitwise [code]AND[/code] operation for two integers.
 				[codeblock]
@@ -114,21 +114,21 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Color" />
-			<argument index="0" name="right" type="Color" />
+			<param index="0" name="right" type="Color" />
 			<description>
 				Multiplies each component of the [Color] by the given [int].
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Quaternion" />
-			<argument index="0" name="right" type="Quaternion" />
+			<param index="0" name="right" type="Quaternion" />
 			<description>
 				Multiplies each component of the [Quaternion] by the given [int]. This operation is not meaningful on its own, but it can be used as a part of a larger expression.
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector2" />
-			<argument index="0" name="right" type="Vector2" />
+			<param index="0" name="right" type="Vector2" />
 			<description>
 				Multiplies each component of the [Vector2] by the given [int].
 				[codeblock]
@@ -138,101 +138,101 @@
 		</operator>
 		<operator name="operator *">
 			<return type="Vector2i" />
-			<argument index="0" name="right" type="Vector2i" />
+			<param index="0" name="right" type="Vector2i" />
 			<description>
 				Multiplies each component of the [Vector2i] by the given [int].
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector3" />
-			<argument index="0" name="right" type="Vector3" />
+			<param index="0" name="right" type="Vector3" />
 			<description>
 				Multiplies each component of the [Vector3] by the given [int].
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector3i" />
-			<argument index="0" name="right" type="Vector3i" />
+			<param index="0" name="right" type="Vector3i" />
 			<description>
 				Multiplies each component of the [Vector3i] by the given [int].
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector4" />
-			<argument index="0" name="right" type="Vector4" />
+			<param index="0" name="right" type="Vector4" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="Vector4i" />
-			<argument index="0" name="right" type="Vector4i" />
+			<param index="0" name="right" type="Vector4i" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="float" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Multiplies an [int] and a [float]. The result is a [float].
 			</description>
 		</operator>
 		<operator name="operator *">
 			<return type="int" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Multiplies two [int]s.
 			</description>
 		</operator>
 		<operator name="operator **">
 			<return type="float" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator **">
 			<return type="int" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="String" />
-			<argument index="0" name="right" type="String" />
+			<param index="0" name="right" type="String" />
 			<description>
 				Adds Unicode character with code [int] to the [String].
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="float" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Adds an [int] and a [float]. The result is a [float].
 			</description>
 		</operator>
 		<operator name="operator +">
 			<return type="int" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Adds two integers.
 			</description>
 		</operator>
 		<operator name="operator -">
 			<return type="float" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Subtracts a [float] from an [int]. The result is a [float].
 			</description>
 		</operator>
 		<operator name="operator -">
 			<return type="int" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Subtracts two integers.
 			</description>
 		</operator>
 		<operator name="operator /">
 			<return type="float" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Divides an [int] by a [float]. The result is a [float].
 				[codeblock]
@@ -242,7 +242,7 @@
 		</operator>
 		<operator name="operator /">
 			<return type="int" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Divides two integers. The decimal part of the result is discarded (truncated).
 				[codeblock]
@@ -253,21 +253,21 @@
 		</operator>
 		<operator name="operator &lt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Returns [code]true[/code] if this [int] is less than the given [float].
 			</description>
 		</operator>
 		<operator name="operator &lt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Returns [code]true[/code] the left integer is less than the right one.
 			</description>
 		</operator>
 		<operator name="operator &lt;&lt;">
 			<return type="int" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Performs bitwise shift left operation on the integer. Effectively the same as multiplying by a power of 2.
 				[codeblock]
@@ -278,63 +278,63 @@
 		</operator>
 		<operator name="operator &lt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Returns [code]true[/code] if this [int] is less than or equal to the given [float].
 			</description>
 		</operator>
 		<operator name="operator &lt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Returns [code]true[/code] the left integer is less than or equal to the right one.
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Returns [code]true[/code] if the integer is equal to the given [float].
 			</description>
 		</operator>
 		<operator name="operator ==">
 			<return type="bool" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Returns [code]true[/code] if both integers are equal.
 			</description>
 		</operator>
 		<operator name="operator &gt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Returns [code]true[/code] if this [int] is greater than the given [float].
 			</description>
 		</operator>
 		<operator name="operator &gt;">
 			<return type="bool" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Returns [code]true[/code] the left integer is greater than the right one.
 			</description>
 		</operator>
 		<operator name="operator &gt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="float" />
+			<param index="0" name="right" type="float" />
 			<description>
 				Returns [code]true[/code] if this [int] is greater than or equal to the given [float].
 			</description>
 		</operator>
 		<operator name="operator &gt;=">
 			<return type="bool" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Returns [code]true[/code] the left integer is greater than or equal to the right one.
 			</description>
 		</operator>
 		<operator name="operator &gt;&gt;">
 			<return type="int" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Performs bitwise shift right operation on the integer. Effectively the same as dividing by a power of 2.
 				[codeblock]
@@ -345,7 +345,7 @@
 		</operator>
 		<operator name="operator ^">
 			<return type="int" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Returns the result of bitwise [code]XOR[/code] operation for two integers.
 				[codeblock]
@@ -368,7 +368,7 @@
 		</operator>
 		<operator name="operator |">
 			<return type="int" />
-			<argument index="0" name="right" type="int" />
+			<param index="0" name="right" type="int" />
 			<description>
 				Returns the result of bitwise [code]OR[/code] operation for two integers.
 				[codeblock]
diff --git a/doc/tools/doc_status.py b/doc/tools/doc_status.py
index cc0733cab2..376addcff0 100755
--- a/doc/tools/doc_status.py
+++ b/doc/tools/doc_status.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import fnmatch
 import os
@@ -7,6 +7,7 @@ import re
 import math
 import platform
 import xml.etree.ElementTree as ET
+from typing import Dict, List, Set
 
 ################################################################################
 #                                    Config                                    #
@@ -103,13 +104,13 @@ overall_progress_description_weight = 10
 ################################################################################
 
 
-def validate_tag(elem, tag):
+def validate_tag(elem: ET.Element, tag: str) -> None:
     if elem.tag != tag:
         print('Tag mismatch, expected "' + tag + '", got ' + elem.tag)
         sys.exit(255)
 
 
-def color(color, string):
+def color(color: str, string: str) -> str:
     if flags["c"] and terminal_supports_color():
         color_format = ""
         for code in colors[color]:
@@ -122,7 +123,7 @@ def color(color, string):
 ansi_escape = re.compile(r"\x1b[^m]*m")
 
 
-def nonescape_len(s):
+def nonescape_len(s: str) -> int:
     return len(ansi_escape.sub("", s))
 
 
@@ -142,14 +143,14 @@ def terminal_supports_color():
 
 
 class ClassStatusProgress:
-    def __init__(self, described=0, total=0):
-        self.described = described
-        self.total = total
+    def __init__(self, described: int = 0, total: int = 0):
+        self.described: int = described
+        self.total: int = total
 
-    def __add__(self, other):
+    def __add__(self, other: "ClassStatusProgress"):
         return ClassStatusProgress(self.described + other.described, self.total + other.total)
 
-    def increment(self, described):
+    def increment(self, described: bool):
         if described:
             self.described += 1
         self.total += 1
@@ -163,7 +164,7 @@ class ClassStatusProgress:
         else:
             return self.to_colored_string()
 
-    def to_colored_string(self, format="{has}/{total}", pad_format="{pad_described}{s}{pad_total}"):
+    def to_colored_string(self, format: str = "{has}/{total}", pad_format: str = "{pad_described}{s}{pad_total}"):
         ratio = float(self.described) / float(self.total) if self.total != 0 else 1
         percent = int(round(100 * ratio))
         s = format.format(has=str(self.described), total=str(self.total), percent=str(percent))
@@ -183,11 +184,11 @@ class ClassStatusProgress:
 
 
 class ClassStatus:
-    def __init__(self, name=""):
-        self.name = name
-        self.has_brief_description = True
-        self.has_description = True
-        self.progresses = {
+    def __init__(self, name: str = ""):
+        self.name: str = name
+        self.has_brief_description: bool = True
+        self.has_description: bool = True
+        self.progresses: Dict[str, ClassStatusProgress] = {
             "methods": ClassStatusProgress(),
             "constants": ClassStatusProgress(),
             "members": ClassStatusProgress(),
@@ -197,7 +198,7 @@ class ClassStatus:
             "constructors": ClassStatusProgress(),
         }
 
-    def __add__(self, other):
+    def __add__(self, other: "ClassStatus"):
         new_status = ClassStatus()
         new_status.name = self.name
         new_status.has_brief_description = self.has_brief_description and other.has_brief_description
@@ -222,8 +223,8 @@ class ClassStatus:
             sum += self.progresses[k].total
         return sum < 1
 
-    def make_output(self):
-        output = {}
+    def make_output(self) -> Dict[str, str]:
+        output: Dict[str, str] = {}
         output["name"] = color("name", self.name)
 
         ok_string = color("part_good", "OK")
@@ -263,22 +264,24 @@ class ClassStatus:
         return output
 
     @staticmethod
-    def generate_for_class(c):
+    def generate_for_class(c: ET.Element):
         status = ClassStatus()
         status.name = c.attrib["name"]
 
         for tag in list(c):
+            len_tag_text = 0 if (tag.text is None) else len(tag.text.strip())
 
             if tag.tag == "brief_description":
-                status.has_brief_description = len(tag.text.strip()) > 0
+                status.has_brief_description = len_tag_text > 0
 
             elif tag.tag == "description":
-                status.has_description = len(tag.text.strip()) > 0
+                status.has_description = len_tag_text > 0
 
             elif tag.tag in ["methods", "signals", "operators", "constructors"]:
                 for sub_tag in list(tag):
                     descr = sub_tag.find("description")
-                    status.progresses[tag.tag].increment(len(descr.text.strip()) > 0)
+                    increment = (descr is not None) and (descr.text is not None) and len(descr.text.strip()) > 0
+                    status.progresses[tag.tag].increment(increment)
             elif tag.tag in ["constants", "members", "theme_items"]:
                 for sub_tag in list(tag):
                     if not sub_tag.text is None:
@@ -297,9 +300,9 @@ class ClassStatus:
 #                                  Arguments                                   #
 ################################################################################
 
-input_file_list = []
-input_class_list = []
-merged_file = ""
+input_file_list: List[str] = []
+input_class_list: List[str] = []
+merged_file: str = ""
 
 for arg in sys.argv[1:]:
     try:
@@ -373,8 +376,8 @@ if len(input_file_list) < 1 or flags["h"]:
 #                               Parse class list                               #
 ################################################################################
 
-class_names = []
-classes = {}
+class_names: List[str] = []
+classes: Dict[str, ET.Element] = {}
 
 for file in input_file_list:
     tree = ET.parse(file)
@@ -396,10 +399,10 @@ class_names.sort()
 if len(input_class_list) < 1:
     input_class_list = ["*"]
 
-filtered_classes = set()
+filtered_classes_set: Set[str] = set()
 for pattern in input_class_list:
-    filtered_classes |= set(fnmatch.filter(class_names, pattern))
-filtered_classes = list(filtered_classes)
+    filtered_classes_set |= set(fnmatch.filter(class_names, pattern))
+filtered_classes = list(filtered_classes_set)
 filtered_classes.sort()
 
 ################################################################################
@@ -413,7 +416,6 @@ table_column_chars = "|"
 total_status = ClassStatus("Total")
 
 for cn in filtered_classes:
-
     c = classes[cn]
     validate_tag(c, "class")
     status = ClassStatus.generate_for_class(c)
@@ -427,7 +429,7 @@ for cn in filtered_classes:
         continue
 
     out = status.make_output()
-    row = []
+    row: List[str] = []
     for column in table_columns:
         if column in out:
             row.append(out[column])
@@ -464,7 +466,7 @@ if flags["a"]:
     # without having to scroll back to the top.
     table.append(table_column_names)
 
-table_column_sizes = []
+table_column_sizes: List[int] = []
 for row in table:
     for cell_i, cell in enumerate(row):
         if cell_i >= len(table_column_sizes):
@@ -477,7 +479,6 @@ for cell_i in range(len(table[0])):
     divider_string += (
         table_row_chars[1] + table_row_chars[2] * (table_column_sizes[cell_i]) + table_row_chars[1] + table_row_chars[0]
     )
-print(divider_string)
 
 for row_i, row in enumerate(table):
     row_string = table_column_chars
diff --git a/doc/tools/make_rst.py b/doc/tools/make_rst.py
index 469bb4a310..519554e026 100755
--- a/doc/tools/make_rst.py
+++ b/doc/tools/make_rst.py
@@ -9,15 +9,13 @@ import re
 import sys
 import xml.etree.ElementTree as ET
 from collections import OrderedDict
+from typing import List, Dict, TextIO, Tuple, Optional, Any, Union
 
 # Import hardcoded version information from version.py
 root_directory = os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../")
 sys.path.append(root_directory)  # Include the root directory
 import version
 
-# Uncomment to do type checks. I have it commented out so it works below Python 3.5
-# from typing import List, Dict, TextIO, Tuple, Iterable, Optional, DefaultDict, Any, Union
-
 # $DOCS_URL/path/to/page.html(#fragment-tag)
 GODOT_DOCS_PATTERN = re.compile(r"^\$DOCS_URL/(.*)\.html(#.*)?$")
 
@@ -61,127 +59,21 @@ BASE_STRINGS = [
     "This method doesn't need an instance to be called, so it can be called directly using the class name.",
     "This method describes a valid operator to use with this type as left-hand operand.",
 ]
-strings_l10n = {}
-
-STYLES = {}
-
-
-def print_error(error, state):  # type: (str, State) -> None
-    print("{}{}ERROR:{} {}{}".format(STYLES["red"], STYLES["bold"], STYLES["regular"], error, STYLES["reset"]))
-    state.num_errors += 1
-
-
-class TypeName:
-    def __init__(self, type_name, enum=None):  # type: (str, Optional[str]) -> None
-        self.type_name = type_name
-        self.enum = enum
-
-    def to_rst(self, state):  # type: ("State") -> str
-        if self.enum is not None:
-            return make_enum(self.enum, state)
-        elif self.type_name == "void":
-            return "void"
-        else:
-            return make_type(self.type_name, state)
-
-    @classmethod
-    def from_element(cls, element):  # type: (ET.Element) -> "TypeName"
-        return cls(element.attrib["type"], element.get("enum"))
-
-
-class PropertyDef:
-    def __init__(
-        self, name, type_name, setter, getter, text, default_value, overrides
-    ):  # type: (str, TypeName, Optional[str], Optional[str], Optional[str], Optional[str], Optional[str]) -> None
-        self.name = name
-        self.type_name = type_name
-        self.setter = setter
-        self.getter = getter
-        self.text = text
-        self.default_value = default_value
-        self.overrides = overrides
-
-
-class ParameterDef:
-    def __init__(self, name, type_name, default_value):  # type: (str, TypeName, Optional[str]) -> None
-        self.name = name
-        self.type_name = type_name
-        self.default_value = default_value
-
-
-class SignalDef:
-    def __init__(self, name, parameters, description):  # type: (str, List[ParameterDef], Optional[str]) -> None
-        self.name = name
-        self.parameters = parameters
-        self.description = description
-
-
-class MethodDef:
-    def __init__(
-        self, name, return_type, parameters, description, qualifiers
-    ):  # type: (str, TypeName, List[ParameterDef], Optional[str], Optional[str]) -> None
-        self.name = name
-        self.return_type = return_type
-        self.parameters = parameters
-        self.description = description
-        self.qualifiers = qualifiers
+strings_l10n: Dict[str, str] = {}
 
-
-class ConstantDef:
-    def __init__(self, name, value, text, bitfield):  # type: (str, str, Optional[str], Optional[bool]) -> None
-        self.name = name
-        self.value = value
-        self.text = text
-        self.is_bitfield = bitfield
-
-
-class EnumDef:
-    def __init__(self, name, bitfield):  # type: (str, Optional[bool]) -> None
-        self.name = name
-        self.values = OrderedDict()  # type: OrderedDict[str, ConstantDef]
-        self.is_bitfield = bitfield
-
-
-class ThemeItemDef:
-    def __init__(
-        self, name, type_name, data_name, text, default_value
-    ):  # type: (str, TypeName, str, Optional[str], Optional[str]) -> None
-        self.name = name
-        self.type_name = type_name
-        self.data_name = data_name
-        self.text = text
-        self.default_value = default_value
-
-
-class ClassDef:
-    def __init__(self, name):  # type: (str) -> None
-        self.name = name
-        self.constants = OrderedDict()  # type: OrderedDict[str, ConstantDef]
-        self.enums = OrderedDict()  # type: OrderedDict[str, EnumDef]
-        self.properties = OrderedDict()  # type: OrderedDict[str, PropertyDef]
-        self.constructors = OrderedDict()  # type: OrderedDict[str, List[MethodDef]]
-        self.methods = OrderedDict()  # type: OrderedDict[str, List[MethodDef]]
-        self.operators = OrderedDict()  # type: OrderedDict[str, List[MethodDef]]
-        self.signals = OrderedDict()  # type: OrderedDict[str, SignalDef]
-        self.annotations = OrderedDict()  # type: OrderedDict[str, List[MethodDef]]
-        self.theme_items = OrderedDict()  # type: OrderedDict[str, ThemeItemDef]
-        self.inherits = None  # type: Optional[str]
-        self.brief_description = None  # type: Optional[str]
-        self.description = None  # type: Optional[str]
-        self.tutorials = []  # type: List[Tuple[str, str]]
-
-        # Used to match the class with XML source for output filtering purposes.
-        self.filepath = ""  # type: str
+STYLES: Dict[str, str] = {}
 
 
 class State:
-    def __init__(self):  # type: () -> None
+    def __init__(self) -> None:
         self.num_errors = 0
-        self.classes = OrderedDict()  # type: OrderedDict[str, ClassDef]
-        self.current_class = ""  # type: str
+        self.num_warnings = 0
+        self.classes: OrderedDict[str, ClassDef] = OrderedDict()
+        self.current_class: str = ""
 
-    def parse_class(self, class_root, filepath):  # type: (ET.Element, str) -> None
+    def parse_class(self, class_root: ET.Element, filepath: str) -> None:
         class_name = class_root.attrib["name"]
+        self.current_class = class_name
 
         class_def = ClassDef(class_name)
         self.classes[class_name] = class_def
@@ -233,11 +125,10 @@ class State:
                 return_element = constructor.find("return")
                 if return_element is not None:
                     return_type = TypeName.from_element(return_element)
-
                 else:
                     return_type = TypeName("void")
 
-                params = parse_arguments(constructor)
+                params = self.parse_params(constructor, "constructor")
 
                 desc_element = constructor.find("description")
                 method_desc = None
@@ -245,6 +136,7 @@ class State:
                     method_desc = desc_element.text
 
                 method_def = MethodDef(method_name, return_type, params, method_desc, qualifiers)
+                method_def.definition_name = "constructor"
                 if method_name not in class_def.constructors:
                     class_def.constructors[method_name] = []
 
@@ -265,7 +157,7 @@ class State:
                 else:
                     return_type = TypeName("void")
 
-                params = parse_arguments(method)
+                params = self.parse_params(method, "method")
 
                 desc_element = method.find("description")
                 method_desc = None
@@ -293,7 +185,7 @@ class State:
                 else:
                     return_type = TypeName("void")
 
-                params = parse_arguments(operator)
+                params = self.parse_params(operator, "operator")
 
                 desc_element = operator.find("description")
                 method_desc = None
@@ -301,6 +193,7 @@ class State:
                     method_desc = desc_element.text
 
                 method_def = MethodDef(method_name, return_type, params, method_desc, qualifiers)
+                method_def.definition_name = "operator"
                 if method_name not in class_def.operators:
                     class_def.operators[method_name] = []
 
@@ -314,7 +207,7 @@ class State:
                 constant_name = constant.attrib["name"]
                 value = constant.attrib["value"]
                 enum = constant.get("enum")
-                is_bitfield = constant.get("is_bitfield") or False
+                is_bitfield = constant.get("is_bitfield") == "true"
                 constant_def = ConstantDef(constant_name, value, constant.text, is_bitfield)
                 if enum is None:
                     if constant_name in class_def.constants:
@@ -341,14 +234,14 @@ class State:
                 annotation_name = annotation.attrib["name"]
                 qualifiers = annotation.get("qualifiers")
 
-                params = parse_arguments(annotation)
+                params = self.parse_params(annotation, "annotation")
 
                 desc_element = annotation.find("description")
                 annotation_desc = None
                 if desc_element is not None:
                     annotation_desc = desc_element.text
 
-                annotation_def = MethodDef(annotation_name, return_type, params, annotation_desc, qualifiers)
+                annotation_def = AnnotationDef(annotation_name, params, annotation_desc, qualifiers)
                 if annotation_name not in class_def.annotations:
                     class_def.annotations[annotation_name] = []
 
@@ -365,7 +258,7 @@ class State:
                     print_error('{}.xml: Duplicate signal "{}".'.format(class_name, signal_name), self)
                     continue
 
-                params = parse_arguments(signal)
+                params = self.parse_params(signal, "signal")
 
                 desc_element = signal.find("description")
                 signal_desc = None
@@ -413,31 +306,190 @@ class State:
                 if link.text is not None:
                     class_def.tutorials.append((link.text.strip(), link.get("title", "")))
 
-    def sort_classes(self):  # type: () -> None
+        self.current_class = ""
+
+    def parse_params(self, root: ET.Element, context: str) -> List["ParameterDef"]:
+        param_elements = root.findall("param")
+        params: Any = [None] * len(param_elements)
+
+        for param_index, param_element in enumerate(param_elements):
+            param_name = param_element.attrib["name"]
+            index = int(param_element.attrib["index"])
+            type_name = TypeName.from_element(param_element)
+            default = param_element.get("default")
+
+            if param_name.strip() == "" or param_name.startswith("_unnamed_arg"):
+                print_error(
+                    '{}.xml: Empty argument name in {} "{}" at position {}.'.format(
+                        self.current_class, context, root.attrib["name"], param_index
+                    ),
+                    self,
+                )
+
+            params[index] = ParameterDef(param_name, type_name, default)
+
+        cast: List[ParameterDef] = params
+
+        return cast
+
+    def sort_classes(self) -> None:
         self.classes = OrderedDict(sorted(self.classes.items(), key=lambda t: t[0]))
 
 
-def parse_arguments(root):  # type: (ET.Element) -> List[ParameterDef]
-    param_elements = root.findall("argument")
-    params = [None] * len(param_elements)  # type: Any
-    for param_element in param_elements:
-        param_name = param_element.attrib["name"]
-        index = int(param_element.attrib["index"])
-        type_name = TypeName.from_element(param_element)
-        default = param_element.get("default")
+class TypeName:
+    def __init__(self, type_name: str, enum: Optional[str] = None) -> None:
+        self.type_name = type_name
+        self.enum = enum
+
+    def to_rst(self, state: State) -> str:
+        if self.enum is not None:
+            return make_enum(self.enum, state)
+        elif self.type_name == "void":
+            return "void"
+        else:
+            return make_type(self.type_name, state)
+
+    @classmethod
+    def from_element(cls, element: ET.Element) -> "TypeName":
+        return cls(element.attrib["type"], element.get("enum"))
+
+
+class DefinitionBase:
+    def __init__(
+        self,
+        definition_name: str,
+        name: str,
+    ) -> None:
+        self.definition_name = definition_name
+        self.name = name
+
+
+class PropertyDef(DefinitionBase):
+    def __init__(
+        self,
+        name: str,
+        type_name: TypeName,
+        setter: Optional[str],
+        getter: Optional[str],
+        text: Optional[str],
+        default_value: Optional[str],
+        overrides: Optional[str],
+    ) -> None:
+        super().__init__("property", name)
+
+        self.type_name = type_name
+        self.setter = setter
+        self.getter = getter
+        self.text = text
+        self.default_value = default_value
+        self.overrides = overrides
+
+
+class ParameterDef(DefinitionBase):
+    def __init__(self, name: str, type_name: TypeName, default_value: Optional[str]) -> None:
+        super().__init__("parameter", name)
+
+        self.type_name = type_name
+        self.default_value = default_value
+
+
+class SignalDef(DefinitionBase):
+    def __init__(self, name: str, parameters: List[ParameterDef], description: Optional[str]) -> None:
+        super().__init__("signal", name)
+
+        self.parameters = parameters
+        self.description = description
+
+
+class AnnotationDef(DefinitionBase):
+    def __init__(
+        self,
+        name: str,
+        parameters: List[ParameterDef],
+        description: Optional[str],
+        qualifiers: Optional[str],
+    ) -> None:
+        super().__init__("annotation", name)
+
+        self.parameters = parameters
+        self.description = description
+        self.qualifiers = qualifiers
+
+
+class MethodDef(DefinitionBase):
+    def __init__(
+        self,
+        name: str,
+        return_type: TypeName,
+        parameters: List[ParameterDef],
+        description: Optional[str],
+        qualifiers: Optional[str],
+    ) -> None:
+        super().__init__("method", name)
+
+        self.return_type = return_type
+        self.parameters = parameters
+        self.description = description
+        self.qualifiers = qualifiers
+
 
-        params[index] = ParameterDef(param_name, type_name, default)
+class ConstantDef(DefinitionBase):
+    def __init__(self, name: str, value: str, text: Optional[str], bitfield: bool) -> None:
+        super().__init__("constant", name)
 
-    cast = params  # type: List[ParameterDef]
+        self.value = value
+        self.text = text
+        self.is_bitfield = bitfield
 
-    return cast
 
+class EnumDef(DefinitionBase):
+    def __init__(self, name: str, bitfield: bool) -> None:
+        super().__init__("enum", name)
 
-def main():  # type: () -> None
+        self.values: OrderedDict[str, ConstantDef] = OrderedDict()
+        self.is_bitfield = bitfield
+
+
+class ThemeItemDef(DefinitionBase):
+    def __init__(
+        self, name: str, type_name: TypeName, data_name: str, text: Optional[str], default_value: Optional[str]
+    ) -> None:
+        super().__init__("theme item", name)
+
+        self.type_name = type_name
+        self.data_name = data_name
+        self.text = text
+        self.default_value = default_value
+
+
+class ClassDef(DefinitionBase):
+    def __init__(self, name: str) -> None:
+        super().__init__("class", name)
+
+        self.constants: OrderedDict[str, ConstantDef] = OrderedDict()
+        self.enums: OrderedDict[str, EnumDef] = OrderedDict()
+        self.properties: OrderedDict[str, PropertyDef] = OrderedDict()
+        self.constructors: OrderedDict[str, List[MethodDef]] = OrderedDict()
+        self.methods: OrderedDict[str, List[MethodDef]] = OrderedDict()
+        self.operators: OrderedDict[str, List[MethodDef]] = OrderedDict()
+        self.signals: OrderedDict[str, SignalDef] = OrderedDict()
+        self.annotations: OrderedDict[str, List[AnnotationDef]] = OrderedDict()
+        self.theme_items: OrderedDict[str, ThemeItemDef] = OrderedDict()
+        self.inherits: Optional[str] = None
+        self.brief_description: Optional[str] = None
+        self.description: Optional[str] = None
+        self.tutorials: List[Tuple[str, str]] = []
+
+        # Used to match the class with XML source for output filtering purposes.
+        self.filepath: str = ""
+
+
+# Entry point for the RST generator.
+def main() -> None:
     # Enable ANSI escape code support on Windows 10 and later (for colored console output).
     # <https://bugs.python.org/issue29059>
     if platform.system().lower() == "windows":
-        from ctypes import windll, c_int, byref
+        from ctypes import windll, c_int, byref  # type: ignore
 
         stdout_handle = windll.kernel32.GetStdHandle(c_int(-11))
         mode = c_int(0)
@@ -466,6 +518,7 @@ def main():  # type: () -> None
     should_color = args.color or (hasattr(sys.stdout, "isatty") and sys.stdout.isatty())
     STYLES["red"] = "\x1b[91m" if should_color else ""
     STYLES["green"] = "\x1b[92m" if should_color else ""
+    STYLES["yellow"] = "\x1b[93m" if should_color else ""
     STYLES["bold"] = "\x1b[1m" if should_color else ""
     STYLES["regular"] = "\x1b[22m" if should_color else ""
     STYLES["reset"] = "\x1b[0m" if should_color else ""
@@ -491,7 +544,7 @@ def main():  # type: () -> None
 
     print("Checking for errors in the XML class reference...")
 
-    file_list = []  # type: List[str]
+    file_list: List[str] = []
 
     for path in args.path:
         # Cut off trailing slashes so os.path.basename doesn't choke.
@@ -515,7 +568,7 @@ def main():  # type: () -> None
 
             file_list.append(path)
 
-    classes = {}  # type: Dict[str, ET.Element]
+    classes: Dict[str, Tuple[ET.Element, str]] = {}
     state = State()
 
     for cur_file in file_list:
@@ -550,12 +603,29 @@ def main():  # type: () -> None
     # Create the output folder recursively if it doesn't already exist.
     os.makedirs(args.output, exist_ok=True)
 
+    print("Generating the RST class reference...")
+
     for class_name, class_def in state.classes.items():
         if args.filter and not pattern.search(class_def.filepath):
             continue
         state.current_class = class_name
         make_rst_class(class_def, state, args.dry_run, args.output)
 
+    print("")
+
+    if state.num_warnings >= 2:
+        print(
+            "{}{} warnings were found in the class reference XML. Please check the messages above.{}".format(
+                STYLES["yellow"], state.num_warnings, STYLES["reset"]
+            )
+        )
+    elif state.num_warnings == 1:
+        print(
+            "{}1 warning was found in the class reference XML. Please check the messages above.{}".format(
+                STYLES["yellow"], STYLES["reset"]
+            )
+        )
+
     if state.num_errors == 0:
         print("{}No errors found in the class reference XML.{}".format(STYLES["green"], STYLES["reset"]))
         if not args.dry_run:
@@ -576,7 +646,20 @@ def main():  # type: () -> None
         exit(1)
 
 
-def translate(string):  # type: (str) -> str
+# Common helpers.
+
+
+def print_error(error: str, state: State) -> None:
+    print("{}{}ERROR:{} {}{}".format(STYLES["red"], STYLES["bold"], STYLES["regular"], error, STYLES["reset"]))
+    state.num_errors += 1
+
+
+def print_warning(error: str, state: State) -> None:
+    print("{}{}WARNING:{} {}{}".format(STYLES["yellow"], STYLES["bold"], STYLES["regular"], error, STYLES["reset"]))
+    state.num_warnings += 1
+
+
+def translate(string: str) -> str:
     """Translate a string based on translations sourced from `doc/translations/*.po`
     for a language if defined via the --lang command line argument.
     Returns the original string if no translation exists.
@@ -584,7 +667,10 @@ def translate(string):  # type: (str) -> str
     return strings_l10n.get(string, string)
 
 
-def make_rst_class(class_def, state, dry_run, output_dir):  # type: (ClassDef, State, bool, str) -> None
+# Generator methods.
+
+
+def make_rst_class(class_def: ClassDef, state: State, dry_run: bool, output_dir: str) -> None:
     class_name = class_def.name
 
     if dry_run:
@@ -635,8 +721,8 @@ def make_rst_class(class_def, state, dry_run, output_dir):  # type: (ClassDef, S
                 break
         f.write("\n\n")
 
-    # Descendents
-    inherited = []
+    # Descendants
+    inherited: List[str] = []
     for c in state.classes.values():
         if c.inherits and c.inherits.strip() == class_name:
             inherited.append(c.name)
@@ -651,12 +737,12 @@ def make_rst_class(class_def, state, dry_run, output_dir):  # type: (ClassDef, S
 
     # Brief description
     if class_def.brief_description is not None:
-        f.write(rstize_text(class_def.brief_description.strip(), state) + "\n\n")
+        f.write(format_text_block(class_def.brief_description.strip(), class_def, state) + "\n\n")
 
     # Class description
     if class_def.description is not None and class_def.description.strip() != "":
         f.write(make_heading("Description", "-"))
-        f.write(rstize_text(class_def.description.strip(), state) + "\n\n")
+        f.write(format_text_block(class_def.description.strip(), class_def, state) + "\n\n")
 
     # Online tutorials
     if len(class_def.tutorials) > 0:
@@ -667,7 +753,7 @@ def make_rst_class(class_def, state, dry_run, output_dir):  # type: (ClassDef, S
     # Properties overview
     if len(class_def.properties) > 0:
         f.write(make_heading("Properties", "-"))
-        ml = []  # type: List[Tuple[str, str, str]]
+        ml: List[Tuple[Optional[str], ...]] = []
         for property_def in class_def.properties.values():
             type_rst = property_def.type_name.to_rst(state)
             default = property_def.default_value
@@ -683,7 +769,7 @@ def make_rst_class(class_def, state, dry_run, output_dir):  # type: (ClassDef, S
     # Constructors, Methods, Operators overview
     if len(class_def.constructors) > 0:
         f.write(make_heading("Constructors", "-"))
-        ml = []
+        ml: List[Tuple[Optional[str], ...]] = []
         for method_list in class_def.constructors.values():
             for m in method_list:
                 ml.append(make_method_signature(class_def, m, "constructor", state))
@@ -691,7 +777,7 @@ def make_rst_class(class_def, state, dry_run, output_dir):  # type: (ClassDef, S
 
     if len(class_def.methods) > 0:
         f.write(make_heading("Methods", "-"))
-        ml = []
+        ml: List[Tuple[Optional[str], ...]] = []
         for method_list in class_def.methods.values():
             for m in method_list:
                 ml.append(make_method_signature(class_def, m, "method", state))
@@ -699,7 +785,7 @@ def make_rst_class(class_def, state, dry_run, output_dir):  # type: (ClassDef, S
 
     if len(class_def.operators) > 0:
         f.write(make_heading("Operators", "-"))
-        ml = []
+        ml: List[Tuple[Optional[str], ...]] = []
         for method_list in class_def.operators.values():
             for m in method_list:
                 ml.append(make_method_signature(class_def, m, "operator", state))
@@ -708,7 +794,7 @@ def make_rst_class(class_def, state, dry_run, output_dir):  # type: (ClassDef, S
     # Theme properties
     if len(class_def.theme_items) > 0:
         f.write(make_heading("Theme Properties", "-"))
-        pl = []
+        pl: List[Tuple[Optional[str], ...]] = []
         for theme_item_def in class_def.theme_items.values():
             ref = ":ref:`{0}<class_{2}_theme_{1}_{0}>`".format(
                 theme_item_def.name, theme_item_def.data_name, class_name
@@ -730,7 +816,7 @@ def make_rst_class(class_def, state, dry_run, output_dir):  # type: (ClassDef, S
             f.write("- {}\n\n".format(signature))
 
             if signal.description is not None and signal.description.strip() != "":
-                f.write(rstize_text(signal.description.strip(), state) + "\n\n")
+                f.write(format_text_block(signal.description.strip(), signal, state) + "\n\n")
 
             index += 1
 
@@ -760,7 +846,7 @@ def make_rst_class(class_def, state, dry_run, output_dir):  # type: (ClassDef, S
                 f.write("- **{}** = **{}**".format(value.name, value.value))
                 if value.text is not None and value.text.strip() != "":
                     # If value.text contains a bullet point list, each entry needs additional indentation
-                    f.write(" --- " + indent_bullets(rstize_text(value.text.strip(), state)))
+                    f.write(" --- " + indent_bullets(format_text_block(value.text.strip(), value, state)))
 
                 f.write("\n\n")
 
@@ -777,10 +863,11 @@ def make_rst_class(class_def, state, dry_run, output_dir):  # type: (ClassDef, S
         for constant in class_def.constants.values():
             f.write("- **{}** = **{}**".format(constant.name, constant.value))
             if constant.text is not None and constant.text.strip() != "":
-                f.write(" --- " + rstize_text(constant.text.strip(), state))
+                f.write(" --- " + format_text_block(constant.text.strip(), constant, state))
 
             f.write("\n\n")
 
+    # Annotations
     if len(class_def.annotations) > 0:
         f.write(make_heading("Annotations", "-"))
         index = 0
@@ -793,11 +880,11 @@ def make_rst_class(class_def, state, dry_run, output_dir):  # type: (ClassDef, S
                 if i == 0:
                     f.write(".. _class_{}_annotation_{}:\n\n".format(class_name, m.name.strip("@")))
 
-                ret_type, signature = make_method_signature(class_def, m, "", state)
-                f.write("- {} {}\n\n".format(ret_type, signature))
+                _, signature = make_method_signature(class_def, m, "", state)
+                f.write("- {}\n\n".format(signature))
 
                 if m.description is not None and m.description.strip() != "":
-                    f.write(rstize_text(m.description.strip(), state) + "\n\n")
+                    f.write(format_text_block(m.description.strip(), m, state) + "\n\n")
 
                 index += 1
 
@@ -816,7 +903,7 @@ def make_rst_class(class_def, state, dry_run, output_dir):  # type: (ClassDef, S
             f.write(".. _class_{}_property_{}:\n\n".format(class_name, property_def.name))
             f.write("- {} **{}**\n\n".format(property_def.type_name.to_rst(state), property_def.name))
 
-            info = []
+            info: List[Tuple[Optional[str], ...]] = []
             # Not using translate() for now as it breaks table formatting.
             if property_def.default_value is not None:
                 info.append(("*" + "Default" + "*", property_def.default_value))
@@ -829,7 +916,7 @@ def make_rst_class(class_def, state, dry_run, output_dir):  # type: (ClassDef, S
                 format_table(f, info)
 
             if property_def.text is not None and property_def.text.strip() != "":
-                f.write(rstize_text(property_def.text.strip(), state) + "\n\n")
+                f.write(format_text_block(property_def.text.strip(), property_def, state) + "\n\n")
 
             index += 1
 
@@ -850,7 +937,7 @@ def make_rst_class(class_def, state, dry_run, output_dir):  # type: (ClassDef, S
                 f.write("- {} {}\n\n".format(ret_type, signature))
 
                 if m.description is not None and m.description.strip() != "":
-                    f.write(rstize_text(m.description.strip(), state) + "\n\n")
+                    f.write(format_text_block(m.description.strip(), m, state) + "\n\n")
 
                 index += 1
 
@@ -870,7 +957,7 @@ def make_rst_class(class_def, state, dry_run, output_dir):  # type: (ClassDef, S
                 f.write("- {} {}\n\n".format(ret_type, signature))
 
                 if m.description is not None and m.description.strip() != "":
-                    f.write(rstize_text(m.description.strip(), state) + "\n\n")
+                    f.write(format_text_block(m.description.strip(), m, state) + "\n\n")
 
                 index += 1
 
@@ -894,7 +981,7 @@ def make_rst_class(class_def, state, dry_run, output_dir):  # type: (ClassDef, S
                 f.write("- {} {}\n\n".format(ret_type, signature))
 
                 if m.description is not None and m.description.strip() != "":
-                    f.write(rstize_text(m.description.strip(), state) + "\n\n")
+                    f.write(format_text_block(m.description.strip(), m, state) + "\n\n")
 
                 index += 1
 
@@ -919,85 +1006,185 @@ def make_rst_class(class_def, state, dry_run, output_dir):  # type: (ClassDef, S
                 format_table(f, info)
 
             if theme_item_def.text is not None and theme_item_def.text.strip() != "":
-                f.write(rstize_text(theme_item_def.text.strip(), state) + "\n\n")
+                f.write(format_text_block(theme_item_def.text.strip(), theme_item_def, state) + "\n\n")
 
             index += 1
 
     f.write(make_footer())
 
 
-def escape_rst(text, until_pos=-1):  # type: (str, int) -> str
-    # Escape \ character, otherwise it ends up as an escape character in rst
-    pos = 0
-    while True:
-        pos = text.find("\\", pos, until_pos)
-        if pos == -1:
-            break
-        text = text[:pos] + "\\\\" + text[pos + 1 :]
-        pos += 2
+def make_type(klass: str, state: State) -> str:
+    if klass.find("*") != -1:  # Pointer, ignore
+        return klass
+    link_type = klass
+    if link_type.endswith("[]"):  # Typed array, strip [] to link to contained type.
+        link_type = link_type[:-2]
+    if link_type in state.classes:
+        return ":ref:`{}<class_{}>`".format(klass, link_type)
+    print_error('{}.xml: Unresolved type "{}".'.format(state.current_class, klass), state)
+    return klass
 
-    # Escape * character to avoid interpreting it as emphasis
-    pos = 0
-    while True:
-        pos = text.find("*", pos, until_pos)
-        if pos == -1:
-            break
-        text = text[:pos] + "\*" + text[pos + 1 :]
-        pos += 2
 
-    # Escape _ character at the end of a word to avoid interpreting it as an inline hyperlink
-    pos = 0
-    while True:
-        pos = text.find("_", pos, until_pos)
-        if pos == -1:
-            break
-        if not text[pos + 1].isalnum():  # don't escape within a snake_case word
-            text = text[:pos] + "\_" + text[pos + 1 :]
-            pos += 2
-        else:
-            pos += 1
+def make_enum(t: str, state: State) -> str:
+    p = t.find(".")
+    if p >= 0:
+        c = t[0:p]
+        e = t[p + 1 :]
+        # Variant enums live in GlobalScope but still use periods.
+        if c == "Variant":
+            c = "@GlobalScope"
+            e = "Variant." + e
+    else:
+        c = state.current_class
+        e = t
+        if c in state.classes and e not in state.classes[c].enums:
+            c = "@GlobalScope"
 
-    return text
+    if c in state.classes and e in state.classes[c].enums:
+        return ":ref:`{0}<enum_{1}_{0}>`".format(e, c)
 
+    # Don't fail for `Vector3.Axis`, as this enum is a special case which is expected not to be resolved.
+    if "{}.{}".format(c, e) != "Vector3.Axis":
+        print_error('{}.xml: Unresolved enum "{}".'.format(state.current_class, t), state)
 
-def format_codeblock(code_type, post_text, indent_level, state):  # types: str, str, int, state
-    end_pos = post_text.find("[/" + code_type + "]")
-    if end_pos == -1:
-        print_error("{}.xml: [" + code_type + "] without a closing tag.".format(state.current_class), state)
-        return None
+    return t
 
-    code_text = post_text[len("[" + code_type + "]") : end_pos]
-    post_text = post_text[end_pos:]
 
-    # Remove extraneous tabs
-    code_pos = 0
-    while True:
-        code_pos = code_text.find("\n", code_pos)
-        if code_pos == -1:
-            break
+def make_method_signature(
+    class_def: ClassDef, definition: Union[AnnotationDef, MethodDef, SignalDef], ref_type: str, state: State
+) -> Tuple[str, str]:
+    ret_type = ""
 
-        to_skip = 0
-        while code_pos + to_skip + 1 < len(code_text) and code_text[code_pos + to_skip + 1] == "\t":
-            to_skip += 1
+    is_method_def = isinstance(definition, MethodDef)
+    if is_method_def:
+        ret_type = definition.return_type.to_rst(state)
 
-        if to_skip > indent_level:
-            print_error(
-                "{}.xml: Four spaces should be used for indentation within [{}].".format(
-                    state.current_class, code_type
-                ),
-                state,
+    qualifiers = None
+    if is_method_def or isinstance(definition, AnnotationDef):
+        qualifiers = definition.qualifiers
+
+    out = ""
+
+    if is_method_def and ref_type != "":
+        if ref_type == "operator":
+            out += ":ref:`{0}<class_{1}_{2}_{3}_{4}>` ".format(
+                definition.name.replace("<", "\\<"),  # So operator "<" gets correctly displayed.
+                class_def.name,
+                ref_type,
+                sanitize_operator_name(definition.name, state),
+                definition.return_type.type_name,
             )
+        else:
+            out += ":ref:`{0}<class_{1}_{2}_{0}>` ".format(definition.name, class_def.name, ref_type)
+    else:
+        out += "**{}** ".format(definition.name)
 
-        if len(code_text[code_pos + to_skip + 1 :]) == 0:
-            code_text = code_text[:code_pos] + "\n"
-            code_pos += 1
+    out += "**(**"
+    for i, arg in enumerate(definition.parameters):
+        if i > 0:
+            out += ", "
         else:
-            code_text = code_text[:code_pos] + "\n    " + code_text[code_pos + to_skip + 1 :]
-            code_pos += 5 - to_skip
-    return ["\n[" + code_type + "]" + code_text + post_text, len("\n[" + code_type + "]" + code_text)]
+            out += " "
+
+        out += "{} {}".format(arg.type_name.to_rst(state), arg.name)
+
+        if arg.default_value is not None:
+            out += "=" + arg.default_value
+
+    if qualifiers is not None and "vararg" in qualifiers:
+        if len(definition.parameters) > 0:
+            out += ", ..."
+        else:
+            out += " ..."
+
+    out += " **)**"
+
+    if qualifiers is not None:
+        # Use substitutions for abbreviations. This is used to display tooltips on hover.
+        # See `make_footer()` for descriptions.
+        for qualifier in qualifiers.split():
+            out += " |" + qualifier + "|"
+
+    return ret_type, out
+
+
+def make_heading(title: str, underline: str, l10n: bool = True) -> str:
+    if l10n:
+        new_title = translate(title)
+        if new_title != title:
+            title = new_title
+            underline *= 2  # Double length to handle wide chars.
+    return title + "\n" + (underline * len(title)) + "\n\n"
 
 
-def rstize_text(text, state):  # type: (str, State) -> str
+def make_footer() -> str:
+    # Generate reusable abbreviation substitutions.
+    # This way, we avoid bloating the generated rST with duplicate abbreviations.
+    # fmt: off
+    return (
+        ".. |virtual| replace:: :abbr:`virtual (" + translate("This method should typically be overridden by the user to have any effect.") + ")`\n"
+        ".. |const| replace:: :abbr:`const (" + translate("This method has no side effects. It doesn't modify any of the instance's member variables.") + ")`\n"
+        ".. |vararg| replace:: :abbr:`vararg (" + translate("This method accepts any number of arguments after the ones described here.") + ")`\n"
+        ".. |constructor| replace:: :abbr:`constructor (" + translate("This method is used to construct a type.") + ")`\n"
+        ".. |static| replace:: :abbr:`static (" + translate("This method doesn't need an instance to be called, so it can be called directly using the class name.") + ")`\n"
+        ".. |operator| replace:: :abbr:`operator (" + translate("This method describes a valid operator to use with this type as left-hand operand.") + ")`\n"
+    )
+    # fmt: on
+
+
+def make_link(url: str, title: str) -> str:
+    match = GODOT_DOCS_PATTERN.search(url)
+    if match:
+        groups = match.groups()
+        if match.lastindex == 2:
+            # Doc reference with fragment identifier: emit direct link to section with reference to page, for example:
+            # `#calling-javascript-from-script in Exporting For Web`
+            # Or use the title if provided.
+            if title != "":
+                return "`" + title + " <../" + groups[0] + ".html" + groups[1] + ">`__"
+            return "`" + groups[1] + " <../" + groups[0] + ".html" + groups[1] + ">`__ in :doc:`../" + groups[0] + "`"
+        elif match.lastindex == 1:
+            # Doc reference, for example:
+            # `Math`
+            if title != "":
+                return ":doc:`" + title + " <../" + groups[0] + ">`"
+            return ":doc:`../" + groups[0] + "`"
+
+    # External link, for example:
+    # `http://enet.bespin.org/usergroup0.html`
+    if title != "":
+        return "`" + title + " <" + url + ">`__"
+    return "`" + url + " <" + url + ">`__"
+
+
+# Formatting helpers.
+
+
+RESERVED_FORMATTING_TAGS = ["i", "b", "u", "code", "kbd", "center", "url", "br"]
+RESERVED_CODEBLOCK_TAGS = ["codeblocks", "codeblock", "gdscript", "csharp"]
+RESERVED_CROSSLINK_TAGS = ["method", "member", "signal", "constant", "enum", "annotation", "theme_item", "param"]
+
+
+def is_in_tagset(tag_text: str, tagset: List[str]) -> bool:
+    for tag in tagset:
+        # Complete match.
+        if tag_text == tag:
+            return True
+        # Tag with arguments.
+        if tag_text.startswith(tag + " "):
+            return True
+        # Tag with arguments, special case for [url].
+        if tag_text.startswith(tag + "="):
+            return True
+
+    return False
+
+
+def format_text_block(
+    text: str,
+    context: Union[DefinitionBase, None],
+    state: State,
+) -> str:
     # Linebreak + tabs in the XML should become two line breaks unless in a "codeblock"
     pos = 0
     while True:
@@ -1033,11 +1220,14 @@ def rstize_text(text, state):  # type: (str, State) -> str
     next_brac_pos = text.find("[")
     text = escape_rst(text, next_brac_pos)
 
+    context_name = format_context_name(context)
+
     # Handle [tags]
     inside_code = False
+    inside_code_tag = ""
+    inside_code_tabs = False
     pos = 0
     tag_depth = 0
-    previous_pos = 0
     while True:
         pos = text.find("[", pos)
         if pos == -1:
@@ -1054,188 +1244,337 @@ def rstize_text(text, state):  # type: (str, State) -> str
         escape_pre = False
         escape_post = False
 
+        # Tag is a reference to a class.
         if tag_text in state.classes:
             if tag_text == state.current_class:
-                # We don't want references to the same class
+                # Don't create a link to the same class, format it as inline code.
                 tag_text = "``{}``".format(tag_text)
             else:
                 tag_text = make_type(tag_text, state)
             escape_pre = True
             escape_post = True
-        else:  # command
+
+        # Tag is a cross-reference or a formating directive.
+        else:
             cmd = tag_text
             space_pos = tag_text.find(" ")
-            if cmd == "/codeblock" or cmd == "/gdscript" or cmd == "/csharp":
-                tag_text = ""
-                tag_depth -= 1
-                inside_code = False
-                # Strip newline if the tag was alone on one
-                if pre_text[-1] == "\n":
-                    pre_text = pre_text[:-1]
-            elif cmd == "/code":
-                tag_text = "``"
-                tag_depth -= 1
-                inside_code = False
-                escape_post = True
-            elif inside_code:
-                tag_text = "[" + tag_text + "]"
-            elif cmd.find("html") == 0:
-                param = tag_text[space_pos + 1 :]
-                tag_text = param
-            elif (
-                cmd.startswith("method")
-                or cmd.startswith("member")
-                or cmd.startswith("signal")
-                or cmd.startswith("constant")
-                or cmd.startswith("theme_item")
-            ):
-                param = tag_text[space_pos + 1 :]
-
-                if param.find(".") != -1:
-                    ss = param.split(".")
-                    if len(ss) > 2:
-                        print_error('{}.xml: Bad reference: "{}".'.format(state.current_class, param), state)
-                    class_param, method_param = ss
 
-                else:
-                    class_param = state.current_class
-                    method_param = param
-
-                ref_type = ""
-                if class_param in state.classes:
-                    class_def = state.classes[class_param]
-                    if cmd.startswith("constructor"):
-                        if method_param not in class_def.constructors:
-                            print_error(
-                                '{}.xml: Unresolved constructor "{}".'.format(state.current_class, param), state
-                            )
-                        ref_type = "_constructor"
-                    if cmd.startswith("method"):
-                        if method_param not in class_def.methods:
-                            print_error('{}.xml: Unresolved method "{}".'.format(state.current_class, param), state)
-                        ref_type = "_method"
-                    if cmd.startswith("operator"):
-                        if method_param not in class_def.operators:
-                            print_error('{}.xml: Unresolved operator "{}".'.format(state.current_class, param), state)
-                        ref_type = "_operator"
-
-                    elif cmd.startswith("member"):
-                        if method_param not in class_def.properties:
-                            print_error('{}.xml: Unresolved member "{}".'.format(state.current_class, param), state)
-                        ref_type = "_property"
-
-                    elif cmd.startswith("theme_item"):
-                        if method_param not in class_def.theme_items:
-                            print_error('{}.xml: Unresolved theme item "{}".'.format(state.current_class, param), state)
-                        ref_type = "_theme_{}".format(class_def.theme_items[method_param].data_name)
-
-                    elif cmd.startswith("signal"):
-                        if method_param not in class_def.signals:
-                            print_error('{}.xml: Unresolved signal "{}".'.format(state.current_class, param), state)
-                        ref_type = "_signal"
-
-                    elif cmd.startswith("annotation"):
-                        if method_param not in class_def.annotations:
-                            print_error('{}.xml: Unresolved annotation "{}".'.format(state.current_class, param), state)
-                        ref_type = "_annotation"
-
-                    elif cmd.startswith("constant"):
-                        found = False
-
-                        # Search in the current class
-                        search_class_defs = [class_def]
-
-                        if param.find(".") == -1:
-                            # Also search in @GlobalScope as a last resort if no class was specified
-                            search_class_defs.append(state.classes["@GlobalScope"])
-
-                        for search_class_def in search_class_defs:
-                            if method_param in search_class_def.constants:
-                                class_param = search_class_def.name
-                                found = True
-
-                            else:
-                                for enum in search_class_def.enums.values():
-                                    if method_param in enum.values:
-                                        class_param = search_class_def.name
-                                        found = True
-                                        break
-
-                        if not found:
-                            print_error('{}.xml: Unresolved constant "{}".'.format(state.current_class, param), state)
-                        ref_type = "_constant"
+            # Anything identified as a tag inside of a code block is valid,
+            # unless it's a matching closing tag.
+            if inside_code:
+                # Exiting codeblocks and inline code tags.
+
+                if inside_code_tag == cmd[1:]:
+                    if cmd == "/codeblock" or cmd == "/gdscript" or cmd == "/csharp":
+                        tag_text = ""
+                        tag_depth -= 1
+                        inside_code = False
+                        # Strip newline if the tag was alone on one
+                        if pre_text[-1] == "\n":
+                            pre_text = pre_text[:-1]
+
+                    elif cmd == "/code":
+                        tag_text = "``"
+                        tag_depth -= 1
+                        inside_code = False
+                        escape_post = True
 
                 else:
-                    print_error(
-                        '{}.xml: Unresolved type reference "{}" in method reference "{}".'.format(
-                            state.current_class, class_param, param
-                        ),
-                        state,
-                    )
-
-                repl_text = method_param
-                if class_param != state.current_class:
-                    repl_text = "{}.{}".format(class_param, method_param)
-                tag_text = ":ref:`{}<class_{}{}_{}>`".format(repl_text, class_param, ref_type, method_param)
-                escape_pre = True
-                escape_post = True
-            elif cmd.find("image=") == 0:
-                tag_text = ""  # '![](' + cmd[6:] + ')'
-            elif cmd.find("url=") == 0:
-                # URLs are handled in full here as we need to extract the optional link
-                # title to use `make_link`.
-                link_url = cmd[4:]
-                endurl_pos = text.find("[/url]", endq_pos + 1)
-                if endurl_pos == -1:
-                    print_error(
-                        "{}.xml: Tag depth mismatch for [url]: no closing [/url]".format(state.current_class), state
-                    )
-                    break
-                link_title = text[endq_pos + 1 : endurl_pos]
-                tag_text = make_link(link_url, link_title)
+                    if cmd.startswith("/"):
+                        print_warning(
+                            '{}.xml: Potential error inside of a code tag, found a string that looks like a closing tag "[{}]" in {}.'.format(
+                                state.current_class, cmd, context_name
+                            ),
+                            state,
+                        )
 
-                pre_text = text[:pos]
-                post_text = text[endurl_pos + 6 :]
+                    tag_text = "[" + tag_text + "]"
 
-                if pre_text and pre_text[-1] not in MARKUP_ALLOWED_PRECEDENT:
-                    pre_text += "\ "
-                if post_text and post_text[0] not in MARKUP_ALLOWED_SUBSEQUENT:
-                    post_text = "\ " + post_text
+            # Entering codeblocks and inline code tags.
 
-                text = pre_text + tag_text + post_text
-                pos = len(pre_text) + len(tag_text)
-                previous_pos = pos
-                continue
-            elif cmd == "center":
+            elif cmd == "codeblocks":
                 tag_depth += 1
-                tag_text = ""
-            elif cmd == "/center":
+                tag_text = "\n.. tabs::"
+                inside_code_tabs = True
+            elif cmd == "/codeblocks":
                 tag_depth -= 1
                 tag_text = ""
-            elif cmd == "codeblock":
-                tag_depth += 1
-                tag_text = "\n::\n"
-                inside_code = True
-            elif cmd == "gdscript":
+                inside_code_tabs = False
+
+            elif cmd == "codeblock" or cmd == "gdscript" or cmd == "csharp":
                 tag_depth += 1
-                tag_text = "\n .. code-tab:: gdscript\n"
+
+                if cmd == "gdscript":
+                    if not inside_code_tabs:
+                        print_error(
+                            "{}.xml: GDScript code block is used outside of [codeblocks] in {}.".format(
+                                state.current_class, cmd, context_name
+                            ),
+                            state,
+                        )
+                    tag_text = "\n .. code-tab:: gdscript\n"
+                elif cmd == "csharp":
+                    if not inside_code_tabs:
+                        print_error(
+                            "{}.xml: C# code block is used outside of [codeblocks] in {}.".format(
+                                state.current_class, cmd, context_name
+                            ),
+                            state,
+                        )
+                    tag_text = "\n .. code-tab:: csharp\n"
+                else:
+                    tag_text = "\n::\n"
+
                 inside_code = True
-            elif cmd == "csharp":
+                inside_code_tag = cmd
+
+            elif cmd == "code":
+                tag_text = "``"
                 tag_depth += 1
-                tag_text = "\n .. code-tab:: csharp\n"
                 inside_code = True
-            elif cmd == "codeblocks":
-                tag_depth += 1
-                tag_text = "\n.. tabs::"
-            elif cmd == "/codeblocks":
-                tag_depth -= 1
-                tag_text = ""
+                inside_code_tag = cmd
+                escape_pre = True
+
+            # Cross-references to items in this or other class documentation pages.
+            elif is_in_tagset(cmd, RESERVED_CROSSLINK_TAGS):
+                link_target: str = ""
+                if space_pos >= 0:
+                    link_target = tag_text[space_pos + 1 :].strip()
+
+                if link_target == "":
+                    print_error(
+                        '{}.xml: Empty cross-reference link "{}" in {}.'.format(state.current_class, cmd, context_name),
+                        state,
+                    )
+                    tag_text = ""
+                else:
+                    if (
+                        cmd.startswith("method")
+                        or cmd.startswith("member")
+                        or cmd.startswith("signal")
+                        or cmd.startswith("constant")
+                        or cmd.startswith("annotation")
+                        or cmd.startswith("theme_item")
+                    ):
+                        if link_target.find(".") != -1:
+                            ss = link_target.split(".")
+                            if len(ss) > 2:
+                                print_error(
+                                    '{}.xml: Bad reference "{}" in {}.'.format(
+                                        state.current_class, link_target, context_name
+                                    ),
+                                    state,
+                                )
+                            class_param, method_param = ss
+
+                        else:
+                            class_param = state.current_class
+                            method_param = link_target
+
+                        ref_type = ""
+                        if class_param in state.classes:
+                            class_def = state.classes[class_param]
+                            if cmd.startswith("constructor"):
+                                if method_param not in class_def.constructors:
+                                    print_error(
+                                        '{}.xml: Unresolved constructor reference "{}" in {}.'.format(
+                                            state.current_class, link_target, context_name
+                                        ),
+                                        state,
+                                    )
+                                ref_type = "_constructor"
+
+                            elif cmd.startswith("method"):
+                                if method_param not in class_def.methods:
+                                    print_error(
+                                        '{}.xml: Unresolved method reference "{}" in {}.'.format(
+                                            state.current_class, link_target, context_name
+                                        ),
+                                        state,
+                                    )
+                                ref_type = "_method"
+
+                            elif cmd.startswith("operator"):
+                                if method_param not in class_def.operators:
+                                    print_error(
+                                        '{}.xml: Unresolved operator reference "{}" in {}.'.format(
+                                            state.current_class, link_target, context_name
+                                        ),
+                                        state,
+                                    )
+                                ref_type = "_operator"
+
+                            elif cmd.startswith("member"):
+                                if method_param not in class_def.properties:
+                                    print_error(
+                                        '{}.xml: Unresolved member reference "{}" in {}.'.format(
+                                            state.current_class, link_target, context_name
+                                        ),
+                                        state,
+                                    )
+                                ref_type = "_property"
+
+                            elif cmd.startswith("theme_item"):
+                                if method_param not in class_def.theme_items:
+                                    print_error(
+                                        '{}.xml: Unresolved theme item reference "{}" in {}.'.format(
+                                            state.current_class, link_target, context_name
+                                        ),
+                                        state,
+                                    )
+                                ref_type = "_theme_{}".format(class_def.theme_items[method_param].data_name)
+
+                            elif cmd.startswith("signal"):
+                                if method_param not in class_def.signals:
+                                    print_error(
+                                        '{}.xml: Unresolved signal reference "{}" in {}.'.format(
+                                            state.current_class, link_target, context_name
+                                        ),
+                                        state,
+                                    )
+                                ref_type = "_signal"
+
+                            elif cmd.startswith("annotation"):
+                                if method_param not in class_def.annotations:
+                                    print_error(
+                                        '{}.xml: Unresolved annotation reference "{}" in {}.'.format(
+                                            state.current_class, link_target, context_name
+                                        ),
+                                        state,
+                                    )
+                                ref_type = "_annotation"
+
+                            elif cmd.startswith("constant"):
+                                found = False
+
+                                # Search in the current class
+                                search_class_defs = [class_def]
+
+                                if link_target.find(".") == -1:
+                                    # Also search in @GlobalScope as a last resort if no class was specified
+                                    search_class_defs.append(state.classes["@GlobalScope"])
+
+                                for search_class_def in search_class_defs:
+                                    if method_param in search_class_def.constants:
+                                        class_param = search_class_def.name
+                                        found = True
+
+                                    else:
+                                        for enum in search_class_def.enums.values():
+                                            if method_param in enum.values:
+                                                class_param = search_class_def.name
+                                                found = True
+                                                break
+
+                                if not found:
+                                    print_error(
+                                        '{}.xml: Unresolved constant reference "{}" in {}.'.format(
+                                            state.current_class, link_target, context_name
+                                        ),
+                                        state,
+                                    )
+                                ref_type = "_constant"
+
+                        else:
+                            print_error(
+                                '{}.xml: Unresolved type reference "{}" in method reference "{}" in {}.'.format(
+                                    state.current_class, class_param, link_target, context_name
+                                ),
+                                state,
+                            )
+
+                        repl_text = method_param
+                        if class_param != state.current_class:
+                            repl_text = "{}.{}".format(class_param, method_param)
+                        tag_text = ":ref:`{}<class_{}{}_{}>`".format(repl_text, class_param, ref_type, method_param)
+                        escape_pre = True
+                        escape_post = True
+
+                    elif cmd.startswith("enum"):
+                        tag_text = make_enum(link_target, state)
+                        escape_pre = True
+                        escape_post = True
+
+                    elif cmd.startswith("param"):
+                        valid_context = (
+                            isinstance(context, MethodDef)
+                            or isinstance(context, SignalDef)
+                            or isinstance(context, AnnotationDef)
+                        )
+                        if not valid_context:
+                            print_error(
+                                '{}.xml: Argument reference "{}" used outside of method, signal, or annotation context in {}.'.format(
+                                    state.current_class, link_target, context_name
+                                ),
+                                state,
+                            )
+                        else:
+                            context_params: List[ParameterDef] = context.parameters
+                            found = False
+                            for param_def in context_params:
+                                if param_def.name == link_target:
+                                    found = True
+                                    break
+                            if not found:
+                                print_error(
+                                    '{}.xml: Unresolved argument reference "{}" in {}.'.format(
+                                        state.current_class, link_target, context_name
+                                    ),
+                                    state,
+                                )
+
+                        tag_text = "``{}``".format(link_target)
+
+            # Formatting directives.
+
+            elif is_in_tagset(cmd, ["url"]):
+                if cmd.startswith("url="):
+                    # URLs are handled in full here as we need to extract the optional link
+                    # title to use `make_link`.
+                    link_url = cmd[4:]
+                    endurl_pos = text.find("[/url]", endq_pos + 1)
+                    if endurl_pos == -1:
+                        print_error(
+                            "{}.xml: Tag depth mismatch for [url]: no closing [/url] in {}.".format(
+                                state.current_class, context_name
+                            ),
+                            state,
+                        )
+                        break
+                    link_title = text[endq_pos + 1 : endurl_pos]
+                    tag_text = make_link(link_url, link_title)
+
+                    pre_text = text[:pos]
+                    post_text = text[endurl_pos + 6 :]
+
+                    if pre_text and pre_text[-1] not in MARKUP_ALLOWED_PRECEDENT:
+                        pre_text += "\ "
+                    if post_text and post_text[0] not in MARKUP_ALLOWED_SUBSEQUENT:
+                        post_text = "\ " + post_text
+
+                    text = pre_text + tag_text + post_text
+                    pos = len(pre_text) + len(tag_text)
+                    continue
+                else:
+                    print_error(
+                        '{}.xml: Misformatted [url] tag "{}" in {}.'.format(state.current_class, cmd, context_name),
+                        state,
+                    )
+
             elif cmd == "br":
                 # Make a new paragraph instead of a linebreak, rst is not so linebreak friendly
                 tag_text = "\n\n"
                 # Strip potential leading spaces
                 while post_text[0] == " ":
                     post_text = post_text[1:]
+
+            elif cmd == "center" or cmd == "/center":
+                if cmd == "/center":
+                    tag_depth -= 1
+                else:
+                    tag_depth += 1
+                tag_text = ""
+
             elif cmd == "i" or cmd == "/i":
                 if cmd == "/i":
                     tag_depth -= 1
@@ -1244,6 +1583,7 @@ def rstize_text(text, state):  # type: (str, State) -> str
                     tag_depth += 1
                     escape_pre = True
                 tag_text = "*"
+
             elif cmd == "b" or cmd == "/b":
                 if cmd == "/b":
                     tag_depth -= 1
@@ -1252,6 +1592,7 @@ def rstize_text(text, state):  # type: (str, State) -> str
                     tag_depth += 1
                     escape_pre = True
                 tag_text = "**"
+
             elif cmd == "u" or cmd == "/u":
                 if cmd == "/u":
                     tag_depth -= 1
@@ -1260,25 +1601,31 @@ def rstize_text(text, state):  # type: (str, State) -> str
                     tag_depth += 1
                     escape_pre = True
                 tag_text = ""
-            elif cmd == "code":
-                tag_text = "``"
-                tag_depth += 1
-                inside_code = True
-                escape_pre = True
-            elif cmd == "kbd":
-                tag_text = ":kbd:`"
-                tag_depth += 1
-                escape_pre = True
-            elif cmd == "/kbd":
+
+            elif cmd == "kbd" or cmd == "/kbd":
                 tag_text = "`"
-                tag_depth -= 1
-                escape_post = True
-            elif cmd.startswith("enum "):
-                tag_text = make_enum(cmd[5:], state)
-                escape_pre = True
-                escape_post = True
+                if cmd == "/kbd":
+                    tag_depth -= 1
+                    escape_post = True
+                else:
+                    tag_text = ":kbd:" + tag_text
+                    tag_depth += 1
+                    escape_pre = True
+
+            # Invalid syntax checks.
+            elif cmd.startswith("/"):
+                print_error(
+                    '{}.xml: Unrecognized closing tag "{}" in {}.'.format(state.current_class, cmd, context_name), state
+                )
+
+                tag_text = "[" + tag_text + "]"
+
             else:
-                tag_text = make_type(tag_text, state)
+                print_error(
+                    '{}.xml: Unrecognized opening tag "{}" in {}.'.format(state.current_class, cmd, context_name), state
+                )
+
+                tag_text = "``{}``".format(tag_text)
                 escape_pre = True
                 escape_post = True
 
@@ -1310,17 +1657,98 @@ def rstize_text(text, state):  # type: (str, State) -> str
 
         text = pre_text + tag_text + post_text
         pos = len(pre_text) + len(tag_text)
-        previous_pos = pos
 
     if tag_depth > 0:
         print_error(
-            "{}.xml: Tag depth mismatch: too many (or too little) open/close tags.".format(state.current_class), state
+            "{}.xml: Tag depth mismatch: too many (or too little) open/close tags in {}.".format(
+                state.current_class, context_name
+            ),
+            state,
         )
 
     return text
 
 
-def format_table(f, data, remove_empty_columns=False):  # type: (TextIO, Iterable[Tuple[str, ...]], bool) -> None
+def format_context_name(context: Union[DefinitionBase, None]) -> str:
+    context_name: str = "unknown context"
+    if context is not None:
+        context_name = '{} "{}" description'.format(context.definition_name, context.name)
+
+    return context_name
+
+
+def escape_rst(text: str, until_pos: int = -1) -> str:
+    # Escape \ character, otherwise it ends up as an escape character in rst
+    pos = 0
+    while True:
+        pos = text.find("\\", pos, until_pos)
+        if pos == -1:
+            break
+        text = text[:pos] + "\\\\" + text[pos + 1 :]
+        pos += 2
+
+    # Escape * character to avoid interpreting it as emphasis
+    pos = 0
+    while True:
+        pos = text.find("*", pos, until_pos)
+        if pos == -1:
+            break
+        text = text[:pos] + "\*" + text[pos + 1 :]
+        pos += 2
+
+    # Escape _ character at the end of a word to avoid interpreting it as an inline hyperlink
+    pos = 0
+    while True:
+        pos = text.find("_", pos, until_pos)
+        if pos == -1:
+            break
+        if not text[pos + 1].isalnum():  # don't escape within a snake_case word
+            text = text[:pos] + "\_" + text[pos + 1 :]
+            pos += 2
+        else:
+            pos += 1
+
+    return text
+
+
+def format_codeblock(code_type: str, post_text: str, indent_level: int, state: State) -> Union[Tuple[str, int], None]:
+    end_pos = post_text.find("[/" + code_type + "]")
+    if end_pos == -1:
+        print_error("{}.xml: [" + code_type + "] without a closing tag.".format(state.current_class), state)
+        return None
+
+    code_text = post_text[len("[" + code_type + "]") : end_pos]
+    post_text = post_text[end_pos:]
+
+    # Remove extraneous tabs
+    code_pos = 0
+    while True:
+        code_pos = code_text.find("\n", code_pos)
+        if code_pos == -1:
+            break
+
+        to_skip = 0
+        while code_pos + to_skip + 1 < len(code_text) and code_text[code_pos + to_skip + 1] == "\t":
+            to_skip += 1
+
+        if to_skip > indent_level:
+            print_error(
+                "{}.xml: Four spaces should be used for indentation within [{}].".format(
+                    state.current_class, code_type
+                ),
+                state,
+            )
+
+        if len(code_text[code_pos + to_skip + 1 :]) == 0:
+            code_text = code_text[:code_pos] + "\n"
+            code_pos += 1
+        else:
+            code_text = code_text[:code_pos] + "\n    " + code_text[code_pos + to_skip + 1 :]
+            code_pos += 5 - to_skip
+    return ("\n[" + code_type + "]" + code_text + post_text, len("\n[" + code_type + "]" + code_text))
+
+
+def format_table(f: TextIO, data: List[Tuple[Optional[str], ...]], remove_empty_columns: bool = False) -> None:
     if len(data) == 0:
         return
 
@@ -1351,146 +1779,7 @@ def format_table(f, data, remove_empty_columns=False):  # type: (TextIO, Iterabl
     f.write("\n")
 
 
-def make_type(klass, state):  # type: (str, State) -> str
-    if klass.find("*") != -1:  # Pointer, ignore
-        return klass
-    link_type = klass
-    if link_type.endswith("[]"):  # Typed array, strip [] to link to contained type.
-        link_type = link_type[:-2]
-    if link_type in state.classes:
-        return ":ref:`{}<class_{}>`".format(klass, link_type)
-    print_error('{}.xml: Unresolved type "{}".'.format(state.current_class, klass), state)
-    return klass
-
-
-def make_enum(t, state):  # type: (str, State) -> str
-    p = t.find(".")
-    if p >= 0:
-        c = t[0:p]
-        e = t[p + 1 :]
-        # Variant enums live in GlobalScope but still use periods.
-        if c == "Variant":
-            c = "@GlobalScope"
-            e = "Variant." + e
-    else:
-        c = state.current_class
-        e = t
-        if c in state.classes and e not in state.classes[c].enums:
-            c = "@GlobalScope"
-
-    if c in state.classes and e in state.classes[c].enums:
-        return ":ref:`{0}<enum_{1}_{0}>`".format(e, c)
-
-    # Don't fail for `Vector3.Axis`, as this enum is a special case which is expected not to be resolved.
-    if "{}.{}".format(c, e) != "Vector3.Axis":
-        print_error('{}.xml: Unresolved enum "{}".'.format(state.current_class, t), state)
-
-    return t
-
-
-def make_method_signature(
-    class_def, method_def, ref_type, state
-):  # type: (ClassDef, Union[MethodDef, SignalDef], str, State) -> Tuple[str, str]
-    ret_type = " "
-
-    if isinstance(method_def, MethodDef):
-        ret_type = method_def.return_type.to_rst(state)
-
-    out = ""
-
-    if ref_type != "":
-        if ref_type == "operator":
-            out += ":ref:`{0}<class_{1}_{2}_{3}_{4}>` ".format(
-                method_def.name.replace("<", "\\<"),  # So operator "<" gets correctly displayed.
-                class_def.name,
-                ref_type,
-                sanitize_operator_name(method_def.name, state),
-                method_def.return_type.type_name,
-            )
-        else:
-            out += ":ref:`{0}<class_{1}_{2}_{0}>` ".format(method_def.name, class_def.name, ref_type)
-    else:
-        out += "**{}** ".format(method_def.name)
-
-    out += "**(**"
-    for i, arg in enumerate(method_def.parameters):
-        if i > 0:
-            out += ", "
-        else:
-            out += " "
-
-        out += "{} {}".format(arg.type_name.to_rst(state), arg.name)
-
-        if arg.default_value is not None:
-            out += "=" + arg.default_value
-
-    if isinstance(method_def, MethodDef) and method_def.qualifiers is not None and "vararg" in method_def.qualifiers:
-        if len(method_def.parameters) > 0:
-            out += ", ..."
-        else:
-            out += " ..."
-
-    out += " **)**"
-
-    if isinstance(method_def, MethodDef) and method_def.qualifiers is not None:
-        # Use substitutions for abbreviations. This is used to display tooltips on hover.
-        # See `make_footer()` for descriptions.
-        for qualifier in method_def.qualifiers.split():
-            out += " |" + qualifier + "|"
-
-    return ret_type, out
-
-
-def make_heading(title, underline, l10n=True):  # type: (str, str, bool) -> str
-    if l10n:
-        new_title = translate(title)
-        if new_title != title:
-            title = new_title
-            underline *= 2  # Double length to handle wide chars.
-    return title + "\n" + (underline * len(title)) + "\n\n"
-
-
-def make_footer():  # type: () -> str
-    # Generate reusable abbreviation substitutions.
-    # This way, we avoid bloating the generated rST with duplicate abbreviations.
-    # fmt: off
-    return (
-        ".. |virtual| replace:: :abbr:`virtual (" + translate("This method should typically be overridden by the user to have any effect.") + ")`\n"
-        ".. |const| replace:: :abbr:`const (" + translate("This method has no side effects. It doesn't modify any of the instance's member variables.") + ")`\n"
-        ".. |vararg| replace:: :abbr:`vararg (" + translate("This method accepts any number of arguments after the ones described here.") + ")`\n"
-        ".. |constructor| replace:: :abbr:`constructor (" + translate("This method is used to construct a type.") + ")`\n"
-        ".. |static| replace:: :abbr:`static (" + translate("This method doesn't need an instance to be called, so it can be called directly using the class name.") + ")`\n"
-        ".. |operator| replace:: :abbr:`operator (" + translate("This method describes a valid operator to use with this type as left-hand operand.") + ")`\n"
-    )
-    # fmt: on
-
-
-def make_link(url, title):  # type: (str, str) -> str
-    match = GODOT_DOCS_PATTERN.search(url)
-    if match:
-        groups = match.groups()
-        if match.lastindex == 2:
-            # Doc reference with fragment identifier: emit direct link to section with reference to page, for example:
-            # `#calling-javascript-from-script in Exporting For Web`
-            # Or use the title if provided.
-            if title != "":
-                return "`" + title + " <../" + groups[0] + ".html" + groups[1] + ">`__"
-            return "`" + groups[1] + " <../" + groups[0] + ".html" + groups[1] + ">`__ in :doc:`../" + groups[0] + "`"
-        elif match.lastindex == 1:
-            # Doc reference, for example:
-            # `Math`
-            if title != "":
-                return ":doc:`" + title + " <../" + groups[0] + ">`"
-            return ":doc:`../" + groups[0] + "`"
-    else:
-        # External link, for example:
-        # `http://enet.bespin.org/usergroup0.html`
-        if title != "":
-            return "`" + title + " <" + url + ">`__"
-        return "`" + url + " <" + url + ">`__"
-
-
-def sanitize_operator_name(dirty_name, state):  # type: (str, State) -> str
+def sanitize_operator_name(dirty_name: str, state: State) -> str:
     clear_name = dirty_name.replace("operator ", "")
 
     if clear_name == "!=":
@@ -1548,7 +1837,7 @@ def sanitize_operator_name(dirty_name, state):  # type: (str, State) -> str
     return clear_name
 
 
-def indent_bullets(text):  # type: (str) -> str
+def indent_bullets(text: str) -> str:
     # Take the text and check each line for a bullet point represented by "-".
     # Where found, indent the given line by a further "\t".
     # Used to properly indent bullet points contained in the description for enum values.
diff --git a/doc/translations/fr.po b/doc/translations/fr.po
index 2866dc9b70..44d40e1bd5 100644
--- a/doc/translations/fr.po
+++ b/doc/translations/fr.po
@@ -61,7 +61,7 @@ msgstr ""
 "Project-Id-Version: Godot Engine class reference\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2022-07-27 05:24+0000\n"
+"PO-Revision-Date: 2022-08-04 05:23+0000\n"
 "Last-Translator: Maxime Leroy <lisacintosh@gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/godot-engine/"
 "godot-class-reference/fr/>\n"
@@ -548,7 +548,6 @@ msgstr ""
 "[/codeblock]"
 
 #: modules/gdscript/doc_classes/@GDScript.xml
-#, fuzzy
 msgid ""
 "Compares two values by checking their actual contents, recursing into any "
 "[Array] or [Dictionary] up to its deepest level.\n"
@@ -574,15 +573,15 @@ msgstr ""
 "- Pour [code]null[/code], [code]int[/code], [code]float[/code], "
 "[code]String[/code], [code]Object[/code] et [code]RID[/code], les résultats "
 "de [code]deep_equal[/code] et [code]==[/code] sont les mêmes.\n"
-"- Pour [code]Dictionary[/code], [code]==[/code] considère que l'égalité est "
-"respéctée si et seulement si les deux variables pointent vers le même "
-"[code]Dictionary[/code], sans recursion ou connaissance du contenu des "
+"- Pour les [code]Dictionary[/code], [code]==[/code] considère que l'égalité "
+"est respectée si et seulement si les deux variables pointent vers le même "
+"[code]Dictionary[/code], sans récursion ou comparaison du contenu des "
 "variables.\n"
-"- For [code]Array[/code], [code]==[/code] considère que l'égalité est "
-"respéctée si et seulement si chaque élement du premier [code]Tableau[/code] "
+"- Pour les [code]Array[/code], [code]==[/code] considère que l'égalité est "
+"respectée si et seulement si chaque élément du premier [code]Array[/code] "
 "est égal à l'élément au même index du second [code]Array[/code], évalué par "
-"[code]==[/code] lui même. Cela implique que [code]==[/code] recurses dans un "
-"[code]Array[/code], mais pas dans un [code]Dictionary[/code].\n"
+"[code]==[/code] lui-même. Cela implique un récursion avec [code]==[/code] "
+"pour les [code]Array[/code], mais pas les [code]Dictionary[/code].\n"
 "Rapidement, dès qu'un [code]Dictionary[/code] est potentiellement impliqué, "
 "si une vraie comparaison du contenu est souhaité, il faut utiliser "
 "[code]deep_equal[/code]."
@@ -608,7 +607,6 @@ msgstr ""
 "nouveau en une instance. Utile pour la désérialisation."
 
 #: modules/gdscript/doc_classes/@GDScript.xml
-#, fuzzy
 msgid ""
 "Returns an \"eased\" value of [code]x[/code] based on an easing function "
 "defined with [code]curve[/code]. This easing function is based on an "
@@ -634,13 +632,15 @@ msgstr ""
 "nombre à virgule flottante, avec des valeurs spécifiques conduisant aux "
 "comportements suivants:\n"
 "[codeblock]\n"
-"- Inférieur à -1.0 (exclusif): Ease in-out\n"
-"- 1.0: Linéaire\n"
-"- Entre -1.0 et 0.0 (exclusif): Ease out-in\n"
-"- 0.0: Constante\n"
-"- Entre 0.0 et 1.0 (exclusif): Ease in\n"
-"- 1.0: Linéaire\n"
-"- Supérieur à 1.0 (exclusif): Ease out\n"
+"- Inférieur à -1.0 (exclus) : Plus lent au début et à la fin (\"ease in-out\""
+")\n"
+"- 1.0 : Linéaire\n"
+"- Entre -1.0 et 0.0 (exclus) : Plus rapide au début et à la fin (\"ease out-"
+"in\")\n"
+"- 0.0 : Constante\n"
+"- Entre 0.0 et 1.0 (exclus) : Plus lent au début (\"ease in\")\n"
+"- 1.0 : Linéaire\n"
+"- Supérieur à 1.0 (exclus) : Plus lent à la fin (\"ease out\")\n"
 "[/codeblock]\n"
 "[url=https://raw.githubusercontent.com/godotengine/godot-docs/3.4/img/"
 "ease_cheatsheet.png]ease() curve values cheatsheet[/url]\n"
@@ -1423,7 +1423,6 @@ msgstr ""
 "ou un avertissement est affiché."
 
 #: modules/gdscript/doc_classes/@GDScript.xml
-#, fuzzy
 msgid ""
 "Like [method print], but includes the current stack frame when running with "
 "the debugger turned on.\n"
@@ -1433,11 +1432,12 @@ msgid ""
 "   At: res://test.gd:15:_process()\n"
 "[/codeblock]"
 msgstr ""
-"Affiche la trace d'appels à l'emplacement du code, ne fonctionne que lorsque "
-"le débogueur est activé.\n"
+"Comme [method prunt], mais inclus la frame de la pile actuelle quand le "
+"débogueur est activé.\n"
 "La sortie dans la console ressemblerait à ceci :\n"
 "[codeblock]\n"
-"Frame 0 - res://test.gd:16 in function '_process'\n"
+"Test print\n"
+"   At: res://test.gd:15:_process()\n"
 "[/codeblock]"
 
 #: modules/gdscript/doc_classes/@GDScript.xml
@@ -1824,7 +1824,6 @@ msgstr ""
 "[/codeblock]"
 
 #: modules/gdscript/doc_classes/@GDScript.xml
-#, fuzzy
 msgid ""
 "Returns the result of smoothly interpolating the value of [code]s[/code] "
 "between [code]0[/code] and [code]1[/code], based on the where [code]s[/code] "
@@ -1850,25 +1849,26 @@ msgid ""
 "-1.6521) return values[/url]"
 msgstr ""
 "Retourne le résultat de l'interpolation douce de la valeur [code]s[/code] "
-"entre [code]0[/code] et [code]1[/code], basée sur la position de [code]s[/"
-"code] entre [code]from[/code] et [code]to[/code].\n"
-"La valeur de retour est [code]0[/code] si [code]s <= from[/code], et "
+"entre [code]0[/code] et [code]1[/code], basée sur la position de "
+"[code]s[/code] entre [code]from[/code] et [code]to[/code].\n"
+"La valeur retournée est [code]0[/code] si [code]s <= from[/code], et "
 "[code]1[/code] si [code]s >= to[/code]. Si [code]s[/code] se trouve entre "
 "[code]from[/code] et [code]to[/code], la valeur retournée suit une courbe en "
-"S qui représente les positions de [code]s[/code] entre[code]0[/code] and "
+"S qui représente les positions de [code]s[/code] entre[code]0[/code] et "
 "[code]1[/code].\n"
-"Cette courbe en S est l'interpolateur cubique d'Hermite, obtenu par "
-"[code]f(y) = 3*y^2 - 2*y^3[/code] où [code]y = (x-from) / (to-from)[/code].\n"
-"[codeblock]\n"
-"smoothstep(0, 2, -5.0) # Renvoie 0.0\n"
-"smoothstep(0, 2, 0.5) # Renvoie 0.15625\n"
-"smoothstep(0, 2, 1.0) # Renvoie 0.5\n"
-"smoothstep(0, 2, 2.0) # Renvoie 1.0\n"
+"Cette courbe en S est l'interpolation cubique d'Hermite, obtenu par la "
+"fonction mathématique [code]f(y) = 3*y^2 - 2*y^3[/code] où [code]y = (x-from)"
+" / (to-from)[/code].\n"
+"[codeblock]\n"
+"smoothstep(0, 2, -5.0) # Retourne 0.0\n"
+"smoothstep(0, 2, 0.5) # Retourne 0.15625\n"
+"smoothstep(0, 2, 1.0) # Retourne 0.5\n"
+"smoothstep(0, 2, 2.0) # Retourne 1.0\n"
 "[/codeblock]\n"
-"Comparé à [method ease] avec une valeur de courbe de [code]-1.6521[/code], "
-"[method smoothstep] retourne la courbe la plus douce possible sans change "
-"brusque dans la dérivée. Si vous avez besoin d'effectuer des transitions "
-"plus avancées, utilisez [Tween] ou [AnimationPlayer].\n"
+"Comparé à l'utilisateur [method ease] avec une valeur de courbe de [code]-1."
+"6521[/code], [method smoothstep] retourne la courbe la plus douce possible, "
+"sans changement brusque de dérivée. Si vous avez besoin d'effectuer des "
+"transitions plus avancées, utilisez [Tween] ou [AnimationPlayer].\n"
 "[url=https://raw.githubusercontent.com/godotengine/godot-docs/3.4/img/"
 "smoothstep_ease_comparison.png]Comparaison entre les valeurs retournées par "
 "smoothstep() et ease(x, -1.6521)[/url]"
@@ -4510,13 +4510,12 @@ msgstr ""
 "les couches de physique 2D optionnellement nommées."
 
 #: doc/classes/@GlobalScope.xml
-#, fuzzy
 msgid ""
 "Hints that an integer property is a bitmask using the optionally named 2D "
 "navigation layers."
 msgstr ""
-"Indique qu'une propriété nombre entier est un masque de bits utilisant les "
-"couches de rendu 2D optionnellement nommées."
+"Indique qu'une propriété de nombre entier est un masque de bits indiquant "
+"des calques de navigation 2D, qui peuvent être nommées."
 
 #: doc/classes/@GlobalScope.xml
 msgid ""
@@ -4535,13 +4534,12 @@ msgstr ""
 "couches de physique 3D optionnellement nommées."
 
 #: doc/classes/@GlobalScope.xml
-#, fuzzy
 msgid ""
 "Hints that an integer property is a bitmask using the optionally named 3D "
 "navigation layers."
 msgstr ""
-"Indique qu'une propriété nombre entier est un masque de bits utilisant les "
-"couches de rendu 2D optionnellement nommées."
+"Indique qu'une propriété de nombre entier est un masque de bits indiquant "
+"des calques de navigation 3D, qui peuvent être nommées."
 
 #: doc/classes/@GlobalScope.xml
 msgid ""
@@ -4660,9 +4658,10 @@ msgid "The property is a translatable string."
 msgstr "La propriété est une chaîne de caractères traduisible."
 
 #: doc/classes/@GlobalScope.xml
-#, fuzzy
 msgid "Used to group properties together in the editor. See [EditorInspector]."
-msgstr "Utilisé pour rassembler des propriétés ensemble dans l'éditeur."
+msgstr ""
+"Utilisé pour rassembler des propriétés ensemble dans l'éditeur. Voir "
+"[EditorInspector]."
 
 #: doc/classes/@GlobalScope.xml
 msgid "Used to categorize properties together in the editor."
@@ -5443,10 +5442,11 @@ msgid "Maximum value for the mode enum."
 msgstr "Valeur maximale pour le mode énumeration."
 
 #: doc/classes/AnimatedSprite.xml
-#, fuzzy
 msgid ""
 "Sprite node that contains multiple textures as frames to play for animation."
-msgstr "NÅ“ud de sprite qui peut utiliser plusieurs textures pour l'animation."
+msgstr ""
+"Le nœud de sprite qui peut utiliser plusieurs textures pour jouer une "
+"animation."
 
 #: doc/classes/AnimatedSprite.xml
 msgid ""
@@ -7372,7 +7372,7 @@ msgstr "Le type de transition."
 
 #: doc/classes/AnimationNodeStateMachineTransition.xml
 msgid "The time to cross-fade between this state and the next."
-msgstr ""
+msgstr "La durée du fondu entre cet état et le suivant."
 
 #: doc/classes/AnimationNodeStateMachineTransition.xml
 msgid "Emitted when [member advance_condition] is changed."
@@ -7515,9 +7515,8 @@ msgstr ""
 "processus."
 
 #: doc/classes/AnimationPlayer.xml
-#, fuzzy
 msgid "Animation tutorial index"
-msgstr "NÅ“ud d'animation."
+msgstr ""
 
 #: doc/classes/AnimationPlayer.xml
 msgid ""
@@ -8099,9 +8098,8 @@ msgstr ""
 "connectés à l'emplacement spécifié.."
 
 #: doc/classes/AnimationTreePlayer.xml
-#, fuzzy
 msgid "Returns the blend amount of a Blend2 node given its name."
-msgstr "Retourne le nombre de clés d'une piste donnée."
+msgstr ""
 
 #: doc/classes/AnimationTreePlayer.xml
 msgid ""
@@ -8129,9 +8127,8 @@ msgstr ""
 "code]. Les enfants modifiés du node's continuent d'être animés."
 
 #: doc/classes/AnimationTreePlayer.xml
-#, fuzzy
 msgid "Returns the blend amount of a Blend3 node given its name."
-msgstr "Retourne le nombre de clés d'une piste donnée."
+msgstr ""
 
 #: doc/classes/AnimationTreePlayer.xml
 msgid ""
@@ -8152,9 +8149,8 @@ msgstr ""
 "de B+ est à 0. À 1, la sortie est l'entrée B+."
 
 #: doc/classes/AnimationTreePlayer.xml
-#, fuzzy
 msgid "Returns the blend amount of a Blend4 node given its name."
-msgstr "Retourne le nombre de clés d'une piste donnée."
+msgstr ""
 
 #: doc/classes/AnimationTreePlayer.xml
 msgid ""
@@ -8186,9 +8182,8 @@ msgid "Returns a [PoolStringArray] containing the name of all nodes."
 msgstr "Retourne un [PoolStringArray] contenant le nom de tous les nœuds."
 
 #: doc/classes/AnimationTreePlayer.xml
-#, fuzzy
 msgid "Returns the mix amount of a Mix node given its name."
-msgstr "Retourne le nombre de clés d'une piste donnée."
+msgstr ""
 
 #: doc/classes/AnimationTreePlayer.xml
 msgid ""
@@ -8234,23 +8229,20 @@ msgstr ""
 "position."
 
 #: doc/classes/AnimationTreePlayer.xml
-#, fuzzy
 msgid "Returns the autostart delay of a OneShot node given its name."
-msgstr "Retourne la valeur d'une clé donnée dans une piste donnée."
+msgstr ""
 
 #: doc/classes/AnimationTreePlayer.xml
 msgid "Returns the autostart random delay of a OneShot node given its name."
 msgstr ""
 
 #: doc/classes/AnimationTreePlayer.xml
-#, fuzzy
 msgid "Returns the fade in time of a OneShot node given its name."
-msgstr "Retourne le nom du nœud d'animation donné."
+msgstr ""
 
 #: doc/classes/AnimationTreePlayer.xml
-#, fuzzy
 msgid "Returns the fade out time of a OneShot node given its name."
-msgstr "Retourne la valeur d'une clé donnée dans une piste donnée."
+msgstr ""
 
 #: doc/classes/AnimationTreePlayer.xml
 msgid "Returns whether a OneShot node will auto restart given its name."
@@ -8364,13 +8356,10 @@ msgstr ""
 "transition nommé [code]id[/code]."
 
 #: doc/classes/AnimationTreePlayer.xml
-#, fuzzy
 msgid ""
 "Returns the index of the currently evaluated input for the transition node "
 "with name [code]id[/code]."
 msgstr ""
-"Retourne la distance la plus courte de l'avion à la position [code]point [/"
-"code]."
 
 #: doc/classes/AnimationTreePlayer.xml
 msgid ""
@@ -8382,11 +8371,10 @@ msgstr ""
 "de transition."
 
 #: doc/classes/AnimationTreePlayer.xml
-#, fuzzy
 msgid ""
 "Returns the cross fade time for the transition node with name [code]id[/"
 "code]."
-msgstr "Retourne le nom du nœud à [code]idx[/code]."
+msgstr ""
 
 #: doc/classes/AnimationTreePlayer.xml
 msgid ""
@@ -8399,13 +8387,10 @@ msgstr ""
 "vers la prochaine entrée dès que la transition se termine."
 
 #: doc/classes/AnimationTreePlayer.xml
-#, fuzzy
 msgid ""
 "The transition node with name [code]id[/code] sets its current input at "
 "[code]input_idx[/code]."
 msgstr ""
-"Change la position de l'index de la piste [code]idx[/code] à celui définie "
-"par [code]to_idx[/code]."
 
 #: doc/classes/AnimationTreePlayer.xml
 msgid ""
@@ -8424,13 +8409,10 @@ msgstr ""
 "nommé [code]id[/code]."
 
 #: doc/classes/AnimationTreePlayer.xml
-#, fuzzy
 msgid ""
 "The transition node with name [code]id[/code] sets its cross fade time to "
 "[code]time_sec[/code]."
 msgstr ""
-"Change la position de l'index de la piste [code]idx[/code] à celui définie "
-"par [code]to_idx[/code]."
 
 #: doc/classes/AnimationTreePlayer.xml
 msgid ""
@@ -9590,7 +9572,7 @@ msgid ""
 "element, the slower [method pop_at] will be."
 msgstr ""
 "Retire et retourne l'élément du tableau à la [code]position[/code]. Si "
-"négatif, [code]position[/code] part de la la fin du tableau vers le début. "
+"négatif, [code]position[/code] part de la fin du tableau vers le début. "
 "Laisse le tableau intact et retourne [code]null[/code] si le tableau est "
 "vide ou s'il la position est en dehors des limites du tableau. Un message "
 "d'erreur est affiché lorsque la position est en dehors des limites du "
@@ -9932,7 +9914,7 @@ msgid ""
 "(see [method add_surface_from_arrays])."
 msgstr ""
 "Retourne la longueur des indices du tableau d'indices pour la surface "
-"spécifiée (voir [method add_surface_from_arrays].)"
+"spécifiée (voir [method add_surface_from_arrays])."
 
 #: doc/classes/ArrayMesh.xml
 msgid ""
@@ -9940,7 +9922,7 @@ msgid ""
 "(see [method add_surface_from_arrays])."
 msgstr ""
 "Retourne la longueur des sommets du tableau des sommets dans la surface "
-"spécifiée (voir [method add_surface_from_arrays].)"
+"spécifiée (voir [method add_surface_from_arrays])."
 
 #: doc/classes/ArrayMesh.xml
 msgid ""
@@ -9988,7 +9970,7 @@ msgstr ""
 
 #: doc/classes/ArrayMesh.xml
 msgid "Sets the blend shape mode to one of [enum Mesh.BlendShapeMode]."
-msgstr "Définit le mode de forme de mélange avec [enum Mesh.BlendShapeMode]"
+msgstr "Définit le mode de forme de mélange avec [enum Mesh.BlendShapeMode]."
 
 #: doc/classes/ArrayMesh.xml doc/classes/PrimitiveMesh.xml
 msgid ""
@@ -10001,10 +9983,8 @@ msgstr ""
 "lors de l'utilisation d'un shader qui décale les sommets."
 
 #: doc/classes/ArrayMesh.xml
-#, fuzzy
 msgid "Value used internally when no indices are present."
-msgstr ""
-"La valeur par défaut utilisée pour index_array_len quand il n'y pas d'indice."
+msgstr "La valeur par défaut utilisée en interne quand il n'y pas d'indice."
 
 #: doc/classes/ArrayMesh.xml
 msgid "Amount of weights/bone indices per vertex (always 4)."
@@ -10227,7 +10207,6 @@ msgstr ""
 "constamment mise à jour [code]mesh_updated[/code]."
 
 #: doc/classes/ARVRCamera.xml
-#, fuzzy
 msgid ""
 "A camera node with a few overrules for AR/VR applied, such as location "
 "tracking."
@@ -10384,7 +10363,6 @@ msgstr ""
 "identifiant inférieur est éteint."
 
 #: doc/classes/ARVRController.xml
-#, fuzzy
 msgid ""
 "The degree to which the controller vibrates. Ranges from [code]0.0[/code] to "
 "[code]1.0[/code]. If changed, updates [member ARVRPositionalTracker.rumble] "
@@ -10393,8 +10371,8 @@ msgid ""
 "for a limited duration."
 msgstr ""
 "L'intensité de vibration du contrôleur. L'intervalle va de [code]0.0[/code] "
-"à [code]1.0[/code] avec une précision de [code]0.01[/code]. Si changé, met à "
-"jour [membrez ARVRPositionalTracker.rumble] en conséquence.\n"
+"à [code]1.0[/code]. Si changé, [member ARVRPositionalTracker.rumble] sera "
+"mis à jour en conséquence.\n"
 "C'est une propriété utile à animer si vous souhaitez que le contrôleur vibre "
 "pendant une durée limitée."
 
@@ -10564,6 +10542,7 @@ msgstr "Cette interface est compatible avec le rendu stéréoscopique."
 #: doc/classes/ARVRInterface.xml
 msgid "This interface supports AR (video background and real world tracking)."
 msgstr ""
+"Cette interface supporte la AR (arrière-plan vidéo et suivi du monde réel)."
 
 #: doc/classes/ARVRInterface.xml
 msgid ""
@@ -10640,9 +10619,8 @@ msgstr ""
 "lumières sont éteintes, etc.)."
 
 #: modules/gdnative/doc_classes/ARVRInterfaceGDNative.xml
-#, fuzzy
 msgid "GDNative wrapper for an ARVR interface."
-msgstr "Classe de base pour une implémentation d’interface AR / VR."
+msgstr "L'encapsulation GDNative pour les interfaces ARVR."
 
 #: modules/gdnative/doc_classes/ARVRInterfaceGDNative.xml
 msgid ""
@@ -11074,7 +11052,6 @@ msgstr ""
 "position du joueur."
 
 #: doc/classes/AspectRatioContainer.xml
-#, fuzzy
 msgid "Container that preserves its child controls' aspect ratio."
 msgstr "Un conteneur qui préserve le ratio d'aspect des contrôles enfants."
 
@@ -11097,19 +11074,16 @@ msgstr ""
 #: doc/classes/PanelContainer.xml doc/classes/ScrollContainer.xml
 #: doc/classes/SplitContainer.xml doc/classes/TabContainer.xml
 #: doc/classes/VBoxContainer.xml doc/classes/VSplitContainer.xml
-#, fuzzy
 msgid "GUI containers"
-msgstr "Conteneur à onglets."
+msgstr "Conteneurs d'interface"
 
 #: doc/classes/AspectRatioContainer.xml
-#, fuzzy
 msgid "Specifies the horizontal relative position of child controls."
-msgstr "La séparation horizontale des nœuds enfants."
+msgstr "Définit la position horizontale relative des nœuds enfants."
 
 #: doc/classes/AspectRatioContainer.xml
-#, fuzzy
 msgid "Specifies the vertical relative position of child controls."
-msgstr "La séparation verticale des nœuds enfants."
+msgstr "Définit la position verticale relative des nœuds enfants."
 
 #: doc/classes/AspectRatioContainer.xml
 msgid ""
@@ -11160,19 +11134,17 @@ msgstr ""
 "de limiter la visibilité à seulement la taille du conteneur."
 
 #: doc/classes/AspectRatioContainer.xml
-#, fuzzy
 msgid ""
 "Aligns child controls with the beginning (left or top) of the container."
-msgstr "Aligne les enfants avec le début du conteneur."
+msgstr "Aligne les enfants au début (à gauche ou en haut) du conteneur."
 
 #: doc/classes/AspectRatioContainer.xml
 msgid "Aligns child controls with the center of the container."
 msgstr "Aligne les contrôles enfants au centre du conteneur."
 
 #: doc/classes/AspectRatioContainer.xml
-#, fuzzy
 msgid "Aligns child controls with the end (right or bottom) of the container."
-msgstr "Aligne les enfants avec le centre du conteneur."
+msgstr "Aligne les enfants à la fin (à droite ou en-bas) du conteneur."
 
 #: doc/classes/AStar.xml
 msgid ""
@@ -11657,14 +11629,13 @@ msgstr ""
 "position et sont facteur de poids seront mis à jour avec la valeur donnée."
 
 #: doc/classes/AStar2D.xml
-#, fuzzy
 msgid ""
 "Returns whether there is a connection/segment between the given points. If "
 "[code]bidirectional[/code] is [code]false[/code], returns whether movement "
 "from [code]id[/code] to [code]to_id[/code] is possible through this segment."
 msgstr ""
 "Retourne si les deux points donnés sont directement reliés par un segment. "
-"Si [code]bidirectionnel[/code] est [code]false[/code], retourne si le "
+"Si [code]bidirectional[/code] est [code]false[/code], retourne si le "
 "mouvement d'identifiant [code]id[/code] vers l'autre identifiant "
 "[code]to_id[/code] est possible par ce segment."
 
@@ -11852,11 +11823,10 @@ msgstr ""
 "sont ignorés pour les AtlasTexture."
 
 #: doc/classes/AtlasTexture.xml
-#, fuzzy
 msgid "The texture that contains the atlas. Can be any [Texture] subtype."
 msgstr ""
-"La texture qui contient l'atlas. Peut être de n'importe quel sous-type "
-"[Texture2D]."
+"La texture qui contient l'atlas. Peut être de n'importe quel sous-type de "
+"[Texture]."
 
 #: doc/classes/AtlasTexture.xml
 msgid ""
@@ -11991,9 +11961,8 @@ msgstr ""
 "pas assez de données disponibles."
 
 #: doc/classes/AudioEffectCapture.xml
-#, fuzzy
 msgid "Returns the total size of the internal ring buffer in frames."
-msgstr "Renvoie le reste de deux vecteurs."
+msgstr ""
 
 #: doc/classes/AudioEffectCapture.xml
 msgid ""
@@ -12004,15 +11973,13 @@ msgstr ""
 "mémoire est pleine."
 
 #: doc/classes/AudioEffectCapture.xml
-#, fuzzy
 msgid ""
 "Returns the number of frames available to read using [method get_buffer]."
-msgstr "Retourne le nombre de formes assignées à une zone."
+msgstr ""
 
 #: doc/classes/AudioEffectCapture.xml
-#, fuzzy
 msgid "Returns the number of audio frames inserted from the audio bus."
-msgstr "Renvoie le nombre de points sur l'axe de mélange."
+msgstr ""
 
 #: doc/classes/AudioEffectCapture.xml
 msgid ""
@@ -13013,7 +12980,6 @@ msgid "Returns the names of all audio devices detected on the system."
 msgstr "Retourne les noms de tous les appareils audio détectés sur le système."
 
 #: doc/classes/AudioServer.xml
-#, fuzzy
 msgid "Returns the sample rate at the output of the [AudioServer]."
 msgstr "Retourne le débit de sortie du [AudioServer]."
 
@@ -13298,14 +13264,11 @@ msgstr ""
 "pour lire l'audio généré en temps réel."
 
 #: doc/classes/AudioStreamGeneratorPlayback.xml
-#, fuzzy
 msgid ""
 "Returns [code]true[/code] if a buffer of the size [code]amount[/code] can be "
 "pushed to the audio sample data buffer without overflowing it, [code]false[/"
 "code] otherwise."
 msgstr ""
-"Retourne [code]true[/code] si le paramètre spécifié par [code]name[/code] "
-"existe, [code]false[/code] autrement."
 
 #: doc/classes/AudioStreamGeneratorPlayback.xml
 msgid "Clears the audio sample data buffer."
@@ -13347,9 +13310,8 @@ msgstr ""
 "[i]moins[/i] efficace avec GDScript."
 
 #: modules/minimp3/doc_classes/AudioStreamMP3.xml
-#, fuzzy
 msgid "MP3 audio stream driver."
-msgstr "Pilote de flux audio OGG Vorbis."
+msgstr "Le pilote de flux audio MP3."
 
 #: modules/minimp3/doc_classes/AudioStreamMP3.xml
 #: modules/stb_vorbis/doc_classes/AudioStreamOGGVorbis.xml
@@ -14149,9 +14111,8 @@ msgstr ""
 "[constant ENVIRONMENT_MODE_CUSTOM_SKY]."
 
 #: doc/classes/BakedLightmap.xml
-#, fuzzy
 msgid "The rotation of the baked custom sky."
-msgstr "La racine de la scène éditée."
+msgstr ""
 
 #: doc/classes/BakedLightmap.xml
 msgid ""
@@ -14260,9 +14221,8 @@ msgid "Currently unused."
 msgstr "Actuellement inutilisé."
 
 #: doc/classes/BakedLightmap.xml
-#, fuzzy
 msgid "Returns when the baker cannot save per-mesh textures to file."
-msgstr "Renvoie l'arc tangente des paramètres."
+msgstr ""
 
 #: doc/classes/BakedLightmap.xml
 msgid "The size of the generated lightmaps is too large."
@@ -14363,7 +14323,6 @@ msgstr ""
 "défini par l'enumération [enum DrawMode]."
 
 #: doc/classes/BaseButton.xml
-#, fuzzy
 msgid ""
 "Returns [code]true[/code] if the mouse has entered the button and has not "
 "left it yet."
@@ -15497,14 +15456,12 @@ msgid "Returns the current pressed button."
 msgstr "Renvoie le bouton actuellement enfoncé."
 
 #: doc/classes/ButtonGroup.xml
-#, fuzzy
 msgid "Emitted when one of the buttons of the group is pressed."
-msgstr "Émis lorsqu’un bouton de ce contrôleur est appuyé."
+msgstr "Émis lorsqu’un des boutons de ce groupe est appuyé."
 
 #: doc/classes/CallbackTweener.xml
-#, fuzzy
 msgid "Calls the specified method after optional delay."
-msgstr "Verrouille l'axe linéaire et de rotation spécifié."
+msgstr "Appelle la méthode spécifiée après un délai optionnel."
 
 #: doc/classes/CallbackTweener.xml
 msgid ""
@@ -16088,7 +16045,7 @@ msgid ""
 "Left margin needed to drag the camera. A value of [code]1[/code] makes the "
 "camera move only when reaching the edge of the screen."
 msgstr ""
-"La marge gauche nécessaire pour pour glisser la caméra. Une valeur de "
+"La marge gauche nécessaire pour glisser la caméra. Une valeur de "
 "[code]1[/code] ne déplace la caméra que lorsqu'elle atteint le bord de "
 "l'écran."
 
@@ -16097,7 +16054,7 @@ msgid ""
 "Right margin needed to drag the camera. A value of [code]1[/code] makes the "
 "camera move only when reaching the edge of the screen."
 msgstr ""
-"La marge droite nécessaire pour pour glisser la caméra. Une valeur de "
+"La marge droite nécessaire pour glisser la caméra. Une valeur de "
 "[code]1[/code] ne déplace la caméra que lorsqu'elle atteint le bord de "
 "l'écran."
 
@@ -16106,7 +16063,7 @@ msgid ""
 "Top margin needed to drag the camera. A value of [code]1[/code] makes the "
 "camera move only when reaching the edge of the screen."
 msgstr ""
-"La marge supérieure nécessaire pour pour glisser la caméra. Une valeur de "
+"La marge supérieure nécessaire pour glisser la caméra. Une valeur de "
 "[code]1[/code] ne déplacer la caméra que lorsqu'elle atteint le bord de "
 "l'écran."
 
@@ -16222,9 +16179,8 @@ msgstr ""
 "La méthode de mise à jour de la camera. Voir [enum Camera2DProcessMode]."
 
 #: doc/classes/Camera2D.xml
-#, fuzzy
 msgid "If [code]true[/code], the camera view rotates with the target."
-msgstr "Si [code]true[/code], le bouton \"add preset\" est activé."
+msgstr ""
 
 #: doc/classes/Camera2D.xml
 msgid ""
@@ -16312,9 +16268,8 @@ msgid "Returns the unique ID for this feed."
 msgstr "Retourne l'identifiant unique de ce flux."
 
 #: doc/classes/CameraFeed.xml
-#, fuzzy
 msgid "Returns the camera's name."
-msgstr "Renvoie le nom de l'élément."
+msgstr "Retourne le nom de la caméra."
 
 #: doc/classes/CameraFeed.xml
 msgid "Returns the position of camera on the device."
@@ -16384,20 +16339,18 @@ msgstr ""
 "iOS. Sur les autres plates-formes, aucun [CameraFeed] ne sera disponible."
 
 #: doc/classes/CameraServer.xml
-#, fuzzy
 msgid "Adds the camera [code]feed[/code] to the camera server."
-msgstr "Ajoute un [Shape2D] au propriétaire de la forme."
+msgstr ""
 
 #: doc/classes/CameraServer.xml
 msgid "Returns an array of [CameraFeed]s."
 msgstr "Retourne un tableau de [CameraFeed]s."
 
 #: doc/classes/CameraServer.xml
-#, fuzzy
 msgid ""
 "Returns the [CameraFeed] corresponding to the camera with the given "
 "[code]index[/code]."
-msgstr "Retourne la position du point à l'index [code]point[/code]."
+msgstr ""
 
 #: doc/classes/CameraServer.xml
 msgid "Returns the number of [CameraFeed]s registered."
@@ -16408,14 +16361,12 @@ msgid "Removes the specified camera [code]feed[/code]."
 msgstr "Supprime le flux de caméra [code]feed[/code] spécifié."
 
 #: doc/classes/CameraServer.xml
-#, fuzzy
 msgid "Emitted when a [CameraFeed] is added (e.g. a webcam is plugged in)."
-msgstr "Émis lorsqu'une interface est supprimée."
+msgstr ""
 
 #: doc/classes/CameraServer.xml
-#, fuzzy
 msgid "Emitted when a [CameraFeed] is removed (e.g. a webcam is unplugged)."
-msgstr "Émis lorsqu'une interface est supprimée."
+msgstr ""
 
 #: doc/classes/CameraServer.xml
 msgid "The RGBA camera image."
@@ -17451,9 +17402,8 @@ msgstr ""
 "[CanvasLayer] n'est pas propagée aux calques enfants."
 
 #: doc/classes/CanvasLayer.xml
-#, fuzzy
 msgid "Emitted when visibility of the layer is changed. See [member visible]."
-msgstr "Émis lorsque le VisibilityNotifier3D quitte la vue d'un [Camera3D]."
+msgstr ""
 
 #: doc/classes/CanvasModulate.xml
 msgid "Tint the entire canvas."
@@ -17548,13 +17498,12 @@ msgstr ""
 "contrôler le rendu de caractères individuels dans un [RichTextEffect]."
 
 #: doc/classes/CharFXTransform.xml
-#, fuzzy
 msgid ""
 "The index of the current character (starting from 0) for the "
 "[RichTextLabel]'s BBCode text. Setting this property won't affect drawing."
 msgstr ""
-"L'index du caractère actuel (commence à 0). Régler cette propriété n'affecte "
-"pas l'affichage."
+"L'index du caractère actuel (commence à 0) pour le texte BBCode du "
+"[RichTextLabel]. Régler cette propriété n'affecte pas l'affichage."
 
 #: doc/classes/CharFXTransform.xml
 msgid ""
@@ -17633,13 +17582,12 @@ msgstr ""
 "pixels)."
 
 #: doc/classes/CharFXTransform.xml
-#, fuzzy
 msgid ""
 "The index of the current character (starting from 0) for this "
 "[RichTextEffect] custom block. Setting this property won't affect drawing."
 msgstr ""
-"L'index du caractère actuel (commence à 0). Régler cette propriété n'affecte "
-"pas l'affichage."
+"L'index du caractère actuel (commence à 0) pour le bloc personnalisé du "
+"[RichTextEffect]. Régler cette propriété n'affecte pas l'affichage."
 
 #: doc/classes/CharFXTransform.xml
 msgid ""
@@ -17757,10 +17705,9 @@ msgid "The check icon to display when the [CheckBox] is unchecked."
 msgstr "L'icône de la coche à afficher quand la [CheckBox] est décochée."
 
 #: doc/classes/CheckBox.xml
-#, fuzzy
 msgid ""
 "The check icon to display when the [CheckBox] is unchecked and disabled."
-msgstr "Icône à afficher lorsque le [CheckButton] est coché et désactivé."
+msgstr "L'icône à afficher lorsque le [CheckBox] est décoché et désactivé."
 
 #: doc/classes/CheckBox.xml
 msgid ""
@@ -17977,10 +17924,9 @@ msgstr ""
 "code] de la [code]class[/code] ou de ses parents."
 
 #: doc/classes/ClassDB.xml
-#, fuzzy
 msgid ""
 "Returns an array with all the enums of [code]class[/code] or its ancestry."
-msgstr "Retourne si la [code]class[/code] spécifiée est disponible ou non."
+msgstr ""
 
 #: doc/classes/ClassDB.xml
 msgid ""
@@ -18252,7 +18198,7 @@ msgid ""
 msgstr ""
 "CollisionObject est la classe de base pour les objets physiques. Il peut "
 "contenir n'importe quel nombre de formes [Shape] de collision. Chaque forme "
-"doit être assignée à un [i]propriétaire de forme[ /i]. Le CollisionObject "
+"doit être assignée à un [i]propriétaire de forme[/i]. Le CollisionObject "
 "peut avoir n'importe quel nombre de propriétaires de forme. Les "
 "propriétaires de forme ne sont pas des nœuds et ne apparaissent pas dans "
 "l'éditeur, mais sont accessibles par le code en utilisant les méthodes "
@@ -18361,20 +18307,18 @@ msgid "Returns the parent object of the given shape owner."
 msgstr "Retourne l'objet parent du propriétaire de la forme spécifié."
 
 #: doc/classes/CollisionObject.xml
-#, fuzzy
 msgid "Returns the [Shape] with the given id from the given shape owner."
-msgstr "Retourne le [RID] de la énième forme d'une zone."
+msgstr ""
 
 #: doc/classes/CollisionObject.xml doc/classes/CollisionObject2D.xml
 msgid "Returns the number of shapes the given shape owner contains."
 msgstr "Retourne le nombre de formes que le propriétaire de forme contient."
 
 #: doc/classes/CollisionObject.xml
-#, fuzzy
 msgid ""
 "Returns the child index of the [Shape] with the given id from the given "
 "shape owner."
-msgstr "Retourne la liste de tous les nœuds du shader avec le type spécifié."
+msgstr ""
 
 #: doc/classes/CollisionObject.xml
 msgid "Returns the shape owner's [Transform]."
@@ -18839,11 +18783,12 @@ msgid "2D Kinematic Character Demo"
 msgstr "Démo de caractère cinétique 2D"
 
 #: doc/classes/CollisionShape2D.xml
-#, fuzzy
 msgid ""
 "A disabled collision shape has no effect in the world. This property should "
 "be changed with [method Object.set_deferred]."
-msgstr "Une forme de collision désactivée n’a aucun effet dans le monde."
+msgstr ""
+"Une forme de collision désactivée n’a aucun effet dans le monde. Cette "
+"propriété devrait être modifiée avec [method Object.set_deferred]."
 
 #: doc/classes/CollisionShape2D.xml
 msgid ""
@@ -19976,9 +19921,8 @@ msgstr ""
 "performance)."
 
 #: doc/classes/ColorPicker.xml
-#, fuzzy
 msgid "If [code]true[/code], shows an alpha channel slider (opacity)."
-msgstr "Si [code]true[/code], le GraphNode est sélectionné."
+msgstr ""
 
 #: doc/classes/ColorPicker.xml
 msgid ""
@@ -21003,15 +20947,12 @@ msgstr ""
 "[/codeblock]"
 
 #: doc/classes/Control.xml
-#, fuzzy
 msgid ""
 "Creates a local override for a theme constant with the specified [code]name[/"
 "code]. Local overrides always take precedence when fetching theme items for "
 "the control.\n"
 "See also [method get_constant], [method remove_constant_override]."
 msgstr ""
-"Retourne [code]true[/code] si le paramètre spécifié par [code]name[/code] "
-"existe, [code]false[/code] autrement."
 
 #: doc/classes/Control.xml
 msgid ""
@@ -21393,9 +21334,8 @@ msgstr ""
 "Retourne la taille minimale de ce contrôle. Voir [member rect_min_size]."
 
 #: doc/classes/Control.xml
-#, fuzzy
 msgid "Returns the width/height occupied in the parent control."
-msgstr "Renvoie la largeur / hauteur occupée dans le contrôle du parent."
+msgstr "Retourne la largeur / hauteur occupée dans le contrôle du parent."
 
 #: doc/classes/Control.xml
 msgid "Returns the parent control node."
@@ -21500,7 +21440,7 @@ msgid ""
 "See [method get_color] for details."
 msgstr ""
 "Retourne [code]true[/code] s'il y a un [Theme] correspondant dans "
-"l'arborescence qui a une propriété de constante nommée [/code]name[/code] et "
+"l'arborescence qui a une propriété de constante nommée [code]name[/code] et "
 "du type de thème [code]theme_type[/code].\n"
 "Voir [method get_color] pour plus de détails."
 
@@ -21644,37 +21584,31 @@ msgstr ""
 "clavier."
 
 #: doc/classes/Control.xml
-#, fuzzy
 msgid ""
 "Removes a theme override for a [Color] with the given [code]name[/code]."
-msgstr "Supprime l’animation avec la touche [code]name[/code]."
+msgstr ""
 
 #: doc/classes/Control.xml
-#, fuzzy
 msgid ""
 "Removes a theme override for a constant with the given [code]name[/code]."
-msgstr "Supprime l’animation avec la touche [code]name[/code]."
+msgstr ""
 
 #: doc/classes/Control.xml
-#, fuzzy
 msgid "Removes a theme override for a [Font] with the given [code]name[/code]."
-msgstr "Supprime l’animation avec la touche [code]name[/code]."
+msgstr ""
 
 #: doc/classes/Control.xml
-#, fuzzy
 msgid "Removes a theme override for an icon with the given [code]name[/code]."
-msgstr "Supprime l’animation avec la touche [code]name[/code]."
+msgstr ""
 
 #: doc/classes/Control.xml
-#, fuzzy
 msgid "Removes a theme override for a shader with the given [code]name[/code]."
-msgstr "Retourne la position du point à l'index [code]point[/code]."
+msgstr ""
 
 #: doc/classes/Control.xml
-#, fuzzy
 msgid ""
 "Removes a theme override for a [StyleBox] with the given [code]name[/code]."
-msgstr "Supprime l’animation avec la touche [code]name[/code]."
+msgstr ""
 
 #: doc/classes/Control.xml
 msgid ""
@@ -22627,20 +22561,20 @@ msgstr ""
 "Affiche le curseur en croix du système quand l'utilisateur survole ce nœud."
 
 #: doc/classes/Control.xml
-#, fuzzy
 msgid ""
 "Show the system's wait mouse cursor when the user hovers the node. Often an "
 "hourglass."
 msgstr ""
-"Affiche le curseur en croix du système quand l'utilisateur survole ce nœud."
+"Affiche le curseur d'attente du système quand l'utilisateur survole ce nœud. "
+"Souvent un sablier."
 
 #: doc/classes/Control.xml
-#, fuzzy
 msgid ""
 "Show the system's busy mouse cursor when the user hovers the node. Often an "
 "arrow with a small hourglass."
 msgstr ""
-"Affiche le curseur en croix du système quand l'utilisateur survole ce nœud."
+"Affiche le curseur d'occupation du système quand l'utilisateur survole ce "
+"nœud. Souvent une flèche avec un petit sablier."
 
 #: doc/classes/Control.xml
 msgid ""
@@ -23056,10 +22990,10 @@ msgid ""
 "variables, like [member anchor_left]. To change all 4 anchors at once, use "
 "[method set_anchors_preset]."
 msgstr ""
-"Magnétise l'un des 4 côtés d'ancrage à l'origine de l'ancrage [code]Rect[/"
-"code], en haut à gauche. Utilisez-le avec l'une des variables membres "
-"[code]anchor_[* /code], comme [member anchor_left]. Pour modifier les 4 "
-"ancres à la fois, utilisez [method set_anchors_preset]."
+"Magnétise l'un des 4 côtés d'ancrage à l'origine de l'ancrage "
+"[code]Rect[/code], en haut à gauche. Utilisez-le avec l'une des variables "
+"membres [code]anchor_*[/code], comme [member anchor_left]. Pour modifier les "
+"4 ancres à la fois, utilisez [method set_anchors_preset]."
 
 #: doc/classes/Control.xml
 msgid ""
@@ -23070,18 +23004,19 @@ msgid ""
 msgstr ""
 "Magnétise l'un des 4 côtés d'ancrage à l'extrémité de l'extrémité "
 "[code]Rect[/code], en bas à droite. Utilisez-le avec l'une des variables "
-"membres [code]anchor_[* /code], comme [member anchor_left]. Pour modifier "
-"les 4 ancres à la fois, utilisez [method set_anchors_preset]."
+"membres [code]anchor_*[/code], comme [member anchor_left]. Pour modifier les "
+"4 ancres à la fois, utilisez [method set_anchors_preset]."
 
 #: doc/classes/ConvexPolygonShape.xml
 msgid "Convex polygon shape for 3D physics."
 msgstr "Forme de polygone convexe pour la physique 3D."
 
 #: doc/classes/ConvexPolygonShape.xml
-#, fuzzy
 msgid ""
 "Convex polygon shape resource, which can be added to a [PhysicsBody] or area."
-msgstr "Ressource de forme de polygone concave 2D pour la physique."
+msgstr ""
+"Un ressource de forme de polygone convexe, qui peut être ajoutée à un "
+"[PhysicsBody] ou une aire."
 
 #: doc/classes/ConvexPolygonShape.xml
 msgid "The list of 3D points forming the convex polygon shape."
@@ -24348,7 +24283,6 @@ msgid ""
 msgstr ""
 
 #: modules/csg/doc_classes/CSGCylinder.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code] a cone is created, the [member radius] will only apply "
 "to one side."
@@ -24551,9 +24485,8 @@ msgstr ""
 "aucun maillage ne sera généré."
 
 #: modules/csg/doc_classes/CSGPolygon.xml
-#, fuzzy
 msgid "If [code]true[/code], applies smooth shading to the extrusions."
-msgstr "Si [code]true[/code], l’audio est stéréo."
+msgstr ""
 
 #: modules/csg/doc_classes/CSGPolygon.xml
 msgid ""
@@ -24785,7 +24718,6 @@ msgid "Only intersecting geometry remains, the rest is removed."
 msgstr "Il ne reste que la géométrie d'intersection, le reste est supprimé."
 
 #: modules/csg/doc_classes/CSGShape.xml
-#, fuzzy
 msgid ""
 "The second shape is subtracted from the first, leaving a dent with its shape."
 msgstr ""
@@ -24874,13 +24806,12 @@ msgstr ""
 "le tore aura un aspect de rendu plat."
 
 #: modules/mono/doc_classes/CSharpScript.xml
-#, fuzzy
 msgid ""
 "A script implemented in the C# programming language (Mono-enabled builds "
 "only)."
 msgstr ""
-"Un script implémenté dans le langage de programmation C# (uniquement des "
-"compilations Mono-activé)."
+"Un script implémenté en langage C# (uniquement pour les versions où Mono est "
+"activé)."
 
 #: modules/mono/doc_classes/CSharpScript.xml
 msgid ""
@@ -24909,9 +24840,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/CubeMap.xml
-#, fuzzy
 msgid "Returns the [CubeMap]'s height."
-msgstr "Retourne la hauteur de texture."
+msgstr "Retourne la hauteur du [CubeMap]."
 
 #: doc/classes/CubeMap.xml
 msgid ""
@@ -24922,9 +24852,8 @@ msgstr ""
 "constantes [enum Side]."
 
 #: doc/classes/CubeMap.xml
-#, fuzzy
 msgid "Returns the [CubeMap]'s width."
-msgstr "Renvoie la largeur de texture."
+msgstr "Renvoie la largeur du [CubeMap]."
 
 #: doc/classes/CubeMap.xml
 msgid ""
@@ -24951,9 +24880,8 @@ msgstr ""
 "défini à [constant STORAGE_COMPRESS_LOSSY]."
 
 #: doc/classes/CubeMap.xml
-#, fuzzy
 msgid "The [CubeMap]'s storage mode. See [enum Storage] constants."
-msgstr "Convertit le format de l’image. Voir les constantes [enum Format]."
+msgstr ""
 
 #: doc/classes/CubeMap.xml
 msgid "Store the [CubeMap] without any compression."
@@ -25370,13 +25298,13 @@ msgid ""
 "list."
 msgstr ""
 "Ajoute un point à une courbe à la [code]position[/code] par rapport à la "
-"position de la [Curve2D], avec des points de contrôle d'entrée [code]in[/"
-"code] et de sortie [code]out[/code].\n"
+"position de la [Curve2D], avec des points de contrôle d'entrée "
+"[code]in[/code] et de sortie [code]out[/code].\n"
 "Si [code]at_position[/code] est spécifié, le point est inséré juste avant ce "
 "numéro de point [code]at_position[/code], en déplaçant ce point (et tous les "
-"autres points qui suivent) après le point inséré. Si [code]at_position[/"
-"code] n'est pas donné, ou est une valeur invalide ([code]at_position < 0[/"
-"code] ou [code]at_position >= [method get_point_count][/code,) le point sera "
+"autres points qui suivent) après le point inséré. Si [code]at_position[/code]"
+" n'est pas donné, ou est une valeur invalide ([code]at_position < 0[/code] "
+"ou [code]at_position >= [method get_point_count][/code]), le point sera "
 "ajouté en dernier."
 
 #: doc/classes/Curve2D.xml doc/classes/Curve3D.xml
@@ -25796,9 +25724,8 @@ msgstr ""
 "courbes et/ou de les enregistrer dans des fichiers d'image."
 
 #: doc/classes/CurveTexture.xml
-#, fuzzy
 msgid "The [Curve] that is rendered onto the texture."
-msgstr "La [code]curve[/code] rendue sur la texture."
+msgstr "La [Curve] qui est rendue dans la texture."
 
 #: doc/classes/CurveTexture.xml
 msgid ""
@@ -25878,9 +25805,8 @@ msgid "The cylinder's radius."
 msgstr "Le rayon du cylindre."
 
 #: doc/classes/DampedSpringJoint2D.xml
-#, fuzzy
 msgid "Damped spring constraint for 2D physics."
-msgstr "Contrainte de ressort amortie pour la physique 2D."
+msgstr "Une contrainte de ressort avec amortissement pour la physique 2D."
 
 #: doc/classes/DampedSpringJoint2D.xml
 msgid ""
@@ -26491,9 +26417,9 @@ msgid ""
 msgstr ""
 "Change le dossier actuellement ouvert par celui donné en argument. "
 "L'argument peut être relatif au répertoire actuel (par exemple "
-"[code]nouveau_dossier[/code] ou [code]./dossier[ /code,)] ou être un chemin "
+"[code]nouveau_dossier[/code] ou [code]./dossier[/code]), ou être un chemin "
 "absolu (par exemple [code]/tmp/dossier[/code] ou [code]res://parent/"
-"dossier[ /code)].\n"
+"dossier[/code]).\n"
 "Retourne une des constantes de code [enum Error] (et [code]OK[/code] en cas "
 "de succès)."
 
@@ -27116,9 +27042,8 @@ msgid "Disables font hinting (smoother but less crisp)."
 msgstr ""
 
 #: doc/classes/DynamicFontData.xml
-#, fuzzy
 msgid "Use the light font hinting mode."
-msgstr "Utilisez le mode d’allusion de police de lumière."
+msgstr "Utilise le mode d'indice de police légère."
 
 #: doc/classes/DynamicFontData.xml
 msgid "Use the default font hinting mode (crisper but less smooth)."
@@ -27379,15 +27304,15 @@ msgstr ""
 "[method save_to_file]."
 
 #: doc/classes/EditorFeatureProfile.xml
-#, fuzzy
 msgid ""
 "Saves the editor feature profile to a file in JSON format. It can then be "
 "imported using the feature profile manager's [b]Import[/b] button or the "
 "[method load_from_file] method."
 msgstr ""
 "Enregistre le profil de fonctionnalité de l'éditeur dans un fichier au "
-"format JSON. Il peut ensuite être importé en utilisant le bouton [b]Import[/"
-"b] ou la méthode [method load_from_file]."
+"format JSON. Il peut ensuite être importé en utilisant le bouton "
+"[b]Importer[/b] du gestionnaire de profils ou via la méthode [method "
+"load_from_file]."
 
 #: doc/classes/EditorFeatureProfile.xml
 msgid ""
@@ -27546,7 +27471,7 @@ msgid ""
 "code], [code]user://[/code], and the local file system."
 msgstr ""
 "L'emplacement à partir duquel l'utilisateur peut sélectionner un fichier, y "
-"compris [code]res://[/code], [code]user://[code], et le système de fichiers "
+"compris [code]res://[/code], [code]user://[/code], et le système de fichiers "
 "local."
 
 #: doc/classes/EditorFileDialog.xml
@@ -27686,7 +27611,7 @@ msgstr ""
 "fichiers, leurs types, etc.\n"
 "[b]Note :[/b] Cette classe ne devrait pas être instanciée directement. "
 "Accédez plutôt à l'instance unique avec [method EditorInterface."
-"get_resource_filesystem]"
+"get_resource_filesystem]."
 
 #: doc/classes/EditorFileSystem.xml
 msgid ""
@@ -27716,7 +27641,6 @@ msgstr ""
 "en train d'être scanné."
 
 #: doc/classes/EditorFileSystem.xml
-#, fuzzy
 msgid "Returns [code]true[/code] if the filesystem is being scanned."
 msgstr "Retourne [code]true[/code] si le système de fichier a été scanné."
 
@@ -27927,8 +27851,8 @@ msgid ""
 msgstr ""
 "Les [EditorImportPlugin] fournissent un moyen d'étendre la fonctionnalité "
 "d'importation des ressources dans l'éditeur. Utilisez-les pour importer des "
-"ressources depuis des formats de de fichier personnalisés  ou pour proposer "
-"une alternative aux importateurs existants de l'éditeur.\n"
+"ressources depuis des formats de fichier personnalisés  ou pour proposer une "
+"alternative aux importateurs existants de l'éditeur.\n"
 "Les EditorImportPlugins fonctionnent pas associés certaines extensions de "
 "fichiers avec un type de ressource. Voir [method get_recognized_extensions] "
 "et [method get_resource_type]. Ils peuvent aussi spécifier des préréglages "
@@ -28122,10 +28046,8 @@ msgstr ""
 "surcharge de cette méthode."
 
 #: doc/classes/EditorInspector.xml
-#, fuzzy
 msgid "A control used to edit properties of an object."
-msgstr ""
-"Contrôle personnalisé pour modifier les propriétés à ajouter à l’inspecteur."
+msgstr "Un contrôle pour modifier les propriétés d'un objet."
 
 #: doc/classes/EditorInspector.xml
 msgid ""
@@ -28520,22 +28442,16 @@ msgstr ""
 "[code]object[/code]."
 
 #: doc/classes/EditorInterface.xml
-#, fuzzy
 msgid ""
 "Returns [code]true[/code] if a scene is currently being played, [code]false[/"
 "code] otherwise. Paused scenes are considered as being played."
 msgstr ""
-"Retourne [code]true[/code] si la chaîne de caractères commence par la chaîne "
-"de caractères donnée, ou [code]false[/code] le cas échéant."
 
 #: doc/classes/EditorInterface.xml
-#, fuzzy
 msgid ""
 "Returns [code]true[/code] if the specified [code]plugin[/code] is enabled. "
 "The plugin name is the same as its directory name."
 msgstr ""
-"Renvoie [code]true[/code] (vrai) si [code]s[/code] vaut zéro ou quasiment "
-"zéro."
 
 #: doc/classes/EditorInterface.xml
 msgid ""
@@ -29315,29 +29231,25 @@ msgid "Removes a custom type added by [method add_custom_type]."
 msgstr "Supprime un type personnalisé ajouté par [method add_custom_type]."
 
 #: doc/classes/EditorPlugin.xml
-#, fuzzy
 msgid "Removes an export plugin registered by [method add_export_plugin]."
-msgstr "Supprime un type personnalisé ajouté par [method add_custom_type]."
+msgstr ""
 
 #: doc/classes/EditorPlugin.xml
-#, fuzzy
 msgid "Removes an import plugin registered by [method add_import_plugin]."
-msgstr "Supprime un type personnalisé ajouté par [method add_custom_type]."
+msgstr ""
 
 #: doc/classes/EditorPlugin.xml
 msgid "Removes an inspector plugin registered by [method add_import_plugin]"
 msgstr "Supprime un type personnalisé ajouté par [method add_custom_type]"
 
 #: doc/classes/EditorPlugin.xml
-#, fuzzy
 msgid ""
 "Removes a scene importer registered by [method add_scene_import_plugin]."
-msgstr "Supprime un type personnalisé ajouté par [method add_custom_type]."
+msgstr ""
 
 #: doc/classes/EditorPlugin.xml
-#, fuzzy
 msgid "Removes a gizmo plugin registered by [method add_spatial_gizmo_plugin]."
-msgstr "Supprime un type personnalisé ajouté par [method add_custom_type]."
+msgstr ""
 
 #: doc/classes/EditorPlugin.xml
 msgid "Removes a menu [code]name[/code] from [b]Project > Tools[/b]."
@@ -29528,7 +29440,7 @@ msgid ""
 "must be previously added using [method Node.add_child]."
 msgstr ""
 "Place le contrôle [code]editor[/code] sous le label de la propriété. Le "
-"contrôle doit d'abord être ajouté avec [method Node.add_child]"
+"contrôle doit d'abord être ajouté avec [method Node.add_child]."
 
 #: doc/classes/EditorProperty.xml
 msgid "When this virtual function is called, you must update your editor."
@@ -29588,9 +29500,9 @@ msgid ""
 "Emit it if you want multiple properties modified at the same time. Do not "
 "use if added via [method EditorInspectorPlugin.parse_property]."
 msgstr ""
-"Emettez-le si vous voulez plusieurs propriétés modifiées en même temps. Ne "
+"Émettez-le si vous voulez plusieurs propriétés modifiées en même temps. Ne "
 "pas utiliser s'il a été ajouté avec [method EditorInspectorPlugin."
-"parse_property]"
+"parse_property]."
 
 #: doc/classes/EditorProperty.xml
 msgid "Used by sub-inspectors. Emit it if what was selected was an Object ID."
@@ -29739,9 +29651,8 @@ msgstr ""
 "set_toggle_pressed] pour définir manuellement cet état."
 
 #: doc/classes/EditorResourcePicker.xml
-#, fuzzy
 msgid "Emitted when the value of the edited resource was changed."
-msgstr "Émis à chaque fois que la ressource change."
+msgstr "Émis quand le valeur d'une ressource modifiée a été changée."
 
 #: doc/classes/EditorResourcePicker.xml
 msgid ""
@@ -29767,7 +29678,7 @@ msgstr ""
 "fichiers.\n"
 "[b]Note :[/b] Cette classe ne devrait pas être instanciée directement. "
 "Accédez plutôt à l'instance unique en utilisant [method EditorInterface."
-"get_resource_previewer]"
+"get_resource_previewer]."
 
 #: doc/classes/EditorResourcePreview.xml
 msgid "Create an own, custom preview generator."
@@ -30174,7 +30085,7 @@ msgstr ""
 "Cet objet gère la sélection dans le SceneTree dans l'éditeur.\n"
 "[b]Note :[/b] Cette classe ne devrait pas être instanciée directement. "
 "Accédez plutôt à l'instance unique en utilisant [method EditorInterface."
-"get_selection]"
+"get_selection]."
 
 #: doc/classes/EditorSelection.xml
 msgid ""
@@ -30572,12 +30483,11 @@ msgid ""
 msgstr ""
 "Retourne le [EditorSpatialGizmoPlugin] qui possède ce manipulateur. Il est "
 "utile de récupérer les matériaux en utilisant [method "
-"EditorSpatialGizmoPlugin.get_material]"
+"EditorSpatialGizmoPlugin.get_material]."
 
 #: doc/classes/EditorSpatialGizmo.xml
-#, fuzzy
 msgid "Returns the Spatial node associated with this gizmo."
-msgstr "Retourne le chemin d’accès au nœud associé à l’os spécifié."
+msgstr ""
 
 #: doc/classes/EditorSpatialGizmo.xml
 msgid ""
@@ -30778,9 +30688,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/EditorSpinSlider.xml
-#, fuzzy
 msgid "If [code]true[/code], the slider is hidden."
-msgstr "Si [code]true[/code], la flèche de réduction est masquée."
+msgstr "Si [code]true[/code], le glisseur est masqué."
 
 #: doc/classes/EditorVCSInterface.xml
 msgid ""
@@ -30809,10 +30718,8 @@ msgstr ""
 "hériter de [EditorVCSInterface] et surcharger ces fonctions virtuelles."
 
 #: doc/classes/EditorVCSInterface.xml
-#, fuzzy
 msgid "Checks out a [code]branch_name[/code] in the VCS."
 msgstr ""
-"Supprime un [code]name[/code] de chargement automatique à partir de la liste."
 
 #: doc/classes/EditorVCSInterface.xml
 msgid ""
@@ -30821,9 +30728,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/EditorVCSInterface.xml
-#, fuzzy
 msgid "Creates a new branch named [code]branch_name[/code] in the VCS."
-msgstr "Crée une instance de [code]class[/code]."
+msgstr ""
 
 #: doc/classes/EditorVCSInterface.xml
 msgid ""
@@ -30854,9 +30760,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/EditorVCSInterface.xml
-#, fuzzy
 msgid "Gets the current branch name defined in the VCS."
-msgstr "Définit le trame présentement visible de l'animation."
+msgstr ""
 
 #: doc/classes/EditorVCSInterface.xml
 msgid ""
@@ -30920,9 +30825,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/EditorVCSInterface.xml
-#, fuzzy
 msgid "Remove a branch from the local VCS."
-msgstr "Supprime un nœud de la sélection."
+msgstr ""
 
 #: doc/classes/EditorVCSInterface.xml
 msgid "Remove a remote from the local VCS."
@@ -30944,9 +30848,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/EditorVCSInterface.xml
-#, fuzzy
 msgid "Stages the file present at [code]file_path[/code] to the staged area."
-msgstr "Ajoute un [Shape2D] au propriétaire de la forme."
+msgstr ""
 
 #: doc/classes/EditorVCSInterface.xml
 msgid ""
@@ -31056,9 +30959,8 @@ msgid "A commit is encountered from the commit area."
 msgstr ""
 
 #: doc/classes/EditorVCSInterface.xml
-#, fuzzy
 msgid "A file is encountered from the staged area."
-msgstr "Statut : Déconnecté du serveur."
+msgstr ""
 
 #: doc/classes/EditorVCSInterface.xml
 msgid "A file is encountered from the unstaged area."
@@ -31578,14 +31480,12 @@ msgid "The [Sky] resource's rotation expressed as a [Basis]."
 msgstr "La rotation du [Sky] exprimée par un [Basis]."
 
 #: doc/classes/Environment.xml
-#, fuzzy
 msgid "The [Sky] resource's rotation expressed as Euler angles in radians."
-msgstr "La rotation de la texture en radians."
+msgstr ""
 
 #: doc/classes/Environment.xml
-#, fuzzy
 msgid "The [Sky] resource's rotation expressed as Euler angles in degrees."
-msgstr "La rotation de la texture en degrés."
+msgstr ""
 
 #: doc/classes/Environment.xml
 msgid "The amount of far blur for the depth-of-field effect."
@@ -31599,9 +31499,8 @@ msgstr ""
 "rendu."
 
 #: doc/classes/Environment.xml
-#, fuzzy
 msgid "If [code]true[/code], enables the depth-of-field far blur effect."
-msgstr "Si [code]true[/code], active le drapeau spécifié."
+msgstr "Si [code]true[/code], active l'effet de flou de profondeur lointain."
 
 #: doc/classes/Environment.xml
 msgid ""
@@ -31921,11 +31820,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Environment.xml
-#, fuzzy
 msgid ""
 "The secondary screen-space ambient occlusion intensity. See also [member "
 "ssao_radius2]."
-msgstr "Le rayon d'occlusion ambiante de l'espace de l'écran primaire."
+msgstr ""
 
 #: doc/classes/Environment.xml
 msgid ""
@@ -33063,7 +32961,7 @@ msgstr ""
 #: doc/classes/FlowContainer.xml
 #, fuzzy
 msgid "Base class for flow containers."
-msgstr "Classe de base pour les conteneurs de boîtes."
+msgstr "La classe de base pour les conteneurs de flux."
 
 #: doc/classes/FlowContainer.xml
 msgid ""
@@ -33074,7 +32972,6 @@ msgid ""
 msgstr ""
 
 #: doc/classes/FlowContainer.xml
-#, fuzzy
 msgid "Returns the current line count."
 msgstr "Retourne le numéro de la ligne actuelle."
 
@@ -33144,30 +33041,24 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Font.xml
-#, fuzzy
 msgid "Returns resource id of the cache texture containing the char."
-msgstr "Retourne l'identifiant OpenGL de l'image de cette texture."
+msgstr ""
 
 #: doc/classes/Font.xml
-#, fuzzy
 msgid "Returns size of the cache texture containing the char."
-msgstr "Retourne la position du contact sur le collisionneur."
+msgstr ""
 
 #: doc/classes/Font.xml
-#, fuzzy
 msgid "Returns char offset from the baseline."
-msgstr "Retourne le décalage de la texture de la tuile."
+msgstr ""
 
 #: doc/classes/Font.xml
-#, fuzzy
 msgid "Returns size of the char."
-msgstr "Renvoie le sinus du paramètre."
+msgstr "Retourne la taille du caractère."
 
 #: doc/classes/Font.xml
-#, fuzzy
 msgid "Returns rectangle in the cache texture containing the char."
 msgstr ""
-"Retourne un rectangle englobant les tuiles utilisées (non vides) de la carte."
 
 #: doc/classes/Font.xml
 msgid "Returns the font descent (number of pixels below the baseline)."
@@ -33203,9 +33094,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Font.xml
-#, fuzzy
 msgid "Contour point is on the curve."
-msgstr "Supprime tous les points de la courbe."
+msgstr ""
 
 #: doc/classes/Font.xml
 msgid ""
@@ -34039,18 +33929,17 @@ msgstr ""
 "fin."
 
 #: doc/classes/Geometry.xml
-#, fuzzy
 msgid ""
 "Given an array of [Vector2]s representing tiles, builds an atlas. The "
 "returned dictionary has two keys: [code]points[/code] is an array of "
 "[Vector2] that specifies the positions of each tile, [code]size[/code] "
 "contains the overall size of the whole atlas as [Vector2]."
 msgstr ""
-"À partir d'un tableau de [Vector2] représentant des tuiles, construit un "
+"À partir d'un tableau de [Vector2] représentant des tuiles, ça construit un "
 "atlas. Le dictionnaire retourné a deux clés : [code]points[/code] est un "
 "tableau de [Vector2] qui précise les positions de chaque tuile, et "
-"[code]size[/code] contient la taille globale de l'atlas entier sous forme de "
-"[Vector2]."
+"[code]size[/code] contient la taille globale de l'atlas en entier sous forme "
+"d'un [Vector2]."
 
 #: doc/classes/Geometry.xml
 msgid ""
@@ -34095,19 +33984,20 @@ msgid ""
 msgstr ""
 "Gonfle ou dégonfle [code]polygon[/code] par la quantité [code]delta[/code] "
 "unités (pixels) dans toutes les directions. Si [code]delta[/code] est "
-"positif, le polygone décale chaque sommet vers l'extérieur. Si [code]delta[/"
-"code] est négatif, décale chaque sommet vers l'intérieur. Retourne une liste "
-"des polygones parce que gonflage/dégonflage peut produire plusieurs "
-"polygones distinctes. Retourne un tableau vide si [code]delta[/code] est "
-"négatif et la valeur absolue de celui-ci dépasse approximativement les "
-"dimensions du rectangle minimal englobant du polygone.\n"
+"positif, le polygone décale chaque sommet vers l'extérieur. Si "
+"[code]delta[/code] est négatif, décale chaque sommet vers l'intérieur. "
+"Retourne une liste des polygones parce que gonflage/dégonflage peut produire "
+"plusieurs polygones distinctes. Retourne un tableau vide si "
+"[code]delta[/code] est négatif et la valeur absolue de celui-ci dépasse "
+"approximativement les dimensions du rectangle minimal englobant du polygone."
+"\n"
 "Les sommets de chaque polygone sont arrondis suivant [code]join_type[/code], "
 "voir [enum PolyJoinType].\n"
 "L'opération peut fournir un polygone extérieur (la limite extérieure) et "
 "plusieurs polygones à intérieur (représentant les trous) qui pourraient être "
-"distingués en appelant [méthode is_polygon_clockwise].\n"
-"[b]Note :[/b] Pour transformer les sommets en polygone, utilisez la méthode "
-"[méthode Transform2D.xform]:\n"
+"distingués en appelant [method is_polygon_clockwise].\n"
+"[b]Note :[/b] Pour transformer les sommets en polygone, utilisez la méthode ["
+"method Transform2D.xform]:\n"
 "[codeblock]\n"
 "var polygon = PoolVector2Array([Vector2(0, 0), Vector2(100, 0), Vector2(100, "
 "100), Vector2(0, 100)])\n"
@@ -34132,15 +34022,16 @@ msgid ""
 "(hole) produced which could be distinguished by calling [method "
 "is_polygon_clockwise]."
 msgstr ""
-"par la quantité [code]delta[/code] unités (pixels) dans toutes les "
-"directions. Si [code]delta[/code] est positif, le polygone décale chaque "
-"sommet vers l'extérieur. Retourne une liste des polygones parce que gonflage/"
-"dégonflage peut produire plusieurs polygones distinctes. Si [code]delta[/"
-"code] est négatif, retourne un tableau vide.\n"
+"Gonfle ou dégonfle [code]polyline[/code] par la quantité [code]delta[/code] "
+"d'unités (pixels) dans toutes les directions. Si [code]delta[/code] est "
+"positif, le polygone décale chaque sommet vers l'extérieur. Retourne une "
+"liste des polygones parce que gonflage/dégonflage peut produire plusieurs "
+"polygones distinctes. Si [code]delta[/code] est négatif, retourne un tableau "
+"vide.\n"
 "Les sommets de chaque polygone sont arrondis suivant [code]join_type[/code], "
 "voir [enum PolyJoinType].\n"
-"Chaque point d'extrémité du polygone sera arrondi suivant [code]end_type[/"
-"code], voir [enum PolyEndType].\n"
+"Chaque point d'extrémité du polygone sera arrondi suivant "
+"[code]end_type[/code], voir [enum PolyEndType].\n"
 "L'opération peut fournir un polygone extérieur (la limite extérieur) et "
 "plusieurs polygones à intérieur (représentant les trous) qui pourraient être "
 "distingués en appelant [method is_polygon_clockwise]."
@@ -34383,39 +34274,35 @@ msgid ""
 msgstr ""
 
 #: doc/classes/GeometryInstance.xml
-#, fuzzy
 msgid ""
 "The GeometryInstance's max LOD distance.\n"
 "[b]Note:[/b] This property currently has no effect."
 msgstr ""
-"La distance min LOD de GeometryInstance3D.\n"
+"La distance maximale pour ce LOD de la GeometryInstance.\n"
 "[b]Remarque :[/b] Cette propriété n’a actuellement aucun effet."
 
 #: doc/classes/GeometryInstance.xml
-#, fuzzy
 msgid ""
 "The GeometryInstance's max LOD margin.\n"
 "[b]Note:[/b] This property currently has no effect."
 msgstr ""
-"La distance min LOD de GeometryInstance3D.\n"
+"La marge maximale pour ce LOD de la GeometryInstance.\n"
 "[b]Remarque :[/b] Cette propriété n’a actuellement aucun effet."
 
 #: doc/classes/GeometryInstance.xml
-#, fuzzy
 msgid ""
 "The GeometryInstance's min LOD distance.\n"
 "[b]Note:[/b] This property currently has no effect."
 msgstr ""
-"La distance min LOD de GeometryInstance3D.\n"
+"La distance minimale pour ce LOD de la GeometryInstance.\n"
 "[b]Remarque :[/b] Cette propriété n’a actuellement aucun effet."
 
 #: doc/classes/GeometryInstance.xml
-#, fuzzy
 msgid ""
 "The GeometryInstance's min LOD margin.\n"
 "[b]Note:[/b] This property currently has no effect."
 msgstr ""
-"La distance min LOD de GeometryInstance3D.\n"
+"La marge minimale pour ce LOD de la GeometryInstance.\n"
 "[b]Remarque :[/b] Cette propriété n’a actuellement aucun effet."
 
 #: doc/classes/GeometryInstance.xml
@@ -34952,13 +34839,10 @@ msgstr ""
 "[code]false[/code] sinon."
 
 #: modules/mono/doc_classes/GodotSharp.xml
-#, fuzzy
 msgid ""
 "Returns [code]true[/code] if the Mono runtime is shutting down, [code]false[/"
 "code] otherwise."
 msgstr ""
-"Renvoie [code]true[/code] (vrai) si [code]s[/code] vaut zéro ou quasiment "
-"zéro."
 
 #: modules/mono/doc_classes/GodotSharp.xml
 msgid ""
@@ -35640,14 +35524,12 @@ msgid "Returns the type of the output connection [code]idx[/code]."
 msgstr "Retourne le type de connexion pour la sortie [code]idx[/code]."
 
 #: doc/classes/GraphNode.xml
-#, fuzzy
 msgid "Returns the left (input) [Color] of the slot [code]idx[/code]."
-msgstr "Retourne le type du nœud à [code]idx[/code]."
+msgstr ""
 
 #: doc/classes/GraphNode.xml
-#, fuzzy
 msgid "Returns the right (output) [Color] of the slot [code]idx[/code]."
-msgstr "Retourne le type du nœud à [code]idx[/code]."
+msgstr ""
 
 #: doc/classes/GraphNode.xml
 msgid "Returns the left (input) type of the slot [code]idx[/code]."
@@ -35690,17 +35572,17 @@ msgid ""
 "methods. You must enable at least one side of the slot to do so."
 msgstr ""
 "Définit les propriétés de l'emplacement avec identifiant [code]idx[/code].\n"
-"Si [code]enable_left[code]/[code]right[/code], un port apparaîtra et "
+"Si [code]enable_left[/code]/[code]right[/code], un port apparaîtra et "
 "l'emplacement pourra être connectée de ce côté.\n"
-"[code]type_left[code]/[code]right[/code] est un type arbitraire du port. "
+"[code]type_left[/code]/[code]right[/code] est un type arbitraire du port. "
 "Seuls les ports avec le même type peuvent être connectés.\n"
-"[code]color_left[code]/[code]right[/code] est la teinte de l'icône du port "
+"[code]color_left[/code]/[code]right[/code] est la teinte de l'icône du port "
 "de ce côté.\n"
-"[code]custom_left[code]/[code]right[/code] est une texture personnalisée "
+"[code]custom_left[/code]/[code]right[/code] est une texture personnalisée "
 "pour le port de ce côté.\n"
 "[b]Note :[/b] Cette méthode ne définit que les propriétés de l'emplacement. "
-"Pour créer l'emplacement, ajoutez un enfant dérivé de [Control] au "
-"GraphNode.\n"
+"Pour créer l'emplacement, ajoutez un enfant dérivé de [Control] au GraphNode."
+"\n"
 "Les propriétés individuelles peuvent être définies en utilisant l'une des "
 "méthodes [code]set_slot_*[/code]. Vous devez activer au moins un côté de "
 "l'emplacement pour le faire."
@@ -36069,13 +35951,10 @@ msgstr ""
 "dans la grille."
 
 #: modules/gridmap/doc_classes/GridMap.xml
-#, fuzzy
 msgid ""
 "Returns an array of all cells with the given item index specified in "
 "[code]item[/code]."
 msgstr ""
-"Renvoie la texture de l’atlas de police de caractères à l’index [code]idx[/"
-"code]."
 
 #: modules/gridmap/doc_classes/GridMap.xml
 msgid ""
@@ -36112,13 +35991,10 @@ msgid ""
 msgstr ""
 
 #: modules/gridmap/doc_classes/GridMap.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], this GridMap uses cell navmesh resources to create "
 "navigation regions."
 msgstr ""
-"Si [code]true[/code], met à jour les animations en réponse aux notifications "
-"liées au processus."
 
 #: modules/gridmap/doc_classes/GridMap.xml
 msgid "If [code]true[/code], grid items are centered on the X axis."
@@ -36330,9 +36206,8 @@ msgid "The horizontal space between the [HBoxContainer]'s elements."
 msgstr "L'espace horizontal entre les éléments du [HBoxContainer]."
 
 #: doc/classes/HeightMapShape.xml
-#, fuzzy
 msgid "Height map shape for 3D physics."
-msgstr "Forme de polygone convexe pour la physique 3D."
+msgstr "La forme de carte de hauteurs pour la physique 3D."
 
 #: doc/classes/HeightMapShape.xml
 msgid ""
@@ -36605,14 +36480,13 @@ msgid "Displayed when the decrement button is being pressed."
 msgstr "Affiché quand le bouton de reduction est appuyé."
 
 #: doc/classes/HScrollBar.xml
-#, fuzzy
 msgid ""
 "Icon used as a button to scroll the [ScrollBar] right. Supports custom step "
 "using the [member ScrollBar.custom_step] property."
 msgstr ""
-"Icône utilisée comme bouton pour faire défiler la [ScrollBar] correctement. "
-"Supporte l'étape personnalisée en utilisant la propriété [member ScrollBar."
-"custom_step]."
+"L'icône utilisée comme bouton pour faire défiler la [ScrollBar] vers la "
+"droite. Supporte une étape personnalisée en utilisant la propriété [member "
+"ScrollBar.custom_step]."
 
 #: doc/classes/HScrollBar.xml doc/classes/VScrollBar.xml
 msgid "Displayed when the mouse cursor hovers over the increment button."
@@ -36631,7 +36505,7 @@ msgstr ""
 #: doc/classes/HScrollBar.xml doc/classes/VScrollBar.xml
 #, fuzzy
 msgid "Used when the mouse hovers over the grabber."
-msgstr "Utilisé lorsque la souris survole le grappin."
+msgstr "Utilisé lorsque la souris survole le glisseur."
 
 #: doc/classes/HScrollBar.xml doc/classes/VScrollBar.xml
 msgid "Used when the grabber is being dragged."
@@ -37722,7 +37596,6 @@ msgid "A node with the ability to send HTTP(S) requests."
 msgstr "Un nœud qui permet d'envoyer des requêtes HTTP(S)."
 
 #: doc/classes/HTTPRequest.xml
-#, fuzzy
 msgid ""
 "A node with the ability to send HTTP requests. Uses [HTTPClient] "
 "internally.\n"
@@ -37802,28 +37675,28 @@ msgstr ""
 "des fichiers ou du contenu web via HTTP.\n"
 "[b]Avertissement :[/b] Voir les notes et avertissements du [HTTPClient] pour "
 "les limites, notamment concernant la sécurité SSL.\n"
-"[b]Exemple pour contacter une API REST et afficher les champs retournés :[/"
-"b]\n"
+"[b]Exemple pour contacter une API REST et afficher les champs retournés :[/b]"
+"\n"
 "[codeblock]\n"
 "func _ready():\n"
-"    # Créer un nœud de requête HTTP et le connecter au signal de "
-"complétion.\n"
+"    # Créer un nœud de requête HTTP et le connecter au signal de complétion."
+"\n"
 "    var http_request = HTTPRequest.new()\n"
 "    add_child(http_request)\n"
 "    http_request.connect(\"request_completed\", self, "
 "\"_http_request_completed\")\n"
 "\n"
-"    # Lancer une requête GET. L'URL en-dessous retourne un JSON au moment de "
+"    # Lancer une requête GET. L'URL en dessous retourne un JSON au moment de "
 "l'écriture de ce tutoriel.\n"
 "    var error = http_request.request(\"https://httpbin.org/get\")\n"
 "    if error != OK:\n"
 "        push_error(\"Une erreur est survenue dans la requête HTTP.\")\n"
 "\n"
-"    # Lancer une requête POST. L'URL en-dessous retourne un JSON au moment "
+"    # Lancer une requête POST. L'URL en dessous retourne un JSON au moment "
 "de l'écriture de ce tutoriel.\n"
 "    # Note : Don't make simultaneous requests using a single HTTPRequest "
 "node.\n"
-"    # Le code en-dessous est uniquement donné comme exemple.\n"
+"    # Le code en dessous est uniquement donné comme exemple.\n"
 "    var body = {\"nom\": \"Godette\"}\n"
 "    error = http_request.request(\"https://httpbin.org/post\", [], true, "
 "HTTPClient.METHOD_POST, body)\n"
@@ -37843,14 +37716,14 @@ msgstr ""
 "HTTPRequest:[/b]\n"
 "[codeblock]\n"
 "func _ready():\n"
-"    # Créer un nœud de requête HTTP et le connecter au signal de "
-"complétion.\n"
+"    # Créer un nœud de requête HTTP et le connecter au signal de complétion."
+"\n"
 "    var http_request = HTTPRequest.new()\n"
 "    add_child(http_request)\n"
 "    http_request.connect(\"request_completed\", self, "
 "\"_http_request_completed\")\n"
 "\n"
-"    # Lancer une requête HTTP. L'URL en-dessous retourne une image PNG au "
+"    # Lancer une requête HTTP. L'URL en dessous retourne une image PNG au "
 "moment de l'écriture de ce tutoriel.\n"
 "    var error = http_request.request(\"https://via.placeholder.com/512\")\n"
 "    if error != OK:\n"
@@ -37957,11 +37830,12 @@ msgid ""
 msgstr ""
 
 #: doc/classes/HTTPRequest.xml
-#, fuzzy
 msgid ""
 "Maximum number of allowed redirects. This is used to prevent endless "
 "redirect loops."
-msgstr "Nombre maximal de redirections autorisées."
+msgstr ""
+"Le nombre maximal de redirections autorisées. C'est utilisé pour éviter les "
+"redirections infinies."
 
 #: doc/classes/HTTPRequest.xml
 msgid ""
@@ -38175,9 +38049,8 @@ msgid "Fills [code]rect[/code] with [code]color[/code]."
 msgstr "Remplis le [code]rect[/code] avec la [code]color[/code]."
 
 #: doc/classes/Image.xml
-#, fuzzy
 msgid "Blends low-alpha pixels with nearby pixels."
-msgstr "Mélange les pixels à faible alpha avec les pixels à proximité."
+msgstr "Mélange les pixels à faible opacité avec ceux proches."
 
 #: doc/classes/Image.xml
 msgid "Flips the image horizontally."
@@ -38959,9 +38832,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/ImageTexture.xml
-#, fuzzy
 msgid "Returns the format of the texture, one of [enum Image.Format]."
-msgstr "Renvoie l'inverse de la racine carrée du paramètre."
+msgstr ""
 
 #: doc/classes/ImageTexture.xml
 msgid ""
@@ -39206,11 +39078,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Input.xml
-#, fuzzy
 msgid ""
 "Returns the current value of the joypad axis at given index (see [enum "
 "JoystickList])."
-msgstr "Retourne l'état actuel de ce canal, voir [enum ChannelState]."
+msgstr ""
 
 #: doc/classes/Input.xml
 msgid "Returns the index of the provided axis name."
@@ -39510,10 +39381,9 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Input.xml
-#, fuzzy
 msgid "Controls the mouse mode. See [enum MouseMode] for more information."
 msgstr ""
-"Définit le mode de la souris. Voir les constantes pour plus d'informations."
+"Définit le mode de la souris. Voir [enum MouseMode] pour plus d'informations."
 
 #: doc/classes/Input.xml
 msgid ""
@@ -39830,9 +39700,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/InputEventAction.xml
-#, fuzzy
 msgid "InputEvent: Actions"
-msgstr "Type d’évènement d’entrée pour les actions."
+msgstr "Évènements d’entrée : les actions"
 
 #: doc/classes/InputEventAction.xml
 msgid "The action's name. Actions are accessed via this [String]."
@@ -40011,9 +39880,8 @@ msgid "Wikipedia General MIDI Instrument List"
 msgstr ""
 
 #: doc/classes/InputEventMIDI.xml
-#, fuzzy
 msgid "Wikipedia Piano Key Frequencies List"
-msgstr "https://en.wikipedia.org/wiki/Piano_key_frequencies#List"
+msgstr "La liste des fréquences des touches de piano sur Wikipédia"
 
 #: doc/classes/InputEventMIDI.xml
 msgid ""
@@ -40187,12 +40055,12 @@ msgid "Mouse and input coordinates"
 msgstr "Les coordonnées de la souris"
 
 #: doc/classes/InputEventMouseMotion.xml
-#, fuzzy
 msgid ""
 "Returns [code]true[/code] when using the eraser end of a stylus pen.\n"
 "[b]Note:[/b] This property is implemented on Linux, macOS and Windows."
 msgstr ""
-"Retourne le nombre de disposition de clavier.\n"
+"Retourne [code]true[/code] lors de l'utilisation de la gomme (l'autre "
+"extrémité) d'un stylet.\n"
 "[b]Note :[/b] Cette méthode est implémentée sous Linux, macOS et Windows."
 
 #: doc/classes/InputEventMouseMotion.xml
@@ -40554,11 +40422,11 @@ msgstr ""
 "automatiquement."
 
 #: doc/classes/InterpolatedCamera.xml
-#, fuzzy
 msgid ""
 "The camera's process callback. See [enum InterpolatedCameraProcessMode]."
 msgstr ""
-"La méthode de mise à jour de la camera. Voir [enum Camera2DProcessMode]."
+"La méthode de mise à jour de la camera. Voir [enum "
+"InterpolatedCameraProcessMode]."
 
 #: doc/classes/InterpolatedCamera.xml
 msgid ""
@@ -41824,14 +41692,14 @@ msgid ""
 msgstr ""
 
 #: doc/classes/KinematicBody.xml doc/classes/KinematicBody2D.xml
-#, fuzzy
 msgid ""
 "Returns the number of times the body collided and changed direction during "
 "the last call to [method move_and_slide] or [method "
 "move_and_slide_with_snap]."
 msgstr ""
-"Renvoie le nombre de fois où le corps est entré en collision et a changé de "
-"direction au cours du dernier appel vers [method move_and_slide]."
+"Retourne le nombre de fois où le corps est entré en collision et a changé de "
+"direction au cours du dernier appel vers [method move_and_slide] ou [method "
+"move_and_slide_with_snap]."
 
 #: doc/classes/KinematicBody.xml doc/classes/KinematicBody2D.xml
 msgid ""
@@ -42433,9 +42301,8 @@ msgid "Background [StyleBox] for the [Label]."
 msgstr "Le [StyleBox] d'arrière-plan pour le [Label]."
 
 #: doc/classes/Label3D.xml
-#, fuzzy
 msgid "Displays plain text in a 3D world."
-msgstr "NÅ“ud de sprite en 2D dans un monde en 3D."
+msgstr "Affiche du texte dans un monde en 3D."
 
 #: doc/classes/Label3D.xml
 msgid ""
@@ -42450,62 +42317,50 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Label3D.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], the specified flag will be enabled. See [enum Label3D."
 "DrawFlags] for a list of flags."
 msgstr ""
-"Si [code]true[/code], active l'option donné. Voir [enum Flags] pour ces "
-"options."
+"Si [code]true[/code], active le drapeau spécifié. Voir [enum Label3D."
+"DrawFlags] pour la liste des drapeaux."
 
 #: doc/classes/Label3D.xml
-#, fuzzy
 msgid ""
 "The alpha cutting mode to use for the sprite. See [enum AlphaCutMode] for "
 "possible values."
 msgstr ""
-"Le mode d'orientation de la TileMap. Voir [enum Mode] pour les valeurs "
-"possibles."
 
 #: doc/classes/Label3D.xml doc/classes/SpatialMaterial.xml
 msgid "Threshold at which the alpha scissor will discard values."
 msgstr "Le seuil à partir duquel le ciseau alpha ignorera les valeurs."
 
 #: doc/classes/Label3D.xml
-#, fuzzy
 msgid "If [code]true[/code], wraps the text to the [member width]."
-msgstr "Si [code]true[/code], cache la ligne à l'index spécifié."
+msgstr ""
 
 #: doc/classes/Label3D.xml
-#, fuzzy
 msgid ""
 "The billboard mode to use for the label. See [enum SpatialMaterial."
 "BillboardMode] for possible values."
 msgstr ""
-"La direction de remplissage. Voir [enum FillMode] pour les valeurs possibles."
 
 #: doc/classes/Label3D.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], text can be seen from the back as well, if "
 "[code]false[/code], it is invisible when looking at it from behind."
 msgstr ""
-"Si [code]true[/code], la ligne sera verticale. Si [code]false[/code], elle "
-"sera horizontale."
 
 #: doc/classes/Label3D.xml doc/classes/SpriteBase3D.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], the label is rendered at the same size regardless of "
 "distance."
 msgstr ""
-"Si [code]true[/code], l'objet est affiché à la même taille indépendamment de "
-"sa distance à la caméra."
+"Si [code]true[/code], le label est affiché à la même taille indépendamment "
+"de sa distance à la caméra."
 
 #: doc/classes/Label3D.xml
-#, fuzzy
 msgid "[Font] used for the [Label3D]'s text."
-msgstr "[Font] utilisée pour le texte du [Label]."
+msgstr "La [Font] utilisée pour le texte du [Label3D]."
 
 #: doc/classes/Label3D.xml
 msgid ""
@@ -42516,14 +42371,13 @@ msgstr ""
 "droite. Réglez-le à l'une des constantes de [enum Align]."
 
 #: doc/classes/Label3D.xml
-#, fuzzy
 msgid "Vertical space between lines in multiline [Label3D]."
-msgstr "L'espace vertical entre les lignes en multiligne [Label]."
+msgstr ""
+"L'espacement vertical entre les lignes en mode multi-ligne d'un [Label3D]."
 
 #: doc/classes/Label3D.xml
-#, fuzzy
 msgid "Text [Color] of the [Label3D]."
-msgstr "La [Color] par défaut du texte du [Label]."
+msgstr "La [Color] du texte du [Label3D]."
 
 #: doc/classes/Label3D.xml doc/classes/SpatialMaterial.xml
 #: doc/classes/SpriteBase3D.xml
@@ -42535,17 +42389,14 @@ msgstr ""
 "sera dessiné suivant son ordre de rendu et non suivant sa distance."
 
 #: doc/classes/Label3D.xml
-#, fuzzy
 msgid "The text drawing offset (in pixels)."
-msgstr "Le décalage du dessin de la texture."
+msgstr ""
 
 #: doc/classes/Label3D.xml
-#, fuzzy
 msgid "The tint of [Font]'s outline."
-msgstr "La hauteur du cylindre."
+msgstr "Le teinte du contour de la [Font]."
 
 #: doc/classes/Label3D.xml
-#, fuzzy
 msgid ""
 "Sets the render priority for the text outline. Higher priority objects will "
 "be sorted in front of lower priority objects.\n"
@@ -42556,23 +42407,21 @@ msgid ""
 "This is because opaque objects are not sorted, while transparent objects are "
 "sorted from back to front (subject to priority)."
 msgstr ""
-"Définit la priorité de rendu pour la bordure du texte. Des objets plus "
-"prioritaires seront affichés par-dessus des objets moins inférieurs.\n"
-"[b]Note: [/b] Cela ne s'applique que si [member alpha_cut] est défini à "
-"[constant ALPHA_CUT_DISABLED] (c'est la valeur par défaut).\n"
+"Définit la priorité de rendu pour la bordure du texte. Les objets les plus "
+"prioritaires seront affichés par-dessus des objets les moins prioritaires.\n"
+"[b]Note :[/b] Cela ne s'applique que si [member alpha_cut] est défini à ["
+"constant ALPHA_CUT_DISABLED] (c'est la valeur par défaut).\n"
 "[b]Note :[/b] Cela ne s'applique qu'au tri des objets transparents. Cela "
 "n'affectera pas la façon dont les objets transparents sont triés par rapport "
 "aux objets opaques. C'est parce que les objets opaques ne sont pas triés, "
-"alors que les objets transparents sont triés de l'arrière à l'avant (et "
+"alors que les objets transparents sont triés de l'arrière vers l'avant (et "
 "suivant leur priorité)."
 
 #: doc/classes/Label3D.xml
-#, fuzzy
 msgid "The size of one pixel's width on the label to scale it in 3D."
-msgstr "La taille d'un des pixels de la sprite pour définir sa taille en 3D."
+msgstr "La taille d'un des pixels du label pour définir sa taille en 3D."
 
 #: doc/classes/Label3D.xml
-#, fuzzy
 msgid ""
 "Sets the render priority for the text. Higher priority objects will be "
 "sorted in front of lower priority objects.\n"
@@ -42583,22 +42432,21 @@ msgid ""
 "This is because opaque objects are not sorted, while transparent objects are "
 "sorted from back to front (subject to priority)."
 msgstr ""
-"Définit la priorité de rendu pour le texte. Des objets plus prioritaires "
-"seront affichés par-dessus des objets moins inférieurs.\n"
-"[b]Note: [/b] Cela ne s'applique que si [member alpha_cut] est défini à "
-"[constant ALPHA_CUT_DISABLED] (c'est la valeur par défaut).\n"
+"Définit la priorité de rendu pour le texte. Les objets les plus prioritaires "
+"seront affichés par-dessus des objets les moins prioritaires.\n"
+"[b]Note :[/b] Cela ne s'applique que si [member alpha_cut] est défini à ["
+"constant ALPHA_CUT_DISABLED] (c'est la valeur par défaut).\n"
 "[b]Note :[/b] Cela ne s'applique qu'au tri des objets transparents. Cela "
 "n'affectera pas la façon dont les objets transparents sont triés par rapport "
 "aux objets opaques. C'est parce que les objets opaques ne sont pas triés, "
-"alors que les objets transparents sont triés de l'arrière à l'avant (et "
+"alors que les objets transparents sont triés de l'arrière vers l'avant (et "
 "suivant leur priorité)."
 
 #: doc/classes/Label3D.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], the [Light] in the [Environment] has effects on the "
 "label."
-msgstr "Si [code]true[/code], ce [HTTPClient] a une réponse disponible."
+msgstr ""
 
 #: doc/classes/Label3D.xml
 msgid ""
@@ -42615,18 +42463,16 @@ msgstr ""
 "l'alignement de remplissage."
 
 #: doc/classes/Label3D.xml
-#, fuzzy
 msgid "If set, lights in the environment affect the label."
-msgstr "Si [code]true[/code], ce [HTTPClient] a une réponse disponible."
+msgstr ""
 
 #: doc/classes/Label3D.xml
-#, fuzzy
 msgid ""
 "If set, text can be seen from the back as well. If not, the text is "
 "invisible when looking at it from behind."
 msgstr ""
-"Si défini, le texte sera aussi visible de derrière. Sinon, le texture n'est "
-"invisible que de face."
+"Si défini, le texte sera aussi visible de derrière. Sinon, la texture ne "
+"sera visible que de face."
 
 #: doc/classes/Label3D.xml doc/classes/SpatialMaterial.xml
 #: doc/classes/SpriteBase3D.xml
@@ -42738,9 +42584,8 @@ msgid "Returns the offset of the piece with the index [code]idx[/code]."
 msgstr "Retourne le décalage de la pièce à l'index [code]idx[/code]."
 
 #: doc/classes/LargeTexture.xml
-#, fuzzy
 msgid "Returns the [Texture] of the piece with the index [code]idx[/code]."
-msgstr "Retourne la position du point à l'index [code]point[/code]."
+msgstr ""
 
 #: doc/classes/LargeTexture.xml
 msgid ""
@@ -42751,12 +42596,10 @@ msgstr ""
 "code]."
 
 #: doc/classes/LargeTexture.xml
-#, fuzzy
 msgid ""
 "Sets the [Texture] of the piece with index [code]idx[/code] to "
 "[code]texture[/code]."
 msgstr ""
-"Déplace l’élément de l’index [code]from_idx[/code] à [code]to_idx[/code]."
 
 #: doc/classes/LargeTexture.xml
 msgid "Sets the size of this [LargeTexture]."
@@ -42908,7 +42751,7 @@ msgstr ""
 "utile lorsque vous avez un maillage plat qui a une lumière derrière elle. Si "
 "vous avez besoin de lancer une ombre sur les deux côtés du maillage, "
 "définissez le maillage pour utiliser les deux faces avec [constant "
-"GeometryInstance.SHADOW_CASTING_SETTING_DOUBLE_SIDED]"
+"GeometryInstance.SHADOW_CASTING_SETTING_DOUBLE_SIDED]."
 
 #: doc/classes/Light.xml
 msgid "Constant for accessing [member light_energy]."
@@ -43109,7 +42952,6 @@ msgstr ""
 "les Light2D."
 
 #: doc/classes/Light2D.xml
-#, fuzzy
 msgid "Shadow buffer size."
 msgstr "Taille du tampon d'ombre."
 
@@ -43275,7 +43117,7 @@ msgstr ""
 "polygone à la fois. Pour augmenter cette limite, ouvrez les paramètres du "
 "projet et augmentez [member ProjectSettings.rendering/limits/buffers/"
 "canvas_polygon_buffer_size_kb] et [member ProjectSettings.rendering/limits/"
-"buffers/canvas_polygon_index_buffer_size_kb]"
+"buffers/canvas_polygon_index_buffer_size_kb]."
 
 #: doc/classes/Line2D.xml
 msgid ""
@@ -43335,6 +43177,19 @@ msgid ""
 "perform antialiasing. 2D batching is also still supported with those "
 "antialiased lines."
 msgstr ""
+"Si [code]true[/code], la bordure de la ligne essayera d'activer "
+"anticrénelage en dessinant de fines lignes en OpenGL sur les bords de la "
+"ligne.\n"
+"[b]Note :[/b] Line2D n'est pas accéléré par lots si [code]antialiased[/code] "
+"est [code]true[/code].\n"
+"[b]Note :[/b] En raison de son fonctionnement, l'anticrénelage calculé en "
+"interne n'est pas correct pour les lignes semi-transparents voire peut ne "
+"pas fonctionner sur certaines plateformes. Vous pouvez corriger ce problème "
+"en installant le greffon [url=https://github.com/godot-extended-libraries/"
+"godot-antialiased-line2d]Antialiased Line2D[/url] puis créez un nœud "
+"\"AntialiasedPolygon2D\". Ce nœud utilise des texture avec des mipmaps "
+"personnalisés pour afficher l'anticrénelage. L'accélération par lot est "
+"toujours supporté même avec les lignes avec anticrénelage."
 
 #: doc/classes/Line2D.xml
 msgid ""
@@ -43361,6 +43216,8 @@ msgid ""
 "The gradient is drawn through the whole line from start to finish. The "
 "default color will not be used if a gradient is set."
 msgstr ""
+"Le dégradé est dessiné par toute la ligne du début à la fin. La couleur par "
+"défaut ne sera pas utilisée si un dégradé est défini."
 
 #: doc/classes/Line2D.xml
 msgid "The style for the points between the start and the end."
@@ -43371,6 +43228,9 @@ msgid ""
 "The points that form the lines. The line is drawn between every point set in "
 "this array. Points are interpreted as local vectors."
 msgstr ""
+"Les points qui forment les lignes. La ligne est tracée entre chaque point "
+"défini dans ce tableau. Les points sont interprétés comme des vecteurs "
+"locaux."
 
 #: doc/classes/Line2D.xml
 msgid ""
@@ -43381,24 +43241,37 @@ msgid ""
 "width]. For thin lines, this value should be reduced to a number between "
 "[code]2[/code] and [code]4[/code] to improve performance."
 msgstr ""
+"Le lissage des coins et des bouts. Les valeurs plus élevées affichent des "
+"coins plus lisses, mais demandent plus de ressources pour le rendu. Ceci "
+"n'est utilisé que si un coin ou un bout est défini comme arrondi.\n"
+"[b]Note :[/b] La valeur par défaut est réglée pour les lignes avec la "
+"largeur [member width] par défaut. Pour les lignes fines, cette valeur "
+"devrait être réduite à entre [code]2[/code] et [code]4[/code] pour améliorer "
+"les performances."
 
 #: doc/classes/Line2D.xml
 msgid ""
 "The direction difference in radians between vector points. This value is "
 "only used if [member joint_mode] is set to [constant LINE_JOINT_SHARP]."
 msgstr ""
+"La différence de direction entre les points vectoriels. Cette valeur n'est "
+"utilisée que si [member joint_mode] est [constant LINE_JOINT_SHARP]."
 
 #: doc/classes/Line2D.xml
 msgid ""
 "The texture used for the line's texture. Uses [code]texture_mode[/code] for "
 "drawing style."
 msgstr ""
+"La texture utilisée pour la texture de la ligne. Utilise "
+"[code]texture_mode[/code] pour le style de dessin."
 
 #: doc/classes/Line2D.xml
 msgid ""
 "The style to render the [code]texture[/code] on the line. Use [enum "
 "LineTextureMode] constants."
 msgstr ""
+"Le style de rendu de la [code]texture[/code] sur la ligne. Utilisez une des "
+"constantes [enum LineTextureMode]."
 
 #: doc/classes/Line2D.xml
 msgid "The line's width."
@@ -43409,12 +43282,16 @@ msgid ""
 "The line's width varies with the curve. The original width is simply "
 "multiply by the value of the Curve."
 msgstr ""
+"La largeur de la ligne dépend selon la courbe. La largeur originale est "
+"simplement multipliée par la valeur de la Curve."
 
 #: doc/classes/Line2D.xml
 msgid ""
 "The line's joints will be pointy. If [code]sharp_limit[/code] is greater "
 "than the rotation of a joint, it becomes a bevel joint instead."
 msgstr ""
+"Les coins de la ligne sont pointus. Si [code]sharp_limit[/code] est plus "
+"grand que l'angle d'un coin, ça devient un biseau."
 
 #: doc/classes/Line2D.xml
 msgid "The line's joints will be bevelled/chamfered."
@@ -43422,7 +43299,7 @@ msgstr ""
 
 #: doc/classes/Line2D.xml
 msgid "The line's joints will be rounded."
-msgstr ""
+msgstr "Les coins de la ligne seront arrondis."
 
 #: doc/classes/Line2D.xml
 msgid "Don't draw a line cap."
@@ -43440,6 +43317,7 @@ msgstr "Dessine le bout de la ligne avec un arrondi."
 msgid ""
 "Takes the left pixels of the texture and renders it over the whole line."
 msgstr ""
+"Utilise les pixels de gauche de la texture pour le rendu de toute la ligne."
 
 #: doc/classes/Line2D.xml
 msgid ""
@@ -43452,10 +43330,12 @@ msgid ""
 "Stretches the texture across the line. Import the texture with [b]Repeat[/b] "
 "disabled for best results."
 msgstr ""
+"Étire la texture à travers la ligne. Importez la texture avec la "
+"[b]répétition[/b] désactivée pour de meilleurs résultats."
 
 #: doc/classes/LineEdit.xml
 msgid "Control that provides single-line string editing."
-msgstr ""
+msgstr "Le Control qui fournit l'édition d'un texte d'une seule ligne."
 
 #: doc/classes/LineEdit.xml
 msgid ""
@@ -43543,6 +43423,9 @@ msgid ""
 "[code]from_column[/code] to [code]to_column[/code]. Both parameters should "
 "be within the text's length."
 msgstr ""
+"Supprime une section du [member text] allant de la position "
+"[code]from_column[/code] à [code]to_column[/code]. Les deux paramètres "
+"doivent être de la longueur du texte."
 
 #: doc/classes/LineEdit.xml doc/classes/RichTextLabel.xml
 msgid "Clears the current selection."
@@ -43556,12 +43439,19 @@ msgid ""
 "may cause a crash. If you wish to hide it or any of its children, use their "
 "[member CanvasItem.visible] property."
 msgstr ""
+"Retourne le [PopupMenu] de ce [LineEdit]. Par défaut, ce menu s'affiche "
+"lorsque le clic-droit sur le [LineEdit].\n"
+"[b]Avertissement :[/b] Il s'agit d'un nœud interne requis, le retirer et le "
+"supprimer peut causer un plantage. Si vous voulez le cacher, lui ou un de "
+"ses enfants, utilisez la propriété [member CanvasItem.visible]."
 
 #: doc/classes/LineEdit.xml
 msgid ""
 "Returns the scroll offset due to [member caret_position], as a number of "
 "characters."
 msgstr ""
+"Retourne le décalage du défilement suivant [member caret_position], en tant "
+"que nombre de caractères."
 
 #: doc/classes/LineEdit.xml doc/classes/TextEdit.xml
 msgid "Returns the selection begin column."
@@ -43572,9 +43462,8 @@ msgid "Returns the selection end column."
 msgstr "Retourne la colonne de fin de sélection."
 
 #: doc/classes/LineEdit.xml
-#, fuzzy
 msgid "Returns [code]true[/code] if the user has selected text."
-msgstr "Retourne [code]true[/code] si le minuteur est arrêté."
+msgstr "Retourne [code]true[/code] si l'utilisateur a sélectionné du texte."
 
 #: doc/classes/LineEdit.xml
 msgid "Executes a given action as defined in the [enum MenuItems] enum."
@@ -43642,13 +43531,12 @@ msgstr "Si [code]true[/code], le menu contextuel apparaitra au clic-droit."
 
 #: doc/classes/LineEdit.xml doc/classes/RichTextLabel.xml
 #: doc/classes/TextEdit.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], the selected text will be deselected when focus is "
 "lost."
 msgstr ""
-"Si [code]true[/code], la cellule actuellement sélectionnée peut être "
-"sélectionnée à nouveau."
+"Si [code]true[/code], le texte actuellement sélectionné sera désélectionné "
+"quand le focus sera perdu."
 
 #: doc/classes/LineEdit.xml
 msgid ""
@@ -44366,35 +44254,58 @@ msgid ""
 "add_constant_override(\"margin_right\", margin_value)\n"
 "[/codeblock]"
 msgstr ""
+"Ajoute une marge supérieure, gauche, inférieure et droite à tous les nœuds "
+"[Control] qui sont des enfants directs du conteneur. Pour contrôler la marge "
+"du [MarginContainer], utilisez les propriétés [code]margin_*[/code] du "
+"thèmes listées ci-dessous.\n"
+"[b]Note :[/b] Soyez prudent, les valeurs des marges de [Control] sont "
+"différentes des valeurs de marge constante. Si vous souhaitez modifier les "
+"valeurs de marge personnalisées du [MarginContainer] par code, vous devez "
+"utiliser les exemples suivants :\n"
+"[codeblock]\n"
+"# Cet exemple suppose que ce script hérite de MarginContainer.\n"
+"var margin_value = 100\n"
+"add_constant_override(\"margin_top\", margin_value)\n"
+"add_constant_override(\"margin_left\", margin_value)\n"
+"add_constant_override(\"margin_bottom\", margin_value)\n"
+"add_constant_override(\"margin_right\", margin_value)\n"
+"[/codeblock]"
 
 #: doc/classes/MarginContainer.xml
 msgid ""
 "All direct children of [MarginContainer] will have a bottom margin of "
 "[code]margin_bottom[/code] pixels."
 msgstr ""
+"Tous les enfants directs de [MarginContainer] auront la marge du bas de "
+"[code]margin_bottom[/code] pixels."
 
 #: doc/classes/MarginContainer.xml
 msgid ""
 "All direct children of [MarginContainer] will have a left margin of "
 "[code]margin_left[/code] pixels."
 msgstr ""
+"Tous les enfants directs de [MarginContainer] auront la marge gauche de "
+"[code]margin_left[/code] pixels."
 
 #: doc/classes/MarginContainer.xml
 msgid ""
 "All direct children of [MarginContainer] will have a right margin of "
 "[code]margin_right[/code] pixels."
 msgstr ""
+"Tous les enfants directs de [MarginContainer] auront la marge droite de "
+"[code]margin_right[/code] pixels."
 
 #: doc/classes/MarginContainer.xml
 msgid ""
 "All direct children of [MarginContainer] will have a top margin of "
 "[code]margin_top[/code] pixels."
 msgstr ""
+"Tous les enfants directs de [MarginContainer] auront la marge du haut de "
+"[code]margin_top[/code] pixels."
 
 #: doc/classes/Marshalls.xml
-#, fuzzy
 msgid "Data transformation (marshalling) and encoding helpers."
-msgstr "Transformation de données (marshalling) et assistants d'encodage."
+msgstr "Transformation de données (\"marshalling\") et assistants d'encodage."
 
 #: doc/classes/Marshalls.xml
 msgid "Provides data transformation and encoding utility functions."
@@ -44403,13 +44314,12 @@ msgstr ""
 "données."
 
 #: doc/classes/Marshalls.xml
-#, fuzzy
 msgid ""
 "Returns a decoded [PoolByteArray] corresponding to the Base64-encoded string "
 "[code]base64_str[/code]."
 msgstr ""
-"Renvoie un [PoolByteArray] décodé correspondant à la chaîne de caractères "
-"encodée en Base64 [code]base64_str[/code]."
+"Retourne un [PoolByteArray] décodé correspondant à la chaîne de caractères "
+"[code]base64_str[/code] encodée en Base64."
 
 #: doc/classes/Marshalls.xml
 msgid ""
@@ -44981,6 +44891,9 @@ msgid ""
 "Uses specified surface of given [Mesh] to populate data for MeshDataTool.\n"
 "Requires [Mesh] with primitive type [constant Mesh.PRIMITIVE_TRIANGLES]."
 msgstr ""
+"Utiliser la surface spécifiée de [Mesh] pour construire les données pour le "
+"MeshDataTool.\n"
+"Nécessite un [Mesh] de type primitif [constant Mesh.PRIMITIVE_TRIANGES]."
 
 #: doc/classes/MeshDataTool.xml
 msgid "Returns the number of edges in this [Mesh]."
@@ -45000,6 +44913,9 @@ msgid ""
 "Vertex argument can only be 0 or 1 because edges are comprised of two "
 "vertices."
 msgstr ""
+"Retourne l'index des sommet spécifiés reliés au bord donné.\n"
+"L'argument du sommet ne peut être que 0 ou 1 car les bords ne sont composés "
+"que de deux sommets."
 
 #: doc/classes/MeshDataTool.xml
 msgid "Returns the number of faces in this [Mesh]."
@@ -45010,6 +44926,9 @@ msgid ""
 "Returns specified edge associated with given face.\n"
 "Edge argument must be either 0, 1, or 2 because a face only has three edges."
 msgstr ""
+"Retourne le bord spécifié associé au face donné.\n"
+"L'argument du bord doit être soit 0, 1 ou 2 parce qu'une face n'a que trois "
+"bords."
 
 #: doc/classes/MeshDataTool.xml
 msgid "Returns the metadata associated with the given face."
@@ -45025,6 +44944,9 @@ msgid ""
 "Vertex argument must be either 0, 1, or 2 because faces contain three "
 "vertices."
 msgstr ""
+"Retourne le vertx spécifié du face donné.\n"
+"L'argument du sommet doit être soit 0, 1 ou 2 parce que les faces ne "
+"contiennent que trois sommets."
 
 #: doc/classes/MeshDataTool.xml
 msgid ""
@@ -45035,6 +44957,12 @@ msgid ""
 "ARRAY_FORMAT_NORMAL] is [code]2[/code].\n"
 "See [enum ArrayMesh.ArrayFormat] for a list of format flags."
 msgstr ""
+"Retourne le format du [Mesh]. Le format est un entier composé des drapeaux "
+"de format du [Mesh]. Par exemple, un maillage contenant à la fois des "
+"sommets et des normales retournerait un format de [code]3[/code] parce que ["
+"constant ArrayMesh.ARRAY_FORMAT_VERTEX] est [code]1[/code] et [constant "
+"ArrayMesh.ARRAY_FORMAT_NORMAL] est [code]2[/code].\n"
+"Voir [enum ArrayMesh.ArrayFormat] pour une liste de drapeaux de format."
 
 #: doc/classes/MeshDataTool.xml
 msgid "Returns the material assigned to the [Mesh]."
@@ -45149,6 +45077,13 @@ msgid ""
 "[Mesh] has to be instanced more than thousands of times at close proximity, "
 "consider using a [MultiMesh] in a [MultiMeshInstance] instead."
 msgstr ""
+"MeshInstance est un nœud qui prend une ressource [Mesh] et l'ajoute au "
+"scénario actuel en créant une instance. C'est la classe la plus souvent "
+"utilisée pour obtenir la géométrie 3D pour le rendu et peut être utilisé "
+"pour l'instance d'un seul [Mesh] dans de nombreux endroits. Cela permet de "
+"réutiliser la géométrie et d'économiser des ressources. Lorsqu'un [Mesh] "
+"doit être instancié plusieurs milliers de fois les uns proches des autres, "
+"préférez plutôt un [MultiMesh] dans un [MultiMeshInstance]."
 
 #: doc/classes/MeshInstance.xml
 msgid ""
@@ -45161,6 +45096,16 @@ msgid ""
 "If [code]simplify[/code] is [code]true[/code], the geometry can be further "
 "simplified to reduce the amount of vertices. Disabled by default."
 msgstr ""
+"Cette aide crée un nœud [StaticBody] enfant avec une forme de collision "
+"[ConvexPolygonShape] calculée à partir de la géométrie du maillage. Elle est "
+"principalement utilisée pour les essais.\n"
+"Si [code]clean[/code] est [code]true[/code] (par défaut), les doublons et "
+"les sommets intérieurs sont automatiquement supprimés. Vous pouvez le "
+"définir à [code]false[/code] pour rendre le processus de création plus "
+"rapide.\n"
+"Si [code]simplify[/code] est [code]true[/code], la géométrie pourra être "
+"simplifiée pour réduire la quantité de sommets, ce qui est désactivé par "
+"défaut."
 
 #: doc/classes/MeshInstance.xml
 msgid ""
@@ -45199,11 +45144,15 @@ msgid ""
 "[method Mesh.surface_get_material] to get materials associated with the "
 "[Mesh] resource."
 msgstr ""
+"Retourne la surcharge [Material] pour une surface de la ressource [Mesh].\n"
+"[b]Note :[/b] Cette fonction ne retourne que les matériaux associés à la "
+"[i]surchage[/i] de la [MeshInstance]. Préférez [method get_active_material] "
+"ou [method Mesh.surface_get_material] pour obtenir des matériaux associés à "
+"la ressource [Mesh]."
 
 #: doc/classes/MeshInstance.xml
-#, fuzzy
 msgid "Returns the number of surface override materials."
-msgstr "Retourne le nombre de surfaces du matériau."
+msgstr "Retourne le nombre de surcharges des surfaces du matériau."
 
 #: doc/classes/MeshInstance.xml
 msgid ""
@@ -45213,6 +45162,12 @@ msgid ""
 "In order to be mergeable, properties of the [MeshInstance] must match, and "
 "each surface must match, in terms of material, attributes and vertex format."
 msgstr ""
+"Retourne [code]true[/code] si cette [MeshInstance] peut être fusionnée avec "
+"l'autre instance [code]other_mesh_instance[/code], en utilisant la fonction ["
+"method MeshInstance.merge_meshes].\n"
+"Pour pouvoir être fusionnées, les propriétés des [MeshInstance] doivent "
+"correspondre, et chaque surface doit correspondre, en termes de matériau, "
+"d'attributs et de format des sommets."
 
 #: doc/classes/MeshInstance.xml
 msgid ""
@@ -45237,6 +45192,26 @@ msgid ""
 "Also note that any initial data in the destination [MeshInstance] data will "
 "be discarded."
 msgstr ""
+"Cette fonction peut fusionner les données de plusieurs [MeshInstance] "
+"sources en une seule [MeshInstance] finale (le MeshInstance sur laquel la "
+"fonction est appelée). Ceci est principalement utile pour améliorer les "
+"performances en réduisant le nombre de appels de dessin et de [Node].\n"
+"Le fusions ne doivent être faites que sur des maillages simples et ne "
+"contenant pas d'animation.\n"
+"Les sommets finaux peuvent soit être retournés dans l'espace global, soit "
+"dans l'espace local par rapport à la transformation globale de la "
+"[MeshInstance] finale (ce nœud doit être à l'intérieur du [SceneTree] pour "
+"l'espace local pour fonctionner).\n"
+"La fonction effectuera un contrôle final de compatibilité entre les "
+"[MeshInstance] par défaut, cela devrait toujours être utilisé à moins que "
+"vous n'ayez préalablement vérifié la compatibilité avec [method MeshInstance."
+"is_mergeable_with]. Si la vérification est ignorée et que les maillages sont "
+"fusionnés, vous pouvez voir des erreurs de rendu.\n"
+"[b]Note :[/b] Les exigences de similitude entre les maillages sont assez "
+"strictes. Elles peuvent être vérifiés avec [method MeshInstance."
+"is_mergeable_with], avant d'appeler [method MeshInstance.merge_meshes]\n"
+"Notez également que toutes les données initiales dans la [MeshInstance] "
+"finale seront supprimées."
 
 #: doc/classes/MeshInstance.xml
 msgid ""
@@ -45244,6 +45219,9 @@ msgid ""
 "resource. This material is associated with this [MeshInstance] rather than "
 "with the [Mesh] resource."
 msgstr ""
+"Définit la surcharge [Material] pour la surface spécifiée de la ressource "
+"[Mesh]. Ce matériel est associé à cette ressource [MeshInstance] plutôt qu'à "
+"la ressource [Mesh]."
 
 #: doc/classes/MeshInstance.xml
 msgid "The [Mesh] resource for the instance."
@@ -45336,9 +45314,8 @@ msgid "Returns the item's mesh."
 msgstr "Retourne le maillage de l'élément."
 
 #: doc/classes/MeshLibrary.xml
-#, fuzzy
 msgid "Returns the transform applied to the item's mesh."
-msgstr "Retourne la matrice de transformation de la toile de cet objet."
+msgstr ""
 
 #: doc/classes/MeshLibrary.xml
 msgid "Returns the item's name."
@@ -45381,9 +45358,8 @@ msgid "Sets the item's mesh."
 msgstr "Définit le maillage de l'élément."
 
 #: doc/classes/MeshLibrary.xml
-#, fuzzy
 msgid "Sets the transform to apply to the item's mesh."
-msgstr "Retourne la matrice de transformation de la toile de cet objet."
+msgstr ""
 
 #: doc/classes/MeshLibrary.xml
 msgid ""
@@ -45607,6 +45583,18 @@ msgid ""
 "(4 bytes as is) and [code]COLOR_FLOAT[/code] / [code]CUSTOM_DATA_FLOAT[/"
 "code] is stored as 4 floats."
 msgstr ""
+"Définit toutes les données relatives aux instances en une seule fois. Ceci "
+"est particulièrement utile lors du chargement des données du disque ou de la "
+"préparation des données de GDNative.\n"
+"Toutes les données sont empaquetées dans un grand tableau flottant. Un "
+"tableau peut ressembler à ceci : la Transform pour l'instance 1, les données "
+"de couleur pour l'instance 1, des données personnalisées pour l'instance 1, "
+"la Transform pour l'instance 2, les données de couleur pour l'instance 2, "
+"etc.\n"
+"[Transform] est enregistré avec 12 flottants, [Transform2D] avec 8 "
+"flottants, [code]COLOR_8BIT[/code] / [code]CUSTOM_DATA_8BIT[/code] avec 1 "
+"flottant (4 octets en général) et [code]COLOR_FLOAT[/code] / "
+"[code]CUSTOM_DATA_FLOAT[/code] avec 4 flottants."
 
 #: doc/classes/MultiMesh.xml
 msgid ""
@@ -45619,6 +45607,16 @@ msgid ""
 "When the order of instances is coherent, the simpler [method MultiMesh."
 "set_as_bulk_array] can still be used with interpolation."
 msgstr ""
+"Une version alternative de [method MultiMesh.set_as_bulk_array] qui peut "
+"être utilisée avec [i]l'interpolation physique[/i]. Cette méthode prend deux "
+"tableaux, et peut définir les données pour la trame actuelle et précédente "
+"en une seule fois. Le rendu interpolera automatiquement les données entre "
+"ces deux trames.\n"
+"Ceci est utile pour les situations où l'ordre des instances peut changer "
+"d'une trame physique à l'autre, comme les systèmes de particules.\n"
+"Lorsque l'ordre des instances est cohérent, la méthode [method MultiMesh."
+"set_as_bulk_array] plus simple peut encore être utilisée avec "
+"l'interpolation."
 
 #: doc/classes/MultiMesh.xml
 msgid ""
@@ -45628,6 +45626,11 @@ msgid ""
 "[code]null[/code] on the [MultiMesh] and [member SpatialMaterial."
 "vertex_color_use_as_albedo] is [code]true[/code] on the material."
 msgstr ""
+"Définit la couleur d'une instance spécifique en [i]multipliant[/i] les "
+"couleurs des sommets existants du maillage.\n"
+"Pour que la couleur soit modifiée, assurez-vous que [member color_format] "
+"n'est pas [code]null[/code] pour le [MultiMesh] et [member SpatialMaterial."
+"vertex_color_use_as_albedo] est [code]true[/code] dans le matériau."
 
 #: doc/classes/MultiMesh.xml
 msgid ""
@@ -45635,6 +45638,10 @@ msgid ""
 "just a container for 4 floating point numbers. The format of the number can "
 "change depending on the [enum CustomDataFormat] used."
 msgstr ""
+"Définit des données personnalisées pour une instance spécifique. Bien que "
+"[Color] soit utilisée, ce n'est qu'un conteneur pour 4 flottants qui peut "
+"servir à autre chose. Le format du nombre peut changer en fonction du [enum "
+"CustomDataFormat] utilisé."
 
 #: doc/classes/MultiMesh.xml
 msgid "Sets the [Transform] for a specific instance."
@@ -45646,11 +45653,11 @@ msgstr "Définit la [Transform2D] pour l'instance spécifiée."
 
 #: doc/classes/MultiMesh.xml
 msgid "Format of colors in color array that gets passed to shader."
-msgstr ""
+msgstr "Le format des couleurs dans le tableau de couleurs passé au shader."
 
 #: doc/classes/MultiMesh.xml
 msgid "Format of custom data in custom data array that gets passed to shader."
-msgstr ""
+msgstr "Le format des données personnalisées dans ce tableau passé au shader."
 
 #: doc/classes/MultiMesh.xml
 msgid ""
@@ -45658,6 +45665,9 @@ msgid ""
 "buffers. By default, all instances are drawn but you can limit this with "
 "[member visible_instance_count]."
 msgstr ""
+"Le nombre de cas qui seront affichés. Cela effacera et re-dimensionnera les "
+"mémoires tampons. Par défaut, toutes les instantes sont dessinées mais vous "
+"pouvez les limiter avec [member visible_instance_count]."
 
 #: doc/classes/MultiMesh.xml
 msgid "Mesh to be drawn."
@@ -45672,6 +45682,14 @@ msgid ""
 "special cases mentioned above, the quality should be comparable to high "
 "quality."
 msgstr ""
+"Choisis si vous utilisez une méthode d'interpolation qui favorise la vitesse "
+"ou la qualité.\n"
+"Lors de l'utilisation de faibles taux de trames physiques (généralement "
+"inférieur à 20) ou de taux élevés de rotation d'objets, vous pouvez obtenir "
+"de meilleurs résultats à partir du réglage de haute qualité.\n"
+"[b]Note :[/b] La qualité rapide ne correspond pas à la qualité basse. Sauf "
+"dans les cas particuliers mentionnés ci-dessus, la qualité devrait être "
+"comparable à la qualité."
 
 #: doc/classes/MultiMesh.xml
 msgid "Format of transform used to transform mesh, either 2D or 3D."
@@ -45684,6 +45702,8 @@ msgid ""
 "Limits the number of instances drawn, -1 draws all instances. Changing this "
 "does not change the sizes of the buffers."
 msgstr ""
+"Limite le nombre d'instances affichées, et -1 les dessine toutes. Changer "
+"cela ne change pas la taille des mémoires tampons."
 
 #: doc/classes/MultiMesh.xml
 msgid "Use this when using 2D transforms."
@@ -45702,12 +45722,17 @@ msgid ""
 "Compress [Color] data into 8 bits when passing to shader. This uses less "
 "memory and can be faster, but the [Color] loses precision."
 msgstr ""
+"Compresse les données [Color] en 8 bits quand elles seront passées au "
+"shader. Cela utilise moins de mémoire et peut être plus rapide, mais les "
+"[Color] perdent en précision."
 
 #: doc/classes/MultiMesh.xml
 msgid ""
 "The [Color] passed into [method set_instance_color] will use 4 floats. Use "
 "this for highest precision [Color]."
 msgstr ""
+"La [Color] passée dans [method set_instance_color] utilisera 4 flottants. "
+"Utilisez ceci pour la plus haute précision [Color]."
 
 #: doc/classes/MultiMesh.xml
 msgid "Use when you are not using per-instance custom data."
@@ -45899,12 +45924,16 @@ msgid ""
 "Emitted when this MultiplayerAPI's [member network_peer] successfully "
 "connected to a server. Only emitted on clients."
 msgstr ""
+"Émis lorsque le [member network_peer] de ce MultijoueurAPI est connecté avec "
+"succès à un serveur. Seulement émis aux clients."
 
 #: doc/classes/MultiplayerAPI.xml
 msgid ""
 "Emitted when this MultiplayerAPI's [member network_peer] fails to establish "
 "a connection to a server. Only emitted on clients."
 msgstr ""
+"Émis lorsque le [member network_peer] de ce MultijoueurAPI ne parvient pas à "
+"établir une connexion à un serveur. Seulement émis aux clients."
 
 #: doc/classes/MultiplayerAPI.xml
 msgid ""
@@ -45913,6 +45942,11 @@ msgid ""
 "clients connect to the same server. Upon connecting to a server, a client "
 "also receives this signal for the server (with ID being 1)."
 msgstr ""
+"Émis lorsque le [member network_peer] de ce MultiplayerAPI se connecte à un "
+"nouveau pair. L'identifiant est celui du nouveau pair. Les clients sont "
+"informés lorsque d'autres clients se connectent au même serveur. En se "
+"connectant à un serveur, un client reçoit également ce signal pour le "
+"serveur (avec identifiant étant à 1)."
 
 #: doc/classes/MultiplayerAPI.xml
 msgid ""
@@ -45920,6 +45954,9 @@ msgid ""
 "peer. Clients get notified when other clients disconnect from the same "
 "server."
 msgstr ""
+"Émis lorsque le [member network_peer] de ce MultiplayerAPI se déconnecte "
+"d'un pair. Les clients sont informés lorsque d'autres clients se "
+"déconnectent du même serveur."
 
 #: doc/classes/MultiplayerAPI.xml
 msgid ""
@@ -45927,12 +45964,18 @@ msgid ""
 "[code]packet[/code] with custom data (see [method send_bytes]). ID is the "
 "peer ID of the peer that sent the packet."
 msgstr ""
+"Émis lorsque le [member network_peer] de ce MultijoueurAPI reçoit un "
+"[code]packet[/code] avec des données personnalisées (voir [method "
+"send_bytes)]. L'identifiant est l'identifiant par les pairs de l'équipe qui "
+"a envoyé le paquet."
 
 #: doc/classes/MultiplayerAPI.xml
 msgid ""
 "Emitted when this MultiplayerAPI's [member network_peer] disconnects from "
 "server. Only emitted on clients."
 msgstr ""
+"Émis lorsque le [member network_peer] de ce MultijoueurAPI se déconnecte du "
+"serveur. Seulement émis sur les clients."
 
 #: doc/classes/MultiplayerAPI.xml
 msgid ""
@@ -45973,34 +46016,47 @@ msgid ""
 "[i]Deprecated.[/i] Use [constant RPC_MODE_PUPPET] instead. Analogous to the "
 "[code]slave[/code] keyword."
 msgstr ""
+"[i]Obsolète.[/i] Utilisez plutôt [constant RPC_MODE_PUPPET]. Similaire au "
+"mot-clé [code]slave[/code]."
 
 #: doc/classes/MultiplayerAPI.xml
 msgid ""
 "Behave like [constant RPC_MODE_REMOTE] but also make the call or property "
 "change locally. Analogous to the [code]remotesync[/code] keyword."
 msgstr ""
+"Se comporte comme [constant RPC_MODE_REMOTE] mais fait aussi l'appel ou le "
+"changement d'un propriété en local. Similaire au mot-clé "
+"[code]remotesync[/code]."
 
 #: doc/classes/MultiplayerAPI.xml
 msgid ""
 "[i]Deprecated.[/i] Use [constant RPC_MODE_REMOTESYNC] instead. Analogous to "
 "the [code]sync[/code] keyword."
 msgstr ""
+"[i]Obsolète.[/i] Utilisez plutôt [constant RPC_MODE_REMOTESYNC]. Similaire "
+"au mot-clé [code]sync[/code]."
 
 #: doc/classes/MultiplayerAPI.xml
 msgid ""
 "Behave like [constant RPC_MODE_MASTER] but also make the call or property "
 "change locally. Analogous to the [code]mastersync[/code] keyword."
 msgstr ""
+"Se comporte comme [constant RPC_MODE_MASTER] mais fait aussi l'appel ou le "
+"changement d'une propriété en local. Similaire au mot-clé "
+"[code]mastersync[/code]."
 
 #: doc/classes/MultiplayerAPI.xml
 msgid ""
 "Behave like [constant RPC_MODE_PUPPET] but also make the call or property "
 "change locally. Analogous to the [code]puppetsync[/code] keyword."
 msgstr ""
+"Se comporte comme [constant RPC_MODE_PUPPET] mais fait aussi l'appel ou le "
+"changement d'une propriété en local. Similaire au mot-clé "
+"[code]puppetsync[/code]."
 
 #: doc/classes/Mutex.xml
 msgid "A synchronization mutex (mutual exclusion)."
-msgstr ""
+msgstr "Un mutex de synchronisation (exclusion mutuelle)."
 
 #: doc/classes/Mutex.xml
 msgid ""
@@ -46117,6 +46173,9 @@ msgid ""
 "Returns the owner of the [NavigationMesh] which contains the navigation "
 "point closest to the point given. This is usually a [NavigationMeshInstance]."
 msgstr ""
+"Retourne le propriétaire du [NavigationMesh] qui contient le point de "
+"navigation le plus proche du point donné. C'est généralement une "
+"[NavigationMeshInstance]."
 
 #: doc/classes/Navigation.xml
 msgid ""
@@ -46127,9 +46186,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Navigation.xml
-#, fuzzy
 msgid "Returns the [RID] of the navigation map on the [NavigationServer]."
-msgstr "Retourne le [RID] de la énième forme d'une zone."
+msgstr ""
 
 #: doc/classes/Navigation.xml
 msgid ""
@@ -46141,6 +46199,13 @@ msgid ""
 "agent properties associated with each [NavigationMesh] (radius, height, "
 "etc.) are considered in the path calculation, otherwise they are ignored."
 msgstr ""
+"[i]Obsolète.[/i] Le nœud [Navigation] la méthode [method get_simple_path] "
+"sont obsolètes se seront retiré dans une prochaine version. Utilisez plutôt ["
+"method NavigationServer.map_get_path].\n"
+"Retourne le chemin entre deux points donnés. Les points sont des coordonées "
+"locales. Si [code]optimize[/code] est [code]true[/code] (par défaut), les "
+"propriétés de l'agent associées à chaque [NavigationMesh] (rayon, hauteur, "
+"etc.) sont considérés dans le calcul du chemin, sinon ils sont ignorés."
 
 #: doc/classes/Navigation.xml
 msgid "The cell height to use for fields."
@@ -46166,12 +46231,16 @@ msgid ""
 "Defines which direction is up. By default, this is [code](0, 1, 0)[/code], "
 "which is the world's \"up\" direction."
 msgstr ""
+"Définit la direction. Par défaut, il s'agit de [code](0, 1, 0)[/code], qui "
+"est la direction du haut (\"up\")."
 
 #: doc/classes/Navigation.xml doc/classes/Navigation2DServer.xml
 #: doc/classes/NavigationServer.xml
 msgid ""
 "Emitted when a navigation map is updated, when a region moves or is modified."
 msgstr ""
+"Émis quand une carte de navigation est mise à jour, ou quand une région se "
+"déplace ou est modifiée."
 
 #: doc/classes/Navigation2D.xml
 msgid "2D navigation and pathfinding node."
@@ -46220,9 +46289,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Navigation2DServer.xml
-#, fuzzy
 msgid "Server interface for low-level 2D navigation access."
-msgstr "Interface de serveur pour l'accès audio de bas niveau."
+msgstr ""
 
 #: doc/classes/Navigation2DServer.xml
 #, fuzzy
@@ -46260,16 +46328,16 @@ msgstr ""
 "de navigation. Ensemble, ces cartes définissent les aires navigables dans le "
 "monde 2D. Pour que deux régions soient connectées entre elles, elles doivent "
 "avoir une bordure en commun. Une bordure (\"edge\") est considérée connectée "
-"à une autre si elles ont deux sommets rapprochés de moins de la distance "
-"[member Navigation.edge_connection_margin].\n"
+"à une autre si elles ont deux sommets rapprochés de moins de la distance ["
+"member Navigation.edge_connection_margin].\n"
 "Pour utiliser le système d'évitement, vous devez utiliser des agents. Vous "
 "pouvez définir la vitesse cible d'un agent, puis le serveur émettra une "
 "méthode de rappel avec la vitesse modifiée.\n"
 "[b]Note :[/b] Le système d'évitement des collisions ignorent les régions. "
 "Utiliser la vitesse modifiée telle quelle peut déplacer un agent hors de la "
-"surface de navigable. C'est une limite du système d'évitement des collision, "
-"et certaines situations plus complexes peuvent nécessiter l'utilisation du "
-"moteur physique.\n"
+"surface de navigable. C'est une limite du système d'évitement des "
+"collisions, et certaines situations plus complexes peuvent nécessiter "
+"l'utilisation du moteur physique.\n"
 "Le serveur garde en mémoire tous les appels et les exécutent durant la phase "
 "de synchronisation. Cela veut dire que vous pouvez demander n'importe quel "
 "changement sur l'ensemble des cartes, via n'importe quel fil d'exécution, "
@@ -46284,11 +46352,12 @@ msgid ""
 "Returns the navigation map [RID] the requested [code]agent[/code] is "
 "currently assigned to."
 msgstr ""
+"Retourne le [RID] de la carte de navigation auquel le [code]agent[/code] "
+"spécifié est actuellement assigné."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
-#, fuzzy
 msgid "Returns [code]true[/code] if the map got changed the previous frame."
-msgstr "Renvoie [code]true[/code] si le chemin donné est filtré."
+msgstr ""
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
 msgid ""
@@ -46314,11 +46383,13 @@ msgid ""
 "navigation. The larger this number, the longer the running time of the "
 "simulation. If the number is too low, the simulation will not be safe."
 msgstr ""
+"Définit le nombre maximal d'autres agents que cet agent prend en compte dans "
+"la navigation. Plus ce nombre est grand, plus la durée de la simulation est "
+"longue. Si le nombre est trop bas, la simulation ne sera pas fiable."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
-#, fuzzy
 msgid "Sets the maximum speed of the agent. Must be positive."
-msgstr "Obtient le nom d'un entrée par son index."
+msgstr ""
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
 msgid ""
@@ -46326,11 +46397,14 @@ msgid ""
 "the navigation. The larger this number, the longer the running time of the "
 "simulation. If the number is too low, the simulation will not be safe."
 msgstr ""
+"Définit la distance maximale avec d'autres agents que cet agent prend en "
+"compte dans la navigation. Plus ce nombre est grand, plus la durée de la "
+"simulation est longue. Si le nombre est trop bas, la simulation ne sera pas "
+"fiable."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
-#, fuzzy
 msgid "Sets the position of the agent in world space."
-msgstr "Définit la position du nœud spécifié."
+msgstr ""
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
 msgid "Sets the radius of the agent."
@@ -46348,11 +46422,14 @@ msgid ""
 "agents, but the less freedom this agent has in choosing its velocities. Must "
 "be positive."
 msgstr ""
+"La quantité minimale de temps pour laquelle les vitesses de l'agent "
+"calculées par la simulation sont fiables pour les autres agents. Plus ce "
+"nombre est grand, plus tôt cet agent répondra à la présence d'autres agents, "
+"mais moins il aura de liberté pour choisir sa vitesse. Ça doit être positif."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
-#, fuzzy
 msgid "Sets the current velocity of the agent."
-msgstr "Définit le trame présentement visible de l'animation."
+msgstr ""
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
 msgid "Destroys the given RID."
@@ -46364,6 +46441,9 @@ msgid ""
 "returns both 2D and 3D created navigation maps as there is technically no "
 "distinction between them."
 msgstr ""
+"Retourne tous les [RID] des cartes de navigation créées sur le "
+"NavigationServer. Cela renvoie les cartes de navigation 2D et aussi 3D car "
+"il n'y a techniquement aucune distinction entre eux."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
 msgid "Create a new map."
@@ -46397,19 +46477,47 @@ msgid ""
 "but it can also introduce bugs if used inappropriately without much "
 "foresight."
 msgstr ""
+"Cette fonction force immédiatement la synchronisation de la navigation "
+"spécifiée par le [RID] spécifié par [code]map[/code]. Par défaut, les cartes "
+"de navigation ne sont synchronisées qu'à la fin de chaque trame physique. "
+"Cette fonction peut être utilisée pour calculer immédiatement tous les "
+"maillages de navigation et les connexions entre les régions de la carte de "
+"navigation. Cela permet d'interroger un chemin de navigation pour une carte "
+"modifiée immédiatement et dans la même trame (plusieurs fois si nécessaire)."
+"\n"
+"En raison de restrictions techniques, la file de commandes actuelle de "
+"NavigationServer sera exécutée aussitôt. Cela signifie que toutes les "
+"commandes de mise à jour en attente pour cette trame de physique seront "
+"exécutées, même celles destinées à d'autres cartes, régions et agents qui ne "
+"font pas partie de la carte spécifiée. Le calcul coûteux des maillages de "
+"navigation et des connexions de régions d'une carte ne sera fait que pour la "
+"carte spécifiée. D'autres cartes recevront la synchronisation normale à la "
+"fin de la trame physique. Si la carte spécifiée reçoit des changements après "
+"la mise à jour forcée, elle sera à nouveau mise à jour aussi bien lorsque "
+"les autres cartes recevront leur mise à jour.\n"
+"Le traitement d'évitement et l'envoi des signaux [code]safe_velocity[/code] "
+"ne sont pas affectés par cette fonction et continuent de se produire pour "
+"tous les cartes et agents à la fin de la trame physique.\n"
+"[b]Note :[/b] Une grande pouvoir implique une grande responsabilité. Cette "
+"fonction ne devrait être utilisée que par les utilisateurs qui savent "
+"vraiment ce qu'ils font et ont une bonne raison de l'utiliser. Pour "
+"effectuer une mise à jour immédiate d'une carte de navigation, il faut "
+"verrouiller le NavigationServer et exécuter toute la file de commandes du "
+"NavigationServer. Non seulement cela peut affecter sévèrement les "
+"performances du jeu, mais il peut également introduire des bugs si ça n'est "
+"pas fait avec le plus grand soin."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
 msgid ""
 "Returns all navigation agents [RID]s that are currently assigned to the "
 "requested navigation [code]map[/code]."
 msgstr ""
+"Retourne tous [RID] des agents de navigation qui sont actuellement affectés "
+"à la navigation [code]map[/code] spécifiée."
 
 #: doc/classes/Navigation2DServer.xml
-#, fuzzy
 msgid "Returns the map cell height. [b]Note:[/b] Currently not implemented."
 msgstr ""
-"Retourne l'actuelle ligne du fichier interprété (actuellement non "
-"implémenté)."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
 msgid "Returns the map cell size."
@@ -46428,12 +46536,16 @@ msgid ""
 "Returns the owner region RID for the point returned by [method "
 "map_get_closest_point]."
 msgstr ""
+"Retourne la région propriétaire du RID pour le point retourné par [method "
+"map_get_closest_point]."
 
 #: doc/classes/Navigation2DServer.xml
 msgid ""
 "Returns the edge connection margin of the map. The edge connection margin is "
 "a distance used to connect two regions."
 msgstr ""
+"Retourne la marge de raccordement du bord de la carte. La marge de "
+"raccordement est une distance utilisée pour relier deux régions."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
 msgid ""
@@ -46441,38 +46553,42 @@ msgid ""
 "[code]navigation_layers[/code] is a bitmask of all region layers that are "
 "allowed to be in the path."
 msgstr ""
+"Retourne le chemin de navigation pour atteindre la destination de l'origine. "
+"[code]navigation_layers[/code] est un bitmask de toutes les calques de la "
+"région qui sont autorisées à être dans le chemin."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
 msgid ""
 "Returns all navigation regions [RID]s that are currently assigned to the "
 "requested navigation [code]map[/code]."
 msgstr ""
+"Retourne toutes les régions de navigation [RID] qui sont actuellement "
+"affectées à la navigation demandée [code]map[/code]."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
-#, fuzzy
 msgid "Returns [code]true[/code] if the map is active."
-msgstr "Retourne [code]true[/code] si l'[AABB] est vide."
+msgstr ""
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
 msgid "Sets the map active."
 msgstr "Définit la carte comme active."
 
 #: doc/classes/Navigation2DServer.xml
-#, fuzzy
 msgid ""
 "Set the map cell height used to weld the navigation mesh polygons. [b]Note:[/"
 "b] Currently not implemented."
-msgstr "Définit le polygone de navigation de la tuile."
+msgstr ""
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
-#, fuzzy
 msgid "Set the map cell size used to weld the navigation mesh polygons."
-msgstr "Définit le polygone de navigation de la tuile."
+msgstr ""
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
 msgid ""
 "Set the map edge connection margin used to weld the compatible region edges."
 msgstr ""
+"Définit la marge de connexion de bord de la carte utilisée pour fusionner "
+"les bords compatibles de la région."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
 msgid "Creates a new region."
@@ -46484,6 +46600,8 @@ msgid ""
 "index between 0 and the return value of [method "
 "region_get_connections_count]."
 msgstr ""
+"Retourne le point de fin d'une porte de connexion. [code]connection[/code] "
+"est un indice entre 0 et la valeur de [method region_get_connections_count]."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
 msgid ""
@@ -46491,33 +46609,36 @@ msgid ""
 "an index between 0 and the return value of [method "
 "region_get_connections_count]."
 msgstr ""
+"Retourne le point de départ d'une porte de connexion. [code]connection[/code]"
+" est un indice entre 0 et la valeur de [method region_get_connections_count]."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
 msgid ""
 "Returns how many connections this [code]region[/code] has with other regions "
 "in the map."
 msgstr ""
+"Retourne le nombre de connexions ce [code]region[/code] a avec les autres "
+"régions de la carte."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
-#, fuzzy
 msgid "Returns the [code]enter_cost[/code] of this [code]region[/code]."
-msgstr "Retourne [code]true[/code] si le [code]signal[/code] donné existe."
+msgstr ""
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
 msgid ""
 "Returns the navigation map [RID] the requested [code]region[/code] is "
 "currently assigned to."
 msgstr ""
+"Retourne le [RID] de la carte de navigation à laquelle la [code]region[/code]"
+" spécifiée est actuellement assignée."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
-#, fuzzy
 msgid "Returns the region's navigation layers."
-msgstr "Retourne le maillage de navigation de l'élément."
+msgstr "Retourne les calques de navigation de la région."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
-#, fuzzy
 msgid "Returns the [code]travel_cost[/code] of this [code]region[/code]."
-msgstr "Retourne [code]true[/code] si le [code]signal[/code] donné existe."
+msgstr ""
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
 msgid ""
@@ -46551,16 +46672,12 @@ msgstr ""
 "le résultat peut être inattendu."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
-#, fuzzy
 msgid "Sets the [code]enter_cost[/code] for this [code]region[/code]."
 msgstr ""
-"Définit la [code]position[/code] du point avec l'identifiant [code]id[/code] "
-"spécifié."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
-#, fuzzy
 msgid "Sets the map for the region."
-msgstr "Retourne la hauteur du contenu."
+msgstr "Définit la carte de la région."
 
 #: doc/classes/Navigation2DServer.xml
 msgid ""
@@ -46569,24 +46686,19 @@ msgid ""
 msgstr ""
 "Définit les calques de navigation de la région. Cela permet de sélectionner "
 "les régions à partir d'une requête de chemin (en utilisant [method "
-"Navigation2DServer.map_get_path])"
+"Navigation2DServer.map_get_path])."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
-#, fuzzy
 msgid "Sets the navigation mesh for the region."
-msgstr "Définit le polygone de navigation de la tuile."
+msgstr "Définit le polygone de navigation de la région."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
-#, fuzzy
 msgid "Sets the global transformation for the region."
-msgstr "Retourne la matrice de transformation globale de cet élément."
+msgstr "Retourne la transformation globale de cette région."
 
 #: doc/classes/Navigation2DServer.xml doc/classes/NavigationServer.xml
-#, fuzzy
 msgid "Sets the [code]travel_cost[/code] for this [code]region[/code]."
 msgstr ""
-"Définit la [code]position[/code] du point avec l'identifiant [code]id[/code] "
-"spécifié."
 
 #: doc/classes/NavigationAgent.xml
 msgid "3D agent used in navigation for collision avoidance."
@@ -46714,23 +46826,20 @@ msgstr ""
 "la NavigationAgent."
 
 #: doc/classes/NavigationAgent.xml
-#, fuzzy
 msgid "Returns the [RID] of this agent on the [NavigationServer]."
-msgstr "Retourne le [RID] de la énième forme d'une zone."
+msgstr "Retourne le [RID] de cet agent dans le [NavigationServer]."
 
 #: doc/classes/NavigationAgent.xml doc/classes/NavigationAgent2D.xml
-#, fuzzy
 msgid ""
 "Returns the user-defined target location (set with [method "
 "set_target_location])."
-msgstr "Renvoie le mode de remplacement de l’espace pour la zone."
+msgstr ""
 
 #: doc/classes/NavigationAgent.xml doc/classes/NavigationAgent2D.xml
-#, fuzzy
 msgid ""
 "Returns [code]true[/code] if the navigation path's final location has been "
 "reached."
-msgstr "Renvoie [code]true[/code] si le chemin donné est filtré."
+msgstr ""
 
 #: doc/classes/NavigationAgent.xml doc/classes/NavigationAgent2D.xml
 msgid ""
@@ -46827,14 +46936,12 @@ msgstr ""
 "déplacer sur un plan horizontal."
 
 #: doc/classes/NavigationAgent.xml doc/classes/NavigationAgent2D.xml
-#, fuzzy
 msgid "The maximum number of neighbors for the agent to consider."
-msgstr "La valeur de luminance maximale pour l'exposition automatique."
+msgstr ""
 
 #: doc/classes/NavigationAgent.xml doc/classes/NavigationAgent2D.xml
-#, fuzzy
 msgid "The maximum speed that an agent can move."
-msgstr "Rotation maximale à travers la charnière."
+msgstr "La vitesse maximale à laquelle un agent peut se déplacer."
 
 #: doc/classes/NavigationAgent.xml
 msgid ""
@@ -46848,9 +46955,8 @@ msgstr ""
 "correspondant."
 
 #: doc/classes/NavigationAgent.xml doc/classes/NavigationAgent2D.xml
-#, fuzzy
 msgid "The distance to search for other agents."
-msgstr "L’instance n’a pas de type."
+msgstr ""
 
 #: doc/classes/NavigationAgent.xml doc/classes/NavigationAgent2D.xml
 msgid ""
@@ -46929,9 +47035,8 @@ msgstr ""
 "doit être positif."
 
 #: doc/classes/NavigationAgent.xml doc/classes/NavigationAgent2D.xml
-#, fuzzy
 msgid "Notifies when the final location is reached."
-msgstr "Avertit quand une animation commence à jouer."
+msgstr ""
 
 #: doc/classes/NavigationAgent.xml doc/classes/NavigationAgent2D.xml
 msgid ""
@@ -47008,9 +47113,8 @@ msgstr ""
 "navigation."
 
 #: doc/classes/NavigationAgent2D.xml
-#, fuzzy
 msgid "Returns the [RID] of this agent on the [Navigation2DServer]."
-msgstr "Retourne le [RID] de la énième forme d'une zone."
+msgstr "Retourne le [RID] de cet agent dans le [Navigation2DServer]."
 
 #: doc/classes/NavigationAgent2D.xml
 msgid ""
@@ -47090,11 +47194,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/NavigationMesh.xml
-#, fuzzy
 msgid ""
 "Returns whether the specified [code]bit[/code] of the [member "
 "geometry_collision_mask] is set."
-msgstr "Retourne si la [code]class[/code] spécifiée est disponible ou non."
+msgstr ""
 
 #: doc/classes/NavigationMesh.xml doc/classes/NavigationPolygon.xml
 msgid ""
@@ -47105,9 +47208,8 @@ msgstr ""
 "créé."
 
 #: doc/classes/NavigationMesh.xml
-#, fuzzy
 msgid "Returns the number of polygons in the navigation mesh."
-msgstr "Renvoie le nombre de points sur l'axe de mélange."
+msgstr ""
 
 #: doc/classes/NavigationMesh.xml
 msgid ""
@@ -47118,17 +47220,16 @@ msgstr ""
 "créé."
 
 #: doc/classes/NavigationMesh.xml
-#, fuzzy
 msgid ""
 "If [code]value[/code] is [code]true[/code], sets the specified [code]bit[/"
 "code] in the [member geometry_collision_mask].\n"
 "If [code]value[/code] is [code]false[/code], clears the specified [code]bit[/"
 "code] in the [member geometry_collision_mask]."
 msgstr ""
-"Si [code]value[/code] est [code]true[/code]], définit le [code]bit[/code] "
-"spécifié dans le masque [nom collision_mask].\n"
-"Si [code]value[/code] est [code]false[/code], rétablit le [code]bit[/code] "
-"spécifié dans le masque [nom collision_mask]."
+"Si [code]value[/code] est [code]true[/code], définit le [code]bit[/code] "
+"spécifié dans le masque [member geometry_collision_mask].\n"
+"Si [code]value[/code] est [code]false[/code], efface le [code]bit[/code] "
+"spécifié dans le masque [member geometry_collision_mask]."
 
 #: doc/classes/NavigationMesh.xml doc/classes/NavigationPolygon.xml
 msgid ""
@@ -47152,9 +47253,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/NavigationMesh.xml
-#, fuzzy
 msgid "The maximum slope that is considered walkable, in degrees."
-msgstr "Rotation maximale à travers la charnière."
+msgstr ""
 
 #: doc/classes/NavigationMesh.xml
 msgid ""
@@ -47203,9 +47303,8 @@ msgid "The position offset applied to the [member filter_baking_aabb] [AABB]."
 msgstr ""
 
 #: doc/classes/NavigationMesh.xml
-#, fuzzy
 msgid "If [code]true[/code], marks spans that are ledges as non-walkable."
-msgstr "Si [code]true[/code], les titres des colonnes sont visibles."
+msgstr ""
 
 #: doc/classes/NavigationMesh.xml
 msgid ""
@@ -47214,13 +47313,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/NavigationMesh.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], marks walkable spans as not walkable if the clearance "
 "above the span is less than [member agent_height]."
 msgstr ""
-"Si [code]true[/code], les particules sera émise une seule fois puis "
-"arrêtées. Équivalent à [member Particles.one_shot]."
 
 #: doc/classes/NavigationMesh.xml
 msgid ""
@@ -47489,18 +47585,16 @@ msgstr ""
 "geometry_source_geometry_mode] de la ressource [NavigationMesh]."
 
 #: doc/classes/NavigationMeshGenerator.xml
-#, fuzzy
 msgid ""
 "Removes all polygons and vertices from the provided [code]nav_mesh[/code] "
 "resource."
-msgstr "Supprime l’animation avec la touche [code]name[/code]."
+msgstr ""
 
 #: doc/classes/NavigationMeshInstance.xml
 msgid "An instance of a [NavigationMesh]."
 msgstr "Une instance de [NavigationMesh]."
 
 #: doc/classes/NavigationMeshInstance.xml
-#, fuzzy
 msgid ""
 "An instance of a [NavigationMesh]. It tells the [Navigation] node what can "
 "be navigated and what cannot, based on the [NavigationMesh] resource.\n"
@@ -47533,7 +47627,7 @@ msgstr ""
 "relier deux régions. Ils doivent partager un même bord.\n"
 "Le coût d'entrée dans cette région d'une autre région peut être contrôlé "
 "avec la valeur [member enter_cost].\n"
-"[b]Note : [/b] Cette valeur n'est pas ajoutée au coût du chemin lorsque la "
+"[b]Note :[/b] Cette valeur n'est pas ajoutée au coût du chemin lorsque la "
 "position de départ est déjà dans cette région.\n"
 "Le coût des distances de voyage dans cette région peut être contrôlé avec le "
 "multiplicateur [member travel_cost]."
@@ -47550,6 +47644,18 @@ msgid ""
 "operating systems that cannot use threads (such as HTML5 with threads "
 "disabled)."
 msgstr ""
+"Pré-calcule le [NavigationMesh]. Si [code]on_thread[/code] est défini à "
+"[code]true[/code] (par défaut), le pré-calcul est fait sur un fil "
+"d'exécution séparé. Le pré-calcul sur un fil d'exécution séparé est utile "
+"parce que la navigation est une opération relativement coûteuse. Lorsqu'il "
+"est terminé, il définit automatiquement ce nouveau [NavigationMesh]. "
+"Veuillez noter que le pré-calcul sur le fil d'exécution séparé peut être "
+"très lent si la géométrie est composée de plein de maillages puisque l'accès "
+"asynchrone à chaque maillage nécessite une lourde synchronisation. De plus, "
+"veuillez noter que le pré-calculs sur un fil d'exécution séparé est "
+"automatiquement désactivée sur les systèmes d'exploitation qui ne peuvent "
+"pas utiliser des fils d'exécution (comme HTML5 si cette fonction est "
+"désactivée)."
 
 #: doc/classes/NavigationMeshInstance.xml
 msgid ""
@@ -47558,6 +47664,10 @@ msgid ""
 "identify the [NavigationMeshInstance] closest to a point on the merged "
 "navigation map."
 msgstr ""
+"Retourne le [RID] de cette région sur [NavigationServer]. Combiné avec ["
+"method NavigationServer.map_get_closest_point_owner], peut être utilisé pour "
+"identifier le [NavigationMeshInstance] le plus proche d'un point d'une carte "
+"de navigation fusionnée."
 
 #: doc/classes/NavigationMeshInstance.xml
 msgid "Determines if the [NavigationMeshInstance] is enabled or disabled."
@@ -47590,11 +47700,13 @@ msgid ""
 "are multiplied with [code]travel_cost[/code] for determining the shortest "
 "path."
 msgstr ""
+"Lorsque le cheminement se déplace à l'intérieur de cette région, les "
+"distances parcourues sont multipliées par [code]travel_cost[/code] pour "
+"déterminer le chemin le plus court."
 
 #: doc/classes/NavigationMeshInstance.xml
-#, fuzzy
 msgid "Notifies when the navigation mesh bake operation is completed."
-msgstr "Avertit quand une animation commence à jouer."
+msgstr ""
 
 #: doc/classes/NavigationMeshInstance.xml
 msgid "Notifies when the [NavigationMesh] has changed."
@@ -47613,12 +47725,22 @@ msgid ""
 "[b]Note:[/b] Obstacles are intended as a last resort option for constantly "
 "moving objects that cannot be (re)baked to a navigation mesh efficiently."
 msgstr ""
+"Obstacle 3D utilisé dans la navigation pour éviter les collisions. "
+"L'obstacle a besoin de données de navigation pour fonctionner correctement. "
+"Cela peut être fait avec l'obstacle comme enfant d'un nœud [Navigation], ou "
+"en utilisant [method set_navigation]. [NavigationObstacle] est sûr lors des "
+"trames physiques.\n"
+"[b]Note :[/b] Les obstacles sont conçus comme dernière option pour les "
+"objets constamment mobiles qui ne peuvent pas être pré-calculés efficacement "
+"dans un maillage de navigation."
 
 #: doc/classes/NavigationObstacle.xml
 msgid ""
 "Returns the [Navigation] node that the obstacle is using for its navigation "
 "system."
 msgstr ""
+"Retourne le nœud [Navigation] que l'obstacle utilise pour son système de "
+"navigation."
 
 #: doc/classes/NavigationObstacle.xml
 msgid "Returns the [RID] of this obstacle on the [NavigationServer]."
@@ -47629,18 +47751,24 @@ msgid ""
 "Sets the [Navigation] node used by the obstacle. Useful when you don't want "
 "to make the obstacle a child of a [Navigation] node."
 msgstr ""
+"Définit le nœud [Navigation] utilisé par l'obstacle. Utile lorsque vous ne "
+"voulez pas faire l'obstacle un enfant d'un nœud [Navigation]."
 
 #: doc/classes/NavigationObstacle.xml doc/classes/NavigationObstacle2D.xml
 msgid ""
 "Enables radius estimation algorithm which uses parent's collision shapes to "
 "determine the obstacle radius."
 msgstr ""
+"Active l'algorithme d'estimation de rayon qui utilise les formes de "
+"collision des parents pour déterminer le rayon des obstacles."
 
 #: doc/classes/NavigationObstacle.xml doc/classes/NavigationObstacle2D.xml
 msgid ""
 "The radius of the agent. Used only if [member estimate_radius] is set to "
 "[code]false[/code]."
 msgstr ""
+"Le rayon de l'agent. Utilisé uniquement si [member estimate_radius] est "
+"[code]false[/code]."
 
 #: doc/classes/NavigationObstacle2D.xml
 msgid "2D obstacle used in navigation for collision avoidance."
@@ -47655,12 +47783,22 @@ msgid ""
 "[b]Note:[/b] Obstacles are intended as a last resort option for constantly "
 "moving objects that cannot be (re)baked to a navigation mesh efficiently."
 msgstr ""
+"L'obstacle 2D utilisé dans la navigation pour éviter les collisions. "
+"L'obstacle a besoin de données de navigation pour fonctionner correctement. "
+"Cela peut être fait avec l'obstacle comme enfant d'un nœud [Navigation2D], "
+"ou en utilisant [method set_navigation]. [NavigationObstacle2D] est sûr lors "
+"des trames physiques.\n"
+"[b]Note :[/b] Les obstacles sont conçus comme dernière option pour les "
+"objets constamment mobiles qui ne peuvent pas être pré-calculés efficacement "
+"dans un maillage de navigation."
 
 #: doc/classes/NavigationObstacle2D.xml
 msgid ""
 "Returns the [Navigation2D] node that the obstacle is using for its "
 "navigation system."
 msgstr ""
+"Retourne le nœud [Navigation2D] que l'obstacle utilise pour son système de "
+"navigation."
 
 #: doc/classes/NavigationObstacle2D.xml
 msgid "Returns the [RID] of this obstacle on the [Navigation2DServer]."
@@ -47671,12 +47809,16 @@ msgid ""
 "Sets the [Navigation2D] node used by the obstacle. Useful when you don't "
 "want to make the obstacle a child of a [Navigation2D] node."
 msgstr ""
+"Définit le nœud [Navigation2D] utilisé par l'obstacle. Utile lorsque vous ne "
+"voulez pas faire l'obstacle un enfant d'un nœud [Navigation2D]."
 
 #: doc/classes/NavigationPolygon.xml
 msgid ""
 "A node that has methods to draw outlines or use indices of vertices to "
 "create navigation polygons."
 msgstr ""
+"Un nœud qui a des méthodes pour dessiner des contours ou utiliser des "
+"indices de sommets pour créer des polygones de navigation."
 
 #: doc/classes/NavigationPolygon.xml
 msgid ""
@@ -47702,6 +47844,27 @@ msgid ""
 "$NavigationPolygonInstance.navpoly = polygon\n"
 "[/codeblock]"
 msgstr ""
+"Il y a deux façons de créer des polygones. Soit en utilisant la méthode ["
+"method add_outline], soit en utilisant la méthode [method add_polygon].\n"
+"Avec [method add_outline] :\n"
+"[codeblock]\n"
+"var polygon = NavigationPolygon.new()\n"
+"var outline = PoolVector2Array([Vector2(0, 0), Vector2(0, 50), Vector2(50, "
+"50), Vector2(50, 0)])\n"
+"polygon.add_outline(outline)\n"
+"polygon.make_polygons_from_outlines()\n"
+"$NavigationPolygonInstance.navpoly = polygon\n"
+"[/codeblock]\n"
+"Avec [method add_polygon] et les indices du tableau des sommets :\n"
+"[codeblock]\n"
+"var polygon = NavigationPolygon.new()\n"
+"var vertices = PoolVector2Array([Vector2(0, 0), Vector2(0, 50), Vector2(50, "
+"50), Vector2(50, 0)])\n"
+"polygon.set_vertices(vertices)\n"
+"var indices = PoolIntArray([0, 1, 2, 3])\n"
+"polygon.add_polygon(indices)\n"
+"$NavigationPolygonInstance.navpoly = polygon\n"
+"[/codeblock]"
 
 #: doc/classes/NavigationPolygon.xml
 msgid ""
@@ -47710,6 +47873,10 @@ msgid ""
 "make_polygons_from_outlines] in order for this array to be converted to "
 "polygons that the engine will use."
 msgstr ""
+"Ajoute un [PoolVector2Array] qui contient les sommets d'un contour au "
+"tableau interne qui contient tous les contours. Vous devez appeler [method "
+"make_polygons_from_outlines] afin que ce tableau soit converti en polygones "
+"que le moteur pourra utiliser."
 
 #: doc/classes/NavigationPolygon.xml
 msgid ""
@@ -47718,18 +47885,26 @@ msgid ""
 "to call [method make_polygons_from_outlines] in order for this array to be "
 "converted to polygons that the engine will use."
 msgstr ""
+"Ajoute un [PoolVector2Array] qui contient les sommets d'un contour au "
+"tableau interne qui contient tous les contours à une position fixe. Vous "
+"devez appeler [method make_polygons_from_outlines] afin que ce tableau soit "
+"converti en polygones que le pourra utiliser."
 
 #: doc/classes/NavigationPolygon.xml
 msgid ""
 "Clears the array of the outlines, but it doesn't clear the vertices and the "
 "polygons that were created by them."
 msgstr ""
+"Efface le tableau des contours, mais ça n'efface pas les sommets et les "
+"polygones qui ont été créés par eux."
 
 #: doc/classes/NavigationPolygon.xml
 msgid ""
 "Clears the array of polygons, but it doesn't clear the array of outlines and "
 "vertices."
 msgstr ""
+"Efface le tableau des polygones, mais ça n'effacera pas le tableau des "
+"contours et des sommets."
 
 #: doc/classes/NavigationPolygon.xml
 msgid ""
@@ -47738,17 +47913,25 @@ msgid ""
 "NavigationServer.region_set_navmesh] API directly (as 2D uses the 3D server "
 "behind the scene)."
 msgstr ""
+"Retourne le [NavigationMesh] résultant de ce polygone de navigation. Ce "
+"navmesh peut être utilisé pour mettre à jour le navmesh d'une région avec "
+"l'API [method NavigationServer.region_set_navmesh] directement (comme la 2D "
+"utilise le serveur 3D en interne)."
 
 #: doc/classes/NavigationPolygon.xml
 msgid ""
 "Returns a [PoolVector2Array] containing the vertices of an outline that was "
 "created in the editor or by script."
 msgstr ""
+"Retourne un [PoolVector2Array] contenant les sommets d'un contour qui a été "
+"créé dans l'éditeur ou par un script."
 
 #: doc/classes/NavigationPolygon.xml
 msgid ""
 "Returns the number of outlines that were created in the editor or by script."
 msgstr ""
+"Retourne le nombre de contours qui ont été créés dans l'éditeur ou par un "
+"script."
 
 #: doc/classes/NavigationPolygon.xml
 msgid "Returns the count of all polygons."
@@ -47759,30 +47942,35 @@ msgid ""
 "Returns a [PoolVector2Array] containing all the vertices being used to "
 "create the polygons."
 msgstr ""
+"Retourne un [PoolVector2Array] contenant tous les sommets utilisés pour "
+"créer les polygones."
 
 #: doc/classes/NavigationPolygon.xml
 msgid "Creates polygons from the outlines added in the editor or by script."
 msgstr ""
+"Crée des polygones des contours ajoutés dans l'éditeur ou par un script."
 
 #: doc/classes/NavigationPolygon.xml
 msgid ""
 "Removes an outline created in the editor or by script. You have to call "
 "[method make_polygons_from_outlines] for the polygons to update."
 msgstr ""
+"Enlève un aperçu créé dans l'éditeur ou par un script. Vous devez appeler ["
+"method make_polygons_from_outlines] pour mettre à jour les polygones."
 
 #: doc/classes/NavigationPolygon.xml
 msgid ""
 "Changes an outline created in the editor or by script. You have to call "
 "[method make_polygons_from_outlines] for the polygons to update."
 msgstr ""
+"Change un aperçu créé dans l'éditeur ou par un script. Vous devez appeler ["
+"method make_polygons_from_outlines] pour mettre à jour les polygones."
 
 #: doc/classes/NavigationPolygonInstance.xml
-#, fuzzy
 msgid "A region of the 2D navigation map."
-msgstr "Prépare le maillage de navigation."
+msgstr ""
 
 #: doc/classes/NavigationPolygonInstance.xml
-#, fuzzy
 msgid ""
 "A region of the navigation map. It tells the [Navigation2DServer] what can "
 "be navigated and what cannot, based on its [NavigationPolygon] resource.\n"
@@ -47801,24 +47989,24 @@ msgid ""
 "The pathfinding cost of traveling distances inside this region can be "
 "controlled with the [member travel_cost] multiplier."
 msgstr ""
-"Une instance de [NavigationMesh]. Il signale au nœud [Navigation] ce qui "
-"peut être navigué et ce qui ne peut pas, basé sur la ressource "
-"[NavigationMesh].\n"
-"Par défaut ce nœud s'enregistrera à la carte de navigation du [World] par "
-"défaut. Si ce nœud est un enfant d'un nœud [Navigation], il s'inscrira à la "
-"carte de navigation du nœud de navigation.\n"
-"Deux régions peuvent être reliées l'une à l'autre si elles partagent un même "
-"bord. Vous pouvez définir la distance minimale entre deux sommets "
-"nécessaires pour connecter deux bords en utilisant [method NavigationServer."
-"map_set_edge_connection_margin]\n"
-"[b]Note :[/b] Le chevauchement de deux régions n'est pas suffisant pour "
-"relier deux régions. Ils doivent partager un même bord.\n"
-"Le coût d'entrée dans cette région d'une autre région peut être contrôlé "
+"Une région de la carte de navigation. Il indique au [Navigation2DServer] ce "
+"qui peut être navigué et ce qui ne peut pas l'être, en fonction de sa "
+"ressource [NavigationPolygon].\n"
+"Par défaut ce nœud s'enregistrera à la carte de navigation du [World2D] par "
+"défaut. Si ce nœud est un enfant d'un nœud [Navigation2D], il s'inscrirea à "
+"la carte de navigation du nœud de navigation.\n"
+"Deux régions peuvent être reliées l'une à l'autre si elles partagent un bord "
+"similaire. Vous pouvez définir la distance minimale entre deux sommets "
+"nécessaires pour connecter deux bords en utilisant [method Navigation2DServer"
+".map_set_edge_connection_margin]\n"
+"[b]Note :[/b] Embiquer deux régions ne suffit pas pour relier ces deux "
+"régions. Elles doivent partager un bord similaire.\n"
+"Le coût de cheminement de cette région vers une autre peut être contrôlé "
 "avec la valeur [member enter_cost].\n"
-"[b]Note : [/b] Cette valeur n'est pas ajoutée au coût du chemin lorsque la "
+"[b]Note :[/b] Cette valeur n'est pas ajoutée au coût du chemin lorsque la "
 "position de départ est déjà dans cette région.\n"
-"Le coût des distances de voyage dans cette région peut être contrôlé avec le "
-"multiplicateur [member travel_cost]."
+"Le coût de parcours des distances de cheminement à l'intérieur de cette "
+"région peut être contrôlé avec le multiplicateur [member travel_cost]."
 
 #: doc/classes/NavigationPolygonInstance.xml
 msgid ""
@@ -47827,11 +48015,14 @@ msgid ""
 "identify the [NavigationPolygonInstance] closest to a point on the merged "
 "navigation map."
 msgstr ""
+"Retourne le [RID] de cette région sur le [Navigation2DServer]. Combiné avec ["
+"method Navigation2DServer.map_get_closest_point_propriétaire] peut permettre "
+"d'identifier le [NavigationPolygonInstance] le plus proche d'un point sur la "
+"carte de navigation fusionnée."
 
 #: doc/classes/NavigationPolygonInstance.xml
-#, fuzzy
 msgid "Determines if the [NavigationPolygonInstance] is enabled or disabled."
-msgstr "Détermine si le [NavigationMeshInstance] est actif ou non."
+msgstr "Détermine si la [NavigationPolygonInstance] est active ou non."
 
 #: doc/classes/NavigationPolygonInstance.xml
 msgid ""
@@ -47842,14 +48033,12 @@ msgid ""
 msgstr ""
 
 #: doc/classes/NavigationPolygonInstance.xml
-#, fuzzy
 msgid "The [NavigationPolygon] resource to use."
-msgstr "La ressource [NavigationMesh] à utiliser."
+msgstr "La ressource [NavigationPolygon] à utiliser."
 
 #: doc/classes/NavigationServer.xml
-#, fuzzy
 msgid "Server interface for low-level 3D navigation access."
-msgstr "Interface de serveur pour l'accès audio de bas niveau."
+msgstr ""
 
 #: doc/classes/NavigationServer.xml
 #, fuzzy
@@ -47899,15 +48088,13 @@ msgstr ""
 "sans soucis."
 
 #: doc/classes/NavigationServer.xml
-#, fuzzy
 msgid "Returns the map cell height."
-msgstr "Retourne la taille du tableau."
+msgstr ""
 
 #: doc/classes/NavigationServer.xml
-#, fuzzy
 msgid ""
 "Returns the normal for the point returned by [method map_get_closest_point]."
-msgstr "Renvoie l'inverse de la racine carrée du paramètre."
+msgstr ""
 
 #: doc/classes/NavigationServer.xml
 msgid ""
@@ -47921,15 +48108,16 @@ msgid ""
 "Returns the edge connection margin of the map. This distance is the minimum "
 "vertex distance needed to connect two edges from different regions."
 msgstr ""
+"Retourne la marge de raccordement du bord de la carte. Cette distance est la "
+"distance minimale nécessaire pour relier deux bords de différentes régions."
 
 #: doc/classes/NavigationServer.xml
 msgid "Returns the map's up direction."
 msgstr "Retourne la direction haut de la carte."
 
 #: doc/classes/NavigationServer.xml
-#, fuzzy
 msgid "Set the map cell height used to weld the navigation mesh polygons."
-msgstr "Définit le polygone de navigation de la tuile."
+msgstr ""
 
 #: doc/classes/NavigationServer.xml
 msgid "Sets the map up direction."
@@ -47942,6 +48130,10 @@ msgid ""
 "called in the main thread.\n"
 "[b]Note:[/b] This function is not thread safe."
 msgstr ""
+"Traite les agents d'évitement de collision.\n"
+"Le résultat de ce processus est nécessaire par le serveur de physique, de "
+"sorte que cela doit être appelé dans le fil d'exécution principal.\n"
+"[b]Note :[/b] Cette fonction n'est pas sûre entre plusieurs fils d'exécution."
 
 #: doc/classes/NavigationServer.xml
 msgid "Bakes the navigation mesh."
@@ -47952,6 +48144,9 @@ msgid ""
 "Set the region's navigation layers. This allows selecting regions from a "
 "path request (when using [method NavigationServer.map_get_path])."
 msgstr ""
+"Définir les calques de navigation de la région. Cela permet de sélectionner "
+"les régions à partir d'une requête de chemin (en utilisant [method "
+"NavigationServer.map_get_path])."
 
 #: doc/classes/NavigationServer.xml
 msgid "Control activation of this server."
@@ -47986,16 +48181,16 @@ msgid ""
 msgstr ""
 
 #: doc/classes/NetworkedMultiplayerCustom.xml
-#, fuzzy
 msgid ""
 "Set the state of the connection. See [enum NetworkedMultiplayerPeer."
 "ConnectionStatus]."
-msgstr "Retourne l'état actuel de la connexion. Voir [enum ConnexionStatus]."
+msgstr ""
+"Retourne l'état actuel de la connexion. Voir [enum NetworkedMultiplayerPeer."
+"ConnectionStatus]."
 
 #: doc/classes/NetworkedMultiplayerCustom.xml
-#, fuzzy
 msgid "Set the max packet size that this peer can handle."
-msgstr "Définit la texture de lumière à utiliser pour cette instance."
+msgstr ""
 
 #: doc/classes/NetworkedMultiplayerCustom.xml
 msgid ""
@@ -48074,7 +48269,7 @@ msgstr ""
 "Créer un client qui se connecte au serveur à [code]address[/code] donnée via "
 "le [code]port[/code]. L'adresse donnée doit être soit un nom de domaine "
 "entièrement qualifié (ex.: [code]\"www.example.com\"[/code]) ou une adresse "
-"IP en format IPv4 ou IPv6 (par exemple [code]\"192.168.1.1\"[/code)]. Le "
+"IP en format IPv4 ou IPv6 (par exemple [code]\"192.168.1.1\"[/code]). Le "
 "[code]port[/code] est le port que le serveur écoute. Les paramètres "
 "[code]in_bandwidth[/code] et [code]out_bandwidth[/code] peuvent être "
 "utilisés pour limiter la bande passante entrante et sortante, en octets par "
@@ -48087,9 +48282,9 @@ msgstr ""
 "client a été créé, [constant ERR_ALREADY_IN_USE] si ce "
 "NetworkedMultiplayerENet a déjà une connexion ouverte (dans quel cas vous "
 "devez appeler [method close_connection] d'abord) ou [constant "
-"ERR_CANT_CREATE] si le client ne peut pas être créé. Si [code]client_port[/"
-"code] est spécifié, le client écoutera également le port donné ; ceci est "
-"utile pour certaines techniques NAT transversale."
+"ERR_CANT_CREATE] si le client ne peut pas être créé. Si "
+"[code]client_port[/code] est spécifié, le client écoutera également le port "
+"donné ; ceci est utile pour certaines techniques NAT transversale."
 
 #: modules/enet/doc_classes/NetworkedMultiplayerENet.xml
 msgid ""
@@ -48145,8 +48340,8 @@ msgid ""
 "Returns the channel of the next packet that will be retrieved via [method "
 "PacketPeer.get_packet]."
 msgstr ""
-"Retourne le canal du prochain paquet qui sera récupéré via [method "
-"PacketPeer.get_packet]"
+"Retourne le canal du prochain paquet qui sera récupéré via [method PacketPeer"
+".get_packet]."
 
 #: modules/enet/doc_classes/NetworkedMultiplayerENet.xml
 #: modules/websocket/doc_classes/WebSocketServer.xml
@@ -48288,7 +48483,6 @@ msgstr ""
 "create_client] est utilisé à la place."
 
 #: modules/enet/doc_classes/NetworkedMultiplayerENet.xml
-#, fuzzy
 msgid ""
 "Enable or disable certificate verification when [member use_dtls] is "
 "[code]true[/code]."
@@ -48874,7 +49068,7 @@ msgstr ""
 "dans un script). Si le nœud a des enfants, sa méthode [méthod enter_tree] "
 "sera appelée d'abord, puis ensuite celle de ses enfants.\n"
 "Correspond à la notification [constant NOTIFICATION_ENTER_TREE] dans [method "
-"Object._notification]"
+"Object._notification]."
 
 #: doc/classes/Node.xml
 msgid ""
@@ -49255,18 +49449,13 @@ msgid ""
 "[method get_node] instead. To avoid using [method find_parent] too often, "
 "consider caching the node reference into a variable."
 msgstr ""
-"Trouve un parent de ce nœud dont le nom correspond à [code]mask[/code] "
-"suivant le même fonctionnement que pour [method String.match] (c'est-à-dire "
-"sensible à la casse, que [code]\"*\"[/code] correspond à un zéro au un seul "
-"caractère, et que [code]\"?\"[/code] correspond à n'importe quel unique "
-"caractère sauf [code]\".\"[/code]). Retourne [code]null[/code] si aucun "
-"[Node] correspondant n'est trouvée.\n"
+"Trouve le premier parent de ce nœud dont le nom correspond à "
+"[code]mask[/code] suivant le même fonctionnement que pour [method String."
+"match] (c'est-à-dire sensible à la casse, que [code]\"*\"[/code] correspond "
+"à un zéro au un seul caractère, et que [code]\"?\"[/code] correspond à "
+"n'importe quel unique caractère sauf [code]\".\"[/code]).\n"
 "[b]Note :[/b] La correspondance ne se fait pas sur le chemin complet mais "
 "juste les noms des nœuds.\n"
-"Si [code]owned[/code] est [code]true[/code], cette méthode ne trouve que des "
-"nœuds dont le propriétaire est ce nœud. Ceci est particulièrement important "
-"pour les scènes instanciée par un script, parce que ces scènes n'ont pas de "
-"propriétaire.\n"
 "[b]Note :[/b] Comme cette méthode liste tous les parents d'un nœud, c'est le "
 "moyen le plus lent d'obtenir une référence à un autre nœud. Dans la mesure "
 "du possible, essayez plutôt d'utiliser [method get_node]. Pour éviter "
@@ -49420,7 +49609,7 @@ msgid ""
 "[/codeblock]"
 msgstr ""
 "Récupère un nœud et une de ses ressources comme spécifié par le sous-nom de "
-"son [NodePath] (ex.: [code]Area2D/CollisionShape2D:shape[/code)]. Si "
+"son [NodePath] (ex.: [code]Area2D/CollisionShape2D:shape[/code]). Si "
 "plusieurs ressources imbriquées sont spécifiées dans le [NodePath], seul le "
 "dernier sera récupéré.\n"
 "La valeur de retour est un tableau de 3 éléments : le premier élément est le "
@@ -49480,10 +49669,10 @@ msgid ""
 "processing unless the frames per second is changed via [member Engine."
 "iterations_per_second]."
 msgstr ""
-"Retourne le temps écoulé (en secondes) depuis la dernière trame physique "
-"(voir [method _physics_process]). C'est toujours une valeur constante dans "
-"le traitement de la physique à moins que les trames par seconde ne soient "
-"changés via [member Engine.iterations_per_second]"
+"Retourne le temps écoulé (en secondes) depuis la dernière trame physique ("
+"voir [method _physics_process]). C'est toujours une valeur constante dans le "
+"traitement de la physique à moins que les trames par seconde ne soient "
+"changés via [member Engine.iterations_per_second]."
 
 #: doc/classes/Node.xml
 msgid ""
@@ -49601,12 +49790,12 @@ msgid ""
 "See [member SceneTree.physics_interpolation] and [member ProjectSettings."
 "physics/common/physics_interpolation]."
 msgstr ""
-"Retourne [code]true[/code] si l'interpolation physique est activée (voir "
-"[member physics_interpolation_mode]) [b]et[/b] activée dans [SceneTree].\n"
+"Retourne [code]true[/code] si l'interpolation physique est activée (voir ["
+"member physics_interpolation_mode]) [b]et[/b] activée dans [SceneTree].\n"
 "Il s'agit d'une version pratique de [method is_physics_interpolated] qui "
 "vérifie également si l'interpolation physique est activée globalement.\n"
 "Voir [member SceneTree.physics_interpolation] et [member ProjectSettings."
-"physics/common/physics_interpolation]"
+"physics/common/physics_interpolation]."
 
 #: doc/classes/Node.xml
 msgid ""
@@ -49700,7 +49889,7 @@ msgstr ""
 "Imprime l'arborescence dans la console. Utilisé principalement à des fins de "
 "débogage. Cette version affiche le chemin par rapport au nœud actuel, ce qui "
 "est utile pour le copier/coller dans la fonction [method get_node].\n"
-"[ b]Exemple de sortie:[/b]\n"
+"[b]Exemple de sortie:[/b]\n"
 "[codeblock]\n"
 "TheGame\n"
 "TheGame/Menu\n"
@@ -49729,7 +49918,7 @@ msgstr ""
 "Cette version affiche une représentation plus graphique semblable à ce qui "
 "est affiché dans l'inspecteur de scène. C'est utile pour inspecter les "
 "grands arborescences.\n"
-"[ b]Exemple de sortie:[/b]\n"
+"[b]Exemple de sortie:[/b]\n"
 "[codeblock]\n"
 " â”–â•´TheGame\n"
 "    â” â•´Menu\n"
@@ -49851,7 +50040,7 @@ msgstr ""
 "d'enfants que le nœud remplacé avait.\n"
 "[b]Note :[/b] Le nœud remplacé n'est pas automatiquement libéré, donc vous "
 "devez le garder dans une variable pour une utilisation ultérieure ou le "
-"libérer en utilisant [method Object.free]"
+"libérer en utilisant [method Object.free]."
 
 #: doc/classes/Node.xml
 msgid ""
@@ -49938,13 +50127,13 @@ msgid ""
 "By default, methods are not exposed to networking (and RPCs). See also "
 "[method rset] and [method rset_config] for properties."
 msgstr ""
-"Change le mode RPC pour la [code]method[/code] donné pour le [code]mode[/"
-"code] spécifié. Voir [enum MultiplayerAPI.RPCMode]. Une alternative est "
-"d'annoter les méthodes et les propriétés avec les mots-clés correspondants "
-"([code]remote[/code], [code]master[/code], [code]puppet[/code], "
-"[code]remotesync[/code], [code]mastersync[/code], [code]puppetsync[/code)]. "
-"Par défaut, les méthodes ne sont pas exposées au réseaut (et aux RPC). Voir "
-"aussi [method rset] et [method rset_config] pour les propriétés."
+"Change le mode RPC pour la [code]method[/code] donné pour le "
+"[code]mode[/code] spécifié. Voir [enum MultiplayerAPI.RPCMode]. Une "
+"alternative est d'annoter les méthodes et les propriétés avec les mots-clés "
+"correspondants ([code]remote[/code], [code]master[/code], [code]puppet[/code]"
+", [code]remotesync[/code], [code]mastersync[/code], [code]puppetsync[/code])"
+". Par défaut, les méthodes ne sont pas exposées au réseaut (et aux RPC). "
+"Voir aussi [method rset] et [method rset_config] pour les propriétés."
 
 #: doc/classes/Node.xml
 msgid ""
@@ -49998,10 +50187,10 @@ msgstr ""
 "Change le mode RPC pour la [code]property[/code] donnée au [code]mode[/code] "
 "spécifié. Voir [enum MultiplayerAPI.RPCMode]. Une alternative est "
 "l'annotation des méthodes et des propriétés avec les mots-clés "
-"correspondants ([code]remote[/code], [code]master[/code], [code]puppet[/"
-"code], [code]remotesync[/code], [code]mastersync[/code], [code]puppetsync[/"
-"code)]. Par défaut, les propriétés ne sont pas exposées au réseau (et au "
-"RPC). Voir aussi [method rpc] et [method rpc_config] pour les méthodes."
+"correspondants ([code]remote[/code], [code]master[/code], [code]puppet[/code]"
+", [code]remotesync[/code], [code]mastersync[/code], [code]puppetsync[/code])"
+". Par défaut, les propriétés ne sont pas exposées au réseau (et au RPC). "
+"Voir aussi [method rpc] et [method rpc_config] pour les méthodes."
 
 #: doc/classes/Node.xml
 msgid ""
@@ -50249,11 +50438,13 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Node.xml
-#, fuzzy
 msgid ""
 "Notification received when the node is about to exit a [SceneTree].\n"
 "This notification is emitted [i]after[/i] the related [signal tree_exiting]."
-msgstr "La notification reçue quand le nœud va quitter le [SceneTree]."
+msgstr ""
+"La notification reçue quand le nœud va quitter le [SceneTree].\n"
+"Cette notification est émise [i]après[/i] le signal [signal tree_exiting] "
+"correspondant."
 
 #: doc/classes/Node.xml
 msgid "Notification received when the node is moved in the parent."
@@ -50547,9 +50738,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/NodePath.xml
-#, fuzzy
 msgid "Pre-parsed scene tree path."
-msgstr "Chemin de l'arborescence des scènes pré-analysé."
+msgstr "Le chemin pré-analysé de l'arborescence des scènes."
 
 #: doc/classes/NodePath.xml
 msgid ""
@@ -51580,19 +51770,16 @@ msgid "Sets an individual hole point position."
 msgstr "Définit la position d'un trou simple."
 
 #: doc/classes/OccluderShapePolygon.xml
-#, fuzzy
 msgid "Sets an individual polygon point position."
-msgstr "Définit la position d'un polygone simple."
+msgstr "Définit la position d'un seul point d'un polygone."
 
 #: doc/classes/OccluderShapePolygon.xml
-#, fuzzy
 msgid "Allows changing the hole geometry from code."
-msgstr "Dessine une géométrie simple à partir du code."
+msgstr ""
 
 #: doc/classes/OccluderShapePolygon.xml
-#, fuzzy
 msgid "Allows changing the polygon geometry from code."
-msgstr "Dessine une géométrie simple à partir du code."
+msgstr ""
 
 #: doc/classes/OccluderShapePolygon.xml
 msgid ""
@@ -51862,18 +52049,16 @@ msgid "Returns the text of the item at index [code]idx[/code]."
 msgstr "Retourne le texte de l'élément à l'index [code]idx[/code]."
 
 #: doc/classes/OptionButton.xml
-#, fuzzy
 msgid "Returns the tooltip of the item at index [code]idx[/code]."
-msgstr "Retourne le texte de l'élément à l'index [code]idx[/code]."
+msgstr "Retourne l'infobulle de l'élément à l'index [code]idx[/code]."
 
 #: doc/classes/OptionButton.xml
-#, fuzzy
 msgid ""
 "Returns the ID of the selected item, or [code]-1[/code] if no item is "
 "selected."
 msgstr ""
-"Retourne la position de l’élément qui a actuellement le focus. Ou retourne "
-"[code]-1[/code] si aucun n'a le focus."
+"Retourne l'identifiant de l’élément sélectionné, ou [code]-1[/code] si aucun "
+"n'est sélectionné."
 
 #: doc/classes/OptionButton.xml
 msgid ""
@@ -51926,9 +52111,8 @@ msgid "Sets the text of the item at index [code]idx[/code]."
 msgstr "Définit le texte pour l'élément à l'index [code]idx[/code]."
 
 #: doc/classes/OptionButton.xml
-#, fuzzy
 msgid "Sets the tooltip of the item at index [code]idx[/code]."
-msgstr "Définit le texte pour l'élément à l'index [code]idx[/code]."
+msgstr "Définit l'infobulle pour l'élément à l'index [code]idx[/code]."
 
 #: doc/classes/OptionButton.xml
 msgid ""
@@ -52051,9 +52235,8 @@ msgstr ""
 "fils d'exécutions."
 
 #: doc/classes/OS.xml
-#, fuzzy
 msgid "Centers the window on the screen if in windowed mode."
-msgstr "Définit la position du nœud spécifié."
+msgstr ""
 
 #: doc/classes/OS.xml
 msgid ""
@@ -52212,18 +52395,16 @@ msgid ""
 msgstr ""
 
 #: doc/classes/OS.xml
-#, fuzzy
 msgid "Returns the scancode of the given string (e.g. \"Escape\")."
-msgstr "Renvoie le reste de deux vecteurs."
+msgstr ""
 
 #: doc/classes/OS.xml
 msgid "Returns the total number of available audio drivers."
 msgstr "Retourne le nombre total de périphériques audio."
 
 #: doc/classes/OS.xml
-#, fuzzy
 msgid "Returns the audio driver name for the given index."
-msgstr "Retourne le sommet à l’index donné."
+msgstr ""
 
 #: doc/classes/OS.xml
 msgid ""
@@ -52642,14 +52823,13 @@ msgid ""
 msgstr ""
 
 #: doc/classes/OS.xml
-#, fuzzy
 msgid "Returns the epoch time of the operating system in milliseconds."
-msgstr "Retourne le temps epoch du système d'exploitation en millisecondes."
+msgstr ""
+"Retourne l'heure de l'époque du système d'exploitation en millisecondes."
 
 #: doc/classes/OS.xml
-#, fuzzy
 msgid "Returns the epoch time of the operating system in seconds."
-msgstr "Retourne le temps epoch du système d'exploitation en secondes."
+msgstr "Retourne l'heure de l'époque du système d'exploitation en secondes."
 
 #: doc/classes/OS.xml
 msgid ""
@@ -52766,9 +52946,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/OS.xml
-#, fuzzy
 msgid "Returns the number of video drivers supported on the current platform."
-msgstr "Renvoie le nombre de points sur l'axe de mélange."
+msgstr ""
 
 #: doc/classes/OS.xml
 msgid ""
@@ -52816,9 +52995,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/OS.xml
-#, fuzzy
 msgid "Returns [code]true[/code] if there is content on the clipboard."
-msgstr "Retourne [code]true[/code] si l'[AABB] est plate ou vide."
+msgstr "Retourne [code]true[/code] si le presse-papiers n'est pas vide."
 
 #: doc/classes/OS.xml
 msgid ""
@@ -52840,19 +53018,19 @@ msgid ""
 msgstr ""
 
 #: doc/classes/OS.xml
-#, fuzzy
 msgid ""
 "Returns [code]true[/code] if the device has a touchscreen or emulates one."
-msgstr "Retourne [code]true[/code] (vrai) si la chaîne de caractères est vide."
+msgstr ""
+"Retourne [code]true[/code] si le périphérique à un écran tactile ou en "
+"simule un."
 
 #: doc/classes/OS.xml
-#, fuzzy
 msgid ""
 "Returns [code]true[/code] if the platform has a virtual keyboard, "
 "[code]false[/code] otherwise."
 msgstr ""
-"Retourne [code]true[/code] si la chaîne de caractères est vide, ou "
-"[code]false[/code] le cas échéant."
+"Retourne [code]true[/code] si la plateforme à un clavier virtuel (non "
+"physique), ou [code]false[/code] sinon."
 
 #: doc/classes/OS.xml
 msgid "Hides the virtual keyboard if it is shown, does nothing otherwise."
@@ -52887,11 +53065,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/OS.xml
-#, fuzzy
 msgid ""
 "Returns [code]true[/code] if the input scancode corresponds to a Unicode "
 "character."
-msgstr "Retourne [code]true[/code] si l'[AABB] chevauche une autre."
+msgstr ""
 
 #: doc/classes/OS.xml
 msgid ""
@@ -53196,7 +53373,6 @@ msgstr ""
 "Windows."
 
 #: doc/classes/OS.xml
-#, fuzzy
 msgid ""
 "Requests the OS to open a resource with the most appropriate program. For "
 "example:\n"
@@ -53223,12 +53399,12 @@ msgstr ""
 "d'accueil de Godot dans le navigateur web par défaut.\n"
 "- [code]OS.shell_open(\"mailto:example@example.com\")[/code] ouvrira le "
 "client mail par défaut avec le champs destinataire définit à "
-"[code]example@example.com[/code]. Voir [url=https://blog.escapecreative.com/"
-"customizing-mailto-links/]Personnaliser les liens [code]mailto:[/code][/url] "
-"pour la liste des champs qui peuvent être ajoutés.\n"
+"[code]example@example.com[/code]. Voir [url=https://datatracker.ietf.org/doc/"
+"html/rfc2368]RFC 2368 - The [code]mailto[/code] URL scheme[/url] pour la "
+"liste des champs qui peuvent être ajoutés.\n"
 "Utilisez [method ProjectSettings.globalize_path] pour convertir un chemin "
-"[code]res://[/code] ou [code]user://[/code] en chemin système pour utiliser "
-"avec cette méthode.\n"
+"[code]res://[/code] ou [code]user://[/code] en chemin système qui peut être "
+"utilisé avec cette méthode.\n"
 "[b]Note :[/b] Cette méthode est implémentée sous Android, iOS, HTML5, Linux, "
 "macOS et Windows."
 
@@ -53272,12 +53448,12 @@ msgid ""
 msgstr ""
 
 #: doc/classes/OS.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], the engine tries to keep the screen on while the game "
 "is running. Useful on mobile."
 msgstr ""
-"Si [code]true[/code], le mouvement linéaire à travers l’axe Z est limité."
+"Si [code]true[/code], Le moteur tente de garder l'écran allumé quand le jeu "
+"est lancé. Utile sur les mobiles."
 
 #: doc/classes/OS.xml
 msgid ""
@@ -54335,9 +54511,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Particles.xml
-#, fuzzy
 msgid "Maximum number of draw passes supported."
-msgstr "Nombre maximal de passes de tirage prises en charge."
+msgstr "Le nombre maximal de passes de dessin supporté."
 
 #: doc/classes/Particles2D.xml
 msgid "GPU-based 2D particle emitter."
@@ -55015,11 +55190,10 @@ msgstr ""
 "dans les versions finales."
 
 #: doc/classes/Performance.xml
-#, fuzzy
 msgid "Available static memory. Not available in release builds."
 msgstr ""
 "La mémoire statique disponible. N'est pas utilisable dans les versions "
-"finales."
+"exportés sans le mode débogage."
 
 #: doc/classes/Performance.xml
 msgid "Available dynamic memory. Not available in release builds."
@@ -55852,9 +56026,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Physics2DServer.xml
-#, fuzzy
 msgid "Returns the value of a damped spring joint parameter."
-msgstr "Renvoie la valeur opposée du paramètre."
+msgstr ""
 
 #: doc/classes/Physics2DServer.xml
 #, fuzzy
@@ -55862,8 +56035,8 @@ msgid ""
 "Sets a damped spring joint parameter. See [enum DampedStringParam] for a "
 "list of available parameters."
 msgstr ""
-"Définit la valeur d’un paramètre de zone. Voir [enum AreaParameter] pour une "
-"liste de paramètres disponibles."
+"Définit la valeur d’un paramètre de zone. Voir [enum DampedStringParam] pour "
+"une liste de paramètres disponibles."
 
 #: doc/classes/Physics2DServer.xml
 msgid ""
@@ -56831,18 +57004,16 @@ msgid "Creates a [SliderJoint]."
 msgstr "Crée un [SliderJoint]."
 
 #: doc/classes/PhysicsServer.xml
-#, fuzzy
 msgid "Gets the priority value of the Joint."
-msgstr "Renvoie la valeur opposée du paramètre."
+msgstr ""
 
 #: doc/classes/PhysicsServer.xml
 msgid "Returns the type of the Joint."
 msgstr "Retourne le type de Joint."
 
 #: doc/classes/PhysicsServer.xml
-#, fuzzy
 msgid "Sets the priority value of the Joint."
-msgstr "Renvoie la valeur opposée du paramètre."
+msgstr "Définit la priorité de la valeur du Joint."
 
 #: doc/classes/PhysicsServer.xml
 msgid ""
@@ -57123,20 +57294,17 @@ msgid ""
 msgstr ""
 
 #: doc/classes/PhysicsServer.xml
-#, fuzzy
 msgid "If set, linear motion is possible within the given limits."
 msgstr ""
-"Si [code]set[/code] il y a un mouvement linéaire possible dans les limites "
-"données."
+"Si définit, le mouvement linéaire est possible dans les limites données."
 
 #: doc/classes/PhysicsServer.xml
 msgid "If set, rotational motion is possible."
 msgstr "Si définit, la rotation est possible."
 
 #: doc/classes/PhysicsServer.xml
-#, fuzzy
 msgid "If set, there is a rotational motor across these axes."
-msgstr "La vitesse de toutes les rotations à travers l’axe X."
+msgstr ""
 
 #: doc/classes/PhysicsServer.xml
 msgid ""
@@ -57197,14 +57365,12 @@ msgid "Sets the [Shape] that will be used for collision/intersection queries."
 msgstr ""
 
 #: doc/classes/PhysicsShapeQueryParameters.xml
-#, fuzzy
 msgid "If [code]true[/code], the query will take [Area]s into account."
-msgstr "Si [code]true[/code], la texture sera centrée."
+msgstr "Si [code]true[/code], le requête prendra les [Area] en compte."
 
 #: doc/classes/PhysicsShapeQueryParameters.xml
-#, fuzzy
 msgid "If [code]true[/code], the query will take [PhysicsBody]s into account."
-msgstr "Si [code]true[/code], la texture sera centrée."
+msgstr "Si [code]true[/code], le requête prendra les [PhysicsBody] en compte."
 
 #: doc/classes/PinJoint.xml
 #, fuzzy
@@ -57230,13 +57396,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/PinJoint.xml
-#, fuzzy
 msgid ""
 "If above 0, this value is the maximum value for an impulse that this Joint "
 "produces."
 msgstr ""
-"Retourne quand la mot clé [code]keyword[/code] spécifié a une couleur de "
-"défini ou non."
 
 #: doc/classes/PinJoint2D.xml
 #, fuzzy
@@ -57275,11 +57438,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Plane.xml
-#, fuzzy
 msgid "Creates a plane from the three points, given in clockwise order."
-msgstr ""
-"Crée un plan à partir des trois points, donné dans le sens des aiguilles "
-"d’une montre."
+msgstr "Crée un plan à partir de trois points, spécifiés dans le sens horaire."
 
 #: doc/classes/Plane.xml
 msgid "Creates a plane from the normal and the plane's distance to the origin."
@@ -57507,9 +57667,8 @@ msgid "Returns the path to the node associated with the specified bone."
 msgstr "Retourne le chemin d’accès au nœud associé à l’os spécifié."
 
 #: doc/classes/Polygon2D.xml
-#, fuzzy
 msgid "Returns the height values of the specified bone."
-msgstr "Retourne la hauteur de l'os spécifié."
+msgstr "Retourne les valeurs de hauteur de l'os spécifié."
 
 #: doc/classes/Polygon2D.xml
 msgid "Sets the path to the node associated with the specified bone."
@@ -57780,9 +57939,8 @@ msgstr "Change l'octet à la position donnée."
 #: doc/classes/PoolIntArray.xml doc/classes/PoolRealArray.xml
 #: doc/classes/PoolStringArray.xml doc/classes/PoolVector2Array.xml
 #: doc/classes/PoolVector3Array.xml
-#, fuzzy
 msgid "Sorts the elements of the array in ascending order."
-msgstr "Retire l' élément du tableau à l'index donné."
+msgstr "Tris les éléments du tableau dans l'ordre croissant."
 
 #: doc/classes/PoolByteArray.xml
 msgid ""
@@ -57794,7 +57952,6 @@ msgstr ""
 "nouveau [PoolByteArray]. Chaque index négatif partira de la fin du tableau."
 
 #: doc/classes/PoolColorArray.xml
-#, fuzzy
 msgid "A pooled array of [Color]s."
 msgstr "Un tableau compacté de [Color]."
 
@@ -57959,9 +58116,8 @@ msgid "Changes the int at the given index."
 msgstr "Modifie le [int] à l’index donné."
 
 #: doc/classes/PoolRealArray.xml
-#, fuzzy
 msgid "A pooled array of real numbers ([float])."
-msgstr "Un tableau compacté de flottants ([float])."
+msgstr "Un tableau compacté de nombres réels (des flottants, [float])."
 
 #: doc/classes/PoolRealArray.xml
 msgid ""
@@ -58040,7 +58196,6 @@ msgid "Changes the float at the given index."
 msgstr "Change la flottant à la position donnée."
 
 #: doc/classes/PoolStringArray.xml
-#, fuzzy
 msgid "A pooled array of [String]s."
 msgstr "Un tableau compacté de [String]."
 
@@ -58119,7 +58274,6 @@ msgid "Changes the [String] at the given index."
 msgstr "Change la [String] à la position donnée."
 
 #: doc/classes/PoolVector2Array.xml
-#, fuzzy
 msgid "A pooled array of [Vector2]s."
 msgstr "Un tableau compacté de [Vector2]."
 
@@ -58201,7 +58355,6 @@ msgid "A pooled array of [Vector3]."
 msgstr "Un tableau compacté de [Vector3]."
 
 #: doc/classes/PoolVector3Array.xml
-#, fuzzy
 msgid ""
 "An array specifically designed to hold [Vector3]. Optimized for memory "
 "usage, does not fragment the memory.\n"
@@ -58364,9 +58517,8 @@ msgstr ""
 "[WindowDialog]."
 
 #: doc/classes/PopupDialog.xml
-#, fuzzy
 msgid "Sets a custom [StyleBox] for the panel of the [PopupDialog]."
-msgstr "[StyleBox] par défaut pour le [Button]."
+msgstr ""
 
 #: doc/classes/PopupMenu.xml
 msgid "PopupMenu displays a list of options."
@@ -58596,7 +58748,6 @@ msgid ""
 msgstr ""
 
 #: doc/classes/PopupMenu.xml
-#, fuzzy
 msgid ""
 "Returns the tooltip associated with the specified index [code]idx[/code]."
 msgstr "Retourne l'infobulle associée avec l'index [code]idx[/code] spécifié."
@@ -58659,9 +58810,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/PopupMenu.xml
-#, fuzzy
 msgid "Sets the currently focused item as the given [code]index[/code]."
-msgstr "Retourne la position du point à l'index [code]point[/code]."
+msgstr ""
 
 #: doc/classes/PopupMenu.xml
 msgid "Hides the [PopupMenu] when the window loses focus."
@@ -58751,11 +58901,10 @@ msgstr ""
 "spécifié."
 
 #: doc/classes/PopupMenu.xml
-#, fuzzy
 msgid ""
 "Toggles the check state of the item of the specified index [code]idx[/code]."
 msgstr ""
-"Active l'état de contrôle de l'élément de l'index spécifié [code]idx[/code]."
+"Bascule l'état de contrôle de l'élément de l'index [code]idx[/code] spécifié."
 
 #: doc/classes/PopupMenu.xml
 msgid ""
@@ -59169,9 +59318,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/ProceduralSky.xml
-#, fuzzy
 msgid "Amount of energy contribution from the sun."
-msgstr "Montant de la contribution énergétique du ciel."
+msgstr "La quantité de contribution énergétique du ciel."
 
 #: doc/classes/ProceduralSky.xml
 msgid "The sun's height using polar coordinates."
@@ -59423,6 +59571,16 @@ msgid ""
 "specify the offset in bytes to the start of the resource pack. This is only "
 "supported for .pck files."
 msgstr ""
+"Charge le contenu du fichier .pck ou .zip spécifié par [code]pack[/code] "
+"dans le système de fichiers de ressources ([code]res://[/code]). Retourne "
+"[code]true[/code] en cas de succès.\n"
+"[b]Note :[/b] Si un fichier de [code]pack[/code] partage le même chemin "
+"qu'un fichier déjà dans le système de fichiers de ressources, toute "
+"tentative de charger ce fichier utilisera le fichier de [code]pack[/code] "
+"sauf si [code]replace_files[/code] est défini à [code]false[/code].\n"
+"[b]Note :[/b] Le paramètre optionnel [code]offset[/code] peut être utilisé "
+"pour spécifier le décalage en octets au début du pack de ressources. Ceci "
+"n'est pris en charge que pour les fichiers .pck."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -59430,18 +59588,25 @@ msgid ""
 "to the absolute, native OS [code]path[/code]. See also [method "
 "globalize_path]."
 msgstr ""
+"Retourne le chemin localisé (démarrant par [code]res://[/code]) "
+"correspondant au chemin [code]path[/code] absolu et natif du système "
+"d'exploitation. Voir aussi [method globalize_path]."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Returns [code]true[/code] if the specified property exists and its initial "
 "value differs from the current value."
 msgstr ""
+"Retourne [code]true[/code] si la propriété spécifiée existe et sa valeur "
+"initiale diffère de la valeur actuelle."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Returns the specified property's initial value. Returns [code]null[/code] if "
 "the property does not exist."
 msgstr ""
+"Retourne la valeur initiale de la propriété spécifiée. Retourne "
+"[code]null[/code] si la propriété n'existe pas."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -59451,6 +59616,12 @@ msgid ""
 "want to change project settings in exported projects, use [method "
 "save_custom] to save [code]override.cfg[/code] file."
 msgstr ""
+"Enregistre la configuration du fichier [code]project.godot[/code].\n"
+"[b]Note :[/b] Cette méthode est destinée à être utilisée par les greffons de "
+"l'éditeur, puisque [ProjectSettings] ne peut pas être modifié puis chargé "
+"directement dans une application lancée. Si vous voulez modifier les "
+"paramètres de projet depuis un projet exporté, utilisez [method save_custom] "
+"pour enregistrer le fichier [code]override.cfg[/code]."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -59460,18 +59631,28 @@ msgid ""
 "code] file, which is also text, but can be used in exported projects unlike "
 "other formats."
 msgstr ""
+"Enregistre la configuration vers un fichier personnalisé. L'extension de "
+"fichier doit être [code].godot[/code] (pour enregistrer dans le format "
+"[ConfigFile] au format texte) ou [code].binary[/code] (pour enregistrer au "
+"format binaire). Vous pouvez également enregistrer le fichier [code]override."
+"cfg[/code], qui est également au format texte, mais peut être utilisé dans "
+"des projets exportés contrairement aux autres formats."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Sets the specified property's initial value. This is the value the property "
 "reverts to."
 msgstr ""
+"Définit la valeur initiale de la propriété spécifiée. C'est cette valeur qui "
+"sera rétablie pour cette propriété."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Sets the order of a configuration value (influences when saved to the config "
 "file)."
 msgstr ""
+"Définit l'ordre d'une valeur de configuration (qui a une influence quand "
+"sauvegardée dans le fichier de configuration)."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -59483,6 +59664,14 @@ msgid ""
 "This can also be used to erase custom project settings. To do this change "
 "the setting value to [code]null[/code]."
 msgstr ""
+"Définit la valeur d'un réglage.\n"
+"[b]Exemple :[/b]\n"
+"[codeblock]\n"
+"ProjectSettings.set_setting(\"application/config/name\", \"Example\")\n"
+"/[codeblock]\n"
+"Cela peut également être utilisé pour effacer les paramètres de projet "
+"personnalisés. Pour ce faire, utilisez la valeur [code]null[/code] pour le "
+"réglage."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -59507,6 +59696,9 @@ msgid ""
 "(preserving the aspect ratio) when the engine starts. If [code]false[/code], "
 "the engine will leave it at the default pixel size."
 msgstr ""
+"Si [code]true[/code], étire l'image au lancement du jeu suivant la taille de "
+"la fenêtre (et préserve le ratio). Si [code]false[/code], l'image sera "
+"affichée par défaut suivant sa taille en pixels."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -59515,6 +59707,10 @@ msgid ""
 "[b]Note:[/b] Only effective if [member application/boot_splash/show_image] "
 "is [code]true[/code]."
 msgstr ""
+"Le chemin vers une image utilisée au lancement du jeu. Si vide, l'image avec "
+"le logo de Godot sera affichée à la place.\n"
+"[b]Note :[/b] Ne fonctionne que si [member application/boot_splash/"
+"show_image] est [code]true[/code]."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -59523,6 +59719,10 @@ msgid ""
 "displays the plain color specified in [member application/boot_splash/"
 "bg_color]."
 msgstr ""
+"Si [code]true[/code], affiche l'image spécifiée dans [member application/"
+"boot_splash/image] lorsque le moteur démarre. Si [code]false[/code], affiche "
+"seulement la couleur spécifiée dans [member application/boot_splash/"
+"bg_color]."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -59530,6 +59730,10 @@ msgid ""
 "(recommended for high-resolution artwork). If [code]false[/code], uses "
 "nearest-neighbor interpolation (recommended for pixel art)."
 msgstr ""
+"Si [code]true[/code], applique le filtrage linéaire pour l'étirement de "
+"l'image (recommandé pour les images à haute résolution.) Si "
+"[code]false[/code], utilise l'interpolation la plus proche (recommandée pour "
+"le pixel-art)."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -59543,24 +59747,41 @@ msgid ""
 "The [member application/config/use_custom_user_dir] setting must be enabled "
 "for this to take effect."
 msgstr ""
+"Ce dossier utilisateur est utilisé pour stocker des données persistantes (le "
+"système de fichiers [code]user://[/code]). Si laissé vide, "
+"[code]user://[/code] va pointer vers un dossier spécifique au projet suivant "
+"la configuration de Godot (voir [method OS.get_user_data_dir]). Si un nom de "
+"dossier personnalisé est défini, ce nom sera utilisé à la place, puis ajouté "
+"au dossier de données utilisateur spécifique au système (le même dossier "
+"parent que celui configuration Godot documenté dans [method OS."
+"get_user_data_dir]).\n"
+"Le paramètre [member application/config/use_custom_user_dir] doit être actif "
+"pour que cela fonctionne."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "The project's description, displayed as a tooltip in the Project Manager "
 "when hovering the project."
 msgstr ""
+"La description du projet, affichée en tant qu'infobulle dans le Gestionnaire "
+"de projet quand le projet est survolé."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Icon used for the project, set when project loads. Exporters will also use "
 "this icon when possible."
 msgstr ""
+"L'icône utilisée pour le projet, défini au chargement du projet. Les "
+"exportateurs utiliseront également cette icône si possible."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Icon set in [code].icns[/code] format used on macOS to set the game's icon. "
 "This is done automatically on start by calling [method OS.set_native_icon]."
 msgstr ""
+"L'icône définit dans le format [code].icns[/code] utilisé sur macOS pour "
+"définir l'icône du jeu. Ceci est fait automatiquement au lancement en "
+"appelant [method OS.set_native_icon]."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -59609,12 +59830,28 @@ msgid ""
 "default can impact compatibility with some external tools or plugins which "
 "expect the default [code].import[/code] folder."
 msgstr ""
+"Si [code]true[/code], le projet utilisera un dossier caché ([code]."
+"import[/code]) pour stocker des données spécifiques au projet (métadonnées, "
+"cache des shaders, etc.)\n"
+"Si [code]false[/code], un dossier non caché ([code]import[/code]) sera "
+"utilisé à la place.\n"
+"[b]Note :[/b] Vous devez redémarrer l'application après avoir modifié ce "
+"réglage.\n"
+"[b]Note :[/b] Changer cette valeur peut aider sur les plateformes ou avec "
+"des outils tiers où les modèles de dossier cachés ne sont pas autorisés. Il "
+"suffit de modifier ce paramètre si vous savez que votre environnement "
+"l'exige, car le changer par défaut peut impacter la compatibilité avec "
+"certains outils ou greffons externes qui s'attendent à ce que le dossier par "
+"défaut soit [code].import[/code]."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Icon set in [code].ico[/code] format used on Windows to set the game's icon. "
 "This is done automatically on start by calling [method OS.set_native_icon]."
 msgstr ""
+"L'icône définit dans le format [code].ico[/code] utilisé sur Windows pour "
+"définir l'icône du jeu. Ceci est fait automatiquement au lancement en "
+"appelant [method OS.set_native_icon]."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -59844,11 +60081,10 @@ msgstr ""
 "ne généreront pas d'avertissements."
 
 #: doc/classes/ProjectSettings.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], enables warnings when the type of the default value "
 "set to an exported variable is different than the specified export type."
-msgstr "Si [code]true[/code], le filtrage est activé."
+msgstr ""
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -60000,17 +60236,14 @@ msgstr ""
 "qui n'est pas garantie d'exister dans la classe à la compilation."
 
 #: doc/classes/ProjectSettings.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], enables warnings when a function parameter is unused."
 msgstr ""
-"Si [code]true[/code], le mouvement linéaire à travers l’axe Z est limité."
 
 #: doc/classes/ProjectSettings.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], enables warnings when a member variable is unused."
-msgstr "Si [code]true[/code], le filtrage est activé."
+msgstr ""
 
 #: doc/classes/ProjectSettings.xml
 msgid "If [code]true[/code], enables warnings when a signal is unused."
@@ -60100,42 +60333,57 @@ msgstr ""
 #: doc/classes/ProjectSettings.xml
 msgid "Maximum call stack in visual scripting, to avoid infinite recursion."
 msgstr ""
+"Le nombre maximal de la pile d'appels dans le script visuel, pour éviter une "
+"récursion infinie."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Color of the contact points between collision shapes, visible when \"Visible "
 "Collision Shapes\" is enabled in the Debug menu."
 msgstr ""
+"La couleur des points de contact entre les formes de collision, visible "
+"lorsque \"Formes de collision visibles\" est activé dans le menu Débogage."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Sets whether 2D physics will display collision outlines in game when "
 "\"Visible Collision Shapes\" is enabled in the Debug menu."
 msgstr ""
+"Définit si la physique 2D affichera les contours de collision dans le jeu "
+"lorsque \"Formes de collision visibles\" est activé dans le menu Débogage."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Maximum number of contact points between collision shapes to display when "
 "\"Visible Collision Shapes\" is enabled in the Debug menu."
 msgstr ""
+"Le nombre maximal de points de contact entre les formes de collision à "
+"afficher lorsque \"Formes de collision visibles\" est activé dans le menu "
+"Débogage."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Color of the collision shapes, visible when \"Visible Collision Shapes\" is "
 "enabled in the Debug menu."
 msgstr ""
+"La couleur des formes de collision, visible lorsque \"Formes de collision "
+"visibles\" est activé dans le menu Débogage."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Color of the disabled navigation geometry, visible when \"Visible "
 "Navigation\" is enabled in the Debug menu."
 msgstr ""
+"La couleur de la géométrie de navigation désactivée, visible lorsque "
+"\"Navigation visible\" est activée dans le menu Débogage."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Color of the navigation geometry, visible when \"Visible Navigation\" is "
 "enabled in the Debug menu."
 msgstr ""
+"La couleur de la géométrie de navigation, visible lorsque \"Navigation "
+"visible\" est activée dans le menu Débogage."
 
 #: doc/classes/ProjectSettings.xml
 msgid "Custom image for the mouse cursor (limited to 256×256)."
@@ -60332,18 +60580,25 @@ msgid ""
 "Load the previously opened VCS plugin when the editor starts up. This is set "
 "to [code]true[/code] whenever a new VCS plugin is initialized."
 msgstr ""
+"Charge le greffon VCS précédemment ouvert dès que l'éditeur démarre. Ceci "
+"est défini à [code]true[/code] chaque fois qu'un nouveau greffon VCS est "
+"initialisé."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Last loaded VCS plugin name. Used to autoload the plugin when the editor "
 "starts up."
 msgstr ""
+"Le dernier nom de greffon VCS chargé. Utilisé pour recharger le greffon dès "
+"que l'éditeur démarre."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Default value for [member ScrollContainer.scroll_deadzone], which will be "
 "used for all [ScrollContainer]s unless overridden."
 msgstr ""
+"La valeur par défaut pour [member ScrollContainer.scroll_deadzone], qui sera "
+"utilisé pour tous les [ScrollContainer] à moins d'être surchargé."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -60363,6 +60618,8 @@ msgid ""
 "If [code]true[/code], swaps OK and Cancel buttons in dialogs on Windows and "
 "UWP to follow interface conventions."
 msgstr ""
+"Si [code]true[/code], échange des boutons OK et Annuler dans les dialogues "
+"sur Windows et UWP pour suivre les conventions d'interface."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -60375,6 +60632,8 @@ msgid ""
 "Path to a custom [Font] resource to use as default for all GUI elements of "
 "the project."
 msgstr ""
+"Le chemin vers une [Font] personnalisée à utiliser par défaut pour tous les "
+"éléments graphiques du projet."
 
 #: doc/classes/ProjectSettings.xml
 msgid "If [code]true[/code], makes sure the theme used works with HiDPI."
@@ -60578,208 +60837,278 @@ msgid ""
 "If [code]true[/code], sends mouse input events when tapping or swiping on "
 "the touchscreen."
 msgstr ""
+"Si [code]true[/code], envoie des événements d'entrée de la souris lorsque "
+"vous tapez ou glissez sur l'écran tactile."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "If [code]true[/code], sends touch input events when clicking or dragging the "
 "mouse."
 msgstr ""
+"Si [code]true[/code], envoie des événements d'entrée tactile lorsque vous "
+"cliquez ou faites glisser la souris."
 
 #: doc/classes/ProjectSettings.xml
 msgid "Default delay for touch events. This only affects iOS devices."
 msgstr ""
+"Un retard par défaut pour les événements tactiles. Cela n'affecte que les "
+"appareils iOS."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 1. If left empty, the layer will "
 "display as \"Layer 1\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 1. Si vide, le "
+"calque s'affichera comme \"Calque 1\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 10. If left empty, the layer will "
 "display as \"Layer 10\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 10. Si vide, la "
+"calque s'affichera comme \"Calque 10\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 11. If left empty, the layer will "
 "display as \"Layer 11\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 11. Si vide, la "
+"calque s'affichera comme \"Calque 11\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 12. If left empty, the layer will "
 "display as \"Layer 12\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 12. Si vide, la "
+"calque s'affichera comme \"Calque 12\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 13. If left empty, the layer will "
 "display as \"Layer 13\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 13. Si vide, la "
+"calque s'affichera comme \"Calque 13\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 14. If left empty, the layer will "
 "display as \"Layer 14\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 14. Si vide, la "
+"calque s'affichera comme \"Calque 14\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 15. If left empty, the layer will "
 "display as \"Layer 15\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 15. Si vide, la "
+"calque s'affichera comme \"Calque 15\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 16. If left empty, the layer will "
 "display as \"Layer 16\"."
 msgstr ""
+"Nom facultatif pour la calque de navigation 2D numéro 16. Si vide, la calque "
+"s'affichera comme \"Calque 16\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 17. If left empty, the layer will "
 "display as \"Layer 17\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 17. Si vide, la "
+"calque s'affichera comme \"Calque 17\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 18. If left empty, the layer will "
 "display as \"Layer 18\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 18. Si vide, la "
+"calque s'affichera comme \"Calque 18\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 19. If left empty, the layer will "
 "display as \"Layer 19\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 19. Si vide, la "
+"calque s'affichera comme \"Calque 19\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 2. If left empty, the layer will "
 "display as \"Layer 2\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 2. Si vide, la "
+"calque affichera comme « calque 2 »."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 20. If left empty, the layer will "
 "display as \"Layer 20\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 20. Si vide, la "
+"calque s'affichera comme \"Calque 20\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 21. If left empty, the layer will "
 "display as \"Layer 21\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 21. Si vide, la "
+"calque s'affichera comme \"Calque 21\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 22. If left empty, the layer will "
 "display as \"Layer 22\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 22. Si vide, la "
+"calque s'affichera comme \"Calque 22\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 23. If left empty, the layer will "
 "display as \"Layer 23\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 23. Si vide, la "
+"calque s'affichera comme \"Calque 23\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 24. If left empty, the layer will "
 "display as \"Layer 24\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 24. Si vide, la "
+"calque s'affichera comme \"Calque 24\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 25. If left empty, the layer will "
 "display as \"Layer 25\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 25. Si vide, la "
+"calque s'affichera comme \"Calque 25\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 26. If left empty, the layer will "
 "display as \"Layer 26\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 26. Si vide, la "
+"calque s'affichera comme \"Calque 26\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 27. If left empty, the layer will "
 "display as \"Layer 27\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 27. Si vide, la "
+"calque s'affichera comme \"Calque 27\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 28. If left empty, the layer will "
 "display as \"Layer 28\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 28. Si vide, la "
+"calque s'affichera comme \"Calque 28\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 29. If left empty, the layer will "
 "display as \"Layer 29\"."
 msgstr ""
+"Nom facultatif pour la calque de navigation 2D numéro 29. Si vide, la calque "
+"s'affichera comme \"Calque 29\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 3. If left empty, the layer will "
 "display as \"Layer 3\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 3. Si vide, la "
+"calque s'affichera comme « calque 3 »."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 30. If left empty, the layer will "
 "display as \"Layer 30\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 30. Si vide, la "
+"calque s'affichera comme \"Calque 30\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 31. If left empty, the layer will "
 "display as \"Layer 31\"."
 msgstr ""
+"Nom facultatif pour la calque de navigation 2D numéro 31. Si vide, la calque "
+"s'affichera comme \"Calque 31\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 32. If left empty, the layer will "
 "display as \"Layer 32\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 32. Si vide, la "
+"calque s'affichera comme \"Calque 32\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 4. If left empty, the layer will "
 "display as \"Layer 4\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 4. Si vide, la "
+"calque apparaîtra comme \"Calque 4\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 5. If left empty, the layer will "
 "display as \"Layer 5\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 5. Si vide, le "
+"calque affichera comme \"Calque 5\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 6. If left empty, the layer will "
 "display as \"Layer 6\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 6. Si vide, la "
+"calque apparaîtra comme \"Calque 6\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 7. If left empty, the layer will "
 "display as \"Layer 7\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 7. Si vide, la "
+"calque s'affichera comme « calque 7 »."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 8. If left empty, the layer will "
 "display as \"Layer 8\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 8. Si vide, la "
+"calque s'affichera comme \"Calque 8\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 2D navigation layer 9. If left empty, the layer will "
 "display as \"Layer 9\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 2D numéro 9. Si vide, la "
+"calque s'affichera comme \"Calque 9\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid "Optional name for the 2D physics layer 1."
@@ -60994,192 +61323,256 @@ msgid ""
 "Optional name for the 3D navigation layer 1. If left empty, the layer will "
 "display as \"Layer 1\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 1. Si vide, le "
+"calque s'affichera comme \"Calque 1\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 10. If left empty, the layer will "
 "display as \"Layer 10\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 10. Si vide, la "
+"calque s'affichera comme \"Calque 10\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 11. If left empty, the layer will "
 "display as \"Layer 11\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 11. Si vide, la "
+"calque s'affichera comme \"Calque 11\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 12. If left empty, the layer will "
 "display as \"Layer 12\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 12. Si vide, la "
+"calque s'affichera comme \"Calque 12\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 13. If left empty, the layer will "
 "display as \"Layer 13\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 13. Si vide, la "
+"calque s'affichera comme \"Calque 13\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 14. If left empty, the layer will "
 "display as \"Layer 14\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 14. Si vide, la "
+"calque s'affichera comme \"Calque 14\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 15. If left empty, the layer will "
 "display as \"Layer 15\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 15. Si vide, la "
+"calque s'affichera comme \"Calque 15\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 16. If left empty, the layer will "
 "display as \"Layer 16\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 16. Si vide, la "
+"calque s'affichera comme \"Calque 16\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 17. If left empty, the layer will "
 "display as \"Layer 17\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 17. Si vide, la "
+"calque s'affichera comme \"Calque 17\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 18. If left empty, the layer will "
 "display as \"Layer 18\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 18. Si vide, la "
+"calque s'affichera comme \"Calque 18\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 19. If left empty, the layer will "
 "display as \"Layer 19\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 19. Si vide, la "
+"calque s'affichera comme \"Calque 19\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 2. If left empty, the layer will "
 "display as \"Layer 2\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 2. Si vide, la "
+"calque affichera comme « calque 2 »."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 20. If left empty, the layer will "
 "display as \"Layer 20\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 20. Si vide, la "
+"calque s'affichera comme \"Calque 20\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 21. If left empty, the layer will "
 "display as \"Layer 21\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 21. Si vide, la "
+"calque s'affichera comme \"Calque 21\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 22. If left empty, the layer will "
 "display as \"Layer 22\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 22. Si vide, la "
+"calque s'affichera comme \"Calque 22\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 23. If left empty, the layer will "
 "display as \"Layer 23\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 23. Si vide, la "
+"calque s'affichera comme \"Calque 23\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 24. If left empty, the layer will "
 "display as \"Layer 24\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 24. Si vide, la "
+"calque s'affichera comme \"Calque 24\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 25. If left empty, the layer will "
 "display as \"Layer 25\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 25. Si vide, la "
+"calque s'affichera comme \"Calque 25\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 26. If left empty, the layer will "
 "display as \"Layer 26\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 26. Si vide, la "
+"calque s'affichera comme \"Calque 26\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 27. If left empty, the layer will "
 "display as \"Layer 27\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 27. Si vide, la "
+"calque s'affichera comme \"Calque 27\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 28. If left empty, the layer will "
 "display as \"Layer 28\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 28. Si vide, la "
+"calque s'affichera comme \"Calque 28\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 29. If left empty, the layer will "
 "display as \"Layer 29\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 29. Si vide, la "
+"calque s'affichera comme \"Calque 29\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 3. If left empty, the layer will "
 "display as \"Layer 3\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 3. Si vide, la "
+"calque s'affichera comme « calque 3 »."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 30. If left empty, the layer will "
 "display as \"Layer 30\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 30. Si vide, la "
+"calque s'affichera comme \"Calque 30\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 31. If left empty, the layer will "
 "display as \"Layer 31\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 31. Si vide, la "
+"calque s'affichera comme \"Calque 31\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 32. If left empty, the layer will "
 "display as \"Layer 32\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 32. Si vide, la "
+"calque s'affichera comme \"Calque 32\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 4. If left empty, the layer will "
 "display as \"Layer 4\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 4. Si vide, la "
+"calque apparaîtra comme \"Calque 4\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 5. If left empty, the layer will "
 "display as \"Layer 5\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 5. Si vide, le "
+"calque affichera comme \"Calque 5\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 6. If left empty, the layer will "
 "display as \"Layer 6\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 6. Si vide, la "
+"calque apparaîtra comme \"Calque 6\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 7. If left empty, the layer will "
 "display as \"Layer 7\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 7. Si vide, la "
+"calque s'affichera comme « calque 7 »."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 8. If left empty, the layer will "
 "display as \"Layer 8\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 8. Si vide, la "
+"calque s'affichera comme \"Calque 8\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Optional name for the 3D navigation layer 9. If left empty, the layer will "
 "display as \"Layer 9\"."
 msgstr ""
+"Le nom optionnel pour la calque de navigation 3D numéro 9. Si vide, la "
+"calque s'affichera comme \"Calque 9\"."
 
 #: doc/classes/ProjectSettings.xml
 msgid "Optional name for the 3D physics layer 1."
@@ -61394,6 +61787,8 @@ msgid ""
 "The locale to fall back to if a translation isn't available in a given "
 "language. If left empty, [code]en[/code] (English) will be used."
 msgstr ""
+"Le langage de repli si une traduction n'est pas disponible dans une langue "
+"donnée. Si laissé vide, [code]en[/code] (anglais) sera utilisé."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -61412,6 +61807,9 @@ msgid ""
 "Desktop override for [member logging/file_logging/enable_file_logging], as "
 "log files are not readily accessible on mobile/Web platforms."
 msgstr ""
+"Le surcharge du bureau pour [member logging/file_logging/enable_file_logging]"
+", car les fichiers de journaux ne sont pas facilement accessibles sur les "
+"plateformes mobiles et web."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -62212,6 +62610,12 @@ msgid ""
 "[b]Note:[/b] This setting is only meaningful if [member rendering/gles3/"
 "shaders/shader_compilation_mode] is [b]not[/b] [code]Synchronous[/code]."
 msgstr ""
+"La valeur par défaut est une surcharge très conservatrice pour [member "
+"rendering/gles3/shaders/max_simultaneous_compiles].\n"
+"Selon les appareils spécifiques que vous ciblez, vous pouvez vouloir "
+"l'augmenter.\n"
+"[b]Note :[/b] Ce paramètre n'est utile que si [nomm rendering/gles3/shaders/"
+"shader_compilation_mode] n'est [b]pas[/b] à [code]Synchrone[/code]."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -62222,6 +62626,12 @@ msgid ""
 "[b]Note:[/b] This setting is only meaningful if [member rendering/gles3/"
 "shaders/shader_compilation_mode] is [b]not[/b] [code]Synchronous[/code]."
 msgstr ""
+"La valeur par défaut est une surcharge très conservatrice pour [member "
+"rendering/gles3/shaders/max_simultaneous_compiles].\n"
+"Selon les navigateurs spécifiques que vous ciblez, vous pouvez vouloir "
+"l'augmenter.\n"
+"[b]Note :[/b] Ce paramètre n'est utile que si [nomm rendering/gles3/shaders/"
+"shader_compilation_mode] n'est [b]pas[/b] à [code]Synchrone[/code]."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -62231,6 +62641,11 @@ msgid ""
 "[b]Note:[/b] This setting is only meaningful if [member rendering/gles3/"
 "shaders/shader_compilation_mode] is set to [code]Asynchronous + Cache[/code]."
 msgstr ""
+"La taille maximale, en mégaoctets, que le cache de ubershader peut "
+"atteindre. Au démarrage, les entrées les moins récemment utilisées seront "
+"supprimées jusqu'à ce que la taille totale soit dans les limites.\n"
+"[b]Note :[/b] Ce paramètre n'est utile que si [nomm rendering/gles3/shaders/"
+"shader_compilation_mode] est défini à [code]Synchrone + Cache[/code]."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -62240,6 +62655,11 @@ msgid ""
 "[b]Note:[/b] This setting is only meaningful if [member rendering/gles3/"
 "shaders/shader_compilation_mode] is set to [code]Asynchronous + Cache[/code]."
 msgstr ""
+"Une surcharge pour [member rendering/gles3/shaders/shader_cache_size_mb], de "
+"sorte qu'une taille maximale plus petite peut être configurée pour les "
+"plates-formes mobiles, où l'espace de stockage est plus limité.\n"
+"[b]Note :[/b] Ce paramètre n'est utile que si [nomm rendering/gles3/shaders/"
+"shader_compilation_mode] est défini à [code]Synchrone + Cache[/code]."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -62251,6 +62671,13 @@ msgid ""
 "[b]Note:[/b] This setting is only meaningful if [member rendering/gles3/"
 "shaders/shader_compilation_mode] is set to [code]Asynchronous + Cache[/code]."
 msgstr ""
+"Une surcharge pour [member rendering/gles3/shaders/shader_cache_size_mb], de "
+"sorte qu'une taille maximale plus petite peut être configurée pour les "
+"plateformes web, où l'espace de stockage est plus limité.\n"
+"[b]Note :[/b] Actuellement, le caisson d'ombrage n'est généralement pas "
+"disponible sur les plateformes Web.\n"
+"[b]Note :[/b] Ce paramètre n'est utile que si [nomm rendering/gles3/shaders/"
+"shader_compilation_mode] est défini à [code]Synchrone + Cache[/code]."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -62300,24 +62727,33 @@ msgid ""
 "Max buffer size for blend shapes. Any blend shape bigger than this will not "
 "work."
 msgstr ""
+"La capacité maximale de la mémoire tampon pour les formes de mélange. Toute "
+"forme de mélange plus grande que cela ne fonctionnera pas."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Max buffer size for drawing polygons. Any polygon bigger than this will not "
 "work."
 msgstr ""
+"La capacity maximale de la mémoire tampon pour dessiner des polygones. Tout "
+"polygone plus grand que cela ne fonctionnera pas."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Max index buffer size for drawing polygons. Any polygon bigger than this "
 "will not work."
 msgstr ""
+"La capacity maximale de la mémoire tampon pour le dessin des polygones. Tout "
+"polygone plus grand que cela ne fonctionnera pas."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
 "Max buffer size for drawing immediate objects (ImmediateGeometry nodes). "
 "Nodes using more than this size will not work."
 msgstr ""
+"La capacity maximale de la mémoire tampon pour le dessin d'objets immédiats ("
+"les nœuds ImmediateGeometry). Les nœuds utilisant plus que cette taille ne "
+"fonctionneront pas."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -62363,13 +62799,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/ProjectSettings.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], the texture importer will import lossless textures "
 "using the PNG format. Otherwise, it will default to using WebP."
 msgstr ""
-"Si [code]true[/code], la [SpinBox] sera modifiable. Sinon, elle sera en "
-"lecture seule."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -62379,6 +62812,12 @@ msgid ""
 "Note that compression levels above 6 are very slow and offer very little "
 "savings."
 msgstr ""
+"Le niveau de compression par défaut pour le format WebP sans perte. Des "
+"niveaux plus élevés entraînent des fichiers plus petits mais une plus lente "
+"vitesse de compression. La vitesse de décompression ne dépend pas du niveau "
+"de compression. Les valeurs supportées vont de 0 à 9. Notez que les niveaux "
+"de compression supérieurs à 6 sont très lents et offrent une très petite "
+"réduction du poids du fichier."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -62387,6 +62826,11 @@ msgid ""
 "attributes data. Recommended to be enabled if targeting mobile devices. "
 "Requires manual reimport of meshes after toggling."
 msgstr ""
+"À l'importation, les données des sommets de maillage seront divisées en deux "
+"flux dans une seule mémoire tampon pour les sommets, l'une pour les données "
+"de position et l'autre pour les données d'attributs. Recommandé si vous "
+"ciblez des appareils mobiles. Nécessite de réimporter manuellement toutes "
+"les meshes après l'activation."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -62398,6 +62842,14 @@ msgid ""
 "A greater number of polygons can potentially cull more objects, however the "
 "cost of culling calculations scales with the number of occluders."
 msgstr ""
+"Détermine le nombre maximal d'occulteurs de polygones qui seront utilisés à "
+"tout moment.\n"
+"Même si vous pouvez avoir de nombreux occulteurs dans une même scène, à "
+"chaque trame, le système choisira parmi ces plus pertinents basés sur une "
+"métrique de l'espace à l'écran, afin de donner la meilleure performance "
+"globale.\n"
+"Un plus grand nombre de polygones peut potentiellement masquer plus "
+"d'objets, cependant les performances baissent avec le nombre d'occulteurs."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -62407,6 +62859,12 @@ msgid ""
 "choose from these the most relevant based on a screen space metric, in order "
 "to give the best overall performance."
 msgstr ""
+"Détermine le nombre maximal d'occulteurs de sphère qui seront utilisés à "
+"tout moment.\n"
+"Même si vous pouvez avoir de nombreux occulteurs dans une même scène, à "
+"chaque trame, le système choisira parmi ces plus pertinents basés sur une "
+"métrique de l'espace à l'écran, afin de donner la meilleure performance "
+"globale."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -62417,6 +62875,12 @@ msgid ""
 "It will flip named portal meshes (i.e. [code]-portal[/code]) on the initial "
 "conversion to [Portal] nodes."
 msgstr ""
+"La convention par défaut est de pointer vers l'extérieur (la face vers "
+"l'extérieur) de la salle source.\n"
+"Si vous construisez accidentellement votre niveau avec des portails faisant "
+"face de la mauvaise manière, ce réglage peut corriger le problème.\n"
+"Cela va inverser le maillages nommés de portail (c'est-à-dire finissant par "
+"[code]-portal[/code]) pour les nœuds [Portal]."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -62427,14 +62891,11 @@ msgstr ""
 "[b]Note :[/b] Cela sera automatiquement désactivé dans les exports."
 
 #: doc/classes/ProjectSettings.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], gameplay callbacks will be sent as [code]signals[/"
 "code]. If [code]false[/code], they will be sent as [code]notifications[/"
 "code]."
 msgstr ""
-"Si [code]true[/code], l’état de la clé est pressé. Si [code]false[/code], "
-"l’état de la clé est libéré."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -62450,6 +62911,8 @@ msgid ""
 "Show logs during PVS generation.\n"
 "[b]Note:[/b] This will automatically be disabled in exports."
 msgstr ""
+"Afficher les journaux pendant la génération du PVS.\n"
+"[b]Note :[/b] Cela sera automatiquement désactivé dans les exportations."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -62784,6 +63247,9 @@ msgid ""
 "Lower-end override for [member rendering/quality/shadows/filter_mode] on "
 "mobile devices, due to performance concerns or driver support."
 msgstr ""
+"Surcharge pour les appareils bas de gamme pour [le rendu de membre/qualité/"
+"shadows/filter_mode] sur les appareils mobiles, en raison de performance "
+"plus faibles ou du support des pilotes."
 
 #: doc/classes/ProjectSettings.xml
 msgid ""
@@ -62944,6 +63410,8 @@ msgid ""
 "Objects can use this signal to restrict reading of settings only to "
 "situations where a change has been made."
 msgstr ""
+"Les objets peuvent utiliser ce signal pour restreindre leur lecture aux "
+"seuls paramètres modifiés."
 
 #: doc/classes/PropertyTweener.xml
 msgid "Interpolates an [Object]'s property over time."
@@ -62957,6 +63425,11 @@ msgid ""
 "to create [PropertyTweener]. Any [PropertyTweener] created manually will not "
 "function correctly."
 msgstr ""
+"[PropertyTweener] est utilisé pour interpoler une propriété dans un objet. "
+"Voir [method SceneTreeTween.tween_property] pour plus d'informations.\n"
+"[b]Note :[/b] [method SceneTreeTween.tween_property] est le seul moyen "
+"correct de créer un [PropertyTweener]. Les [PropertyTweener] créés "
+"manuellement ne fonctionneront pas correctement."
 
 #: doc/classes/PropertyTweener.xml
 msgid ""
@@ -62968,6 +63441,13 @@ msgid ""
 "as_relative() #the node will move by 100 pixels to the right\n"
 "[/codeblock]"
 msgstr ""
+"Quand appellé, la valeur finale sera utilisée comme valeur relative. Par "
+"exemple :\n"
+"[codeblock]\n"
+"var tween = get_tree().create_tween()\n"
+"tween.tween_property(self, \"position\", Vector2.RIGHT * 100, 1)."
+"as_relative() # Le nœud sera déplacé de 100 pixels sur la droite\n"
+"/[codeblock]"
 
 #: doc/classes/PropertyTweener.xml
 msgid ""
@@ -62979,6 +63459,14 @@ msgid ""
 "(200, 100)\n"
 "[/codeblock]"
 msgstr ""
+"Définit une valeur initiale personnalisée pour le [PropertyTweener]. Par "
+"exemple :\n"
+"[codeblock]\n"
+"var tween = get_tree().create_tween()\n"
+"tween.tween_property(self, \"position\", Vector2(200, 100), 1).from(Vector2("
+"100, 100) # Ça déplacera le nœud de la position (100, 100) jusqu'à (200, 100)"
+"\n"
+"/[codeblock]"
 
 #: doc/classes/PropertyTweener.xml
 msgid ""
@@ -62993,6 +63481,16 @@ msgid ""
 "from_current()\n"
 "[/codeblock]"
 msgstr ""
+"Fait que ce [PropertyTweener] utilisera la valeur de propriété actuelle "
+"(c'est-à-dire au moment de créer ce [PropertyTweener]) comme point de "
+"départ. Ceci est pareil que [method from] avec la valeur actuelle. Ces deux "
+"appels sont identiques :\n"
+"[codeblock]\n"
+"tween.tween_property(self, \"position\", Vector2(200, 100), 1).from(position)"
+"\n"
+"tween.tween_property(self, \"position\", Vector2(200, 100), 1).from_current()"
+"\n"
+"/[codeblock]"
 
 #: doc/classes/PropertyTweener.xml
 msgid ""
@@ -63003,9 +63501,8 @@ msgstr ""
 "interpolation. Par défaut, il n'y a pas de délai."
 
 #: doc/classes/ProximityGroup.xml
-#, fuzzy
 msgid "General-purpose 3D proximity detection node."
-msgstr "Nœud de détection de proximité pour usage général."
+msgstr "Un nœud de détection de proximité 3D pour un usage général."
 
 #: doc/classes/ProximityGroup.xml
 msgid ""
@@ -63077,11 +63574,16 @@ msgid ""
 "If the [member dispatch_mode] is set to [constant MODE_PROXY] (the default), "
 "all calls are delegated to their respective parent [Node]."
 msgstr ""
+"Appelle la méthode et les paramètres donnés à tous les [ProximityGroup] qui "
+"s'intersectent.\n"
+"Si le [member dispatch_mode] est [constant MODE_PROXY] (par défaut), tous "
+"les appels sont délégués à leur parent [Node] respectif."
 
 #: doc/classes/ProximityGroup.xml
 msgid ""
 "Specifies which node gets contacted on a call of method [method broadcast]."
 msgstr ""
+"Spécifie quel nœud est contacté sur un appel de méthode [method broadcast]."
 
 #: doc/classes/ProximityGroup.xml
 msgid ""
@@ -63091,6 +63593,11 @@ msgid ""
 "proximity checks at the cost of performance, since more groups will be "
 "created."
 msgstr ""
+"La taille de l'espace en unités 3D. Cela définit également la quantité de "
+"coordonnées requises pour calculer si deux nœuds [ProximityGroup] sont en "
+"intersection ou non. Des valeurs plus petites de [member grid_radius] "
+"peuvent être utilisées pour des vérifications de proximité plus précises "
+"mais avec de moins bonnes performances, car plus de groupes seront créés."
 
 #: doc/classes/ProximityGroup.xml
 msgid ""
@@ -63117,13 +63624,15 @@ msgstr ""
 
 #: doc/classes/ProximityGroup.xml
 msgid "This [ProximityGroup]'s parent will be target of [method broadcast]."
-msgstr ""
+msgstr "Le parent de ce [ProximityGroup] sera la cible de [method broadcast]."
 
 #: doc/classes/ProximityGroup.xml
 msgid ""
 "This [ProximityGroup] will emit the [signal broadcast] [i]signal[/i] when "
 "calling the [method broadcast] [i]method[/i]."
 msgstr ""
+"Ce [ProximityGroup] émettra le [i]signal[/i] [signal broadcast] lors de "
+"l'appel de la [i]méthode[/i] [method broadcast]."
 
 #: doc/classes/QuadMesh.xml
 msgid "Class representing a square mesh."
@@ -63186,9 +63695,8 @@ msgstr ""
 "spécifié. L'axe doit être un vecteur normalisé."
 
 #: doc/classes/Quat.xml
-#, fuzzy
 msgid "Constructs a quaternion defined by the given values."
-msgstr "Construit une nouvelle chaîne de caractères à partir du [Plane] donné."
+msgstr ""
 
 #: doc/classes/Quat.xml
 msgid ""
@@ -63206,6 +63714,9 @@ msgid ""
 "code], this vector, [code]b[/code], and [code]post_b[/code], by the given "
 "amount [code]weight[/code]."
 msgstr ""
+"Exécute une interpolation sphérique cubique entre les quaternions "
+"[code]pre_a[/code], ce vecteur, [code]b[/code], et [code]post_b[/code], par "
+"la quantité [code]weight[/code] spécifiée."
 
 #: doc/classes/Quat.xml
 msgid "Returns the dot product of two quaternions."
@@ -63218,6 +63729,10 @@ msgid ""
 "quaternion. Returned vector contains the rotation angles in the format (X "
 "angle, Y angle, Z angle)."
 msgstr ""
+"Retourne les angles d'Euler (selon la convention YXZ : lors de la "
+"décomposition, d'abord Z, puis X, et enfin Y) correspondant à la rotation "
+"représentée par un quaternion d'unité. Le vecteur retourné contient les "
+"angles de rotation dans le format (angle X, angle Y, angle Z)."
 
 #: doc/classes/Quat.xml
 msgid "Returns the inverse of the quaternion."
@@ -63254,6 +63769,8 @@ msgid ""
 "Sets the quaternion to a rotation which rotates around axis by the specified "
 "angle, in radians. The axis must be a normalized vector."
 msgstr ""
+"Définit le quaternion avec une rotation qui tourne autour de l'axe par "
+"l'angle spécifié, en radians. L'axe doit être un vecteur normalisé."
 
 #: doc/classes/Quat.xml
 msgid ""
@@ -63261,6 +63778,9 @@ msgid ""
 "convention: when decomposing, first Z, then X, and Y last), given in the "
 "vector format as (X angle, Y angle, Z angle)."
 msgstr ""
+"Définit le quaternion avec une rotation spécifiée par les angles d'Euler ("
+"selon la convention YXZ : lors de la décomposition, d'abord Z, puis X, et "
+"enfin Y), donnée dans le format vectoriel comme (angle X, angle Y, angle Z)."
 
 #: doc/classes/Quat.xml
 msgid ""
@@ -63268,6 +63788,10 @@ msgid ""
 "quaternion and [code]to[/code] by amount [code]weight[/code].\n"
 "[b]Note:[/b] Both quaternions must be normalized."
 msgstr ""
+"Retourne le résultat de l'interpolation linéaire sphérique entre ce "
+"quaternion et [code]to[/code] par la quantité [code]weight[/code] spécifiée."
+"\n"
+"[b]Note :[/b] Les deux quaternions doivent être normalisés."
 
 #: doc/classes/Quat.xml
 msgid ""
@@ -63275,6 +63799,9 @@ msgid ""
 "quaternion and [code]to[/code] by amount [code]weight[/code], but without "
 "checking if the rotation path is not bigger than 90 degrees."
 msgstr ""
+"Retourne le résultat de l'interpolation linéaire sphérique entre ce "
+"quaternion et [code]to[/code] par la quantité [code]weight[/code] spécifiée, "
+"mais sans vérifier si la rotation n'est pas supérieure à 90 degrés."
 
 #: doc/classes/Quat.xml
 msgid "Returns a vector transformed (multiplied) by this quaternion."
@@ -63318,6 +63845,9 @@ msgid ""
 "[Basis] matrix. If a vector is transformed by an identity quaternion, it "
 "will not change."
 msgstr ""
+"La quaternion d'identité, sans rotation. Équivalent à la matrice [Basis] "
+"d'identité. Si un vecteur est transformé par un quaternion d'identité, il ne "
+"changera pas."
 
 #: doc/classes/RandomNumberGenerator.xml
 msgid "A class for generating pseudo-random numbers."
@@ -63483,22 +64013,21 @@ msgstr ""
 "avec une valeur personnalisée, utilisez plutôt [member seed]."
 
 #: doc/classes/Range.xml
-#, fuzzy
 msgid "Abstract base class for range-based controls."
-msgstr "Classe de base abstraite pour les contrôles basés sur la portée."
+msgstr "Une classe de base abstraite pour les contrôles basés sur la portée."
 
 #: doc/classes/Range.xml
-#, fuzzy
 msgid ""
 "Range is a base class for [Control] nodes that change a floating-point "
 "[member value] between a [member min_value] and [member max_value], using a "
 "configured [member step] and [member page] size. See e.g. [ScrollBar] and "
 "[Slider] for examples of higher level nodes using Range."
 msgstr ""
-"Range est une classe de base des nœuds [Control] qui change une [code]value[/"
-"code] flottante entre le [code]minimum[/code] et le [code]maximum[/code], "
-"par étape [code]step[/code] et par [code]page[/code], par exemple un "
-"[ScrollBar]."
+"Range est une classe de base des nœuds [Control] qui change une "
+"[code]value[/code] flottante entre le [code]minimum[/code] et le "
+"[code]maximum[/code], par étape [code]step[/code] et par [code]page[/code], "
+"par exemple un [ScrollBar]. Voir [ScrollBar] et [Slider] pour des exemples "
+"de nœuds de haut niveau utilisant des Range."
 
 #: doc/classes/Range.xml
 msgid ""
@@ -63509,7 +64038,7 @@ msgstr ""
 
 #: doc/classes/Range.xml
 msgid "Stops the [Range] from sharing its member variables with any other."
-msgstr ""
+msgstr "Arrête le [Range] de partager ses variables membres avec les autres."
 
 #: doc/classes/Range.xml
 msgid ""
@@ -63530,6 +64059,9 @@ msgid ""
 "If [code]true[/code], and [code]min_value[/code] is greater than 0, "
 "[code]value[/code] will be represented exponentially rather than linearly."
 msgstr ""
+"Si [code]true[/code], et [code]min_value[/code] est supérieur à 0, "
+"[code]value[/code] sera représenté de façon exponentielle plutôt que "
+"linéaire."
 
 #: doc/classes/Range.xml
 msgid ""
@@ -63553,6 +64085,9 @@ msgid ""
 "multiplied by [code]page[/code] over the difference between [code]min_value[/"
 "code] and [code]max_value[/code]."
 msgstr ""
+"La taille de la page. Utilisé principalement pour [ScrollBar]. La longueur "
+"de la barre de défilement est multipliée par [code]page[/code] divisé par la "
+"différence entre [code]min_value[/code] et [code]max_value[/code]."
 
 #: doc/classes/Range.xml
 msgid "The value mapped between 0 and 1."
@@ -63657,12 +64192,17 @@ msgid ""
 "[code]0[/code] if no object is intersecting the ray (i.e. [method "
 "is_colliding] returns [code]false[/code])."
 msgstr ""
+"Retourne l'identifiant de forme du premier objet que le rayon intersecte, ou "
+"[code]0[/code] si aucun objet n'intersecte le rayon (c'est-à-dire [method "
+"is_colliding] renvoie [code]false[/code])."
 
 #: doc/classes/RayCast.xml
 msgid ""
 "Returns [code]true[/code] if the bit index passed is turned on.\n"
 "[b]Note:[/b] Bit indices range from 0-19."
 msgstr ""
+"Retourne [code]true[/code] si l'index de bit est activé.\n"
+"[b]Note :[/b] Les indices de bit vont de 0 à 19."
 
 #: doc/classes/RayCast.xml doc/classes/RayCast2D.xml
 msgid ""
@@ -63674,6 +64214,10 @@ msgid ""
 "Returns the collision point at which the ray intersects the closest object.\n"
 "[b]Note:[/b] This point is in the [b]global[/b] coordinate system."
 msgstr ""
+"Retourne le point de collision où le rayon intersecte l'objet le plus proche."
+"\n"
+"[b]Note :[/b] Ce point se trouve dans le système de coordonnées "
+"[b]global[/b]."
 
 #: doc/classes/RayCast.xml doc/classes/RayCast2D.xml
 msgid ""
@@ -63704,21 +64248,24 @@ msgid ""
 "Sets the bit index passed to the [code]value[/code] passed.\n"
 "[b]Note:[/b] Bit indexes range from 0-19."
 msgstr ""
+"Définit l'index de bit transmis à la [code]valeur[/code] passée.\n"
+"[b]Note :[/b] Les index de bit vont de 0-19."
 
 #: doc/classes/RayCast.xml doc/classes/RayCast2D.xml
 msgid ""
 "The ray's destination point, relative to the RayCast's [code]position[/code]."
 msgstr ""
+"Le point de destination du rayon, par rapport à la [code]position[/code] du "
+"RayCast."
 
 #: doc/classes/RayCast.xml
-#, fuzzy
 msgid "If [code]true[/code], collision with [Area]s will be reported."
-msgstr "Si [code]true[/code], les collisions seront signalées."
+msgstr "Si [code]true[/code], les collisions avec les [Area] seront signalées."
 
 #: doc/classes/RayCast.xml
-#, fuzzy
 msgid "If [code]true[/code], collision with [PhysicsBody]s will be reported."
-msgstr "Si [code]true[/code], les collisions seront signalées."
+msgstr ""
+"Si [code]true[/code], les collisions avec les [PhysicsBody] seront signalées."
 
 #: doc/classes/RayCast.xml doc/classes/RayCast2D.xml
 msgid ""
@@ -63751,11 +64298,12 @@ msgid "If [code]true[/code], collisions will be reported."
 msgstr "Si [code]true[/code], les collisions seront signalées."
 
 #: doc/classes/RayCast.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], collisions will be ignored for this RayCast's "
 "immediate parent."
-msgstr "Si [code]true[/code], les collisions seront signalées."
+msgstr ""
+"Si [code]true[/code], les collisions seront ignorées avec le parent direct "
+"de ce RayCast."
 
 #: doc/classes/RayCast2D.xml
 msgid ""
@@ -63781,6 +64329,8 @@ msgid ""
 "Sets or clears individual bits on the collision mask. This makes selecting "
 "the areas scanned easier."
 msgstr ""
+"Définit ou efface des bits individuels sur le masque de collision. Cela "
+"facilite le choix des aires scannées."
 
 #: doc/classes/RayCast2D.xml
 msgid "If [code]true[/code], collision with [Area2D]s will be reported."
@@ -63812,6 +64362,10 @@ msgid ""
 "itself from whatever is touching its far endpoint. It's often useful for "
 "characters."
 msgstr ""
+"Une forme en rayon pour les collisions en 3D, qui peuvt être placée dans un "
+"[PhysicsBody] ou une [Area]. Un rayon n'est pas vraiment un corps de "
+"collision ; il tente plutôt de se séparer de ce qui touche son point "
+"d'extrémité lointain. Il est souvent utile pour les caractères."
 
 #: doc/classes/RayShape.xml doc/classes/RayShape2D.xml
 msgid "The ray's length."
@@ -63833,11 +64387,13 @@ msgid ""
 "it tries to separate itself from whatever is touching its far endpoint. It's "
 "often useful for characters."
 msgstr ""
+"Une forme en rayon pour les collisions 2D. Un rayon n'est pas vraiment un "
+"corps de collision ; il tente plutôt de se séparer de ce qui touche son "
+"point d'extrémité lointain. Il est souvent utile pour les caractères."
 
 #: doc/classes/Rect2.xml
-#, fuzzy
 msgid "2D axis-aligned bounding box."
-msgstr "Boîte de délimitation alignée sur l'axe."
+msgstr "La boîte de délimitation 2D alignée sur les axes."
 
 #: doc/classes/Rect2.xml
 msgid ""
@@ -63865,6 +64421,9 @@ msgid ""
 "top-left corner is the origin and [code]width[/code] and [code]height[/code] "
 "are positive."
 msgstr ""
+"Retourne un [Rect2] avec la même position et aire, modifié de sorte que le "
+"coin supérieur gauche est l'origine et [code]width[/code] et "
+"[code]height[/code] soient positifs."
 
 #: doc/classes/Rect2.xml
 msgid "Returns the intersection of this [Rect2] and b."
@@ -63886,11 +64445,19 @@ msgid ""
 "var rect2 = rect.expand(Vector2(0, -1))\n"
 "[/codeblock]"
 msgstr ""
+"Retourne une copie de ce [Rect2] élargi pour inclure le point donné.\n"
+"[b]Exemple :[/b]\n"
+"[codeblock]\n"
+"# position (-3, 2), size (1, 1)\n"
+"var rect = Rect2(Vector2(-3, 2), Vector2(1, 1))\n"
+"# position (-3, -1), size (3, 4), contient donc à la fois `rect` et Vector2("
+"0, -1)\n"
+"var rect2 = rect.expand(Vector2(0, -1))\n"
+"/[codeblock]"
 
 #: doc/classes/Rect2.xml
-#, fuzzy
 msgid "Returns the area of the [Rect2]. See also [method has_no_area]."
-msgstr "Retourne la zone du [Rect2]."
+msgstr "Retourne l'aire du [Rect2]. Voir aussi [method has_no_area]."
 
 #: doc/classes/Rect2.xml
 msgid ""
@@ -63905,12 +64472,16 @@ msgid ""
 "Returns a copy of the [Rect2] grown a given amount of units towards all the "
 "sides."
 msgstr ""
+"Retourne une copie du [Rect2] aggrandi par une quantité donnée d'unités vers "
+"tous les côtés."
 
 #: doc/classes/Rect2.xml
 msgid ""
 "Returns a copy of the [Rect2] grown a given amount of units towards each "
 "direction individually."
 msgstr ""
+"Retourne une copie du [Rect2] aggrandi par une quantité donnée d'unités vers "
+"chaque direction individuellement."
 
 #: doc/classes/Rect2.xml
 msgid ""
@@ -63927,6 +64498,10 @@ msgid ""
 "[b]Note:[/b] If the [Rect2] has a negative size and is not flat or empty, "
 "[method has_no_area] will return [code]true[/code]."
 msgstr ""
+"Retourne [code]true[/code] si le [Rect2] est plat ou vide, ou "
+"[code]false[/code] sinon. Voir aussi [method get_area].\n"
+"[b]Note :[/b] Si le [Rect2] a une taille négative et n'est pas plat ou vide, "
+"[method has_no_area] retournera [code]true[/code]."
 
 #: doc/classes/Rect2.xml
 msgid ""
@@ -63945,6 +64520,11 @@ msgid ""
 "If [code]include_borders[/code] is [code]true[/code], they will also be "
 "considered overlapping if their borders touch, even without intersection."
 msgstr ""
+"Retourne [code]true[/code] si le [Rect2] se chevauche avec [code]b[/code] "
+"(c'est-à-dire qu'ils ont au moins un point en commun).\n"
+"Si [code]include_borders[/code] est [code]true[/code], ils seront également "
+"considérés comme se chevauchant si leurs bordures touchent, même sans "
+"intersection."
 
 #: doc/classes/Rect2.xml
 msgid ""
@@ -63952,6 +64532,9 @@ msgid ""
 "approximately equal, by calling [code]is_equal_approx[/code] on each "
 "component."
 msgstr ""
+"Retourne [code]true[/code] si ce [Rect2] et [code]rect[/code] sont "
+"approximativement égaux, en appelant [code]is_equal_approx[/code] sur chaque "
+"composant."
 
 #: doc/classes/Rect2.xml
 msgid "Returns a larger [Rect2] that contains this [Rect2] and [code]b[/code]."
@@ -63968,12 +64551,16 @@ msgid ""
 "Rectangle shape for 2D collisions. This shape is useful for modeling box-"
 "like 2D objects."
 msgstr ""
+"Une forme rectangulaire pour les collisions 2D. Cette forme est utile pour "
+"les objets 2D de type boîte."
 
 #: doc/classes/RectangleShape2D.xml
 msgid ""
 "The rectangle's half extents. The width and height of this shape is twice "
 "the half extents."
 msgstr ""
+"La demi-taille du rectangle. La largeur et la hauteur de cette forme sont "
+"deux fois plus grandes."
 
 #: doc/classes/Reference.xml
 msgid "Base class for reference-counted objects."
@@ -64002,6 +64589,9 @@ msgid ""
 "what you are doing.\n"
 "Returns whether the initialization was successful."
 msgstr ""
+"Initialise le compteur de référence interne. Utilisez ceci seulement si vous "
+"savez vraiment ce que vous faites.\n"
+"Retourne si l'initialisation a été réussie."
 
 #: doc/classes/Reference.xml
 msgid ""
@@ -64010,6 +64600,10 @@ msgid ""
 "Returns [code]true[/code] if the increment was successful, [code]false[/"
 "code] otherwise."
 msgstr ""
+"Augmente le compteur de référence interne. Utilisez ceci seulement si vous "
+"savez vraiment ce que vous faites.\n"
+"Retourne [code]true[/code] si l'augmentation a réussi, [code]false[/code] "
+"sinon."
 
 #: doc/classes/Reference.xml
 msgid ""
@@ -64018,6 +64612,10 @@ msgid ""
 "Returns [code]true[/code] if the decrement was successful, [code]false[/"
 "code] otherwise."
 msgstr ""
+"Diminue le compteur de référence interne. Utilisez ceci seulement si vous "
+"savez vraiment ce que vous faites.\n"
+"Retourne [code]true[/code] si la diminution a réussi, [code]false[/code] "
+"sinon."
 
 #: doc/classes/ReferenceRect.xml
 msgid "Reference frame for GUI."
@@ -64030,6 +64628,10 @@ msgid ""
 "display a rectangle filled with a solid color, consider using [ColorRect] "
 "instead."
 msgstr ""
+"Une boîte rectangulaire qui n'affiche que la couleur [member border_color] "
+"sur ses bordures. [ReferenceRect] n'a pas de [Color] de remplissage. Si vous "
+"devez afficher un rectangle rempli avec une couleur, utilisez plutôt "
+"[ColorRect]."
 
 #: doc/classes/ReferenceRect.xml
 msgid "Sets the border [Color] of the [ReferenceRect]."
@@ -64040,19 +64642,24 @@ msgid ""
 "Sets the border width of the [ReferenceRect]. The border grows both inwards "
 "and outwards with respect to the rectangle box."
 msgstr ""
+"Définit la largeur de la bordure du [ReferenceRect]. La bordure va à la fois "
+"vers l'intérieur et vers l'extérieur par rapport aux limites du rectangle."
 
 #: doc/classes/ReferenceRect.xml
 msgid ""
 "If set to [code]true[/code], the [ReferenceRect] will only be visible while "
 "in editor. Otherwise, [ReferenceRect] will be visible in game."
 msgstr ""
+"Si définit à [code]true[/code], le [ReferenceRect] ne sera visible que dans "
+"l'éditeur. Sinon, [ReferenceRect] sera aussi visible dans le jeu."
 
 #: doc/classes/ReflectionProbe.xml
-#, fuzzy
 msgid ""
 "Captures its surroundings to create fast, accurate reflections from a given "
 "point."
-msgstr "Capture son environnement pour créer des réflexions."
+msgstr ""
+"Capture son environnement pour créer des réflexions rapides et précises "
+"depuis un point donné."
 
 #: doc/classes/ReflectionProbe.xml
 msgid ""
@@ -64128,6 +64735,8 @@ msgid ""
 "Sets the ambient light color to be used when this probe is set to [member "
 "interior_enable]."
 msgstr ""
+"Définit la couleur de la lumière ambiante à utiliser lorsque cette sonde est "
+"définie à [membrer interior_enable]."
 
 #: doc/classes/ReflectionProbe.xml
 msgid ""
@@ -64135,22 +64744,25 @@ msgid ""
 "light for this reflection probe when set to [member interior_enable]. Useful "
 "so that ambient light matches the color of the room."
 msgstr ""
+"Définit la valeur de contribution pour la quantité de lumière ambiante "
+"affectée par la réflexion pour cette sonde que [member interior_enable] est "
+"activé. Utile pour que la lumière ambiante corresponde à la couleur de la "
+"pièce."
 
 #: doc/classes/ReflectionProbe.xml
 msgid ""
 "Sets the energy multiplier for this reflection probe's ambient light "
 "contribution when set to [member interior_enable]."
 msgstr ""
+"Définit le multiplicateur d'énergie pour cette sonde de réflexion de la "
+"lumière ambiante quand défini à [member interior_enable]."
 
 #: doc/classes/ReflectionProbe.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], reflections will ignore sky contribution. Ambient "
 "lighting is then controlled by the [code]interior_ambient_*[/code] "
 "properties."
 msgstr ""
-"Retourne la profondeur de la texture. La profondeur est la 3ème dimension "
-"(généralement l'axe Z)."
 
 #: doc/classes/ReflectionProbe.xml
 msgid ""
@@ -64698,9 +65310,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/ResourceImporter.xml
-#, fuzzy
 msgid "Base class for the implementation of core resource importers."
-msgstr "Classe de base pour une implémentation d’interface AR / VR."
+msgstr ""
 
 #: doc/classes/ResourceImporter.xml
 msgid ""
@@ -64714,9 +65325,8 @@ msgid "Import plugins"
 msgstr "Importer des plugins"
 
 #: doc/classes/ResourceImporter.xml
-#, fuzzy
 msgid "The default import order."
-msgstr "La police par défaut du thème."
+msgstr ""
 
 #: doc/classes/ResourceImporter.xml
 msgid ""
@@ -64739,13 +65349,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/ResourceInteractiveLoader.xml
-#, fuzzy
 msgid ""
 "Returns the loaded resource if the load operation completed successfully, "
 "[code]null[/code] otherwise."
 msgstr ""
-"Retourne [code]true[/code] si la chaîne de caractères commence par la chaîne "
-"de caractères donnée, ou [code]false[/code] le cas échéant."
 
 #: doc/classes/ResourceInteractiveLoader.xml
 msgid ""
@@ -65147,9 +65754,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/RichTextLabel.xml
-#, fuzzy
 msgid "Returns the current selection text. Does not include BBCodes."
-msgstr "Retourne le numéro de la ligne actuelle."
+msgstr ""
 
 #: doc/classes/RichTextLabel.xml
 msgid ""
@@ -65445,24 +66051,20 @@ msgid "Makes text fill width."
 msgstr "Rempli le texte en largeur."
 
 #: doc/classes/RichTextLabel.xml
-#, fuzzy
 msgid "Aligns top of the inline image to the top of the text."
-msgstr "La hauteur de la boite mesuré depuis son centre."
+msgstr ""
 
 #: doc/classes/RichTextLabel.xml
-#, fuzzy
 msgid "Aligns center of the inline image to the center of the text."
-msgstr "Aligne les enfants avec le centre du conteneur."
+msgstr ""
 
 #: doc/classes/RichTextLabel.xml
-#, fuzzy
 msgid "Aligns bottom of the inline image to the baseline of the text."
-msgstr "La hauteur de la boite mesuré depuis son centre."
+msgstr ""
 
 #: doc/classes/RichTextLabel.xml
-#, fuzzy
 msgid "Aligns bottom of the inline image to the bottom of the text."
-msgstr "Aligne les enfants avec le centre du conteneur."
+msgstr ""
 
 #: doc/classes/RichTextLabel.xml
 msgid "Each list item has a number marker."
@@ -65543,7 +66145,6 @@ msgid "The default text font."
 msgstr "La police par défaut du texte."
 
 #: doc/classes/RichTextLabel.xml
-#, fuzzy
 msgid "The background used when the [RichTextLabel] is focused."
 msgstr "L'arrière-plan utilisé quand le [RichTextLabel] a le focus."
 
@@ -65685,16 +66286,15 @@ msgid "Locks the specified linear or rotational axis."
 msgstr "Verrouille l'axe linéaire et de rotation spécifié."
 
 #: doc/classes/RigidBody.xml
-#, fuzzy
 msgid ""
 "Damps the body's rotational forces. If this value is different from -1.0 it "
 "will be added to any angular damp derived from the world or areas.\n"
 "See [member ProjectSettings.physics/3d/default_angular_damp] for more "
 "details about damping."
 msgstr ""
-"La vitesse à laquelle les objets arrêtent de tourner dans cette zone. "
-"Représente la vitesse angulaire perdue par seconde.\n"
-"Voir [membre ProjectSettings.physics/2d/default_angular_damp] pour plus de "
+"Amortit les forces de rotation du corps. Si cette valeur est différente de -"
+"1.0, elle sera ajoutée aux amortissements obtenues du monde et des aires.\n"
+"Voir [membre ProjectSettings.physics/3d/default_angular_damp] pour plus de "
 "détails sur l'amortissement."
 
 #: doc/classes/RigidBody.xml
@@ -66017,9 +66617,8 @@ msgid "The body's total applied force."
 msgstr "La force appliquée totale du corps."
 
 #: doc/classes/RigidBody2D.xml
-#, fuzzy
 msgid "The body's total applied torque."
-msgstr "La force appliquée totale du corps."
+msgstr "La force totale appliquée au corps."
 
 #: doc/classes/RigidBody2D.xml
 msgid ""
@@ -66581,9 +67180,8 @@ msgid "Path to an [AnimationTree] node to use as a basis for root motion."
 msgstr ""
 
 #: doc/classes/RootMotionView.xml
-#, fuzzy
 msgid "The grid's cell size in 3D units."
-msgstr "La taille de cellule du TileMap."
+msgstr "La taille de cellule de la grille en unités 3D."
 
 #: doc/classes/RootMotionView.xml
 msgid "The grid's color."
@@ -66596,14 +67194,11 @@ msgid ""
 msgstr ""
 
 #: doc/classes/RootMotionView.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], the grid's points will all be on the same Y coordinate "
 "([i]local[/i] Y = 0). If [code]false[/code], the points' original Y "
 "coordinate is preserved."
 msgstr ""
-"Si [code]true[/code], l’état de la clé est pressé. Si [code]false[/code], "
-"l’état de la clé est libéré."
 
 #: doc/classes/SceneState.xml
 msgid "A script interface to a scene file's data."
@@ -67000,13 +67595,11 @@ msgid ""
 msgstr ""
 
 #: doc/classes/SceneTree.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], the application automatically accepts quitting.\n"
 "For mobile platforms, see [member quit_on_go_back]."
 msgstr ""
-"Si [code]true[/code], l'application accepte automatiquement de se fermer. "
-"Activé par défaut.\n"
+"Si [code]true[/code], l'application accepte automatiquement de se fermer.\n"
 "Pour les plateformes mobiles, voir [method set_quit_on_go_back]."
 
 #: doc/classes/SceneTree.xml
@@ -67093,9 +67686,8 @@ msgstr ""
 "les nouvelles connexions entrantes."
 
 #: doc/classes/SceneTree.xml
-#, fuzzy
 msgid "The [SceneTree]'s root [Viewport]."
-msgstr "La [Window] racine de [SceneTree]."
+msgstr "La [Viewport] racine du [SceneTree]."
 
 #: doc/classes/SceneTree.xml
 msgid ""
@@ -67133,9 +67725,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/SceneTree.xml
-#, fuzzy
 msgid "Emitted whenever global menu item is clicked."
-msgstr "Émis lorsqu’un élément est sélectionné."
+msgstr "Émis quand le menu global est cliqué."
 
 #: doc/classes/SceneTree.xml
 msgid ""
@@ -67177,9 +67768,8 @@ msgid "Emitted whenever a node is removed from the [SceneTree]."
 msgstr "Émit quand un nœud est retiré du [SceneTree]."
 
 #: doc/classes/SceneTree.xml
-#, fuzzy
 msgid "Emitted whenever a node is renamed."
-msgstr "Émis chaque fois qu’un nœud est renommé."
+msgstr "Émis quand un nœud est renommé."
 
 #: doc/classes/SceneTree.xml
 msgid ""
@@ -67279,7 +67869,6 @@ msgid "One-shot timer."
 msgstr "Minuteur à un coup."
 
 #: doc/classes/SceneTreeTimer.xml
-#, fuzzy
 msgid ""
 "A one-shot timer managed by the scene tree, which emits [signal timeout] on "
 "completion. See also [method SceneTree.create_timer].\n"
@@ -67305,16 +67894,16 @@ msgstr ""
 "    yield(get_tree().create_timer(1.0), \"timeout\")\n"
 "    print(\"Minuteur terminé.\")\n"
 "[/codeblock]\n"
-"Le minuteur sera automatiquement une fois terminé."
+"Le minuteur sera automatiquement une fois terminé. Pour garder le minuteur, "
+"vous pouvez maintenir une référence vers lui. Voir [Reference]."
 
 #: doc/classes/SceneTreeTimer.xml
 msgid "The time remaining (in seconds)."
 msgstr "Le temps restant (en secondes)."
 
 #: doc/classes/SceneTreeTimer.xml doc/classes/Timer.xml
-#, fuzzy
 msgid "Emitted when the timer reaches 0."
-msgstr "Émis lorsque la minuterie atteint 0."
+msgstr "Émis quand le minuteur atteint 0."
 
 #: doc/classes/SceneTreeTween.xml
 msgid ""
@@ -67692,7 +68281,6 @@ msgstr ""
 "[/codeblock]"
 
 #: doc/classes/SceneTreeTween.xml
-#, fuzzy
 msgid ""
 "Creates and appends an [IntervalTweener]. This method can be used to create "
 "delays in the tween animation, as an alternative to using the delay in other "
@@ -67722,7 +68310,7 @@ msgstr ""
 "délais des autres [Tweener] ou quand il n'y a pas d'animation (dans ce cas "
 "le [SceneTreeTween] se comportement comme un minuteur). [code]time[/code] "
 "est le durée du délai, en secondes.\n"
-"Exemple : créer un délai de 2s dans l'exécution du code.\n"
+"Exemple : créer un délai dans l'exécution du code.\n"
 "[codeblock]\n"
 "# ... du code\n"
 "yield(create_tween().tween_interval(2), \"finished\")\n"
@@ -67796,7 +68384,6 @@ msgstr ""
 "[/codeblock]"
 
 #: doc/classes/SceneTreeTween.xml
-#, fuzzy
 msgid ""
 "Creates and appends a [PropertyTweener]. This method tweens a "
 "[code]property[/code] of an [code]object[/code] between an initial value and "
@@ -67838,14 +68425,14 @@ msgstr ""
 "tween.tween_property($Sprite, \"position\", Vector2(200, 300), 1)\n"
 "[/codeblock]\n"
 "déplacera la sprite de sa position actuelle à la position (100, 200) puis "
-"ensuite à (200, 300). Si vous utilisez [method PropertyTweener.from] ou "
-"[method PropertyTweener.from_current], la position de départ sera celle "
+"ensuite à (200, 300). Si vous utilisez [method PropertyTweener.from] ou ["
+"method PropertyTweener.from_current], la position de départ sera celle "
 "spécifiée et non l'actuelle. Voir les autres méthodes de [PropertyTweener] "
 "pour connaitre les possibilités.\n"
 "[b]Note :[/b] Vous pouvez trouver les noms corrects des propriétés en "
 "survolant ces propriétés dans l'inspecteur de Godot. Vous pouvez aussi "
-"fournir un seul composant de cette propriété directement en utilisant "
-"[code]\"property:component\"[/code] (ex. [code]position:x[/code]), alors "
+"fournir un seul composant de cette propriété directement en utilisant [code]"
+"\"property:component\"[/code] (ex. [code]position:x[/code]), alors "
 "l'interpolation ne se fera que sur cet unique composant.\n"
 "Exemple : déplacer un objet deux fois depuis la même position vers "
 "différentes positions, avec différents types de transition.\n"
@@ -67893,11 +68480,10 @@ msgid "If [SceneTree] is paused, the [SceneTreeTween] will also pause."
 msgstr "Si le [SceneTree] est en pause, le [SceneTreeTween] le sera aussi."
 
 #: doc/classes/SceneTreeTween.xml
-#, fuzzy
 msgid ""
 "The [SceneTreeTween] will process regardless of whether [SceneTree] is "
 "paused."
-msgstr "Arrête la mise à jour quand le [SceneTree] est en pause."
+msgstr ""
 
 #: doc/classes/Script.xml
 msgid "A class stored as a resource."
@@ -68233,7 +68819,6 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Shader.xml
-#, fuzzy
 msgid "A custom shader program."
 msgstr "Un programme de shader personnalisé."
 
@@ -68583,9 +69168,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Skeleton.xml
-#, fuzzy
 msgid "Sets the pose transform for bone [code]bone_idx[/code]."
-msgstr "Définit le décalage à partir de [code]0.5[/code]."
+msgstr ""
 
 #: doc/classes/Skeleton.xml
 msgid "Sets the rest transform for bone [code]bone_idx[/code]."
@@ -68925,14 +69509,12 @@ msgid ""
 msgstr ""
 
 #: doc/classes/SoftBody.xml
-#, fuzzy
 msgid "Returns local translation of a vertex in the surface array."
-msgstr "Renvoie la matrice de transformation d’une forme dans une zone."
+msgstr ""
 
 #: doc/classes/SoftBody.xml
-#, fuzzy
 msgid "Returns [code]true[/code] if vertex is set to pinned."
-msgstr "Retourne [code]true[/code] si l'[AABB] est plate ou vide."
+msgstr ""
 
 #: doc/classes/SoftBody.xml
 msgid ""
@@ -68968,13 +69550,10 @@ msgid "[NodePath] to a [CollisionObject] this SoftBody should avoid clipping."
 msgstr ""
 
 #: doc/classes/SoftBody.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], the [SoftBody] is simulated in physics. Can be set to "
 "[code]false[/code] to pause the physics simulation."
 msgstr ""
-"Si [code]true[/code], l’état de la clé est pressé. Si [code]false[/code], "
-"l’état de la clé est libéré."
 
 #: doc/classes/SoftBody.xml
 msgid "If [code]true[/code], the [SoftBody] will respond to [RayCast]s."
@@ -69695,7 +70274,6 @@ msgstr ""
 "à un point donné."
 
 #: doc/classes/SpatialMaterial.xml
-#, fuzzy
 msgid ""
 "Forces a conversion of the [member albedo_texture] from sRGB space to linear "
 "space."
@@ -69887,11 +70465,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/SpatialMaterial.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], enables the vertex grow setting. See [member "
 "params_grow_amount]."
-msgstr "Si [code]true[/code], active le drapeau spécifié."
+msgstr ""
 
 #: doc/classes/SpatialMaterial.xml
 msgid "Grows object vertices in the direction of their normals."
@@ -70178,9 +70755,8 @@ msgid "Texture specifying per-pixel depth."
 msgstr "La texture spécifiant la profondeur par pixel."
 
 #: doc/classes/SpatialMaterial.xml
-#, fuzzy
 msgid "Texture specifying per-pixel subsurface scattering."
-msgstr "La texture spécifiant par pixel de diffusion souterraine."
+msgstr "La texture spécifiant la transluminescence par pixel."
 
 #: doc/classes/SpatialMaterial.xml
 msgid "Texture specifying per-pixel transmission color."
@@ -70392,10 +70968,9 @@ msgstr ""
 "emission_texture]."
 
 #: doc/classes/SpatialMaterial.xml
-#, fuzzy
 msgid "Use alpha scissor. Set by [member params_use_alpha_scissor]."
 msgstr ""
-"Utilise un ciseau pour l'alpha. Définit par [member "
+"Utilise un ciseau pour l'opacité. Définit par [member "
 "params_use_alpha_scissor]."
 
 #: doc/classes/SpatialMaterial.xml
@@ -70819,9 +71394,8 @@ msgstr ""
 "collision."
 
 #: doc/classes/SpringArm.xml
-#, fuzzy
 msgid "Returns the spring arm's current length."
-msgstr "Retourne la chaîne de caractères convertie en minuscules."
+msgstr ""
 
 #: doc/classes/SpringArm.xml
 msgid ""
@@ -71046,7 +71620,6 @@ msgid "The size of one pixel's width on the sprite to scale it in 3D."
 msgstr "La taille d'un des pixels de la sprite pour définir sa taille en 3D."
 
 #: doc/classes/SpriteBase3D.xml
-#, fuzzy
 msgid ""
 "Sets the render priority for the sprite. Higher priority objects will be "
 "sorted in front of lower priority objects.\n"
@@ -71057,22 +71630,21 @@ msgid ""
 "This is because opaque objects are not sorted, while transparent objects are "
 "sorted from back to front (subject to priority)."
 msgstr ""
-"Définit la priorité de rendu pour le texte. Des objets plus prioritaires "
-"seront affichés par-dessus des objets moins inférieurs.\n"
-"[b]Note: [/b] Cela ne s'applique que si [member alpha_cut] est défini à "
-"[constant ALPHA_CUT_DISABLED] (c'est la valeur par défaut).\n"
+"Définit la priorité de rendu pour le texte. Les objets plus prioritaires "
+"seront affichés par-dessus les objets les moins prioritaites.\n"
+"[b]Note :[/b] Cela ne s'applique que si [member alpha_cut] est défini à ["
+"constant ALPHA_CUT_DISABLED] (c'est la valeur par défaut).\n"
 "[b]Note :[/b] Cela ne s'applique qu'au tri des objets transparents. Cela "
 "n'affectera pas la façon dont les objets transparents sont triés par rapport "
 "aux objets opaques. C'est parce que les objets opaques ne sont pas triés, "
-"alors que les objets transparents sont triés de l'arrière à l'avant (et "
+"alors que les objets transparents sont triés de l'arrière vers l'avant (et "
 "suivant leur priorité)."
 
 #: doc/classes/SpriteBase3D.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], the [Light] in the [Environment] has effects on the "
 "sprite."
-msgstr "Si [code]true[/code], ce [HTTPClient] a une réponse disponible."
+msgstr ""
 
 #: doc/classes/SpriteBase3D.xml
 msgid ""
@@ -71132,13 +71704,10 @@ msgid "Removes all animations. A \"default\" animation will be created."
 msgstr "Retire toutes les animations. Une animation \"défaut\" sera créée."
 
 #: doc/classes/SpriteFrames.xml
-#, fuzzy
 msgid ""
 "Returns [code]true[/code] if the given animation is configured to loop when "
 "it finishes playing. Otherwise, returns [code]false[/code]."
 msgstr ""
-"Retourne [code]true[/code] si la piste donnée est importée. Sinon retourne "
-"[code]false[/code]."
 
 #: doc/classes/SpriteFrames.xml
 msgid ""
@@ -71460,9 +72029,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/StreamPeerBuffer.xml
-#, fuzzy
 msgid "Data buffer stream peer."
-msgstr "Homologue de flux SSL."
+msgstr ""
 
 #: doc/classes/StreamPeerBuffer.xml
 msgid ""
@@ -72361,22 +72929,20 @@ msgstr ""
 "répétitions est donné en argument."
 
 #: doc/classes/String.xml
-#, fuzzy
 msgid ""
 "Replaces occurrences of a case-sensitive substring with the given one inside "
 "the string."
 msgstr ""
-"Remplacer les occurrences d'une sous-chaine sensible à la casse avec l'autre "
-"donnée."
+"Remplace les occurrences sensibles à la casse à l'intérieur d'une chaine par "
+"la sous-chaine donnée."
 
 #: doc/classes/String.xml
-#, fuzzy
 msgid ""
 "Replaces occurrences of a case-insensitive substring with the given one "
 "inside the string."
 msgstr ""
-"Remplacer les occurrences d'une sous-chaine insensible à la casse avec "
-"l'autre donnée."
+"Remplace les occurrences insensibles à la casse à l'intérieur d'une chaine "
+"par la sous-chaine donnée."
 
 #: doc/classes/String.xml
 msgid ""
@@ -72893,7 +73459,6 @@ msgstr ""
 "[code]corner[/code] spécifié. Voir [enum Corner] pour les valeurs possibles."
 
 #: doc/classes/StyleBoxFlat.xml
-#, fuzzy
 msgid "Sets the corner radius to [code]radius[/code] pixels for all corners."
 msgstr ""
 "Définit le rayon d’angle sur [code]radius[/code] pixels pour tous les coins."
@@ -73629,11 +74194,11 @@ msgstr ""
 "est désactivé."
 
 #: doc/classes/TabContainer.xml
-#, fuzzy
 msgid ""
 "Returns [code]true[/code] if the tab at index [code]tab_idx[/code] is hidden."
 msgstr ""
-"Retourne [code]true[/code] si la piste à l'index [code]idx[/code] est active."
+"Retourne [code]true[/code] si l'onglet à l'index [code]tab_idx[/code] est "
+"masqué."
 
 #: doc/classes/TabContainer.xml doc/classes/Tabs.xml
 msgid ""
@@ -73701,13 +74266,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/TabContainer.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], all tabs are drawn in front of the panel. If "
 "[code]false[/code], inactive tabs are drawn behind the panel."
 msgstr ""
-"Si [code]true[/code], l’état de la clé est pressé. Si [code]false[/code], "
-"l’état de la clé est libéré."
 
 #: doc/classes/TabContainer.xml
 msgid ""
@@ -73858,12 +74420,11 @@ msgid "Tabs control."
 msgstr "Contrôle des onglets."
 
 #: doc/classes/Tabs.xml
-#, fuzzy
 msgid ""
 "Simple tabs control, similar to [TabContainer] but is only in charge of "
 "drawing tabs, not interacting with children."
 msgstr ""
-"Contrôle des onglets simples, similaire à [TabContainer] mais il est "
+"Un contrôle simple des onglets, similaire à [TabContainer] mais il est "
 "uniquement chargé du dessin des onglets, et non de l’interaction avec les "
 "enfants."
 
@@ -73941,12 +74502,10 @@ msgid "Select tab at index [code]tab_idx[/code]."
 msgstr "Sélectionne l'onglet à l'index [code]tab_idx[/code]."
 
 #: doc/classes/Tabs.xml
-#, fuzzy
 msgid ""
 "if [code]true[/code], the mouse's scroll wheel can be used to navigate the "
 "scroll view."
 msgstr ""
-"Si [code]true[/code], l’état du bouton de la souris est un double-clic."
 
 #: doc/classes/Tabs.xml
 msgid "The alignment of all tabs. See [enum TabAlign] for details."
@@ -74189,9 +74748,8 @@ msgid "Returns the amount of total lines in the text."
 msgstr "Retourne le nombre total de lignes dans le texte."
 
 #: doc/classes/TextEdit.xml
-#, fuzzy
 msgid "Returns the height of a largest line."
-msgstr "Retourne la hauteur du contenu."
+msgstr ""
 
 #: doc/classes/TextEdit.xml
 msgid ""
@@ -74202,14 +74760,12 @@ msgstr ""
 "code]."
 
 #: doc/classes/TextEdit.xml
-#, fuzzy
 msgid "Returns the number of times the given line is wrapped."
-msgstr "Renvoie le nombre de lignes visibles."
+msgstr ""
 
 #: doc/classes/TextEdit.xml
-#, fuzzy
 msgid "Returns an array of [String]s representing each wrapped index."
-msgstr "Retourne une représentation [String] de l'évènement."
+msgstr ""
 
 #: doc/classes/TextEdit.xml
 msgid ""
@@ -74254,19 +74810,16 @@ msgid "Returns the selection end line."
 msgstr "Retourne la ligne de fin de sélection."
 
 #: doc/classes/TextEdit.xml
-#, fuzzy
 msgid "Returns the total width of all gutters and internal padding."
-msgstr "Retourne le nombre de pistes dans l'animation."
+msgstr ""
 
 #: doc/classes/TextEdit.xml
-#, fuzzy
 msgid "Returns the total amount of lines that could be drawn."
-msgstr "Retourne la position du contact sur le collisionneur."
+msgstr ""
 
 #: doc/classes/TextEdit.xml
-#, fuzzy
 msgid "Returns the number of visible lines, including wrapped text."
-msgstr "Renvoie le nombre de lignes visibles."
+msgstr ""
 
 #: doc/classes/TextEdit.xml
 msgid ""
@@ -74309,34 +74862,26 @@ msgstr ""
 "marque-page."
 
 #: doc/classes/TextEdit.xml
-#, fuzzy
 msgid ""
 "Returns [code]true[/code] when the specified [code]line[/code] has a "
 "breakpoint."
 msgstr ""
-"Retourne [code]true[/code] si la piste à l'index [code]idx[/code] est active."
 
 #: doc/classes/TextEdit.xml
-#, fuzzy
 msgid ""
 "Returns [code]true[/code] when the specified [code]line[/code] is marked as "
 "safe."
 msgstr ""
-"Retourne [code]true[/code] si la piste à l'index [code]idx[/code] est active."
 
 #: doc/classes/TextEdit.xml
-#, fuzzy
 msgid "Returns if the given line is wrapped."
-msgstr "Renvoie le texte de la colonne donnée."
+msgstr ""
 
 #: doc/classes/TextEdit.xml
-#, fuzzy
 msgid ""
 "Returns whether the mouse is over selection. If [code]edges[/code] is "
 "[code]true[/code], the edges are considered part of the selection."
 msgstr ""
-"Renvoie [code]true[/code] (vrai) si [code]a[/code] et [code]b[/code] sont "
-"approximativement égaux l'un à l'autre."
 
 #: doc/classes/TextEdit.xml
 msgid "Returns [code]true[/code] if the selection is active."
@@ -74412,15 +74957,14 @@ msgid "Sets the text for a specific line."
 msgstr "Définit le texte pour la ligne spécifiée."
 
 #: doc/classes/TextEdit.xml
-#, fuzzy
 msgid ""
 "Bookmarks the [code]line[/code] if [code]bookmark[/code] is [code]true[/"
 "code]. Deletes the bookmark if [code]bookmark[/code] is [code]false[/code].\n"
 "Bookmarks are shown in the [member breakpoint_gutter]."
 msgstr ""
-"Ajoute un marque-page pour la ligne [code]line[/code] si [code]bookmark[/"
-"code] est [code]true[/code]. Supprime le marque-page si [code]bookmark[/"
-"code] est [code]false[/code].\n"
+"Ajoute un marque-page pour la ligne [code]line[/code] si "
+"[code]bookmark[/code] est [code]true[/code]. Supprime le marque-page si "
+"[code]bookmark[/code] est [code]false[/code].\n"
 "Les marque-pages sont affichés dans [member breakpoint_gutter]."
 
 #: doc/classes/TextEdit.xml
@@ -74486,9 +75030,8 @@ msgid "If [code]true[/code], a right-click displays the context menu."
 msgstr "Si [code]true[/code], un clic droit affiche le menu contextuel."
 
 #: doc/classes/TextEdit.xml
-#, fuzzy
 msgid "If [code]true[/code], allow drag and drop of selected text."
-msgstr "Si [code]true[/code], la valeur peut être sélectionnée et modifiée."
+msgstr ""
 
 #: doc/classes/TextEdit.xml
 msgid ""
@@ -74592,13 +75135,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/TextEdit.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], any custom color properties that have been set for "
 "this [TextEdit] will be visible."
 msgstr ""
-"Si [code]true[/code], les présélections de couleurs enregistrées sont "
-"visibles."
 
 #: doc/classes/TextEdit.xml
 msgid "String value of the [TextEdit]."
@@ -74748,9 +75288,8 @@ msgstr ""
 "Définit le [StyleBox] de ce [TextEdit] quand [member readonly] est activé."
 
 #: doc/classes/TextMesh.xml
-#, fuzzy
 msgid "Generate an [PrimitiveMesh] from the text."
-msgstr "Générer un [TriangleMesh] à partir du maillage."
+msgstr "Génère un [PrimitiveMesh] à partir du texte."
 
 #: doc/classes/TextMesh.xml
 msgid ""
@@ -74775,9 +75314,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/TextMesh.xml
-#, fuzzy
 msgid "[Font] used for the [TextMesh]'s text."
-msgstr "[Font] utilisée pour le texte du [Label]."
+msgstr "La [Font] utilisée pour le texte du [TextMesh]."
 
 #: doc/classes/TextMesh.xml
 msgid ""
@@ -74786,14 +75324,12 @@ msgid ""
 msgstr ""
 
 #: doc/classes/TextMesh.xml
-#, fuzzy
 msgid "The size of one pixel's width on the text to scale it in 3D."
-msgstr "La taille d'un des pixels de la sprite pour définir sa taille en 3D."
+msgstr "La taille d'un des pixels du texte pour définir sa taille en 3D."
 
 #: doc/classes/TextMesh.xml
-#, fuzzy
 msgid "The text to generate mesh from."
-msgstr "Le type à partir duquel obtenir la constante."
+msgstr ""
 
 #: doc/classes/Texture.xml
 msgid "Texture for 2D and 3D."
@@ -74851,9 +75387,8 @@ msgid "Returns the texture width."
 msgstr "Renvoie la largeur de texture."
 
 #: doc/classes/Texture.xml
-#, fuzzy
 msgid "Returns [code]true[/code] if this [Texture] has an alpha channel."
-msgstr "Retourne [code]true[/code] (vrai) si la chaîne de caractères est vide."
+msgstr ""
 
 #: doc/classes/Texture.xml
 msgid ""
@@ -74912,9 +75447,8 @@ msgid "Texture is a video surface."
 msgstr "La texture est une surface vidéo."
 
 #: doc/classes/Texture3D.xml
-#, fuzzy
 msgid "Texture with 3 dimensions."
-msgstr "Retourne les dimensions de bitmap."
+msgstr ""
 
 #: doc/classes/Texture3D.xml
 msgid ""
@@ -75498,46 +76032,33 @@ msgid "Clears all values on the theme."
 msgstr "Efface toutes les valeurs de ce thème."
 
 #: doc/classes/Theme.xml
-#, fuzzy
 msgid ""
 "Clears the [Color] at [code]name[/code] if the theme has [code]node_type[/"
 "code]."
-msgstr "Multiplie le transform [code]a[/code] par le transform [code]b[/code]."
+msgstr ""
 
 #: doc/classes/Theme.xml
-#, fuzzy
 msgid ""
 "Clears the constant at [code]name[/code] if the theme has [code]node_type[/"
 "code]."
 msgstr ""
-"Retourne [code]true[/code] si la chaîne de caractères est vide (longueur de "
-"la chaîne égale à [code]0[/code])."
 
 #: doc/classes/Theme.xml
-#, fuzzy
 msgid ""
 "Clears the [Font] at [code]name[/code] if the theme has [code]node_type[/"
 "code]."
 msgstr ""
-"Retourne [code]true[/code] si la chaîne de caractères est vide (longueur de "
-"la chaîne égale à [code]0[/code])."
 
 #: doc/classes/Theme.xml
-#, fuzzy
 msgid ""
 "Clears the icon at [code]name[/code] if the theme has [code]node_type[/code]."
 msgstr ""
-"Retourne [code]true[/code] si la chaîne de caractères est vide (longueur de "
-"la chaîne égale à [code]0[/code])."
 
 #: doc/classes/Theme.xml
-#, fuzzy
 msgid ""
 "Clears [StyleBox] at [code]name[/code] if the theme has [code]node_type[/"
 "code]."
 msgstr ""
-"Retourne [code]true[/code] si la chaîne de caractères est vide (longueur de "
-"la chaîne égale à [code]0[/code])."
 
 #: doc/classes/Theme.xml
 msgid ""
@@ -75560,13 +76081,10 @@ msgid "Sets the theme's values to a copy of a given theme."
 msgstr "Définit les valeurs du thème à partir d'une copie d'un thème donné."
 
 #: doc/classes/Theme.xml
-#, fuzzy
 msgid ""
 "Returns the [Color] at [code]name[/code] if the theme has [code]node_type[/"
 "code]."
 msgstr ""
-"Retourne [code]true[/code] si la chaîne de caractères est vide (longueur de "
-"la chaîne égale à [code]0[/code])."
 
 #: doc/classes/Theme.xml
 msgid ""
@@ -75581,13 +76099,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Theme.xml
-#, fuzzy
 msgid ""
 "Returns the constant at [code]name[/code] if the theme has [code]node_type[/"
 "code]."
 msgstr ""
-"Retourne [code]true[/code] si la chaîne de caractères est vide (longueur de "
-"la chaîne égale à [code]0[/code])."
 
 #: doc/classes/Theme.xml
 msgid ""
@@ -75623,13 +76138,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Theme.xml
-#, fuzzy
 msgid ""
 "Returns the icon [Texture] at [code]name[/code] if the theme has "
 "[code]node_type[/code]."
 msgstr ""
-"Retourne [code]true[/code] si la chaîne de caractères est vide (longueur de "
-"la chaîne égale à [code]0[/code])."
 
 #: doc/classes/Theme.xml
 msgid ""
@@ -75706,11 +76218,9 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Theme.xml
-#, fuzzy
 msgid ""
 "Returns a list of all type variations for the given [code]base_type[/code]."
 msgstr ""
-"Retourne l'index de l'élément avec l'identifiant [code]id[/code] spécifié."
 
 #: doc/classes/Theme.xml
 msgid ""
@@ -75730,13 +76240,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Theme.xml
-#, fuzzy
 msgid ""
 "Returns [code]true[/code] if this theme has a valid [member default_font] "
 "value."
 msgstr ""
-"Retourne [code]true[/code] si la chaîne de caractères est vide (longueur de "
-"la chaîne égale à [code]0[/code])."
 
 #: doc/classes/Theme.xml
 msgid ""
@@ -75770,13 +76277,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Theme.xml
-#, fuzzy
 msgid ""
 "Returns [code]true[/code] if [code]theme_type[/code] is marked as a "
 "variation of [code]base_type[/code]."
 msgstr ""
-"Retourne [code]true[/code] si la piste donnée est importée. Sinon retourne "
-"[code]false[/code]."
 
 #: doc/classes/Theme.xml
 msgid ""
@@ -75903,9 +76407,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Theme.xml
-#, fuzzy
 msgid "Theme's [Color] item type."
-msgstr "Le type [Color] du thème."
+msgstr "Le type de l'élément [Color] du thème."
 
 #: doc/classes/Theme.xml
 msgid "Theme's constant item type."
@@ -76074,13 +76577,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/TileMap.xml
-#, fuzzy
 msgid ""
 "Returns an array of all cells with the given tile index specified in "
 "[code]id[/code]."
 msgstr ""
-"Renvoie la texture de l’atlas de police de caractères à l’index [code]idx[/"
-"code]."
 
 #: doc/classes/TileMap.xml
 msgid "Returns a rectangle enclosing the used (non-empty) tiles of the map."
@@ -76195,9 +76695,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/TileMap.xml
-#, fuzzy
 msgid "If [code]true[/code], this TileMap bakes a navigation region."
-msgstr "Si [code]true[/code], l'animation nommée existe."
+msgstr ""
 
 #: doc/classes/TileMap.xml
 #, fuzzy
@@ -76231,11 +76730,10 @@ msgstr ""
 "valeurs possibles."
 
 #: doc/classes/TileMap.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], the TileMap's direct children will be drawn in order "
 "of their Y coordinate."
-msgstr "Si [code]true[/code], la frontière de la ligne sera anti-aliasée."
+msgstr ""
 
 #: doc/classes/TileMap.xml
 msgid ""
@@ -76391,7 +76889,6 @@ msgid "Tile origin at its bottom-left corner."
 msgstr "Origine de tuile à son coin inférieur gauche."
 
 #: doc/classes/TileSet.xml
-#, fuzzy
 msgid "Tile library for tilemaps."
 msgstr "La bibliothèque des tuiles pour les cartes."
 
@@ -77233,7 +77730,6 @@ msgstr ""
 "[InputEventAction]."
 
 #: doc/classes/TouchScreenButton.xml
-#, fuzzy
 msgid "The button's bitmask."
 msgstr "Le masque binaire du bouton."
 
@@ -77644,9 +78140,8 @@ msgid "Clears the server from all translations."
 msgstr "Efface le serveur de toutes les traductions."
 
 #: doc/classes/TranslationServer.xml
-#, fuzzy
 msgid "Returns an array of all loaded locales of the project."
-msgstr "Renvoie la valeur absolue du paramètre."
+msgstr ""
 
 #: doc/classes/TranslationServer.xml
 msgid ""
@@ -77889,9 +78384,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Tree.xml
-#, fuzzy
 msgid "Causes the [Tree] to jump to the specified [TreeItem]."
-msgstr "Définit la position du nœud spécifié."
+msgstr ""
 
 #: doc/classes/Tree.xml
 msgid ""
@@ -78329,13 +78823,10 @@ msgstr ""
 "[code]column[/code]."
 
 #: doc/classes/TreeItem.xml
-#, fuzzy
 msgid ""
 "Returns the [Texture] of the button at index [code]button_idx[/code] in "
 "column [code]column[/code]."
 msgstr ""
-"Rentourne [code]true[/code] (vrai) si le bouton d'index [code]button[/code] "
-"est préssé. Voir [enum JoyButtonList]."
 
 #: doc/classes/TreeItem.xml
 msgid ""
@@ -78350,13 +78841,10 @@ msgid "Returns the number of buttons in column [code]column[/code]."
 msgstr "Retourne le nombre de boutons dans la colonne [code]column[/code]."
 
 #: doc/classes/TreeItem.xml
-#, fuzzy
 msgid ""
 "Returns the id for the button at index [code]button_idx[/code] in column "
 "[code]column[/code]."
 msgstr ""
-"Rentourne [code]true[/code] (vrai) si le bouton d'index [code]button[/code] "
-"est préssé. Voir [enum JoyButtonList]."
 
 #: doc/classes/TreeItem.xml
 msgid ""
@@ -78367,9 +78855,8 @@ msgstr ""
 "[code]button_idx[/code] dans la colonne [code]column[/code]."
 
 #: doc/classes/TreeItem.xml
-#, fuzzy
 msgid "Returns the column's cell mode."
-msgstr "Retourne le mode de la cellule de la colonne."
+msgstr "Retourne le mode des cellules de la colonne."
 
 #: doc/classes/TreeItem.xml
 msgid ""
@@ -78391,9 +78878,8 @@ msgid "Returns [code]true[/code] if [code]expand_right[/code] is set."
 msgstr "Retourne [code]true[/code] si [code]expand_right[/code] est défini."
 
 #: doc/classes/TreeItem.xml
-#, fuzzy
 msgid "Returns the given column's icon [Texture]. Error if no icon is set."
-msgstr "Retourne l'alignement du texte de la colonne donnée."
+msgstr ""
 
 #: doc/classes/TreeItem.xml
 msgid "Returns the column's icon's maximum width."
@@ -78414,16 +78900,14 @@ msgid ""
 msgstr ""
 
 #: doc/classes/TreeItem.xml
-#, fuzzy
 msgid ""
 "Returns the next sibling TreeItem in the tree or a null object if there is "
 "none."
 msgstr ""
-"Retourne le TreeItem précédent dans l'arbre ou un objet nul s'il n'y en a "
-"pas."
+"Retourne le TreeItem suivant dans l'arborescence, ou l'objet null s'il n'y "
+"en a pas."
 
 #: doc/classes/TreeItem.xml
-#, fuzzy
 msgid ""
 "Returns the next visible sibling TreeItem in the tree or a null object if "
 "there is none.\n"
@@ -78431,7 +78915,8 @@ msgid ""
 "visible element in the tree when called on the last visible element, "
 "otherwise it returns [code]null[/code]."
 msgstr ""
-"Retourne le TreeItem suivant visible dans l'arborescence ou null si aucun.\n"
+"Retourne le TreeItem voisin suivant visible dans l'arborescence, ou null si "
+"aucun.\n"
 "Si [code]wrap[/code] est activé, la méthode repartira depuis le premier "
 "élément visible de l'arborescence si elle est appelé sur le dernier élément, "
 "sinon elle retournera [code]null[/code]."
@@ -78441,16 +78926,14 @@ msgid "Returns the parent TreeItem or a null object if there is none."
 msgstr "Renvoie le TreeItem parent ou un objet nul s’il n’y en a pas."
 
 #: doc/classes/TreeItem.xml
-#, fuzzy
 msgid ""
 "Returns the previous sibling TreeItem in the tree or a null object if there "
 "is none."
 msgstr ""
-"Retourne le TreeItem précédent dans l'arbre ou un objet nul s'il n'y en a "
-"pas."
+"Retourne le TreeItem précédent dans l'arborescence, ou l'objet null s'il n'y "
+"en a pas."
 
 #: doc/classes/TreeItem.xml
-#, fuzzy
 msgid ""
 "Returns the previous visible sibling TreeItem in the tree or a null object "
 "if there is none.\n"
@@ -78458,8 +78941,8 @@ msgid ""
 "visible element in the tree when called on the first visible element, "
 "otherwise it returns [code]null[/code]."
 msgstr ""
-"Retourne le TreeItem précédent visible dans l'arborescence ou null si "
-"aucun.\n"
+"Retourne le TreeItem voisin précédent visible dans l'arborescence, ou null "
+"si aucun.\n"
 "Si [code]wrap[/code] est activé, la méthode repartira depuis le dernier "
 "élément visible de l'arborescence si elle est appelé sur le premier élément, "
 "sinon elle retournera [code]null[/code]."
@@ -78541,12 +79024,10 @@ msgid "Selects the column [code]column[/code]."
 msgstr "Sélectionne la colonne [code]column[/code]."
 
 #: doc/classes/TreeItem.xml
-#, fuzzy
 msgid ""
 "Sets the given column's button [Texture] at index [code]button_idx[/code] to "
 "[code]button[/code]."
 msgstr ""
-"Déplace l’élément de l’index [code]from_idx[/code] à [code]to_idx[/code]."
 
 #: doc/classes/TreeItem.xml
 msgid ""
@@ -78846,7 +79327,6 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Tween.xml
-#, fuzzy
 msgid ""
 "Resets all tweens to their initial values (the ones given, not those before "
 "the tween)."
@@ -79960,9 +80440,8 @@ msgid "Vertical box container."
 msgstr "Conteneur vertical."
 
 #: doc/classes/VBoxContainer.xml
-#, fuzzy
 msgid "Vertical box container. See [BoxContainer]."
-msgstr "Conteneur vertical. Voir [BoxContainer]."
+msgstr "Conteneur de boites vertical. Voir [BoxContainer]."
 
 #: doc/classes/VBoxContainer.xml
 msgid "The vertical space between the [VBoxContainer]'s elements."
@@ -80186,9 +80665,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Vector2.xml doc/classes/Vector3.xml
-#, fuzzy
 msgid "Returns this vector projected onto the vector [code]b[/code]."
-msgstr "Retourne le vecteur projeté sur le vecteur [code]b[/code]."
+msgstr "Retourne ce vecteur projeté sur le vecteur [code]b[/code]."
 
 #: doc/classes/Vector2.xml
 msgid ""
@@ -80197,13 +80675,12 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Vector2.xml
-#, fuzzy
 msgid ""
 "Returns the vector rotated by [code]angle[/code] (in radians). See also "
 "[method @GDScript.deg2rad]."
 msgstr ""
-"Retourne le vecteur pivoté par [code]phi[/code] en radians. Voir aussi "
-"[method @GDScript.deg2rad]."
+"Retourne le vecteur pivoté par [code]angle[/code] (en radians). Voir aussi ["
+"method @GDScript.deg2rad]."
 
 #: doc/classes/Vector2.xml doc/classes/Vector3.xml
 msgid ""
@@ -80805,7 +81282,6 @@ msgid ""
 msgstr ""
 
 #: modules/gdnative/doc_classes/VideoStreamGDNative.xml
-#, fuzzy
 msgid "[VideoStream] resource for video formats implemented via GDNative."
 msgstr ""
 "La ressource [VideoStream] pour les formats vidéo implémentés via GDNative."
@@ -80961,12 +81437,10 @@ msgid "Returns the topmost modal in the stack."
 msgstr "Retourne la vue exclusive la plus en avant dans la pile."
 
 #: doc/classes/Viewport.xml
-#, fuzzy
 msgid ""
 "Returns the mouse's position in this [Viewport] using the coordinate system "
 "of this [Viewport]."
 msgstr ""
-"Retourne la position de la souris par rapport à la position de cet élément."
 
 #: doc/classes/Viewport.xml
 msgid "Returns information about the viewport from the rendering pipeline."
@@ -80977,9 +81451,8 @@ msgid "Returns the [enum ShadowAtlasQuadrantSubdiv] of the specified quadrant."
 msgstr ""
 
 #: doc/classes/Viewport.xml
-#, fuzzy
 msgid "Returns the size override set with [method set_size_override]."
-msgstr "Renvoie le mode de remplacement de l’espace pour la zone."
+msgstr ""
 
 #: doc/classes/Viewport.xml
 msgid ""
@@ -81009,9 +81482,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Viewport.xml
-#, fuzzy
 msgid "Returns [code]true[/code] if there are visible modals on-screen."
-msgstr "Retourne [code]true[/code] si la colonne donnée est cochée."
+msgstr ""
 
 #: doc/classes/Viewport.xml
 msgid "Returns [code]true[/code] if the drag operation is successful."
@@ -81074,9 +81546,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Viewport.xml
-#, fuzzy
 msgid "If [code]true[/code], the viewport will be used in AR/VR process."
-msgstr "Si [code]true[/code], la texture sera centrée."
+msgstr ""
 
 #: doc/classes/Viewport.xml
 msgid "If [code]true[/code], the viewport will process 2D audio streams."
@@ -81260,10 +81731,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Viewport.xml
-#, fuzzy
 msgid "If [code]true[/code], the size override affects stretch as well."
 msgstr ""
-"Si [code]true[/code], le mouvement linéaire à travers l’axe Z est limité."
 
 #: doc/classes/Viewport.xml
 msgid ""
@@ -81294,9 +81763,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/Viewport.xml
-#, fuzzy
 msgid "The custom [World] which can be used as 3D environment source."
-msgstr "Une constante [Transform], qui peut être utilisée comme nœud d’entrée."
+msgstr ""
 
 #: doc/classes/Viewport.xml
 msgid "The custom [World2D] which can be used as 2D environment source."
@@ -81397,14 +81865,12 @@ msgid "Amount of surface changes in frame."
 msgstr "Le nombre de surfaces changées à chaque trame."
 
 #: doc/classes/Viewport.xml
-#, fuzzy
 msgid "Amount of draw calls in frame."
-msgstr "Le nombre d'appels d'affichage à chaque trame."
+msgstr "Le nombre d'appels de dessin à chaque trame."
 
 #: doc/classes/Viewport.xml
-#, fuzzy
 msgid "Amount of items or joined items in frame."
-msgstr "Quantité d’objets dans le cadre."
+msgstr ""
 
 #: doc/classes/Viewport.xml
 msgid "Represents the size of the [enum RenderInfo] enum."
@@ -81651,15 +82117,14 @@ msgid "This enabler will stop [Particles2D] nodes."
 msgstr "Cet activateur arrêtera les nœuds [Particles2D]."
 
 #: doc/classes/VisibilityEnabler2D.xml
-#, fuzzy
 msgid "This enabler will stop the parent's [method Node._process] function."
-msgstr "Cet activateur arrêtera la fonction _process du parent."
+msgstr "Cet activateur arrêtera la fonction [method Node._process] du parent."
 
 #: doc/classes/VisibilityEnabler2D.xml
-#, fuzzy
 msgid ""
 "This enabler will stop the parent's [method Node._physics_process] function."
-msgstr "Cet activateur arrêtera la fonction _physics_process du parent."
+msgstr ""
+"Cet activateur arrêtera la fonction [method Node._physics_process] du parent."
 
 #: doc/classes/VisibilityEnabler2D.xml
 msgid "This enabler will stop [AnimatedSprite] nodes animations."
@@ -81713,15 +82178,12 @@ msgid ""
 msgstr ""
 
 #: doc/classes/VisibilityNotifier.xml
-#, fuzzy
 msgid "Emitted when the VisibilityNotifier enters a [Camera]'s view."
-msgstr ""
-"Émis lorsque le VisibilityNotifier3D entre dans la vue d’un [Camera3D]."
+msgstr "Émis lorsque le VisibilityNotifier entre dans la vue d’un [Camera]."
 
 #: doc/classes/VisibilityNotifier.xml
-#, fuzzy
 msgid "Emitted when the VisibilityNotifier exits a [Camera]'s view."
-msgstr "Émis lorsque le VisibilityNotifier3D quitte la vue d'un [Camera3D]."
+msgstr "Émis lorsque le VisibilityNotifier quitte la vue d'un [Camera]."
 
 #: doc/classes/VisibilityNotifier.xml
 msgid "Emitted when the VisibilityNotifier enters the screen."
@@ -81754,9 +82216,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/VisibilityNotifier2D.xml
-#, fuzzy
 msgid "The VisibilityNotifier2D's bounding rectangle."
-msgstr "Rectangle englobant de VisibilityNotifier2D."
+msgstr "Le rectangle englobant du VisibilityNotifier2D."
 
 #: doc/classes/VisibilityNotifier2D.xml
 msgid "Emitted when the VisibilityNotifier2D enters the screen."
@@ -81794,6 +82255,8 @@ msgid ""
 "Returns the [AABB] (also known as the bounding box) for this "
 "[VisualInstance]. See also [method get_transformed_aabb]."
 msgstr ""
+"Retourne le [AABB] (\"bounding box\") pour cette [VisualInstance]. Voir "
+"aussi [method get_transformed_aaabb]."
 
 #: doc/classes/VisualInstance.xml
 msgid ""
@@ -81801,6 +82264,8 @@ msgid ""
 "example, if the Node is a [MeshInstance], this will return the RID of the "
 "associated [Mesh]."
 msgstr ""
+"Retourne le RID de la ressource associée à cette [VisualInstance]. Par "
+"exemple, si le nœud est une [MeshInstance], cela retournera le RID du [Mesh]."
 
 #: doc/classes/VisualInstance.xml
 msgid ""
@@ -81808,12 +82273,18 @@ msgid ""
 "by [method VisualServer.instance_create]. This RID is needed if you want to "
 "call [VisualServer] functions directly on this [VisualInstance]."
 msgstr ""
+"Retourne le RID de cette instance. Ce RID est le même que le RID retourné "
+"par [method VisualServer.instance_create]. Ce RID est nécessaire si vous "
+"voulez appeler les fonctions [VisualServer] directement sur cette "
+"[VisualInstance]."
 
 #: doc/classes/VisualInstance.xml
 msgid ""
 "Returns [code]true[/code] when the specified layer is enabled in [member "
 "layers] and [code]false[/code] otherwise."
 msgstr ""
+"Retourne [code]true[/code] si le calque spécifié est actif, ou "
+"[code]false[/code] sinon."
 
 #: doc/classes/VisualInstance.xml
 msgid ""
@@ -81822,6 +82293,11 @@ msgid ""
 "Transformed in this case means the [AABB] plus the position, rotation, and "
 "scale of the [Spatial]'s [Transform]. See also [method get_aabb]."
 msgstr ""
+"Retourne la [AABB] (\"bounding box\") transformée pour cette "
+"[VisualInstance].\n"
+"Transformé dans ce cas veut dire la [AABB] plus sa position, la rotation et "
+"la mise à l'échelle de la [Transform] du [Spatial]. Voir aussi [method "
+"get_aabb]."
 
 #: doc/classes/VisualInstance.xml
 msgid ""
@@ -81829,6 +82305,9 @@ msgid ""
 "changes how the engine handles the [VisualInstance] under the hood. "
 "Equivalent to [method VisualServer.instance_set_base]."
 msgstr ""
+"Définit la ressource qui est instanciée par cette [VisualInstance] qui "
+"modifie la façon dont le moteur gère la [VisualInstance] en interne. "
+"Équivalent à [method VisualServer.instance_set_base]."
 
 #: doc/classes/VisualInstance.xml
 msgid "Enables a particular layer in [member layers]."
@@ -81840,10 +82319,14 @@ msgid ""
 "This object will only be visible for [Camera]s whose cull mask includes the "
 "render object this [VisualInstance] is set to."
 msgstr ""
+"Le(s) calque(s) de rendu où cette [VisualInstance] est dessinée.\n"
+"Cet objet ne sera visible que pour les [Camera] où le masque de cull inclut "
+"l'objet de rendu auquel [VisualInstance] est défini."
 
 #: modules/visual_script/doc_classes/VisualScript.xml
 msgid "A script implemented in the Visual Script programming environment."
 msgstr ""
+"Un script implémenté dans l'environnement de programmation Visual Script."
 
 #: modules/visual_script/doc_classes/VisualScript.xml
 msgid ""
@@ -81872,6 +82355,8 @@ msgid ""
 "Add a variable to the VisualScript, optionally giving it a default value or "
 "marking it as exported."
 msgstr ""
+"Ajouter une variable au VisualScript, en option lui donnant une valeur par "
+"défaut ou la marquant comme exporté."
 
 #: modules/visual_script/doc_classes/VisualScript.xml
 msgid ""
@@ -81927,7 +82412,7 @@ msgstr ""
 
 #: modules/visual_script/doc_classes/VisualScript.xml
 msgid "Returns the id of a function's entry point node."
-msgstr ""
+msgstr "Retourne l'identifiant d'un nœud de point d'entrée de la fonction."
 
 #: modules/visual_script/doc_classes/VisualScript.xml
 msgid "Returns the position of the center of the screen for a given function."
@@ -81954,6 +82439,8 @@ msgid ""
 "Returns the information for a given variable as a dictionary. The "
 "information includes its name, type, hint and usage."
 msgstr ""
+"Retourne les informations d'une variable donnée dans un dictionnaire. Les "
+"informations comprennent son nom, son type, un indice et son usage."
 
 #: modules/visual_script/doc_classes/VisualScript.xml
 msgid "Returns whether a signal exists with the specified name."
@@ -82014,16 +82501,23 @@ msgid ""
 "Unlike [method data_connect], there isn't a [code]to_port[/code], since the "
 "target node can have only one sequence port."
 msgstr ""
+"Connecte deux ports d'une séquence. L'exécution passera de "
+"[code]from_output[/code] de [code]from_node[/code] vers [code]to_node[/code]."
+"\n"
+"Contrairement à [method data_connect], il n'y a pas ∂e [code]to_port[/code], "
+"puisque le nœud cible ne peut avoir qu'un seul port dans la séquence."
 
 #: modules/visual_script/doc_classes/VisualScript.xml
 msgid ""
 "Disconnect two sequence ports previously connected with [method "
 "sequence_connect]."
 msgstr ""
+"Déconnecte deux ports de séquence précédemment connectés avec [method "
+"sequence_connect]."
 
 #: modules/visual_script/doc_classes/VisualScript.xml
 msgid "Position the center of the screen for a function."
-msgstr ""
+msgstr "Positionne le centre de l'écran sur une fonction."
 
 #: modules/visual_script/doc_classes/VisualScript.xml
 msgid "Set the base type of the script."
@@ -82054,13 +82548,15 @@ msgstr "Émis quand les ports d'un nœud ont changés."
 
 #: modules/visual_script/doc_classes/VisualScriptBasicTypeConstant.xml
 msgid "A Visual Script node representing a constant from the base types."
-msgstr ""
+msgstr "Un nœud Visual Script représentant une constante d'un type de base."
 
 #: modules/visual_script/doc_classes/VisualScriptBasicTypeConstant.xml
 msgid ""
 "A Visual Script node representing a constant from base types, such as "
 "[constant Vector3.AXIS_X]."
 msgstr ""
+"Un nœud Visual Script représentant une constante des types de base, comme ["
+"constant Vector3.AXIS_X]."
 
 #: modules/visual_script/doc_classes/VisualScriptBasicTypeConstant.xml
 msgid "The type to get the constant from."
@@ -82072,7 +82568,7 @@ msgstr "Le nom de la constante à retourner."
 
 #: modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
 msgid "A Visual Script node used to call built-in functions."
-msgstr ""
+msgstr "Un nœud Visual Script utilisé pour appeler des fonctions intégrées."
 
 #: modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
 msgid ""
@@ -82080,6 +82576,9 @@ msgid ""
 "function or an utility function.\n"
 "See also [@GDScript], for the same functions in the GDScript language."
 msgstr ""
+"Une fonction intégrée utilisée dans un [VisualScript]. C'est généralement "
+"une fonction de mathématiques ou une fonction utilitaire.\n"
+"Voir aussi @[GDScript], pour les mêmes fonctions dans le langage GDScript."
 
 #: modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
 msgid "The function to be executed."
@@ -82126,6 +82625,8 @@ msgid ""
 "Return the arc tangent of the input, using the signs of both parameters to "
 "determine the exact angle."
 msgstr ""
+"Retourner l'arc tangente de l'entrée, en utilisant les signes des deux "
+"paramètres pour déterminer l'angle exact."
 
 #: modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
 msgid "Return the square root of the input."
@@ -82144,6 +82645,8 @@ msgid ""
 "Return the positive remainder of one input divided by the other, using "
 "floating-point numbers."
 msgstr ""
+"Retourner le reste positif d'une entrée divisée par l'autre, en utilisant "
+"des flottants."
 
 #: modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
 msgid "Return the input rounded down."
@@ -82166,6 +82669,8 @@ msgid ""
 "Return the sign of the input, turning it into 1, -1, or 0. Useful to "
 "determine if the input is positive or negative."
 msgstr ""
+"Retourner le signe de l'entrée, le transformant en 1, -1, ou 0. Utile pour "
+"déterminer si l'entrée est positive ou négative."
 
 #: modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
 msgid "Return the input raised to a given power."
@@ -82176,18 +82681,26 @@ msgid ""
 "Return the natural logarithm of the input. Note that this is not the typical "
 "base-10 logarithm function calculators use."
 msgstr ""
+"Retourner le logarithme népérien de l'entrée. Notez que ce n'est pas "
+"l'utilisation typique des calculatrices avec la fonction logarithme en "
+"base-10."
 
 #: modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
 msgid ""
 "Return the mathematical constant [b]e[/b] raised to the specified power of "
 "the input. [b]e[/b] has an approximate value of 2.71828."
 msgstr ""
+"Retourner la constante mathématique [b]e[/b] à la puissance spécifiée par "
+"l'entrée. [b]e[/b] a une valeur approximativement égal à 2.71828."
 
 #: modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
 msgid ""
 "Return whether the input is NaN (Not a Number) or not. NaN is usually "
 "produced by dividing 0 by 0, though other ways exist."
 msgstr ""
+"Retourne si l'entrée la valeur spéciale NaN qui signifie que ce n'est pas un "
+"nombre (\"Not a Number\") ou non. NaN est généralement produit en divisant 0 "
+"par 0, entre autre."
 
 #: modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
 msgid ""
@@ -82195,6 +82708,8 @@ msgid ""
 "Infinity is usually produced by dividing a number by 0, though other ways "
 "exist."
 msgstr ""
+"Retourne si l'entrée est un nombre flottant infini ou non. L'infini est "
+"généralement produit en divisant un nombre par 0, entre autre."
 
 #: modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
 msgid ""
@@ -82207,7 +82722,6 @@ msgstr ""
 "progressive."
 
 #: modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
-#, fuzzy
 msgid ""
 "Return the number of digit places after the decimal that the first non-zero "
 "digit occurs."
@@ -82217,13 +82731,16 @@ msgstr ""
 
 #: modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
 msgid "Return the input snapped to a given step."
-msgstr ""
+msgstr "Retourner l'entrée arrondie à l'étape donnée la plus proche."
 
 #: modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
 msgid ""
 "Return a number linearly interpolated between the first two inputs, based on "
 "the third input. Uses the formula [code]a + (a - b) * t[/code]."
 msgstr ""
+"Retourner un nombre linéairement interpolé entre les deux premières entrées, "
+"basé sur la troisième entrée. Utilise la formule [code]a + (a - b) * "
+"t[/code]."
 
 #: modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
 msgid "Moves the number toward a value, based on the third input."
@@ -82250,12 +82767,17 @@ msgid ""
 "N (where N is smaller than 2^32 - 1), you can use it with the remainder "
 "function."
 msgstr ""
+"Retourner une entier de 32 bits aléatoire. Pour obtenir une valeur aléatoire "
+"entre 0 et N (où N est plus petit que 2^32 - 1), vous pouvez l'utiliser avec "
+"la fonction modulo (retournant le reste de la division euclidienne)."
 
 #: modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
 msgid ""
 "Return a random floating-point value between 0 and 1. To obtain a random "
 "value between 0 to N, you can use it with multiplication."
 msgstr ""
+"Retourner un flottant aléatoire entre 0 et 1. Pour obtenir une valeur "
+"aléatoire entre 0 à N, vous pouvez multiplier cette valeur avec N."
 
 #: modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
 msgid "Return a random floating-point value between the two inputs."
@@ -82304,6 +82826,9 @@ msgid ""
 "never outside it. Equivalent to [code]min(max(input, range_low), range_high)"
 "[/code]."
 msgstr ""
+"Retourner l'entrée limitée à l'intervalle donné, s'assurant que le résultat "
+"n'est jamais en dehors de l'intervalle. Équivalent à [code]min(max(input, "
+"minimum), maximum)[/code]."
 
 #: modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
 msgid "Return the nearest power of 2 to the input."
@@ -82326,6 +82851,8 @@ msgid ""
 "Return the type of the input as an integer. Check [enum Variant.Type] for "
 "the integers that might be returned."
 msgstr ""
+"Retourner le type d'entrée en entier. Regardez [enum Variant.Type] pour les "
+"valeurs des entiers qui peuvent être retournés."
 
 #: modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
 msgid "Checks if a type is registered in the [ClassDB]."
@@ -82378,6 +82905,8 @@ msgid ""
 "Return the [Color] with the given name and alpha ranging from 0 to 1.\n"
 "[b]Note:[/b] Names are defined in [code]color_names.inc[/code]."
 msgstr ""
+"Retourner la [Color] avec le nom donné et alpha allant de 0 à 1.\n"
+"[b]Note :[/b] Les noms sont définis dans [code]color_names.inc[/code]."
 
 #: modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
 msgid ""
@@ -82389,6 +82918,14 @@ msgid ""
 "return t * t * (3.0 - 2.0 * t)\n"
 "[/codeblock]"
 msgstr ""
+"Retourner un nombre correctement interpolé entre les deux premières entrées, "
+"en fonction de la troisième entrée. Comme [constant MATH_LERP], mais "
+"interpole plus rapidement au début et plus lentement à la fin. Utiliser la "
+"formule d'interpolation de Hermite:\n"
+"[codeblock]\n"
+"var t = clamp((weight - from) / (to - from), 0.0, 1.0)\n"
+"return t * t * (3.0 - 2.0 * t)\n"
+"[/codeblock]"
 
 #: modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
 msgid "Represents the size of the [enum BuiltinFunc] enum."
@@ -82503,6 +83040,8 @@ msgid ""
 "A Visual Script node which calls a base type constructor. It can be used for "
 "type conversion as well."
 msgstr ""
+"Un nœud Visual Script qui appelle un constructeur de type de base. Il peut "
+"également être utilisé pour la conversion de type."
 
 #: modules/visual_script/doc_classes/VisualScriptCustomNode.xml
 msgid "A scripted Visual Script node."
@@ -82511,6 +83050,8 @@ msgstr "Un nœud Visual Script scripté."
 #: modules/visual_script/doc_classes/VisualScriptCustomNode.xml
 msgid "A custom Visual Script node which can be scripted in powerful ways."
 msgstr ""
+"Un nœud Visual Script personnalisé qui peut être scripté de plein de "
+"manières."
 
 #: modules/visual_script/doc_classes/VisualScriptCustomNode.xml
 msgid "Return the node's title."
@@ -82564,6 +83105,8 @@ msgid ""
 "Return the specified output port's hint. See the [enum @GlobalScope."
 "PropertyHint] hints."
 msgstr ""
+"Retourne l'indice du port de sortie spécifié. Voir les indices dans [enum "
+"@GlobalScope.PropertyHint]."
 
 #: modules/visual_script/doc_classes/VisualScriptCustomNode.xml
 msgid "Return the specified output port's hint string."
@@ -82574,10 +83117,11 @@ msgid "Return the specified output port's name."
 msgstr "Retourne le nom du port de sortie spécifié."
 
 #: modules/visual_script/doc_classes/VisualScriptCustomNode.xml
-#, fuzzy
 msgid ""
 "Return the specified output port's type. See the [enum Variant.Type] values."
-msgstr "Représente la taille de l'énumération [enum Variant.Type]."
+msgstr ""
+"Retourne le type du port de sortie spécifié. Voir [enum Variant.Type] "
+"valeurs."
 
 #: modules/visual_script/doc_classes/VisualScriptCustomNode.xml
 msgid ""
@@ -82585,6 +83129,9 @@ msgid ""
 "[b]sequence[/b] port (if there is none, on the place that is usually taken "
 "by it)."
 msgstr ""
+"Retourne le texte du nœud personnalisé, qui est affiché juste à côté du port "
+"d'entrée [b]séquence[/b] (s'il n'y en a aucun, à l'emplacement où "
+"habituellement pris par lui)."
 
 #: modules/visual_script/doc_classes/VisualScriptCustomNode.xml
 msgid ""
@@ -82617,18 +83164,24 @@ msgstr ""
 #: modules/visual_script/doc_classes/VisualScriptCustomNode.xml
 msgid "The start mode used the first time when [method _step] is called."
 msgstr ""
+"Le mode de démarrage a utilisé la première fois que [method _step] est "
+"appelée."
 
 #: modules/visual_script/doc_classes/VisualScriptCustomNode.xml
 msgid ""
 "The start mode used when [method _step] is called after coming back from a "
 "[constant STEP_PUSH_STACK_BIT]."
 msgstr ""
+"Le mode de démarrage utilisé lorsque [method _step] est appelé après être "
+"revenu de [constant STEP_PUSH_STACK_BIT]."
 
 #: modules/visual_script/doc_classes/VisualScriptCustomNode.xml
 msgid ""
 "The start mode used when [method _step] is called after resuming from "
 "[constant STEP_YIELD_BIT]."
 msgstr ""
+"Le mode de démarrage utilisé lorsque [method _step] est appelé après être "
+"revenu de [constant STEP_YIELD_BIT]."
 
 #: modules/visual_script/doc_classes/VisualScriptCustomNode.xml
 msgid ""
@@ -82644,6 +83197,9 @@ msgid ""
 "Hint used by [method _step] to tell that control should return back, either "
 "hitting a previous [constant STEP_PUSH_STACK_BIT] or exiting the function."
 msgstr ""
+"L'indice utilisé par [method _step] pour dire que la commande doit revenir, "
+"soit en atteignant un précédent [constant STEP_PUSH_STACK_BIT] ou en sortant "
+"de la fonction."
 
 #: modules/visual_script/doc_classes/VisualScriptCustomNode.xml
 msgid ""
@@ -82659,11 +83215,17 @@ msgid ""
 "Using this requires you to have at least one working memory slot, which is "
 "used for the [VisualScriptFunctionState]."
 msgstr ""
+"L'indice utilisé par [method _step] pour dire que la fonction doit être "
+"attendue.\n"
+"En utilisant cela, vous devez avoir au moins un emplacement de mémoire "
+"fonctionnel, qui est utilisé pour [VisualScriptFunctionState]."
 
 #: modules/visual_script/doc_classes/VisualScriptDeconstruct.xml
 msgid ""
 "A Visual Script node which deconstructs a base type instance into its parts."
 msgstr ""
+"Un nœud Visual Script qui déconstruit une instance de type de base en ses "
+"différentes parties."
 
 #: modules/visual_script/doc_classes/VisualScriptDeconstruct.xml
 msgid "The type to deconstruct."
@@ -82674,12 +83236,16 @@ msgid ""
 "Add a custom Visual Script node to the editor. It'll be placed under "
 "\"Custom Nodes\" with the [code]category[/code] as the parameter."
 msgstr ""
+"Ajoute un nœud Visual Script personnalisé à l'éditeur. Il sera placé sous "
+"\"Nœuds personnalisés\" avec la [code]category[/code] en paramètre."
 
 #: modules/visual_script/doc_classes/VisualScriptEditor.xml
 msgid ""
 "Remove a custom Visual Script node from the editor. Custom nodes already "
 "placed on scripts won't be removed."
 msgstr ""
+"Retire un nœud Visual Script personnalisé de l'éditeur. Les nœuds "
+"personnalisés déjà placés sur des scripts ne seront pas supprimés."
 
 #: modules/visual_script/doc_classes/VisualScriptEditor.xml
 msgid "Emitted when a custom Visual Script node is added or removed."
@@ -82697,6 +83263,11 @@ msgid ""
 "[b]Output Ports:[/b]\n"
 "- Sequence"
 msgstr ""
+"Émet un signal spécifié quand il est exécuté.\n"
+"[b]Ports d'entrée :[/b]\n"
+"- Séquence : [code]emit[/code]\n"
+"[b]Ports de sortie :[/b]\n"
+"- Séquence"
 
 #: modules/visual_script/doc_classes/VisualScriptEmitSignal.xml
 msgid "The signal to emit."
@@ -82704,16 +83275,15 @@ msgstr "Le signal à émettre."
 
 #: modules/visual_script/doc_classes/VisualScriptEngineSingleton.xml
 msgid "A Visual Script node returning a singleton from [@GlobalScope]."
-msgstr ""
+msgstr "Un nœud Visual Script retournant un singleton parmi @[GlobalScope]."
 
 #: modules/visual_script/doc_classes/VisualScriptEngineSingleton.xml
 msgid "The singleton's name."
 msgstr "Le nom du singleton."
 
 #: modules/visual_script/doc_classes/VisualScriptExpression.xml
-#, fuzzy
 msgid "A Visual Script node that can execute a custom expression."
-msgstr "Un nœud Visual Script utilisé pour annoter le script."
+msgstr "Un nœud Visual Script qui peut exécuter une expression personnalisée."
 
 #: modules/visual_script/doc_classes/VisualScriptExpression.xml
 msgid ""
@@ -82734,9 +83304,8 @@ msgid ""
 msgstr ""
 
 #: modules/visual_script/doc_classes/VisualScriptFunctionCall.xml
-#, fuzzy
 msgid "A Visual Script node for calling a function."
-msgstr "Un nœud Visual Script utilisé pour annoter le script."
+msgstr "Un nœud Visual Script pour appeler une fonction."
 
 #: modules/visual_script/doc_classes/VisualScriptFunctionCall.xml
 msgid ""
@@ -82750,6 +83319,8 @@ msgid ""
 "The script to be used when [member call_mode] is set to [constant "
 "CALL_MODE_INSTANCE]."
 msgstr ""
+"Le script à utiliser lorsque [member call_mode] est défini à [constant "
+"CALL_MODE_INSTANCE]."
 
 #: modules/visual_script/doc_classes/VisualScriptFunctionCall.xml
 #: modules/visual_script/doc_classes/VisualScriptYieldSignal.xml
@@ -82757,18 +83328,24 @@ msgid ""
 "The base type to be used when [member call_mode] is set to [constant "
 "CALL_MODE_INSTANCE]."
 msgstr ""
+"Le type de base à utiliser lorsque [member call_mode] est défini à [constant "
+"CALL_MODE_INSTANCE]."
 
 #: modules/visual_script/doc_classes/VisualScriptFunctionCall.xml
 msgid ""
 "The type to be used when [member call_mode] is set to [constant "
 "CALL_MODE_BASIC_TYPE]."
 msgstr ""
+"Le type à utiliser lorsque [member call_mode] est défini à [constant "
+"CALL_MODE_BASIC_TYPE]."
 
 #: modules/visual_script/doc_classes/VisualScriptFunctionCall.xml
 msgid ""
 "[code]call_mode[/code] determines the target object on which the method will "
 "be called. See [enum CallMode] for options."
 msgstr ""
+"[code]call_mode[/code] détermine l'objet cible sur lequel la méthode sera "
+"appelée. Voir [enum CallMode] pour les options."
 
 #: modules/visual_script/doc_classes/VisualScriptFunctionCall.xml
 msgid "The name of the function to be called."
@@ -82780,12 +83357,16 @@ msgid ""
 "The node path to use when [member call_mode] is set to [constant "
 "CALL_MODE_NODE_PATH]."
 msgstr ""
+"Le chemin nœud à utiliser lorsque [member call_mode] est défini à [constant "
+"CALL_MODE_NODE_PATH]."
 
 #: modules/visual_script/doc_classes/VisualScriptFunctionCall.xml
 msgid ""
 "The mode for RPC calls. See [method Node.rpc] for more details and [enum "
 "RPCCallMode] for available options."
 msgstr ""
+"Le mode pour les appels RPC. Voir [method Node.rpc] pour plus de détails et ["
+"enum RPCCallMode] pour les options disponibles."
 
 #: modules/visual_script/doc_classes/VisualScriptFunctionCall.xml
 msgid ""
@@ -82801,12 +83382,17 @@ msgid ""
 "Can't be higher than the number of available default arguments in the "
 "method's declaration."
 msgstr ""
+"Le nombre d'arguments par défaut qui seront utilisés lors de l'appel de la "
+"fonction. Ne peut être supérieur au nombre d'arguments par défaut "
+"disponibles dans la déclaration de la méthode."
 
 #: modules/visual_script/doc_classes/VisualScriptFunctionCall.xml
 msgid ""
 "If [code]false[/code], call errors (e.g. wrong number of arguments) will be "
 "ignored."
 msgstr ""
+"Si [code]false[/code], les erreurs d'appel (par exemple le nombre erroné "
+"d'arguments) seront ignorées."
 
 #: modules/visual_script/doc_classes/VisualScriptFunctionCall.xml
 msgid "The method will be called on this [Object]."
@@ -82815,12 +83401,15 @@ msgstr "La méthode sera appelée sur cet [Object]."
 #: modules/visual_script/doc_classes/VisualScriptFunctionCall.xml
 msgid "The method will be called on the given [Node] in the scene tree."
 msgstr ""
+"La méthode sera appelée sur le [Node] donné dans l'arborescence de la scène."
 
 #: modules/visual_script/doc_classes/VisualScriptFunctionCall.xml
 msgid ""
 "The method will be called on an instanced node with the given type and "
 "script."
 msgstr ""
+"La méthode sera appelée sur un nœud instancié avec le type et le script "
+"donnés."
 
 #: modules/visual_script/doc_classes/VisualScriptFunctionCall.xml
 msgid "The method will be called on a GDScript basic type (e.g. [Vector2])."
@@ -82852,6 +83441,8 @@ msgid ""
 "The method will be called remotely for the given peer, using an unreliable "
 "protocol."
 msgstr ""
+"La méthode sera appelée à distance pour le pair donné, en utilisant un "
+"protocole non fiable."
 
 #: modules/visual_script/doc_classes/VisualScriptFunctionState.xml
 msgid "A Visual Script node representing a function state."
@@ -82862,12 +83453,16 @@ msgid ""
 "[VisualScriptFunctionState] is returned from [VisualScriptYield] and can be "
 "used to resume a paused function call."
 msgstr ""
+"[VisualScriptFunctionState] est retourné depuis [VisualScriptYield] et peut "
+"être utilisé pour reprendre un appel de fonction en pause."
 
 #: modules/visual_script/doc_classes/VisualScriptFunctionState.xml
 msgid ""
 "Connects this [VisualScriptFunctionState] to a signal in the given object to "
 "automatically resume when it's emitted."
 msgstr ""
+"Connecte ce [VisualScriptFunctionState] à un signal dans l'objet donné pour "
+"reprendre automatiquement lorsqu'il est émis."
 
 #: modules/visual_script/doc_classes/VisualScriptFunctionState.xml
 msgid "Returns whether the function state is valid."
@@ -82876,61 +83471,63 @@ msgstr "Retourne si l'état de la fonction est valide."
 #: modules/visual_script/doc_classes/VisualScriptFunctionState.xml
 msgid "Resumes the function to run from the point it was yielded."
 msgstr ""
+"Reprend la fonction à exécuter à partir du point où elle a été suspendue."
 
 #: modules/visual_script/doc_classes/VisualScriptGlobalConstant.xml
-#, fuzzy
 msgid "A Visual Script node returning a constant from [@GlobalScope]."
-msgstr "Un nœud Visual Script utilisé pour annoter le script."
+msgstr "Un nœud Visual Script retournant une constante de [@GlobalScope]."
 
 #: modules/visual_script/doc_classes/VisualScriptGlobalConstant.xml
 msgid "The constant to be used."
 msgstr "La constante à utiliser."
 
 #: modules/visual_script/doc_classes/VisualScriptIndexGet.xml
-#, fuzzy
 msgid "A Visual Script node for getting a value from an array or a dictionary."
 msgstr ""
-"Nœud de script visuel utilisé pour créer un tableau à partir d’une liste "
-"d’éléments."
+"Un nœud Visual Script pour obtenir une valeur d'un tableau ou d'un "
+"dictionnaire."
 
 #: modules/visual_script/doc_classes/VisualScriptIndexGet.xml
 msgid ""
 "[VisualScriptIndexGet] will return the value stored in an array or a "
 "dictionary under the given index."
 msgstr ""
+"[VisualScriptIndexGet] retourne la valeur enregistrée dans un tableau ou un "
+"dictionnaire à l'index donné."
 
 #: modules/visual_script/doc_classes/VisualScriptIndexSet.xml
-#, fuzzy
 msgid "A Visual Script node for setting a value in an array or a dictionary."
 msgstr ""
-"Nœud de script visuel utilisé pour créer un tableau à partir d’une liste "
-"d’éléments."
+"Un nœud Visual Script pour définir une valeur dans un tableau ou un "
+"dictionnaire."
 
 #: modules/visual_script/doc_classes/VisualScriptIndexSet.xml
 msgid ""
 "[VisualScriptIndexSet] will set the value stored in an array or a dictionary "
 "under the given index to the provided new value."
 msgstr ""
+"[VisualScriptIndexSet] définira la valeur enregistrée dans un tableau ou un "
+"dictionnaire à l'index donné avec la nouvelle valeur fournie."
 
 #: modules/visual_script/doc_classes/VisualScriptInputAction.xml
-#, fuzzy
 msgid "A Visual Script node returning a state of an action."
-msgstr "Un nœud Visual Script utilisé pour annoter le script."
+msgstr "Un nœud Visual Script retournant l'état de l'action."
 
 #: modules/visual_script/doc_classes/VisualScriptInputAction.xml
 msgid ""
 "[VisualScriptInputAction] can be used to check if an action is pressed or "
 "released."
 msgstr ""
+"[VisualScriptInputAction] peut être utilisé pour vérifier si une action est "
+"pressée ou relâchée."
 
 #: modules/visual_script/doc_classes/VisualScriptInputAction.xml
 msgid "Name of the action."
 msgstr "Le nom de l'action."
 
 #: modules/visual_script/doc_classes/VisualScriptInputAction.xml
-#, fuzzy
 msgid "State of the action to check. See [enum Mode] for options."
-msgstr "La fonction à calculer. Voir [enum Function] pour les options."
+msgstr "L'état de l'action à vérifier. Voir [enum Mode] pour les options."
 
 #: modules/visual_script/doc_classes/VisualScriptInputAction.xml
 msgid "[code]True[/code] if action is pressed."
@@ -82969,32 +83566,31 @@ msgstr ""
 #: modules/visual_script/doc_classes/VisualScriptLists.xml
 msgid "A Visual Script virtual class for in-graph editable nodes."
 msgstr ""
+"Une classe virtuelle Visual Script pour les nœuds modifiables dans le graphe."
 
 #: modules/visual_script/doc_classes/VisualScriptLists.xml
 msgid ""
 "A Visual Script virtual class that defines the shape and the default "
 "behavior of the nodes that have to be in-graph editable nodes."
 msgstr ""
+"Une classe virtuelle Visual Script qui définit la forme et le comportement "
+"par défaut des nœuds qui doivent être des nœuds modifiables dans le graphe."
 
 #: modules/visual_script/doc_classes/VisualScriptLists.xml
-#, fuzzy
 msgid "Adds an input port to the Visual Script node."
-msgstr "Un nœud Visual Script scripté."
+msgstr "Ajoute un port d'entrée au nœud Visual Script."
 
 #: modules/visual_script/doc_classes/VisualScriptLists.xml
-#, fuzzy
 msgid "Adds an output port to the Visual Script node."
-msgstr "Un nœud Visual Script scripté."
+msgstr "Ajoute un port de sortie au nœud Visual Script."
 
 #: modules/visual_script/doc_classes/VisualScriptLists.xml
-#, fuzzy
 msgid "Removes an input port from the Visual Script node."
-msgstr "Supprime un nœud de la sélection."
+msgstr "Supprime un port d'entrée du nœud Visual Script."
 
 #: modules/visual_script/doc_classes/VisualScriptLists.xml
-#, fuzzy
 msgid "Removes an output port from the Visual Script node."
-msgstr "Supprime un nœud de la sélection."
+msgstr "Supprime un port de sortie du nœud Visual Script."
 
 #: modules/visual_script/doc_classes/VisualScriptLists.xml
 msgid "Sets the name of an input port."
@@ -83127,13 +83723,15 @@ msgstr ""
 
 #: modules/visual_script/doc_classes/VisualScriptNode.xml
 msgid "Returns the [VisualScript] instance the node is bound to."
-msgstr ""
+msgstr "Retourne l'instance [VisualScript] liée à ce nœud."
 
 #: modules/visual_script/doc_classes/VisualScriptNode.xml
 msgid ""
 "Notify that the node's ports have changed. Usually used in conjunction with "
 "[VisualScriptCustomNode] ."
 msgstr ""
+"Notifie quand les ports de ce nœud ont changé. Habituellement utilisé avec "
+"[VisualScriptCustomNode] ."
 
 #: modules/visual_script/doc_classes/VisualScriptNode.xml
 msgid "Change the default value of a given port."
@@ -83144,11 +83742,8 @@ msgid "Emitted when the available input/output ports are changed."
 msgstr "Émis quand les ports entrants/sortants sont changés."
 
 #: modules/visual_script/doc_classes/VisualScriptOperator.xml
-#, fuzzy
 msgid "A Visual Script node that performs an operation on two values."
-msgstr ""
-"Nœud de script visuel utilisé pour créer un tableau à partir d’une liste "
-"d’éléments."
+msgstr "Un nœud Visual Script qui effectue une opération sur deux valeurs."
 
 #: modules/visual_script/doc_classes/VisualScriptOperator.xml
 msgid ""
@@ -83160,21 +83755,18 @@ msgid ""
 msgstr ""
 
 #: modules/visual_script/doc_classes/VisualScriptOperator.xml
-#, fuzzy
 msgid ""
 "The operation to be performed. See [enum Variant.Operator] for available "
 "options."
 msgstr ""
-"Type de multiplication à effectuer. Voir [enum Operator] pour les options."
+"Le type d'opération à effectuer. Voir [enum Variant.Operator] pour les "
+"options disponibles."
 
 #: modules/visual_script/doc_classes/VisualScriptOperator.xml
-#, fuzzy
 msgid ""
 "The type of the values for this operation. See [enum Variant.Type] for "
 "available options."
 msgstr ""
-"Définit la valeur d’un paramètre de zone. Voir [enum AreaParameter] pour une "
-"liste de paramètres disponibles."
 
 #: modules/visual_script/doc_classes/VisualScriptPreload.xml
 msgid "Creates a new [Resource] or loads one from the filesystem."
@@ -83195,17 +83787,17 @@ msgid "The [Resource] to load."
 msgstr "La [Resource] à charger."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertyGet.xml
-#, fuzzy
 msgid "A Visual Script node returning a value of a property from an [Object]."
 msgstr ""
-"Nœud de script visuel utilisé pour créer un tableau à partir d’une liste "
-"d’éléments."
+"Un nœud Visual Script retournant une valeur d'une propriété d'un [Object]."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertyGet.xml
 msgid ""
 "[VisualScriptPropertyGet] can return a value of any property from the "
 "current object or other objects."
 msgstr ""
+"[VisualScriptPropertyGet] peut renvoyer une valeur de toute propriété de "
+"l'objet courant ou d'autres objets."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertyGet.xml
 #: modules/visual_script/doc_classes/VisualScriptPropertySet.xml
@@ -83213,6 +83805,8 @@ msgid ""
 "The script to be used when [member set_mode] is set to [constant "
 "CALL_MODE_INSTANCE]."
 msgstr ""
+"Le script à utiliser lorsque [member set_mode] est défini à [constant "
+"CALL_MODE_INSTANCE]."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertyGet.xml
 #: modules/visual_script/doc_classes/VisualScriptPropertySet.xml
@@ -83220,6 +83814,8 @@ msgid ""
 "The base type to be used when [member set_mode] is set to [constant "
 "CALL_MODE_INSTANCE]."
 msgstr ""
+"Le type de base à utiliser lorsque [member set_mode] est défini à [constant "
+"CALL_MODE_INSTANCE]."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertyGet.xml
 #: modules/visual_script/doc_classes/VisualScriptPropertySet.xml
@@ -83227,12 +83823,16 @@ msgid ""
 "The type to be used when [member set_mode] is set to [constant "
 "CALL_MODE_BASIC_TYPE]."
 msgstr ""
+"Le type à utiliser lorsque [member set_mode] est défini à [constant "
+"CALL_MODE_BASIC_TYPE]."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertyGet.xml
 msgid ""
 "The indexed name of the property to retrieve. See [method Object."
 "get_indexed] for details."
 msgstr ""
+"Le nom indexé de la propriété à récupérer. Voir [method Object.get_indexed] "
+"pour plus de détails."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertyGet.xml
 #: modules/visual_script/doc_classes/VisualScriptPropertySet.xml
@@ -83240,34 +83840,40 @@ msgid ""
 "The node path to use when [member set_mode] is set to [constant "
 "CALL_MODE_NODE_PATH]."
 msgstr ""
+"Le chemin du nœud à utiliser lorsque [member set_mode] est défini à ["
+"constant CALL_MODE_NODE_PATH]."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertyGet.xml
 msgid ""
 "The name of the property to retrieve. Changing this will clear [member "
 "index]."
 msgstr ""
+"Le nom de la propriété à récupérer. Changer cela effecera [member index]."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertyGet.xml
 msgid ""
 "[code]set_mode[/code] determines the target object from which the property "
 "will be retrieved. See [enum CallMode] for options."
 msgstr ""
+"[code]set_mode[/code] détermine l'objet cible à partir duquel la propriété "
+"sera récupérée. Voir [enum CallMode] pour les options."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertyGet.xml
 msgid "The property will be retrieved from this [Object]."
 msgstr "La propriété sera récupérée depuis cet [Object]."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertyGet.xml
-#, fuzzy
 msgid "The property will be retrieved from the given [Node] in the scene tree."
 msgstr ""
-"Le propriété est sérialisé et sauvegardé dans le fichier de la scène(défaut)."
+"La propriété sera récupérée du [Node] donné dans l'arborescence de la scène."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertyGet.xml
 msgid ""
 "The property will be retrieved from an instanced node with the given type "
 "and script."
 msgstr ""
+"La propriété sera récupérée à partir d'un nœud instancié avec le type et le "
+"script donnés."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertyGet.xml
 msgid ""
@@ -83277,23 +83883,23 @@ msgstr ""
 "[Vector2])."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertySet.xml
-#, fuzzy
 msgid "A Visual Script node that sets a property of an [Object]."
-msgstr "Un nœud Visual Script utilisé pour annoter le script."
+msgstr "Un nœud de script visuel qui définit une propriété d'un [Object]."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertySet.xml
 msgid ""
 "[VisualScriptPropertySet] can set the value of any property from the current "
 "object or other objects."
 msgstr ""
+"[VisualScriptPropertySet] peut définir la valeur de toute propriété à partir "
+"de l'objet courant ou d'autres objets."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertySet.xml
-#, fuzzy
 msgid ""
 "The additional operation to perform when assigning. See [enum AssignOp] for "
 "options."
 msgstr ""
-"L'opérateur additionelle à effectuer lors de l'assignation. Voir [enum "
+"L'opérateur d'addition à effectuer lors de l'assignation. Voir [enum "
 "AssignOp] pour les options."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertySet.xml
@@ -83301,32 +83907,37 @@ msgid ""
 "The indexed name of the property to set. See [method Object.set_indexed] for "
 "details."
 msgstr ""
+"Le nom indexé de la propriété à définir. Voir [method Object.set_indexed] "
+"pour plus de détails."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertySet.xml
 msgid ""
 "The name of the property to set. Changing this will clear [member index]."
-msgstr ""
+msgstr "Le nom de la propriété à définir. Changer cela effecera [member index]."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertySet.xml
 msgid ""
 "[code]set_mode[/code] determines the target object on which the property "
 "will be set. See [enum CallMode] for options."
 msgstr ""
+"[code]set_mode[/code] détermine l'objet cible sur lequel la propriété sera "
+"définie. Voir [enum CallMode] pour les options."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertySet.xml
 msgid "The property will be set on this [Object]."
 msgstr "La propriété sera définie dans cet [Object]."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertySet.xml
-#, fuzzy
 msgid "The property will be set on the given [Node] in the scene tree."
 msgstr ""
-"Le propriété est sérialisé et sauvegardé dans le fichier de la scène(défaut)."
+"La propriété sera placée sur le [Node] donné dans l'arborescence de la scène."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertySet.xml
 msgid ""
 "The property will be set on an instanced node with the given type and script."
 msgstr ""
+"La propriété sera définie sur un nœud instancié avec le type et le script "
+"donnés."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertySet.xml
 msgid "The property will be set on a GDScript basic type (e.g. [Vector2])."
@@ -83372,36 +83983,48 @@ msgid ""
 "A modulo operation will be performed on the property and the value. "
 "Equivalent of doing [code]%=[/code]."
 msgstr ""
+"Une opération modulo sera effectuée sur la propriété et la valeur. Revient à "
+"écrire [code]%=[/code]."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertySet.xml
 msgid ""
 "The property will be binarly shifted to the left by the given value. "
 "Equivalent of doing [code]<<[/code]."
 msgstr ""
+"La propriété sera transférée à gauche par la valeur donnée. Revient de "
+"écrire [code]<<[/code]."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertySet.xml
 msgid ""
 "The property will be binarly shifted to the right by the given value. "
 "Equivalent of doing [code]>>[/code]."
 msgstr ""
+"La propriété sera transférée à droite par la valeur donnée. Revient de "
+"écrire [code]>>[/code]."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertySet.xml
 msgid ""
 "A binary [code]AND[/code] operation will be performed on the property. "
 "Equivalent of doing [code]&=[/code]."
 msgstr ""
+"Une opération binaire [code]AND[/code] (et) sera effectuée sur la propriété. "
+"Revient à écrire [code]&=[/code]."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertySet.xml
 msgid ""
 "A binary [code]OR[/code] operation will be performed on the property. "
 "Equivalent of doing [code]|=[/code]."
 msgstr ""
+"Une opération binaire [code]OR[/code] (ou) sera effectuée sur la propriété. "
+"Revient à écrire [code]|=[/code]."
 
 #: modules/visual_script/doc_classes/VisualScriptPropertySet.xml
 msgid ""
 "A binary [code]XOR[/code] operation will be performed on the property. "
 "Equivalent of doing [code]^=[/code]."
 msgstr ""
+"Une opération binaire [code]XOR[/code] (ou exclusif) sera effectuée sur la "
+"propriété. Revient à écrire [code]^=[/code]."
 
 #: modules/visual_script/doc_classes/VisualScriptReturn.xml
 msgid "Exits a function and returns an optional value."
@@ -83536,9 +84159,8 @@ msgid ""
 msgstr ""
 
 #: modules/visual_script/doc_classes/VisualScriptTypeCast.xml
-#, fuzzy
 msgid "A Visual Script node that casts the given value to another type."
-msgstr "Un nœud Visual Script utilisé pour annoter le script."
+msgstr ""
 
 #: modules/visual_script/doc_classes/VisualScriptTypeCast.xml
 msgid ""
@@ -83606,9 +84228,8 @@ msgid ""
 msgstr ""
 
 #: modules/visual_script/doc_classes/VisualScriptYield.xml
-#, fuzzy
 msgid "A Visual Script node used to pause a function execution."
-msgstr "Un nœud Visual Script utilisé pour annoter le script."
+msgstr "Un nœud Visual Script pour mettre en pause l'exécution d'une fonction."
 
 #: modules/visual_script/doc_classes/VisualScriptYield.xml
 msgid ""
@@ -83617,11 +84238,11 @@ msgid ""
 msgstr ""
 
 #: modules/visual_script/doc_classes/VisualScriptYield.xml
-#, fuzzy
 msgid ""
 "The mode to use for yielding. See [enum YieldMode] for available options."
 msgstr ""
-"Type de multiplication à effectuer. Voir [enum Operator] pour les options."
+"Le mode à utiliser pour suspendre. Voir [enum YieldMode] pour les options "
+"disponibles."
 
 #: modules/visual_script/doc_classes/VisualScriptYield.xml
 msgid "The time to wait when [member mode] is set to [constant YIELD_WAIT]."
@@ -83640,9 +84261,8 @@ msgid "Yields a function and waits the given time."
 msgstr ""
 
 #: modules/visual_script/doc_classes/VisualScriptYieldSignal.xml
-#, fuzzy
 msgid "A Visual Script node yielding for a signal."
-msgstr "Un nœud Visual Script utilisé pour annoter le script."
+msgstr "Un nœud Visual Script pour attendre un signal."
 
 #: modules/visual_script/doc_classes/VisualScriptYieldSignal.xml
 msgid ""
@@ -83657,6 +84277,8 @@ msgid ""
 "[code]call_mode[/code] determines the target object to wait for the signal "
 "emission. See [enum CallMode] for options."
 msgstr ""
+"[code]call_mode[/code] détermine l'objet cible à attendre avant l'émission "
+"du signal. Voir [enum CallMode] pour les options."
 
 #: modules/visual_script/doc_classes/VisualScriptYieldSignal.xml
 msgid "The signal name to be waited for."
@@ -83668,11 +84290,11 @@ msgstr "Un signal depuis cet [Object] sera utilisé."
 
 #: modules/visual_script/doc_classes/VisualScriptYieldSignal.xml
 msgid "A signal from the given [Node] in the scene tree will be used."
-msgstr ""
+msgstr "Un signal du [Node] donné dans l'arborescence de la scène sera utilisé."
 
 #: modules/visual_script/doc_classes/VisualScriptYieldSignal.xml
 msgid "A signal from an instanced node with the given type will be used."
-msgstr ""
+msgstr "Un signal d'un nœud instancié avec le type donné sera utilisé."
 
 #: doc/classes/VisualServer.xml
 msgid "Server for anything visible."
@@ -83711,12 +84333,15 @@ msgstr ""
 #: doc/classes/VisualServer.xml
 msgid "Sets images to be rendered in the window margin."
 msgstr ""
+"Définit des images dont le rendu sera fait dans les marges de la fenêtre."
 
 #: doc/classes/VisualServer.xml
 msgid ""
 "Sets margin size, where black bars (or images, if [method "
 "black_bars_set_images] was used) are rendered."
 msgstr ""
+"Définit la taille de la marge, où des barres noires (ou des images, si ["
+"method black_bars_set_images] est utilisé) sont rendues."
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -83781,6 +84406,10 @@ msgid ""
 "the vertical aspect ratio which is equivalent to [constant Camera."
 "KEEP_HEIGHT]."
 msgstr ""
+"Si [code]true[/code], conserve le rapport d'aspect horizontal qui est "
+"équivalent à [constant Camera.KEEP_WIDTH]. Si [code]false[/code], conserve "
+"le rapport d'aspect vertical qui est équivalent à [constant Camera."
+"KEEP_HEIGHT]."
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -83801,12 +84430,9 @@ msgid "Adds a circle command to the [CanvasItem]'s draw commands."
 msgstr "Ajouter un cercle aux commandes de dessin du [CanvasItem]."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid ""
 "If ignore is [code]true[/code], the VisualServer does not perform clipping."
 msgstr ""
-"Si [code]true[/code], le multithreading est utilisé pour améliorer les "
-"performances."
 
 #: doc/classes/VisualServer.xml
 msgid "Adds a line command to the [CanvasItem]'s draw commands."
@@ -83821,6 +84447,8 @@ msgid ""
 "Adds a [MultiMesh] to the [CanvasItem]'s draw commands. Only affects its "
 "aabb at the moment."
 msgstr ""
+"Ajoute un [MultiMesh] aux commandes d'affichage du [CanvasItem]. N'affecte "
+"que son aabb pour le moment."
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -83842,6 +84470,8 @@ msgid ""
 "Adds a polyline, which is a line from multiple points with a width, to the "
 "[CanvasItem]'s draw commands."
 msgstr ""
+"Ajoute une suite de lignes, qui est une ligne de plusieurs points avec une "
+"largeur, aux commandes d'affichage du [CanvasItem]."
 
 #: doc/classes/VisualServer.xml
 msgid "Adds a primitive to the [CanvasItem]'s draw commands."
@@ -83866,6 +84496,8 @@ msgstr "Ajouter un rectangle texturé aux commandes de dessin du [CanvasItem]."
 msgid ""
 "Adds a texture rect with region setting to the [CanvasItem]'s draw commands."
 msgstr ""
+"Ajoute un rectangle de texture, avec des réglages de la région à afficher, "
+"aux commandes d'affichage du [CanvasItem]."
 
 #: doc/classes/VisualServer.xml
 msgid "Adds a triangle array to the [CanvasItem]'s draw commands."
@@ -83874,7 +84506,7 @@ msgstr ""
 
 #: doc/classes/VisualServer.xml
 msgid "Clears the [CanvasItem] and removes all commands in it."
-msgstr ""
+msgstr "Efface le [CanvasItem] et enlève toutes les commandes."
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -83891,7 +84523,6 @@ msgstr ""
 "méthode statique [method free_rid] du VisualServer."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Sets clipping for the [CanvasItem]."
 msgstr "Définit la coupure pour le [CanvasItem]."
 
@@ -83937,6 +84568,9 @@ msgid ""
 "Sets the parent for the [CanvasItem]. The parent can be another canvas item, "
 "or it can be the root canvas that is attached to the viewport."
 msgstr ""
+"Définit le parent du [CanvasItem]. Le parent peut être un autre élément de "
+"toile, ou il peut être la toile racine qui est attachée à la fenêtre "
+"d'affichage."
 
 #: doc/classes/VisualServer.xml
 msgid "Sets the color that modulates the [CanvasItem] without children."
@@ -83958,9 +84592,8 @@ msgid "Sets if the [CanvasItem] uses its parent's material."
 msgstr "Définit si le [CanvasItem] utilise le même matériau que son parent."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Sets if the canvas item (including its children) is visible."
-msgstr "Masquer le [CanvasItem] s’il est actuellement visible."
+msgstr "Définit si la toile (y compris ses enfants) est visible."
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -84043,9 +84676,8 @@ msgid "Sets a canvas light's energy."
 msgstr "Définit l'énergie d'une lumière du canevas."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Sets a canvas light's height."
-msgstr "Définit la hauteur d’une toile."
+msgstr ""
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -84059,19 +84691,23 @@ msgstr ""
 
 #: doc/classes/VisualServer.xml
 msgid "The mode of the light, see [enum CanvasLightMode] constants."
-msgstr ""
+msgstr "Le mode de la lumière, voir les constantes [enum CanvasLightMode]."
 
 #: doc/classes/VisualServer.xml
 msgid ""
 "Sets the texture's scale factor of the light. Equivalent to [member Light2D."
 "texture_scale]."
 msgstr ""
+"Définit le facteur d'échelle de la texture de lumière. Équivalent à [member "
+"Light2D.texture_scale]"
 
 #: doc/classes/VisualServer.xml
 msgid ""
 "Sets the width of the shadow buffer, size gets scaled to the next power of "
 "two for this."
 msgstr ""
+"Définit la largeur du tampon d'ombre, la taille est arrondie à la puissance "
+"de deux suivante pour cela."
 
 #: doc/classes/VisualServer.xml
 msgid "Sets the color of the canvas light's shadow."
@@ -84143,11 +84779,11 @@ msgstr ""
 
 #: doc/classes/VisualServer.xml
 msgid "Sets the shape of the occluder polygon."
-msgstr ""
+msgstr "Définit la forme du polygone occulteur."
 
 #: doc/classes/VisualServer.xml
 msgid "Sets the shape of the occluder polygon as lines."
-msgstr ""
+msgstr "Définit la forme du polygone occulteur avec des lignes."
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -84209,6 +84845,8 @@ msgstr ""
 #: doc/classes/VisualServer.xml
 msgid "Sets the ambient light parameters. See [Environment] for more details."
 msgstr ""
+"Définit les paramètres de lumière ambiante. Voir [Environnement] pour plus "
+"de détails."
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -84250,18 +84888,24 @@ msgid ""
 "Sets the variables to be used with the scene fog. See [Environment] for more "
 "details."
 msgstr ""
+"Définit les variables à utiliser avec le brouillard de scène. Voir "
+"[Environnement] pour plus de détails."
 
 #: doc/classes/VisualServer.xml
 msgid ""
 "Sets the variables to be used with the fog depth effect. See [Environment] "
 "for more details."
 msgstr ""
+"Définit les variables à utiliser avec l'effet de profondeur du brouillard. "
+"Voir [Environnement] pour plus de détails."
 
 #: doc/classes/VisualServer.xml
 msgid ""
 "Sets the variables to be used with the fog height effect. See [Environment] "
 "for more details."
 msgstr ""
+"Définit les variables à utiliser avec l'effet de hauteur du brouillard. Voir "
+"[Environnement] pour plus de détails."
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -84280,12 +84924,16 @@ msgid ""
 "Sets a custom field of view for the background [Sky]. Equivalent to [member "
 "Environment.background_sky_custom_fov]."
 msgstr ""
+"Définit un angle de vue personnalisé pour le ciel [Sky] en arrière-plan. "
+"Équivalent à [member Environnement.background_sky_custom_fov]"
 
 #: doc/classes/VisualServer.xml
 msgid ""
 "Sets the rotation of the background [Sky] expressed as a [Basis]. Equivalent "
 "to [member Environment.background_sky_orientation]."
 msgstr ""
+"Définit la rotation du ciel [Sky] en arrière-plan exprimé avec une [Basis]. "
+"Équivalent à [member Environnement.background_sky_orientation]"
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -84329,6 +84977,7 @@ msgstr "Essaye de supprimer un objet dans le VisualServer."
 #: doc/classes/VisualServer.xml
 msgid "Returns a certain information, see [enum RenderInfo] for options."
 msgstr ""
+"Retourne une information précise, voir [enum RenderInfo] pour les options."
 
 #: doc/classes/VisualServer.xml
 msgid "Returns the id of the test cube. Creates one if none exists."
@@ -84346,6 +84995,10 @@ msgid ""
 "[b]Note:[/b] When running a headless or server binary, this function returns "
 "an empty string."
 msgstr ""
+"Retourne le nom de l'adaptateur vidéo (par exemple \"GeForce GTX 1080/PCIe/"
+"SSE2\").\n"
+"[b]Note :[/b] Lors de l'exécution d'une version sans graphique ou de "
+"serveur, cette fonction retourne une chaîne vide."
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -84353,6 +85006,10 @@ msgid ""
 "[b]Note:[/b] When running a headless or server binary, this function returns "
 "an empty string."
 msgstr ""
+"Retourne le vendeur de l'adaptateur vidéo (par exemple \"NVIDIA Corporation\""
+").\n"
+"[b]Note :[/b] Lors de l'exécution d'une version sans graphique ou de "
+"serveur, cette fonction retourne une chaîne vide."
 
 #: doc/classes/VisualServer.xml
 msgid "Returns the id of a white texture. Creates one if none exists."
@@ -84395,21 +85052,24 @@ msgstr ""
 "Retourne la taille de la cellule définit par [method gi_probe_set_cell_size]."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Returns the data used by the GI probe."
-msgstr "Renvoie l’espace affecté à la zone."
+msgstr "Retourne les données utilisées par la sonde GI."
 
 #: doc/classes/VisualServer.xml
 msgid ""
 "Returns the dynamic range set for this GI probe. Equivalent to [member "
 "GIProbe.dynamic_range]."
 msgstr ""
+"Retourne la gamme dynamique pour cette sonde GI. Équivalent à [member GIProbe"
+".dynamic_range]"
 
 #: doc/classes/VisualServer.xml
 msgid ""
 "Returns the energy multiplier for this GI probe. Equivalent to [member "
 "GIProbe.energy]."
 msgstr ""
+"Retourne le multiplicateur d'énergie pour cette sonde GI. Équivalent à ["
+"member GIProbe.energy]"
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -84422,6 +85082,8 @@ msgid ""
 "Returns the propagation value for this GI probe. Equivalent to [member "
 "GIProbe.propagation]."
 msgstr ""
+"Retourne la valeur de propagation de cette sonde GI. Équivalent à [member "
+"GIProbe.propagation]"
 
 #: doc/classes/VisualServer.xml
 msgid "Returns the Transform set by [method gi_probe_set_to_cell_xform]."
@@ -84432,15 +85094,14 @@ msgid ""
 "Returns [code]true[/code] if the GI probe data associated with this GI probe "
 "is compressed. Equivalent to [member GIProbe.compress]."
 msgstr ""
+"Retourne [code]true[/code] si les données de cette sonde GI sont "
+"compressées. Équivalent à [member GIProbe.compress]"
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid ""
 "Returns [code]true[/code] if the GI probe is set to interior, meaning it "
 "does not account for sky light. Equivalent to [member GIProbe.interior]."
 msgstr ""
-"Si [code]true[/code], les réflexions ignoreront la contribution du ciel. "
-"Équivalent à [member ReflectionProbe.interior]."
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -84506,9 +85167,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Sets the to cell [Transform] for this GI probe."
-msgstr "Retourne la matrice de transformation globale de cet élément."
+msgstr ""
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -84591,9 +85251,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Sets the material to be used to draw the [ImmediateGeometry]."
-msgstr "Retourne le matériel affecté à la [ImmediateGeometry3D]."
+msgstr "Définit le matériel utilisé pour afficher le [ImmediateGeometry]."
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -84875,13 +85534,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], light will subtract light instead of adding light. "
 "Equivalent to [member Light.light_negative]."
 msgstr ""
-"Si [code]true[/code], les réflexions ignoreront la contribution du ciel. "
-"Équivalent à [member ReflectionProbe.interior]."
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -84899,13 +85555,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], light will cast shadows. Equivalent to [member Light."
 "shadow_enabled]."
 msgstr ""
-"Si [code]true[/code], les réflexions ignoreront la contribution du ciel. "
-"Équivalent à [member ReflectionProbe.interior]."
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -84942,19 +85595,16 @@ msgstr ""
 "en utilisant la [method instance_set_base] utilisant le RID retourné."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Returns the size of the lightmap capture area."
-msgstr "Renvoie le sinus du paramètre."
+msgstr ""
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Returns the energy multiplier used by the lightmap capture."
-msgstr "Renvoie le nombre de textures dans l’atlas BitmapFont."
+msgstr ""
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Returns the octree used by the lightmap capture."
-msgstr "Renvoie l’espace affecté à la zone."
+msgstr ""
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -84962,9 +85612,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Returns the cell transform for this lightmap capture's octree."
-msgstr "Retourne la matrice de transformation de la toile de cet objet."
+msgstr ""
 
 #: doc/classes/VisualServer.xml
 msgid "Returns [code]true[/code] if capture is in \"interior\" mode."
@@ -85032,13 +85681,10 @@ msgid "Returns the value of a certain material's parameter."
 msgstr "Retourne la valeur du paramètre du matériau."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid ""
 "Returns the default value for the param if available. Returns [code]null[/"
 "code] otherwise."
 msgstr ""
-"Retourne la valeur par défaut du paramètre nommé [code]name[/code] du "
-"matériau."
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -85055,9 +85701,8 @@ msgid "Sets an object's next material."
 msgstr "Définit le prochain matériau d’un objet."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Sets a material's parameter."
-msgstr "Définit le paramètre d’un matériau."
+msgstr "Définit le paramètre d'un matériau."
 
 #: doc/classes/VisualServer.xml
 msgid "Sets a material's render priority."
@@ -85120,7 +85765,7 @@ msgstr "Supprime la surface d'un maillage."
 #: doc/classes/VisualServer.xml
 #, fuzzy
 msgid "Sets a mesh's blend shape count."
-msgstr "Retourne le nombre de formes de mélange d’un maillage."
+msgstr "Définit le nombre de formes de mélange d’un maillage."
 
 #: doc/classes/VisualServer.xml
 msgid "Sets a mesh's blend shape mode."
@@ -85135,19 +85780,16 @@ msgid "Returns a mesh's surface's aabb."
 msgstr "Retourne l’aabb de la surface d'un maillage."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Returns a mesh's surface's vertex buffer."
-msgstr "Retourne l’aabb personnalisé d’un maillage."
+msgstr ""
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Returns a mesh's surface's amount of indices."
-msgstr "Renvoie le nombre de points de la Ligne2D."
+msgstr ""
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Returns a mesh's surface's amount of vertices."
-msgstr "Renvoie le nombre de points de la Ligne2D."
+msgstr ""
 
 #: doc/classes/VisualServer.xml
 msgid "Returns a mesh's surface's buffer arrays."
@@ -85158,32 +85800,28 @@ msgid "Returns a mesh's surface's arrays for blend shapes."
 msgstr ""
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Returns the format of a mesh's surface."
-msgstr "Retourne le nom de la méthode d'une piste de méthode."
+msgstr "Retourne le format d'une surface d'un maillage."
 
 #: doc/classes/VisualServer.xml
 msgid "Function is unused in Godot 3.x."
 msgstr "Cette fonction n'est pas utilisée dans Godot 3.x."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Returns a mesh's surface's index buffer."
-msgstr "Retourne le mode de forme de mélange d’un maillage."
+msgstr ""
 
 #: doc/classes/VisualServer.xml
 msgid "Returns a mesh's surface's material."
 msgstr "Retourne le matériau de la surface du maillage."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Returns the primitive type of a mesh's surface."
-msgstr "Retourne le nom de la méthode d'une piste de méthode."
+msgstr ""
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Returns the aabb of a mesh's surface's skeleton."
-msgstr "Retourne la traduction d’un message."
+msgstr ""
 
 #: doc/classes/VisualServer.xml
 msgid "Sets a mesh's surface's material."
@@ -85457,13 +86095,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], uses fractional delta which smooths the movement of "
 "the particles. Equivalent to [member Particles.fract_delta]."
 msgstr ""
-"Si [code]true[/code], les réflexions ignoreront la contribution du ciel. "
-"Équivalent à [member ReflectionProbe.interior]."
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -85533,13 +86168,12 @@ msgstr ""
 "retourné."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], reflections will ignore sky contribution. Equivalent "
 "to [member ReflectionProbe.interior_enable]."
 msgstr ""
 "Si [code]true[/code], les réflexions ignoreront la contribution du ciel. "
-"Équivalent à [member ReflectionProbe.interior]."
+"Équivalent à [member ReflectionProbe.interior_enable]."
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -85575,23 +86209,17 @@ msgid ""
 msgstr ""
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid ""
 "Sets the ambient light color for this reflection probe when set to interior "
 "mode. Equivalent to [member ReflectionProbe.interior_ambient_color]."
 msgstr ""
-"Si [code]true[/code], les réflexions ignoreront la contribution du ciel. "
-"Équivalent à [member ReflectionProbe.interior]."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid ""
 "Sets the energy multiplier for this reflection probes ambient light "
 "contribution when set to interior mode. Equivalent to [member "
 "ReflectionProbe.interior_ambient_energy]."
 msgstr ""
-"Si [code]true[/code], les réflexions ignoreront la contribution du ciel. "
-"Équivalent à [member ReflectionProbe.interior]."
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -85709,9 +86337,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Enables or disables occlusion culling."
-msgstr "Active ou désactive une lumière du canevas."
+msgstr "Active ou désactive le culling de l'occlusion."
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -85728,7 +86355,6 @@ msgstr ""
 "méthode statique [method free_rid] du VisualServer."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Returns a shader's code."
 msgstr "Retourne le code d'un shader."
 
@@ -85741,7 +86367,6 @@ msgid "Returns the parameters of a shader."
 msgstr "Retourne les paramètres d'un shader."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Sets a shader's code."
 msgstr "Définit le code d'un shader."
 
@@ -85826,14 +86451,12 @@ msgstr ""
 "utilisant la [method instance_set_base] utilisant le RID retourné."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Allocates the GPU memory for the texture."
-msgstr "La largeur de la texture."
+msgstr ""
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Binds the texture to a texture slot."
-msgstr "Alignez le texte à gauche."
+msgstr ""
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -85856,9 +86479,8 @@ msgstr ""
 "Crée une texture, alloue l'espace pour une image, et remplit avec l'image."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Returns a list of all the textures and their information."
-msgstr "Retourne le nombre de pistes dans l'animation."
+msgstr ""
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -85877,9 +86499,8 @@ msgid "Returns the flags of a texture."
 msgstr "Retourne les drapeaux de la texture."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Returns the format of the texture's image."
-msgstr "Renvoie le reste de deux vecteurs."
+msgstr ""
 
 #: doc/classes/VisualServer.xml
 msgid "Returns the texture's height."
@@ -85980,13 +86601,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], the image will be stored in the texture's images array "
 "if overwritten."
 msgstr ""
-"Si [code]true[/code], la [SpinBox] sera modifiable. Sinon, elle sera en "
-"lecture seule."
 
 #: doc/classes/VisualServer.xml
 msgid "Sets a viewport's camera."
@@ -85997,7 +86615,6 @@ msgid "Sets a viewport's canvas."
 msgstr "Définit le canevas de la fenêtre d'affichage."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid ""
 "Copies viewport to a region of the screen specified by [code]rect[/code]. If "
 "[member Viewport.render_direct_to_screen] is [code]true[/code], then "
@@ -86034,7 +86651,7 @@ msgstr ""
 "    $Viewport.set_attach_to_screen_rect(Rect2(0, 0, 600, 600))\n"
 "[/codeblock]\n"
 "Utiliser cette méthode peut permettre d'améliorer considérablement les "
-"performances, surtout sur les appareils peut puissants. Par contre, cela "
+"performances, surtout sur les appareils peu puissants. Par contre, cela "
 "nécessite de gérer manuellement les fenêtres d'affichage. Pour plus "
 "d'optimisations, voir [method viewport_set_render_direct_to_screen]."
 
@@ -86212,11 +86829,10 @@ msgid ""
 msgstr ""
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid ""
 "Sets the viewport's 2D/3D mode. See [enum ViewportUsage] constants for "
 "options."
-msgstr "Convertit le format de l’image. Voir les constantes [enum Format]."
+msgstr ""
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -86290,16 +86906,12 @@ msgid "Number of weights/bones per vertex."
 msgstr "Nombre de poids / os par sommet."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "The minimum Z-layer for canvas items."
-msgstr ""
-"Le niveau minimal du calque de profondeur pour les éléments de canevas."
+msgstr "Le niveau minimal du calque de profondeur pour les éléments de canevas."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "The maximum Z-layer for canvas items."
-msgstr ""
-"Le niveau maximal du calque de profondeur pour les éléments de canevas."
+msgstr "Le niveau maximal du calque de profondeur pour les éléments de canevas."
 
 #: doc/classes/VisualServer.xml
 msgid ""
@@ -86361,7 +86973,6 @@ msgid "A 3-dimensional texture with width, height, and depth."
 msgstr "Une texture à 3 dimensions, largeur et hauteur, et profondeur."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Repeats the texture (instead of clamp to edge)."
 msgstr "Répète la texture (plutôt que de s'arrêter aux bordures)."
 
@@ -86755,9 +87366,8 @@ msgid "Number of draw calls during this frame."
 msgstr "Nombre d'appels d'affichage pour cette trame."
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid "Number of 2d items drawn this frame."
-msgstr "Nombre de changements de surface pendant cette image."
+msgstr "Le nombre d'éléments 2D affichés dans cette trame."
 
 #: doc/classes/VisualServer.xml
 msgid "Number of 2d draw calls during this frame."
@@ -87432,11 +88042,8 @@ msgstr "Sera traduit en [code]uniform bool[/code] dans le code du shader."
 #: doc/classes/VisualShaderNodeScalarUniform.xml
 #: doc/classes/VisualShaderNodeTransformUniform.xml
 #: doc/classes/VisualShaderNodeVec3Uniform.xml
-#, fuzzy
 msgid "A default value to be assigned within the shader."
 msgstr ""
-"Un opérateur scalaire à virgule flottante à utiliser dans le graphique du "
-"nuanceur visuel."
 
 #: doc/classes/VisualShaderNodeBooleanUniform.xml
 #: doc/classes/VisualShaderNodeColorUniform.xml
@@ -87729,7 +88336,6 @@ msgid ""
 msgstr ""
 
 #: doc/classes/VisualShaderNodeCompare.xml
-#, fuzzy
 msgid ""
 "The result will be true if all of component in vector satisfy the comparison "
 "condition."
@@ -87738,7 +88344,6 @@ msgstr ""
 "condition de comparaison."
 
 #: doc/classes/VisualShaderNodeCompare.xml
-#, fuzzy
 msgid ""
 "The result will be true if any of component in vector satisfy the comparison "
 "condition."
@@ -87747,11 +88352,8 @@ msgstr ""
 "condition de comparaison."
 
 #: doc/classes/VisualShaderNodeCubeMap.xml
-#, fuzzy
 msgid "A [CubeMap] sampling node to be used within the visual shader graph."
 msgstr ""
-"Un opérateur scalaire à virgule flottante à utiliser dans le graphique du "
-"nuanceur visuel."
 
 #: doc/classes/VisualShaderNodeCubeMap.xml
 msgid ""
@@ -87818,11 +88420,8 @@ msgid ""
 msgstr ""
 
 #: doc/classes/VisualShaderNodeCubeMapUniform.xml
-#, fuzzy
 msgid "A [CubeMap] uniform node to be used within the visual shader graph."
 msgstr ""
-"Un tableau uniforme de texture 2D à utiliser dans le graphique de l'ombrage "
-"visuel."
 
 #: doc/classes/VisualShaderNodeCubeMapUniform.xml
 msgid ""
@@ -88498,13 +89097,12 @@ msgid "Defaults to black color."
 msgstr "Par défaut à la couleur noire."
 
 #: doc/classes/VisualShaderNodeTextureUniformTriplanar.xml
-#, fuzzy
 msgid ""
 "Performs a uniform texture lookup with triplanar within the visual shader "
 "graph."
 msgstr ""
-"Effectue une recherche de texture uniforme avec triplanaire dans le "
-"graphique de nuanceur visuel."
+"Effectue une projection de texture uniforme en triplanaire dans le graphe du "
+"Visual Shader."
 
 #: doc/classes/VisualShaderNodeTextureUniformTriplanar.xml
 msgid ""
@@ -88513,12 +89111,11 @@ msgid ""
 msgstr ""
 
 #: doc/classes/VisualShaderNodeTransformCompose.xml
-#, fuzzy
 msgid ""
 "Composes a [Transform] from four [Vector3]s within the visual shader graph."
 msgstr ""
-"Compose un [Transform] à partir de quatre [Vector3] dans le graphique du "
-"nuanceur visuel."
+"Compose un [Transform] à partir de quatre [Vector3] dans le graphe du Visual "
+"Shader."
 
 #: doc/classes/VisualShaderNodeTransformCompose.xml
 msgid ""
@@ -88632,11 +89229,10 @@ msgid "Translated to [code]uniform mat4[/code] in the shader language."
 msgstr "Sera traduit en [code]uniform mat4[/code] dans le code du shader."
 
 #: doc/classes/VisualShaderNodeTransformVecMult.xml
-#, fuzzy
 msgid ""
 "Multiplies a [Transform] and a [Vector3] within the visual shader graph."
 msgstr ""
-"Multiplie un [Transform] et un [Vector3] dans le graphique de shader visuel."
+"Multiplie un [Transform] et un [Vector3] dans le graphe du Visual Shader."
 
 #: doc/classes/VisualShaderNodeTransformVecMult.xml
 msgid ""
@@ -88679,7 +89275,7 @@ msgstr ""
 #: doc/classes/VisualShaderNodeUniform.xml
 #, fuzzy
 msgid "A base type for the uniforms within the visual shader graph."
-msgstr "Type de base pour les uniformes dans le graphique du nuanceur visuel."
+msgstr "Le type de base pour les uniformes dans le graphe du Visual Shader."
 
 #: doc/classes/VisualShaderNodeUniform.xml
 msgid ""
@@ -89236,10 +89832,9 @@ msgid "Closes this data channel, notifying the other peer."
 msgstr "Ferme ce canal de données, en notifiant l’autre homologue."
 
 #: modules/webrtc/doc_classes/WebRTCDataChannel.xml
-#, fuzzy
 msgid ""
 "Returns the number of bytes currently queued to be sent over this channel."
-msgstr "Retourne le nombre de traqueurs actuellement enregistrés."
+msgstr ""
 
 #: modules/webrtc/doc_classes/WebRTCDataChannel.xml
 msgid ""
@@ -89330,7 +89925,6 @@ msgid "The channel was created, but it's still trying to connect."
 msgstr "Le canal a été créé, mais il essaie toujours de se connecter."
 
 #: modules/webrtc/doc_classes/WebRTCDataChannel.xml
-#, fuzzy
 msgid "The channel is currently open, and data can flow over it."
 msgstr "Le canal est actuellement ouvert, et les données peuvent y circuler."
 
@@ -89439,9 +90033,8 @@ msgid ""
 msgstr ""
 
 #: modules/webrtc/doc_classes/WebRTCPeerConnection.xml
-#, fuzzy
 msgid "Interface to a WebRTC peer connection."
-msgstr "Interface vers une connexion homologue WebRTC."
+msgstr "L'interface de connexion par pair via WebRTC."
 
 #: modules/webrtc/doc_classes/WebRTCPeerConnection.xml
 msgid ""
@@ -90495,14 +91088,12 @@ msgid ""
 msgstr ""
 
 #: doc/classes/WindowDialog.xml
-#, fuzzy
 msgid "The vertical offset of the title text."
-msgstr "Décalage vertical du texte du titre."
+msgstr "Le décalage vertical du texte du titre."
 
 #: doc/classes/WindowDialog.xml
-#, fuzzy
 msgid "The font used to draw the title."
-msgstr "La police utilisée pour le texte en gras."
+msgstr ""
 
 #: doc/classes/WindowDialog.xml
 msgid "The icon for the close button."
@@ -90548,10 +91139,9 @@ msgid ""
 msgstr ""
 
 #: doc/classes/World.xml
-#, fuzzy
 msgid ""
 "The [RID] of this world's navigation map. Used by the [NavigationServer]."
-msgstr "Retourne le [RID] de la énième forme d'une zone."
+msgstr ""
 
 #: doc/classes/World.xml
 msgid "The World's visual scenario."
@@ -90586,10 +91176,9 @@ msgid ""
 msgstr ""
 
 #: doc/classes/World2D.xml
-#, fuzzy
 msgid ""
 "The [RID] of this world's navigation map. Used by the [Navigation2DServer]."
-msgstr "Retourne le [RID] de la énième forme d'une zone."
+msgstr ""
 
 #: doc/classes/World2D.xml
 msgid ""
diff --git a/doc/translations/it.po b/doc/translations/it.po
index 3acfabc091..e07c906b29 100644
--- a/doc/translations/it.po
+++ b/doc/translations/it.po
@@ -30,8 +30,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine class reference\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
-"PO-Revision-Date: 2022-07-23 03:56+0000\n"
-"Last-Translator: AndreWharn <andrewharnofficial@gmail.com>\n"
+"PO-Revision-Date: 2022-07-31 16:43+0000\n"
+"Last-Translator: Mirko <miknsop@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/godot-engine/"
 "godot-class-reference/it/>\n"
 "Language: it\n"
@@ -62,6 +62,7 @@ msgid "Theme Properties"
 msgstr "Proprietà del tema"
 
 #: doc/tools/make_rst.py
+#, fuzzy
 msgid "Signals"
 msgstr "Segnali"
 
@@ -56960,7 +56961,7 @@ msgstr ""
 
 #: doc/classes/Spatial.xml
 msgid "Introduction to 3D"
-msgstr ""
+msgstr "Introduzione al 3D"
 
 #: doc/classes/Spatial.xml doc/classes/Vector3.xml
 msgid "All 3D Demos"
diff --git a/doc/translations/pt_BR.po b/doc/translations/pt_BR.po
index 74758850c7..ea624fdf2c 100644
--- a/doc/translations/pt_BR.po
+++ b/doc/translations/pt_BR.po
@@ -41,12 +41,13 @@
 # Fabio Moura de Oliveira <ccmaismais@yahoo.com>, 2022.
 # Daniel Abrante <danielabrante@protonmail.com>, 2022.
 # lucas rossy brasil coelho <lucasrossy270@gmail.com>, 2022.
+# Felipe Kinoshita <kinofhek@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine class reference\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
-"PO-Revision-Date: 2022-06-16 18:58+0000\n"
-"Last-Translator: lucas rossy brasil coelho <lucasrossy270@gmail.com>\n"
+"PO-Revision-Date: 2022-08-04 06:40+0000\n"
+"Last-Translator: Felipe Kinoshita <kinofhek@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
 "godot-engine/godot-class-reference/pt_BR/>\n"
 "Language: pt_BR\n"
@@ -54,7 +55,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.13-dev\n"
+"X-Generator: Weblate 4.14-dev\n"
 
 #: doc/tools/make_rst.py
 msgid "Description"
@@ -76754,6 +76755,13 @@ msgid ""
 "the same space as the parent YSort, allowing to better organize a scene or "
 "divide it in multiple ones, yet keep the unique sorting."
 msgstr ""
+"Classifique todos os nós filhos com base em suas posições Y. O nó filho deve "
+"herdar de [CanvasItem] para ser classificado. Os nós que têm uma posição Y "
+"mais alta serão desenhados mais tarde, então eles aparecerão no topo dos nós "
+"que têm uma posição Y mais baixa. O aninhamento de nós YSort é possível. Os "
+"nós YSort filhos serão classificados no mesmo espaço que o YSort pai, "
+"permitindo organizar melhor uma cena ou dividi-la em várias outras, mas "
+"manter a classificação única."
 
 #: doc/classes/YSort.xml
 msgid ""
diff --git a/doc/translations/ru.po b/doc/translations/ru.po
index 985198198a..b148868ce6 100644
--- a/doc/translations/ru.po
+++ b/doc/translations/ru.po
@@ -49,21 +49,22 @@
 # FuzzMix <fmwolfiechad@gmail.com>, 2022.
 # М��69К <weblate@mah69k.net>, 2022.
 # Vadim Mitroshkin <Vadim7540@yandex.ru>, 2022.
+# SonicStalker Games <dmitriyusolsev1971@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine class reference\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
-"PO-Revision-Date: 2022-07-03 00:44+0000\n"
-"Last-Translator: Bozhko Artyom Dmitrievich <jek_sun@mail.ru>\n"
+"PO-Revision-Date: 2022-08-04 06:40+0000\n"
+"Last-Translator: SonicStalker Games <dmitriyusolsev1971@gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/godot-engine/"
 "godot-class-reference/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.13.1-dev\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.14-dev\n"
 
 #: doc/tools/make_rst.py
 msgid "Description"
@@ -620,11 +621,11 @@ msgstr ""
 "[codeblock]\n"
 "- Меньше -1,0 (не включа�): Облегчение вхождени�-выхождени�\n"
 "- 1.0: Линейный\n"
-"- От -1,0 до 0,0 (не включа�): Облегчение в\n"
+"- От -1,0 до 0,0 (не включа�): Облегчение выхождени�-вхождени�\n"
 "- 0.0: По�то�нный\n"
-"- От 0,0 до 1,0 (не включа�): Облегчение\n"
+"- От 0,0 до 1,0 (не включа�): Облегчение выхождени�(только выход)\n"
 "- 1.0: Линейный\n"
-"- Больше 1,0 (не включа�): Облегчение\n"
+"- Больше 1,0 (не включа�): Облегчение вхождени�(только вход)\n"
 "[/codeblock]\n"
 "[url=https://raw.githubusercontent.com/godotengine/godot-docs/3.4/img/"
 "ease_cheatsheet.png]ease() значени� кривой шпаргалка[/url]\n"
@@ -1402,7 +1403,6 @@ msgstr ""
 "тра��ировка �тека при печати ошибки или предупреждени�."
 
 #: modules/gdscript/doc_classes/@GDScript.xml
-#, fuzzy
 msgid ""
 "Like [method print], but includes the current stack frame when running with "
 "the debugger turned on.\n"
@@ -1412,10 +1412,12 @@ msgid ""
 "   At: res://test.gd:15:_process()\n"
 "[/codeblock]"
 msgstr ""
-"Печатает трек �тека вызовов, работает только е�ли включён отладчик.\n"
+"Как [method print], но включает в �еб� текущий кадр �тека когда запушен � "
+"включенным отладчиком.\n"
 "Вывод в кон�оли будет выгл�деть примерно так:\n"
 "[codeblock]\n"
-"Frame 0 - res://test.gd:16 in function '_process'\n"
+"Test print\n"
+"   At: res://test.gd:15:_process()\n"
 "[/codeblock]"
 
 #: modules/gdscript/doc_classes/@GDScript.xml
@@ -1830,19 +1832,30 @@ msgstr ""
 "Возвращает результат плавной интерпол�ции значени� [code]s[/code] между "
 "[code]0[/code] и [code]1[/code], в зави�имо�ти от того, где находит�� "
 "[code]s[/code] отно�ительно [code]from[/code] и [code]to[/code].\n"
+"\n"
 "Возвращаемое значение равно [code]0[/code], е�ли [code]s <= from[/code] и "
 "[code]1[/code], е�ли[code]s >= to[/code]. Е�ли [code]s[/code] находит�� "
 "между [code]from[/code] и [code]to[/code], то возвращаемое значение �ледует "
 "S-образной кривой, котора� �оответ�твует значению [code]s[/code] между "
 "[code]0[/code] и [code]1[/code].\n"
+"\n"
 "S-образна� крива� �вл�ет�� кубиче�ким �рмитовым �плайном, заданным функцией "
 "[code]f(s) = 3*s^2 - 2*s^3[/code].\n"
+"\n"
 "[codeblock]\n"
 "smoothstep(0, 2, -5.0) # Returns 0.0\n"
 "smoothstep(0, 2, 0.5) # Returns 0.15625\n"
 "smoothstep(0, 2, 1.0) # Returns 0.5\n"
 "smoothstep(0, 2, 2.0) # Returns 1.0\n"
-"[/codeblock]"
+"[/codeblock]\n"
+"\n"
+"Compared to [method ease] with a curve value of [code]-1.6521[/code], ["
+"method smoothstep] returns the smoothest possible curve with no sudden "
+"changes in the derivative. If you need to perform more advanced transitions, "
+"use [Tween] or [AnimationPlayer].\n"
+"[url=https://raw.githubusercontent.com/godotengine/godot-docs/3.5/img/"
+"smoothstep_ease_comparison.png]Comparison between smoothstep() and ease(x, -1"
+".6521) return values[/url]"
 
 #: modules/gdscript/doc_classes/@GDScript.xml
 #, fuzzy
diff --git a/doc/translations/zh_CN.po b/doc/translations/zh_CN.po
index 76ea804df5..7647bf0081 100644
--- a/doc/translations/zh_CN.po
+++ b/doc/translations/zh_CN.po
@@ -62,7 +62,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine class reference\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
-"PO-Revision-Date: 2022-07-26 01:54+0000\n"
+"PO-Revision-Date: 2022-07-31 16:43+0000\n"
 "Last-Translator: Haoyu Qiu <timothyqiu32@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "godot-engine/godot-class-reference/zh_Hans/>\n"
@@ -1322,7 +1322,6 @@ msgstr ""
 "在打�错误或警告时还会显示堆栈跟踪。"
 
 #: modules/gdscript/doc_classes/@GDScript.xml
-#, fuzzy
 msgid ""
 "Like [method print], but includes the current stack frame when running with "
 "the debugger turned on.\n"
@@ -1332,10 +1331,11 @@ msgid ""
 "   At: res://test.gd:15:_process()\n"
 "[/codeblock]"
 msgstr ""
-"在代��置打�堆栈轨迹，仅在打开调试器的情况下�行。\n"
-"控制�中的输出如下所示：\n"
+"与 [method print] 类似，但在打开调试器�行时还会包�当�栈帧。\n"
+"控制�中的输出应该是类似这样的：\n"
 "[codeblock]\n"
-"Frame 0 - res://test.gd:16 in function '_process'\n"
+"Test print\n"
+"   At: res://test.gd:15:_process()\n"
 "[/codeblock]"
 
 #: modules/gdscript/doc_classes/@GDScript.xml
@@ -9581,7 +9581,6 @@ msgstr ""
 "制器也将��相�的 ID。"
 
 #: doc/classes/ARVRController.xml
-#, fuzzy
 msgid ""
 "The degree to which the controller vibrates. Ranges from [code]0.0[/code] to "
 "[code]1.0[/code]. If changed, updates [member ARVRPositionalTracker.rumble] "
@@ -9589,9 +9588,8 @@ msgid ""
 "This is a useful property to animate if you want the controller to vibrate "
 "for a limited duration."
 msgstr ""
-"控制器振动的程度。范围从 [code]0.0[/code] 到 [code]1.0[/code]，精度 "
-"[code].01[/code]。如果更改，会相应地更新 [member ARVRPositionalTracker."
-"rumble]。\n"
+"控制器振动的程度。范围从 [code]0.0[/code] 到 [code]1.0[/code]。如果更改，"
+"会相应地更新 [member ARVRPositionalTracker.rumble]。\n"
 "如果你想让控制器在�定时间内振动，这是一个有用的属性，�以将其动画化。"
 
 #: doc/classes/ARVRController.xml
@@ -14589,6 +14587,10 @@ msgid ""
 "current, setting one camera's [member current] to [code]false[/code] will "
 "cause the other camera to be made current."
 msgstr ""
+"如果为 [code]true[/code]，则祖级 [Viewport] 正在使用这个相机。\n"
+"如果场景中有多个相机，总会有一个被设为当�相机。例如，�设场景中存在两个 "
+"[Camera] 节点并且�有一个为当�相机，那么如果把�一个相机的 [member current] "
+"设为 [code]false[/code] 就会导致�一个相机被设为当�相机。"
 
 #: doc/classes/Camera.xml
 msgid ""
@@ -17985,7 +17987,7 @@ msgstr "�奇�色。"
 
 #: doc/classes/Color.xml
 msgid "Firebrick color."
-msgstr "�砖的颜色。"
+msgstr "��砖红色。"
 
 #: doc/classes/Color.xml
 msgid "Floral white color."
@@ -17997,11 +17999,11 @@ msgstr "森林绿色。"
 
 #: doc/classes/Color.xml
 msgid "Fuchsia color."
-msgstr "紫红色的颜色。"
+msgstr "洋红色。"
 
 #: doc/classes/Color.xml
 msgid "Gainsboro color."
-msgstr "庚斯伯勒颜色。"
+msgstr "庚斯伯勒�色。"
 
 #: doc/classes/Color.xml
 msgid "Ghost white color."
@@ -18013,7 +18015,7 @@ msgstr "金色。"
 
 #: doc/classes/Color.xml
 msgid "Goldenrod color."
-msgstr "金黄的颜色。"
+msgstr "金�色。"
 
 #: doc/classes/Color.xml
 msgid "Gray color."
@@ -18033,7 +18035,7 @@ msgstr "蜜露色。"
 
 #: doc/classes/Color.xml
 msgid "Hot pink color."
-msgstr "炙热的粉红色。"
+msgstr "亮粉色。"
 
 #: doc/classes/Color.xml
 msgid "Indian red color."
@@ -18057,7 +18059,7 @@ msgstr "薰衣�色。"
 
 #: doc/classes/Color.xml
 msgid "Lavender blush color."
-msgstr "薰衣�腮红的颜色。"
+msgstr "薰衣�紫红色。"
 
 #: doc/classes/Color.xml
 msgid "Lawn green color."
@@ -18081,7 +18083,7 @@ msgstr "淡�色。"
 
 #: doc/classes/Color.xml
 msgid "Light goldenrod color."
-msgstr "淡淡的金黄色。"
+msgstr "亮金�黄色。"
 
 #: doc/classes/Color.xml
 msgid "Light gray color."
@@ -22935,7 +22937,7 @@ msgstr ""
 msgid ""
 "A script implemented in the C# programming language (Mono-enabled builds "
 "only)."
-msgstr "用C＃编程语言实现的脚本（仅�用Mono的版本）。"
+msgstr "用 C# 编程语言实现的脚本（仅 Mono 版本中存在）。"
 
 #: modules/mono/doc_classes/CSharpScript.xml
 msgid ""
@@ -22943,14 +22945,14 @@ msgid ""
 "class and is only available in Mono-enabled Godot builds.\n"
 "See also [GodotSharp]."
 msgstr ""
-"此类表示C＃脚本。它与[GDScript]类的C＃等效，并且仅在�用了Mono的Godot版本中�"
-"用。\n"
-"�请�阅[GodotSharp]。"
+"这个类表示 C# 脚本，是 [GDScript] 类在 C# 中的对等体，仅在�用了 Mono 的 "
+"Godot 版本中�用。\n"
+"�请�阅 [GodotSharp]。"
 
 #: modules/mono/doc_classes/CSharpScript.xml
 #: modules/gdnative/doc_classes/PluginScript.xml
 msgid "Returns a new instance of the script."
-msgstr "返回脚本的新实例。"
+msgstr "返回该脚本的新实例。"
 
 #: doc/classes/CubeMap.xml
 msgid "A CubeMap is a 6-sided 3D texture."
@@ -23267,7 +23269,7 @@ msgstr "�新计算曲线的烘焙点缓存。"
 msgid ""
 "Removes points that are closer than [code]CMP_EPSILON[/code] (0.00001) units "
 "to their neighbor on the curve."
-msgstr "移除比曲线上的相邻点近[code]CMP_EPSILON[/code]（0.00001）个��的点。"
+msgstr "移除比曲线上的相邻点近 [code]CMP_EPSILON[/code]（0.00001）个��的点。"
 
 #: doc/classes/Curve.xml doc/classes/Curve2D.xml doc/classes/Curve3D.xml
 msgid "Removes all points from the curve."
@@ -23462,9 +23464,9 @@ msgid ""
 "the index is out of bounds, the function sends an error to the console, and "
 "returns [code](0, 0)[/code]."
 msgstr ""
-"返回指�顶点[code]idx[/code]的控制点�置。返回的�置是相对于顶点[code]idx[/"
-"code]的。如果索引超出了范围，函数会�控制���一�错误，并返回 [code](0, 0)"
-"[/code]。"
+"返回指�顶点 [code]idx[/code] 的控制点�置。返回的�置是相对于顶点 "
+"[code]idx[/code] 的。如果索引超出了范围，函数会�控制���一�错误，并返回 "
+"[code](0, 0)[/code]。"
 
 #: doc/classes/Curve2D.xml
 msgid ""
@@ -23473,9 +23475,9 @@ msgid ""
 "code]. If the index is out of bounds, the function sends an error to the "
 "console, and returns [code](0, 0)[/code]."
 msgstr ""
-"返回从顶点[code]idx[/code]引出的控制点�置。返回的�置是相对于顶点 "
-"[code]idx[/code]。如果索引越界，函数会�控制���错误，并返回 [code](0, 0)[/"
-"code]。"
+"返回从顶点 [code]idx[/code] 引出的控制点�置。返回的�置是相对于顶点 "
+"[code]idx[/code]。如果索引越界，函数会�控制���错误，并返回 [code](0, "
+"0)[/code]。"
 
 #: doc/classes/Curve2D.xml
 msgid ""
@@ -25234,9 +25236,9 @@ msgid ""
 "appear in the inspector when selecting a node that extends the class "
 "specified by [code]class_name[/code]."
 msgstr ""
-"如果[code]class_name[/code]指定的类中的[code]property[/code]被�用，则返回 "
-"[code]true[/code]。当属性被�用时，当[code]class_name[/code]类被指定为类的(继"
-"承)父节点时，它将�会出现在检查器中。"
+"如果 [code]class_name[/code] 指定的类中的 [code]property[/code] 属性被�用，"
+"则返回 [code]true[/code]。�用�一属性�，当选中继承自 "
+"[code]class_name[/code] 类的节点时，该属性将�会出现在检查器中。"
 
 #: doc/classes/EditorFeatureProfile.xml
 msgid ""
@@ -25252,18 +25254,19 @@ msgid ""
 "format obtained by using the feature profile manager's [b]Export[/b] button "
 "or the [method save_to_file] method."
 msgstr ""
-"从文件中加载一个编辑器功能�置文件。该文件必须�循JSON格�，通过使用功能�置"
-"文件管�器的[b]Export[/b]按钮或[method save_to_file]方法获得。"
+"从文件中加载一个编辑器功能�置文件。该文件必须�循 JSON "
+"格�，通过使用功能�置文件管�器的[b]导出[/b]按钮或 [method save_to_file] "
+"方法获得。"
 
 #: doc/classes/EditorFeatureProfile.xml
-#, fuzzy
 msgid ""
 "Saves the editor feature profile to a file in JSON format. It can then be "
 "imported using the feature profile manager's [b]Import[/b] button or the "
 "[method load_from_file] method."
 msgstr ""
-"将编辑器的功能�置�存到JSON格�的文件中。然��以使用特��置文件管�器的[b]"
-"导入[/b]按钮或[method load_from_file]按钮导入它。"
+"将编辑器的功能�置�存到 JSON "
+"格�的文件中。然��以使用功能�置文件管�器的[b]导入[/b]按钮或 [method "
+"load_from_file] 方法导入它。"
 
 #: doc/classes/EditorFeatureProfile.xml
 msgid ""
@@ -25271,8 +25274,9 @@ msgid ""
 "by [code]class_name[/code]. When disabled, the class won't appear in the "
 "Create New Node dialog."
 msgstr ""
-"如果 [code]disable[/code] 是 [code]true[/code]，则�用 [code]class_name[/"
-"code] 指定的类。被�用时，该类�会出现在“创建新 Node�对�框中。"
+"如果 [code]disable[/code] 为 [code]true[/code]，则�用 "
+"[code]class_name[/code] 指定的类。�用�，该类�会出现在“创建新 "
+"Node�对�框中。"
 
 #: doc/classes/EditorFeatureProfile.xml
 msgid ""
@@ -25281,9 +25285,9 @@ msgid ""
 "appear in the Create New Node dialog but the inspector will be read-only "
 "when selecting a node that extends the class."
 msgstr ""
-"如果 [code]disable[/code] 为 [code]true[/code]，则�用 [code]class_name[/"
-"code] 指定的类的编辑。�用时，类�然会出现在“创建新 Node�对�框中，但在选择继"
-"承的节点时，检查器将�读。"
+"如果 [code]disable[/code] 为 [code]true[/code]，则�用 "
+"[code]class_name[/code] 指定的类的编辑。�用�，该类�然会出现在“创建新 "
+"Node�对�框中，但在选中继承的节点时，检查器将�读。"
 
 #: doc/classes/EditorFeatureProfile.xml
 msgid ""
@@ -25292,9 +25296,10 @@ msgid ""
 "When a property is disabled, it won't appear in the inspector when selecting "
 "a node that extends the class specified by [code]class_name[/code]."
 msgstr ""
-"如果 [code]disable[/code] 是 [code]true[/code]，则�用 [code]class_name[/"
-"code] 指定的类中的 [code]property[/code] 的编辑。当属性被�用时，当选择继承 "
-"[code]class_name[/code] 指定的类的节点时，它将�会出现在检查器中。"
+"如果 [code]disable[/code] 为 [code]true[/code]，则�用 "
+"[code]class_name[/code] 指定的类中的 [code]property[/code] "
+"属性的编辑。�用�一属性�，选中继承自 [code]class_name[/code] "
+"指定的类的节点时，这个属性将�会出现在检查器中。"
 
 #: doc/classes/EditorFeatureProfile.xml
 msgid ""
@@ -25325,7 +25330,7 @@ msgstr ""
 msgid ""
 "The AssetLib tab. If this feature is disabled, the AssetLib tab won't "
 "display."
-msgstr "AssetLib选项�。如果�用此功能，则�会显示AssetLib选项�。"
+msgstr "AssetLib 选项�。如果�用此功能，则�会显示 AssetLib 选项�。"
 
 #: doc/classes/EditorFeatureProfile.xml
 msgid ""
@@ -29678,14 +29683,13 @@ msgid "The default exposure used for tonemapping."
 msgstr "用于色调映射的默认�光。"
 
 #: doc/classes/Environment.xml
-#, fuzzy
 msgid ""
 "The tonemapping mode to use. Tonemapping is the process that \"converts\" "
 "HDR values to be suitable for rendering on a SDR display. (Godot doesn't "
 "support rendering on HDR displays yet.)"
 msgstr ""
-"�使用的色调映射模�。色调映射是“转��HDR 值以适�在 LDR 显示器上呈现的过程。"
-"（Godot 尚�支�在 HDR 显示器上进行渲染。）"
+"�使用的色调映射模�。色调映射是将 HDR 值“转��为适�在 SDR "
+"显示器上呈现的值过程。（Godot 尚�支�在 HDR 显示器上进行渲染。）"
 
 #: doc/classes/Environment.xml
 msgid ""
@@ -31958,16 +31962,16 @@ msgstr ""
 "[b]注�：[/b]直线是使用方���而�是终点指定的。"
 
 #: doc/classes/Geometry.xml
-#, fuzzy
 msgid ""
 "Given an array of [Vector2]s representing tiles, builds an atlas. The "
 "returned dictionary has two keys: [code]points[/code] is an array of "
 "[Vector2] that specifies the positions of each tile, [code]size[/code] "
 "contains the overall size of the whole atlas as [Vector2]."
 msgstr ""
-"给定表示图�的[Vector2]数组，构建一个地图集。返回的字典有两个键："
-"[code]points[/code]是[Vector2]的��，用于指定�个图�的�置，[code]size[/"
-"code]包�整个图集的整体大�，作为[Vector2]。"
+"给定表示图�的 [Vector2] "
+"数组，构建一个地图集。返回的字典有两个键：[code]points[/code] 是 [Vector2] "
+"的数组，用于指定�个图�的�置，[code]size[/code] 包�整个图集的整体大�，"
+"是一个 [Vector2]。"
 
 #: doc/classes/Geometry.xml
 msgid ""
@@ -33247,9 +33251,7 @@ msgstr "�图矩形的大�。地图自身基于网格区域的大�，并被
 msgid ""
 "If [code]true[/code], enables disconnection of existing connections in the "
 "GraphEdit by dragging the right end."
-msgstr ""
-"如果为 [code]true[/code]，通过拖动�端，�以断开图形编辑GraphEdit中现有的连"
-"接。"
+msgstr "如果为 [code]true[/code]，通过拖动�端，�以断开 GraphEdit 中现有的连接。"
 
 #: doc/classes/GraphEdit.xml
 msgid "The scroll offset."
@@ -33306,9 +33308,9 @@ msgid ""
 "code] slot of the [code]from[/code] GraphNode and the [code]to_slot[/code] "
 "slot of the [code]to[/code] GraphNode is attempted to be created."
 msgstr ""
-"当试图创建[code]�自from[/code]图形节点GraphNode1的[code]from_slot[/code]槽和"
-"[code]to[/code]图形节点GraphNode2的[code]to_slot[/code]槽之间的连接时，会�图"
-"形编辑GraphEdit�出。"
+"�试创建从 [code]from[/code] GraphNode 的 [code]from_slot[/code] 槽到 "
+"[code]to[/code] GraphNode 的 [code]to_slot[/code] 槽之间的连接时，会�该 "
+"GraphEdit �出。"
 
 #: doc/classes/GraphEdit.xml
 msgid ""
@@ -33335,9 +33337,9 @@ msgid ""
 "slot of [code]from[/code] GraphNode and [code]to_slot[/code] slot of "
 "[code]to[/code] GraphNode is attempted to be removed."
 msgstr ""
-"当试图移除 [code]from[/code] 图形节点GraphNode1的 [code]from_slot[/code]槽和"
-"[code]to[/code] 图形节点GraphNode 的[code]to_slot[/code] 槽之间的连接时，会�"
-"�到图形编辑GraphEdit。"
+"�试移除从 [code]from[/code] GraphNode 的 [code]from_slot[/code] 槽到 "
+"[code]to[/code] GraphNode 的 [code]to_slot[/code] 槽之间的连接时，会�该 "
+"GraphEdit �出。"
 
 #: doc/classes/GraphEdit.xml
 msgid ""
@@ -33561,9 +33563,8 @@ msgstr ""
 msgid ""
 "Sets the [Color] of the right (output) side of the slot [code]idx[/code] to "
 "[code]color_right[/code]."
-msgstr ""
-"将�槽[code]idx[/code]的�侧（输出）的颜色[Color]设置为[code]color_right[/"
-"code]。"
+msgstr "将�槽 [code]idx[/code] 的�侧（输出）的颜色 [Color] 设置为 "
+"[code]color_right[/code]。"
 
 #: doc/classes/GraphNode.xml
 msgid ""
@@ -33599,7 +33600,7 @@ msgstr ""
 
 #: doc/classes/GraphNode.xml
 msgid "If [code]true[/code], the GraphNode is a comment node."
-msgstr "如果为 [code]true[/code]，则 GraphNode 是注释节点。"
+msgstr "如果为 [code]true[/code]，则该 GraphNode 是注释节点。"
 
 #: doc/classes/GraphNode.xml
 msgid ""
@@ -33627,7 +33628,7 @@ msgstr ""
 
 #: doc/classes/GraphNode.xml
 msgid "If [code]true[/code], the GraphNode is selected."
-msgstr "如果为 [code]true[/code]，图形节点GraphNode被选中。"
+msgstr "如果为 [code]true[/code]，则该 GraphNode 被选中。"
 
 #: doc/classes/GraphNode.xml
 msgid ""
@@ -41016,7 +41017,6 @@ msgid "The tint of [Font]'s outline."
 msgstr "对 [Font] 轮廓的染色。"
 
 #: doc/classes/Label3D.xml
-#, fuzzy
 msgid ""
 "Sets the render priority for the text outline. Higher priority objects will "
 "be sorted in front of lower priority objects.\n"
@@ -41028,8 +41028,8 @@ msgid ""
 "sorted from back to front (subject to priority)."
 msgstr ""
 "设置文本轮廓的渲染优先级。优先级高的物体将被排�在优先级低的物体��。\n"
-"[b]注�：[/b]仅在 [member alpha_cut] 为 [constant ALPHA_CUT_DISABLED]（默认"
-"值）时适用。\n"
+"[b]注�：[/b]仅在 [member alpha_cut] 为 [constant "
+"ALPHA_CUT_DISABLED]（默认值）时适用。\n"
 "[b]注�：[/b]仅适用于�明物体的排�。这�会影��明物体相对于��明物体的排�"
 "方�。这是因为��明对象�被排�，而�明对象则从�往�排�（�决于优先级）。"
 
@@ -41038,7 +41038,6 @@ msgid "The size of one pixel's width on the label to scale it in 3D."
 msgstr "标签上一个�素宽度的大�，以 3D 缩放。"
 
 #: doc/classes/Label3D.xml
-#, fuzzy
 msgid ""
 "Sets the render priority for the text. Higher priority objects will be "
 "sorted in front of lower priority objects.\n"
@@ -41050,8 +41049,8 @@ msgid ""
 "sorted from back to front (subject to priority)."
 msgstr ""
 "设置文本的渲染优先级。优先级高的物体将被排�在优先级低的物体��。\n"
-"[b]注�：[/b]仅在 [member alpha_cut] 为 [constant ALPHA_CUT_DISABLED]（默认"
-"值）时适用。\n"
+"[b]注�：[/b]仅在 [member alpha_cut] 为 [constant "
+"ALPHA_CUT_DISABLED]（默认值）时适用。\n"
 "[b]注�：[/b]仅适用于�明物体的排�。这�会影��明物体相对于��明物体的排�"
 "方�。这是因为��明对象�被排�，而�明对象则从�往�排�（�决于优先级）。"
 
@@ -41077,11 +41076,10 @@ msgid "If set, lights in the environment affect the label."
 msgstr "如果打开，环境中的�光会影�该标签。"
 
 #: doc/classes/Label3D.xml
-#, fuzzy
 msgid ""
 "If set, text can be seen from the back as well. If not, the text is "
 "invisible when looking at it from behind."
-msgstr "如果打开，从��也�以看到文本，如果�打开，从��看它是���的。"
+msgstr "如果打开，从��也�以看到文本。如果�打开，从��看该文本是���的。"
 
 #: doc/classes/Label3D.xml doc/classes/SpatialMaterial.xml
 #: doc/classes/SpriteBase3D.xml
@@ -46077,7 +46075,6 @@ msgid "An instance of a [NavigationMesh]."
 msgstr "[NavigationMesh] 的一个实例。"
 
 #: doc/classes/NavigationMeshInstance.xml
-#, fuzzy
 msgid ""
 "An instance of a [NavigationMesh]. It tells the [Navigation] node what can "
 "be navigated and what cannot, based on the [NavigationMesh] resource.\n"
@@ -46096,13 +46093,13 @@ msgid ""
 "The cost of traveling distances inside this region can be controlled with "
 "the [member travel_cost] multiplier."
 msgstr ""
-"[NavigationMesh] 的实例。[Navigation] 节点根�它的 [NavigationMesh] 资��确"
-"定哪些�以进行导航�哪些�能。\n"
+"[NavigationMesh] 的实例。[Navigation] 节点根�它的 [NavigationMesh] "
+"资��确定哪些�以进行导航�哪些�能。\n"
 "默认情况下，这个节点会在默认的 [World] 导航地图中进行注册。如果这个节点是 "
 "[Navigation] 节点的�项，就会在该导航节点的导航地图中进行注册。\n"
 "如果两个地图共享类似的边界，就�以相互连接。你�以通过 [method "
-"NavigationServer.map_set_edge_connection_margin] 设置两个顶点连接两�边界所需"
-"的最��离。\n"
+"NavigationServer.map_set_edge_connection_margin] "
+"设置两个顶点连接两�边界所需的最��离。\n"
 "[b]注�：[/b]将两个地区的导航网格相互��并�足以将其相连。它们必须共享类似的"
 "边界。\n"
 "从�一个地区进入这个地图的消耗�以通过 [member enter_cost] 进行控制。\n"
@@ -46415,7 +46412,6 @@ msgid "A region of the 2D navigation map."
 msgstr "2D 导航地图上的一个地区。"
 
 #: doc/classes/NavigationPolygonInstance.xml
-#, fuzzy
 msgid ""
 "A region of the navigation map. It tells the [Navigation2DServer] what can "
 "be navigated and what cannot, based on its [NavigationPolygon] resource.\n"
@@ -46434,13 +46430,13 @@ msgid ""
 "The pathfinding cost of traveling distances inside this region can be "
 "controlled with the [member travel_cost] multiplier."
 msgstr ""
-"导航地图上的地区。[Navigation2DServer] 根�它的 [NavigationPolygon] 资��确"
-"定哪些�以进行导航�哪些�能。\n"
+"导航地图上的地区。[Navigation2DServer] 根�它的 [NavigationPolygon] "
+"资��确定哪些�以进行导航�哪些�能。\n"
 "默认情况下，这个节点会在默认的 [World2D] 导航地图中进行注册。如果这个节点是 "
 "[Navigation2D] 节点的�项，就会在该导航节点的导航地图中进行注册。\n"
 "如果两个地图共享类似的边界，就�以相互连接。你�以通过 [method "
-"Navigation2DServer.map_set_edge_connection_margin] 设置两个顶点连接两�边界所"
-"需的最��离。\n"
+"Navigation2DServer.map_set_edge_connection_margin] "
+"设置两个顶点连接两�边界所需的最��离。\n"
 "[b]注�：[/b]将两个地区的导航网格相互��并�足以将其相连。它们必须共享类似的"
 "边界。\n"
 "从�一个地区进入这个地图的寻路消耗�以通过 [member enter_cost] 进行控制。\n"
@@ -46587,7 +46583,7 @@ msgstr "控制这个�务器是�激活。"
 msgid ""
 "A [NetworkedMultiplayerPeer] implementation that can be controlled from a "
 "script."
-msgstr ""
+msgstr "对 [NetworkedMultiplayerPeer] 的一�实现，能够通过脚本控制。"
 
 #: doc/classes/NetworkedMultiplayerCustom.xml
 msgid ""
@@ -46596,6 +46592,9 @@ msgid ""
 "Its purpose is to allow adding a new backend for the high-Level multiplayer "
 "API without needing to use GDNative."
 msgstr ""
+"对 [NetworkedMultiplayerPeer] 的一�实现，能够作为 [member MultiplayerAPI."
+"network_peer] 使用并且通过脚本控制。\n"
+"其目的是为高级多人 API 添加新的�端，�必使用 GDNative。"
 
 #: doc/classes/NetworkedMultiplayerCustom.xml
 msgid ""
@@ -46604,24 +46603,26 @@ msgid ""
 "(originating from the [signal packet_generated] signal on the sending peer), "
 "passing it to this method will deliver it locally."
 msgstr ""
+"�本地 [MultiplayerAPI] 传递数�包。\n"
+"当你的脚本通过网络收到其他对等体的数�包时（��方�出 [signal "
+"packet_generated] 信�），将其传递给这个方法会在本地进行传递。"
 
 #: doc/classes/NetworkedMultiplayerCustom.xml
 msgid ""
 "Initialize the peer with the given [code]peer_id[/code] (must be between 1 "
 "and 2147483647)."
-msgstr ""
+msgstr "使用给定的 [code]peer_id[/code] �始化该对等体（必须在 1 和 2147483647 "
+"之间）。"
 
 #: doc/classes/NetworkedMultiplayerCustom.xml
-#, fuzzy
 msgid ""
 "Set the state of the connection. See [enum NetworkedMultiplayerPeer."
 "ConnectionStatus]."
-msgstr "返回连接的当�状�。� [enum ConnectionStatus]。"
+msgstr "设置连接的状�。� [enum NetworkedMultiplayerPeer.ConnectionStatus]。"
 
 #: doc/classes/NetworkedMultiplayerCustom.xml
-#, fuzzy
 msgid "Set the max packet size that this peer can handle."
-msgstr "设置该实例使用的光照图。"
+msgstr "设置这个对等体所能够处�的最大数�包大�。"
 
 #: doc/classes/NetworkedMultiplayerCustom.xml
 msgid ""
@@ -46630,6 +46631,9 @@ msgid ""
 "the network (which should call [method deliver_packet] with the data when "
 "it's received)."
 msgstr ""
+"当本地 [MultiplayerAPI] 生�数�包时触�。\n"
+"你的脚本应当获�这个数�包并将其通过网络��给请求的对等体（"
+"对方收到该数�时应当调用 [method deliver_packet]）。"
 
 #: modules/enet/doc_classes/NetworkedMultiplayerENet.xml
 msgid ""
@@ -50336,6 +50340,10 @@ msgid ""
 "series don't support cubemap shadows and will fall back to dual paraboloid "
 "shadows as a result."
 msgstr ""
+"为这个 [OmniLight] 使用的阴影渲染模�。� [enum ShadowMode]。\n"
+"[b]注�：[/b]在 GLES2 中，�有支�深度立方体贴图功能的 GPU �支� [constant "
+"SHADOW_CUBE]。Radeon HD 4000 系列等较�的 GPU "
+"�支�立方体贴图阴影，因此会回退到使用�抛物�阴影。"
 
 #: doc/classes/OmniLight.xml
 msgid ""
@@ -50345,14 +50353,13 @@ msgstr ""
 "阴影被渲染到一个�抛物�纹�。比 [constant SHADOW_CUBE] 更快，但质�较差。"
 
 #: doc/classes/OmniLight.xml
-#, fuzzy
 msgid ""
 "Shadows are rendered to a cubemap. Slower than [constant "
 "SHADOW_DUAL_PARABOLOID], but higher-quality. Only supported on GPUs that "
 "feature support for depth cubemaps."
 msgstr ""
-"阴影被渲染�一个立方体贴图。比 [constant SHADOW_DUAL_PARABOLOID] 慢，但质�更"
-"高。"
+"阴影被渲染至一个立方体贴图。比 [constant SHADOW_DUAL_PARABOLOID] "
+"慢，但质�更高。仅在支�深度立方体贴图功能的 GPU 上支�。"
 
 #: doc/classes/OmniLight.xml
 msgid "Use more detail vertically when computing the shadow."
@@ -72901,7 +72908,6 @@ msgid "The size of one pixel's width on the sprite to scale it in 3D."
 msgstr "精�上一个�素宽度的大�，以 3D 缩放。"
 
 #: doc/classes/SpriteBase3D.xml
-#, fuzzy
 msgid ""
 "Sets the render priority for the sprite. Higher priority objects will be "
 "sorted in front of lower priority objects.\n"
@@ -72912,9 +72918,9 @@ msgid ""
 "This is because opaque objects are not sorted, while transparent objects are "
 "sorted from back to front (subject to priority)."
 msgstr ""
-"设置精�的渲染优先级。优先级高的物体将被排�在优先级低的物体��。\n"
-"[b]注�：[/b]仅在 [member alpha_cut] 为 [constant ALPHA_CUT_DISABLED]（默认"
-"值）时适用。\n"
+"设置该精�的渲染优先级。优先级高的物体将被排�在优先级低的物体��。\n"
+"[b]注�：[/b]仅在 [member alpha_cut] 为 [constant "
+"ALPHA_CUT_DISABLED]（默认值）时适用。\n"
 "[b]注�：[/b]仅适用于�明物体的排�。这�会影��明物体相对于��明物体的排�"
 "方�。这是因为��明对象�被排�，而�明对象则从�往�排�（�决于优先级）。"
 
@@ -76499,14 +76505,13 @@ msgid "Sets the text for a specific line."
 msgstr "设置特定行的文本。"
 
 #: doc/classes/TextEdit.xml
-#, fuzzy
 msgid ""
 "Bookmarks the [code]line[/code] if [code]bookmark[/code] is [code]true[/"
 "code]. Deletes the bookmark if [code]bookmark[/code] is [code]false[/code].\n"
 "Bookmarks are shown in the [member breakpoint_gutter]."
 msgstr ""
-"如果 [code]bookmark[/code] 为 true，则为行 [code]line[/code] 设置书签。如果 "
-"[code]bookmark[/code] 为 false，则删除该书签。\n"
+"如果 [code]bookmark[/code] 为 [code]true[/code]，则为行 [code]line[/code] "
+"设置书签。如果 [code]bookmark[/code] 为 [code]false[/code]，则删除该书签。\n"
 "书签显示在 [member breakpoint_gutter] 中。"
 
 #: doc/classes/TextEdit.xml
@@ -80906,14 +80911,12 @@ msgid ""
 msgstr "返回使用 [method set_metadata] 为指定列设置的元数�。"
 
 #: doc/classes/TreeItem.xml
-#, fuzzy
 msgid ""
 "Returns the next sibling TreeItem in the tree or a null object if there is "
 "none."
-msgstr "返回树中的下一个 TreeItem，如果没有，则返回一个空对象。"
+msgstr "返回树中的下一个兄弟 TreeItem，如果没有，则返回一个空对象。"
 
 #: doc/classes/TreeItem.xml
-#, fuzzy
 msgid ""
 "Returns the next visible sibling TreeItem in the tree or a null object if "
 "there is none.\n"
@@ -80921,8 +80924,8 @@ msgid ""
 "visible element in the tree when called on the last visible element, "
 "otherwise it returns [code]null[/code]."
 msgstr ""
-"返回树中下一个��的 TreeItem，如果没有，则返回空对象。\n"
-"如果 [code]wrap[/code] 被�用，当在最�一个��元素上调用时，该方法将环绕到树"
+"返回树中下一个��的兄弟 TreeItem，如果没有，则返回空对象。\n"
+"如果�用了 [code]wrap[/code]，当在最�一个��元素上调用时，该方法将环绕到树"
 "中的第一个��元素，�则它将返回 [code]null[/code]。"
 
 #: doc/classes/TreeItem.xml
@@ -80930,14 +80933,12 @@ msgid "Returns the parent TreeItem or a null object if there is none."
 msgstr "返回父级 TreeItem，如果没有，则返回一个空对象。"
 
 #: doc/classes/TreeItem.xml
-#, fuzzy
 msgid ""
 "Returns the previous sibling TreeItem in the tree or a null object if there "
 "is none."
-msgstr "返回树中的�一个 TreeItem，如果没有，则返回一个空对象。"
+msgstr "返回树中的�一个兄弟 TreeItem，如果没有，则返回一个空对象。"
 
 #: doc/classes/TreeItem.xml
-#, fuzzy
 msgid ""
 "Returns the previous visible sibling TreeItem in the tree or a null object "
 "if there is none.\n"
@@ -80945,8 +80946,8 @@ msgid ""
 "visible element in the tree when called on the first visible element, "
 "otherwise it returns [code]null[/code]."
 msgstr ""
-"返回树中�一个��的 TreeItem，如果没有，则返回 null 对象。\n"
-"如果 [code]wrap[/code] 被�用，当在第一个��元素上调用时，该方法将环绕到树中"
+"返回树中�一个��的兄弟 TreeItem，如果没有，则返回 null 对象。\n"
+"如果�用了 [code]wrap[/code]，当在第一个��元素上调用时，该方法将环绕到树中"
 "最�一个��元素，�则它将返回 [code]null[/code]。"
 
 #: doc/classes/TreeItem.xml
@@ -89273,6 +89274,10 @@ msgid ""
 "viewport_set_use_32_bpc_depth].\n"
 "[b]Note:[/b] Only available on the GLES3 backend."
 msgstr ""
+"如果为 "
+"[code]true[/code]，该视区会渲染至高动�范围（HDR）而�是标准动�范围（SDR）。"
+"�请�阅 [method viewport_set_use_32_bpc_depth]。\n"
+"[b]注�：[/b]仅在 GLES3 �端�用。"
 
 #: doc/classes/VisualServer.xml
 msgid "If [code]true[/code], the viewport's canvas is not rendered."
@@ -89370,7 +89375,6 @@ msgid ""
 msgstr "设置视窗的 2D/3D 模�。选项� [enum ViewportUsage] 常�。"
 
 #: doc/classes/VisualServer.xml
-#, fuzzy
 msgid ""
 "If [code]true[/code], allocates the viewport's framebuffer with full "
 "floating-point precision (32-bit) instead of half floating-point precision "
@@ -89378,11 +89382,9 @@ msgid ""
 "on the same [Viewport] to set HDR to [code]true[/code].\n"
 "[b]Note:[/b] Only available on the GLES3 backend."
 msgstr ""
-"如果为 [code]true[/code]，分�该视窗的帧缓冲时将使用完整浮点数精度（32 �）而"
-"�是�浮点数精度（16 �）。仅在�时�用 [member hdr] 时有效。\n"
-"[b]注�：[/b]�用这个设置�会��渲染质�。使用完整浮点数精度较慢，一般�有�"
-"求更高精度的高级�色器需�使用。如果是��少�带效应，请�用 [member "
-"debanding]。\n"
+"如果为 [code]true[/code]，分�该视区的帧缓冲时将使用完整浮点数精度（32 "
+"�）而�是�浮点数精度（16 �）。�有在�一个 [Viewport] 上通过 [method "
+"viewport_set_use_32_bpc_depth] 将 HDR 设为 [code]true[/code] 时有效。\n"
 "[b]注�：[/b]仅在 GLES3 �端中�用。"
 
 #: doc/classes/VisualServer.xml
diff --git a/drivers/gles3/rasterizer_canvas_gles3.cpp b/drivers/gles3/rasterizer_canvas_gles3.cpp
index f548cb4310..28802f571c 100644
--- a/drivers/gles3/rasterizer_canvas_gles3.cpp
+++ b/drivers/gles3/rasterizer_canvas_gles3.cpp
@@ -1610,6 +1610,8 @@ void fragment() {
 RasterizerCanvasGLES3::~RasterizerCanvasGLES3() {
 	GLES3::MaterialStorage *material_storage = GLES3::MaterialStorage::get_singleton();
 
+	memdelete_arr(state.instance_data_array);
+
 	GLES3::MaterialStorage::get_singleton()->shaders.canvas_shader.version_free(state.canvas_shader_default_version);
 	material_storage->material_free(default_canvas_group_material);
 	material_storage->shader_free(default_canvas_group_shader);
diff --git a/drivers/gles3/rasterizer_scene_gles3.cpp b/drivers/gles3/rasterizer_scene_gles3.cpp
index 410cd376a7..3e416bc615 100644
--- a/drivers/gles3/rasterizer_scene_gles3.cpp
+++ b/drivers/gles3/rasterizer_scene_gles3.cpp
@@ -1650,23 +1650,23 @@ void RasterizerSceneGLES3::_setup_lights(const RenderDataGLES3 *p_render_data, b
 
 		light_data.specular_amount = light_storage->light_get_param(base, RS::LIGHT_PARAM_SPECULAR) * 2.0;
 
-		light_data.shadow_enabled = false;
+		light_data.shadow_opacity = 0.0;
 	}
 
 	// TODO, to avoid stalls, should rotate between 3 buffers based on frame index.
 	// TODO, consider mapping the buffer as in 2D
+	glBindBufferBase(GL_UNIFORM_BUFFER, SCENE_OMNILIGHT_UNIFORM_LOCATION, scene_state.omni_light_buffer);
 	if (r_omni_light_count) {
-		glBindBufferBase(GL_UNIFORM_BUFFER, SCENE_OMNILIGHT_UNIFORM_LOCATION, scene_state.omni_light_buffer);
 		glBufferSubData(GL_UNIFORM_BUFFER, 0, sizeof(LightData) * r_omni_light_count, scene_state.omni_lights);
 	}
 
+	glBindBufferBase(GL_UNIFORM_BUFFER, SCENE_SPOTLIGHT_UNIFORM_LOCATION, scene_state.spot_light_buffer);
 	if (r_spot_light_count) {
-		glBindBufferBase(GL_UNIFORM_BUFFER, SCENE_SPOTLIGHT_UNIFORM_LOCATION, scene_state.spot_light_buffer);
 		glBufferSubData(GL_UNIFORM_BUFFER, 0, sizeof(LightData) * r_spot_light_count, scene_state.spot_lights);
 	}
 
+	glBindBufferBase(GL_UNIFORM_BUFFER, SCENE_DIRECTIONAL_LIGHT_UNIFORM_LOCATION, scene_state.directional_light_buffer);
 	if (r_directional_light_count) {
-		glBindBufferBase(GL_UNIFORM_BUFFER, SCENE_DIRECTIONAL_LIGHT_UNIFORM_LOCATION, scene_state.directional_light_buffer);
 		glBufferSubData(GL_UNIFORM_BUFFER, 0, sizeof(DirectionalLightData) * r_directional_light_count, scene_state.directional_lights);
 	}
 	glBindBuffer(GL_UNIFORM_BUFFER, 0);
diff --git a/drivers/gles3/rasterizer_scene_gles3.h b/drivers/gles3/rasterizer_scene_gles3.h
index e227b2df82..a54d87a3a3 100644
--- a/drivers/gles3/rasterizer_scene_gles3.h
+++ b/drivers/gles3/rasterizer_scene_gles3.h
@@ -165,7 +165,7 @@ private:
 		float inv_spot_attenuation;
 		float cos_spot_angle;
 		float specular_amount;
-		uint32_t shadow_enabled;
+		float shadow_opacity;
 	};
 	static_assert(sizeof(LightData) % 16 == 0, "LightData size must be a multiple of 16 bytes");
 
diff --git a/drivers/gles3/shaders/scene.glsl b/drivers/gles3/shaders/scene.glsl
index 4081d73ab0..84daf839e9 100644
--- a/drivers/gles3/shaders/scene.glsl
+++ b/drivers/gles3/shaders/scene.glsl
@@ -495,7 +495,7 @@ struct LightData { //this structure needs to be as packed as possible
 	mediump float cone_attenuation;
 	mediump float cone_angle;
 	mediump float specular_amount;
-	bool shadow_enabled;
+	mediump float shadow_opacity;
 };
 #ifndef DISABLE_LIGHT_OMNI
 layout(std140) uniform OmniLightData { // ubo:5
@@ -1052,6 +1052,7 @@ void main() {
 #else
 		vec3 ref_vec = reflect(-view, normal);
 #endif
+		ref_vec = mix(ref_vec, normal, roughness * roughness);
 		float horizon = min(1.0 + dot(ref_vec, normal), 1.0);
 		ref_vec = scene_data.radiance_inverse_xform * ref_vec;
 		specular_light = textureLod(radiance_map, ref_vec, roughness * RADIANCE_MAX_LOD).rgb;
diff --git a/drivers/gles3/storage/config.cpp b/drivers/gles3/storage/config.cpp
index f2809734a9..6cc65e7bb2 100644
--- a/drivers/gles3/storage/config.cpp
+++ b/drivers/gles3/storage/config.cpp
@@ -64,7 +64,14 @@ Config::Config() {
 #else
 	float_texture_supported = extensions.has("GL_ARB_texture_float") || extensions.has("GL_OES_texture_float");
 	etc2_supported = true;
+#if defined(ANDROID_ENABLED) || defined(IOS_ENABLED)
+	// Some Android devices report support for S3TC but we don't expect that and don't export the textures.
+	// This could be fixed but so few devices support it that it doesn't seem useful (and makes bigger APKs).
+	// For good measure we do the same hack for iOS, just in case.
+	s3tc_supported = false;
+#else
 	s3tc_supported = extensions.has("GL_EXT_texture_compression_dxt1") || extensions.has("GL_EXT_texture_compression_s3tc") || extensions.has("WEBGL_compressed_texture_s3tc");
+#endif
 	rgtc_supported = extensions.has("GL_EXT_texture_compression_rgtc") || extensions.has("GL_ARB_texture_compression_rgtc") || extensions.has("EXT_texture_compression_rgtc");
 #endif
 
diff --git a/drivers/gles3/storage/light_storage.cpp b/drivers/gles3/storage/light_storage.cpp
index 22578c9e91..2e4bfdc15b 100644
--- a/drivers/gles3/storage/light_storage.cpp
+++ b/drivers/gles3/storage/light_storage.cpp
@@ -70,6 +70,7 @@ void LightStorage::_light_initialize(RID p_light, RS::LightType p_type) {
 	light.param[RS::LIGHT_PARAM_SHADOW_SPLIT_3_OFFSET] = 0.6;
 	light.param[RS::LIGHT_PARAM_SHADOW_FADE_START] = 0.8;
 	light.param[RS::LIGHT_PARAM_SHADOW_NORMAL_BIAS] = 1.0;
+	light.param[RS::LIGHT_PARAM_SHADOW_OPACITY] = 1.0;
 	light.param[RS::LIGHT_PARAM_SHADOW_BIAS] = 0.02;
 	light.param[RS::LIGHT_PARAM_SHADOW_BLUR] = 0;
 	light.param[RS::LIGHT_PARAM_SHADOW_PANCAKE_SIZE] = 20.0;
diff --git a/drivers/gles3/storage/material_storage.cpp b/drivers/gles3/storage/material_storage.cpp
index 7a52b0520e..c8a35dbdad 100644
--- a/drivers/gles3/storage/material_storage.cpp
+++ b/drivers/gles3/storage/material_storage.cpp
@@ -2528,11 +2528,11 @@ String MaterialStorage::shader_get_code(RID p_shader) const {
 	return shader->code;
 }
 
-void MaterialStorage::shader_get_param_list(RID p_shader, List<PropertyInfo> *p_param_list) const {
+void MaterialStorage::shader_get_shader_uniform_list(RID p_shader, List<PropertyInfo> *p_param_list) const {
 	GLES3::Shader *shader = shader_owner.get_or_null(p_shader);
 	ERR_FAIL_COND(!shader);
 	if (shader->data) {
-		return shader->data->get_param_list(p_param_list);
+		return shader->data->get_shader_uniform_list(p_param_list);
 	}
 }
 
@@ -2764,14 +2764,14 @@ bool MaterialStorage::material_casts_shadows(RID p_material) {
 	return true; //by default everything casts shadows
 }
 
-void MaterialStorage::material_get_instance_shader_parameters(RID p_material, List<InstanceShaderParam> *r_parameters) {
+void MaterialStorage::material_get_instance_shader_uniforms(RID p_material, List<InstanceShaderParam> *r_parameters) {
 	GLES3::Material *material = material_owner.get_or_null(p_material);
 	ERR_FAIL_COND(!material);
 	if (material->shader && material->shader->data) {
 		material->shader->data->get_instance_param_list(r_parameters);
 
 		if (material->next_pass.is_valid()) {
-			material_get_instance_shader_parameters(material->next_pass, r_parameters);
+			material_get_instance_shader_uniforms(material->next_pass, r_parameters);
 		}
 	}
 }
@@ -2884,7 +2884,7 @@ void CanvasShaderData::set_default_texture_param(const StringName &p_name, RID p
 	}
 }
 
-void CanvasShaderData::get_param_list(List<PropertyInfo> *p_param_list) const {
+void CanvasShaderData::get_shader_uniform_list(List<PropertyInfo> *p_param_list) const {
 	HashMap<int, StringName> order;
 
 	for (const KeyValue<StringName, ShaderLanguage::ShaderNode::Uniform> &E : uniforms) {
@@ -3128,7 +3128,7 @@ void SkyShaderData::set_default_texture_param(const StringName &p_name, RID p_te
 	}
 }
 
-void SkyShaderData::get_param_list(List<PropertyInfo> *p_param_list) const {
+void SkyShaderData::get_shader_uniform_list(List<PropertyInfo> *p_param_list) const {
 	RBMap<int, StringName> order;
 
 	for (const KeyValue<StringName, ShaderLanguage::ShaderNode::Uniform> &E : uniforms) {
@@ -3452,7 +3452,7 @@ void SceneShaderData::set_default_texture_param(const StringName &p_name, RID p_
 	}
 }
 
-void SceneShaderData::get_param_list(List<PropertyInfo> *p_param_list) const {
+void SceneShaderData::get_shader_uniform_list(List<PropertyInfo> *p_param_list) const {
 	RBMap<int, StringName> order;
 
 	for (const KeyValue<StringName, ShaderLanguage::ShaderNode::Uniform> &E : uniforms) {
diff --git a/drivers/gles3/storage/material_storage.h b/drivers/gles3/storage/material_storage.h
index 64e0e2d8c1..d135357f6a 100644
--- a/drivers/gles3/storage/material_storage.h
+++ b/drivers/gles3/storage/material_storage.h
@@ -54,7 +54,7 @@ namespace GLES3 {
 struct ShaderData {
 	virtual void set_code(const String &p_Code) = 0;
 	virtual void set_default_texture_param(const StringName &p_name, RID p_texture, int p_index) = 0;
-	virtual void get_param_list(List<PropertyInfo> *p_param_list) const = 0;
+	virtual void get_shader_uniform_list(List<PropertyInfo> *p_param_list) const = 0;
 
 	virtual void get_instance_param_list(List<RendererMaterialStorage::InstanceShaderParam> *p_param_list) const = 0;
 	virtual bool is_param_texture(const StringName &p_param) const = 0;
@@ -165,7 +165,7 @@ struct CanvasShaderData : public ShaderData {
 
 	virtual void set_code(const String &p_Code);
 	virtual void set_default_texture_param(const StringName &p_name, RID p_texture, int p_index);
-	virtual void get_param_list(List<PropertyInfo> *p_param_list) const;
+	virtual void get_shader_uniform_list(List<PropertyInfo> *p_param_list) const;
 	virtual void get_instance_param_list(List<RendererMaterialStorage::InstanceShaderParam> *p_param_list) const;
 
 	virtual bool is_param_texture(const StringName &p_param) const;
@@ -216,7 +216,7 @@ struct SkyShaderData : public ShaderData {
 
 	virtual void set_code(const String &p_Code);
 	virtual void set_default_texture_param(const StringName &p_name, RID p_texture, int p_index);
-	virtual void get_param_list(List<PropertyInfo> *p_param_list) const;
+	virtual void get_shader_uniform_list(List<PropertyInfo> *p_param_list) const;
 	virtual void get_instance_param_list(List<RendererMaterialStorage::InstanceShaderParam> *p_param_list) const;
 	virtual bool is_param_texture(const StringName &p_param) const;
 	virtual bool is_animated() const;
@@ -337,7 +337,7 @@ struct SceneShaderData : public ShaderData {
 
 	virtual void set_code(const String &p_Code);
 	virtual void set_default_texture_param(const StringName &p_name, RID p_texture, int p_index);
-	virtual void get_param_list(List<PropertyInfo> *p_param_list) const;
+	virtual void get_shader_uniform_list(List<PropertyInfo> *p_param_list) const;
 	virtual void get_instance_param_list(List<RendererMaterialStorage::InstanceShaderParam> *p_param_list) const;
 
 	virtual bool is_param_texture(const StringName &p_param) const;
@@ -547,7 +547,7 @@ public:
 	virtual void shader_set_code(RID p_shader, const String &p_code) override;
 	virtual void shader_set_path_hint(RID p_shader, const String &p_path) override;
 	virtual String shader_get_code(RID p_shader) const override;
-	virtual void shader_get_param_list(RID p_shader, List<PropertyInfo> *p_param_list) const override;
+	virtual void shader_get_shader_uniform_list(RID p_shader, List<PropertyInfo> *p_param_list) const override;
 
 	virtual void shader_set_default_texture_param(RID p_shader, const StringName &p_name, RID p_texture, int p_index) override;
 	virtual RID shader_get_default_texture_param(RID p_shader, const StringName &p_name, int p_index) const override;
@@ -578,7 +578,7 @@ public:
 	virtual bool material_is_animated(RID p_material) override;
 	virtual bool material_casts_shadows(RID p_material) override;
 
-	virtual void material_get_instance_shader_parameters(RID p_material, List<InstanceShaderParam> *r_parameters) override;
+	virtual void material_get_instance_shader_uniforms(RID p_material, List<InstanceShaderParam> *r_parameters) override;
 
 	virtual void material_update_dependency(RID p_material, DependencyTracker *p_instance) override;
 
diff --git a/drivers/gles3/storage/mesh_storage.cpp b/drivers/gles3/storage/mesh_storage.cpp
index 667ba4f5e6..dee715150b 100644
--- a/drivers/gles3/storage/mesh_storage.cpp
+++ b/drivers/gles3/storage/mesh_storage.cpp
@@ -255,7 +255,10 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RS::SurfaceData &p_surface)
 			mesh->bone_aabbs.resize(p_surface.bone_aabbs.size());
 		}
 		for (int i = 0; i < p_surface.bone_aabbs.size(); i++) {
-			mesh->bone_aabbs.write[i].merge_with(p_surface.bone_aabbs[i]);
+			const AABB &bone = p_surface.bone_aabbs[i];
+			if (!bone.has_no_volume()) {
+				mesh->bone_aabbs.write[i].merge_with(bone);
+			}
 		}
 		mesh->aabb.merge_with(p_surface.aabb);
 	}
diff --git a/drivers/unix/ip_unix.cpp b/drivers/unix/ip_unix.cpp
index 2deeb79957..0dc2efedc1 100644
--- a/drivers/unix/ip_unix.cpp
+++ b/drivers/unix/ip_unix.cpp
@@ -95,12 +95,12 @@ void IPUnix::_resolve_hostname(List<IPAddress> &r_addresses, const String &p_hos
 
 	int s = getaddrinfo(p_hostname.utf8().get_data(), nullptr, &hints, &result);
 	if (s != 0) {
-		ERR_PRINT("getaddrinfo failed! Cannot resolve hostname.");
+		print_verbose("getaddrinfo failed! Cannot resolve hostname.");
 		return;
 	}
 
 	if (result == nullptr || result->ai_addr == nullptr) {
-		ERR_PRINT("Invalid response from getaddrinfo");
+		print_verbose("Invalid response from getaddrinfo");
 		if (result) {
 			freeaddrinfo(result);
 		}
diff --git a/drivers/vulkan/rendering_device_vulkan.cpp b/drivers/vulkan/rendering_device_vulkan.cpp
index 0979ae9e16..bcb6092d87 100644
--- a/drivers/vulkan/rendering_device_vulkan.cpp
+++ b/drivers/vulkan/rendering_device_vulkan.cpp
@@ -46,7 +46,7 @@
 
 static const uint32_t SMALL_ALLOCATION_MAX_SIZE = 4096;
 
-// Get the Vulkan object information and possible stage access types (bitwise OR'd with incoming values)
+// Get the Vulkan object information and possible stage access types (bitwise OR'd with incoming values).
 RenderingDeviceVulkan::Buffer *RenderingDeviceVulkan::_get_buffer_from_owner(RID p_buffer, VkPipelineStageFlags &r_stage_mask, VkAccessFlags &r_access_mask, uint32_t p_post_barrier) {
 	Buffer *buffer = nullptr;
 	if (vertex_buffer_owner.owns(p_buffer)) {
@@ -108,8 +108,8 @@ RenderingDeviceVulkan::Buffer *RenderingDeviceVulkan::_get_buffer_from_owner(RID
 }
 
 static void update_external_dependency_for_store(VkSubpassDependency2KHR &dependency, bool is_sampled, bool is_storage, bool is_depth) {
-	// Transitioning from write to read, protect the shaders that may use this next
-	// Allow for copies/image layout transitions
+	// Transitioning from write to read, protect the shaders that may use this next.
+	// Allow for copies/image layout transitions.
 	dependency.dstStageMask |= VK_PIPELINE_STAGE_TRANSFER_BIT;
 	dependency.dstAccessMask |= VK_ACCESS_TRANSFER_READ_BIT;
 
@@ -125,7 +125,7 @@ static void update_external_dependency_for_store(VkSubpassDependency2KHR &depend
 	}
 
 	if (is_depth) {
-		// Depth resources have additional stages that may be interested in them
+		// Depth resources have additional stages that may be interested in them.
 		dependency.dstStageMask |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
 		dependency.dstAccessMask |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
 	}
@@ -146,7 +146,7 @@ void RenderingDeviceVulkan::_add_dependency(RID p_id, RID p_depends_on) {
 }
 
 void RenderingDeviceVulkan::_free_dependencies(RID p_id) {
-	//direct dependencies must be freed
+	// Direct dependencies must be freed.
 
 	HashMap<RID, HashSet<RID>>::Iterator E = dependency_map.find(p_id);
 	if (E) {
@@ -156,7 +156,7 @@ void RenderingDeviceVulkan::_free_dependencies(RID p_id) {
 		dependency_map.remove(E);
 	}
 
-	//reverse dependencies must be unreferenced
+	// Reverse dependencies must be unreferenced.
 	E = reverse_dependency_map.find(p_id);
 
 	if (E) {
@@ -860,7 +860,7 @@ uint32_t RenderingDeviceVulkan::get_image_format_pixel_size(DataFormat p_format)
 		case DATA_FORMAT_D24_UNORM_S8_UINT:
 			return 4;
 		case DATA_FORMAT_D32_SFLOAT_S8_UINT:
-			return 5; //?
+			return 5; // ?
 		case DATA_FORMAT_BC1_RGB_UNORM_BLOCK:
 		case DATA_FORMAT_BC1_RGB_SRGB_BLOCK:
 		case DATA_FORMAT_BC1_RGBA_UNORM_BLOCK:
@@ -995,7 +995,7 @@ void RenderingDeviceVulkan::get_compressed_image_format_block_dimensions(DataFor
 		case DATA_FORMAT_EAC_R11_SNORM_BLOCK:
 		case DATA_FORMAT_EAC_R11G11_UNORM_BLOCK:
 		case DATA_FORMAT_EAC_R11G11_SNORM_BLOCK:
-		case DATA_FORMAT_ASTC_4x4_UNORM_BLOCK: //again, not sure about astc
+		case DATA_FORMAT_ASTC_4x4_UNORM_BLOCK: // Again, not sure about astc.
 		case DATA_FORMAT_ASTC_4x4_SRGB_BLOCK:
 		case DATA_FORMAT_ASTC_5x4_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_5x4_SRGB_BLOCK:
@@ -1073,7 +1073,7 @@ uint32_t RenderingDeviceVulkan::get_compressed_image_format_block_byte_size(Data
 		case DATA_FORMAT_EAC_R11G11_UNORM_BLOCK:
 		case DATA_FORMAT_EAC_R11G11_SNORM_BLOCK:
 			return 16;
-		case DATA_FORMAT_ASTC_4x4_UNORM_BLOCK: //again, not sure about astc
+		case DATA_FORMAT_ASTC_4x4_UNORM_BLOCK: // Again, not sure about astc.
 		case DATA_FORMAT_ASTC_4x4_SRGB_BLOCK:
 		case DATA_FORMAT_ASTC_5x4_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_5x4_SRGB_BLOCK:
@@ -1101,7 +1101,7 @@ uint32_t RenderingDeviceVulkan::get_compressed_image_format_block_byte_size(Data
 		case DATA_FORMAT_ASTC_12x10_SRGB_BLOCK:
 		case DATA_FORMAT_ASTC_12x12_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_12x12_SRGB_BLOCK:
-			return 8; //wrong
+			return 8; // Wrong.
 		default: {
 		}
 	}
@@ -1110,7 +1110,7 @@ uint32_t RenderingDeviceVulkan::get_compressed_image_format_block_byte_size(Data
 
 uint32_t RenderingDeviceVulkan::get_compressed_image_format_pixel_rshift(DataFormat p_format) {
 	switch (p_format) {
-		case DATA_FORMAT_BC1_RGB_UNORM_BLOCK: //these formats are half byte size, so rshift is 1
+		case DATA_FORMAT_BC1_RGB_UNORM_BLOCK: // These formats are half byte size, so rshift is 1.
 		case DATA_FORMAT_BC1_RGB_SRGB_BLOCK:
 		case DATA_FORMAT_BC1_RGBA_UNORM_BLOCK:
 		case DATA_FORMAT_BC1_RGBA_SRGB_BLOCK:
@@ -1184,7 +1184,7 @@ uint32_t RenderingDeviceVulkan::get_image_format_required_size(DataFormat p_form
 }
 
 uint32_t RenderingDeviceVulkan::get_image_required_mipmaps(uint32_t p_width, uint32_t p_height, uint32_t p_depth) {
-	//formats and block size don't really matter here since they can all go down to 1px (even if block is larger)
+	// Formats and block size don't really matter here since they can all go down to 1px (even if block is larger).
 	uint32_t w = p_width;
 	uint32_t h = p_height;
 	uint32_t d = p_depth;
@@ -1402,16 +1402,16 @@ Error RenderingDeviceVulkan::_insert_staging_block() {
 }
 
 Error RenderingDeviceVulkan::_staging_buffer_allocate(uint32_t p_amount, uint32_t p_required_align, uint32_t &r_alloc_offset, uint32_t &r_alloc_size, bool p_can_segment) {
-	//determine a block to use
+	// Determine a block to use.
 
 	r_alloc_size = p_amount;
 
 	while (true) {
 		r_alloc_offset = 0;
 
-		//see if we can use current block
+		// See if we can use current block.
 		if (staging_buffer_blocks[staging_buffer_current].frame_used == frames_drawn) {
-			//we used this block this frame, let's see if there is still room
+			// We used this block this frame, let's see if there is still room.
 
 			uint32_t write_from = staging_buffer_blocks[staging_buffer_current].fill_amount;
 
@@ -1425,107 +1425,107 @@ Error RenderingDeviceVulkan::_staging_buffer_allocate(uint32_t p_amount, uint32_
 			int32_t available_bytes = int32_t(staging_buffer_block_size) - int32_t(write_from);
 
 			if ((int32_t)p_amount < available_bytes) {
-				//all is good, we should be ok, all will fit
+				// All is good, we should be ok, all will fit.
 				r_alloc_offset = write_from;
 			} else if (p_can_segment && available_bytes >= (int32_t)p_required_align) {
-				//ok all won't fit but at least we can fit a chunkie
-				//all is good, update what needs to be written to
+				// Ok all won't fit but at least we can fit a chunkie.
+				// All is good, update what needs to be written to.
 				r_alloc_offset = write_from;
 				r_alloc_size = available_bytes - (available_bytes % p_required_align);
 
 			} else {
-				//can't fit it into this buffer.
-				//will need to try next buffer
+				// Can't fit it into this buffer.
+				// Will need to try next buffer.
 
 				staging_buffer_current = (staging_buffer_current + 1) % staging_buffer_blocks.size();
 
-				// before doing anything, though, let's check that we didn't manage to fill all blocks
-				// possible in a single frame
+				// Before doing anything, though, let's check that we didn't manage to fill all blocks.
+				// Possible in a single frame.
 				if (staging_buffer_blocks[staging_buffer_current].frame_used == frames_drawn) {
-					//guess we did.. ok, let's see if we can insert a new block..
+					// Guess we did.. ok, let's see if we can insert a new block.
 					if ((uint64_t)staging_buffer_blocks.size() * staging_buffer_block_size < staging_buffer_max_size) {
-						//we can, so we are safe
+						// We can, so we are safe.
 						Error err = _insert_staging_block();
 						if (err) {
 							return err;
 						}
-						//claim for this frame
+						// Claim for this frame.
 						staging_buffer_blocks.write[staging_buffer_current].frame_used = frames_drawn;
 					} else {
 						// Ok, worst case scenario, all the staging buffers belong to this frame
 						// and this frame is not even done.
-						// If this is the main thread, it means the user is likely loading a lot of resources at once,
-						// otherwise, the thread should just be blocked until the next frame (currently unimplemented)
+						// If this is the main thread, it means the user is likely loading a lot of resources at once,.
+						// Otherwise, the thread should just be blocked until the next frame (currently unimplemented).
 
-						if (false) { //separate thread from render
+						if (false) { // Separate thread from render.
 
 							//block_until_next_frame()
 							continue;
 						} else {
-							//flush EVERYTHING including setup commands. IF not immediate, also need to flush the draw commands
+							// Flush EVERYTHING including setup commands. IF not immediate, also need to flush the draw commands.
 							_flush(true);
 
-							//clear the whole staging buffer
+							// Clear the whole staging buffer.
 							for (int i = 0; i < staging_buffer_blocks.size(); i++) {
 								staging_buffer_blocks.write[i].frame_used = 0;
 								staging_buffer_blocks.write[i].fill_amount = 0;
 							}
-							//claim current
+							// Claim current.
 							staging_buffer_blocks.write[staging_buffer_current].frame_used = frames_drawn;
 						}
 					}
 
 				} else {
-					//not from current frame, so continue and try again
+					// Not from current frame, so continue and try again.
 					continue;
 				}
 			}
 
 		} else if (staging_buffer_blocks[staging_buffer_current].frame_used <= frames_drawn - frame_count) {
-			//this is an old block, which was already processed, let's reuse
+			// This is an old block, which was already processed, let's reuse.
 			staging_buffer_blocks.write[staging_buffer_current].frame_used = frames_drawn;
 			staging_buffer_blocks.write[staging_buffer_current].fill_amount = 0;
 		} else {
-			//this block may still be in use, let's not touch it unless we have to, so.. can we create a new one?
+			// This block may still be in use, let's not touch it unless we have to, so.. can we create a new one?
 			if ((uint64_t)staging_buffer_blocks.size() * staging_buffer_block_size < staging_buffer_max_size) {
-				//we are still allowed to create a new block, so let's do that and insert it for current pos
+				// We are still allowed to create a new block, so let's do that and insert it for current pos.
 				Error err = _insert_staging_block();
 				if (err) {
 					return err;
 				}
-				//claim for this frame
+				// Claim for this frame.
 				staging_buffer_blocks.write[staging_buffer_current].frame_used = frames_drawn;
 			} else {
-				// oops, we are out of room and we can't create more.
-				// let's flush older frames.
+				// Oops, we are out of room and we can't create more.
+				// Let's flush older frames.
 				// The logic here is that if a game is loading a lot of data from the main thread, it will need to be stalled anyway.
 				// If loading from a separate thread, we can block that thread until next frame when more room is made (not currently implemented, though).
 
 				if (false) {
-					//separate thread from render
+					// Separate thread from render.
 					//block_until_next_frame()
-					continue; //and try again
+					continue; // And try again.
 				} else {
 					_flush(false);
 
 					for (int i = 0; i < staging_buffer_blocks.size(); i++) {
-						//clear all blocks but the ones from this frame
+						// Clear all blocks but the ones from this frame.
 						int block_idx = (i + staging_buffer_current) % staging_buffer_blocks.size();
 						if (staging_buffer_blocks[block_idx].frame_used == frames_drawn) {
-							break; //ok, we reached something from this frame, abort
+							break; // Ok, we reached something from this frame, abort.
 						}
 
 						staging_buffer_blocks.write[block_idx].frame_used = 0;
 						staging_buffer_blocks.write[block_idx].fill_amount = 0;
 					}
 
-					//claim for current frame
+					// Claim for current frame.
 					staging_buffer_blocks.write[staging_buffer_current].frame_used = frames_drawn;
 				}
 			}
 		}
 
-		//all was good, break
+		// All was good, break.
 		break;
 	}
 
@@ -1535,7 +1535,7 @@ Error RenderingDeviceVulkan::_staging_buffer_allocate(uint32_t p_amount, uint32_
 }
 
 Error RenderingDeviceVulkan::_buffer_update(Buffer *p_buffer, size_t p_offset, const uint8_t *p_data, size_t p_data_size, bool p_use_draw_command_buffer, uint32_t p_required_align) {
-	//submitting may get chunked for various reasons, so convert this to a task
+	// Submitting may get chunked for various reasons, so convert this to a task.
 	size_t to_submit = p_data_size;
 	size_t submit_from = 0;
 
@@ -1548,7 +1548,7 @@ Error RenderingDeviceVulkan::_buffer_update(Buffer *p_buffer, size_t p_offset, c
 			return err;
 		}
 
-		//map staging buffer (It's CPU and coherent)
+		// Map staging buffer (It's CPU and coherent).
 
 		void *data_ptr = nullptr;
 		{
@@ -1556,12 +1556,12 @@ Error RenderingDeviceVulkan::_buffer_update(Buffer *p_buffer, size_t p_offset, c
 			ERR_FAIL_COND_V_MSG(vkerr, ERR_CANT_CREATE, "vmaMapMemory failed with error " + itos(vkerr) + ".");
 		}
 
-		//copy to staging buffer
+		// Copy to staging buffer.
 		memcpy(((uint8_t *)data_ptr) + block_write_offset, p_data + submit_from, block_write_amount);
 
-		//unmap
+		// Unmap.
 		vmaUnmapMemory(allocator, staging_buffer_blocks[staging_buffer_current].allocation);
-		//insert a command to copy this
+		// Insert a command to copy this.
 
 		VkBufferCopy region;
 		region.srcOffset = block_write_offset;
@@ -1587,13 +1587,13 @@ void RenderingDeviceVulkan::_memory_barrier(VkPipelineStageFlags p_src_stage_mas
 	mem_barrier.dstAccessMask = p_dst_sccess;
 
 	if (p_src_stage_mask == 0 || p_dst_stage_mask == 0) {
-		return; //no barrier, since this is invalid
+		return; // No barrier, since this is invalid.
 	}
 	vkCmdPipelineBarrier(p_sync_with_draw ? frames[frame].draw_command_buffer : frames[frame].setup_command_buffer, p_src_stage_mask, p_dst_stage_mask, 0, 1, &mem_barrier, 0, nullptr, 0, nullptr);
 }
 
 void RenderingDeviceVulkan::_full_barrier(bool p_sync_with_draw) {
-	//used for debug
+	// Used for debug.
 	_memory_barrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
 			VK_ACCESS_INDIRECT_COMMAND_READ_BIT |
 					VK_ACCESS_INDEX_READ_BIT |
@@ -1662,8 +1662,8 @@ RID RenderingDeviceVulkan::texture_create(const TextureFormat &p_format, const T
 #ifndef ANDROID_ENABLED
 
 	// vkCreateImage fails with format list on Android (VK_ERROR_OUT_OF_HOST_MEMORY)
-	VkImageFormatListCreateInfoKHR format_list_create_info; //keep out of the if, needed for creation
-	Vector<VkFormat> allowed_formats; //keep out of the if, needed for creation
+	VkImageFormatListCreateInfoKHR format_list_create_info; // Keep out of the if, needed for creation.
+	Vector<VkFormat> allowed_formats; // Keep out of the if, needed for creation.
 #endif
 	if (p_format.shareable_formats.size()) {
 		image_create_info.flags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT;
@@ -1736,7 +1736,7 @@ RID RenderingDeviceVulkan::texture_create(const TextureFormat &p_format, const T
 	image_create_info.samples = rasterization_sample_count[p_format.samples];
 	image_create_info.tiling = (p_format.usage_bits & TEXTURE_USAGE_CPU_READ_BIT) ? VK_IMAGE_TILING_LINEAR : VK_IMAGE_TILING_OPTIMAL;
 
-	//usage
+	// Usage.
 	image_create_info.usage = 0;
 
 	if (p_format.usage_bits & TEXTURE_USAGE_SAMPLING_BIT) {
@@ -1800,7 +1800,7 @@ RID RenderingDeviceVulkan::texture_create(const TextureFormat &p_format, const T
 	}
 
 	{
-		//validate that this image is supported for the intended use
+		// Validate that this image is supported for the intended use.
 		VkFormatProperties properties;
 		vkGetPhysicalDeviceFormatProperties(context->get_physical_device(), image_create_info.format, &properties);
 		VkFormatFeatureFlags flags;
@@ -1841,7 +1841,7 @@ RID RenderingDeviceVulkan::texture_create(const TextureFormat &p_format, const T
 		}
 	}
 
-	//some view validation
+	// Some view validation.
 
 	if (p_view.format_override != DATA_FORMAT_MAX) {
 		ERR_FAIL_INDEX_V(p_view.format_override, DATA_FORMAT_MAX, RID());
@@ -1851,7 +1851,7 @@ RID RenderingDeviceVulkan::texture_create(const TextureFormat &p_format, const T
 	ERR_FAIL_INDEX_V(p_view.swizzle_b, TEXTURE_SWIZZLE_MAX, RID());
 	ERR_FAIL_INDEX_V(p_view.swizzle_a, TEXTURE_SWIZZLE_MAX, RID());
 
-	//allocate memory
+	// Allocate memory.
 
 	uint32_t width, height;
 	uint32_t image_size = get_image_format_required_size(p_format.format, p_format.width, p_format.height, p_format.depth, p_format.mipmaps, &width, &height);
@@ -1888,19 +1888,19 @@ RID RenderingDeviceVulkan::texture_create(const TextureFormat &p_format, const T
 	texture.samples = p_format.samples;
 	texture.allowed_shared_formats = p_format.shareable_formats;
 
-	//set base layout based on usage priority
+	// Set base layout based on usage priority.
 
 	if (p_format.usage_bits & TEXTURE_USAGE_SAMPLING_BIT) {
-		//first priority, readable
+		// First priority, readable.
 		texture.layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
 
 	} else if (p_format.usage_bits & TEXTURE_USAGE_STORAGE_BIT) {
-		//second priority, storage
+		// Second priority, storage.
 
 		texture.layout = VK_IMAGE_LAYOUT_GENERAL;
 
 	} else if (p_format.usage_bits & TEXTURE_USAGE_COLOR_ATTACHMENT_BIT) {
-		//third priority, color or depth
+		// Third priority, color or depth.
 
 		texture.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
 
@@ -1925,7 +1925,7 @@ RID RenderingDeviceVulkan::texture_create(const TextureFormat &p_format, const T
 
 	texture.bound = false;
 
-	//create view
+	// Create view.
 
 	VkImageViewCreateInfo image_view_create_info;
 	image_view_create_info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
@@ -1982,7 +1982,7 @@ RID RenderingDeviceVulkan::texture_create(const TextureFormat &p_format, const T
 		ERR_FAIL_V_MSG(RID(), "vkCreateImageView failed with error " + itos(err) + ".");
 	}
 
-	//barrier to set layout
+	// Barrier to set layout.
 	{
 		VkImageMemoryBarrier image_memory_barrier;
 		image_memory_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
@@ -2004,6 +2004,9 @@ RID RenderingDeviceVulkan::texture_create(const TextureFormat &p_format, const T
 	}
 
 	RID id = texture_owner.make_rid(texture);
+#ifdef DEV_ENABLED
+	set_resource_name(id, "RID:" + itos(id.get_id()));
+#endif
 
 	if (p_data.size()) {
 		for (uint32_t i = 0; i < image_create_info.arrayLayers; i++) {
@@ -2019,13 +2022,13 @@ RID RenderingDeviceVulkan::texture_create_shared(const TextureView &p_view, RID
 	Texture *src_texture = texture_owner.get_or_null(p_with_texture);
 	ERR_FAIL_COND_V(!src_texture, RID());
 
-	if (src_texture->owner.is_valid()) { //ahh this is a share
+	if (src_texture->owner.is_valid()) { // Ahh this is a share.
 		p_with_texture = src_texture->owner;
 		src_texture = texture_owner.get_or_null(src_texture->owner);
-		ERR_FAIL_COND_V(!src_texture, RID()); //this is a bug
+		ERR_FAIL_COND_V(!src_texture, RID()); // This is a bug.
 	}
 
-	//create view
+	// Create view.
 
 	Texture texture = *src_texture;
 
@@ -2086,7 +2089,7 @@ RID RenderingDeviceVulkan::texture_create_shared(const TextureView &p_view, RID
 	usage_info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO;
 	usage_info.pNext = nullptr;
 	if (p_view.format_override != DATA_FORMAT_MAX) {
-		//need to validate usage with vulkan
+		// Need to validate usage with vulkan.
 
 		usage_info.usage = 0;
 
@@ -2133,6 +2136,9 @@ RID RenderingDeviceVulkan::texture_create_shared(const TextureView &p_view, RID
 
 	texture.owner = p_with_texture;
 	RID id = texture_owner.make_rid(texture);
+#ifdef DEV_ENABLED
+	set_resource_name(id, "RID:" + itos(id.get_id()));
+#endif
 	_add_dependency(id, p_with_texture);
 
 	return id;
@@ -2145,9 +2151,9 @@ RID RenderingDeviceVulkan::texture_create_from_extension(TextureType p_type, Dat
 
 	Texture texture;
 	texture.image = image;
-	// if we leave texture.allocation as a nullptr, would that be enough to detect we don't "own" the image?
-	// also leave texture.allocation_info alone
-	// we'll set texture.view later on
+	// If we leave texture.allocation as a nullptr, would that be enough to detect we don't "own" the image?
+	// Also leave texture.allocation_info alone.
+	// We'll set texture.view later on.
 	texture.type = p_type;
 	texture.format = p_format;
 	texture.samples = p_samples;
@@ -2155,14 +2161,14 @@ RID RenderingDeviceVulkan::texture_create_from_extension(TextureType p_type, Dat
 	texture.height = p_height;
 	texture.depth = p_depth;
 	texture.layers = p_layers;
-	texture.mipmaps = 0; // maybe make this settable too?
+	texture.mipmaps = 0; // Maybe make this settable too?
 	texture.usage_flags = p_flags;
 	texture.base_mipmap = 0;
 	texture.base_layer = 0;
 	texture.allowed_shared_formats.push_back(RD::DATA_FORMAT_R8G8B8A8_UNORM);
 	texture.allowed_shared_formats.push_back(RD::DATA_FORMAT_R8G8B8A8_SRGB);
 
-	// Do we need to do something with texture.layout ?
+	// Do we need to do something with texture.layout?
 
 	if (texture.usage_flags & TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) {
 		texture.read_aspect_mask = VK_IMAGE_ASPECT_DEPTH_BIT;
@@ -2176,7 +2182,7 @@ RID RenderingDeviceVulkan::texture_create_from_extension(TextureType p_type, Dat
 		texture.barrier_aspect_mask = VK_IMAGE_ASPECT_COLOR_BIT;
 	}
 
-	// Create a view for us to use
+	// Create a view for us to use.
 
 	VkImageViewCreateInfo image_view_create_info;
 	image_view_create_info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
@@ -2207,7 +2213,7 @@ RID RenderingDeviceVulkan::texture_create_from_extension(TextureType p_type, Dat
 		VK_COMPONENT_SWIZZLE_A
 	};
 
-	// hardcode for now, maybe make this settable from outside..
+	// Hardcode for now, maybe make this settable from outside.
 	image_view_create_info.components.r = component_swizzles[TEXTURE_SWIZZLE_R];
 	image_view_create_info.components.g = component_swizzles[TEXTURE_SWIZZLE_G];
 	image_view_create_info.components.b = component_swizzles[TEXTURE_SWIZZLE_B];
@@ -2230,7 +2236,7 @@ RID RenderingDeviceVulkan::texture_create_from_extension(TextureType p_type, Dat
 		ERR_FAIL_V_MSG(RID(), "vkCreateImageView failed with error " + itos(err) + ".");
 	}
 
-	//barrier to set layout
+	// Barrier to set layout.
 	{
 		VkImageMemoryBarrier image_memory_barrier;
 		image_memory_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
@@ -2252,6 +2258,9 @@ RID RenderingDeviceVulkan::texture_create_from_extension(TextureType p_type, Dat
 	}
 
 	RID id = texture_owner.make_rid(texture);
+#ifdef DEV_ENABLED
+	set_resource_name(id, "RID:" + itos(id.get_id()));
+#endif
 
 	return id;
 }
@@ -2262,10 +2271,10 @@ RID RenderingDeviceVulkan::texture_create_shared_from_slice(const TextureView &p
 	Texture *src_texture = texture_owner.get_or_null(p_with_texture);
 	ERR_FAIL_COND_V(!src_texture, RID());
 
-	if (src_texture->owner.is_valid()) { //ahh this is a share
+	if (src_texture->owner.is_valid()) { // Ahh this is a share.
 		p_with_texture = src_texture->owner;
 		src_texture = texture_owner.get_or_null(src_texture->owner);
-		ERR_FAIL_COND_V(!src_texture, RID()); //this is a bug
+		ERR_FAIL_COND_V(!src_texture, RID()); // This is a bug.
 	}
 
 	ERR_FAIL_COND_V_MSG(p_slice_type == TEXTURE_SLICE_CUBEMAP && (src_texture->type != TEXTURE_TYPE_CUBE && src_texture->type != TEXTURE_TYPE_CUBE_ARRAY), RID(),
@@ -2277,7 +2286,7 @@ RID RenderingDeviceVulkan::texture_create_shared_from_slice(const TextureView &p
 	ERR_FAIL_COND_V_MSG(p_slice_type == TEXTURE_SLICE_2D_ARRAY && (src_texture->type != TEXTURE_TYPE_2D_ARRAY), RID(),
 			"Can only create an array slice from a 2D array mipmap");
 
-	//create view
+	// Create view.
 
 	ERR_FAIL_UNSIGNED_INDEX_V(p_mipmap, src_texture->mipmaps, RID());
 	ERR_FAIL_COND_V(p_mipmap + p_mipmaps > src_texture->mipmaps, RID());
@@ -2377,6 +2386,9 @@ RID RenderingDeviceVulkan::texture_create_shared_from_slice(const TextureView &p
 
 	texture.owner = p_with_texture;
 	RID id = texture_owner.make_rid(texture);
+#ifdef DEV_ENABLED
+	set_resource_name(id, "RID:" + itos(id.get_id()));
+#endif
 	_add_dependency(id, p_with_texture);
 
 	return id;
@@ -2414,7 +2426,7 @@ Error RenderingDeviceVulkan::_texture_update(RID p_texture, uint32_t p_layer, co
 	if (texture->owner != RID()) {
 		p_texture = texture->owner;
 		texture = texture_owner.get_or_null(texture->owner);
-		ERR_FAIL_COND_V(!texture, ERR_BUG); //this is a bug
+		ERR_FAIL_COND_V(!texture, ERR_BUG); // This is a bug.
 	}
 
 	ERR_FAIL_COND_V_MSG(texture->bound, ERR_CANT_ACQUIRE_RESOURCE,
@@ -2436,7 +2448,7 @@ Error RenderingDeviceVulkan::_texture_update(RID p_texture, uint32_t p_layer, co
 	if (required_align == 1) {
 		required_align = get_image_format_pixel_size(texture->format);
 	}
-	if ((required_align % 4) != 0) { //alignment rules are really strange
+	if ((required_align % 4) != 0) { // Alignment rules are really strange.
 		required_align *= 4;
 	}
 
@@ -2449,7 +2461,7 @@ Error RenderingDeviceVulkan::_texture_update(RID p_texture, uint32_t p_layer, co
 
 	VkCommandBuffer command_buffer = p_use_setup_queue ? frames[frame].setup_command_buffer : frames[frame].draw_command_buffer;
 
-	//barrier to transfer
+	// Barrier to transfer.
 	{
 		VkImageMemoryBarrier image_memory_barrier;
 		image_memory_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
@@ -2483,7 +2495,7 @@ Error RenderingDeviceVulkan::_texture_update(RID p_texture, uint32_t p_layer, co
 		const uint8_t *read_ptr_mipmap = r + mipmap_offset;
 		image_size = image_total - mipmap_offset;
 
-		for (uint32_t z = 0; z < depth; z++) { //for 3D textures, depth may be > 0
+		for (uint32_t z = 0; z < depth; z++) { // For 3D textures, depth may be > 0.
 
 			const uint8_t *read_ptr = read_ptr_mipmap + image_size * z / depth;
 
@@ -2505,7 +2517,7 @@ Error RenderingDeviceVulkan::_texture_update(RID p_texture, uint32_t p_layer, co
 
 					uint8_t *write_ptr;
 
-					{ //map
+					{ // Map.
 						void *data_ptr = nullptr;
 						VkResult vkerr = vmaMapMemory(allocator, staging_buffer_blocks[staging_buffer_current].allocation, &data_ptr);
 						ERR_FAIL_COND_V_MSG(vkerr, ERR_CANT_CREATE, "vmaMapMemory failed with error " + itos(vkerr) + ".");
@@ -2520,11 +2532,11 @@ Error RenderingDeviceVulkan::_texture_update(RID p_texture, uint32_t p_layer, co
 					ERR_FAIL_COND_V(region_h % block_h, ERR_BUG);
 
 					if (block_w != 1 || block_h != 1) {
-						//compressed image (blocks)
-						//must copy a block region
+						// Compressed image (blocks).
+						// Must copy a block region.
 
 						uint32_t block_size = get_compressed_image_format_block_byte_size(texture->format);
-						//re-create current variables in blocky format
+						// Re-create current variables in blocky format.
 						uint32_t xb = x / block_w;
 						uint32_t yb = y / block_h;
 						uint32_t wb = width / block_w;
@@ -2533,19 +2545,19 @@ Error RenderingDeviceVulkan::_texture_update(RID p_texture, uint32_t p_layer, co
 						uint32_t region_hb = region_h / block_h;
 						_copy_region(read_ptr, write_ptr, xb, yb, region_wb, region_hb, wb, block_size);
 					} else {
-						//regular image (pixels)
-						//must copy a pixel region
+						// Regular image (pixels).
+						// Must copy a pixel region.
 						_copy_region(read_ptr, write_ptr, x, y, region_w, region_h, width, pixel_size);
 					}
 
-					{ //unmap
+					{ // Unmap.
 						vmaUnmapMemory(allocator, staging_buffer_blocks[staging_buffer_current].allocation);
 					}
 
 					VkBufferImageCopy buffer_image_copy;
 					buffer_image_copy.bufferOffset = alloc_offset;
-					buffer_image_copy.bufferRowLength = 0; //tightly packed
-					buffer_image_copy.bufferImageHeight = 0; //tightly packed
+					buffer_image_copy.bufferRowLength = 0; // Tightly packed.
+					buffer_image_copy.bufferImageHeight = 0; // Tightly packed.
 
 					buffer_image_copy.imageSubresource.aspectMask = texture->read_aspect_mask;
 					buffer_image_copy.imageSubresource.mipLevel = mm_i;
@@ -2572,7 +2584,7 @@ Error RenderingDeviceVulkan::_texture_update(RID p_texture, uint32_t p_layer, co
 		logic_height = MAX(1u, logic_height >> 1);
 	}
 
-	//barrier to restore layout
+	// Barrier to restore layout.
 	{
 		uint32_t barrier_flags = 0;
 		uint32_t access_flags = 0;
@@ -2659,7 +2671,7 @@ Vector<uint8_t> RenderingDeviceVulkan::_texture_get_data_from_image(Texture *tex
 				const uint8_t *slice_read_ptr = ((uint8_t *)img_mem) + layout.offset + z * layout.depthPitch;
 
 				if (block_size > 1) {
-					//compressed
+					// Compressed.
 					uint32_t line_width = (block_size * (width / blockw));
 					for (uint32_t y = 0; y < height / blockh; y++) {
 						const uint8_t *rptr = slice_read_ptr + y * layout.rowPitch;
@@ -2669,7 +2681,7 @@ Vector<uint8_t> RenderingDeviceVulkan::_texture_get_data_from_image(Texture *tex
 					}
 
 				} else {
-					//uncompressed
+					// Uncompressed.
 					for (uint32_t y = 0; y < height; y++) {
 						const uint8_t *rptr = slice_read_ptr + y * layout.rowPitch;
 						uint8_t *wptr = write_ptr + y * pixel_size * width;
@@ -2705,19 +2717,19 @@ Vector<uint8_t> RenderingDeviceVulkan::texture_get_data(RID p_texture, uint32_t
 	ERR_FAIL_COND_V(p_layer >= layer_count, Vector<uint8_t>());
 
 	if (tex->usage_flags & TEXTURE_USAGE_CPU_READ_BIT) {
-		//does not need anything fancy, map and read.
+		// Does not need anything fancy, map and read.
 		return _texture_get_data_from_image(tex, tex->image, tex->allocation, p_layer);
 	} else {
-		//compute total image size
+		// Compute total image size.
 		uint32_t width, height, depth;
 		uint32_t buffer_size = get_image_format_required_size(tex->format, tex->width, tex->height, tex->depth, tex->mipmaps, &width, &height, &depth);
 
-		//allocate buffer
-		VkCommandBuffer command_buffer = frames[frame].draw_command_buffer; //makes more sense to retrieve
+		// Allocate buffer.
+		VkCommandBuffer command_buffer = frames[frame].draw_command_buffer; // Makes more sense to retrieve.
 		Buffer tmp_buffer;
 		_buffer_allocate(&tmp_buffer, buffer_size, VK_BUFFER_USAGE_TRANSFER_DST_BIT, VMA_MEMORY_USAGE_AUTO_PREFER_HOST, VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT);
 
-		{ //Source image barrier
+		{ // Source image barrier.
 			VkImageMemoryBarrier image_memory_barrier;
 			image_memory_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
 			image_memory_barrier.pNext = nullptr;
@@ -2773,7 +2785,7 @@ Vector<uint8_t> RenderingDeviceVulkan::texture_get_data(RID p_texture, uint32_t
 			offset += size;
 		}
 
-		{ //restore src
+		{ // Restore src.
 			VkImageMemoryBarrier image_memory_barrier;
 			image_memory_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
 			image_memory_barrier.pNext = nullptr;
@@ -2888,9 +2900,9 @@ Error RenderingDeviceVulkan::texture_copy(RID p_from_texture, RID p_to_texture,
 	VkCommandBuffer command_buffer = frames[frame].draw_command_buffer;
 
 	{
-		//PRE Copy the image
+		// PRE Copy the image.
 
-		{ //Source
+		{ // Source.
 			VkImageMemoryBarrier image_memory_barrier;
 			image_memory_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
 			image_memory_barrier.pNext = nullptr;
@@ -2910,7 +2922,7 @@ Error RenderingDeviceVulkan::texture_copy(RID p_from_texture, RID p_to_texture,
 
 			vkCmdPipelineBarrier(command_buffer, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, nullptr, 0, nullptr, 1, &image_memory_barrier);
 		}
-		{ //Dest
+		{ // Dest.
 			VkImageMemoryBarrier image_memory_barrier;
 			image_memory_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
 			image_memory_barrier.pNext = nullptr;
@@ -2931,7 +2943,7 @@ Error RenderingDeviceVulkan::texture_copy(RID p_from_texture, RID p_to_texture,
 			vkCmdPipelineBarrier(command_buffer, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, nullptr, 0, nullptr, 1, &image_memory_barrier);
 		}
 
-		//COPY
+		// COPY.
 
 		{
 			VkImageCopy image_copy_region;
@@ -2958,7 +2970,7 @@ Error RenderingDeviceVulkan::texture_copy(RID p_from_texture, RID p_to_texture,
 			vkCmdCopyImage(command_buffer, src_tex->image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst_tex->image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &image_copy_region);
 		}
 
-		// RESTORE LAYOUT for SRC and DST
+		// RESTORE LAYOUT for SRC and DST.
 
 		uint32_t barrier_flags = 0;
 		uint32_t access_flags = 0;
@@ -2979,7 +2991,7 @@ Error RenderingDeviceVulkan::texture_copy(RID p_from_texture, RID p_to_texture,
 			barrier_flags = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
 		}
 
-		{ //restore src
+		{ // Restore src.
 			VkImageMemoryBarrier image_memory_barrier;
 			image_memory_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
 			image_memory_barrier.pNext = nullptr;
@@ -2999,7 +3011,7 @@ Error RenderingDeviceVulkan::texture_copy(RID p_from_texture, RID p_to_texture,
 			vkCmdPipelineBarrier(command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, barrier_flags, 0, 0, nullptr, 0, nullptr, 1, &image_memory_barrier);
 		}
 
-		{ //make dst readable
+		{ // Make dst readable.
 
 			VkImageMemoryBarrier image_memory_barrier;
 			image_memory_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
@@ -3066,9 +3078,9 @@ Error RenderingDeviceVulkan::texture_resolve_multisample(RID p_from_texture, RID
 	VkCommandBuffer command_buffer = frames[frame].draw_command_buffer;
 
 	{
-		//PRE Copy the image
+		// PRE Copy the image.
 
-		{ //Source
+		{ // Source.
 			VkImageMemoryBarrier image_memory_barrier;
 			image_memory_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
 			image_memory_barrier.pNext = nullptr;
@@ -3088,7 +3100,7 @@ Error RenderingDeviceVulkan::texture_resolve_multisample(RID p_from_texture, RID
 
 			vkCmdPipelineBarrier(command_buffer, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, nullptr, 0, nullptr, 1, &image_memory_barrier);
 		}
-		{ //Dest
+		{ // Dest.
 			VkImageMemoryBarrier image_memory_barrier;
 			image_memory_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
 			image_memory_barrier.pNext = nullptr;
@@ -3109,7 +3121,7 @@ Error RenderingDeviceVulkan::texture_resolve_multisample(RID p_from_texture, RID
 			vkCmdPipelineBarrier(command_buffer, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, nullptr, 0, nullptr, 1, &image_memory_barrier);
 		}
 
-		//COPY
+		// COPY.
 
 		{
 			VkImageResolve image_copy_region;
@@ -3136,7 +3148,7 @@ Error RenderingDeviceVulkan::texture_resolve_multisample(RID p_from_texture, RID
 			vkCmdResolveImage(command_buffer, src_tex->image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst_tex->image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &image_copy_region);
 		}
 
-		// RESTORE LAYOUT for SRC and DST
+		// RESTORE LAYOUT for SRC and DST.
 
 		uint32_t barrier_flags = 0;
 		uint32_t access_flags = 0;
@@ -3157,7 +3169,7 @@ Error RenderingDeviceVulkan::texture_resolve_multisample(RID p_from_texture, RID
 			barrier_flags = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
 		}
 
-		{ //restore src
+		{ // Restore src.
 			VkImageMemoryBarrier image_memory_barrier;
 			image_memory_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
 			image_memory_barrier.pNext = nullptr;
@@ -3177,7 +3189,7 @@ Error RenderingDeviceVulkan::texture_resolve_multisample(RID p_from_texture, RID
 			vkCmdPipelineBarrier(command_buffer, VK_ACCESS_TRANSFER_WRITE_BIT, barrier_flags, 0, 0, nullptr, 0, nullptr, 1, &image_memory_barrier);
 		}
 
-		{ //make dst readable
+		{ // Make dst readable.
 
 			VkImageMemoryBarrier image_memory_barrier;
 			image_memory_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
@@ -3230,13 +3242,13 @@ Error RenderingDeviceVulkan::texture_clear(RID p_texture, const Color &p_color,
 
 	VkImageLayout clear_layout = (src_tex->layout == VK_IMAGE_LAYOUT_GENERAL) ? VK_IMAGE_LAYOUT_GENERAL : VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
 
-	// NOTE: Perhaps the valid stages/accesses for a given owner should be a property of the owner. (Here and places like _get_buffer_from_owner)
+	// NOTE: Perhaps the valid stages/accesses for a given owner should be a property of the owner. (Here and places like _get_buffer_from_owner.)
 	const VkPipelineStageFlags valid_texture_stages = VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT;
 	constexpr VkAccessFlags read_access = VK_ACCESS_SHADER_READ_BIT;
 	constexpr VkAccessFlags read_write_access = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT;
 	const VkAccessFlags valid_texture_access = (src_tex->usage_flags & TEXTURE_USAGE_STORAGE_BIT) ? read_write_access : read_access;
 
-	{ // Barrier from previous access with optional layout change (see clear_layout logic above)
+	{ // Barrier from previous access with optional layout change (see clear_layout logic above).
 		VkImageMemoryBarrier image_memory_barrier;
 		image_memory_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
 		image_memory_barrier.pNext = nullptr;
@@ -3272,7 +3284,7 @@ Error RenderingDeviceVulkan::texture_clear(RID p_texture, const Color &p_color,
 
 	vkCmdClearColorImage(command_buffer, src_tex->image, clear_layout, &clear_color, 1, &range);
 
-	{ // Barrier to post clear accesses (changing back the layout if needed)
+	{ // Barrier to post clear accesses (changing back the layout if needed).
 
 		uint32_t barrier_flags = 0;
 		uint32_t access_flags = 0;
@@ -3328,7 +3340,7 @@ bool RenderingDeviceVulkan::texture_is_format_supported_for_usage(DataFormat p_f
 
 	_THREAD_SAFE_METHOD_
 
-	//validate that this image is supported for the intended use
+	// Validate that this image is supported for the intended use.
 	VkFormatProperties properties;
 	vkGetPhysicalDeviceFormatProperties(context->get_physical_device(), vulkan_formats[p_format], &properties);
 	VkFormatFeatureFlags flags;
@@ -3372,12 +3384,12 @@ bool RenderingDeviceVulkan::texture_is_format_supported_for_usage(DataFormat p_f
 /********************/
 
 VkRenderPass RenderingDeviceVulkan::_render_pass_create(const Vector<AttachmentFormat> &p_attachments, const Vector<FramebufferPass> &p_passes, InitialAction p_initial_action, FinalAction p_final_action, InitialAction p_initial_depth_action, FinalAction p_final_depth_action, uint32_t p_view_count, Vector<TextureSamples> *r_samples) {
-	// Set up dependencies from/to external equivalent to the default (implicit) one, and then amend them
+	// Set up dependencies from/to external equivalent to the default (implicit) one, and then amend them.
 	const VkPipelineStageFlags default_access_mask = VK_ACCESS_INPUT_ATTACHMENT_READ_BIT |
 			VK_ACCESS_COLOR_ATTACHMENT_READ_BIT |
 			VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT |
 			VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT |
-			VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT | // From Section 7.1 of Vulkan API Spec v1.1.148
+			VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT | // From Section 7.1 of Vulkan API Spec v1.1.148.
 			VK_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR;
 
 	VkPipelineStageFlags reading_stages = VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT | VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_TRANSFER_BIT;
@@ -3420,20 +3432,20 @@ VkRenderPass RenderingDeviceVulkan::_render_pass_create(const Vector<AttachmentF
 		bool is_depth = p_attachments[i].usage_flags & TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
 
 		// We can setup a framebuffer where we write to our VRS texture to set it up.
-		// We make the assumption here that if our texture is actually used as our VRS attachment,
-		// it is used as such for each subpass. This is fairly certain seeing the restrictions on subpasses.
+		// We make the assumption here that if our texture is actually used as our VRS attachment.
+		// It is used as such for each subpass. This is fairly certain seeing the restrictions on subpasses.
 		bool is_vrs = p_attachments[i].usage_flags & TEXTURE_USAGE_VRS_ATTACHMENT_BIT && i == p_passes[0].vrs_attachment;
 
 		if (is_vrs) {
-			// For VRS we only read, there is no writing to this texture
+			// For VRS we only read, there is no writing to this texture.
 			description.loadOp = VK_ATTACHMENT_LOAD_OP_LOAD;
 			description.initialLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
 			description.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_LOAD;
 		} else {
-			// For each UNDEFINED, assume the prior use was a *read*, as we'd be discarding the output of a write
-			// Also, each UNDEFINED will do an immediate layout transition (write), s.t. we must ensure execution synchronization vs.
+			// For each UNDEFINED, assume the prior use was a *read*, as we'd be discarding the output of a write.
+			// Also, each UNDEFINED will do an immediate layout transition (write), s.t. we must ensure execution synchronization vs
 			// the read. If this is a performance issue, one could track the actual last accessor of each resource, adding only that
-			// stage
+			// stage.
 
 			switch (is_depth ? p_initial_depth_action : p_initial_action) {
 				case INITIAL_ACTION_CLEAR_REGION:
@@ -3450,7 +3462,7 @@ VkRenderPass RenderingDeviceVulkan::_render_pass_create(const Vector<AttachmentF
 					} else {
 						description.loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
 						description.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
-						description.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; //don't care what is there
+						description.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; // Don't care what is there.
 						dependency_from_external.srcStageMask |= reading_stages;
 					}
 				} break;
@@ -3467,7 +3479,7 @@ VkRenderPass RenderingDeviceVulkan::_render_pass_create(const Vector<AttachmentF
 					} else {
 						description.loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
 						description.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
-						description.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; //don't care what is there
+						description.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; // Don't care what is there.
 						dependency_from_external.srcStageMask |= reading_stages;
 					}
 				} break;
@@ -3478,13 +3490,13 @@ VkRenderPass RenderingDeviceVulkan::_render_pass_create(const Vector<AttachmentF
 						description.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
 					} else if (p_attachments[i].usage_flags & TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) {
 						description.loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
-						description.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; //don't care what is there
+						description.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; // Don't care what is there.
 						description.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
 						dependency_from_external.srcStageMask |= reading_stages;
 					} else {
 						description.loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
 						description.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
-						description.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; //don't care what is there
+						description.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; // Don't care what is there.
 						dependency_from_external.srcStageMask |= reading_stages;
 					}
 				} break;
@@ -3501,12 +3513,12 @@ VkRenderPass RenderingDeviceVulkan::_render_pass_create(const Vector<AttachmentF
 					} else {
 						description.loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
 						description.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
-						description.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; //don't care what is there
+						description.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; // Don't care what is there.
 						dependency_from_external.srcStageMask |= reading_stages;
 					}
 				} break;
 				default: {
-					ERR_FAIL_V(VK_NULL_HANDLE); //should never reach here
+					ERR_FAIL_V(VK_NULL_HANDLE); // Should never reach here.
 				}
 			}
 		}
@@ -3517,7 +3529,7 @@ VkRenderPass RenderingDeviceVulkan::_render_pass_create(const Vector<AttachmentF
 			int last_pass = p_passes.size() - 1;
 
 			if (is_depth) {
-				//likely missing depth resolve?
+				// Likely missing depth resolve?
 				if (p_passes[last_pass].depth_attachment == i) {
 					used_last = true;
 				}
@@ -3527,7 +3539,7 @@ VkRenderPass RenderingDeviceVulkan::_render_pass_create(const Vector<AttachmentF
 				}
 			} else {
 				if (p_passes[last_pass].resolve_attachments.size()) {
-					//if using resolve attachments, check resolve attachments
+					// If using resolve attachments, check resolve attachments.
 					for (int j = 0; j < p_passes[last_pass].resolve_attachments.size(); j++) {
 						if (p_passes[last_pass].resolve_attachments[j] == i) {
 							used_last = true;
@@ -3567,13 +3579,13 @@ VkRenderPass RenderingDeviceVulkan::_render_pass_create(const Vector<AttachmentF
 		}
 
 		if (is_vrs) {
-			// We don't change our VRS texture during this process
+			// We don't change our VRS texture during this process.
 
 			description.storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
 			description.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
 			description.finalLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
 
-			// TODO do we need to update our external dependency ?
+			// TODO: Do we need to update our external dependency?
 			// update_external_dependency_for_store(dependency_to_external, is_sampled, is_storage, false);
 		} else {
 			switch (is_depth ? final_depth_action : final_action) {
@@ -3591,8 +3603,8 @@ VkRenderPass RenderingDeviceVulkan::_render_pass_create(const Vector<AttachmentF
 					} else {
 						description.loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
 						description.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
-						description.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; //don't care what is there
-						// TODO: What does this mean about the next usage (and thus appropriate dependency masks
+						description.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; // Don't care what is there.
+						// TODO: What does this mean about the next usage (and thus appropriate dependency masks.
 					}
 				} break;
 				case FINAL_ACTION_DISCARD: {
@@ -3607,7 +3619,7 @@ VkRenderPass RenderingDeviceVulkan::_render_pass_create(const Vector<AttachmentF
 					} else {
 						description.storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
 						description.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
-						description.finalLayout = VK_IMAGE_LAYOUT_UNDEFINED; //don't care what is there
+						description.finalLayout = VK_IMAGE_LAYOUT_UNDEFINED; // Don't care what is there.
 					}
 				} break;
 				case FINAL_ACTION_CONTINUE: {
@@ -3622,12 +3634,12 @@ VkRenderPass RenderingDeviceVulkan::_render_pass_create(const Vector<AttachmentF
 					} else {
 						description.storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
 						description.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
-						description.finalLayout = VK_IMAGE_LAYOUT_UNDEFINED; //don't care what is there
+						description.finalLayout = VK_IMAGE_LAYOUT_UNDEFINED; // Don't care what is there.
 					}
 
 				} break;
 				default: {
-					ERR_FAIL_V(VK_NULL_HANDLE); //should never reach here
+					ERR_FAIL_V(VK_NULL_HANDLE); // Should never reach here.
 				}
 			}
 		}
@@ -3711,7 +3723,7 @@ VkRenderPass RenderingDeviceVulkan::_render_pass_create(const Vector<AttachmentF
 				reference.layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
 				attachment_last_pass[attachment] = i;
 			}
-			reference.aspectMask = 0; // TODO we need to set this here, possibly VK_IMAGE_ASPECT_COLOR_BIT ??
+			reference.aspectMask = 0; // TODO: We need to set this here, possibly VK_IMAGE_ASPECT_COLOR_BIT?
 			input_references.push_back(reference);
 		}
 
@@ -3737,7 +3749,7 @@ VkRenderPass RenderingDeviceVulkan::_render_pass_create(const Vector<AttachmentF
 				bool multisample = p_attachments[attachment].samples > TEXTURE_SAMPLES_1;
 				ERR_FAIL_COND_V_MSG(multisample, VK_NULL_HANDLE, "Invalid framebuffer format attachment(" + itos(attachment) + "), in pass (" + itos(i) + "), resolve attachments can't be multisample.");
 				reference.attachment = attachment_remap[attachment];
-				reference.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; // VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+				reference.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; // VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL
 				attachment_last_pass[attachment] = i;
 			}
 			reference.aspectMask = 0;
@@ -3806,7 +3818,7 @@ VkRenderPass RenderingDeviceVulkan::_render_pass_create(const Vector<AttachmentF
 			ERR_FAIL_INDEX_V_MSG(attachment, p_attachments.size(), VK_NULL_HANDLE, "Invalid framebuffer format attachment(" + itos(attachment) + "), in pass (" + itos(i) + "), preserve attachment (" + itos(j) + ").");
 
 			if (attachment_last_pass[attachment] != i) {
-				//preserve can still be used to keep depth or color from being discarded after use
+				// Preserve can still be used to keep depth or color from being discarded after use.
 				attachment_last_pass[attachment] = i;
 				preserve_references.push_back(attachment);
 			}
@@ -3875,14 +3887,14 @@ VkRenderPass RenderingDeviceVulkan::_render_pass_create(const Vector<AttachmentF
 			subpass_dependencies.push_back(dependency);
 		}
 		/*
-		// NOTE: Big Mallet Approach -- any layout transition causes a full barrier
+		// NOTE: Big Mallet Approach -- any layout transition causes a full barrier.
 		if (reference.layout != description.initialLayout) {
-			// NOTE: this should be smarter based on the texture's knowledge of its previous role
+			// NOTE: This should be smarter based on the texture's knowledge of its previous role.
 			dependency_from_external.srcStageMask |= VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
 			dependency_from_external.srcAccessMask |= VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT;
 		}
 		if (reference.layout != description.finalLayout) {
-			// NOTE: this should be smarter based on the texture's knowledge of its subsequent role
+			// NOTE: This should be smarter based on the texture's knowledge of its subsequent role.
 			dependency_to_external.dstStageMask |= VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
 			dependency_to_external.dstAccessMask |= VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT;
 		}
@@ -3923,7 +3935,7 @@ VkRenderPass RenderingDeviceVulkan::_render_pass_create(const Vector<AttachmentF
 	VkRenderPassMultiviewCreateInfo render_pass_multiview_create_info;
 
 	if (p_view_count > 1) {
-		// this may no longer be needed with the new settings already including this
+		// This may no longer be needed with the new settings already including this.
 
 		const VulkanContext::MultiviewCapabilities capabilities = context->get_multiview_capabilities();
 
@@ -3933,7 +3945,7 @@ VkRenderPass RenderingDeviceVulkan::_render_pass_create(const Vector<AttachmentF
 		// Make sure we limit this to the number of views we support.
 		ERR_FAIL_COND_V_MSG(p_view_count > capabilities.max_view_count, VK_NULL_HANDLE, "Hardware does not support requested number of views for Multiview render pass");
 
-		// Set view masks for each subpass
+		// Set view masks for each subpass.
 		for (uint32_t i = 0; i < subpasses.size(); i++) {
 			view_masks.push_back(view_mask);
 		}
@@ -3971,7 +3983,7 @@ RenderingDevice::FramebufferFormatID RenderingDeviceVulkan::framebuffer_format_c
 	passes.push_back(pass);
 	return framebuffer_format_create_multipass(p_format, passes, p_view_count);
 }
-RenderingDevice::FramebufferFormatID RenderingDeviceVulkan::framebuffer_format_create_multipass(const Vector<AttachmentFormat> &p_attachments, Vector<FramebufferPass> &p_passes, uint32_t p_view_count) {
+RenderingDevice::FramebufferFormatID RenderingDeviceVulkan::framebuffer_format_create_multipass(const Vector<AttachmentFormat> &p_attachments, const Vector<FramebufferPass> &p_passes, uint32_t p_view_count) {
 	_THREAD_SAFE_METHOD_
 
 	FramebufferFormatKey key;
@@ -3981,14 +3993,14 @@ RenderingDevice::FramebufferFormatID RenderingDeviceVulkan::framebuffer_format_c
 
 	const RBMap<FramebufferFormatKey, FramebufferFormatID>::Element *E = framebuffer_format_cache.find(key);
 	if (E) {
-		//exists, return
+		// Exists, return.
 		return E->get();
 	}
 
 	Vector<TextureSamples> samples;
-	VkRenderPass render_pass = _render_pass_create(p_attachments, p_passes, INITIAL_ACTION_CLEAR, FINAL_ACTION_READ, INITIAL_ACTION_CLEAR, FINAL_ACTION_READ, p_view_count, &samples); //actions don't matter for this use case
+	VkRenderPass render_pass = _render_pass_create(p_attachments, p_passes, INITIAL_ACTION_CLEAR, FINAL_ACTION_READ, INITIAL_ACTION_CLEAR, FINAL_ACTION_READ, p_view_count, &samples); // Actions don't matter for this use case.
 
-	if (render_pass == VK_NULL_HANDLE) { //was likely invalid
+	if (render_pass == VK_NULL_HANDLE) { // Was likely invalid.
 		return INVALID_ID;
 	}
 	FramebufferFormatID id = FramebufferFormatID(framebuffer_format_cache.size()) | (FramebufferFormatID(ID_TYPE_FRAMEBUFFER_FORMAT) << FramebufferFormatID(ID_BASE_SHIFT));
@@ -4009,7 +4021,7 @@ RenderingDevice::FramebufferFormatID RenderingDeviceVulkan::framebuffer_format_c
 
 	const RBMap<FramebufferFormatKey, FramebufferFormatID>::Element *E = framebuffer_format_cache.find(key);
 	if (E) {
-		//exists, return
+		// Exists, return.
 		return E->get();
 	}
 
@@ -4019,7 +4031,7 @@ RenderingDevice::FramebufferFormatID RenderingDeviceVulkan::framebuffer_format_c
 	subpass.flags = 0;
 	subpass.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
 	subpass.viewMask = 0;
-	subpass.inputAttachmentCount = 0; //unsupported for now
+	subpass.inputAttachmentCount = 0; // Unsupported for now.
 	subpass.pInputAttachments = nullptr;
 	subpass.colorAttachmentCount = 0;
 	subpass.pColorAttachments = nullptr;
@@ -4046,7 +4058,7 @@ RenderingDevice::FramebufferFormatID RenderingDeviceVulkan::framebuffer_format_c
 
 	ERR_FAIL_COND_V_MSG(res, 0, "vkCreateRenderPass2KHR for empty fb failed with error " + itos(res) + ".");
 
-	if (render_pass == VK_NULL_HANDLE) { //was likely invalid
+	if (render_pass == VK_NULL_HANDLE) { // Was likely invalid.
 		return INVALID_ID;
 	}
 
@@ -4082,7 +4094,11 @@ RID RenderingDeviceVulkan::framebuffer_create_empty(const Size2i &p_size, Textur
 	framebuffer.size = p_size;
 	framebuffer.view_count = 1;
 
-	return framebuffer_owner.make_rid(framebuffer);
+	RID id = framebuffer_owner.make_rid(framebuffer);
+#ifdef DEV_ENABLED
+	set_resource_name(id, "RID:" + itos(id.get_id()));
+#endif
+	return id;
 }
 
 RID RenderingDeviceVulkan::framebuffer_create(const Vector<RID> &p_texture_attachments, FramebufferFormatID p_format_check, uint32_t p_view_count) {
@@ -4110,7 +4126,7 @@ RID RenderingDeviceVulkan::framebuffer_create(const Vector<RID> &p_texture_attac
 	return framebuffer_create_multipass(p_texture_attachments, passes, p_format_check, p_view_count);
 }
 
-RID RenderingDeviceVulkan::framebuffer_create_multipass(const Vector<RID> &p_texture_attachments, Vector<FramebufferPass> &p_passes, FramebufferFormatID p_format_check, uint32_t p_view_count) {
+RID RenderingDeviceVulkan::framebuffer_create_multipass(const Vector<RID> &p_texture_attachments, const Vector<FramebufferPass> &p_passes, FramebufferFormatID p_format_check, uint32_t p_view_count) {
 	_THREAD_SAFE_METHOD_
 
 	Vector<AttachmentFormat> attachments;
@@ -4130,9 +4146,9 @@ RID RenderingDeviceVulkan::framebuffer_create_multipass(const Vector<RID> &p_tex
 				size.height = texture->height;
 				size_set = true;
 			} else if (texture->usage_flags & TEXTURE_USAGE_VRS_ATTACHMENT_BIT) {
-				// If this is not the first attachement we assume this is used as the VRS attachment
-				// in this case this texture will be 1/16th the size of the color attachement.
-				// So we skip the size check
+				// If this is not the first attachement we assume this is used as the VRS attachment.
+				// In this case this texture will be 1/16th the size of the color attachement.
+				// So we skip the size check.
 			} else {
 				ERR_FAIL_COND_V_MSG((uint32_t)size.width != texture->width || (uint32_t)size.height != texture->height, RID(),
 						"All textures in a framebuffer should be the same size.");
@@ -4162,6 +4178,9 @@ RID RenderingDeviceVulkan::framebuffer_create_multipass(const Vector<RID> &p_tex
 	framebuffer.view_count = p_view_count;
 
 	RID id = framebuffer_owner.make_rid(framebuffer);
+#ifdef DEV_ENABLED
+	set_resource_name(id, "RID:" + itos(id.get_id()));
+#endif
 
 	for (int i = 0; i < p_texture_attachments.size(); i++) {
 		if (p_texture_attachments[i].is_valid()) {
@@ -4181,6 +4200,22 @@ RenderingDevice::FramebufferFormatID RenderingDeviceVulkan::framebuffer_get_form
 	return framebuffer->format_id;
 }
 
+bool RenderingDeviceVulkan::framebuffer_is_valid(RID p_framebuffer) const {
+	_THREAD_SAFE_METHOD_
+
+	return framebuffer_owner.owns(p_framebuffer);
+}
+
+void RenderingDeviceVulkan::framebuffer_set_invalidation_callback(RID p_framebuffer, InvalidationCallback p_callback, void *p_userdata) {
+	_THREAD_SAFE_METHOD_
+
+	Framebuffer *framebuffer = framebuffer_owner.get_or_null(p_framebuffer);
+	ERR_FAIL_COND(!framebuffer);
+
+	framebuffer->invalidated_callback = p_callback;
+	framebuffer->invalidated_callback_userdata = p_userdata;
+}
+
 /*****************/
 /**** SAMPLER ****/
 /*****************/
@@ -4223,7 +4258,11 @@ RID RenderingDeviceVulkan::sampler_create(const SamplerState &p_state) {
 	VkResult res = vkCreateSampler(device, &sampler_create_info, nullptr, &sampler);
 	ERR_FAIL_COND_V_MSG(res, RID(), "vkCreateSampler failed with error " + itos(res) + ".");
 
-	return sampler_owner.make_rid(sampler);
+	RID id = sampler_owner.make_rid(sampler);
+#ifdef DEV_ENABLED
+	set_resource_name(id, "RID:" + itos(id.get_id()));
+#endif
+	return id;
 }
 
 /**********************/
@@ -4252,10 +4291,14 @@ RID RenderingDeviceVulkan::vertex_buffer_create(uint32_t p_size_bytes, const Vec
 		_buffer_memory_barrier(buffer.buffer, 0, data_size, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_VERTEX_INPUT_BIT, VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT, false);
 	}
 
-	return vertex_buffer_owner.make_rid(buffer);
+	RID id = vertex_buffer_owner.make_rid(buffer);
+#ifdef DEV_ENABLED
+	set_resource_name(id, "RID:" + itos(id.get_id()));
+#endif
+	return id;
 }
 
-// Internally reference counted, this ID is warranted to be unique for the same description, but needs to be freed as many times as it was allocated
+// Internally reference counted, this ID is warranted to be unique for the same description, but needs to be freed as many times as it was allocated.
 RenderingDevice::VertexFormatID RenderingDeviceVulkan::vertex_format_create(const Vector<VertexAttribute> &p_vertex_formats) {
 	_THREAD_SAFE_METHOD_
 
@@ -4267,7 +4310,7 @@ RenderingDevice::VertexFormatID RenderingDeviceVulkan::vertex_format_create(cons
 		return *idptr;
 	}
 
-	//does not exist, create one and cache it
+	// Does not exist, create one and cache it.
 	VertexDescriptionCache vdcache;
 	vdcache.bindings = memnew_arr(VkVertexInputBindingDescription, p_vertex_formats.size());
 	vdcache.attributes = memnew_arr(VkVertexInputAttributeDescription, p_vertex_formats.size());
@@ -4323,25 +4366,25 @@ RID RenderingDeviceVulkan::vertex_array_create(uint32_t p_vertex_count, VertexFo
 
 	vertex_array.vertex_count = p_vertex_count;
 	vertex_array.description = p_vertex_format;
-	vertex_array.max_instances_allowed = 0xFFFFFFFF; //by default as many as you want
+	vertex_array.max_instances_allowed = 0xFFFFFFFF; // By default as many as you want.
 	for (int i = 0; i < p_src_buffers.size(); i++) {
 		Buffer *buffer = vertex_buffer_owner.get_or_null(p_src_buffers[i]);
 
-		//validate with buffer
+		// Validate with buffer.
 		{
 			const VertexAttribute &atf = vd.vertex_formats[i];
 
 			uint32_t element_size = get_format_vertex_size(atf.format);
-			ERR_FAIL_COND_V(element_size == 0, RID()); //should never happens since this was prevalidated
+			ERR_FAIL_COND_V(element_size == 0, RID()); // Should never happens since this was prevalidated.
 
 			if (atf.frequency == VERTEX_FREQUENCY_VERTEX) {
-				//validate size for regular drawing
+				// Validate size for regular drawing.
 				uint64_t total_size = uint64_t(atf.stride) * (p_vertex_count - 1) + atf.offset + element_size;
 				ERR_FAIL_COND_V_MSG(total_size > buffer->size, RID(),
 						"Attachment (" + itos(i) + ") will read past the end of the buffer.");
 
 			} else {
-				//validate size for instances drawing
+				// Validate size for instances drawing.
 				uint64_t available = buffer->size - atf.offset;
 				ERR_FAIL_COND_V_MSG(available < element_size, RID(),
 						"Attachment (" + itos(i) + ") uses instancing, but it's just too small.");
@@ -4352,7 +4395,7 @@ RID RenderingDeviceVulkan::vertex_array_create(uint32_t p_vertex_count, VertexFo
 		}
 
 		vertex_array.buffers.push_back(buffer->buffer);
-		vertex_array.offsets.push_back(0); //offset unused, but passing anyway
+		vertex_array.offsets.push_back(0); // Offset unused, but passing anyway.
 	}
 
 	RID id = vertex_array_owner.make_rid(vertex_array);
@@ -4387,7 +4430,7 @@ RID RenderingDeviceVulkan::index_buffer_create(uint32_t p_index_count, IndexBuff
 			const uint16_t *index16 = (const uint16_t *)r;
 			for (uint32_t i = 0; i < p_index_count; i++) {
 				if (p_use_restart_indices && index16[i] == 0xFFFF) {
-					continue; //restart index, ignore
+					continue; // Restart index, ignore.
 				}
 				index_buffer.max_index = MAX(index16[i], index_buffer.max_index);
 			}
@@ -4395,7 +4438,7 @@ RID RenderingDeviceVulkan::index_buffer_create(uint32_t p_index_count, IndexBuff
 			const uint32_t *index32 = (const uint32_t *)r;
 			for (uint32_t i = 0; i < p_index_count; i++) {
 				if (p_use_restart_indices && index32[i] == 0xFFFFFFFF) {
-					continue; //restart index, ignore
+					continue; // Restart index, ignore.
 				}
 				index_buffer.max_index = MAX(index32[i], index_buffer.max_index);
 			}
@@ -4413,7 +4456,11 @@ RID RenderingDeviceVulkan::index_buffer_create(uint32_t p_index_count, IndexBuff
 		_buffer_update(&index_buffer, 0, r, data_size);
 		_buffer_memory_barrier(index_buffer.buffer, 0, data_size, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_VERTEX_INPUT_BIT, VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_INDEX_READ_BIT, false);
 	}
-	return index_buffer_owner.make_rid(index_buffer);
+	RID id = index_buffer_owner.make_rid(index_buffer);
+#ifdef DEV_ENABLED
+	set_resource_name(id, "RID:" + itos(id.get_id()));
+#endif
+	return id;
 }
 
 RID RenderingDeviceVulkan::index_array_create(RID p_index_buffer, uint32_t p_index_offset, uint32_t p_index_count) {
@@ -4490,7 +4537,7 @@ bool RenderingDeviceVulkan::_uniform_add_binding(Vector<Vector<VkDescriptorSetLa
 		case glslang::EbtSampler: {
 			//print_line("DEBUG: IsSampler");
 			if (reflection.getType()->getSampler().dim == glslang::EsdBuffer) {
-				//texture buffers
+				// Texture buffers.
 				if (reflection.getType()->getSampler().isCombined()) {
 					layout_binding.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER;
 					info.type = UNIFORM_TYPE_SAMPLER_WITH_TEXTURE_BUFFER;
@@ -4590,7 +4637,7 @@ bool RenderingDeviceVulkan::_uniform_add_binding(Vector<Vector<VkDescriptorSetLa
 		} break;*/
 		default: {
 			if (reflection.getType()->getQualifier().hasOffset() || reflection.name.find(".") != std::string::npos) {
-				//member of uniform block?
+				// Member of uniform block?
 				return true;
 			}
 
@@ -4627,10 +4674,10 @@ bool RenderingDeviceVulkan::_uniform_add_binding(Vector<Vector<VkDescriptorSetLa
 	uint32_t binding = reflection.getType()->getQualifier().layoutBinding;
 
 	if (set < (uint32_t)bindings.size()) {
-		//check if this already exists
+		// Check if this already exists.
 		for (int i = 0; i < bindings[set].size(); i++) {
 			if (bindings[set][i].binding == binding) {
-				//already exists, verify that it's the same type
+				// Already exists, verify that it's the same type.
 				if (bindings[set][i].descriptorType != layout_binding.descriptorType) {
 					if (r_error) {
 						*r_error = "On shader stage '" + String(shader_stage_names[p_stage]) + "', uniform '" + reflection.name + "' trying to re-use location for set=" + itos(set) + ", binding=" + itos(binding) + " with different uniform type.";
@@ -4638,7 +4685,7 @@ bool RenderingDeviceVulkan::_uniform_add_binding(Vector<Vector<VkDescriptorSetLa
 					return false;
 				}
 
-				//also, verify that it's the same size
+				// Also, verify that it's the same size.
 				if (bindings[set][i].descriptorCount != layout_binding.descriptorCount || uniform_infos[set][i].length != info.length) {
 					if (r_error) {
 						*r_error = "On shader stage '" + String(shader_stage_names[p_stage]) + "', uniform '" + reflection.name + "' trying to re-use location for set=" + itos(set) + ", binding=" + itos(binding) + " with different uniform size.";
@@ -4646,7 +4693,7 @@ bool RenderingDeviceVulkan::_uniform_add_binding(Vector<Vector<VkDescriptorSetLa
 					return false;
 				}
 
-				//just append stage mask and return
+				// Just append stage mask and return.
 				bindings.write[set].write[i].stageFlags |= shader_stage_masks[p_stage];
 				uniform_infos.write[set].write[i].stages |= 1 << p_stage;
 				return true;
@@ -4655,7 +4702,7 @@ bool RenderingDeviceVulkan::_uniform_add_binding(Vector<Vector<VkDescriptorSetLa
 	}
 	layout_binding.binding = binding;
 	layout_binding.stageFlags = shader_stage_masks[p_stage];
-	layout_binding.pImmutableSamplers = nullptr; //no support for this yet
+	layout_binding.pImmutableSamplers = nullptr; // No support for this yet.
 
 	info.stages = 1 << p_stage;
 	info.binding = binding;
@@ -4674,9 +4721,9 @@ bool RenderingDeviceVulkan::_uniform_add_binding(Vector<Vector<VkDescriptorSetLa
 }
 #endif
 
-//version 1: initial
-//version 2: Added shader name
-//version 3: Added writable
+// Version 1: initial.
+// Version 2: Added shader name.
+// Version 3: Added writable.
 
 #define SHADER_BINARY_VERSION 3
 
@@ -4688,7 +4735,7 @@ struct RenderingDeviceVulkanShaderBinaryDataBinding {
 	uint32_t type;
 	uint32_t binding;
 	uint32_t stages;
-	uint32_t length; //size of arrays (in total elements), or ubos (in bytes * total elements)
+	uint32_t length; // Size of arrays (in total elements), or ubos (in bytes * total elements).
 	uint32_t writable;
 };
 
@@ -4729,7 +4776,7 @@ Vector<uint8_t> RenderingDeviceVulkan::shader_compile_binary_from_spirv(const Ve
 	binary_data.push_constant_size = 0;
 	binary_data.push_constants_vk_stage = 0;
 
-	Vector<Vector<RenderingDeviceVulkanShaderBinaryDataBinding>> uniform_info; //set bindings
+	Vector<Vector<RenderingDeviceVulkanShaderBinaryDataBinding>> uniform_info; // Set bindings.
 	Vector<RenderingDeviceVulkanShaderBinarySpecializationConstant> specialization_constants;
 
 	uint32_t stages_processed = 0;
@@ -4763,7 +4810,7 @@ Vector<uint8_t> RenderingDeviceVulkan::shader_compile_binary_from_spirv(const Ve
 			uint32_t stage = p_spirv[i].shader_stage;
 
 			if (binding_count > 0) {
-				//Parse bindings
+				// Parse bindings.
 
 				Vector<SpvReflectDescriptorBinding *> bindings;
 				bindings.resize(binding_count);
@@ -4870,23 +4917,23 @@ Vector<uint8_t> RenderingDeviceVulkan::shader_compile_binary_from_spirv(const Ve
 							"On shader stage '" + String(shader_stage_names[stage]) + "', uniform '" + binding.name + "' uses a set (" + itos(set) + ") index larger than what is supported by the hardware (" + itos(limits.maxBoundDescriptorSets) + ").");
 
 					if (set < (uint32_t)uniform_info.size()) {
-						//check if this already exists
+						// Check if this already exists.
 						bool exists = false;
 						for (int k = 0; k < uniform_info[set].size(); k++) {
 							if (uniform_info[set][k].binding == (uint32_t)info.binding) {
-								//already exists, verify that it's the same type
+								// Already exists, verify that it's the same type.
 								ERR_FAIL_COND_V_MSG(uniform_info[set][k].type != info.type, Vector<uint8_t>(),
 										"On shader stage '" + String(shader_stage_names[stage]) + "', uniform '" + binding.name + "' trying to re-use location for set=" + itos(set) + ", binding=" + itos(info.binding) + " with different uniform type.");
 
-								//also, verify that it's the same size
+								// Also, verify that it's the same size.
 								ERR_FAIL_COND_V_MSG(uniform_info[set][k].length != info.length, Vector<uint8_t>(),
 										"On shader stage '" + String(shader_stage_names[stage]) + "', uniform '" + binding.name + "' trying to re-use location for set=" + itos(set) + ", binding=" + itos(info.binding) + " with different uniform size.");
 
-								//also, verify that it has the same writability
+								// Also, verify that it has the same writability.
 								ERR_FAIL_COND_V_MSG(uniform_info[set][k].writable != info.writable, Vector<uint8_t>(),
 										"On shader stage '" + String(shader_stage_names[stage]) + "', uniform '" + binding.name + "' trying to re-use location for set=" + itos(set) + ", binding=" + itos(info.binding) + " with different writability.");
 
-								//just append stage mask and return
+								// Just append stage mask and return.
 								uniform_info.write[set].write[k].stages |= 1 << stage;
 								exists = true;
 								break;
@@ -4894,7 +4941,7 @@ Vector<uint8_t> RenderingDeviceVulkan::shader_compile_binary_from_spirv(const Ve
 						}
 
 						if (exists) {
-							continue; //merged
+							continue; // Merged.
 						}
 					}
 
@@ -4909,7 +4956,7 @@ Vector<uint8_t> RenderingDeviceVulkan::shader_compile_binary_from_spirv(const Ve
 			}
 
 			{
-				//specialization constants
+				// Specialization constants.
 
 				uint32_t sc_count = 0;
 				result = spvReflectEnumerateSpecializationConstants(&module, &sc_count, nullptr);
@@ -4930,7 +4977,7 @@ Vector<uint8_t> RenderingDeviceVulkan::shader_compile_binary_from_spirv(const Ve
 						SpvReflectSpecializationConstant *spc = spec_constants[j];
 
 						sconst.constant_id = spc->constant_id;
-						sconst.int_value = 0.0; // clear previous value JIC
+						sconst.int_value = 0.0; // Clear previous value JIC.
 						switch (spc->constant_type) {
 							case SPV_REFLECT_SPECIALIZATION_CONSTANT_BOOL: {
 								sconst.type = PIPELINE_SPECIALIZATION_CONSTANT_TYPE_BOOL;
@@ -4980,7 +5027,7 @@ Vector<uint8_t> RenderingDeviceVulkan::shader_compile_binary_from_spirv(const Ve
 							"Reflection of SPIR-V shader stage '" + String(shader_stage_names[p_spirv[i].shader_stage]) + "' failed obtaining input variables.");
 
 					for (uint32_t j = 0; j < iv_count; j++) {
-						if (input_vars[j] && input_vars[j]->decoration_flags == 0) { //regular input
+						if (input_vars[j] && input_vars[j]->decoration_flags == 0) { // Regular input.
 							binary_data.vertex_input_mask |= (1 << uint32_t(input_vars[j]->location));
 						}
 					}
@@ -5049,7 +5096,7 @@ Vector<uint8_t> RenderingDeviceVulkan::shader_compile_binary_from_spirv(const Ve
 
 	Vector<Vector<uint8_t>> compressed_stages;
 	Vector<uint32_t> smolv_size;
-	Vector<uint32_t> zstd_size; //if 0, stdno t used
+	Vector<uint32_t> zstd_size; // If 0, zstd not used.
 
 	uint32_t stages_binary_size = 0;
 
@@ -5061,7 +5108,7 @@ Vector<uint8_t> RenderingDeviceVulkan::shader_compile_binary_from_spirv(const Ve
 			ERR_FAIL_V_MSG(Vector<uint8_t>(), "Error compressing shader stage :" + String(shader_stage_names[p_spirv[i].shader_stage]));
 		} else {
 			smolv_size.push_back(smolv.size());
-			{ //zstd
+			{ // zstd.
 				Vector<uint8_t> zstd;
 				zstd.resize(Compression::get_max_compressed_buffer_size(smolv.size(), Compression::MODE_ZSTD));
 				int dst_size = Compression::compress(zstd.ptrw(), &smolv[0], smolv.size(), Compression::MODE_ZSTD);
@@ -5074,7 +5121,7 @@ Vector<uint8_t> RenderingDeviceVulkan::shader_compile_binary_from_spirv(const Ve
 					Vector<uint8_t> smv;
 					smv.resize(smolv.size());
 					memcpy(smv.ptrw(), &smolv[0], smolv.size());
-					zstd_size.push_back(0); //not using zstd
+					zstd_size.push_back(0); // Not using zstd.
 					compressed_stages.push_back(smv);
 				}
 			}
@@ -5094,12 +5141,12 @@ Vector<uint8_t> RenderingDeviceVulkan::shader_compile_binary_from_spirv(const Ve
 
 	binary_data.shader_name_len = shader_name_utf.length();
 
-	uint32_t total_size = sizeof(uint32_t) * 3; //header + version + main datasize;
+	uint32_t total_size = sizeof(uint32_t) * 3; // Header + version + main datasize;.
 	total_size += sizeof(RenderingDeviceVulkanShaderBinaryData);
 
 	total_size += binary_data.shader_name_len;
 
-	if ((binary_data.shader_name_len % 4) != 0) { //alignment rules are really strange
+	if ((binary_data.shader_name_len % 4) != 0) { // Alignment rules are really strange.
 		total_size += 4 - (binary_data.shader_name_len % 4);
 	}
 
@@ -5110,7 +5157,7 @@ Vector<uint8_t> RenderingDeviceVulkan::shader_compile_binary_from_spirv(const Ve
 
 	total_size += sizeof(RenderingDeviceVulkanShaderBinarySpecializationConstant) * specialization_constants.size();
 
-	total_size += compressed_stages.size() * sizeof(uint32_t) * 3; //sizes
+	total_size += compressed_stages.size() * sizeof(uint32_t) * 3; // Sizes.
 	total_size += stages_binary_size;
 
 	Vector<uint8_t> ret;
@@ -5121,7 +5168,7 @@ Vector<uint8_t> RenderingDeviceVulkan::shader_compile_binary_from_spirv(const Ve
 		binptr[0] = 'G';
 		binptr[1] = 'V';
 		binptr[2] = 'B';
-		binptr[3] = 'D'; //godot vulkan binary data
+		binptr[3] = 'D'; // Godot vulkan binary data.
 		offset += 4;
 		encode_uint32(SHADER_BINARY_VERSION, binptr + offset);
 		offset += sizeof(uint32_t);
@@ -5132,7 +5179,7 @@ Vector<uint8_t> RenderingDeviceVulkan::shader_compile_binary_from_spirv(const Ve
 		memcpy(binptr + offset, shader_name_utf.ptr(), binary_data.shader_name_len);
 		offset += binary_data.shader_name_len;
 
-		if ((binary_data.shader_name_len % 4) != 0) { //alignment rules are really strange
+		if ((binary_data.shader_name_len % 4) != 0) { // Alignment rules are really strange.
 			offset += 4 - (binary_data.shader_name_len % 4);
 		}
 
@@ -5180,7 +5227,7 @@ RID RenderingDeviceVulkan::shader_create_from_bytecode(const Vector<uint8_t> &p_
 	uint32_t binsize = p_shader_binary.size();
 
 	uint32_t read_offset = 0;
-	//consistency check
+	// Consistency check.
 	ERR_FAIL_COND_V(binsize < sizeof(uint32_t) * 3 + sizeof(RenderingDeviceVulkanShaderBinaryData), RID());
 	ERR_FAIL_COND_V(binptr[0] != 'G' || binptr[1] != 'V' || binptr[2] != 'B' || binptr[3] != 'D', RID());
 
@@ -5210,7 +5257,7 @@ RID RenderingDeviceVulkan::shader_create_from_bytecode(const Vector<uint8_t> &p_
 	if (binary_data.shader_name_len) {
 		name.parse_utf8((const char *)(binptr + read_offset), binary_data.shader_name_len);
 		read_offset += binary_data.shader_name_len;
-		if ((binary_data.shader_name_len % 4) != 0) { //alignment rules are really strange
+		if ((binary_data.shader_name_len % 4) != 0) { // Alignment rules are really strange.
 			read_offset += 4 - (binary_data.shader_name_len % 4);
 		}
 	}
@@ -5327,7 +5374,7 @@ RID RenderingDeviceVulkan::shader_create_from_bytecode(const Vector<uint8_t> &p_
 		const uint8_t *src_smolv = nullptr;
 
 		if (zstd_size > 0) {
-			//decompress to smolv
+			// Decompress to smolv.
 			smolv.resize(smolv_size);
 			int dec_smolv_size = Compression::decompress(smolv.ptrw(), smolv.size(), binptr + read_offset, zstd_size, Compression::MODE_ZSTD);
 			ERR_FAIL_COND_V(dec_smolv_size != (int32_t)smolv_size, RID());
@@ -5356,7 +5403,7 @@ RID RenderingDeviceVulkan::shader_create_from_bytecode(const Vector<uint8_t> &p_
 
 	ERR_FAIL_COND_V(read_offset != binsize, RID());
 
-	//all good, let's create modules
+	// All good, let's create modules.
 
 	_THREAD_SAFE_METHOD_
 
@@ -5412,11 +5459,11 @@ RID RenderingDeviceVulkan::shader_create_from_bytecode(const Vector<uint8_t> &p_
 
 		shader.pipeline_stages.push_back(shader_stage);
 	}
-	//proceed to create descriptor sets
+	// Proceed to create descriptor sets.
 
 	if (success) {
 		for (int i = 0; i < set_bindings.size(); i++) {
-			//empty ones are fine if they were not used according to spec (binding count will be 0)
+			// Empty ones are fine if they were not used according to spec (binding count will be 0).
 			VkDescriptorSetLayoutCreateInfo layout_create_info;
 			layout_create_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
 			layout_create_info.pNext = nullptr;
@@ -5435,13 +5482,13 @@ RID RenderingDeviceVulkan::shader_create_from_bytecode(const Vector<uint8_t> &p_
 			Shader::Set set;
 			set.descriptor_set_layout = layout;
 			set.uniform_info = uniform_info[i];
-			//sort and hash
+			// Sort and hash.
 			set.uniform_info.sort();
 
-			uint32_t format = 0; //no format, default
+			uint32_t format = 0; // No format, default.
 
 			if (set.uniform_info.size()) {
-				//has data, needs an actual format;
+				// Has data, needs an actual format.
 				UniformSetFormat usformat;
 				usformat.uniform_info = set.uniform_info;
 				RBMap<UniformSetFormat, uint32_t>::Element *E = uniform_set_format_cache.find(usformat);
@@ -5459,7 +5506,7 @@ RID RenderingDeviceVulkan::shader_create_from_bytecode(const Vector<uint8_t> &p_
 	}
 
 	if (success) {
-		//create pipeline layout
+		// Create pipeline layout.
 		VkPipelineLayoutCreateInfo pipeline_layout_create_info;
 		pipeline_layout_create_info.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
 		pipeline_layout_create_info.pNext = nullptr;
@@ -5498,7 +5545,7 @@ RID RenderingDeviceVulkan::shader_create_from_bytecode(const Vector<uint8_t> &p_
 	}
 
 	if (!success) {
-		//clean up if failed
+		// Clean up if failed.
 		for (int i = 0; i < shader.pipeline_stages.size(); i++) {
 			vkDestroyShaderModule(device, shader.pipeline_stages[i].module, nullptr);
 		}
@@ -5510,7 +5557,11 @@ RID RenderingDeviceVulkan::shader_create_from_bytecode(const Vector<uint8_t> &p_
 		ERR_FAIL_V_MSG(RID(), error_text);
 	}
 
-	return shader_owner.make_rid(shader);
+	RID id = shader_owner.make_rid(shader);
+#ifdef DEV_ENABLED
+	set_resource_name(id, "RID:" + itos(id.get_id()));
+#endif
+	return id;
 }
 
 uint32_t RenderingDeviceVulkan::shader_get_vertex_input_attribute_mask(RID p_shader) {
@@ -5543,7 +5594,11 @@ RID RenderingDeviceVulkan::uniform_buffer_create(uint32_t p_size_bytes, const Ve
 		_buffer_update(&buffer, 0, r, data_size);
 		_buffer_memory_barrier(buffer.buffer, 0, data_size, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_UNIFORM_READ_BIT, false);
 	}
-	return uniform_buffer_owner.make_rid(buffer);
+	RID id = uniform_buffer_owner.make_rid(buffer);
+#ifdef DEV_ENABLED
+	set_resource_name(id, "RID:" + itos(id.get_id()));
+#endif
+	return id;
 }
 
 RID RenderingDeviceVulkan::storage_buffer_create(uint32_t p_size_bytes, const Vector<uint8_t> &p_data, uint32_t p_usage) {
@@ -5613,8 +5668,12 @@ RID RenderingDeviceVulkan::texture_buffer_create(uint32_t p_size_elements, DataF
 		ERR_FAIL_V_MSG(RID(), "Unable to create buffer view, error " + itos(res) + ".");
 	}
 
-	//allocate the view
-	return texture_buffer_owner.make_rid(texture_buffer);
+	// Allocate the view.
+	RID id = texture_buffer_owner.make_rid(texture_buffer);
+#ifdef DEV_ENABLED
+	set_resource_name(id, "RID:" + itos(id.get_id()));
+#endif
+	return id;
 }
 
 RenderingDeviceVulkan::DescriptorPool *RenderingDeviceVulkan::_descriptor_pool_allocate(const DescriptorPoolKey &p_key) {
@@ -5632,17 +5691,17 @@ RenderingDeviceVulkan::DescriptorPool *RenderingDeviceVulkan::_descriptor_pool_a
 	}
 
 	if (!pool) {
-		//create a new one
+		// Create a new one.
 		pool = memnew(DescriptorPool);
 		pool->usage = 0;
 
 		VkDescriptorPoolCreateInfo descriptor_pool_create_info;
 		descriptor_pool_create_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
 		descriptor_pool_create_info.pNext = nullptr;
-		descriptor_pool_create_info.flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT; // can't think how somebody may NOT need this flag..
+		descriptor_pool_create_info.flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT; // Can't think how somebody may NOT need this flag.
 		descriptor_pool_create_info.maxSets = max_descriptors_per_pool;
 		Vector<VkDescriptorPoolSize> sizes;
-		//here comes more vulkan API strangeness
+		// Here comes more vulkan API strangeness.
 
 		if (p_key.uniform_type[UNIFORM_TYPE_SAMPLER]) {
 			VkDescriptorPoolSize s;
@@ -5742,7 +5801,7 @@ RID RenderingDeviceVulkan::uniform_set_create(const Vector<Uniform> &p_uniforms,
 
 	ERR_FAIL_COND_V_MSG(p_shader_set >= (uint32_t)shader->sets.size() || shader->sets[p_shader_set].uniform_info.size() == 0, RID(),
 			"Desired set (" + itos(p_shader_set) + ") not used by shader.");
-	//see that all sets in shader are satisfied
+	// See that all sets in shader are satisfied.
 
 	const Shader::Set &set = shader->sets[p_shader_set];
 
@@ -5755,11 +5814,11 @@ RID RenderingDeviceVulkan::uniform_set_create(const Vector<Uniform> &p_uniforms,
 	Vector<VkWriteDescriptorSet> writes;
 	DescriptorPoolKey pool_key;
 
-	//to keep them alive until update call
+	// To keep them alive until update call.
 	List<Vector<VkDescriptorBufferInfo>> buffer_infos;
 	List<Vector<VkBufferView>> buffer_views;
 	List<Vector<VkDescriptorImageInfo>> image_infos;
-	//used for verification to make sure a uniform set does not use a framebuffer bound texture
+	// Used for verification to make sure a uniform set does not use a framebuffer bound texture.
 	LocalVector<UniformSet::AttachableTexture> attachable_textures;
 	Vector<Texture *> mutable_sampled_textures;
 	Vector<Texture *> mutable_storage_textures;
@@ -5780,14 +5839,14 @@ RID RenderingDeviceVulkan::uniform_set_create(const Vector<Uniform> &p_uniforms,
 		ERR_FAIL_COND_V_MSG(uniform.uniform_type != set_uniform.type, RID(),
 				"Mismatch uniform type for binding (" + itos(set_uniform.binding) + "), set (" + itos(p_shader_set) + "). Expected '" + shader_uniform_names[set_uniform.type] + "', supplied: '" + shader_uniform_names[uniform.uniform_type] + "'.");
 
-		VkWriteDescriptorSet write; //common header
+		VkWriteDescriptorSet write; // Common header.
 		write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
 		write.pNext = nullptr;
-		write.dstSet = VK_NULL_HANDLE; //will assign afterwards when everything is valid
+		write.dstSet = VK_NULL_HANDLE; // Will assign afterwards when everything is valid.
 		write.dstBinding = set_uniform.binding;
 		write.dstArrayElement = 0;
 		write.descriptorCount = 0;
-		write.descriptorType = VK_DESCRIPTOR_TYPE_MAX_ENUM; //Invalid value.
+		write.descriptorType = VK_DESCRIPTOR_TYPE_MAX_ENUM; // Invalid value.
 		write.pImageInfo = nullptr;
 		write.pBufferInfo = nullptr;
 		write.pTexelBufferView = nullptr;
@@ -5860,12 +5919,12 @@ RID RenderingDeviceVulkan::uniform_set_create(const Vector<Uniform> &p_uniforms,
 					}
 
 					if (texture->usage_flags & TEXTURE_USAGE_STORAGE_BIT) {
-						//can also be used as storage, add to mutable sampled
+						// Can also be used as storage, add to mutable sampled.
 						mutable_sampled_textures.push_back(texture);
 					}
 					if (texture->owner.is_valid()) {
 						texture = texture_owner.get_or_null(texture->owner);
-						ERR_FAIL_COND_V(!texture, RID()); //bug, should never happen
+						ERR_FAIL_COND_V(!texture, RID()); // Bug, should never happen.
 					}
 
 					img_info.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
@@ -5913,13 +5972,13 @@ RID RenderingDeviceVulkan::uniform_set_create(const Vector<Uniform> &p_uniforms,
 					}
 
 					if (texture->usage_flags & TEXTURE_USAGE_STORAGE_BIT) {
-						//can also be used as storage, add to mutable sampled
+						// Can also be used as storage, add to mutable sampled.
 						mutable_sampled_textures.push_back(texture);
 					}
 
 					if (texture->owner.is_valid()) {
 						texture = texture_owner.get_or_null(texture->owner);
-						ERR_FAIL_COND_V(!texture, RID()); //bug, should never happen
+						ERR_FAIL_COND_V(!texture, RID()); // Bug, should never happen.
 					}
 
 					img_info.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
@@ -5961,13 +6020,13 @@ RID RenderingDeviceVulkan::uniform_set_create(const Vector<Uniform> &p_uniforms,
 					img_info.imageView = texture->view;
 
 					if (texture->usage_flags & TEXTURE_USAGE_SAMPLING_BIT) {
-						//can also be used as storage, add to mutable sampled
+						// Can also be used as storage, add to mutable sampled.
 						mutable_storage_textures.push_back(texture);
 					}
 
 					if (texture->owner.is_valid()) {
 						texture = texture_owner.get_or_null(texture->owner);
-						ERR_FAIL_COND_V(!texture, RID()); //bug, should never happen
+						ERR_FAIL_COND_V(!texture, RID()); // Bug, should never happen.
 					}
 
 					img_info.imageLayout = VK_IMAGE_LAYOUT_GENERAL;
@@ -6057,7 +6116,7 @@ RID RenderingDeviceVulkan::uniform_set_create(const Vector<Uniform> &p_uniforms,
 				type_size = uniform.get_id_count() / 2;
 			} break;
 			case UNIFORM_TYPE_IMAGE_BUFFER: {
-				//todo
+				// Todo.
 
 			} break;
 			case UNIFORM_TYPE_UNIFORM_BUFFER: {
@@ -6093,7 +6152,7 @@ RID RenderingDeviceVulkan::uniform_set_create(const Vector<Uniform> &p_uniforms,
 				}
 				ERR_FAIL_COND_V_MSG(!buffer, RID(), "Storage buffer supplied (binding: " + itos(uniform.binding) + ") is invalid.");
 
-				//if 0, then it's sized on link time
+				// If 0, then it's sized on link time.
 				ERR_FAIL_COND_V_MSG(set_uniform.length > 0 && buffer->size != (uint32_t)set_uniform.length, RID(),
 						"Storage buffer supplied (binding: " + itos(uniform.binding) + ") size (" + itos(buffer->size) + " does not match size of shader uniform: (" + itos(set_uniform.length) + ").");
 
@@ -6132,7 +6191,7 @@ RID RenderingDeviceVulkan::uniform_set_create(const Vector<Uniform> &p_uniforms,
 
 					if (texture->owner.is_valid()) {
 						texture = texture_owner.get_or_null(texture->owner);
-						ERR_FAIL_COND_V(!texture, RID()); //bug, should never happen
+						ERR_FAIL_COND_V(!texture, RID()); // Bug, should never happen.
 					}
 
 					img_info.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
@@ -6160,7 +6219,7 @@ RID RenderingDeviceVulkan::uniform_set_create(const Vector<Uniform> &p_uniforms,
 		pool_key.uniform_type[set_uniform.type] += type_size;
 	}
 
-	//need a descriptor pool
+	// Need a descriptor pool.
 	DescriptorPool *pool = _descriptor_pool_allocate(pool_key);
 
 	ERR_FAIL_COND_V(!pool, RID());
@@ -6177,7 +6236,7 @@ RID RenderingDeviceVulkan::uniform_set_create(const Vector<Uniform> &p_uniforms,
 
 	VkResult res = vkAllocateDescriptorSets(device, &descriptor_set_allocate_info, &descriptor_set);
 	if (res) {
-		_descriptor_pool_free(pool_key, pool); // meh
+		_descriptor_pool_free(pool_key, pool); // Meh.
 		ERR_FAIL_V_MSG(RID(), "Cannot allocate descriptor sets, error " + itos(res) + ".");
 	}
 
@@ -6193,7 +6252,10 @@ RID RenderingDeviceVulkan::uniform_set_create(const Vector<Uniform> &p_uniforms,
 	uniform_set.shader_id = p_shader;
 
 	RID id = uniform_set_owner.make_rid(uniform_set);
-	//add dependencies
+#ifdef DEV_ENABLED
+	set_resource_name(id, "RID:" + itos(id.get_id()));
+#endif
+	// Add dependencies.
 	_add_dependency(id, p_shader);
 	for (uint32_t i = 0; i < uniform_count; i++) {
 		const Uniform &uniform = uniforms[i];
@@ -6203,7 +6265,7 @@ RID RenderingDeviceVulkan::uniform_set_create(const Vector<Uniform> &p_uniforms,
 		}
 	}
 
-	//write the contents
+	// Write the contents.
 	if (writes.size()) {
 		for (int i = 0; i < writes.size(); i++) {
 			writes.write[i].dstSet = descriptor_set;
@@ -6218,7 +6280,7 @@ bool RenderingDeviceVulkan::uniform_set_is_valid(RID p_uniform_set) {
 	return uniform_set_owner.owns(p_uniform_set);
 }
 
-void RenderingDeviceVulkan::uniform_set_set_invalidation_callback(RID p_uniform_set, UniformSetInvalidatedCallback p_callback, void *p_userdata) {
+void RenderingDeviceVulkan::uniform_set_set_invalidation_callback(RID p_uniform_set, InvalidationCallback p_callback, void *p_userdata) {
 	UniformSet *us = uniform_set_owner.get_or_null(p_uniform_set);
 	ERR_FAIL_COND(!us);
 	us->invalidated_callback = p_callback;
@@ -6236,7 +6298,7 @@ Error RenderingDeviceVulkan::buffer_update(RID p_buffer, uint32_t p_offset, uint
 	VkPipelineStageFlags dst_stage_mask = 0;
 	VkAccessFlags dst_access = 0;
 	if (p_post_barrier & BARRIER_MASK_TRANSFER) {
-		// Protect subsequent updates...
+		// Protect subsequent updates.
 		dst_stage_mask = VK_PIPELINE_STAGE_TRANSFER_BIT;
 		dst_access = VK_ACCESS_TRANSFER_WRITE_BIT;
 	}
@@ -6248,7 +6310,7 @@ Error RenderingDeviceVulkan::buffer_update(RID p_buffer, uint32_t p_offset, uint
 	ERR_FAIL_COND_V_MSG(p_offset + p_size > buffer->size, ERR_INVALID_PARAMETER,
 			"Attempted to write buffer (" + itos((p_offset + p_size) - buffer->size) + " bytes) past the end.");
 
-	// no barrier should be needed here
+	// No barrier should be needed here.
 	// _buffer_memory_barrier(buffer->buffer, p_offset, p_size, dst_stage_mask, VK_PIPELINE_STAGE_TRANSFER_BIT, dst_access, VK_ACCESS_TRANSFER_WRITE_BIT, true);
 
 	Error err = _buffer_update(buffer, p_offset, (uint8_t *)p_data, p_size, p_post_barrier);
@@ -6284,7 +6346,7 @@ Error RenderingDeviceVulkan::buffer_clear(RID p_buffer, uint32_t p_offset, uint3
 	VkPipelineStageFlags dst_stage_mask = 0;
 	VkAccessFlags dst_access = 0;
 	if (p_post_barrier & BARRIER_MASK_TRANSFER) {
-		// Protect subsequent updates...
+		// Protect subsequent updates.
 		dst_stage_mask = VK_PIPELINE_STAGE_TRANSFER_BIT;
 		dst_access = VK_ACCESS_TRANSFER_WRITE_BIT;
 	}
@@ -6297,7 +6359,7 @@ Error RenderingDeviceVulkan::buffer_clear(RID p_buffer, uint32_t p_offset, uint3
 	ERR_FAIL_COND_V_MSG(p_offset + p_size > buffer->size, ERR_INVALID_PARAMETER,
 			"Attempted to write buffer (" + itos((p_offset + p_size) - buffer->size) + " bytes) past the end.");
 
-	// should not be needed
+	// Should not be needed.
 	// _buffer_memory_barrier(buffer->buffer, p_offset, p_size, dst_stage_mask, VK_PIPELINE_STAGE_TRANSFER_BIT, dst_access, VK_ACCESS_TRANSFER_WRITE_BIT, p_post_barrier);
 
 	vkCmdFillBuffer(frames[frame].draw_command_buffer, buffer->buffer, p_offset, p_size, 0);
@@ -6318,10 +6380,10 @@ Error RenderingDeviceVulkan::buffer_clear(RID p_buffer, uint32_t p_offset, uint3
 Vector<uint8_t> RenderingDeviceVulkan::buffer_get_data(RID p_buffer) {
 	_THREAD_SAFE_METHOD_
 
-	// It could be this buffer was just created
+	// It could be this buffer was just created.
 	VkPipelineShaderStageCreateFlags src_stage_mask = VK_PIPELINE_STAGE_TRANSFER_BIT;
 	VkAccessFlags src_access_mask = VK_ACCESS_TRANSFER_WRITE_BIT;
-	// Get the vulkan buffer and the potential stage/access possible
+	// Get the vulkan buffer and the potential stage/access possible.
 	Buffer *buffer = _get_buffer_from_owner(p_buffer, src_stage_mask, src_access_mask, BARRIER_MASK_ALL);
 	if (!buffer) {
 		ERR_FAIL_V_MSG(Vector<uint8_t>(), "Buffer is either invalid or this type of buffer can't be retrieved. Only Index and Vertex buffers allow retrieving.");
@@ -6338,8 +6400,8 @@ Vector<uint8_t> RenderingDeviceVulkan::buffer_get_data(RID p_buffer) {
 	region.srcOffset = 0;
 	region.dstOffset = 0;
 	region.size = buffer->size;
-	vkCmdCopyBuffer(command_buffer, buffer->buffer, tmp_buffer.buffer, 1, &region); //dst buffer is in CPU, but I wonder if src buffer needs a barrier for this..
-	//flush everything so memory can be safely mapped
+	vkCmdCopyBuffer(command_buffer, buffer->buffer, tmp_buffer.buffer, 1, &region); // Dst buffer is in CPU, but I wonder if src buffer needs a barrier for this.
+	// Flush everything so memory can be safely mapped.
 	_flush(true);
 
 	void *buffer_mem;
@@ -6367,7 +6429,7 @@ Vector<uint8_t> RenderingDeviceVulkan::buffer_get_data(RID p_buffer) {
 RID RenderingDeviceVulkan::render_pipeline_create(RID p_shader, FramebufferFormatID p_framebuffer_format, VertexFormatID p_vertex_format, RenderPrimitive p_render_primitive, const PipelineRasterizationState &p_rasterization_state, const PipelineMultisampleState &p_multisample_state, const PipelineDepthStencilState &p_depth_stencil_state, const PipelineColorBlendState &p_blend_state, int p_dynamic_state_flags, uint32_t p_for_render_pass, const Vector<PipelineSpecializationConstant> &p_specialization_constants) {
 	_THREAD_SAFE_METHOD_
 
-	//needs a shader
+	// Needs a shader.
 	Shader *shader = shader_owner.get_or_null(p_shader);
 	ERR_FAIL_COND_V(!shader, RID());
 
@@ -6375,13 +6437,13 @@ RID RenderingDeviceVulkan::render_pipeline_create(RID p_shader, FramebufferForma
 			"Compute shaders can't be used in render pipelines");
 
 	if (p_framebuffer_format == INVALID_ID) {
-		//if nothing provided, use an empty one (no attachments)
+		// If nothing provided, use an empty one (no attachments).
 		p_framebuffer_format = framebuffer_format_create(Vector<AttachmentFormat>());
 	}
 	ERR_FAIL_COND_V(!framebuffer_formats.has(p_framebuffer_format), RID());
 	const FramebufferFormat &fb_format = framebuffer_formats[p_framebuffer_format];
 
-	{ //validate shader vs framebuffer
+	{ // Validate shader vs framebuffer.
 
 		ERR_FAIL_COND_V_MSG(p_for_render_pass >= uint32_t(fb_format.E->key().passes.size()), RID(), "Render pass requested for pipeline creation (" + itos(p_for_render_pass) + ") is out of bounds");
 		const FramebufferPass &pass = fb_format.E->key().passes[p_for_render_pass];
@@ -6394,17 +6456,17 @@ RID RenderingDeviceVulkan::render_pipeline_create(RID p_shader, FramebufferForma
 		ERR_FAIL_COND_V_MSG(shader->fragment_output_mask != output_mask, RID(),
 				"Mismatch fragment shader output mask (" + itos(shader->fragment_output_mask) + ") and framebuffer color output mask (" + itos(output_mask) + ") when binding both in render pipeline.");
 	}
-	//vertex
+	// Vertex.
 	VkPipelineVertexInputStateCreateInfo pipeline_vertex_input_state_create_info;
 
 	if (p_vertex_format != INVALID_ID) {
-		//uses vertices, else it does not
+		// Uses vertices, else it does not.
 		ERR_FAIL_COND_V(!vertex_formats.has(p_vertex_format), RID());
 		const VertexDescriptionCache &vd = vertex_formats[p_vertex_format];
 
 		pipeline_vertex_input_state_create_info = vd.create_info;
 
-		//validate with inputs
+		// Validate with inputs.
 		for (uint32_t i = 0; i < 32; i++) {
 			if (!(shader->vertex_input_mask & (1UL << i))) {
 				continue;
@@ -6421,7 +6483,7 @@ RID RenderingDeviceVulkan::render_pipeline_create(RID p_shader, FramebufferForma
 		}
 
 	} else {
-		//does not use vertices
+		// Does not use vertices.
 		pipeline_vertex_input_state_create_info.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO;
 		pipeline_vertex_input_state_create_info.pNext = nullptr;
 		pipeline_vertex_input_state_create_info.flags = 0;
@@ -6433,7 +6495,7 @@ RID RenderingDeviceVulkan::render_pipeline_create(RID p_shader, FramebufferForma
 		ERR_FAIL_COND_V_MSG(shader->vertex_input_mask != 0, RID(),
 				"Shader contains vertex inputs, but no vertex input description was provided for pipeline creation.");
 	}
-	//input assembly
+	// Input assembly.
 
 	ERR_FAIL_INDEX_V(p_render_primitive, RENDER_PRIMITIVE_MAX, RID());
 
@@ -6459,7 +6521,7 @@ RID RenderingDeviceVulkan::render_pipeline_create(RID p_shader, FramebufferForma
 	input_assembly_create_info.topology = topology_list[p_render_primitive];
 	input_assembly_create_info.primitiveRestartEnable = (p_render_primitive == RENDER_PRIMITIVE_TRIANGLE_STRIPS_WITH_RESTART_INDEX);
 
-	//tessellation
+	// Tessellation.
 	VkPipelineTessellationStateCreateInfo tessellation_create_info;
 	tessellation_create_info.sType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO;
 	tessellation_create_info.pNext = nullptr;
@@ -6471,12 +6533,12 @@ RID RenderingDeviceVulkan::render_pipeline_create(RID p_shader, FramebufferForma
 	viewport_state_create_info.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO;
 	viewport_state_create_info.pNext = nullptr;
 	viewport_state_create_info.flags = 0;
-	viewport_state_create_info.viewportCount = 1; //if VR extensions are supported at some point, this will have to be customizable in the framebuffer format
+	viewport_state_create_info.viewportCount = 1; // If VR extensions are supported at some point, this will have to be customizable in the framebuffer format.
 	viewport_state_create_info.pViewports = nullptr;
 	viewport_state_create_info.scissorCount = 1;
 	viewport_state_create_info.pScissors = nullptr;
 
-	//rasterization
+	// Rasterization.
 	VkPipelineRasterizationStateCreateInfo rasterization_state_create_info;
 	rasterization_state_create_info.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
 	rasterization_state_create_info.pNext = nullptr;
@@ -6499,7 +6561,7 @@ RID RenderingDeviceVulkan::render_pipeline_create(RID p_shader, FramebufferForma
 	rasterization_state_create_info.depthBiasSlopeFactor = p_rasterization_state.depth_bias_slope_factor;
 	rasterization_state_create_info.lineWidth = p_rasterization_state.line_width;
 
-	//multisample
+	// Multisample.
 	VkPipelineMultisampleStateCreateInfo multisample_state_create_info;
 	multisample_state_create_info.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO;
 	multisample_state_create_info.pNext = nullptr;
@@ -6510,7 +6572,7 @@ RID RenderingDeviceVulkan::render_pipeline_create(RID p_shader, FramebufferForma
 	multisample_state_create_info.minSampleShading = p_multisample_state.min_sample_shading;
 	Vector<VkSampleMask> sample_mask;
 	if (p_multisample_state.sample_mask.size()) {
-		//use sample mask
+		// Use sample mask.
 		const int rasterization_sample_mask_expected_size[TEXTURE_SAMPLES_MAX] = {
 			1, 2, 4, 8, 16, 32, 64
 		};
@@ -6528,7 +6590,7 @@ RID RenderingDeviceVulkan::render_pipeline_create(RID p_shader, FramebufferForma
 	multisample_state_create_info.alphaToCoverageEnable = p_multisample_state.enable_alpha_to_coverage;
 	multisample_state_create_info.alphaToOneEnable = p_multisample_state.enable_alpha_to_one;
 
-	//depth stencil
+	// Depth stencil.
 
 	VkPipelineDepthStencilStateCreateInfo depth_stencil_state_create_info;
 	depth_stencil_state_create_info.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO;
@@ -6568,7 +6630,7 @@ RID RenderingDeviceVulkan::render_pipeline_create(RID p_shader, FramebufferForma
 	depth_stencil_state_create_info.minDepthBounds = p_depth_stencil_state.depth_range_min;
 	depth_stencil_state_create_info.maxDepthBounds = p_depth_stencil_state.depth_range_max;
 
-	//blend state
+	// Blend state.
 	VkPipelineColorBlendStateCreateInfo color_blend_state_create_info;
 	color_blend_state_create_info.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
 	color_blend_state_create_info.pNext = nullptr;
@@ -6639,15 +6701,15 @@ RID RenderingDeviceVulkan::render_pipeline_create(RID p_shader, FramebufferForma
 	color_blend_state_create_info.blendConstants[2] = p_blend_state.blend_constant.b;
 	color_blend_state_create_info.blendConstants[3] = p_blend_state.blend_constant.a;
 
-	//dynamic state
+	// Dynamic state.
 
 	VkPipelineDynamicStateCreateInfo dynamic_state_create_info;
 	dynamic_state_create_info.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO;
 	dynamic_state_create_info.pNext = nullptr;
 	dynamic_state_create_info.flags = 0;
-	Vector<VkDynamicState> dynamic_states; //vulkan is weird..
+	Vector<VkDynamicState> dynamic_states; // Vulkan is weird.
 
-	dynamic_states.push_back(VK_DYNAMIC_STATE_VIEWPORT); //viewport and scissor are always dynamic
+	dynamic_states.push_back(VK_DYNAMIC_STATE_VIEWPORT); // Viewport and scissor are always dynamic.
 	dynamic_states.push_back(VK_DYNAMIC_STATE_SCISSOR);
 
 	if (p_dynamic_state_flags & DYNAMIC_STATE_LINE_WIDTH) {
@@ -6686,19 +6748,19 @@ RID RenderingDeviceVulkan::render_pipeline_create(RID p_shader, FramebufferForma
 	VkPipelineFragmentShadingRateStateCreateInfoKHR vrs_create_info;
 	if (context->get_vrs_capabilities().attachment_vrs_supported) {
 		// If VRS is used, this defines how the different VRS types are combined.
-		// combinerOps[0] decides how we use the output of pipeline and primitive (drawcall) VRS
-		// combinerOps[1] decides how we use the output of combinerOps[0] and our attachment VRS
+		// combinerOps[0] decides how we use the output of pipeline and primitive (drawcall) VRS.
+		// combinerOps[1] decides how we use the output of combinerOps[0] and our attachment VRS.
 
 		vrs_create_info.sType = VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR;
 		vrs_create_info.pNext = nullptr;
 		vrs_create_info.fragmentSize = { 4, 4 };
-		vrs_create_info.combinerOps[0] = VK_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_KHR; // We don't use pipeline/primitive VRS so this really doesn't matter
-		vrs_create_info.combinerOps[1] = VK_FRAGMENT_SHADING_RATE_COMBINER_OP_REPLACE_KHR; // always use the outcome of attachment VRS if enabled
+		vrs_create_info.combinerOps[0] = VK_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_KHR; // We don't use pipeline/primitive VRS so this really doesn't matter.
+		vrs_create_info.combinerOps[1] = VK_FRAGMENT_SHADING_RATE_COMBINER_OP_REPLACE_KHR; // Always use the outcome of attachment VRS if enabled.
 
 		graphics_pipeline_nextptr = &vrs_create_info;
 	}
 
-	//finally, pipeline create info
+	// Finally, pipeline create info.
 	VkGraphicsPipelineCreateInfo graphics_pipeline_create_info;
 
 	graphics_pipeline_create_info.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO;
@@ -6716,9 +6778,9 @@ RID RenderingDeviceVulkan::render_pipeline_create(RID p_shader, FramebufferForma
 		specialization_info.resize(pipeline_stages.size());
 		specialization_map_entries.resize(pipeline_stages.size());
 		for (int i = 0; i < shader->specialization_constants.size(); i++) {
-			//see if overridden
+			// See if overridden.
 			const Shader::SpecializationConstant &sc = shader->specialization_constants[i];
-			data_ptr[i] = sc.constant.int_value; //just copy the 32 bits
+			data_ptr[i] = sc.constant.int_value; // Just copy the 32 bits.
 
 			for (int j = 0; j < p_specialization_constants.size(); j++) {
 				const PipelineSpecializationConstant &psc = p_specialization_constants[j];
@@ -6813,9 +6875,12 @@ RID RenderingDeviceVulkan::render_pipeline_create(RID p_shader, FramebufferForma
 	};
 	pipeline.validation.primitive_minimum = primitive_minimum[p_render_primitive];
 #endif
-	//create ID to associate with this pipeline
+	// Create ID to associate with this pipeline.
 	RID id = render_pipeline_owner.make_rid(pipeline);
-	//now add all the dependencies
+#ifdef DEV_ENABLED
+	set_resource_name(id, "RID:" + itos(id.get_id()));
+#endif
+	// Now add all the dependencies.
 	_add_dependency(id, p_shader);
 	return id;
 }
@@ -6832,14 +6897,14 @@ bool RenderingDeviceVulkan::render_pipeline_is_valid(RID p_pipeline) {
 RID RenderingDeviceVulkan::compute_pipeline_create(RID p_shader, const Vector<PipelineSpecializationConstant> &p_specialization_constants) {
 	_THREAD_SAFE_METHOD_
 
-	//needs a shader
+	// Needs a shader.
 	Shader *shader = shader_owner.get_or_null(p_shader);
 	ERR_FAIL_COND_V(!shader, RID());
 
 	ERR_FAIL_COND_V_MSG(!shader->is_compute, RID(),
 			"Non-compute shaders can't be used in compute pipelines");
 
-	//finally, pipeline create info
+	// Finally, pipeline create info.
 	VkComputePipelineCreateInfo compute_pipeline_create_info;
 
 	compute_pipeline_create_info.sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO;
@@ -6859,9 +6924,9 @@ RID RenderingDeviceVulkan::compute_pipeline_create(RID p_shader, const Vector<Pi
 		specialization_constant_data.resize(shader->specialization_constants.size());
 		uint32_t *data_ptr = specialization_constant_data.ptrw();
 		for (int i = 0; i < shader->specialization_constants.size(); i++) {
-			//see if overridden
+			// See if overridden.
 			const Shader::SpecializationConstant &sc = shader->specialization_constants[i];
-			data_ptr[i] = sc.constant.int_value; //just copy the 32 bits
+			data_ptr[i] = sc.constant.int_value; // Just copy the 32 bits.
 
 			for (int j = 0; j < p_specialization_constants.size(); j++) {
 				const PipelineSpecializationConstant &psc = p_specialization_constants[j];
@@ -6902,9 +6967,12 @@ RID RenderingDeviceVulkan::compute_pipeline_create(RID p_shader, const Vector<Pi
 	pipeline.local_group_size[1] = shader->compute_local_size[1];
 	pipeline.local_group_size[2] = shader->compute_local_size[2];
 
-	//create ID to associate with this pipeline
+	// Create ID to associate with this pipeline.
 	RID id = compute_pipeline_owner.make_rid(pipeline);
-	//now add all the dependencies
+#ifdef DEV_ENABLED
+	set_resource_name(id, "RID:" + itos(id.get_id()));
+#endif
+	// Now add all the dependencies.
 	_add_dependency(id, p_shader);
 	return id;
 }
@@ -6934,7 +7002,7 @@ RenderingDevice::FramebufferFormatID RenderingDeviceVulkan::screen_get_framebuff
 	_THREAD_SAFE_METHOD_
 	ERR_FAIL_COND_V_MSG(local_device.is_valid(), INVALID_ID, "Local devices have no screen");
 
-	//very hacky, but not used often per frame so I guess ok
+	// Very hacky, but not used often per frame so I guess ok.
 	VkFormat vkformat = context->get_screen_format();
 	DataFormat format = DATA_FORMAT_MAX;
 	for (int i = 0; i < DATA_FORMAT_MAX; i++) {
@@ -7036,7 +7104,7 @@ Error RenderingDeviceVulkan::_draw_list_setup_framebuffer(Framebuffer *p_framebu
 	vk.view_count = p_framebuffer->view_count;
 
 	if (!p_framebuffer->framebuffers.has(vk)) {
-		//need to create this version
+		// Need to create this version.
 		Framebuffer::Version version;
 
 		version.render_pass = _render_pass_create(framebuffer_formats[p_framebuffer->format_id].E->key().attachments, framebuffer_formats[p_framebuffer->format_id].E->key().passes, p_initial_color_action, p_final_color_action, p_initial_depth_action, p_final_depth_action, p_framebuffer->view_count);
@@ -7112,7 +7180,7 @@ Error RenderingDeviceVulkan::_draw_list_render_pass_begin(Framebuffer *framebuff
 			}
 
 			if (color_index < p_clear_colors.size() && texture->usage_flags & TEXTURE_USAGE_COLOR_ATTACHMENT_BIT) {
-				ERR_FAIL_INDEX_V(color_index, p_clear_colors.size(), ERR_BUG); //a bug
+				ERR_FAIL_INDEX_V(color_index, p_clear_colors.size(), ERR_BUG); // A bug.
 				Color clear_color = p_clear_colors[color_index];
 				clear_value.color.float32[0] = clear_color.r;
 				clear_value.color.float32[1] = clear_color.g;
@@ -7143,7 +7211,7 @@ Error RenderingDeviceVulkan::_draw_list_render_pass_begin(Framebuffer *framebuff
 		ERR_CONTINUE_MSG(!(texture->usage_flags & TEXTURE_USAGE_STORAGE_BIT), "Supplied storage texture " + itos(i) + " for draw list is not set to be used for storage.");
 
 		if (texture->usage_flags & TEXTURE_USAGE_SAMPLING_BIT) {
-			//must change layout to general
+			// Must change layout to general.
 			VkImageMemoryBarrier image_memory_barrier;
 			image_memory_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
 			image_memory_barrier.pNext = nullptr;
@@ -7171,7 +7239,7 @@ Error RenderingDeviceVulkan::_draw_list_render_pass_begin(Framebuffer *framebuff
 
 	vkCmdBeginRenderPass(command_buffer, &render_pass_begin, subpass_contents);
 
-	//mark textures as bound
+	// Mark textures as bound.
 	draw_list_bound_textures.clear();
 	draw_list_unbind_color_textures = p_final_color_action != FINAL_ACTION_CONTINUE;
 	draw_list_unbind_depth_textures = p_final_depth_action != FINAL_ACTION_CONTINUE;
@@ -7248,7 +7316,7 @@ RenderingDevice::DrawListID RenderingDeviceVulkan::draw_list_begin(RID p_framebu
 	bool needs_clear_color = false;
 	bool needs_clear_depth = false;
 
-	if (p_region != Rect2() && p_region != Rect2(Vector2(), viewport_size)) { //check custom region
+	if (p_region != Rect2() && p_region != Rect2(Vector2(), viewport_size)) { // Check custom region.
 		Rect2i viewport(viewport_offset, viewport_size);
 		Rect2i regioni = p_region;
 		if (!(regioni.position.x >= viewport.position.x) && (regioni.position.y >= viewport.position.y) &&
@@ -7277,13 +7345,13 @@ RenderingDevice::DrawListID RenderingDeviceVulkan::draw_list_begin(RID p_framebu
 		}
 	}
 
-	if (p_initial_color_action == INITIAL_ACTION_CLEAR || needs_clear_color) { //check clear values
+	if (p_initial_color_action == INITIAL_ACTION_CLEAR || needs_clear_color) { // Check clear values.
 		int color_count = 0;
 		for (int i = 0; i < framebuffer->texture_ids.size(); i++) {
 			Texture *texture = texture_owner.get_or_null(framebuffer->texture_ids[i]);
 			// We only check for our VRS usage bit if this is not the first texture id.
 			// If it is the first we're likely populating our VRS texture.
-			// Bit dirty but..
+			// Bit dirty but...
 			if (!texture || (!(texture->usage_flags & TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) && !(i != 0 && texture->usage_flags & TEXTURE_USAGE_VRS_ATTACHMENT_BIT))) {
 				color_count++;
 			}
@@ -7355,7 +7423,7 @@ Error RenderingDeviceVulkan::draw_list_begin_split(RID p_framebuffer, uint32_t p
 	bool needs_clear_color = false;
 	bool needs_clear_depth = false;
 
-	if (p_region != Rect2() && p_region != Rect2(Vector2(), viewport_size)) { //check custom region
+	if (p_region != Rect2() && p_region != Rect2(Vector2(), viewport_size)) { // Check custom region.
 		Rect2i viewport(viewport_offset, viewport_size);
 		Rect2i regioni = p_region;
 		if (!(regioni.position.x >= viewport.position.x) && (regioni.position.y >= viewport.position.y) &&
@@ -7377,7 +7445,7 @@ Error RenderingDeviceVulkan::draw_list_begin_split(RID p_framebuffer, uint32_t p
 		}
 	}
 
-	if (p_initial_color_action == INITIAL_ACTION_CLEAR || needs_clear_color) { //check clear values
+	if (p_initial_color_action == INITIAL_ACTION_CLEAR || needs_clear_color) { // Check clear values.
 
 		int color_count = 0;
 		for (int i = 0; i < framebuffer->texture_ids.size(); i++) {
@@ -7463,7 +7531,7 @@ RenderingDeviceVulkan::DrawList *RenderingDeviceVulkan::_get_draw_list_ptr(DrawL
 			return nullptr;
 		}
 
-		uint64_t index = p_id & ((DrawListID(1) << DrawListID(ID_BASE_SHIFT)) - 1); //mask
+		uint64_t index = p_id & ((DrawListID(1) << DrawListID(ID_BASE_SHIFT)) - 1); // Mask.
 
 		if (index >= draw_list_count) {
 			return nullptr;
@@ -7489,7 +7557,7 @@ void RenderingDeviceVulkan::draw_list_bind_render_pipeline(DrawListID p_list, RI
 #endif
 
 	if (p_render_pipeline == dl->state.pipeline) {
-		return; //redundant state, return.
+		return; // Redundant state, return.
 	}
 
 	dl->state.pipeline = p_render_pipeline;
@@ -7498,17 +7566,17 @@ void RenderingDeviceVulkan::draw_list_bind_render_pipeline(DrawListID p_list, RI
 	vkCmdBindPipeline(dl->command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline->pipeline);
 
 	if (dl->state.pipeline_shader != pipeline->shader) {
-		// shader changed, so descriptor sets may become incompatible.
+		// Shader changed, so descriptor sets may become incompatible.
 
-		//go through ALL sets, and unbind them (and all those above) if the format is different
+		// Go through ALL sets, and unbind them (and all those above) if the format is different.
 
-		uint32_t pcount = pipeline->set_formats.size(); //formats count in this pipeline
+		uint32_t pcount = pipeline->set_formats.size(); // Formats count in this pipeline.
 		dl->state.set_count = MAX(dl->state.set_count, pcount);
-		const uint32_t *pformats = pipeline->set_formats.ptr(); //pipeline set formats
+		const uint32_t *pformats = pipeline->set_formats.ptr(); // Pipeline set formats.
 
-		bool sets_valid = true; //once invalid, all above become invalid
+		bool sets_valid = true; // Once invalid, all above become invalid.
 		for (uint32_t i = 0; i < pcount; i++) {
-			//if a part of the format is different, invalidate it (and the rest)
+			// If a part of the format is different, invalidate it (and the rest).
 			if (!sets_valid || dl->state.sets[i].pipeline_expected_format != pformats[i]) {
 				dl->state.sets[i].bound = false;
 				dl->state.sets[i].pipeline_expected_format = pformats[i];
@@ -7517,11 +7585,11 @@ void RenderingDeviceVulkan::draw_list_bind_render_pipeline(DrawListID p_list, RI
 		}
 
 		for (uint32_t i = pcount; i < dl->state.set_count; i++) {
-			//unbind the ones above (not used) if exist
+			// Unbind the ones above (not used) if exist.
 			dl->state.sets[i].bound = false;
 		}
 
-		dl->state.set_count = pcount; //update set count
+		dl->state.set_count = pcount; // Update set count.
 
 		if (pipeline->push_constant_size) {
 			dl->state.pipeline_push_constant_stages = pipeline->push_constant_stages;
@@ -7534,7 +7602,7 @@ void RenderingDeviceVulkan::draw_list_bind_render_pipeline(DrawListID p_list, RI
 	}
 
 #ifdef DEBUG_ENABLED
-	//update render pass pipeline info
+	// Update render pass pipeline info.
 	dl->validation.pipeline_active = true;
 	dl->validation.pipeline_dynamic_state = pipeline->validation.dynamic_state;
 	dl->validation.pipeline_vertex_format = pipeline->validation.vertex_format;
@@ -7564,8 +7632,8 @@ void RenderingDeviceVulkan::draw_list_bind_uniform_set(DrawListID p_list, RID p_
 		dl->state.set_count = p_index;
 	}
 
-	dl->state.sets[p_index].descriptor_set = uniform_set->descriptor_set; //update set pointer
-	dl->state.sets[p_index].bound = false; //needs rebind
+	dl->state.sets[p_index].descriptor_set = uniform_set->descriptor_set; // Update set pointer.
+	dl->state.sets[p_index].bound = false; // Needs rebind.
 	dl->state.sets[p_index].uniform_set_format = uniform_set->format;
 	dl->state.sets[p_index].uniform_set = p_uniform_set;
 
@@ -7583,7 +7651,7 @@ void RenderingDeviceVulkan::draw_list_bind_uniform_set(DrawListID p_list, RID p_
 	}
 
 #ifdef DEBUG_ENABLED
-	{ //validate that textures bound are not attached as framebuffer bindings
+	{ // Validate that textures bound are not attached as framebuffer bindings.
 		uint32_t attachable_count = uniform_set->attachable_textures.size();
 		const UniformSet::AttachableTexture *attachable_ptr = uniform_set->attachable_textures.ptr();
 		uint32_t bound_count = draw_list_bound_textures.size();
@@ -7609,7 +7677,7 @@ void RenderingDeviceVulkan::draw_list_bind_vertex_array(DrawListID p_list, RID p
 	ERR_FAIL_COND(!vertex_array);
 
 	if (dl->state.vertex_array == p_vertex_array) {
-		return; //already set
+		return; // Already set.
 	}
 
 	dl->state.vertex_array = p_vertex_array;
@@ -7633,7 +7701,7 @@ void RenderingDeviceVulkan::draw_list_bind_index_array(DrawListID p_list, RID p_
 	ERR_FAIL_COND(!index_array);
 
 	if (dl->state.index_array == p_index_array) {
-		return; //already set
+		return; // Already set.
 	}
 
 	dl->state.index_array = p_index_array;
@@ -7685,30 +7753,30 @@ void RenderingDeviceVulkan::draw_list_draw(DrawListID p_list, bool p_use_indices
 	ERR_FAIL_COND_MSG(!dl->validation.pipeline_active,
 			"No render pipeline was set before attempting to draw.");
 	if (dl->validation.pipeline_vertex_format != INVALID_ID) {
-		//pipeline uses vertices, validate format
+		// Pipeline uses vertices, validate format.
 		ERR_FAIL_COND_MSG(dl->validation.vertex_format == INVALID_ID,
 				"No vertex array was bound, and render pipeline expects vertices.");
-		//make sure format is right
+		// Make sure format is right.
 		ERR_FAIL_COND_MSG(dl->validation.pipeline_vertex_format != dl->validation.vertex_format,
 				"The vertex format used to create the pipeline does not match the vertex format bound.");
-		//make sure number of instances is valid
+		// Make sure number of instances is valid.
 		ERR_FAIL_COND_MSG(p_instances > dl->validation.vertex_max_instances_allowed,
 				"Number of instances requested (" + itos(p_instances) + " is larger than the maximum number supported by the bound vertex array (" + itos(dl->validation.vertex_max_instances_allowed) + ").");
 	}
 
 	if (dl->validation.pipeline_push_constant_size > 0) {
-		//using push constants, check that they were supplied
+		// Using push constants, check that they were supplied.
 		ERR_FAIL_COND_MSG(!dl->validation.pipeline_push_constant_supplied,
 				"The shader in this pipeline requires a push constant to be set before drawing, but it's not present.");
 	}
 
 #endif
 
-	//Bind descriptor sets
+	// Bind descriptor sets.
 
 	for (uint32_t i = 0; i < dl->state.set_count; i++) {
 		if (dl->state.sets[i].pipeline_expected_format == 0) {
-			continue; //nothing expected by this pipeline
+			continue; // Nothing expected by this pipeline.
 		}
 #ifdef DEBUG_ENABLED
 		if (dl->state.sets[i].pipeline_expected_format != dl->state.sets[i].uniform_set_format) {
@@ -7723,7 +7791,7 @@ void RenderingDeviceVulkan::draw_list_draw(DrawListID p_list, bool p_use_indices
 		}
 #endif
 		if (!dl->state.sets[i].bound) {
-			//All good, see if this requires re-binding
+			// All good, see if this requires re-binding.
 			vkCmdBindDescriptorSets(dl->command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, dl->state.pipeline_layout, i, 1, &dl->state.sets[i].descriptor_set, 0, nullptr);
 			dl->state.sets[i].bound = true;
 		}
@@ -7738,7 +7806,7 @@ void RenderingDeviceVulkan::draw_list_draw(DrawListID p_list, bool p_use_indices
 				"Draw command requested indices, but no index buffer was set.");
 
 		if (dl->validation.pipeline_vertex_format != INVALID_ID) {
-			//uses vertices, do some vertex validations
+			// Uses vertices, do some vertex validations.
 			ERR_FAIL_COND_MSG(dl->validation.vertex_array_size < dl->validation.index_array_max_index,
 					"Index array references (max index: " + itos(dl->validation.index_array_max_index) + ") indices beyond the vertex array size (" + itos(dl->validation.vertex_array_size) + ").");
 		}
@@ -7864,7 +7932,7 @@ Error RenderingDeviceVulkan::draw_list_switch_to_next_pass_split(uint32_t p_spli
 }
 
 Error RenderingDeviceVulkan::_draw_list_allocate(const Rect2i &p_viewport, uint32_t p_splits, uint32_t p_subpass) {
-	// Lock while draw_list is active
+	// Lock while draw_list is active.
 	_THREAD_SAFE_LOCK_
 
 	if (p_splits == 0) {
@@ -7891,7 +7959,7 @@ Error RenderingDeviceVulkan::_draw_list_allocate(const Rect2i &p_viewport, uint3
 					VkCommandBuffer command_buffer;
 
 					VkCommandBufferAllocateInfo cmdbuf;
-					//no command buffer exists, create it.
+					// No command buffer exists, create it.
 					cmdbuf.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
 					cmdbuf.pNext = nullptr;
 					cmdbuf.commandPool = split_draw_list_allocators[i].command_pool;
@@ -7910,7 +7978,7 @@ Error RenderingDeviceVulkan::_draw_list_allocate(const Rect2i &p_viewport, uint3
 		draw_list_split = true;
 
 		for (uint32_t i = 0; i < p_splits; i++) {
-			//take a command buffer and initialize it
+			// Take a command buffer and initialize it.
 			VkCommandBuffer command_buffer = split_draw_list_allocators[i].command_buffers[frame];
 
 			VkCommandBufferInheritanceInfo inheritance_info;
@@ -7920,7 +7988,7 @@ Error RenderingDeviceVulkan::_draw_list_allocate(const Rect2i &p_viewport, uint3
 			inheritance_info.subpass = p_subpass;
 			inheritance_info.framebuffer = draw_list_vkframebuffer;
 			inheritance_info.occlusionQueryEnable = false;
-			inheritance_info.queryFlags = 0; //?
+			inheritance_info.queryFlags = 0; // ?
 			inheritance_info.pipelineStatistics = 0;
 
 			VkCommandBufferBeginInfo cmdbuf_begin;
@@ -7953,7 +8021,7 @@ Error RenderingDeviceVulkan::_draw_list_allocate(const Rect2i &p_viewport, uint3
 
 void RenderingDeviceVulkan::_draw_list_free(Rect2i *r_last_viewport) {
 	if (draw_list_split) {
-		//send all command buffers
+		// Send all command buffers.
 		VkCommandBuffer *command_buffers = (VkCommandBuffer *)alloca(sizeof(VkCommandBuffer) * draw_list_count);
 		for (uint32_t i = 0; i < draw_list_count; i++) {
 			vkEndCommandBuffer(draw_list[i].command_buffer);
@@ -7973,12 +8041,12 @@ void RenderingDeviceVulkan::_draw_list_free(Rect2i *r_last_viewport) {
 		if (r_last_viewport) {
 			*r_last_viewport = draw_list->viewport;
 		}
-		//just end the list
+		// Just end the list.
 		memdelete(draw_list);
 		draw_list = nullptr;
 	}
 
-	// draw_list is no longer active
+	// Draw_list is no longer active.
 	_THREAD_SAFE_UNLOCK_
 }
 
@@ -7993,7 +8061,7 @@ void RenderingDeviceVulkan::draw_list_end(uint32_t p_post_barrier) {
 
 	for (int i = 0; i < draw_list_bound_textures.size(); i++) {
 		Texture *texture = texture_owner.get_or_null(draw_list_bound_textures[i]);
-		ERR_CONTINUE(!texture); //wtf
+		ERR_CONTINUE(!texture); // Wtf.
 		if (draw_list_unbind_color_textures && (texture->usage_flags & TEXTURE_USAGE_COLOR_ATTACHMENT_BIT)) {
 			texture->bound = false;
 		}
@@ -8065,8 +8133,8 @@ void RenderingDeviceVulkan::draw_list_end(uint32_t p_post_barrier) {
 	draw_list_storage_textures.clear();
 
 	// To ensure proper synchronization, we must make sure rendering is done before:
-	//  * Some buffer is copied
-	//  * Another render pass happens (since we may be done)
+	// * Some buffer is copied.
+	// * Another render pass happens (since we may be done).
 
 	VkMemoryBarrier mem_barrier;
 	mem_barrier.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER;
@@ -8091,7 +8159,7 @@ RenderingDevice::ComputeListID RenderingDeviceVulkan::compute_list_begin(bool p_
 	ERR_FAIL_COND_V_MSG(!p_allow_draw_overlap && draw_list != nullptr, INVALID_ID, "Only one draw list can be active at the same time.");
 	ERR_FAIL_COND_V_MSG(compute_list != nullptr, INVALID_ID, "Only one draw/compute list can be active at the same time.");
 
-	// Lock while compute_list is active
+	// Lock while compute_list is active.
 	_THREAD_SAFE_LOCK_
 
 	compute_list = memnew(ComputeList);
@@ -8111,7 +8179,7 @@ void RenderingDeviceVulkan::compute_list_bind_compute_pipeline(ComputeListID p_l
 	ERR_FAIL_COND(!pipeline);
 
 	if (p_compute_pipeline == cl->state.pipeline) {
-		return; //redundant state, return.
+		return; // Redundant state, return.
 	}
 
 	cl->state.pipeline = p_compute_pipeline;
@@ -8120,17 +8188,17 @@ void RenderingDeviceVulkan::compute_list_bind_compute_pipeline(ComputeListID p_l
 	vkCmdBindPipeline(cl->command_buffer, VK_PIPELINE_BIND_POINT_COMPUTE, pipeline->pipeline);
 
 	if (cl->state.pipeline_shader != pipeline->shader) {
-		// shader changed, so descriptor sets may become incompatible.
+		// Shader changed, so descriptor sets may become incompatible.
 
-		//go through ALL sets, and unbind them (and all those above) if the format is different
+		// Go through ALL sets, and unbind them (and all those above) if the format is different.
 
-		uint32_t pcount = pipeline->set_formats.size(); //formats count in this pipeline
+		uint32_t pcount = pipeline->set_formats.size(); // Formats count in this pipeline.
 		cl->state.set_count = MAX(cl->state.set_count, pcount);
-		const uint32_t *pformats = pipeline->set_formats.ptr(); //pipeline set formats
+		const uint32_t *pformats = pipeline->set_formats.ptr(); // Pipeline set formats.
 
-		bool sets_valid = true; //once invalid, all above become invalid
+		bool sets_valid = true; // Once invalid, all above become invalid.
 		for (uint32_t i = 0; i < pcount; i++) {
-			//if a part of the format is different, invalidate it (and the rest)
+			// If a part of the format is different, invalidate it (and the rest).
 			if (!sets_valid || cl->state.sets[i].pipeline_expected_format != pformats[i]) {
 				cl->state.sets[i].bound = false;
 				cl->state.sets[i].pipeline_expected_format = pformats[i];
@@ -8139,11 +8207,11 @@ void RenderingDeviceVulkan::compute_list_bind_compute_pipeline(ComputeListID p_l
 		}
 
 		for (uint32_t i = pcount; i < cl->state.set_count; i++) {
-			//unbind the ones above (not used) if exist
+			// Unbind the ones above (not used) if exist.
 			cl->state.sets[i].bound = false;
 		}
 
-		cl->state.set_count = pcount; //update set count
+		cl->state.set_count = pcount; // Update set count.
 
 		if (pipeline->push_constant_size) {
 			cl->state.pipeline_push_constant_stages = pipeline->push_constant_stages;
@@ -8159,7 +8227,7 @@ void RenderingDeviceVulkan::compute_list_bind_compute_pipeline(ComputeListID p_l
 	}
 
 #ifdef DEBUG_ENABLED
-	//update compute pass pipeline info
+	// Update compute pass pipeline info.
 	cl->validation.pipeline_active = true;
 	cl->validation.pipeline_push_constant_size = pipeline->push_constant_size;
 #endif
@@ -8187,8 +8255,8 @@ void RenderingDeviceVulkan::compute_list_bind_uniform_set(ComputeListID p_list,
 		cl->state.set_count = p_index;
 	}
 
-	cl->state.sets[p_index].descriptor_set = uniform_set->descriptor_set; //update set pointer
-	cl->state.sets[p_index].bound = false; //needs rebind
+	cl->state.sets[p_index].descriptor_set = uniform_set->descriptor_set; // Update set pointer.
+	cl->state.sets[p_index].bound = false; // Needs rebind.
 	cl->state.sets[p_index].uniform_set_format = uniform_set->format;
 	cl->state.sets[p_index].uniform_set = p_uniform_set;
 
@@ -8291,7 +8359,7 @@ void RenderingDeviceVulkan::compute_list_bind_uniform_set(ComputeListID p_list,
 
 			textures_to_storage[i]->layout = VK_IMAGE_LAYOUT_GENERAL;
 
-			cl->state.textures_to_sampled_layout.insert(textures_to_storage[i]); //needs to go back to sampled layout afterwards
+			cl->state.textures_to_sampled_layout.insert(textures_to_storage[i]); // Needs to go back to sampled layout afterwards.
 		}
 	}
 
@@ -8304,7 +8372,7 @@ void RenderingDeviceVulkan::compute_list_bind_uniform_set(ComputeListID p_list,
 	}
 
 #if 0
-	{ //validate that textures bound are not attached as framebuffer bindings
+	{ // Validate that textures bound are not attached as framebuffer bindings.
 		uint32_t attachable_count = uniform_set->attachable_textures.size();
 		const RID *attachable_ptr = uniform_set->attachable_textures.ptr();
 		uint32_t bound_count = draw_list_bound_textures.size();
@@ -8364,18 +8432,18 @@ void RenderingDeviceVulkan::compute_list_dispatch(ComputeListID p_list, uint32_t
 	ERR_FAIL_COND_MSG(!cl->validation.pipeline_active, "No compute pipeline was set before attempting to draw.");
 
 	if (cl->validation.pipeline_push_constant_size > 0) {
-		//using push constants, check that they were supplied
+		// Using push constants, check that they were supplied.
 		ERR_FAIL_COND_MSG(!cl->validation.pipeline_push_constant_supplied,
 				"The shader in this pipeline requires a push constant to be set before drawing, but it's not present.");
 	}
 
 #endif
 
-	//Bind descriptor sets
+	// Bind descriptor sets.
 
 	for (uint32_t i = 0; i < cl->state.set_count; i++) {
 		if (cl->state.sets[i].pipeline_expected_format == 0) {
-			continue; //nothing expected by this pipeline
+			continue; // Nothing expected by this pipeline.
 		}
 #ifdef DEBUG_ENABLED
 		if (cl->state.sets[i].pipeline_expected_format != cl->state.sets[i].uniform_set_format) {
@@ -8390,7 +8458,7 @@ void RenderingDeviceVulkan::compute_list_dispatch(ComputeListID p_list, uint32_t
 		}
 #endif
 		if (!cl->state.sets[i].bound) {
-			//All good, see if this requires re-binding
+			// All good, see if this requires re-binding.
 			vkCmdBindDescriptorSets(cl->command_buffer, VK_PIPELINE_BIND_POINT_COMPUTE, cl->state.pipeline_layout, i, 1, &cl->state.sets[i].descriptor_set, 0, nullptr);
 			cl->state.sets[i].bound = true;
 		}
@@ -8416,7 +8484,7 @@ void RenderingDeviceVulkan::compute_list_dispatch_threads(ComputeListID p_list,
 	ERR_FAIL_COND_MSG(!cl->validation.pipeline_active, "No compute pipeline was set before attempting to draw.");
 
 	if (cl->validation.pipeline_push_constant_size > 0) {
-		//using push constants, check that they were supplied
+		// Using push constants, check that they were supplied.
 		ERR_FAIL_COND_MSG(!cl->validation.pipeline_push_constant_supplied,
 				"The shader in this pipeline requires a push constant to be set before drawing, but it's not present.");
 	}
@@ -8447,18 +8515,18 @@ void RenderingDeviceVulkan::compute_list_dispatch_indirect(ComputeListID p_list,
 	ERR_FAIL_COND_MSG(!cl->validation.pipeline_active, "No compute pipeline was set before attempting to draw.");
 
 	if (cl->validation.pipeline_push_constant_size > 0) {
-		//using push constants, check that they were supplied
+		// Using push constants, check that they were supplied.
 		ERR_FAIL_COND_MSG(!cl->validation.pipeline_push_constant_supplied,
 				"The shader in this pipeline requires a push constant to be set before drawing, but it's not present.");
 	}
 
 #endif
 
-	//Bind descriptor sets
+	// Bind descriptor sets.
 
 	for (uint32_t i = 0; i < cl->state.set_count; i++) {
 		if (cl->state.sets[i].pipeline_expected_format == 0) {
-			continue; //nothing expected by this pipeline
+			continue; // Nothing expected by this pipeline.
 		}
 #ifdef DEBUG_ENABLED
 		if (cl->state.sets[i].pipeline_expected_format != cl->state.sets[i].uniform_set_format) {
@@ -8473,7 +8541,7 @@ void RenderingDeviceVulkan::compute_list_dispatch_indirect(ComputeListID p_list,
 		}
 #endif
 		if (!cl->state.sets[i].bound) {
-			//All good, see if this requires re-binding
+			// All good, see if this requires re-binding.
 			vkCmdBindDescriptorSets(cl->command_buffer, VK_PIPELINE_BIND_POINT_COMPUTE, cl->state.pipeline_layout, i, 1, &cl->state.sets[i].descriptor_set, 0, nullptr);
 			cl->state.sets[i].bound = true;
 		}
@@ -8567,7 +8635,7 @@ void RenderingDeviceVulkan::compute_list_end(uint32_t p_post_barrier) {
 	memdelete(compute_list);
 	compute_list = nullptr;
 
-	// compute_list is no longer active
+	// Compute_list is no longer active.
 	_THREAD_SAFE_UNLOCK_
 }
 
@@ -8660,7 +8728,7 @@ void RenderingDeviceVulkan::draw_list_render_secondary_to_framebuffer(ID p_frame
 					"Draw list index (" + itos(i) + ") is created with a framebuffer format incompatible with this render pass.");
 
 			if (dl->validation.active) {
-				//needs to be closed, so close it.
+				// Needs to be closed, so close it.
 				vkEndCommandBuffer(dl->command_buffer);
 				dl->validation.active = false;
 			}
@@ -8677,7 +8745,15 @@ void RenderingDeviceVulkan::draw_list_render_secondary_to_framebuffer(ID p_frame
 #endif
 
 void RenderingDeviceVulkan::_free_internal(RID p_id) {
-	//push everything so it's disposed of next time this frame index is processed (means, it's safe to do it)
+#ifdef DEV_ENABLED
+	String resource_name;
+	if (resource_names.has(p_id)) {
+		resource_name = resource_names[p_id];
+		resource_names.erase(p_id);
+	}
+#endif
+
+	// Push everything so it's disposed of next time this frame index is processed (means, it's safe to do it).
 	if (texture_owner.owns(p_id)) {
 		Texture *texture = texture_owner.get_or_null(p_id);
 		frames[frame].textures_to_dispose_of.push_back(*texture);
@@ -8685,6 +8761,11 @@ void RenderingDeviceVulkan::_free_internal(RID p_id) {
 	} else if (framebuffer_owner.owns(p_id)) {
 		Framebuffer *framebuffer = framebuffer_owner.get_or_null(p_id);
 		frames[frame].framebuffers_to_dispose_of.push_back(*framebuffer);
+
+		if (framebuffer->invalidated_callback != nullptr) {
+			framebuffer->invalidated_callback(framebuffer->invalidated_callback_userdata);
+		}
+
 		framebuffer_owner.free(p_id);
 	} else if (sampler_owner.owns(p_id)) {
 		VkSampler *sampler = sampler_owner.get_or_null(p_id);
@@ -8741,30 +8822,34 @@ void RenderingDeviceVulkan::_free_internal(RID p_id) {
 		frames[frame].compute_pipelines_to_dispose_of.push_back(*pipeline);
 		compute_pipeline_owner.free(p_id);
 	} else {
+#ifdef DEV_ENABLED
+		ERR_PRINT("Attempted to free invalid ID: " + itos(p_id.get_id()) + " " + resource_name);
+#else
 		ERR_PRINT("Attempted to free invalid ID: " + itos(p_id.get_id()));
+#endif
 	}
 }
 
 void RenderingDeviceVulkan::free(RID p_id) {
 	_THREAD_SAFE_METHOD_
 
-	_free_dependencies(p_id); //recursively erase dependencies first, to avoid potential API problems
+	_free_dependencies(p_id); // Recursively erase dependencies first, to avoid potential API problems.
 	_free_internal(p_id);
 }
 
-// The full list of resources that can be named is in the VkObjectType enum
+// The full list of resources that can be named is in the VkObjectType enum.
 // We just expose the resources that are owned and can be accessed easily.
 void RenderingDeviceVulkan::set_resource_name(RID p_id, const String p_name) {
 	if (texture_owner.owns(p_id)) {
 		Texture *texture = texture_owner.get_or_null(p_id);
 		if (texture->owner.is_null()) {
-			// Don't set the source texture's name when calling on a texture view
+			// Don't set the source texture's name when calling on a texture view.
 			context->set_object_name(VK_OBJECT_TYPE_IMAGE, uint64_t(texture->image), p_name);
 		}
 		context->set_object_name(VK_OBJECT_TYPE_IMAGE_VIEW, uint64_t(texture->view), p_name + " View");
 	} else if (framebuffer_owner.owns(p_id)) {
 		//Framebuffer *framebuffer = framebuffer_owner.get_or_null(p_id);
-		// Not implemented for now as the relationship between Framebuffer and RenderPass is very complex
+		// Not implemented for now as the relationship between Framebuffer and RenderPass is very complex.
 	} else if (sampler_owner.owns(p_id)) {
 		VkSampler *sampler = sampler_owner.get_or_null(p_id);
 		context->set_object_name(VK_OBJECT_TYPE_SAMPLER, uint64_t(*sampler), p_name);
@@ -8803,7 +8888,11 @@ void RenderingDeviceVulkan::set_resource_name(RID p_id, const String p_name) {
 		context->set_object_name(VK_OBJECT_TYPE_PIPELINE_LAYOUT, uint64_t(pipeline->pipeline_layout), p_name + " Layout");
 	} else {
 		ERR_PRINT("Attempted to name invalid ID: " + itos(p_id.get_id()));
+		return;
 	}
+#ifdef DEV_ENABLED
+	resource_names[p_id] = p_name;
+#endif
 }
 
 void RenderingDeviceVulkan::draw_command_begin_label(String p_label_name, const Color p_color) {
@@ -8847,17 +8936,17 @@ void RenderingDeviceVulkan::_finalize_command_bufers() {
 		ERR_PRINT("Found open compute list at the end of the frame, this should never happen (further compute will likely not work).");
 	}
 
-	{ //complete the setup buffer (that needs to be processed before anything else)
+	{ // Complete the setup buffer (that needs to be processed before anything else).
 		vkEndCommandBuffer(frames[frame].setup_command_buffer);
 		vkEndCommandBuffer(frames[frame].draw_command_buffer);
 	}
 }
 
 void RenderingDeviceVulkan::_begin_frame() {
-	//erase pending resources
+	// Erase pending resources.
 	_free_pending_resources(frame);
 
-	//create setup command buffer and set as the setup buffer
+	// Create setup command buffer and set as the setup buffer.
 
 	{
 		VkCommandBufferBeginInfo cmdbuf_begin;
@@ -8876,13 +8965,13 @@ void RenderingDeviceVulkan::_begin_frame() {
 
 		if (local_device.is_null()) {
 			context->append_command_buffer(frames[frame].draw_command_buffer);
-			context->set_setup_buffer(frames[frame].setup_command_buffer); //append now so it's added before everything else
+			context->set_setup_buffer(frames[frame].setup_command_buffer); // Append now so it's added before everything else.
 		}
 	}
 
-	//advance current frame
+	// Advance current frame.
 	frames_drawn++;
-	//advance staging buffer if used
+	// Advance staging buffer if used.
 	if (staging_buffer_used) {
 		staging_buffer_current = (staging_buffer_current + 1) % staging_buffer_blocks.size();
 		staging_buffer_used = false;
@@ -8907,7 +8996,7 @@ void RenderingDeviceVulkan::swap_buffers() {
 	_finalize_command_bufers();
 
 	screen_prepared = false;
-	//swap buffers
+	// Swap buffers.
 	context->swap_buffers();
 
 	frame = (frame + 1) % frame_count;
@@ -8953,15 +9042,15 @@ VmaPool RenderingDeviceVulkan::_find_or_create_small_allocs_pool(uint32_t p_mem_
 	pci.pMemoryAllocateNext = nullptr;
 	VmaPool pool = VK_NULL_HANDLE;
 	VkResult res = vmaCreatePool(allocator, &pci, &pool);
-	small_allocs_pools[p_mem_type_index] = pool; // Don't try to create it again if failed the first time
+	small_allocs_pools[p_mem_type_index] = pool; // Don't try to create it again if failed the first time.
 	ERR_FAIL_COND_V_MSG(res, pool, "vmaCreatePool failed with error " + itos(res) + ".");
 
 	return pool;
 }
 
 void RenderingDeviceVulkan::_free_pending_resources(int p_frame) {
-	//free in dependency usage order, so nothing weird happens
-	//pipelines
+	// Free in dependency usage order, so nothing weird happens.
+	// Pipelines.
 	while (frames[p_frame].render_pipelines_to_dispose_of.front()) {
 		RenderPipeline *pipeline = &frames[p_frame].render_pipelines_to_dispose_of.front()->get();
 
@@ -8978,7 +9067,7 @@ void RenderingDeviceVulkan::_free_pending_resources(int p_frame) {
 		frames[p_frame].compute_pipelines_to_dispose_of.pop_front();
 	}
 
-	//uniform sets
+	// Uniform sets.
 	while (frames[p_frame].uniform_sets_to_dispose_of.front()) {
 		UniformSet *uniform_set = &frames[p_frame].uniform_sets_to_dispose_of.front()->get();
 
@@ -8988,7 +9077,7 @@ void RenderingDeviceVulkan::_free_pending_resources(int p_frame) {
 		frames[p_frame].uniform_sets_to_dispose_of.pop_front();
 	}
 
-	//buffer views
+	// Buffer views.
 	while (frames[p_frame].buffer_views_to_dispose_of.front()) {
 		VkBufferView buffer_view = frames[p_frame].buffer_views_to_dispose_of.front()->get();
 
@@ -8997,19 +9086,19 @@ void RenderingDeviceVulkan::_free_pending_resources(int p_frame) {
 		frames[p_frame].buffer_views_to_dispose_of.pop_front();
 	}
 
-	//shaders
+	// Shaders.
 	while (frames[p_frame].shaders_to_dispose_of.front()) {
 		Shader *shader = &frames[p_frame].shaders_to_dispose_of.front()->get();
 
-		//descriptor set layout for each set
+		// Descriptor set layout for each set.
 		for (int i = 0; i < shader->sets.size(); i++) {
 			vkDestroyDescriptorSetLayout(device, shader->sets[i].descriptor_set_layout, nullptr);
 		}
 
-		//pipeline layout
+		// Pipeline layout.
 		vkDestroyPipelineLayout(device, shader->pipeline_layout, nullptr);
 
-		//shaders themselves
+		// Shaders themselves.
 		for (int i = 0; i < shader->pipeline_stages.size(); i++) {
 			vkDestroyShaderModule(device, shader->pipeline_stages[i].module, nullptr);
 		}
@@ -9017,7 +9106,7 @@ void RenderingDeviceVulkan::_free_pending_resources(int p_frame) {
 		frames[p_frame].shaders_to_dispose_of.pop_front();
 	}
 
-	//samplers
+	// Samplers.
 	while (frames[p_frame].samplers_to_dispose_of.front()) {
 		VkSampler sampler = frames[p_frame].samplers_to_dispose_of.front()->get();
 
@@ -9026,12 +9115,12 @@ void RenderingDeviceVulkan::_free_pending_resources(int p_frame) {
 		frames[p_frame].samplers_to_dispose_of.pop_front();
 	}
 
-	//framebuffers
+	// Framebuffers.
 	while (frames[p_frame].framebuffers_to_dispose_of.front()) {
 		Framebuffer *framebuffer = &frames[p_frame].framebuffers_to_dispose_of.front()->get();
 
 		for (const KeyValue<Framebuffer::VersionKey, Framebuffer::Version> &E : framebuffer->framebuffers) {
-			//first framebuffer, then render pass because it depends on it
+			// First framebuffer, then render pass because it depends on it.
 			vkDestroyFramebuffer(device, E.value.framebuffer, nullptr);
 			vkDestroyRenderPass(device, E.value.render_pass, nullptr);
 		}
@@ -9039,7 +9128,7 @@ void RenderingDeviceVulkan::_free_pending_resources(int p_frame) {
 		frames[p_frame].framebuffers_to_dispose_of.pop_front();
 	}
 
-	//textures
+	// Textures.
 	while (frames[p_frame].textures_to_dispose_of.front()) {
 		Texture *texture = &frames[p_frame].textures_to_dispose_of.front()->get();
 
@@ -9048,14 +9137,14 @@ void RenderingDeviceVulkan::_free_pending_resources(int p_frame) {
 		}
 		vkDestroyImageView(device, texture->view, nullptr);
 		if (texture->owner.is_null()) {
-			//actually owns the image and the allocation too
+			// Actually owns the image and the allocation too.
 			image_memory -= texture->allocation_info.size;
 			vmaDestroyImage(allocator, texture->image, texture->allocation);
 		}
 		frames[p_frame].textures_to_dispose_of.pop_front();
 	}
 
-	//buffers
+	// Buffers.
 	while (frames[p_frame].buffers_to_dispose_of.front()) {
 		_buffer_free(&frames[p_frame].buffers_to_dispose_of.front()->get());
 
@@ -9087,9 +9176,9 @@ uint64_t RenderingDeviceVulkan::get_memory_usage(MemoryType p_type) const {
 
 void RenderingDeviceVulkan::_flush(bool p_current_frame) {
 	if (local_device.is_valid() && !p_current_frame) {
-		return; //flushing previous frames has no effect with local device
+		return; // Flushing previous frames has no effect with local device.
 	}
-	//not doing this crashes RADV (undefined behavior)
+	// Not doing this crashes RADV (undefined behavior).
 	if (p_current_frame) {
 		vkEndCommandBuffer(frames[frame].setup_command_buffer);
 		vkEndCommandBuffer(frames[frame].draw_command_buffer);
@@ -9113,7 +9202,7 @@ void RenderingDeviceVulkan::_flush(bool p_current_frame) {
 
 	} else {
 		context->flush(p_current_frame, p_current_frame);
-		//re-create the setup command
+		// Re-create the setup command.
 		if (p_current_frame) {
 			VkCommandBufferBeginInfo cmdbuf_begin;
 			cmdbuf_begin.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
@@ -9123,7 +9212,7 @@ void RenderingDeviceVulkan::_flush(bool p_current_frame) {
 
 			VkResult err = vkBeginCommandBuffer(frames[frame].setup_command_buffer, &cmdbuf_begin);
 			ERR_FAIL_COND_MSG(err, "vkBeginCommandBuffer failed with error " + itos(err) + ".");
-			context->set_setup_buffer(frames[frame].setup_command_buffer); //append now so it's added before everything else
+			context->set_setup_buffer(frames[frame].setup_command_buffer); // Append now so it's added before everything else.
 		}
 
 		if (p_current_frame) {
@@ -9141,7 +9230,7 @@ void RenderingDeviceVulkan::_flush(bool p_current_frame) {
 }
 
 void RenderingDeviceVulkan::initialize(VulkanContext *p_context, bool p_local_device) {
-	// get our device capabilities
+	// Get our device capabilities.
 	{
 		device_capabilities.version_major = p_context->get_vulkan_major();
 		device_capabilities.version_minor = p_context->get_vulkan_minor();
@@ -9154,12 +9243,12 @@ void RenderingDeviceVulkan::initialize(VulkanContext *p_context, bool p_local_de
 		local_device = p_context->local_device_create();
 		device = p_context->local_device_get_vk_device(local_device);
 	} else {
-		frame_count = p_context->get_swapchain_image_count() + 1; //always need one extra to ensure it's unused at any time, without having to use a fence for this.
+		frame_count = p_context->get_swapchain_image_count() + 1; // Always need one extra to ensure it's unused at any time, without having to use a fence for this.
 	}
 	limits = p_context->get_device_limits();
 	max_timestamp_query_elements = 256;
 
-	{ //initialize allocator
+	{ // Initialize allocator.
 
 		VmaAllocatorCreateInfo allocatorInfo;
 		memset(&allocatorInfo, 0, sizeof(VmaAllocatorCreateInfo));
@@ -9171,11 +9260,11 @@ void RenderingDeviceVulkan::initialize(VulkanContext *p_context, bool p_local_de
 
 	frames.resize(frame_count);
 	frame = 0;
-	//create setup and frame buffers
+	// Create setup and frame buffers.
 	for (int i = 0; i < frame_count; i++) {
 		frames[i].index = 0;
 
-		{ //create command pool, one per frame is recommended
+		{ // Create command pool, one per frame is recommended.
 			VkCommandPoolCreateInfo cmd_pool_info;
 			cmd_pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO;
 			cmd_pool_info.pNext = nullptr;
@@ -9186,10 +9275,10 @@ void RenderingDeviceVulkan::initialize(VulkanContext *p_context, bool p_local_de
 			ERR_FAIL_COND_MSG(res, "vkCreateCommandPool failed with error " + itos(res) + ".");
 		}
 
-		{ //create command buffers
+		{ // Create command buffers.
 
 			VkCommandBufferAllocateInfo cmdbuf;
-			//no command buffer exists, create it.
+			// No command buffer exists, create it.
 			cmdbuf.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
 			cmdbuf.pNext = nullptr;
 			cmdbuf.commandPool = frames[i].command_pool;
@@ -9204,7 +9293,7 @@ void RenderingDeviceVulkan::initialize(VulkanContext *p_context, bool p_local_de
 		}
 
 		{
-			//create query pool
+			// Create query pool.
 			VkQueryPoolCreateInfo query_pool_create_info;
 			query_pool_create_info.sType = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO;
 			query_pool_create_info.flags = 0;
@@ -9226,8 +9315,8 @@ void RenderingDeviceVulkan::initialize(VulkanContext *p_context, bool p_local_de
 	}
 
 	{
-		//begin the first command buffer for the first frame, so
-		//setting up things can be done in the meantime until swap_buffers(), which is called before advance.
+		// Begin the first command buffer for the first frame, so
+		// setting up things can be done in the meantime until swap_buffers(), which is called before advance.
 		VkCommandBufferBeginInfo cmdbuf_begin;
 		cmdbuf_begin.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
 		cmdbuf_begin.pNext = nullptr;
@@ -9240,42 +9329,42 @@ void RenderingDeviceVulkan::initialize(VulkanContext *p_context, bool p_local_de
 		err = vkBeginCommandBuffer(frames[0].draw_command_buffer, &cmdbuf_begin);
 		ERR_FAIL_COND_MSG(err, "vkBeginCommandBuffer failed with error " + itos(err) + ".");
 		if (local_device.is_null()) {
-			context->set_setup_buffer(frames[0].setup_command_buffer); //append now so it's added before everything else
+			context->set_setup_buffer(frames[0].setup_command_buffer); // Append now so it's added before everything else.
 			context->append_command_buffer(frames[0].draw_command_buffer);
 		}
 	}
 
-	// Note: If adding new project settings here, also duplicate their definition in
+	// NOTE: If adding new project settings here, also duplicate their definition in
 	// rendering_server.cpp for headless doctool.
 	staging_buffer_block_size = GLOBAL_DEF("rendering/vulkan/staging_buffer/block_size_kb", 256);
 	staging_buffer_block_size = MAX(4u, staging_buffer_block_size);
-	staging_buffer_block_size *= 1024; //kb -> bytes
+	staging_buffer_block_size *= 1024; // Kb -> bytes.
 	staging_buffer_max_size = GLOBAL_DEF("rendering/vulkan/staging_buffer/max_size_mb", 128);
 	staging_buffer_max_size = MAX(1u, staging_buffer_max_size);
 	staging_buffer_max_size *= 1024 * 1024;
 
 	if (staging_buffer_max_size < staging_buffer_block_size * 4) {
-		//validate enough blocks
+		// Validate enough blocks.
 		staging_buffer_max_size = staging_buffer_block_size * 4;
 	}
 	texture_upload_region_size_px = GLOBAL_DEF("rendering/vulkan/staging_buffer/texture_upload_region_size_px", 64);
 	texture_upload_region_size_px = nearest_power_of_2_templated(texture_upload_region_size_px);
 
-	frames_drawn = frame_count; //start from frame count, so everything else is immediately old
+	frames_drawn = frame_count; // Start from frame count, so everything else is immediately old.
 
-	//ensure current staging block is valid and at least one per frame exists
+	// Ensure current staging block is valid and at least one per frame exists.
 	staging_buffer_current = 0;
 	staging_buffer_used = false;
 
 	for (int i = 0; i < frame_count; i++) {
-		//staging was never used, create a block
+		// Staging was never used, create a block.
 		Error err = _insert_staging_block();
 		ERR_CONTINUE(err != OK);
 	}
 
 	max_descriptors_per_pool = GLOBAL_DEF("rendering/vulkan/descriptor_pools/max_descriptors_per_pool", 64);
 
-	//check to make sure DescriptorPoolKey is good
+	// Check to make sure DescriptorPoolKey is good.
 	static_assert(sizeof(uint64_t) * 3 >= UNIFORM_TYPE_MAX * sizeof(uint16_t));
 
 	draw_list = nullptr;
@@ -9296,6 +9385,11 @@ void RenderingDeviceVulkan::_free_rids(T &p_owner, const char *p_type) {
 			WARN_PRINT(vformat("%d RIDs of type \"%s\" were leaked.", owned.size(), p_type));
 		}
 		for (const RID &E : owned) {
+#ifdef DEV_ENABLED
+			if (resource_names.has(E)) {
+				print_line(String(" - ") + resource_names[E]);
+			}
+#endif
 			free(E);
 		}
 	}
@@ -9305,7 +9399,7 @@ void RenderingDeviceVulkan::capture_timestamp(const String &p_name) {
 	ERR_FAIL_COND_MSG(draw_list != nullptr, "Capturing timestamps during draw list creation is not allowed. Offending timestamp was: " + p_name);
 	ERR_FAIL_COND(frames[frame].timestamp_count >= max_timestamp_query_elements);
 
-	//this should be optional for profiling, else it will slow things down
+	// This should be optional for profiling, else it will slow things down.
 	{
 		VkMemoryBarrier memoryBarrier;
 
@@ -9431,7 +9525,7 @@ uint64_t RenderingDeviceVulkan::get_driver_resource(DriverResource p_resource, R
 			return uint64_t(render_pipeline->pipeline);
 		} break;
 		default: {
-			// not supported for this driver
+			// Not supported for this driver.
 			return 0;
 		} break;
 	}
@@ -9468,9 +9562,9 @@ static void mult64to128(uint64_t u, uint64_t v, uint64_t &h, uint64_t &l) {
 uint64_t RenderingDeviceVulkan::get_captured_timestamp_gpu_time(uint32_t p_index) const {
 	ERR_FAIL_UNSIGNED_INDEX_V(p_index, frames[frame].timestamp_result_count, 0);
 
-	// this sucks because timestampPeriod multiplier is a float, while the timestamp is 64 bits nanosecs.
-	// so, in cases like nvidia which give you enormous numbers and 1 as multiplier, multiplying is next to impossible
-	// need to do 128 bits fixed point multiplication to get the right value
+	// This sucks because timestampPeriod multiplier is a float, while the timestamp is 64 bits nanosecs.
+	// So, in cases like nvidia which give you enormous numbers and 1 as multiplier, multiplying is next to impossible.
+	// Need to do 128 bits fixed point multiplication to get the right value.
 
 	uint64_t shift_bits = 16;
 
@@ -9583,7 +9677,7 @@ uint64_t RenderingDeviceVulkan::limit_get(Limit p_limit) const {
 }
 
 void RenderingDeviceVulkan::finalize() {
-	//free all resources
+	// Free all resources.
 
 	_flush(false);
 
@@ -9601,7 +9695,7 @@ void RenderingDeviceVulkan::finalize() {
 	_free_rids(framebuffer_owner, "Framebuffer");
 	_free_rids(sampler_owner, "Sampler");
 	{
-		//for textures it's a bit more difficult because they may be shared
+		// For textures it's a bit more difficult because they may be shared.
 		List<RID> owned;
 		texture_owner.get_owned_list(&owned);
 		if (owned.size()) {
@@ -9610,23 +9704,33 @@ void RenderingDeviceVulkan::finalize() {
 			} else {
 				WARN_PRINT(vformat("%d RIDs of type \"Texture\" were leaked.", owned.size()));
 			}
-			//free shared first
+			// Free shared first.
 			for (List<RID>::Element *E = owned.front(); E;) {
 				List<RID>::Element *N = E->next();
 				if (texture_is_shared(E->get())) {
+#ifdef DEV_ENABLED
+					if (resource_names.has(E->get())) {
+						print_line(String(" - ") + resource_names[E->get()]);
+					}
+#endif
 					free(E->get());
 					owned.erase(E);
 				}
 				E = N;
 			}
-			//free non shared second, this will avoid an error trying to free unexisting textures due to dependencies.
+			// Free non shared second, this will avoid an error trying to free unexisting textures due to dependencies.
 			for (const RID &E : owned) {
+#ifdef DEV_ENABLED
+				if (resource_names.has(E)) {
+					print_line(String(" - ") + resource_names[E]);
+				}
+#endif
 				free(E);
 			}
 		}
 	}
 
-	//free everything pending
+	// Free everything pending.
 	for (int i = 0; i < frame_count; i++) {
 		int f = (frame + i) % frame_count;
 		_free_pending_resources(f);
@@ -9662,7 +9766,7 @@ void RenderingDeviceVulkan::finalize() {
 	}
 	framebuffer_formats.clear();
 
-	//all these should be clear at this point
+	// All these should be clear at this point.
 	ERR_FAIL_COND(descriptor_pools.size());
 	ERR_FAIL_COND(dependency_map.size());
 	ERR_FAIL_COND(reverse_dependency_map.size());
diff --git a/drivers/vulkan/rendering_device_vulkan.h b/drivers/vulkan/rendering_device_vulkan.h
index 7c8021251f..6572de7c52 100644
--- a/drivers/vulkan/rendering_device_vulkan.h
+++ b/drivers/vulkan/rendering_device_vulkan.h
@@ -96,13 +96,13 @@ class RenderingDeviceVulkan : public RenderingDevice {
 		ID_TYPE_SPLIT_DRAW_LIST,
 		ID_TYPE_COMPUTE_LIST,
 		ID_TYPE_MAX,
-		ID_BASE_SHIFT = 58 //5 bits for ID types
+		ID_BASE_SHIFT = 58 // 5 bits for ID types.
 	};
 
 	VkDevice device = VK_NULL_HANDLE;
 
-	HashMap<RID, HashSet<RID>> dependency_map; //IDs to IDs that depend on it
-	HashMap<RID, HashSet<RID>> reverse_dependency_map; //same as above, but in reverse
+	HashMap<RID, HashSet<RID>> dependency_map; // IDs to IDs that depend on it.
+	HashMap<RID, HashSet<RID>> reverse_dependency_map; // Same as above, but in reverse.
 
 	void _add_dependency(RID p_id, RID p_depends_on);
 	void _free_dependencies(RID p_id);
@@ -152,7 +152,7 @@ class RenderingDeviceVulkan : public RenderingDevice {
 
 		uint32_t read_aspect_mask = 0;
 		uint32_t barrier_aspect_mask = 0;
-		bool bound = false; //bound to framebffer
+		bool bound = false; // Bound to framebffer.
 		RID owner;
 	};
 
@@ -214,7 +214,7 @@ class RenderingDeviceVulkan : public RenderingDevice {
 		uint32_t usage = 0;
 		VkBuffer buffer = VK_NULL_HANDLE;
 		VmaAllocation allocation = nullptr;
-		VkDescriptorBufferInfo buffer_info; //used for binding
+		VkDescriptorBufferInfo buffer_info; // Used for binding.
 		Buffer() {
 		}
 	};
@@ -256,7 +256,7 @@ class RenderingDeviceVulkan : public RenderingDevice {
 			const FramebufferPass *key_pass_ptr = p_key.passes.ptr();
 
 			for (uint32_t i = 0; i < pass_size; i++) {
-				{ //compare color attachments
+				{ // Compare color attachments.
 					uint32_t attachment_size = pass_ptr[i].color_attachments.size();
 					uint32_t key_attachment_size = key_pass_ptr[i].color_attachments.size();
 					if (attachment_size != key_attachment_size) {
@@ -271,7 +271,7 @@ class RenderingDeviceVulkan : public RenderingDevice {
 						}
 					}
 				}
-				{ //compare input attachments
+				{ // Compare input attachments.
 					uint32_t attachment_size = pass_ptr[i].input_attachments.size();
 					uint32_t key_attachment_size = key_pass_ptr[i].input_attachments.size();
 					if (attachment_size != key_attachment_size) {
@@ -286,7 +286,7 @@ class RenderingDeviceVulkan : public RenderingDevice {
 						}
 					}
 				}
-				{ //compare resolve attachments
+				{ // Compare resolve attachments.
 					uint32_t attachment_size = pass_ptr[i].resolve_attachments.size();
 					uint32_t key_attachment_size = key_pass_ptr[i].resolve_attachments.size();
 					if (attachment_size != key_attachment_size) {
@@ -301,7 +301,7 @@ class RenderingDeviceVulkan : public RenderingDevice {
 						}
 					}
 				}
-				{ //compare preserve attachments
+				{ // Compare preserve attachments.
 					uint32_t attachment_size = pass_ptr[i].preserve_attachments.size();
 					uint32_t key_attachment_size = key_pass_ptr[i].preserve_attachments.size();
 					if (attachment_size != key_attachment_size) {
@@ -343,7 +343,7 @@ class RenderingDeviceVulkan : public RenderingDevice {
 				}
 			}
 
-			return false; //equal
+			return false; // Equal.
 		}
 	};
 
@@ -353,9 +353,9 @@ class RenderingDeviceVulkan : public RenderingDevice {
 	RBMap<FramebufferFormatKey, FramebufferFormatID> framebuffer_format_cache;
 	struct FramebufferFormat {
 		const RBMap<FramebufferFormatKey, FramebufferFormatID>::Element *E;
-		VkRenderPass render_pass = VK_NULL_HANDLE; //here for constructing shaders, never used, see section (7.2. Render Pass Compatibility from Vulkan spec)
+		VkRenderPass render_pass = VK_NULL_HANDLE; // Here for constructing shaders, never used, see section (7.2. Render Pass Compatibility from Vulkan spec).
 		Vector<TextureSamples> pass_samples;
-		uint32_t view_count = 1; // number of views
+		uint32_t view_count = 1; // Number of views.
 	};
 
 	HashMap<FramebufferFormatID, FramebufferFormat> framebuffer_formats;
@@ -392,10 +392,12 @@ class RenderingDeviceVulkan : public RenderingDevice {
 
 		uint32_t storage_mask = 0;
 		Vector<RID> texture_ids;
+		InvalidationCallback invalidated_callback = nullptr;
+		void *invalidated_callback_userdata = nullptr;
 
 		struct Version {
 			VkFramebuffer framebuffer = VK_NULL_HANDLE;
-			VkRenderPass render_pass = VK_NULL_HANDLE; //this one is owned
+			VkRenderPass render_pass = VK_NULL_HANDLE; // This one is owned.
 			uint32_t subpass_count = 1;
 		};
 
@@ -452,7 +454,7 @@ class RenderingDeviceVulkan : public RenderingDevice {
 						return false;
 					}
 				}
-				return true; //they are equal
+				return true; // They are equal.
 			}
 		}
 
@@ -497,14 +499,14 @@ class RenderingDeviceVulkan : public RenderingDevice {
 		int vertex_count = 0;
 		uint32_t max_instances_allowed = 0;
 
-		Vector<VkBuffer> buffers; //not owned, just referenced
+		Vector<VkBuffer> buffers; // Not owned, just referenced.
 		Vector<VkDeviceSize> offsets;
 	};
 
 	RID_Owner<VertexArray, true> vertex_array_owner;
 
 	struct IndexBuffer : public Buffer {
-		uint32_t max_index = 0; //used for validation
+		uint32_t max_index = 0; // Used for validation.
 		uint32_t index_count = 0;
 		VkIndexType index_type = VK_INDEX_TYPE_NONE_NV;
 		bool supports_restart_indices = false;
@@ -513,8 +515,8 @@ class RenderingDeviceVulkan : public RenderingDevice {
 	RID_Owner<IndexBuffer, true> index_buffer_owner;
 
 	struct IndexArray {
-		uint32_t max_index = 0; //remember the maximum index here too, for validation
-		VkBuffer buffer; //not owned, inherited from index buffer
+		uint32_t max_index = 0; // Remember the maximum index here too, for validation.
+		VkBuffer buffer; // Not owned, inherited from index buffer.
 		uint32_t offset = 0;
 		uint32_t indices = 0;
 		VkIndexType index_type = VK_INDEX_TYPE_NONE_NV;
@@ -548,7 +550,7 @@ class RenderingDeviceVulkan : public RenderingDevice {
 		bool writable = false;
 		int binding = 0;
 		uint32_t stages = 0;
-		int length = 0; //size of arrays (in total elements), or ubos (in bytes * total elements)
+		int length = 0; // Size of arrays (in total elements), or ubos (in bytes * total elements).
 
 		bool operator!=(const UniformInfo &p_info) const {
 			return (binding != p_info.binding || type != p_info.type || writable != p_info.writable || stages != p_info.stages || length != p_info.length);
@@ -620,7 +622,7 @@ class RenderingDeviceVulkan : public RenderingDevice {
 			VkDescriptorSetLayout descriptor_set_layout = VK_NULL_HANDLE;
 		};
 
-		uint32_t vertex_input_mask = 0; //inputs used, this is mostly for validation
+		uint32_t vertex_input_mask = 0; // Inputs used, this is mostly for validation.
 		uint32_t fragment_output_mask = 0;
 
 		struct PushConstant {
@@ -643,7 +645,7 @@ class RenderingDeviceVulkan : public RenderingDevice {
 		Vector<VkPipelineShaderStageCreateInfo> pipeline_stages;
 		Vector<SpecializationConstant> specialization_constants;
 		VkPipelineLayout pipeline_layout = VK_NULL_HANDLE;
-		String name; //used for debug
+		String name; // Used for debug.
 	};
 
 	String _shader_uniform_debug(RID p_shader, int p_set = -1);
@@ -715,7 +717,7 @@ class RenderingDeviceVulkan : public RenderingDevice {
 	RID_Owner<Buffer, true> uniform_buffer_owner;
 	RID_Owner<Buffer, true> storage_buffer_owner;
 
-	//texture buffer needs a view
+	// Texture buffer needs a view.
 	struct TextureBuffer {
 		Buffer buffer;
 		VkBufferView view = VK_NULL_HANDLE;
@@ -738,16 +740,16 @@ class RenderingDeviceVulkan : public RenderingDevice {
 		DescriptorPool *pool = nullptr;
 		DescriptorPoolKey pool_key;
 		VkDescriptorSet descriptor_set = VK_NULL_HANDLE;
-		//VkPipelineLayout pipeline_layout; //not owned, inherited from shader
+		//VkPipelineLayout pipeline_layout; // Not owned, inherited from shader.
 		struct AttachableTexture {
 			uint32_t bind;
 			RID texture;
 		};
 
-		LocalVector<AttachableTexture> attachable_textures; //used for validation
-		Vector<Texture *> mutable_sampled_textures; //used for layout change
-		Vector<Texture *> mutable_storage_textures; //used for layout change
-		UniformSetInvalidatedCallback invalidated_callback = nullptr;
+		LocalVector<AttachableTexture> attachable_textures; // Used for validation.
+		Vector<Texture *> mutable_sampled_textures; // Used for layout change.
+		Vector<Texture *> mutable_storage_textures; // Used for layout change.
+		InvalidationCallback invalidated_callback = nullptr;
 		void *invalidated_callback_userdata = nullptr;
 	};
 
@@ -769,7 +771,7 @@ class RenderingDeviceVulkan : public RenderingDevice {
 	// was not supplied as intended.
 
 	struct RenderPipeline {
-		//Cached values for validation
+		// Cached values for validation.
 #ifdef DEBUG_ENABLED
 		struct Validation {
 			FramebufferFormatID framebuffer_format = 0;
@@ -781,10 +783,10 @@ class RenderingDeviceVulkan : public RenderingDevice {
 			uint32_t primitive_divisor = 0;
 		} validation;
 #endif
-		//Actual pipeline
+		// Actual pipeline.
 		RID shader;
 		Vector<uint32_t> set_formats;
-		VkPipelineLayout pipeline_layout = VK_NULL_HANDLE; // not owned, needed for push constants
+		VkPipelineLayout pipeline_layout = VK_NULL_HANDLE; // Not owned, needed for push constants.
 		VkPipeline pipeline = VK_NULL_HANDLE;
 		uint32_t push_constant_size = 0;
 		uint32_t push_constant_stages = 0;
@@ -795,7 +797,7 @@ class RenderingDeviceVulkan : public RenderingDevice {
 	struct ComputePipeline {
 		RID shader;
 		Vector<uint32_t> set_formats;
-		VkPipelineLayout pipeline_layout = VK_NULL_HANDLE; // not owned, needed for push constants
+		VkPipelineLayout pipeline_layout = VK_NULL_HANDLE; // Not owned, needed for push constants.
 		VkPipeline pipeline = VK_NULL_HANDLE;
 		uint32_t push_constant_size = 0;
 		uint32_t push_constant_stages = 0;
@@ -821,7 +823,7 @@ class RenderingDeviceVulkan : public RenderingDevice {
 
 	struct SplitDrawListAllocator {
 		VkCommandPool command_pool = VK_NULL_HANDLE;
-		Vector<VkCommandBuffer> command_buffers; //one for each frame
+		Vector<VkCommandBuffer> command_buffers; // One for each frame.
 	};
 
 	Vector<SplitDrawListAllocator> split_draw_list_allocators;
@@ -973,7 +975,7 @@ class RenderingDeviceVulkan : public RenderingDevice {
 	// when the frame is cycled.
 
 	struct Frame {
-		//list in usage order, from last to free to first to free
+		// List in usage order, from last to free to first to free.
 		List<Buffer> buffers_to_dispose_of;
 		List<Texture> textures_to_dispose_of;
 		List<Framebuffer> framebuffers_to_dispose_of;
@@ -985,8 +987,8 @@ class RenderingDeviceVulkan : public RenderingDevice {
 		List<ComputePipeline> compute_pipelines_to_dispose_of;
 
 		VkCommandPool command_pool = VK_NULL_HANDLE;
-		VkCommandBuffer setup_command_buffer = VK_NULL_HANDLE; //used at the beginning of every frame for set-up
-		VkCommandBuffer draw_command_buffer = VK_NULL_HANDLE; //used at the beginning of every frame for set-up
+		VkCommandBuffer setup_command_buffer = VK_NULL_HANDLE; // Used at the beginning of every frame for set-up.
+		VkCommandBuffer draw_command_buffer = VK_NULL_HANDLE; // Used at the beginning of every frame for set-up.
 
 		struct Timestamp {
 			String description;
@@ -1007,9 +1009,9 @@ class RenderingDeviceVulkan : public RenderingDevice {
 
 	uint32_t max_timestamp_query_elements = 0;
 
-	TightLocalVector<Frame> frames; //frames available, for main device they are cycled (usually 3), for local devices only 1
-	int frame = 0; //current frame
-	int frame_count = 0; //total amount of frames
+	TightLocalVector<Frame> frames; // Frames available, for main device they are cycled (usually 3), for local devices only 1.
+	int frame = 0; // Current frame.
+	int frame_count = 0; // Total amount of frames.
 	uint64_t frames_drawn = 0;
 	RID local_device;
 	bool local_device_processing = false;
@@ -1036,6 +1038,10 @@ class RenderingDeviceVulkan : public RenderingDevice {
 	void _finalize_command_bufers();
 	void _begin_frame();
 
+#ifdef DEV_ENABLED
+	HashMap<RID, String> resource_names;
+#endif
+
 public:
 	virtual RID texture_create(const TextureFormat &p_format, const TextureView &p_view, const Vector<Vector<uint8_t>> &p_data = Vector<Vector<uint8_t>>());
 	virtual RID texture_create_shared(const TextureView &p_view, RID p_with_texture);
@@ -1059,13 +1065,15 @@ public:
 	/*********************/
 
 	virtual FramebufferFormatID framebuffer_format_create(const Vector<AttachmentFormat> &p_format, uint32_t p_view_count = 1);
-	virtual FramebufferFormatID framebuffer_format_create_multipass(const Vector<AttachmentFormat> &p_attachments, Vector<FramebufferPass> &p_passes, uint32_t p_view_count = 1);
+	virtual FramebufferFormatID framebuffer_format_create_multipass(const Vector<AttachmentFormat> &p_attachments, const Vector<FramebufferPass> &p_passes, uint32_t p_view_count = 1);
 	virtual FramebufferFormatID framebuffer_format_create_empty(TextureSamples p_samples = TEXTURE_SAMPLES_1);
 	virtual TextureSamples framebuffer_format_get_texture_samples(FramebufferFormatID p_format, uint32_t p_pass = 0);
 
 	virtual RID framebuffer_create(const Vector<RID> &p_texture_attachments, FramebufferFormatID p_format_check = INVALID_ID, uint32_t p_view_count = 1);
-	virtual RID framebuffer_create_multipass(const Vector<RID> &p_texture_attachments, Vector<FramebufferPass> &p_passes, FramebufferFormatID p_format_check = INVALID_ID, uint32_t p_view_count = 1);
+	virtual RID framebuffer_create_multipass(const Vector<RID> &p_texture_attachments, const Vector<FramebufferPass> &p_passes, FramebufferFormatID p_format_check = INVALID_ID, uint32_t p_view_count = 1);
 	virtual RID framebuffer_create_empty(const Size2i &p_size, TextureSamples p_samples = TEXTURE_SAMPLES_1, FramebufferFormatID p_format_check = INVALID_ID);
+	virtual bool framebuffer_is_valid(RID p_framebuffer) const;
+	virtual void framebuffer_set_invalidation_callback(RID p_framebuffer, InvalidationCallback p_callback, void *p_userdata);
 
 	virtual FramebufferFormatID framebuffer_get_format(RID p_framebuffer);
 
@@ -1081,7 +1089,7 @@ public:
 
 	virtual RID vertex_buffer_create(uint32_t p_size_bytes, const Vector<uint8_t> &p_data = Vector<uint8_t>(), bool p_use_as_storage = false);
 
-	// Internally reference counted, this ID is warranted to be unique for the same description, but needs to be freed as many times as it was allocated
+	// Internally reference counted, this ID is warranted to be unique for the same description, but needs to be freed as many times as it was allocated.
 	virtual VertexFormatID vertex_format_create(const Vector<VertexAttribute> &p_vertex_formats);
 	virtual RID vertex_array_create(uint32_t p_vertex_count, VertexFormatID p_vertex_format, const Vector<RID> &p_src_buffers);
 
@@ -1110,9 +1118,9 @@ public:
 
 	virtual RID uniform_set_create(const Vector<Uniform> &p_uniforms, RID p_shader, uint32_t p_shader_set);
 	virtual bool uniform_set_is_valid(RID p_uniform_set);
-	virtual void uniform_set_set_invalidation_callback(RID p_uniform_set, UniformSetInvalidatedCallback p_callback, void *p_userdata);
+	virtual void uniform_set_set_invalidation_callback(RID p_uniform_set, InvalidationCallback p_callback, void *p_userdata);
 
-	virtual Error buffer_update(RID p_buffer, uint32_t p_offset, uint32_t p_size, const void *p_data, uint32_t p_post_barrier = BARRIER_MASK_ALL); //works for any buffer
+	virtual Error buffer_update(RID p_buffer, uint32_t p_offset, uint32_t p_size, const void *p_data, uint32_t p_post_barrier = BARRIER_MASK_ALL); // Works for any buffer.
 	virtual Error buffer_clear(RID p_buffer, uint32_t p_offset, uint32_t p_size, uint32_t p_post_barrier = BARRIER_MASK_ALL);
 	virtual Vector<uint8_t> buffer_get_data(RID p_buffer);
 
@@ -1210,10 +1218,10 @@ public:
 	void initialize(VulkanContext *p_context, bool p_local_device = false);
 	void finalize();
 
-	virtual void swap_buffers(); //for main device
+	virtual void swap_buffers(); // For main device.
 
-	virtual void submit(); //for local device
-	virtual void sync(); //for local device
+	virtual void submit(); // For local device.
+	virtual void sync(); // For local device.
 
 	virtual uint32_t get_frame_delay() const;
 
diff --git a/drivers/vulkan/vulkan_context.cpp b/drivers/vulkan/vulkan_context.cpp
index 0d8a3310fd..afc3e78372 100644
--- a/drivers/vulkan/vulkan_context.cpp
+++ b/drivers/vulkan/vulkan_context.cpp
@@ -237,7 +237,7 @@ Error VulkanContext::_get_preferred_validation_layers(uint32_t *count, const cha
 		{ "VK_LAYER_GOOGLE_threading", "VK_LAYER_LUNARG_parameter_validation", "VK_LAYER_LUNARG_object_tracker", "VK_LAYER_LUNARG_core_validation", "VK_LAYER_GOOGLE_unique_objects" }
 	};
 
-	// Clear out-arguments
+	// Clear out-arguments.
 	*count = 0;
 	if (names != nullptr) {
 		*names = nullptr;
@@ -441,7 +441,7 @@ String VulkanContext::SubgroupCapabilities::supported_stages_desc() const {
 		res += ", STAGE_MESH_NV";
 	}
 
-	return res.substr(2); // Remove first ", "
+	return res.substr(2); // Remove first ", ".
 }
 
 uint32_t VulkanContext::SubgroupCapabilities::supported_operations_flags_rd() const {
@@ -506,7 +506,7 @@ String VulkanContext::SubgroupCapabilities::supported_operations_desc() const {
 		res += ", FEATURE_PARTITIONED_NV";
 	}
 
-	return res.substr(2); // Remove first ", "
+	return res.substr(2); // Remove first ", ".
 }
 
 Error VulkanContext::_check_capabilities() {
@@ -641,8 +641,8 @@ Error VulkanContext::_check_capabilities() {
 		subgroup_capabilities.supportedStages = subgroupProperties.supportedStages;
 		subgroup_capabilities.supportedOperations = subgroupProperties.supportedOperations;
 		// Note: quadOperationsInAllStages will be true if:
-		// - supportedStages has VK_SHADER_STAGE_ALL_GRAPHICS + VK_SHADER_STAGE_COMPUTE_BIT
-		// - supportedOperations has VK_SUBGROUP_FEATURE_QUAD_BIT
+		// - supportedStages has VK_SHADER_STAGE_ALL_GRAPHICS + VK_SHADER_STAGE_COMPUTE_BIT.
+		// - supportedOperations has VK_SUBGROUP_FEATURE_QUAD_BIT.
 		subgroup_capabilities.quadOperationsInAllStages = subgroupProperties.quadOperationsInAllStages;
 
 		if (vrs_capabilities.pipeline_vrs_supported || vrs_capabilities.primitive_vrs_supported || vrs_capabilities.attachment_vrs_supported) {
@@ -654,7 +654,7 @@ Error VulkanContext::_check_capabilities() {
 				print_verbose("  Primitive fragment shading rate");
 			}
 			if (vrs_capabilities.attachment_vrs_supported) {
-				// TODO expose these somehow to the end user
+				// TODO expose these somehow to the end user.
 				vrs_capabilities.min_texel_size.x = vrsProperties.minFragmentShadingRateAttachmentTexelSize.width;
 				vrs_capabilities.min_texel_size.y = vrsProperties.minFragmentShadingRateAttachmentTexelSize.height;
 				vrs_capabilities.max_texel_size.x = vrsProperties.maxFragmentShadingRateAttachmentTexelSize.width;
@@ -731,7 +731,7 @@ Error VulkanContext::_create_instance() {
 	VkDebugUtilsMessengerCreateInfoEXT dbg_messenger_create_info;
 	VkDebugReportCallbackCreateInfoEXT dbg_report_callback_create_info{};
 	if (enabled_debug_utils) {
-		// VK_EXT_debug_utils style
+		// VK_EXT_debug_utils style.
 		dbg_messenger_create_info.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT;
 		dbg_messenger_create_info.pNext = nullptr;
 		dbg_messenger_create_info.flags = 0;
@@ -902,8 +902,8 @@ Error VulkanContext::_create_physical_device(VkSurfaceKHR p_surface) {
 		}
 	} else {
 		// TODO: At least on Linux Laptops integrated GPUs fail with Vulkan in many instances.
-		//   The device should really be a preference, but for now choosing a discrete GPU over the
-		//   integrated one is better than the default.
+		// The device should really be a preference, but for now choosing a discrete GPU over the
+		// integrated one is better than the default.
 
 		int type_selected = -1;
 		print_verbose("Vulkan devices:");
@@ -1175,7 +1175,7 @@ Error VulkanContext::_create_device() {
 
 	VkPhysicalDeviceFragmentShadingRateFeaturesKHR vrs_features;
 	if (vrs_capabilities.pipeline_vrs_supported || vrs_capabilities.primitive_vrs_supported || vrs_capabilities.attachment_vrs_supported) {
-		// insert into our chain to enable these features if they are available
+		// Insert into our chain to enable these features if they are available.
 		vrs_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_FEATURES_KHR;
 		vrs_features.pNext = nextptr;
 		vrs_features.pipelineFragmentShadingRate = vrs_capabilities.pipeline_vrs_supported;
@@ -1611,17 +1611,17 @@ Error VulkanContext::_update_swap_chain(Window *window) {
 	// The FIFO present mode is guaranteed by the spec to be supported
 	// and to have no tearing.  It's a great default present mode to use.
 
-	//  There are times when you may wish to use another present mode.  The
-	//  following code shows how to select them, and the comments provide some
-	//  reasons you may wish to use them.
+	// There are times when you may wish to use another present mode.  The
+	// following code shows how to select them, and the comments provide some
+	// reasons you may wish to use them.
 	//
 	// It should be noted that Vulkan 1.0 doesn't provide a method for
-	// synchronizing rendering with the presentation engine's display.  There
+	// synchronizing rendering with the presentation engine's display. There
 	// is a method provided for throttling rendering with the display, but
 	// there are some presentation engines for which this method will not work.
 	// If an application doesn't throttle its rendering, and if it renders much
 	// faster than the refresh rate of the display, this can waste power on
-	// mobile devices.  That is because power is being spent rendering images
+	// mobile devices. That is because power is being spent rendering images
 	// that may never be seen.
 
 	// VK_PRESENT_MODE_IMMEDIATE_KHR is for applications that don't care about
@@ -1666,7 +1666,22 @@ Error VulkanContext::_update_swap_chain(Window *window) {
 	if (present_mode_available) {
 		window->presentMode = requested_present_mode;
 	} else {
-		WARN_PRINT("Requested VSync mode is not available!");
+		String present_mode_string;
+		switch (window->vsync_mode) {
+			case DisplayServer::VSYNC_MAILBOX:
+				present_mode_string = "Mailbox";
+				break;
+			case DisplayServer::VSYNC_ADAPTIVE:
+				present_mode_string = "Adaptive";
+				break;
+			case DisplayServer::VSYNC_ENABLED:
+				present_mode_string = "Enabled";
+				break;
+			case DisplayServer::VSYNC_DISABLED:
+				present_mode_string = "Disabled";
+				break;
+		}
+		WARN_PRINT(vformat("The requested V-Sync mode %s is not available. Falling back to V-Sync mode Enabled.", present_mode_string));
 		window->vsync_mode = DisplayServer::VSYNC_ENABLED; // Set to default.
 	}
 
@@ -1684,7 +1699,7 @@ Error VulkanContext::_update_swap_chain(Window *window) {
 	// If maxImageCount is 0, we can ask for as many images as we want;
 	// otherwise we're limited to maxImageCount.
 	if ((surfCapabilities.maxImageCount > 0) && (desiredNumOfSwapchainImages > surfCapabilities.maxImageCount)) {
-		// Application must settle for fewer images than desired:
+		// Application must settle for fewer images than desired.
 		desiredNumOfSwapchainImages = surfCapabilities.maxImageCount;
 	}
 
@@ -2028,14 +2043,14 @@ Error VulkanContext::prepare_buffers() {
 		}
 
 		do {
-			// Get the index of the next available swapchain image:
+			// Get the index of the next available swapchain image.
 			err =
 					fpAcquireNextImageKHR(device, w->swapchain, UINT64_MAX,
 							w->image_acquired_semaphores[frame_index], VK_NULL_HANDLE, &w->current_buffer);
 
 			if (err == VK_ERROR_OUT_OF_DATE_KHR) {
 				// Swapchain is out of date (e.g. the window was resized) and
-				// must be recreated:
+				// must be recreated.
 				print_verbose("Vulkan: Early out of date swapchain, recreating.");
 				// resize_notify();
 				_update_swap_chain(w);
@@ -2068,7 +2083,7 @@ Error VulkanContext::swap_buffers() {
 #if 0
 	if (VK_GOOGLE_display_timing_enabled) {
 		// Look at what happened to previous presents, and make appropriate
-		// adjustments in timing:
+		// adjustments in timing.
 		DemoUpdateTargetIPD(demo);
 
 		// Note: a real application would position its geometry to that it's in
@@ -2231,7 +2246,7 @@ Error VulkanContext::swap_buffers() {
 			uint64_t curtime = getTimeInNanoseconds();
 			if (curtime == 0) {
 				// Since we didn't find out the current time, don't give a
-				// desiredPresentTime:
+				// desiredPresentTime.
 				ptime.desiredPresentTime = 0;
 			} else {
 				ptime.desiredPresentTime = curtime + (target_IPD >> 1);
@@ -2263,7 +2278,7 @@ Error VulkanContext::swap_buffers() {
 
 	if (err == VK_ERROR_OUT_OF_DATE_KHR) {
 		// Swapchain is out of date (e.g. the window was resized) and
-		// must be recreated:
+		// must be recreated.
 		print_verbose("Vulkan: Swapchain is out of date, recreating.");
 		resize_notify();
 	} else if (err == VK_SUBOPTIMAL_KHR) {
@@ -2471,12 +2486,12 @@ String VulkanContext::get_device_pipeline_cache_uuid() const {
 }
 
 DisplayServer::VSyncMode VulkanContext::get_vsync_mode(DisplayServer::WindowID p_window) const {
-	ERR_FAIL_COND_V_MSG(!windows.has(p_window), DisplayServer::VSYNC_ENABLED, "Could not get VSync mode for window with WindowID " + itos(p_window) + " because it does not exist.");
+	ERR_FAIL_COND_V_MSG(!windows.has(p_window), DisplayServer::VSYNC_ENABLED, "Could not get V-Sync mode for window with WindowID " + itos(p_window) + " because it does not exist.");
 	return windows[p_window].vsync_mode;
 }
 
 void VulkanContext::set_vsync_mode(DisplayServer::WindowID p_window, DisplayServer::VSyncMode p_mode) {
-	ERR_FAIL_COND_MSG(!windows.has(p_window), "Could not set VSync mode for window with WindowID " + itos(p_window) + " because it does not exist.");
+	ERR_FAIL_COND_MSG(!windows.has(p_window), "Could not set V-Sync mode for window with WindowID " + itos(p_window) + " because it does not exist.");
 	windows[p_window].vsync_mode = p_mode;
 	_update_swap_chain(&windows[p_window]);
 }
diff --git a/drivers/vulkan/vulkan_context.h b/drivers/vulkan/vulkan_context.h
index 35e7ce7db8..5cc3b515d9 100644
--- a/drivers/vulkan/vulkan_context.h
+++ b/drivers/vulkan/vulkan_context.h
@@ -70,9 +70,9 @@ public:
 	};
 
 	struct VRSCapabilities {
-		bool pipeline_vrs_supported; // We can specify our fragment rate on a pipeline level
-		bool primitive_vrs_supported; // We can specify our fragment rate on each drawcall
-		bool attachment_vrs_supported; // We can provide a density map attachment on our framebuffer
+		bool pipeline_vrs_supported; // We can specify our fragment rate on a pipeline level.
+		bool primitive_vrs_supported; // We can specify our fragment rate on each drawcall.
+		bool attachment_vrs_supported; // We can provide a density map attachment on our framebuffer.
 
 		Size2i min_texel_size;
 		Size2i max_texel_size;
@@ -107,7 +107,7 @@ private:
 	bool device_initialized = false;
 	bool inst_initialized = false;
 
-	// Vulkan 1.0 doesn't return version info so we assume this by default until we know otherwise
+	// Vulkan 1.0 doesn't return version info so we assume this by default until we know otherwise.
 	uint32_t vulkan_major = 1;
 	uint32_t vulkan_minor = 0;
 	uint32_t vulkan_patch = 0;
@@ -267,7 +267,7 @@ protected:
 	Error _get_preferred_validation_layers(uint32_t *count, const char *const **names);
 
 public:
-	// Extension calls
+	// Extension calls.
 	VkResult vkCreateRenderPass2KHR(VkDevice device, const VkRenderPassCreateInfo2 *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkRenderPass *pRenderPass);
 
 	uint32_t get_vulkan_major() const { return vulkan_major; };
diff --git a/editor/animation_bezier_editor.cpp b/editor/animation_bezier_editor.cpp
index ab9afda803..e10ed7e976 100644
--- a/editor/animation_bezier_editor.cpp
+++ b/editor/animation_bezier_editor.cpp
@@ -328,6 +328,8 @@ void AnimationBezierTrackEdit::_notification(int p_what) {
 					}
 				}
 
+				Color dc = get_theme_color(SNAME("disabled_font_color"), SNAME("Editor"));
+
 				Ref<Texture2D> remove = get_theme_icon(SNAME("Remove"), SNAME("EditorIcons"));
 				float remove_hpos = limit - hsep - remove->get_width();
 
@@ -402,7 +404,11 @@ void AnimationBezierTrackEdit::_notification(int p_what) {
 
 					float icon_start_height = vofs + rect.size.y / 2;
 					Rect2 remove_rect = Rect2(remove_hpos, icon_start_height - remove->get_height() / 2, remove->get_width(), remove->get_height());
-					draw_texture(remove, remove_rect.position);
+					if (read_only) {
+						draw_texture(remove, remove_rect.position, dc);
+					} else {
+						draw_texture(remove, remove_rect.position);
+					}
 
 					Rect2 lock_rect = Rect2(lock_hpos, icon_start_height - lock->get_height() / 2, lock->get_width(), lock->get_height());
 					if (locked_tracks.has(current_track)) {
@@ -632,8 +638,9 @@ Ref<Animation> AnimationBezierTrackEdit::get_animation() const {
 	return animation;
 }
 
-void AnimationBezierTrackEdit::set_animation_and_track(const Ref<Animation> &p_animation, int p_track) {
+void AnimationBezierTrackEdit::set_animation_and_track(const Ref<Animation> &p_animation, int p_track, bool p_read_only) {
 	animation = p_animation;
+	read_only = p_read_only;
 	selected_track = p_track;
 	update();
 }
@@ -715,7 +722,7 @@ void AnimationBezierTrackEdit::set_filtered(bool p_filtered) {
 							continue; // Skip track due to not selected.
 						}
 
-						set_animation_and_track(animation, i);
+						set_animation_and_track(animation, i, read_only);
 						break;
 					}
 				}
@@ -819,12 +826,16 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 
 	if (p_event->is_pressed()) {
 		if (ED_GET_SHORTCUT("animation_editor/duplicate_selection")->matches_event(p_event)) {
-			duplicate_selection();
+			if (!read_only) {
+				duplicate_selection();
+			}
 			accept_event();
 		}
 
 		if (ED_GET_SHORTCUT("animation_editor/delete_selection")->matches_event(p_event)) {
-			delete_selection();
+			if (!read_only) {
+				delete_selection();
+			}
 			accept_event();
 		}
 	}
@@ -917,26 +928,28 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 	if (mb.is_valid() && mb->get_button_index() == MouseButton::RIGHT && mb->is_pressed()) {
 		menu_insert_key = mb->get_position();
 		if (menu_insert_key.x >= limit && menu_insert_key.x <= get_size().width) {
-			Vector2 popup_pos = get_screen_position() + mb->get_position();
+			if (!read_only) {
+				Vector2 popup_pos = get_screen_position() + mb->get_position();
 
-			menu->clear();
-			if (!locked_tracks.has(selected_track) || locked_tracks.has(selected_track)) {
-				menu->add_icon_item(bezier_icon, TTR("Insert Key Here"), MENU_KEY_INSERT);
-			}
-			if (selection.size()) {
-				menu->add_separator();
-				menu->add_icon_item(get_theme_icon(SNAME("Duplicate"), SNAME("EditorIcons")), TTR("Duplicate Selected Key(s)"), MENU_KEY_DUPLICATE);
-				menu->add_separator();
-				menu->add_icon_item(get_theme_icon(SNAME("Remove"), SNAME("EditorIcons")), TTR("Delete Selected Key(s)"), MENU_KEY_DELETE);
-				menu->add_separator();
-				menu->add_icon_item(get_theme_icon(SNAME("BezierHandlesFree"), SNAME("EditorIcons")), TTR("Make Handles Free"), MENU_KEY_SET_HANDLE_FREE);
-				menu->add_icon_item(get_theme_icon(SNAME("BezierHandlesBalanced"), SNAME("EditorIcons")), TTR("Make Handles Balanced"), MENU_KEY_SET_HANDLE_BALANCED);
-			}
+				menu->clear();
+				if (!locked_tracks.has(selected_track) || locked_tracks.has(selected_track)) {
+					menu->add_icon_item(bezier_icon, TTR("Insert Key Here"), MENU_KEY_INSERT);
+				}
+				if (selection.size()) {
+					menu->add_separator();
+					menu->add_icon_item(get_theme_icon(SNAME("Duplicate"), SNAME("EditorIcons")), TTR("Duplicate Selected Key(s)"), MENU_KEY_DUPLICATE);
+					menu->add_separator();
+					menu->add_icon_item(get_theme_icon(SNAME("Remove"), SNAME("EditorIcons")), TTR("Delete Selected Key(s)"), MENU_KEY_DELETE);
+					menu->add_separator();
+					menu->add_icon_item(get_theme_icon(SNAME("BezierHandlesFree"), SNAME("EditorIcons")), TTR("Make Handles Free"), MENU_KEY_SET_HANDLE_FREE);
+					menu->add_icon_item(get_theme_icon(SNAME("BezierHandlesBalanced"), SNAME("EditorIcons")), TTR("Make Handles Balanced"), MENU_KEY_SET_HANDLE_BALANCED);
+				}
 
-			if (menu->get_item_count()) {
-				menu->reset_size();
-				menu->set_position(popup_pos);
-				menu->popup();
+				if (menu->get_item_count()) {
+					menu->reset_size();
+					menu->set_position(popup_pos);
+					menu->popup();
+				}
 			}
 		}
 	}
@@ -945,7 +958,7 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 		for (const KeyValue<int, Rect2> &E : subtracks) {
 			if (E.value.has_point(mb->get_position())) {
 				if (!locked_tracks.has(E.key) && !hidden_tracks.has(E.key)) {
-					set_animation_and_track(animation, E.key);
+					set_animation_and_track(animation, E.key, read_only);
 					_clear_selection();
 				}
 				return;
@@ -958,30 +971,32 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 			for (const KeyValue<int, Rect2> &I : track_icons) {
 				if (I.value.has_point(mb->get_position())) {
 					if (I.key == REMOVE_ICON) {
-						undo_redo->create_action("Remove Bezier Track");
-
-						undo_redo->add_do_method(this, "_update_locked_tracks_after", track);
-						undo_redo->add_do_method(this, "_update_hidden_tracks_after", track);
-
-						undo_redo->add_do_method(animation.ptr(), "remove_track", track);
+						if (!read_only) {
+							undo_redo->create_action("Remove Bezier Track");
+
+							undo_redo->add_do_method(this, "_update_locked_tracks_after", track);
+							undo_redo->add_do_method(this, "_update_hidden_tracks_after", track);
+
+							undo_redo->add_do_method(animation.ptr(), "remove_track", track);
+
+							undo_redo->add_undo_method(animation.ptr(), "add_track", Animation::TrackType::TYPE_BEZIER, track);
+							undo_redo->add_undo_method(animation.ptr(), "track_set_path", track, animation->track_get_path(track));
+
+							for (int i = 0; i < animation->track_get_key_count(track); ++i) {
+								undo_redo->add_undo_method(
+										animation.ptr(),
+										"bezier_track_insert_key",
+										track, animation->track_get_key_time(track, i),
+										animation->bezier_track_get_key_value(track, i),
+										animation->bezier_track_get_key_in_handle(track, i),
+										animation->bezier_track_get_key_out_handle(track, i),
+										animation->bezier_track_get_key_handle_mode(track, i));
+							}
 
-						undo_redo->add_undo_method(animation.ptr(), "add_track", Animation::TrackType::TYPE_BEZIER, track);
-						undo_redo->add_undo_method(animation.ptr(), "track_set_path", track, animation->track_get_path(track));
+							undo_redo->commit_action();
 
-						for (int i = 0; i < animation->track_get_key_count(track); ++i) {
-							undo_redo->add_undo_method(
-									animation.ptr(),
-									"bezier_track_insert_key",
-									track, animation->track_get_key_time(track, i),
-									animation->bezier_track_get_key_value(track, i),
-									animation->bezier_track_get_key_in_handle(track, i),
-									animation->bezier_track_get_key_out_handle(track, i),
-									animation->bezier_track_get_key_handle_mode(track, i));
+							selected_track = CLAMP(selected_track, 0, animation->get_track_count() - 1);
 						}
-
-						undo_redo->commit_action();
-
-						selected_track = CLAMP(selected_track, 0, animation->get_track_count() - 1);
 						return;
 					} else if (I.key == LOCK_ICON) {
 						if (locked_tracks.has(track)) {
@@ -991,7 +1006,7 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 							if (selected_track == track) {
 								for (int i = 0; i < animation->get_track_count(); ++i) {
 									if (!locked_tracks.has(i) && animation->track_get_type(i) == Animation::TrackType::TYPE_BEZIER) {
-										set_animation_and_track(animation, i);
+										set_animation_and_track(animation, i, read_only);
 										break;
 									}
 								}
@@ -1007,7 +1022,7 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 							if (selected_track == track) {
 								for (int i = 0; i < animation->get_track_count(); ++i) {
 									if (!hidden_tracks.has(i) && animation->track_get_type(i) == Animation::TrackType::TYPE_BEZIER) {
-										set_animation_and_track(animation, i);
+										set_animation_and_track(animation, i, read_only);
 										break;
 									}
 								}
@@ -1046,7 +1061,7 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 								}
 							}
 
-							set_animation_and_track(animation, track);
+							set_animation_and_track(animation, track, read_only);
 							solo_track = track;
 						}
 						update();
@@ -1087,7 +1102,7 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 						moving_selection_from_key = pair.second;
 						moving_selection_from_track = pair.first;
 						moving_selection_offset = Vector2();
-						set_animation_and_track(animation, pair.first);
+						set_animation_and_track(animation, pair.first, read_only);
 						selection.clear();
 						selection.insert(pair);
 						update();
@@ -1096,24 +1111,26 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 				}
 			}
 
-			if (edit_points[i].in_rect.has_point(mb->get_position())) {
-				moving_handle = -1;
-				moving_handle_key = edit_points[i].key;
-				moving_handle_track = edit_points[i].track;
-				moving_handle_left = animation->bezier_track_get_key_in_handle(edit_points[i].track, edit_points[i].key);
-				moving_handle_right = animation->bezier_track_get_key_out_handle(edit_points[i].track, edit_points[i].key);
-				update();
-				return;
-			}
+			if (!read_only) {
+				if (edit_points[i].in_rect.has_point(mb->get_position())) {
+					moving_handle = -1;
+					moving_handle_key = edit_points[i].key;
+					moving_handle_track = edit_points[i].track;
+					moving_handle_left = animation->bezier_track_get_key_in_handle(edit_points[i].track, edit_points[i].key);
+					moving_handle_right = animation->bezier_track_get_key_out_handle(edit_points[i].track, edit_points[i].key);
+					update();
+					return;
+				}
 
-			if (edit_points[i].out_rect.has_point(mb->get_position())) {
-				moving_handle = 1;
-				moving_handle_key = edit_points[i].key;
-				moving_handle_track = edit_points[i].track;
-				moving_handle_left = animation->bezier_track_get_key_in_handle(edit_points[i].track, edit_points[i].key);
-				moving_handle_right = animation->bezier_track_get_key_out_handle(edit_points[i].track, edit_points[i].key);
-				update();
-				return;
+				if (edit_points[i].out_rect.has_point(mb->get_position())) {
+					moving_handle = 1;
+					moving_handle_key = edit_points[i].key;
+					moving_handle_track = edit_points[i].track;
+					moving_handle_left = animation->bezier_track_get_key_in_handle(edit_points[i].track, edit_points[i].key);
+					moving_handle_right = animation->bezier_track_get_key_out_handle(edit_points[i].track, edit_points[i].key);
+					update();
+					return;
+				}
 			}
 		}
 
@@ -1191,7 +1208,7 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 					selection.insert(IntPair(edit_points[i].track, edit_points[i].key));
 					if (!track_set) {
 						track_set = true;
-						set_animation_and_track(animation, edit_points[i].track);
+						set_animation_and_track(animation, edit_points[i].track, read_only);
 					}
 				}
 			}
@@ -1215,7 +1232,7 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 				float track_height = _bezier_h_to_pixel(track_h);
 
 				if (abs(mb->get_position().y - track_height) < 10) {
-					set_animation_and_track(animation, i);
+					set_animation_and_track(animation, i, read_only);
 					break;
 				}
 			}
@@ -1229,102 +1246,106 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 	}
 
 	if (moving_handle != 0 && mb.is_valid() && !mb->is_pressed() && mb->get_button_index() == MouseButton::LEFT) {
-		undo_redo->create_action(TTR("Move Bezier Points"));
-		undo_redo->add_do_method(animation.ptr(), "bezier_track_set_key_in_handle", selected_track, moving_handle_key, moving_handle_left);
-		undo_redo->add_do_method(animation.ptr(), "bezier_track_set_key_out_handle", selected_track, moving_handle_key, moving_handle_right);
-		undo_redo->add_undo_method(animation.ptr(), "bezier_track_set_key_in_handle", selected_track, moving_handle_key, animation->bezier_track_get_key_in_handle(selected_track, moving_handle_key));
-		undo_redo->add_undo_method(animation.ptr(), "bezier_track_set_key_out_handle", selected_track, moving_handle_key, animation->bezier_track_get_key_out_handle(selected_track, moving_handle_key));
-		undo_redo->commit_action();
+		if (!read_only) {
+			undo_redo->create_action(TTR("Move Bezier Points"));
+			undo_redo->add_do_method(animation.ptr(), "bezier_track_set_key_in_handle", selected_track, moving_handle_key, moving_handle_left);
+			undo_redo->add_do_method(animation.ptr(), "bezier_track_set_key_out_handle", selected_track, moving_handle_key, moving_handle_right);
+			undo_redo->add_undo_method(animation.ptr(), "bezier_track_set_key_in_handle", selected_track, moving_handle_key, animation->bezier_track_get_key_in_handle(selected_track, moving_handle_key));
+			undo_redo->add_undo_method(animation.ptr(), "bezier_track_set_key_out_handle", selected_track, moving_handle_key, animation->bezier_track_get_key_out_handle(selected_track, moving_handle_key));
+			undo_redo->commit_action();
 
-		moving_handle = 0;
-		update();
+			moving_handle = 0;
+			update();
+		}
 	}
 
 	if (moving_selection_attempt && mb.is_valid() && !mb->is_pressed() && mb->get_button_index() == MouseButton::LEFT) {
-		if (moving_selection) {
-			//combit it
+		if (!read_only) {
+			if (moving_selection) {
+				//combit it
 
-			undo_redo->create_action(TTR("Move Bezier Points"));
-
-			List<AnimMoveRestore> to_restore;
-			// 1-remove the keys
-			for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) {
-				undo_redo->add_do_method(animation.ptr(), "track_remove_key", E->get().first, E->get().second);
-			}
-			// 2- remove overlapped keys
-			for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) {
-				float newtime = editor->snap_time(animation->track_get_key_time(E->get().first, E->get().second) + moving_selection_offset.x);
+				undo_redo->create_action(TTR("Move Bezier Points"));
 
-				int idx = animation->track_find_key(E->get().first, newtime, true);
-				if (idx == -1) {
-					continue;
+				List<AnimMoveRestore> to_restore;
+				// 1-remove the keys
+				for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) {
+					undo_redo->add_do_method(animation.ptr(), "track_remove_key", E->get().first, E->get().second);
 				}
+				// 2- remove overlapped keys
+				for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) {
+					float newtime = editor->snap_time(animation->track_get_key_time(E->get().first, E->get().second) + moving_selection_offset.x);
 
-				if (selection.has(IntPair(E->get().first, idx))) {
-					continue; //already in selection, don't save
-				}
+					int idx = animation->track_find_key(E->get().first, newtime, true);
+					if (idx == -1) {
+						continue;
+					}
 
-				undo_redo->add_do_method(animation.ptr(), "track_remove_key_at_time", E->get().first, newtime);
-				AnimMoveRestore amr;
+					if (selection.has(IntPair(E->get().first, idx))) {
+						continue; //already in selection, don't save
+					}
 
-				amr.key = animation->track_get_key_value(E->get().first, idx);
-				amr.track = E->get().first;
-				amr.time = newtime;
+					undo_redo->add_do_method(animation.ptr(), "track_remove_key_at_time", E->get().first, newtime);
+					AnimMoveRestore amr;
 
-				to_restore.push_back(amr);
-			}
+					amr.key = animation->track_get_key_value(E->get().first, idx);
+					amr.track = E->get().first;
+					amr.time = newtime;
 
-			// 3-move the keys (re insert them)
-			for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) {
-				float newpos = editor->snap_time(animation->track_get_key_time(E->get().first, E->get().second) + moving_selection_offset.x);
-				Array key = animation->track_get_key_value(E->get().first, E->get().second);
-				float h = key[0];
-				h += moving_selection_offset.y;
-				key[0] = h;
-				undo_redo->add_do_method(animation.ptr(), "track_insert_key", E->get().first, newpos, key, 1);
-			}
+					to_restore.push_back(amr);
+				}
 
-			// 4-(undo) remove inserted keys
-			for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) {
-				float newpos = editor->snap_time(animation->track_get_key_time(E->get().first, E->get().second) + moving_selection_offset.x);
-				undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_time", E->get().first, newpos);
-			}
+				// 3-move the keys (re insert them)
+				for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) {
+					float newpos = editor->snap_time(animation->track_get_key_time(E->get().first, E->get().second) + moving_selection_offset.x);
+					Array key = animation->track_get_key_value(E->get().first, E->get().second);
+					float h = key[0];
+					h += moving_selection_offset.y;
+					key[0] = h;
+					undo_redo->add_do_method(animation.ptr(), "track_insert_key", E->get().first, newpos, key, 1);
+				}
 
-			// 5-(undo) reinsert keys
-			for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) {
-				float oldpos = animation->track_get_key_time(E->get().first, E->get().second);
-				undo_redo->add_undo_method(animation.ptr(), "track_insert_key", E->get().first, oldpos, animation->track_get_key_value(E->get().first, E->get().second), 1);
-			}
+				// 4-(undo) remove inserted keys
+				for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) {
+					float newpos = editor->snap_time(animation->track_get_key_time(E->get().first, E->get().second) + moving_selection_offset.x);
+					undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_time", E->get().first, newpos);
+				}
 
-			// 6-(undo) reinsert overlapped keys
-			for (const AnimMoveRestore &amr : to_restore) {
-				undo_redo->add_undo_method(animation.ptr(), "track_insert_key", amr.track, amr.time, amr.key, 1);
-			}
+				// 5-(undo) reinsert keys
+				for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) {
+					float oldpos = animation->track_get_key_time(E->get().first, E->get().second);
+					undo_redo->add_undo_method(animation.ptr(), "track_insert_key", E->get().first, oldpos, animation->track_get_key_value(E->get().first, E->get().second), 1);
+				}
 
-			undo_redo->add_do_method(this, "_clear_selection_for_anim", animation);
-			undo_redo->add_undo_method(this, "_clear_selection_for_anim", animation);
+				// 6-(undo) reinsert overlapped keys
+				for (const AnimMoveRestore &amr : to_restore) {
+					undo_redo->add_undo_method(animation.ptr(), "track_insert_key", amr.track, amr.time, amr.key, 1);
+				}
 
-			// 7-reselect
+				undo_redo->add_do_method(this, "_clear_selection_for_anim", animation);
+				undo_redo->add_undo_method(this, "_clear_selection_for_anim", animation);
 
-			for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) {
-				float oldpos = animation->track_get_key_time(E->get().first, E->get().second);
-				float newpos = editor->snap_time(oldpos + moving_selection_offset.x);
+				// 7-reselect
 
-				undo_redo->add_do_method(this, "_select_at_anim", animation, E->get().first, newpos);
-				undo_redo->add_undo_method(this, "_select_at_anim", animation, E->get().first, oldpos);
-			}
+				for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) {
+					float oldpos = animation->track_get_key_time(E->get().first, E->get().second);
+					float newpos = editor->snap_time(oldpos + moving_selection_offset.x);
 
-			undo_redo->commit_action();
+					undo_redo->add_do_method(this, "_select_at_anim", animation, E->get().first, newpos);
+					undo_redo->add_undo_method(this, "_select_at_anim", animation, E->get().first, oldpos);
+				}
 
-			moving_selection = false;
-		} else if (select_single_attempt != IntPair(-1, -1)) {
-			selection.clear();
-			selection.insert(select_single_attempt);
-			set_animation_and_track(animation, select_single_attempt.first);
-		}
+				undo_redo->commit_action();
 
-		moving_selection_attempt = false;
-		update();
+				moving_selection = false;
+			} else if (select_single_attempt != IntPair(-1, -1)) {
+				selection.clear();
+				selection.insert(select_single_attempt);
+				set_animation_and_track(animation, select_single_attempt.first, read_only);
+			}
+
+			moving_selection_attempt = false;
+			update();
+		}
 	}
 
 	Ref<InputEventMouseMotion> mm = p_event;
@@ -1337,7 +1358,9 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 		float y = (get_size().height / 2 - mm->get_position().y) * v_zoom + v_scroll;
 		float x = editor->snap_time(((mm->get_position().x - limit) / timeline->get_zoom_scale()) + timeline->get_value());
 
-		moving_selection_offset = Vector2(x - animation->track_get_key_time(moving_selection_from_track, moving_selection_from_key), y - animation->bezier_track_get_key_value(moving_selection_from_track, moving_selection_from_key));
+		if (!read_only) {
+			moving_selection_offset = Vector2(x - animation->track_get_key_time(moving_selection_from_track, moving_selection_from_key), y - animation->bezier_track_get_key_value(moving_selection_from_track, moving_selection_from_key));
+		}
 		update();
 	}
 
@@ -1399,20 +1422,22 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 
 	bool is_finishing_key_handle_drag = moving_handle != 0 && mb.is_valid() && !mb->is_pressed() && mb->get_button_index() == MouseButton::LEFT;
 	if (is_finishing_key_handle_drag) {
-		undo_redo->create_action(TTR("Move Bezier Points"));
-		if (moving_handle == -1) {
-			double ratio = timeline->get_zoom_scale() * v_zoom;
-			undo_redo->add_do_method(animation.ptr(), "bezier_track_set_key_in_handle", moving_handle_track, moving_handle_key, moving_handle_left, ratio);
-			undo_redo->add_undo_method(animation.ptr(), "bezier_track_set_key_in_handle", moving_handle_track, moving_handle_key, animation->bezier_track_get_key_in_handle(moving_handle_track, moving_handle_key), ratio);
-		} else if (moving_handle == 1) {
-			double ratio = timeline->get_zoom_scale() * v_zoom;
-			undo_redo->add_do_method(animation.ptr(), "bezier_track_set_key_out_handle", moving_handle_track, moving_handle_key, moving_handle_right, ratio);
-			undo_redo->add_undo_method(animation.ptr(), "bezier_track_set_key_out_handle", moving_handle_track, moving_handle_key, animation->bezier_track_get_key_out_handle(moving_handle_track, moving_handle_key), ratio);
-		}
-		undo_redo->commit_action();
+		if (!read_only) {
+			undo_redo->create_action(TTR("Move Bezier Points"));
+			if (moving_handle == -1) {
+				double ratio = timeline->get_zoom_scale() * v_zoom;
+				undo_redo->add_do_method(animation.ptr(), "bezier_track_set_key_in_handle", moving_handle_track, moving_handle_key, moving_handle_left, ratio);
+				undo_redo->add_undo_method(animation.ptr(), "bezier_track_set_key_in_handle", moving_handle_track, moving_handle_key, animation->bezier_track_get_key_in_handle(moving_handle_track, moving_handle_key), ratio);
+			} else if (moving_handle == 1) {
+				double ratio = timeline->get_zoom_scale() * v_zoom;
+				undo_redo->add_do_method(animation.ptr(), "bezier_track_set_key_out_handle", moving_handle_track, moving_handle_key, moving_handle_right, ratio);
+				undo_redo->add_undo_method(animation.ptr(), "bezier_track_set_key_out_handle", moving_handle_track, moving_handle_key, animation->bezier_track_get_key_out_handle(moving_handle_track, moving_handle_key), ratio);
+			}
+			undo_redo->commit_action();
 
-		moving_handle = 0;
-		update();
+			moving_handle = 0;
+			update();
+		}
 	}
 }
 
diff --git a/editor/animation_bezier_editor.h b/editor/animation_bezier_editor.h
index 22b58a6703..070a6589ad 100644
--- a/editor/animation_bezier_editor.h
+++ b/editor/animation_bezier_editor.h
@@ -54,6 +54,7 @@ class AnimationBezierTrackEdit : public Control {
 	float play_position_pos = 0;
 
 	Ref<Animation> animation;
+	bool read_only = false;
 	int selected_track = 0;
 
 	Vector<Rect2> view_rects;
@@ -176,7 +177,7 @@ public:
 
 	Ref<Animation> get_animation() const;
 
-	void set_animation_and_track(const Ref<Animation> &p_animation, int p_track);
+	void set_animation_and_track(const Ref<Animation> &p_animation, int p_track, bool p_read_only);
 	virtual Size2 get_minimum_size() const override;
 
 	void set_undo_redo(UndoRedo *p_undo_redo);
diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp
index 83047caf98..0db82551cb 100644
--- a/editor/animation_track_editor.cpp
+++ b/editor/animation_track_editor.cpp
@@ -48,6 +48,7 @@ class AnimationTrackKeyEdit : public Object {
 
 public:
 	bool setting = false;
+	bool animation_read_only = false;
 
 	bool _hide_script_from_inspector() {
 		return true;
@@ -57,12 +58,17 @@ public:
 		return true;
 	}
 
+	bool _read_only() {
+		return animation_read_only;
+	}
+
 	static void _bind_methods() {
 		ClassDB::bind_method("_update_obj", &AnimationTrackKeyEdit::_update_obj);
 		ClassDB::bind_method("_key_ofs_changed", &AnimationTrackKeyEdit::_key_ofs_changed);
 		ClassDB::bind_method("_hide_script_from_inspector", &AnimationTrackKeyEdit::_hide_script_from_inspector);
 		ClassDB::bind_method("get_root_path", &AnimationTrackKeyEdit::get_root_path);
 		ClassDB::bind_method("_dont_undo_redo", &AnimationTrackKeyEdit::_dont_undo_redo);
+		ClassDB::bind_method("_read_only", &AnimationTrackKeyEdit::_read_only);
 	}
 
 	void _fix_node_path(Variant &value) {
@@ -703,6 +709,7 @@ class AnimationMultiTrackKeyEdit : public Object {
 
 public:
 	bool setting = false;
+	bool animation_read_only = false;
 
 	bool _hide_script_from_inspector() {
 		return true;
@@ -712,12 +719,17 @@ public:
 		return true;
 	}
 
+	bool _read_only() {
+		return animation_read_only;
+	}
+
 	static void _bind_methods() {
 		ClassDB::bind_method("_update_obj", &AnimationMultiTrackKeyEdit::_update_obj);
 		ClassDB::bind_method("_key_ofs_changed", &AnimationMultiTrackKeyEdit::_key_ofs_changed);
 		ClassDB::bind_method("_hide_script_from_inspector", &AnimationMultiTrackKeyEdit::_hide_script_from_inspector);
 		ClassDB::bind_method("get_root_path", &AnimationMultiTrackKeyEdit::get_root_path);
 		ClassDB::bind_method("_dont_undo_redo", &AnimationMultiTrackKeyEdit::_dont_undo_redo);
+		ClassDB::bind_method("_read_only", &AnimationMultiTrackKeyEdit::_read_only);
 	}
 
 	void _fix_node_path(Variant &value, NodePath &base) {
@@ -1416,22 +1428,32 @@ void AnimationTimelineEdit::_anim_length_changed(double p_new_len) {
 }
 
 void AnimationTimelineEdit::_anim_loop_pressed() {
-	undo_redo->create_action(TTR("Change Animation Loop"));
-	switch (animation->get_loop_mode()) {
-		case Animation::LOOP_NONE: {
-			undo_redo->add_do_method(animation.ptr(), "set_loop_mode", Animation::LOOP_LINEAR);
-		} break;
-		case Animation::LOOP_LINEAR: {
-			undo_redo->add_do_method(animation.ptr(), "set_loop_mode", Animation::LOOP_PINGPONG);
-		} break;
-		case Animation::LOOP_PINGPONG: {
-			undo_redo->add_do_method(animation.ptr(), "set_loop_mode", Animation::LOOP_NONE);
-		} break;
-		default:
-			break;
+	if (!read_only) {
+		undo_redo->create_action(TTR("Change Animation Loop"));
+		switch (animation->get_loop_mode()) {
+			case Animation::LOOP_NONE: {
+				undo_redo->add_do_method(animation.ptr(), "set_loop_mode", Animation::LOOP_LINEAR);
+			} break;
+			case Animation::LOOP_LINEAR: {
+				undo_redo->add_do_method(animation.ptr(), "set_loop_mode", Animation::LOOP_PINGPONG);
+			} break;
+			case Animation::LOOP_PINGPONG: {
+				undo_redo->add_do_method(animation.ptr(), "set_loop_mode", Animation::LOOP_NONE);
+			} break;
+			default:
+				break;
+		}
+		undo_redo->add_undo_method(animation.ptr(), "set_loop_mode", animation->get_loop_mode());
+		undo_redo->commit_action();
+	} else {
+		String base_path = animation->get_path();
+		if (FileAccess::exists(base_path + ".import")) {
+			EditorNode::get_singleton()->show_warning(TTR("Can't change loop mode on animation instanced from imported scene."));
+		} else {
+			EditorNode::get_singleton()->show_warning(TTR("Can't change loop mode on animation embedded in another scene."));
+		}
+		update_values();
 	}
-	undo_redo->add_undo_method(animation.ptr(), "set_loop_mode", animation->get_loop_mode());
-	undo_redo->commit_action();
 }
 
 int AnimationTimelineEdit::get_buttons_width() const {
@@ -1656,11 +1678,17 @@ void AnimationTimelineEdit::_notification(int p_what) {
 	}
 }
 
-void AnimationTimelineEdit::set_animation(const Ref<Animation> &p_animation) {
+void AnimationTimelineEdit::set_animation(const Ref<Animation> &p_animation, bool p_read_only) {
 	animation = p_animation;
+	read_only = p_read_only;
+
 	if (animation.is_valid()) {
 		len_hb->show();
-		add_track->show();
+		if (read_only) {
+			add_track->hide();
+		} else {
+			add_track->show();
+		}
 		play_position->show();
 	} else {
 		len_hb->hide();
@@ -1982,6 +2010,8 @@ void AnimationTrackEdit::_notification(int p_what) {
 			Color linecolor = color;
 			linecolor.a = 0.2;
 
+			Color dc = get_theme_color(SNAME("disabled_font_color"), SNAME("Editor"));
+
 			// NAMES AND ICONS //
 
 			{
@@ -2131,14 +2161,18 @@ void AnimationTrackEdit::_notification(int p_what) {
 					ofs += update_icon->get_width() + hsep / 2;
 					update_mode_rect.size.x += hsep / 2;
 
-					if (animation->track_get_type(track) == Animation::TYPE_VALUE) {
-						draw_texture(down_icon, Vector2(ofs, int(get_size().height - down_icon->get_height()) / 2));
-						update_mode_rect.size.x += down_icon->get_width();
-					} else if (animation->track_get_type(track) == Animation::TYPE_BEZIER) {
-						Ref<Texture2D> bezier_icon = get_theme_icon(SNAME("EditBezier"), SNAME("EditorIcons"));
-						update_mode_rect.size.x += down_icon->get_width();
+					if (!read_only) {
+						if (animation->track_get_type(track) == Animation::TYPE_VALUE) {
+							draw_texture(down_icon, Vector2(ofs, int(get_size().height - down_icon->get_height()) / 2));
+							update_mode_rect.size.x += down_icon->get_width();
+						} else if (animation->track_get_type(track) == Animation::TYPE_BEZIER) {
+							Ref<Texture2D> bezier_icon = get_theme_icon(SNAME("EditBezier"), SNAME("EditorIcons"));
+							update_mode_rect.size.x += down_icon->get_width();
 
-						update_mode_rect = Rect2();
+							update_mode_rect = Rect2();
+						} else {
+							update_mode_rect = Rect2();
+						}
 					} else {
 						update_mode_rect = Rect2();
 					}
@@ -2169,7 +2203,7 @@ void AnimationTrackEdit::_notification(int p_what) {
 					ofs += icon->get_width() + hsep / 2;
 					interp_mode_rect.size.x += hsep / 2;
 
-					if (!animation->track_is_compressed(track) && (animation->track_get_type(track) == Animation::TYPE_VALUE || animation->track_get_type(track) == Animation::TYPE_BLEND_SHAPE || animation->track_get_type(track) == Animation::TYPE_POSITION_3D || animation->track_get_type(track) == Animation::TYPE_SCALE_3D || animation->track_get_type(track) == Animation::TYPE_ROTATION_3D)) {
+					if (!read_only && !animation->track_is_compressed(track) && (animation->track_get_type(track) == Animation::TYPE_VALUE || animation->track_get_type(track) == Animation::TYPE_BLEND_SHAPE || animation->track_get_type(track) == Animation::TYPE_POSITION_3D || animation->track_get_type(track) == Animation::TYPE_SCALE_3D || animation->track_get_type(track) == Animation::TYPE_ROTATION_3D)) {
 						draw_texture(down_icon, Vector2(ofs, int(get_size().height - down_icon->get_height()) / 2));
 						interp_mode_rect.size.x += down_icon->get_width();
 					} else {
@@ -2202,7 +2236,7 @@ void AnimationTrackEdit::_notification(int p_what) {
 					ofs += icon->get_width() + hsep / 2;
 					loop_wrap_rect.size.x += hsep / 2;
 
-					if (!animation->track_is_compressed(track) && (animation->track_get_type(track) == Animation::TYPE_VALUE || animation->track_get_type(track) == Animation::TYPE_BLEND_SHAPE || animation->track_get_type(track) == Animation::TYPE_POSITION_3D || animation->track_get_type(track) == Animation::TYPE_SCALE_3D || animation->track_get_type(track) == Animation::TYPE_ROTATION_3D)) {
+					if (!read_only && !animation->track_is_compressed(track) && (animation->track_get_type(track) == Animation::TYPE_VALUE || animation->track_get_type(track) == Animation::TYPE_BLEND_SHAPE || animation->track_get_type(track) == Animation::TYPE_POSITION_3D || animation->track_get_type(track) == Animation::TYPE_SCALE_3D || animation->track_get_type(track) == Animation::TYPE_ROTATION_3D)) {
 						draw_texture(down_icon, Vector2(ofs, int(get_size().height - down_icon->get_height()) / 2));
 						loop_wrap_rect.size.x += down_icon->get_width();
 					} else {
@@ -2223,7 +2257,11 @@ void AnimationTrackEdit::_notification(int p_what) {
 					remove_rect.position.y = int(get_size().height - icon->get_height()) / 2;
 					remove_rect.size = icon->get_size();
 
-					draw_texture(icon, remove_rect.position);
+					if (read_only) {
+						draw_texture(icon, remove_rect.position, dc);
+					} else {
+						draw_texture(icon, remove_rect.position);
+					}
 				}
 			}
 
@@ -2439,8 +2477,10 @@ Ref<Animation> AnimationTrackEdit::get_animation() const {
 	return animation;
 }
 
-void AnimationTrackEdit::set_animation_and_track(const Ref<Animation> &p_animation, int p_track) {
+void AnimationTrackEdit::set_animation_and_track(const Ref<Animation> &p_animation, int p_track, bool p_read_only) {
 	animation = p_animation;
+	read_only = p_read_only;
+
 	track = p_track;
 	update();
 
@@ -2721,17 +2761,23 @@ void AnimationTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 
 	if (p_event->is_pressed()) {
 		if (ED_GET_SHORTCUT("animation_editor/duplicate_selection")->matches_event(p_event)) {
-			emit_signal(SNAME("duplicate_request"));
+			if (!read_only) {
+				emit_signal(SNAME("duplicate_request"));
+			}
 			accept_event();
 		}
 
 		if (ED_GET_SHORTCUT("animation_editor/duplicate_selection_transposed")->matches_event(p_event)) {
-			emit_signal(SNAME("duplicate_transpose_request"));
+			if (!read_only) {
+				emit_signal(SNAME("duplicate_transpose_request"));
+			}
 			accept_event();
 		}
 
 		if (ED_GET_SHORTCUT("animation_editor/delete_selection")->matches_event(p_event)) {
-			emit_signal(SNAME("delete_request"));
+			if (!read_only) {
+				emit_signal(SNAME("delete_request"));
+			}
 			accept_event();
 		}
 	}
@@ -2740,79 +2786,81 @@ void AnimationTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 	if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == MouseButton::LEFT) {
 		Point2 pos = mb->get_position();
 
-		if (check_rect.has_point(pos)) {
-			undo_redo->create_action(TTR("Toggle Track Enabled"));
-			undo_redo->add_do_method(animation.ptr(), "track_set_enabled", track, !animation->track_is_enabled(track));
-			undo_redo->add_undo_method(animation.ptr(), "track_set_enabled", track, animation->track_is_enabled(track));
-			undo_redo->commit_action();
-			update();
-			accept_event();
-		}
+		if (!read_only) {
+			if (check_rect.has_point(pos)) {
+				undo_redo->create_action(TTR("Toggle Track Enabled"));
+				undo_redo->add_do_method(animation.ptr(), "track_set_enabled", track, !animation->track_is_enabled(track));
+				undo_redo->add_undo_method(animation.ptr(), "track_set_enabled", track, animation->track_is_enabled(track));
+				undo_redo->commit_action();
+				update();
+				accept_event();
+			}
 
-		// Don't overlap track keys if they start at 0.
-		if (path_rect.has_point(pos + Size2(type_icon->get_width(), 0))) {
-			clicking_on_name = true;
-			accept_event();
-		}
+			// Don't overlap track keys if they start at 0.
+			if (path_rect.has_point(pos + Size2(type_icon->get_width(), 0))) {
+				clicking_on_name = true;
+				accept_event();
+			}
 
-		if (update_mode_rect.has_point(pos)) {
-			if (!menu) {
-				menu = memnew(PopupMenu);
-				add_child(menu);
-				menu->connect("id_pressed", callable_mp(this, &AnimationTrackEdit::_menu_selected));
+			if (update_mode_rect.has_point(pos)) {
+				if (!menu) {
+					menu = memnew(PopupMenu);
+					add_child(menu);
+					menu->connect("id_pressed", callable_mp(this, &AnimationTrackEdit::_menu_selected));
+				}
+				menu->clear();
+				menu->add_icon_item(get_theme_icon(SNAME("TrackContinuous"), SNAME("EditorIcons")), TTR("Continuous"), MENU_CALL_MODE_CONTINUOUS);
+				menu->add_icon_item(get_theme_icon(SNAME("TrackDiscrete"), SNAME("EditorIcons")), TTR("Discrete"), MENU_CALL_MODE_DISCRETE);
+				menu->add_icon_item(get_theme_icon(SNAME("TrackTrigger"), SNAME("EditorIcons")), TTR("Trigger"), MENU_CALL_MODE_TRIGGER);
+				menu->add_icon_item(get_theme_icon(SNAME("TrackCapture"), SNAME("EditorIcons")), TTR("Capture"), MENU_CALL_MODE_CAPTURE);
+				menu->reset_size();
+
+				Vector2 popup_pos = get_screen_position() + update_mode_rect.position + Vector2(0, update_mode_rect.size.height);
+				menu->set_position(popup_pos);
+				menu->popup();
+				accept_event();
 			}
-			menu->clear();
-			menu->add_icon_item(get_theme_icon(SNAME("TrackContinuous"), SNAME("EditorIcons")), TTR("Continuous"), MENU_CALL_MODE_CONTINUOUS);
-			menu->add_icon_item(get_theme_icon(SNAME("TrackDiscrete"), SNAME("EditorIcons")), TTR("Discrete"), MENU_CALL_MODE_DISCRETE);
-			menu->add_icon_item(get_theme_icon(SNAME("TrackTrigger"), SNAME("EditorIcons")), TTR("Trigger"), MENU_CALL_MODE_TRIGGER);
-			menu->add_icon_item(get_theme_icon(SNAME("TrackCapture"), SNAME("EditorIcons")), TTR("Capture"), MENU_CALL_MODE_CAPTURE);
-			menu->reset_size();
-
-			Vector2 popup_pos = get_screen_position() + update_mode_rect.position + Vector2(0, update_mode_rect.size.height);
-			menu->set_position(popup_pos);
-			menu->popup();
-			accept_event();
-		}
 
-		if (interp_mode_rect.has_point(pos)) {
-			if (!menu) {
-				menu = memnew(PopupMenu);
-				add_child(menu);
-				menu->connect("id_pressed", callable_mp(this, &AnimationTrackEdit::_menu_selected));
+			if (interp_mode_rect.has_point(pos)) {
+				if (!menu) {
+					menu = memnew(PopupMenu);
+					add_child(menu);
+					menu->connect("id_pressed", callable_mp(this, &AnimationTrackEdit::_menu_selected));
+				}
+				menu->clear();
+				menu->add_icon_item(get_theme_icon(SNAME("InterpRaw"), SNAME("EditorIcons")), TTR("Nearest"), MENU_INTERPOLATION_NEAREST);
+				menu->add_icon_item(get_theme_icon(SNAME("InterpLinear"), SNAME("EditorIcons")), TTR("Linear"), MENU_INTERPOLATION_LINEAR);
+				menu->add_icon_item(get_theme_icon(SNAME("InterpCubic"), SNAME("EditorIcons")), TTR("Cubic"), MENU_INTERPOLATION_CUBIC);
+				menu->reset_size();
+
+				Vector2 popup_pos = get_screen_position() + interp_mode_rect.position + Vector2(0, interp_mode_rect.size.height);
+				menu->set_position(popup_pos);
+				menu->popup();
+				accept_event();
 			}
-			menu->clear();
-			menu->add_icon_item(get_theme_icon(SNAME("InterpRaw"), SNAME("EditorIcons")), TTR("Nearest"), MENU_INTERPOLATION_NEAREST);
-			menu->add_icon_item(get_theme_icon(SNAME("InterpLinear"), SNAME("EditorIcons")), TTR("Linear"), MENU_INTERPOLATION_LINEAR);
-			menu->add_icon_item(get_theme_icon(SNAME("InterpCubic"), SNAME("EditorIcons")), TTR("Cubic"), MENU_INTERPOLATION_CUBIC);
-			menu->reset_size();
-
-			Vector2 popup_pos = get_screen_position() + interp_mode_rect.position + Vector2(0, interp_mode_rect.size.height);
-			menu->set_position(popup_pos);
-			menu->popup();
-			accept_event();
-		}
 
-		if (loop_wrap_rect.has_point(pos)) {
-			if (!menu) {
-				menu = memnew(PopupMenu);
-				add_child(menu);
-				menu->connect("id_pressed", callable_mp(this, &AnimationTrackEdit::_menu_selected));
+			if (loop_wrap_rect.has_point(pos)) {
+				if (!menu) {
+					menu = memnew(PopupMenu);
+					add_child(menu);
+					menu->connect("id_pressed", callable_mp(this, &AnimationTrackEdit::_menu_selected));
+				}
+				menu->clear();
+				menu->add_icon_item(get_theme_icon(SNAME("InterpWrapClamp"), SNAME("EditorIcons")), TTR("Clamp Loop Interp"), MENU_LOOP_CLAMP);
+				menu->add_icon_item(get_theme_icon(SNAME("InterpWrapLoop"), SNAME("EditorIcons")), TTR("Wrap Loop Interp"), MENU_LOOP_WRAP);
+				menu->reset_size();
+
+				Vector2 popup_pos = get_screen_position() + loop_wrap_rect.position + Vector2(0, loop_wrap_rect.size.height);
+				menu->set_position(popup_pos);
+				menu->popup();
+				accept_event();
 			}
-			menu->clear();
-			menu->add_icon_item(get_theme_icon(SNAME("InterpWrapClamp"), SNAME("EditorIcons")), TTR("Clamp Loop Interp"), MENU_LOOP_CLAMP);
-			menu->add_icon_item(get_theme_icon(SNAME("InterpWrapLoop"), SNAME("EditorIcons")), TTR("Wrap Loop Interp"), MENU_LOOP_WRAP);
-			menu->reset_size();
-
-			Vector2 popup_pos = get_screen_position() + loop_wrap_rect.position + Vector2(0, loop_wrap_rect.size.height);
-			menu->set_position(popup_pos);
-			menu->popup();
-			accept_event();
-		}
 
-		if (remove_rect.has_point(pos)) {
-			emit_signal(SNAME("remove_request"), track);
-			accept_event();
-			return;
+			if (remove_rect.has_point(pos)) {
+				emit_signal(SNAME("remove_request"), track);
+				accept_event();
+				return;
+			}
 		}
 
 		// Check keyframes.
@@ -2872,6 +2920,11 @@ void AnimationTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 						moving_selection_attempt = true;
 						moving_selection_from_ofs = (mb->get_position().x - limit) / timeline->get_zoom_scale();
 					}
+
+					if (read_only) {
+						moving_selection_attempt = false;
+						moving_selection_from_ofs = 0.0f;
+					}
 					accept_event();
 				}
 			}
@@ -2883,33 +2936,35 @@ void AnimationTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 		if (pos.x >= timeline->get_name_limit() && pos.x <= get_size().width - timeline->get_buttons_width()) {
 			// Can do something with menu too! show insert key.
 			float offset = (pos.x - timeline->get_name_limit()) / timeline->get_zoom_scale();
-			if (!menu) {
-				menu = memnew(PopupMenu);
-				add_child(menu);
-				menu->connect("id_pressed", callable_mp(this, &AnimationTrackEdit::_menu_selected));
-			}
+			if (!read_only) {
+				if (!menu) {
+					menu = memnew(PopupMenu);
+					add_child(menu);
+					menu->connect("id_pressed", callable_mp(this, &AnimationTrackEdit::_menu_selected));
+				}
 
-			menu->clear();
-			menu->add_icon_item(get_theme_icon(SNAME("Key"), SNAME("EditorIcons")), TTR("Insert Key"), MENU_KEY_INSERT);
-			if (editor->is_selection_active()) {
-				menu->add_separator();
-				menu->add_icon_item(get_theme_icon(SNAME("Duplicate"), SNAME("EditorIcons")), TTR("Duplicate Key(s)"), MENU_KEY_DUPLICATE);
+				menu->clear();
+				menu->add_icon_item(get_theme_icon(SNAME("Key"), SNAME("EditorIcons")), TTR("Insert Key"), MENU_KEY_INSERT);
+				if (editor->is_selection_active()) {
+					menu->add_separator();
+					menu->add_icon_item(get_theme_icon(SNAME("Duplicate"), SNAME("EditorIcons")), TTR("Duplicate Key(s)"), MENU_KEY_DUPLICATE);
 
-				AnimationPlayer *player = AnimationPlayerEditor::get_singleton()->get_player();
-				if (!player->has_animation(SceneStringNames::get_singleton()->RESET) || animation != player->get_animation(SceneStringNames::get_singleton()->RESET)) {
-					menu->add_icon_item(get_theme_icon(SNAME("Reload"), SNAME("EditorIcons")), TTR("Add RESET Value(s)"), MENU_KEY_ADD_RESET);
-				}
+					AnimationPlayer *player = AnimationPlayerEditor::get_singleton()->get_player();
+					if (!player->has_animation(SceneStringNames::get_singleton()->RESET) || animation != player->get_animation(SceneStringNames::get_singleton()->RESET)) {
+						menu->add_icon_item(get_theme_icon(SNAME("Reload"), SNAME("EditorIcons")), TTR("Add RESET Value(s)"), MENU_KEY_ADD_RESET);
+					}
 
-				menu->add_separator();
-				menu->add_icon_item(get_theme_icon(SNAME("Remove"), SNAME("EditorIcons")), TTR("Delete Key(s)"), MENU_KEY_DELETE);
-			}
-			menu->reset_size();
+					menu->add_separator();
+					menu->add_icon_item(get_theme_icon(SNAME("Remove"), SNAME("EditorIcons")), TTR("Delete Key(s)"), MENU_KEY_DELETE);
+				}
+				menu->reset_size();
 
-			menu->set_position(get_screen_position() + get_local_mouse_position());
-			menu->popup();
+				menu->set_position(get_screen_position() + get_local_mouse_position());
+				menu->popup();
 
-			insert_at_pos = offset + timeline->get_value();
-			accept_event();
+				insert_at_pos = offset + timeline->get_value();
+				accept_event();
+			}
 		}
 	}
 
@@ -3354,7 +3409,7 @@ void AnimationTrackEditor::remove_track_edit_plugin(const Ref<AnimationTrackEdit
 	track_edit_plugins.erase(p_plugin);
 }
 
-void AnimationTrackEditor::set_animation(const Ref<Animation> &p_anim) {
+void AnimationTrackEditor::set_animation(const Ref<Animation> &p_anim, bool p_read_only) {
 	if (animation != p_anim && _get_track_selected() >= 0) {
 		track_edits[_get_track_selected()]->release_focus();
 	}
@@ -3363,7 +3418,8 @@ void AnimationTrackEditor::set_animation(const Ref<Animation> &p_anim) {
 		_clear_selection();
 	}
 	animation = p_anim;
-	timeline->set_animation(p_anim);
+	read_only = p_read_only;
+	timeline->set_animation(p_anim, read_only);
 
 	_cancel_bezier_edit();
 	_update_tracks();
@@ -3372,7 +3428,7 @@ void AnimationTrackEditor::set_animation(const Ref<Animation> &p_anim) {
 		animation->connect("changed", callable_mp(this, &AnimationTrackEditor::_animation_changed));
 
 		hscroll->show();
-		edit->set_disabled(false);
+		edit->set_disabled(read_only);
 		step->set_block_signals(true);
 
 		_update_step_spinbox();
@@ -3501,7 +3557,7 @@ void AnimationTrackEditor::set_state(const Dictionary &p_state) {
 }
 
 void AnimationTrackEditor::cleanup() {
-	set_animation(Ref<Animation>());
+	set_animation(Ref<Animation>(), read_only);
 }
 
 void AnimationTrackEditor::_name_limit_changed() {
@@ -4378,6 +4434,27 @@ void AnimationTrackEditor::_update_tracks() {
 		return;
 	}
 
+	bool read_only = false;
+	if (!animation->get_path().is_resource_file()) {
+		int srpos = animation->get_path().find("::");
+		if (srpos != -1) {
+			String base = animation->get_path().substr(0, srpos);
+			if (ResourceLoader::get_resource_type(base) == "PackedScene") {
+				if (!get_tree()->get_edited_scene_root() || get_tree()->get_edited_scene_root()->get_scene_file_path() != base) {
+					read_only = true;
+				}
+			} else {
+				if (FileAccess::exists(base + ".import")) {
+					read_only = true;
+				}
+			}
+		}
+	} else {
+		if (FileAccess::exists(animation->get_path() + ".import")) {
+			read_only = true;
+		}
+	}
+
 	RBMap<String, VBoxContainer *> group_sort;
 
 	bool use_grouping = !view_group->is_pressed();
@@ -4506,7 +4583,7 @@ void AnimationTrackEditor::_update_tracks() {
 		track_edit->set_undo_redo(undo_redo);
 		track_edit->set_timeline(timeline);
 		track_edit->set_root(root);
-		track_edit->set_animation_and_track(animation, i);
+		track_edit->set_animation_and_track(animation, i, read_only);
 		track_edit->set_play_position(timeline->get_play_position());
 		track_edit->set_editor(this);
 
@@ -5178,6 +5255,7 @@ void AnimationTrackEditor::_update_key_edit() {
 	if (selection.size() == 1) {
 		key_edit = memnew(AnimationTrackKeyEdit);
 		key_edit->animation = animation;
+		key_edit->animation_read_only = read_only;
 		key_edit->track = selection.front()->key().track;
 		key_edit->use_fps = timeline->is_using_fps();
 
@@ -5194,6 +5272,7 @@ void AnimationTrackEditor::_update_key_edit() {
 	} else if (selection.size() > 1) {
 		multi_key_edit = memnew(AnimationMultiTrackKeyEdit);
 		multi_key_edit->animation = animation;
+		multi_key_edit->animation_read_only = read_only;
 
 		RBMap<int, List<float>> key_ofs_map;
 		RBMap<int, NodePath> base_map;
@@ -5473,7 +5552,7 @@ void AnimationTrackEditor::_cancel_bezier_edit() {
 void AnimationTrackEditor::_bezier_edit(int p_for_track) {
 	_clear_selection(); // Bezier probably wants to use a separate selection mode.
 	bezier_edit->set_root(root);
-	bezier_edit->set_animation_and_track(animation, p_for_track);
+	bezier_edit->set_animation_and_track(animation, p_for_track, read_only);
 	scroll->hide();
 	bezier_edit->show();
 	// Search everything within the track and curve - edit it.
diff --git a/editor/animation_track_editor.h b/editor/animation_track_editor.h
index cb7d3c7d96..b0553c54a5 100644
--- a/editor/animation_track_editor.h
+++ b/editor/animation_track_editor.h
@@ -56,6 +56,8 @@ class AnimationTimelineEdit : public Range {
 	GDCLASS(AnimationTimelineEdit, Range);
 
 	Ref<Animation> animation;
+	bool read_only = false;
+
 	AnimationTrackEdit *track_edit = nullptr;
 	int name_limit = 0;
 	Range *zoom = nullptr;
@@ -106,7 +108,7 @@ public:
 	float get_zoom_scale() const;
 
 	virtual Size2 get_minimum_size() const override;
-	void set_animation(const Ref<Animation> &p_animation);
+	void set_animation(const Ref<Animation> &p_animation, bool p_read_only);
 	void set_track_edit(AnimationTrackEdit *p_track_edit);
 	void set_zoom(Range *p_zoom);
 	Range *get_zoom() const { return zoom; }
@@ -159,6 +161,7 @@ class AnimationTrackEdit : public Control {
 	NodePath node_path;
 
 	Ref<Animation> animation;
+	bool read_only = false;
 	int track = 0;
 
 	Rect2 check_rect;
@@ -232,7 +235,7 @@ public:
 	AnimationTrackEditor *get_editor() const { return editor; }
 	UndoRedo *get_undo_redo() const { return undo_redo; }
 	NodePath get_path() const;
-	void set_animation_and_track(const Ref<Animation> &p_animation, int p_track);
+	void set_animation_and_track(const Ref<Animation> &p_animation, int p_track, bool p_read_only);
 	virtual Size2 get_minimum_size() const override;
 
 	void set_undo_redo(UndoRedo *p_undo_redo);
@@ -290,6 +293,7 @@ class AnimationTrackEditor : public VBoxContainer {
 	GDCLASS(AnimationTrackEditor, VBoxContainer);
 
 	Ref<Animation> animation;
+	bool read_only = false;
 	Node *root = nullptr;
 
 	MenuButton *edit = nullptr;
@@ -533,7 +537,7 @@ public:
 	void add_track_edit_plugin(const Ref<AnimationTrackEditPlugin> &p_plugin);
 	void remove_track_edit_plugin(const Ref<AnimationTrackEditPlugin> &p_plugin);
 
-	void set_animation(const Ref<Animation> &p_anim);
+	void set_animation(const Ref<Animation> &p_anim, bool p_read_only);
 	Ref<Animation> get_current_animation() const;
 	void set_root(Node *p_root);
 	Node *get_root() const;
diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp
index b0eb384efc..9e72c8ec10 100644
--- a/editor/code_editor.cpp
+++ b/editor/code_editor.cpp
@@ -1869,7 +1869,8 @@ CodeTextEditor::CodeTextEditor() {
 	code_complete_func = nullptr;
 	ED_SHORTCUT("script_editor/zoom_in", TTR("Zoom In"), KeyModifierMask::CMD | Key::EQUAL);
 	ED_SHORTCUT("script_editor/zoom_out", TTR("Zoom Out"), KeyModifierMask::CMD | Key::MINUS);
-	ED_SHORTCUT("script_editor/reset_zoom", TTR("Reset Zoom"), KeyModifierMask::CMD | Key::KEY_0);
+	ED_SHORTCUT_ARRAY("script_editor/reset_zoom", TTR("Reset Zoom"),
+			{ int32_t(KeyModifierMask::CMD | Key::KEY_0), int32_t(KeyModifierMask::CMD | Key::KP_0) });
 
 	text_editor = memnew(CodeEdit);
 	add_child(text_editor);
diff --git a/editor/doc_tools.cpp b/editor/doc_tools.cpp
index a819458417..864871bb7e 100644
--- a/editor/doc_tools.cpp
+++ b/editor/doc_tools.cpp
@@ -337,311 +337,318 @@ static Variant get_documentation_default_value(const StringName &p_class_name, c
 }
 
 void DocTools::generate(bool p_basic_types) {
-	List<StringName> classes;
-	ClassDB::get_class_list(&classes);
-	classes.sort_custom<StringName::AlphCompare>();
-	// Move ProjectSettings, so that other classes can register properties there.
-	classes.move_to_back(classes.find("ProjectSettings"));
-
-	bool skip_setter_getter_methods = true;
-
-	while (classes.size()) {
-		HashSet<StringName> setters_getters;
-
-		String name = classes.front()->get();
-		if (!ClassDB::is_class_exposed(name)) {
-			print_verbose(vformat("Class '%s' is not exposed, skipping.", name));
-			classes.pop_front();
-			continue;
-		}
-
-		String cname = name;
-
-		class_list[cname] = DocData::ClassDoc();
-		DocData::ClassDoc &c = class_list[cname];
-		c.name = cname;
-		c.inherits = ClassDB::get_parent_class(name);
+	// Add ClassDB-exposed classes.
+	{
+		List<StringName> classes;
+		ClassDB::get_class_list(&classes);
+		classes.sort_custom<StringName::AlphCompare>();
+		// Move ProjectSettings, so that other classes can register properties there.
+		classes.move_to_back(classes.find("ProjectSettings"));
+
+		bool skip_setter_getter_methods = true;
+
+		// Populate documentation data for each exposed class.
+		while (classes.size()) {
+			String name = classes.front()->get();
+			if (!ClassDB::is_class_exposed(name)) {
+				print_verbose(vformat("Class '%s' is not exposed, skipping.", name));
+				classes.pop_front();
+				continue;
+			}
 
-		List<PropertyInfo> properties;
-		List<PropertyInfo> own_properties;
-
-		// Special case for editor and project settings, so they can be documented.
-		if (name == "EditorSettings") {
-			// We don't create the full blown EditorSettings (+ config file) with `create()`,
-			// instead we just make a local instance to get default values.
-			Ref<EditorSettings> edset = memnew(EditorSettings);
-			edset->get_property_list(&properties);
-			own_properties = properties;
-		} else if (name == "ProjectSettings") {
-			ProjectSettings::get_singleton()->get_property_list(&properties);
-			own_properties = properties;
-		} else {
-			ClassDB::get_property_list(name, &properties);
-			ClassDB::get_property_list(name, &own_properties, true);
-		}
+			String cname = name;
+			// Property setters and getters do not get exposed as individual methods.
+			HashSet<StringName> setters_getters;
 
-		properties.sort();
-		own_properties.sort();
+			class_list[cname] = DocData::ClassDoc();
+			DocData::ClassDoc &c = class_list[cname];
+			c.name = cname;
+			c.inherits = ClassDB::get_parent_class(name);
 
-		List<PropertyInfo>::Element *EO = own_properties.front();
-		for (const PropertyInfo &E : properties) {
-			bool inherited = true;
-			if (EO && EO->get() == E) {
-				inherited = false;
-				EO = EO->next();
-			}
+			List<PropertyInfo> properties;
+			List<PropertyInfo> own_properties;
 
-			if (E.usage & PROPERTY_USAGE_GROUP || E.usage & PROPERTY_USAGE_SUBGROUP || E.usage & PROPERTY_USAGE_CATEGORY || E.usage & PROPERTY_USAGE_INTERNAL || (E.type == Variant::NIL && E.usage & PROPERTY_USAGE_ARRAY)) {
-				continue;
+			// Special case for editor and project settings, so they can be documented.
+			if (name == "EditorSettings") {
+				// We don't create the full blown EditorSettings (+ config file) with `create()`,
+				// instead we just make a local instance to get default values.
+				Ref<EditorSettings> edset = memnew(EditorSettings);
+				edset->get_property_list(&properties);
+				own_properties = properties;
+			} else if (name == "ProjectSettings") {
+				ProjectSettings::get_singleton()->get_property_list(&properties);
+				own_properties = properties;
+			} else {
+				ClassDB::get_property_list(name, &properties);
+				ClassDB::get_property_list(name, &own_properties, true);
 			}
 
-			DocData::PropertyDoc prop;
-			prop.name = E.name;
-			prop.overridden = inherited;
+			properties.sort();
+			own_properties.sort();
 
-			if (inherited) {
-				String parent = ClassDB::get_parent_class(c.name);
-				while (!ClassDB::has_property(parent, prop.name, true)) {
-					parent = ClassDB::get_parent_class(parent);
+			List<PropertyInfo>::Element *EO = own_properties.front();
+			for (const PropertyInfo &E : properties) {
+				bool inherited = true;
+				if (EO && EO->get() == E) {
+					inherited = false;
+					EO = EO->next();
 				}
-				prop.overrides = parent;
-			}
-
-			bool default_value_valid = false;
-			Variant default_value;
 
-			if (name == "EditorSettings") {
-				if (E.name == "resource_local_to_scene" || E.name == "resource_name" || E.name == "resource_path" || E.name == "script") {
-					// Don't include spurious properties in the generated EditorSettings class reference.
+				if (E.usage & PROPERTY_USAGE_GROUP || E.usage & PROPERTY_USAGE_SUBGROUP || E.usage & PROPERTY_USAGE_CATEGORY || E.usage & PROPERTY_USAGE_INTERNAL || (E.type == Variant::NIL && E.usage & PROPERTY_USAGE_ARRAY)) {
 					continue;
 				}
-			}
 
-			if (name == "ProjectSettings") {
-				// Special case for project settings, so that settings are not taken from the current project's settings
-				if (E.name == "script" || !ProjectSettings::get_singleton()->is_builtin_setting(E.name)) {
-					continue;
-				}
-				if (E.usage & PROPERTY_USAGE_EDITOR) {
-					if (!ProjectSettings::get_singleton()->get_ignore_value_in_docs(E.name)) {
-						default_value = ProjectSettings::get_singleton()->property_get_revert(E.name);
-						default_value_valid = true;
+				DocData::PropertyDoc prop;
+				prop.name = E.name;
+				prop.overridden = inherited;
+
+				if (inherited) {
+					String parent = ClassDB::get_parent_class(c.name);
+					while (!ClassDB::has_property(parent, prop.name, true)) {
+						parent = ClassDB::get_parent_class(parent);
 					}
+					prop.overrides = parent;
 				}
-			} else {
-				default_value = get_documentation_default_value(name, E.name, default_value_valid);
-				if (inherited) {
-					bool base_default_value_valid = false;
-					Variant base_default_value = get_documentation_default_value(ClassDB::get_parent_class(name), E.name, base_default_value_valid);
-					if (!default_value_valid || !base_default_value_valid || default_value == base_default_value) {
+
+				bool default_value_valid = false;
+				Variant default_value;
+
+				if (name == "EditorSettings") {
+					if (E.name == "resource_local_to_scene" || E.name == "resource_name" || E.name == "resource_path" || E.name == "script") {
+						// Don't include spurious properties in the generated EditorSettings class reference.
 						continue;
 					}
 				}
-			}
 
-			if (default_value_valid && default_value.get_type() != Variant::OBJECT) {
-				prop.default_value = default_value.get_construct_string().replace("\n", " ");
-			}
-
-			StringName setter = ClassDB::get_property_setter(name, E.name);
-			StringName getter = ClassDB::get_property_getter(name, E.name);
-
-			prop.setter = setter;
-			prop.getter = getter;
-
-			bool found_type = false;
-			if (getter != StringName()) {
-				MethodBind *mb = ClassDB::get_method(name, getter);
-				if (mb) {
-					PropertyInfo retinfo = mb->get_return_info();
-
-					found_type = true;
-					if (retinfo.type == Variant::INT && retinfo.usage & (PROPERTY_USAGE_CLASS_IS_ENUM | PROPERTY_USAGE_CLASS_IS_BITFIELD)) {
-						prop.enumeration = retinfo.class_name;
-						prop.type = "int";
-					} else if (retinfo.class_name != StringName()) {
-						prop.type = retinfo.class_name;
-					} else if (retinfo.type == Variant::ARRAY && retinfo.hint == PROPERTY_HINT_ARRAY_TYPE) {
-						prop.type = retinfo.hint_string + "[]";
-					} else if (retinfo.hint == PROPERTY_HINT_RESOURCE_TYPE) {
-						prop.type = retinfo.hint_string;
-					} else if (retinfo.type == Variant::NIL && retinfo.usage & PROPERTY_USAGE_NIL_IS_VARIANT) {
-						prop.type = "Variant";
-					} else if (retinfo.type == Variant::NIL) {
-						prop.type = "void";
-					} else {
-						prop.type = Variant::get_type_name(retinfo.type);
+				if (name == "ProjectSettings") {
+					// Special case for project settings, so that settings are not taken from the current project's settings
+					if (E.name == "script" || !ProjectSettings::get_singleton()->is_builtin_setting(E.name)) {
+						continue;
+					}
+					if (E.usage & PROPERTY_USAGE_EDITOR) {
+						if (!ProjectSettings::get_singleton()->get_ignore_value_in_docs(E.name)) {
+							default_value = ProjectSettings::get_singleton()->property_get_revert(E.name);
+							default_value_valid = true;
+						}
+					}
+				} else {
+					default_value = get_documentation_default_value(name, E.name, default_value_valid);
+					if (inherited) {
+						bool base_default_value_valid = false;
+						Variant base_default_value = get_documentation_default_value(ClassDB::get_parent_class(name), E.name, base_default_value_valid);
+						if (!default_value_valid || !base_default_value_valid || default_value == base_default_value) {
+							continue;
+						}
 					}
 				}
 
-				setters_getters.insert(getter);
-			}
+				if (default_value_valid && default_value.get_type() != Variant::OBJECT) {
+					prop.default_value = default_value.get_construct_string().replace("\n", " ");
+				}
 
-			if (setter != StringName()) {
-				setters_getters.insert(setter);
-			}
+				StringName setter = ClassDB::get_property_setter(name, E.name);
+				StringName getter = ClassDB::get_property_getter(name, E.name);
+
+				prop.setter = setter;
+				prop.getter = getter;
+
+				bool found_type = false;
+				if (getter != StringName()) {
+					MethodBind *mb = ClassDB::get_method(name, getter);
+					if (mb) {
+						PropertyInfo retinfo = mb->get_return_info();
+
+						found_type = true;
+						if (retinfo.type == Variant::INT && retinfo.usage & (PROPERTY_USAGE_CLASS_IS_ENUM | PROPERTY_USAGE_CLASS_IS_BITFIELD)) {
+							prop.enumeration = retinfo.class_name;
+							prop.type = "int";
+						} else if (retinfo.class_name != StringName()) {
+							prop.type = retinfo.class_name;
+						} else if (retinfo.type == Variant::ARRAY && retinfo.hint == PROPERTY_HINT_ARRAY_TYPE) {
+							prop.type = retinfo.hint_string + "[]";
+						} else if (retinfo.hint == PROPERTY_HINT_RESOURCE_TYPE) {
+							prop.type = retinfo.hint_string;
+						} else if (retinfo.type == Variant::NIL && retinfo.usage & PROPERTY_USAGE_NIL_IS_VARIANT) {
+							prop.type = "Variant";
+						} else if (retinfo.type == Variant::NIL) {
+							prop.type = "void";
+						} else {
+							prop.type = Variant::get_type_name(retinfo.type);
+						}
+					}
 
-			if (!found_type) {
-				if (E.type == Variant::OBJECT && E.hint == PROPERTY_HINT_RESOURCE_TYPE) {
-					prop.type = E.hint_string;
-				} else {
-					prop.type = Variant::get_type_name(E.type);
+					setters_getters.insert(getter);
 				}
-			}
 
-			c.properties.push_back(prop);
-		}
+				if (setter != StringName()) {
+					setters_getters.insert(setter);
+				}
 
-		List<MethodInfo> method_list;
-		ClassDB::get_method_list(name, &method_list, true);
-		method_list.sort();
+				if (!found_type) {
+					if (E.type == Variant::OBJECT && E.hint == PROPERTY_HINT_RESOURCE_TYPE) {
+						prop.type = E.hint_string;
+					} else {
+						prop.type = Variant::get_type_name(E.type);
+					}
+				}
 
-		for (const MethodInfo &E : method_list) {
-			if (E.name.is_empty() || (E.name[0] == '_' && !(E.flags & METHOD_FLAG_VIRTUAL))) {
-				continue; //hidden, don't count
+				c.properties.push_back(prop);
 			}
 
-			if (skip_setter_getter_methods && setters_getters.has(E.name)) {
-				// Don't skip parametric setters and getters, i.e. method which require
-				// one or more parameters to define what property should be set or retrieved.
-				// E.g. CPUParticles3D::set_param(Parameter param, float value).
-				if (E.arguments.size() == 0 /* getter */ || (E.arguments.size() == 1 && E.return_val.type == Variant::NIL /* setter */)) {
-					continue;
-				}
-			}
+			List<MethodInfo> method_list;
+			ClassDB::get_method_list(name, &method_list, true);
+			method_list.sort();
 
-			DocData::MethodDoc method;
-			DocData::method_doc_from_methodinfo(method, E, "");
+			for (const MethodInfo &E : method_list) {
+				if (E.name.is_empty() || (E.name[0] == '_' && !(E.flags & METHOD_FLAG_VIRTUAL))) {
+					continue; //hidden, don't count
+				}
 
-			Vector<Error> errs = ClassDB::get_method_error_return_values(name, E.name);
-			if (errs.size()) {
-				if (!errs.has(OK)) {
-					errs.insert(0, OK);
+				if (skip_setter_getter_methods && setters_getters.has(E.name)) {
+					// Don't skip parametric setters and getters, i.e. method which require
+					// one or more parameters to define what property should be set or retrieved.
+					// E.g. CPUParticles3D::set_param(Parameter param, float value).
+					if (E.arguments.size() == 0 /* getter */ || (E.arguments.size() == 1 && E.return_val.type == Variant::NIL /* setter */)) {
+						continue;
+					}
 				}
-				for (int i = 0; i < errs.size(); i++) {
-					if (!method.errors_returned.has(errs[i])) {
-						method.errors_returned.push_back(errs[i]);
+
+				DocData::MethodDoc method;
+				DocData::method_doc_from_methodinfo(method, E, "");
+
+				Vector<Error> errs = ClassDB::get_method_error_return_values(name, E.name);
+				if (errs.size()) {
+					if (!errs.has(OK)) {
+						errs.insert(0, OK);
+					}
+					for (int i = 0; i < errs.size(); i++) {
+						if (!method.errors_returned.has(errs[i])) {
+							method.errors_returned.push_back(errs[i]);
+						}
 					}
 				}
+
+				c.methods.push_back(method);
 			}
 
-			c.methods.push_back(method);
-		}
+			List<MethodInfo> signal_list;
+			ClassDB::get_signal_list(name, &signal_list, true);
 
-		List<MethodInfo> signal_list;
-		ClassDB::get_signal_list(name, &signal_list, true);
+			if (signal_list.size()) {
+				for (List<MethodInfo>::Element *EV = signal_list.front(); EV; EV = EV->next()) {
+					DocData::MethodDoc signal;
+					signal.name = EV->get().name;
+					for (int i = 0; i < EV->get().arguments.size(); i++) {
+						const PropertyInfo &arginfo = EV->get().arguments[i];
+						DocData::ArgumentDoc argument;
+						DocData::argument_doc_from_arginfo(argument, arginfo);
 
-		if (signal_list.size()) {
-			for (List<MethodInfo>::Element *EV = signal_list.front(); EV; EV = EV->next()) {
-				DocData::MethodDoc signal;
-				signal.name = EV->get().name;
-				for (int i = 0; i < EV->get().arguments.size(); i++) {
-					const PropertyInfo &arginfo = EV->get().arguments[i];
-					DocData::ArgumentDoc argument;
-					DocData::argument_doc_from_arginfo(argument, arginfo);
+						signal.arguments.push_back(argument);
+					}
 
-					signal.arguments.push_back(argument);
+					c.signals.push_back(signal);
 				}
-
-				c.signals.push_back(signal);
 			}
-		}
 
-		List<String> constant_list;
-		ClassDB::get_integer_constant_list(name, &constant_list, true);
+			List<String> constant_list;
+			ClassDB::get_integer_constant_list(name, &constant_list, true);
+
+			for (const String &E : constant_list) {
+				DocData::ConstantDoc constant;
+				constant.name = E;
+				constant.value = itos(ClassDB::get_integer_constant(name, E));
+				constant.is_value_valid = true;
+				constant.enumeration = ClassDB::get_integer_constant_enum(name, E);
+				constant.is_bitfield = ClassDB::is_enum_bitfield(name, constant.enumeration);
+				c.constants.push_back(constant);
+			}
 
-		for (const String &E : constant_list) {
-			DocData::ConstantDoc constant;
-			constant.name = E;
-			constant.value = itos(ClassDB::get_integer_constant(name, E));
-			constant.is_value_valid = true;
-			constant.enumeration = ClassDB::get_integer_constant_enum(name, E);
-			constant.is_bitfield = ClassDB::is_enum_bitfield(name, constant.enumeration);
-			c.constants.push_back(constant);
-		}
+			// Theme items.
+			{
+				List<StringName> l;
+
+				Theme::get_default()->get_color_list(cname, &l);
+				for (const StringName &E : l) {
+					DocData::ThemeItemDoc tid;
+					tid.name = E;
+					tid.type = "Color";
+					tid.data_type = "color";
+					tid.default_value = Variant(Theme::get_default()->get_color(E, cname)).get_construct_string().replace("\n", " ");
+					c.theme_properties.push_back(tid);
+				}
 
-		// Theme items.
-		{
-			List<StringName> l;
-
-			Theme::get_default()->get_color_list(cname, &l);
-			for (const StringName &E : l) {
-				DocData::ThemeItemDoc tid;
-				tid.name = E;
-				tid.type = "Color";
-				tid.data_type = "color";
-				tid.default_value = Variant(Theme::get_default()->get_color(E, cname)).get_construct_string().replace("\n", " ");
-				c.theme_properties.push_back(tid);
-			}
+				l.clear();
+				Theme::get_default()->get_constant_list(cname, &l);
+				for (const StringName &E : l) {
+					DocData::ThemeItemDoc tid;
+					tid.name = E;
+					tid.type = "int";
+					tid.data_type = "constant";
+					tid.default_value = itos(Theme::get_default()->get_constant(E, cname));
+					c.theme_properties.push_back(tid);
+				}
 
-			l.clear();
-			Theme::get_default()->get_constant_list(cname, &l);
-			for (const StringName &E : l) {
-				DocData::ThemeItemDoc tid;
-				tid.name = E;
-				tid.type = "int";
-				tid.data_type = "constant";
-				tid.default_value = itos(Theme::get_default()->get_constant(E, cname));
-				c.theme_properties.push_back(tid);
-			}
+				l.clear();
+				Theme::get_default()->get_font_list(cname, &l);
+				for (const StringName &E : l) {
+					DocData::ThemeItemDoc tid;
+					tid.name = E;
+					tid.type = "Font";
+					tid.data_type = "font";
+					c.theme_properties.push_back(tid);
+				}
 
-			l.clear();
-			Theme::get_default()->get_font_list(cname, &l);
-			for (const StringName &E : l) {
-				DocData::ThemeItemDoc tid;
-				tid.name = E;
-				tid.type = "Font";
-				tid.data_type = "font";
-				c.theme_properties.push_back(tid);
-			}
+				l.clear();
+				Theme::get_default()->get_font_size_list(cname, &l);
+				for (const StringName &E : l) {
+					DocData::ThemeItemDoc tid;
+					tid.name = E;
+					tid.type = "int";
+					tid.data_type = "font_size";
+					c.theme_properties.push_back(tid);
+				}
 
-			l.clear();
-			Theme::get_default()->get_font_size_list(cname, &l);
-			for (const StringName &E : l) {
-				DocData::ThemeItemDoc tid;
-				tid.name = E;
-				tid.type = "int";
-				tid.data_type = "font_size";
-				c.theme_properties.push_back(tid);
-			}
+				l.clear();
+				Theme::get_default()->get_icon_list(cname, &l);
+				for (const StringName &E : l) {
+					DocData::ThemeItemDoc tid;
+					tid.name = E;
+					tid.type = "Texture2D";
+					tid.data_type = "icon";
+					c.theme_properties.push_back(tid);
+				}
 
-			l.clear();
-			Theme::get_default()->get_icon_list(cname, &l);
-			for (const StringName &E : l) {
-				DocData::ThemeItemDoc tid;
-				tid.name = E;
-				tid.type = "Texture2D";
-				tid.data_type = "icon";
-				c.theme_properties.push_back(tid);
-			}
+				l.clear();
+				Theme::get_default()->get_stylebox_list(cname, &l);
+				for (const StringName &E : l) {
+					DocData::ThemeItemDoc tid;
+					tid.name = E;
+					tid.type = "StyleBox";
+					tid.data_type = "style";
+					c.theme_properties.push_back(tid);
+				}
 
-			l.clear();
-			Theme::get_default()->get_stylebox_list(cname, &l);
-			for (const StringName &E : l) {
-				DocData::ThemeItemDoc tid;
-				tid.name = E;
-				tid.type = "StyleBox";
-				tid.data_type = "style";
-				c.theme_properties.push_back(tid);
+				c.theme_properties.sort();
 			}
 
-			c.theme_properties.sort();
+			classes.pop_front();
 		}
-
-		classes.pop_front();
 	}
 
+	// Add a dummy Variant entry.
 	{
-		// So we can document the concept of Variant even if it's not a usable class per se.
+		// This allows us to document the concept of Variant even though
+		// it's not a ClassDB-exposed class.
 		class_list["Variant"] = DocData::ClassDoc();
 		class_list["Variant"].name = "Variant";
 	}
 
+	// If we don't want to populate basic types, break here.
 	if (!p_basic_types) {
 		return;
 	}
 
-	// Add Variant types.
+	// Add Variant data types.
 	for (int i = 0; i < Variant::VARIANT_MAX; i++) {
 		if (i == Variant::NIL) {
 			continue; // Not exposed outside of 'null', should not be in class list.
@@ -809,14 +816,14 @@ void DocTools::generate(bool p_basic_types) {
 		}
 	}
 
-	//built in constants and functions
-
+	// Add global API (servers, engine singletons, global constants) and Variant utility functions.
 	{
 		String cname = "@GlobalScope";
 		class_list[cname] = DocData::ClassDoc();
 		DocData::ClassDoc &c = class_list[cname];
 		c.name = cname;
 
+		// Global constants.
 		for (int i = 0; i < CoreConstants::get_global_constant_count(); i++) {
 			DocData::ConstantDoc cd;
 			cd.name = CoreConstants::get_global_constant_name(i);
@@ -830,10 +837,11 @@ void DocTools::generate(bool p_basic_types) {
 			c.constants.push_back(cd);
 		}
 
+		// Servers/engine singletons.
 		List<Engine::Singleton> singletons;
 		Engine::get_singleton()->get_singletons(&singletons);
 
-		//servers (this is kind of hackish)
+		// FIXME: this is kind of hackish...
 		for (const Engine::Singleton &s : singletons) {
 			DocData::PropertyDoc pd;
 			if (!s.ptr) {
@@ -847,13 +855,14 @@ void DocTools::generate(bool p_basic_types) {
 			c.properties.push_back(pd);
 		}
 
+		// Variant utility functions.
 		List<StringName> utility_functions;
 		Variant::get_utility_function_list(&utility_functions);
 		utility_functions.sort_custom<StringName::AlphCompare>();
 		for (const StringName &E : utility_functions) {
 			DocData::MethodDoc md;
 			md.name = E;
-			//return
+			// Utility function's return type.
 			if (Variant::has_utility_function_return_value(E)) {
 				PropertyInfo pi;
 				pi.type = Variant::get_utility_function_return_type(E);
@@ -865,6 +874,7 @@ void DocTools::generate(bool p_basic_types) {
 				md.return_type = ad.type;
 			}
 
+			// Utility function's arguments.
 			if (Variant::is_utility_function_vararg(E)) {
 				md.qualifiers = "vararg";
 			} else {
@@ -885,11 +895,10 @@ void DocTools::generate(bool p_basic_types) {
 		}
 	}
 
-	// Built-in script reference.
-	// We only add a doc entry for languages which actually define any built-in
-	// methods or constants.
-
+	// Add scripting language built-ins.
 	{
+		// We only add a doc entry for languages which actually define any built-in
+		// methods, constants, or annotations.
 		for (int i = 0; i < ScriptServer::get_language_count(); i++) {
 			ScriptLanguage *lang = ScriptServer::get_language(i);
 			String cname = "@" + lang->get_name();
@@ -1010,7 +1019,7 @@ static Error _parse_methods(Ref<XMLParser> &parser, Vector<DocData::MethodDoc> &
 						} else if (name == "returns_error") {
 							ERR_FAIL_COND_V(!parser->has_attribute("number"), ERR_FILE_CORRUPT);
 							method.errors_returned.push_back(parser->get_attribute_value("number").to_int());
-						} else if (name == "argument") {
+						} else if (name == "param") {
 							DocData::ArgumentDoc argument;
 							ERR_FAIL_COND_V(!parser->has_attribute("name"), ERR_FILE_CORRUPT);
 							argument.name = parser->get_attribute_value("name");
@@ -1341,9 +1350,9 @@ static void _write_method_doc(Ref<FileAccess> f, const String &p_name, Vector<Do
 				}
 
 				if (!a.default_value.is_empty()) {
-					_write_string(f, 3, "<argument index=\"" + itos(j) + "\" name=\"" + a.name.xml_escape() + "\" type=\"" + a.type.xml_escape() + "\"" + enum_text + " default=\"" + a.default_value.xml_escape(true) + "\" />");
+					_write_string(f, 3, "<param index=\"" + itos(j) + "\" name=\"" + a.name.xml_escape() + "\" type=\"" + a.type.xml_escape() + "\"" + enum_text + " default=\"" + a.default_value.xml_escape(true) + "\" />");
 				} else {
-					_write_string(f, 3, "<argument index=\"" + itos(j) + "\" name=\"" + a.name.xml_escape() + "\" type=\"" + a.type.xml_escape() + "\"" + enum_text + " />");
+					_write_string(f, 3, "<param index=\"" + itos(j) + "\" name=\"" + a.name.xml_escape() + "\" type=\"" + a.type.xml_escape() + "\"" + enum_text + " />");
 				}
 			}
 
diff --git a/editor/editor_build_profile.cpp b/editor/editor_build_profile.cpp
index d093ab518e..0f0ab4a339 100644
--- a/editor/editor_build_profile.cpp
+++ b/editor/editor_build_profile.cpp
@@ -46,19 +46,68 @@ const char *EditorBuildProfile::build_option_identifiers[BUILD_OPTION_MAX] = {
 	"disable_3d_physics",
 	"disable_navigation",
 	"openxr",
+	"rendering_device", // FIXME: there's no scons option to disable rendering device
 	"opengl3",
 	"vulkan",
+	"module_text_server_fb_enabled",
+	"module_text_server_adv_enabled",
+	"module_freetype_enabled",
+	"brotli",
+	"graphite",
+	"module_msdfgen_enabled"
+};
+
+const bool EditorBuildProfile::build_option_disabled_by_default[BUILD_OPTION_MAX] = {
+	// This maps to SCons build options.
+	false, // 3D
+	false, // PHYSICS_2D
+	false, // PHYSICS_3D
+	false, // NAVIGATION
+	false, // XR
+	false, // RENDERING_DEVICE
+	false, // OPENGL
+	false, // VULKAN
+	true, // TEXT_SERVER_FALLBACK
+	false, // TEXT_SERVER_COMPLEX
+	false, // DYNAMIC_FONTS
+	false, // WOFF2_FONTS
+	false, // GRPAHITE_FONTS
+	false, // MSDFGEN
 };
 
 const bool EditorBuildProfile::build_option_disable_values[BUILD_OPTION_MAX] = {
 	// This maps to SCons build options.
-	true,
-	true,
-	true,
-	true,
-	false,
-	false,
-	false
+	true, // 3D
+	true, // PHYSICS_2D
+	true, // PHYSICS_3D
+	true, // NAVIGATION
+	false, // XR
+	false, // RENDERING_DEVICE
+	false, // OPENGL
+	false, // VULKAN
+	false, // TEXT_SERVER_FALLBACK
+	false, // TEXT_SERVER_COMPLEX
+	false, // DYNAMIC_FONTS
+	false, // WOFF2_FONTS
+	false, // GRPAHITE_FONTS
+	false, // MSDFGEN
+};
+
+const EditorBuildProfile::BuildOptionCategory EditorBuildProfile::build_option_category[BUILD_OPTION_MAX] = {
+	BUILD_OPTION_CATEGORY_GENERAL, // 3D
+	BUILD_OPTION_CATEGORY_GENERAL, // PHYSICS_2D
+	BUILD_OPTION_CATEGORY_GENERAL, // PHYSICS_3D
+	BUILD_OPTION_CATEGORY_GENERAL, // NAVIGATION
+	BUILD_OPTION_CATEGORY_GENERAL, // XR
+	BUILD_OPTION_CATEGORY_GENERAL, // RENDERING_DEVICE
+	BUILD_OPTION_CATEGORY_GENERAL, // OPENGL
+	BUILD_OPTION_CATEGORY_GENERAL, // VULKAN
+	BUILD_OPTION_CATEGORY_TEXT_SERVER, // TEXT_SERVER_FALLBACK
+	BUILD_OPTION_CATEGORY_TEXT_SERVER, // TEXT_SERVER_COMPLEX
+	BUILD_OPTION_CATEGORY_TEXT_SERVER, // DYNAMIC_FONTS
+	BUILD_OPTION_CATEGORY_TEXT_SERVER, // WOFF2_FONTS
+	BUILD_OPTION_CATEGORY_TEXT_SERVER, // GRPAHITE_FONTS
+	BUILD_OPTION_CATEGORY_TEXT_SERVER, // MSDFGEN
 };
 
 void EditorBuildProfile::set_disable_class(const StringName &p_class, bool p_disabled) {
@@ -127,6 +176,12 @@ String EditorBuildProfile::get_build_option_name(BuildOption p_build_option) {
 		TTRC("RenderingDevice"),
 		TTRC("OpenGL"),
 		TTRC("Vulkan"),
+		TTRC("Text Server: Fallback"),
+		TTRC("Text Server: Advanced"),
+		TTRC("TTF, OTF, Type 1, WOFF1 Fonts"),
+		TTRC("WOFF2 Fonts"),
+		TTRC("SIL Graphite Fonts"),
+		TTRC("Multi-channel Signed Distance Field Font Rendering"),
 	};
 	return TTRGET(build_option_names[p_build_option]);
 }
@@ -143,11 +198,33 @@ String EditorBuildProfile::get_build_option_description(BuildOption p_build_opti
 		TTRC("RenderingDevice based rendering (if disabled, the OpenGL back-end is required)."),
 		TTRC("OpenGL back-end (if disabled, the RenderingDevice back-end is required)."),
 		TTRC("Vulkan back-end of RenderingDevice."),
+		TTRC("Fallback implementation of Text Server\nSupports basic text layouts."),
+		TTRC("Text Server implementation powered by ICU and HarfBuzz libraries.\nSupports complex text layouts, BiDi, and contextual OpenType font features."),
+		TTRC("TrueType, OpenType, Type 1, and WOFF1 font format support using FreeType library (if disabled, WOFF2 support is also disabled)."),
+		TTRC("WOFF2 font format support using FreeType and Brotli libraries."),
+		TTRC("SIL Graphite smart font technology support (supported by Advanced Text Server only)."),
+		TTRC("Multi-channel signed distance field font rendering support using msdfgen library (pre-rendered MSDF fonts can be used even if this option disabled)."),
 	};
 
 	return TTRGET(build_option_descriptions[p_build_option]);
 }
 
+EditorBuildProfile::BuildOptionCategory EditorBuildProfile::get_build_option_category(BuildOption p_build_option) {
+	ERR_FAIL_INDEX_V(p_build_option, BUILD_OPTION_MAX, BUILD_OPTION_CATEGORY_GENERAL);
+	return build_option_category[p_build_option];
+}
+
+String EditorBuildProfile::get_build_option_category_name(BuildOptionCategory p_build_option_category) {
+	ERR_FAIL_INDEX_V(p_build_option_category, BUILD_OPTION_CATEGORY_MAX, String());
+
+	const char *build_option_subcategories[BUILD_OPTION_CATEGORY_MAX]{
+		TTRC("General Features:"),
+		TTRC("Text Rendering and Font Options:"),
+	};
+
+	return TTRGET(build_option_subcategories[p_build_option_category]);
+}
+
 Error EditorBuildProfile::save_to_file(const String &p_path) {
 	Dictionary data;
 	data["type"] = "build_profile";
@@ -160,8 +237,12 @@ Error EditorBuildProfile::save_to_file(const String &p_path) {
 
 	Dictionary dis_build_options;
 	for (int i = 0; i < BUILD_OPTION_MAX; i++) {
-		if (build_options_disabled[i]) {
-			dis_build_options[build_option_identifiers[i]] = build_option_disable_values[i];
+		if (build_options_disabled[i] != build_option_disabled_by_default[i]) {
+			if (build_options_disabled[i]) {
+				dis_build_options[build_option_identifiers[i]] = build_option_disable_values[i];
+			} else {
+				dis_build_options[build_option_identifiers[i]] = !build_option_disable_values[i];
+			}
 		}
 	}
 
@@ -211,7 +292,7 @@ Error EditorBuildProfile::load_from_file(const String &p_path) {
 	}
 
 	for (int i = 0; i < BUILD_OPTION_MAX; i++) {
-		build_options_disabled[i] = false;
+		build_options_disabled[i] = build_option_disabled_by_default[i];
 	}
 
 	if (data.has("disabled_build_options")) {
@@ -259,10 +340,24 @@ void EditorBuildProfile::_bind_methods() {
 	BIND_ENUM_CONSTANT(BUILD_OPTION_RENDERING_DEVICE);
 	BIND_ENUM_CONSTANT(BUILD_OPTION_OPENGL);
 	BIND_ENUM_CONSTANT(BUILD_OPTION_VULKAN);
+	BIND_ENUM_CONSTANT(BUILD_OPTION_TEXT_SERVER_FALLBACK);
+	BIND_ENUM_CONSTANT(BUILD_OPTION_TEXT_SERVER_ADVANCED);
+	BIND_ENUM_CONSTANT(BUILD_OPTION_DYNAMIC_FONTS);
+	BIND_ENUM_CONSTANT(BUILD_OPTION_WOFF2_FONTS);
+	BIND_ENUM_CONSTANT(BUILD_OPTION_GRPAHITE_FONTS);
+	BIND_ENUM_CONSTANT(BUILD_OPTION_MSDFGEN);
 	BIND_ENUM_CONSTANT(BUILD_OPTION_MAX);
+
+	BIND_ENUM_CONSTANT(BUILD_OPTION_CATEGORY_GENERAL);
+	BIND_ENUM_CONSTANT(BUILD_OPTION_CATEGORY_TEXT_SERVER);
+	BIND_ENUM_CONSTANT(BUILD_OPTION_CATEGORY_MAX);
 }
 
-EditorBuildProfile::EditorBuildProfile() {}
+EditorBuildProfile::EditorBuildProfile() {
+	for (int i = 0; i < EditorBuildProfile::BUILD_OPTION_MAX; i++) {
+		build_options_disabled[i] = build_option_disabled_by_default[i];
+	}
+}
 
 //////////////////////////
 
@@ -633,11 +728,18 @@ void EditorBuildProfileManager::_update_edited_profile() {
 
 	TreeItem *root = class_list->create_item();
 
-	TreeItem *build_options = class_list->create_item(root);
-	build_options->set_text(0, TTR("General Features:"));
+	HashMap<EditorBuildProfile::BuildOptionCategory, TreeItem *> subcats;
+	for (int i = 0; i < EditorBuildProfile::BUILD_OPTION_CATEGORY_MAX; i++) {
+		TreeItem *build_cat;
+		build_cat = class_list->create_item(root);
+
+		build_cat->set_text(0, EditorBuildProfile::get_build_option_category_name(EditorBuildProfile::BuildOptionCategory(i)));
+		subcats[EditorBuildProfile::BuildOptionCategory(i)] = build_cat;
+	}
+
 	for (int i = 0; i < EditorBuildProfile::BUILD_OPTION_MAX; i++) {
 		TreeItem *build_option;
-		build_option = class_list->create_item(build_options);
+		build_option = class_list->create_item(subcats[EditorBuildProfile::get_build_option_category(EditorBuildProfile::BuildOption(i))]);
 
 		build_option->set_cell_mode(0, TreeItem::CELL_MODE_CHECK);
 		build_option->set_text(0, EditorBuildProfile::get_build_option_name(EditorBuildProfile::BuildOption(i)));
diff --git a/editor/editor_build_profile.h b/editor/editor_build_profile.h
index bb6494b8c9..606c415429 100644
--- a/editor/editor_build_profile.h
+++ b/editor/editor_build_profile.h
@@ -53,7 +53,19 @@ public:
 		BUILD_OPTION_RENDERING_DEVICE,
 		BUILD_OPTION_OPENGL,
 		BUILD_OPTION_VULKAN,
-		BUILD_OPTION_MAX
+		BUILD_OPTION_TEXT_SERVER_FALLBACK,
+		BUILD_OPTION_TEXT_SERVER_ADVANCED,
+		BUILD_OPTION_DYNAMIC_FONTS,
+		BUILD_OPTION_WOFF2_FONTS,
+		BUILD_OPTION_GRPAHITE_FONTS,
+		BUILD_OPTION_MSDFGEN,
+		BUILD_OPTION_MAX,
+	};
+
+	enum BuildOptionCategory {
+		BUILD_OPTION_CATEGORY_GENERAL,
+		BUILD_OPTION_CATEGORY_TEXT_SERVER,
+		BUILD_OPTION_CATEGORY_MAX,
 	};
 
 private:
@@ -65,7 +77,9 @@ private:
 
 	bool build_options_disabled[BUILD_OPTION_MAX] = {};
 	static const char *build_option_identifiers[BUILD_OPTION_MAX];
+	static const bool build_option_disabled_by_default[BUILD_OPTION_MAX];
 	static const bool build_option_disable_values[BUILD_OPTION_MAX];
+	static const BuildOptionCategory build_option_category[BUILD_OPTION_MAX];
 
 	String _get_build_option_name(BuildOption p_build_option) { return get_build_option_name(p_build_option); }
 
@@ -93,11 +107,15 @@ public:
 	static String get_build_option_name(BuildOption p_build_option);
 	static String get_build_option_description(BuildOption p_build_option);
 	static bool get_build_option_disable_value(BuildOption p_build_option);
+	static BuildOptionCategory get_build_option_category(BuildOption p_build_option);
+
+	static String get_build_option_category_name(BuildOptionCategory p_build_option_category);
 
 	EditorBuildProfile();
 };
 
 VARIANT_ENUM_CAST(EditorBuildProfile::BuildOption)
+VARIANT_ENUM_CAST(EditorBuildProfile::BuildOptionCategory)
 
 class EditorFileSystemDirectory;
 
diff --git a/editor/editor_feature_profile.cpp b/editor/editor_feature_profile.cpp
index ab6dec7eeb..f0bf9fd5b3 100644
--- a/editor/editor_feature_profile.cpp
+++ b/editor/editor_feature_profile.cpp
@@ -324,6 +324,11 @@ void EditorFeatureProfileManager::_notification(int p_what) {
 			}
 			_update_profile_list(current_profile);
 		} break;
+
+		case NOTIFICATION_THEME_CHANGED: {
+			// Make sure that the icons are correctly adjusted if the theme's lightness was switched.
+			_update_selected_profile();
+		} break;
 	}
 }
 
diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp
index 5c3038c468..8d58469684 100644
--- a/editor/editor_help.cpp
+++ b/editor/editor_help.cpp
@@ -1803,6 +1803,21 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt) {
 			p_rt->pop();
 			pos = brk_end + 1;
 
+		} else if (tag.begins_with("param ")) {
+			const int tag_end = tag.find(" ");
+			const String param_name = tag.substr(tag_end + 1, tag.length()).lstrip(" ");
+
+			// Use monospace font with translucent background color to make code easier to distinguish from other text.
+			p_rt->push_font(doc_code_font);
+			p_rt->push_bgcolor(Color(0.5, 0.5, 0.5, 0.15));
+			p_rt->push_color(code_color);
+			p_rt->add_text(param_name);
+			p_rt->pop();
+			p_rt->pop();
+			p_rt->pop();
+
+			pos = brk_end + 1;
+
 		} else if (doc->class_list.has(tag)) {
 			// Class reference tag such as [Node2D] or [SceneTree].
 			// Use monospace font with translucent colored background color to make clickable references
diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp
index 9f047c775e..e954f06f08 100644
--- a/editor/editor_inspector.cpp
+++ b/editor/editor_inspector.cpp
@@ -432,11 +432,11 @@ bool EditorProperty::is_read_only() const {
 }
 
 Variant EditorPropertyRevert::get_property_revert_value(Object *p_object, const StringName &p_property, bool *r_is_valid) {
-	if (p_object->has_method("property_can_revert") && p_object->call("property_can_revert", p_property)) {
+	if (p_object->property_can_revert(p_property)) {
 		if (r_is_valid) {
 			*r_is_valid = true;
 		}
-		return p_object->call("property_get_revert", p_property);
+		return p_object->property_get_revert(p_property);
 	}
 
 	return PropertyUtils::get_property_default_value(p_object, p_property, r_is_valid);
@@ -1613,12 +1613,11 @@ void EditorInspectorArray::_rmb_popup_id_pressed(int p_id) {
 			_clear_array();
 			break;
 		case OPTION_RESIZE_ARRAY:
-			new_size = count;
-			new_size_line_edit->set_text(Variant(new_size));
+			new_size_spin_box->set_value(count);
 			resize_dialog->get_ok_button()->set_disabled(true);
-			resize_dialog->popup_centered();
-			new_size_line_edit->grab_focus();
-			new_size_line_edit->select_all();
+			resize_dialog->popup_centered(Size2i(250, 0) * EDSCALE);
+			new_size_spin_box->get_line_edit()->grab_focus();
+			new_size_spin_box->get_line_edit()->select_all();
 			break;
 		default:
 			break;
@@ -2013,36 +2012,21 @@ int EditorInspectorArray::_drop_position() const {
 	return -1;
 }
 
-void EditorInspectorArray::_new_size_line_edit_text_changed(String p_text) {
-	bool valid = false;
-	if (p_text.is_valid_int()) {
-		int val = p_text.to_int();
-		if (val > 0 && val != count) {
-			valid = true;
-		}
+void EditorInspectorArray::_resize_dialog_confirmed() {
+	if (int(new_size_spin_box->get_value()) == count) {
+		return;
 	}
-	resize_dialog->get_ok_button()->set_disabled(!valid);
+
+	resize_dialog->hide();
+	_resize_array(int(new_size_spin_box->get_value()));
 }
 
-void EditorInspectorArray::_new_size_line_edit_text_submitted(String p_text) {
-	bool valid = false;
-	if (p_text.is_valid_int()) {
-		int val = p_text.to_int();
-		if (val > 0 && val != count) {
-			new_size = val;
-			valid = true;
-		}
-	}
-	if (valid) {
-		resize_dialog->hide();
-		_resize_array(new_size);
-	} else {
-		new_size_line_edit->set_text(Variant(new_size));
-	}
+void EditorInspectorArray::_new_size_spin_box_value_changed(float p_value) {
+	resize_dialog->get_ok_button()->set_disabled(int(p_value) == count);
 }
 
-void EditorInspectorArray::_resize_dialog_confirmed() {
-	_new_size_line_edit_text_submitted(new_size_line_edit->get_text());
+void EditorInspectorArray::_new_size_spin_box_text_submitted(String p_text) {
+	_resize_dialog_confirmed();
 }
 
 void EditorInspectorArray::_setup() {
@@ -2342,10 +2326,11 @@ EditorInspectorArray::EditorInspectorArray() {
 	VBoxContainer *resize_dialog_vbox = memnew(VBoxContainer);
 	resize_dialog->add_child(resize_dialog_vbox);
 
-	new_size_line_edit = memnew(LineEdit);
-	new_size_line_edit->connect("text_changed", callable_mp(this, &EditorInspectorArray::_new_size_line_edit_text_changed));
-	new_size_line_edit->connect("text_submitted", callable_mp(this, &EditorInspectorArray::_new_size_line_edit_text_submitted));
-	resize_dialog_vbox->add_margin_child(TTRC("New Size:"), new_size_line_edit);
+	new_size_spin_box = memnew(SpinBox);
+	new_size_spin_box->set_max(16384);
+	new_size_spin_box->connect("value_changed", callable_mp(this, &EditorInspectorArray::_new_size_spin_box_value_changed));
+	new_size_spin_box->get_line_edit()->connect("text_submitted", callable_mp(this, &EditorInspectorArray::_new_size_spin_box_text_submitted));
+	resize_dialog_vbox->add_margin_child(TTRC("New Size:"), new_size_spin_box);
 
 	vbox->connect("visibility_changed", callable_mp(this, &EditorInspectorArray::_vbox_visibility_changed));
 }
@@ -2665,7 +2650,6 @@ void EditorInspector::update_tree() {
 
 	List<PropertyInfo> plist;
 	object->get_property_list(&plist, true);
-	_update_script_class_properties(*object, plist);
 
 	HashMap<VBoxContainer *, HashMap<String, VBoxContainer *>> vbox_per_path;
 	HashMap<String, EditorInspectorArray *> editor_inspector_array_per_prefix;
@@ -2678,7 +2662,7 @@ void EditorInspector::update_tree() {
 		_parse_added_editors(main_vbox, nullptr, ped);
 	}
 
-	StringName type_name;
+	StringName doc_name;
 
 	// Get the lists of editors for properties.
 	for (List<PropertyInfo>::Element *E_property = plist.front(); E_property; E_property = E_property->next()) {
@@ -2750,18 +2734,28 @@ void EditorInspector::update_tree() {
 			category_vbox = nullptr; //reset
 
 			String type = p.name;
-			type_name = p.name;
+			String label = p.name;
+			doc_name = p.name;
 
 			// Set the category icon.
 			if (!ClassDB::class_exists(type) && !ScriptServer::is_global_class(type) && p.hint_string.length() && FileAccess::exists(p.hint_string)) {
 				// If we have a category inside a script, search for the first script with a valid icon.
 				Ref<Script> script = ResourceLoader::load(p.hint_string, "Script");
 				StringName base_type;
+				StringName name;
 				if (script.is_valid()) {
 					base_type = script->get_instance_base_type();
+					name = EditorNode::get_editor_data().script_class_get_name(script->get_path());
+					Vector<DocData::ClassDoc> docs = script->get_documentation();
+					if (!docs.is_empty()) {
+						doc_name = docs[0].name;
+					}
+					if (name != StringName() && label != name) {
+						label = name;
+					}
 				}
 				while (script.is_valid()) {
-					StringName name = EditorNode::get_editor_data().script_class_get_name(script->get_path());
+					name = EditorNode::get_editor_data().script_class_get_name(script->get_path());
 					String icon_path = EditorNode::get_editor_data().script_class_get_icon_path(name);
 					if (name != StringName() && icon_path.length()) {
 						category->icon = ResourceLoader::load(icon_path, "Texture");
@@ -2780,21 +2774,21 @@ void EditorInspector::update_tree() {
 			}
 
 			// Set the category label.
-			category->label = type;
+			category->label = label;
 
 			if (use_doc_hints) {
 				// Sets the category tooltip to show documentation.
-				if (!class_descr_cache.has(type_name)) {
+				if (!class_descr_cache.has(doc_name)) {
 					String descr;
 					DocTools *dd = EditorHelp::get_doc_data();
-					HashMap<String, DocData::ClassDoc>::Iterator E = dd->class_list.find(type_name);
+					HashMap<String, DocData::ClassDoc>::Iterator E = dd->class_list.find(doc_name);
 					if (E) {
 						descr = DTR(E->value.brief_description);
 					}
-					class_descr_cache[type_name] = descr;
+					class_descr_cache[doc_name] = descr;
 				}
 
-				category->set_tooltip(p.name + "::" + (class_descr_cache[type_name].is_empty() ? "" : class_descr_cache[type_name]));
+				category->set_tooltip(p.name + "::" + (class_descr_cache[doc_name].is_empty() ? "" : class_descr_cache[doc_name]));
 			}
 
 			// Add editors at the start of a category.
@@ -3016,7 +3010,6 @@ void EditorInspector::update_tree() {
 
 			Vector<String> class_name_components = String(p.class_name).split(",");
 
-			array_element_prefix = class_name_components[1];
 			int page_size = 5;
 			bool movable = true;
 			bool numbered = false;
@@ -3052,8 +3045,8 @@ void EditorInspector::update_tree() {
 				editor_inspector_array->set_undo_redo(undo_redo);
 			} else if (p.type == Variant::INT) {
 				// Setup the array to use the count property and built-in functions to create/move/delete elements.
-
-				if (class_name_components.size() > 2) {
+				if (class_name_components.size() >= 2) {
+					array_element_prefix = class_name_components[1];
 					editor_inspector_array = memnew(EditorInspectorArray);
 					int page = per_array_page.has(array_element_prefix) ? per_array_page[array_element_prefix] : 0;
 
@@ -3093,7 +3086,7 @@ void EditorInspector::update_tree() {
 			// Build the doc hint, to use as tooltip.
 
 			// Get the class name.
-			StringName classname = type_name == "" ? object->get_class_name() : type_name;
+			StringName classname = doc_name == "" ? object->get_class_name() : doc_name;
 			if (!object_class.is_empty()) {
 				classname = object_class;
 			}
@@ -3251,6 +3244,11 @@ void EditorInspector::update_tree() {
 	}
 
 	if (!hide_metadata) {
+		// Add 4px of spacing between the "Add Metadata" button and the content above it.
+		Control *spacer = memnew(Control);
+		spacer->set_custom_minimum_size(Size2(0, 4) * EDSCALE);
+		main_vbox->add_child(spacer);
+
 		Button *add_md = EditorInspector::create_inspector_action_button(TTR("Add Metadata"));
 		add_md->set_icon(get_theme_icon(SNAME("Add"), SNAME("EditorIcons")));
 		add_md->connect(SNAME("pressed"), callable_mp(this, &EditorInspector::_show_add_meta_dialog));
@@ -3922,93 +3920,6 @@ void EditorInspector::_feature_profile_changed() {
 	update_tree();
 }
 
-void EditorInspector::_update_script_class_properties(const Object &p_object, List<PropertyInfo> &r_list) const {
-	Ref<Script> script = p_object.get_script();
-	if (script.is_null()) {
-		return;
-	}
-
-	List<Ref<Script>> classes;
-
-	// NodeC -> NodeB -> NodeA
-	while (script.is_valid()) {
-		classes.push_front(script);
-		script = script->get_base_script();
-	}
-
-	if (classes.is_empty()) {
-		return;
-	}
-
-	// Script Variables -> to insert: NodeC..B..A -> bottom (insert_here)
-	List<PropertyInfo>::Element *script_variables = nullptr;
-	List<PropertyInfo>::Element *bottom = nullptr;
-	List<PropertyInfo>::Element *insert_here = nullptr;
-	for (List<PropertyInfo>::Element *E = r_list.front(); E; E = E->next()) {
-		PropertyInfo &pi = E->get();
-		if (pi.name != "Script Variables") {
-			continue;
-		}
-		script_variables = E;
-		bottom = r_list.insert_after(script_variables, PropertyInfo());
-		insert_here = bottom;
-		break;
-	}
-
-	HashSet<StringName> added;
-	for (const Ref<Script> &s : classes) {
-		String path = s->get_path();
-		String name = EditorNode::get_editor_data().script_class_get_name(path);
-		if (name.is_empty()) {
-			if (s->is_built_in()) {
-				if (s->get_name().is_empty()) {
-					name = TTR("Built-in script");
-				} else {
-					name = vformat("%s (%s)", s->get_name(), TTR("Built-in"));
-				}
-			} else {
-				name = path.get_file();
-			}
-		}
-
-		List<PropertyInfo> props;
-		s->get_script_property_list(&props);
-
-		// Script Variables -> NodeA -> bottom (insert_here)
-		List<PropertyInfo>::Element *category = r_list.insert_before(insert_here, PropertyInfo(Variant::NIL, name, PROPERTY_HINT_NONE, path, PROPERTY_USAGE_CATEGORY));
-
-		// Script Variables -> NodeA -> A props... -> bottom (insert_here)
-		for (List<PropertyInfo>::Element *P = props.front(); P; P = P->next()) {
-			PropertyInfo &pi = P->get();
-			if (added.has(pi.name)) {
-				continue;
-			}
-			added.insert(pi.name);
-
-			r_list.insert_before(insert_here, pi);
-
-			List<PropertyInfo>::Element *prop_below = bottom->next();
-			while (prop_below) {
-				if (prop_below->get() == pi) {
-					List<PropertyInfo>::Element *to_delete = prop_below;
-					prop_below = prop_below->next();
-					r_list.erase(to_delete);
-				} else {
-					prop_below = prop_below->next();
-				}
-			}
-		}
-
-		// Script Variables -> NodeA (insert_here) -> A props... -> bottom
-		insert_here = category;
-	}
-
-	if (script_variables) {
-		r_list.erase(script_variables);
-		r_list.erase(bottom);
-	}
-}
-
 void EditorInspector::set_restrict_to_basic_settings(bool p_restrict) {
 	restrict_to_basic = p_restrict;
 	update_tree();
diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h
index 9b5e295854..baba9ec1f4 100644
--- a/editor/editor_inspector.h
+++ b/editor/editor_inspector.h
@@ -39,6 +39,7 @@
 #include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/scroll_container.h"
+#include "scene/gui/spin_box.h"
 #include "scene/gui/texture_rect.h"
 
 class UndoRedo;
@@ -333,8 +334,7 @@ class EditorInspectorArray : public EditorInspectorSection {
 	Button *add_button = nullptr;
 
 	AcceptDialog *resize_dialog = nullptr;
-	int new_size = 0;
-	LineEdit *new_size_line_edit = nullptr;
+	SpinBox *new_size_spin_box = nullptr;
 
 	// Pagination
 	int page_length = 5;
@@ -390,8 +390,8 @@ class EditorInspectorArray : public EditorInspectorSection {
 	Array _extract_properties_as_array(const List<PropertyInfo> &p_list);
 	int _drop_position() const;
 
-	void _new_size_line_edit_text_changed(String p_text);
-	void _new_size_line_edit_text_submitted(String p_text);
+	void _new_size_spin_box_value_changed(float p_value);
+	void _new_size_spin_box_text_submitted(String p_text);
 	void _resize_dialog_confirmed();
 
 	void _update_elements_visibility();
@@ -536,7 +536,6 @@ class EditorInspector : public ScrollContainer {
 	void _vscroll_changed(double);
 
 	void _feature_profile_changed();
-	void _update_script_class_properties(const Object &p_object, List<PropertyInfo> &r_list) const;
 
 	bool _is_property_disabled_by_feature_profile(const StringName &p_property);
 
diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp
index 38cc85bb4e..8aa099ddff 100644
--- a/editor/editor_log.cpp
+++ b/editor/editor_log.cpp
@@ -93,6 +93,12 @@ void EditorLog::_update_theme() {
 	collapse_button->set_icon(get_theme_icon(SNAME("CombineLines"), SNAME("EditorIcons")));
 	show_search_button->set_icon(get_theme_icon(SNAME("Search"), SNAME("EditorIcons")));
 	search_box->set_right_icon(get_theme_icon(SNAME("Search"), SNAME("EditorIcons")));
+
+	theme_cache.error_color = get_theme_color(SNAME("error_color"), SNAME("Editor"));
+	theme_cache.error_icon = get_theme_icon(SNAME("Error"), SNAME("EditorIcons"));
+	theme_cache.warning_color = get_theme_color(SNAME("warning_color"), SNAME("Editor"));
+	theme_cache.warning_icon = get_theme_icon(SNAME("Warning"), SNAME("EditorIcons"));
+	theme_cache.message_color = get_theme_color(SNAME("font_color"), SNAME("Editor")) * Color(1, 1, 1, 0.6);
 }
 
 void EditorLog::_notification(int p_what) {
@@ -264,22 +270,22 @@ void EditorLog::_add_log_line(LogMessage &p_message, bool p_replace_previous) {
 		case MSG_TYPE_STD_RICH: {
 		} break;
 		case MSG_TYPE_ERROR: {
-			log->push_color(get_theme_color(SNAME("error_color"), SNAME("Editor")));
-			Ref<Texture2D> icon = get_theme_icon(SNAME("Error"), SNAME("EditorIcons"));
+			log->push_color(theme_cache.error_color);
+			Ref<Texture2D> icon = theme_cache.error_icon;
 			log->add_image(icon);
 			log->add_text(" ");
 			tool_button->set_icon(icon);
 		} break;
 		case MSG_TYPE_WARNING: {
-			log->push_color(get_theme_color(SNAME("warning_color"), SNAME("Editor")));
-			Ref<Texture2D> icon = get_theme_icon(SNAME("Warning"), SNAME("EditorIcons"));
+			log->push_color(theme_cache.warning_color);
+			Ref<Texture2D> icon = theme_cache.warning_icon;
 			log->add_image(icon);
 			log->add_text(" ");
 			tool_button->set_icon(icon);
 		} break;
 		case MSG_TYPE_EDITOR: {
 			// Distinguish editor messages from messages printed by the project
-			log->push_color(get_theme_color(SNAME("font_color"), SNAME("Editor")) * Color(1, 1, 1, 0.6));
+			log->push_color(theme_cache.message_color);
 		} break;
 	}
 
diff --git a/editor/editor_log.h b/editor/editor_log.h
index 003a148b9b..c225e6d8c5 100644
--- a/editor/editor_log.h
+++ b/editor/editor_log.h
@@ -67,6 +67,16 @@ private:
 		}
 	};
 
+	struct {
+		Color error_color;
+		Ref<Texture2D> error_icon;
+
+		Color warning_color;
+		Ref<Texture2D> warning_icon;
+
+		Color message_color;
+	} theme_cache;
+
 	// Encapsulates all data and functionality regarding filters.
 	struct LogFilter {
 	private:
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 8caa38737c..2941ae6695 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -54,6 +54,7 @@
 #include "scene/gui/dialogs.h"
 #include "scene/gui/file_dialog.h"
 #include "scene/gui/link_button.h"
+#include "scene/gui/menu_bar.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/panel_container.h"
@@ -141,6 +142,7 @@
 #include "editor/plugins/bone_map_editor_plugin.h"
 #include "editor/plugins/camera_3d_editor_plugin.h"
 #include "editor/plugins/canvas_item_editor_plugin.h"
+#include "editor/plugins/cast_2d_editor_plugin.h"
 #include "editor/plugins/collision_polygon_2d_editor_plugin.h"
 #include "editor/plugins/collision_shape_2d_editor_plugin.h"
 #include "editor/plugins/control_editor_plugin.h"
@@ -176,7 +178,6 @@
 #include "editor/plugins/physical_bone_3d_editor_plugin.h"
 #include "editor/plugins/polygon_2d_editor_plugin.h"
 #include "editor/plugins/polygon_3d_editor_plugin.h"
-#include "editor/plugins/ray_cast_2d_editor_plugin.h"
 #include "editor/plugins/resource_preloader_editor_plugin.h"
 #include "editor/plugins/root_motion_editor_plugin.h"
 #include "editor/plugins/script_editor_plugin.h"
@@ -751,11 +752,7 @@ void EditorNode::_notification(int p_what) {
 				scene_tabs->add_theme_style_override("tab_selected", gui_base->get_theme_stylebox(SNAME("SceneTabFG"), SNAME("EditorStyles")));
 				scene_tabs->add_theme_style_override("tab_unselected", gui_base->get_theme_stylebox(SNAME("SceneTabBG"), SNAME("EditorStyles")));
 
-				file_menu->add_theme_style_override("hover", gui_base->get_theme_stylebox(SNAME("MenuHover"), SNAME("EditorStyles")));
-				project_menu->add_theme_style_override("hover", gui_base->get_theme_stylebox(SNAME("MenuHover"), SNAME("EditorStyles")));
-				debug_menu->add_theme_style_override("hover", gui_base->get_theme_stylebox(SNAME("MenuHover"), SNAME("EditorStyles")));
-				settings_menu->add_theme_style_override("hover", gui_base->get_theme_stylebox(SNAME("MenuHover"), SNAME("EditorStyles")));
-				help_menu->add_theme_style_override("hover", gui_base->get_theme_stylebox(SNAME("MenuHover"), SNAME("EditorStyles")));
+				main_menu->add_theme_style_override("hover", gui_base->get_theme_stylebox(SNAME("MenuHover"), SNAME("EditorStyles")));
 			}
 
 			scene_tabs->set_max_tab_width(int(EDITOR_GET("interface/scene_tabs/maximum_width")) * EDSCALE);
@@ -803,16 +800,15 @@ void EditorNode::_notification(int p_what) {
 				dock_tab_move_right->set_icon(theme->get_icon(SNAME("Forward"), SNAME("EditorIcons")));
 			}
 
-			PopupMenu *p = help_menu->get_popup();
-			p->set_item_icon(p->get_item_index(HELP_SEARCH), gui_base->get_theme_icon(SNAME("HelpSearch"), SNAME("EditorIcons")));
-			p->set_item_icon(p->get_item_index(HELP_DOCS), gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")));
-			p->set_item_icon(p->get_item_index(HELP_QA), gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")));
-			p->set_item_icon(p->get_item_index(HELP_REPORT_A_BUG), gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")));
-			p->set_item_icon(p->get_item_index(HELP_SUGGEST_A_FEATURE), gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")));
-			p->set_item_icon(p->get_item_index(HELP_SEND_DOCS_FEEDBACK), gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")));
-			p->set_item_icon(p->get_item_index(HELP_COMMUNITY), gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")));
-			p->set_item_icon(p->get_item_index(HELP_ABOUT), gui_base->get_theme_icon(SNAME("Godot"), SNAME("EditorIcons")));
-			p->set_item_icon(p->get_item_index(HELP_SUPPORT_GODOT_DEVELOPMENT), gui_base->get_theme_icon(SNAME("Heart"), SNAME("EditorIcons")));
+			help_menu->set_item_icon(help_menu->get_item_index(HELP_SEARCH), gui_base->get_theme_icon(SNAME("HelpSearch"), SNAME("EditorIcons")));
+			help_menu->set_item_icon(help_menu->get_item_index(HELP_DOCS), gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")));
+			help_menu->set_item_icon(help_menu->get_item_index(HELP_QA), gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")));
+			help_menu->set_item_icon(help_menu->get_item_index(HELP_REPORT_A_BUG), gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")));
+			help_menu->set_item_icon(help_menu->get_item_index(HELP_SUGGEST_A_FEATURE), gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")));
+			help_menu->set_item_icon(help_menu->get_item_index(HELP_SEND_DOCS_FEEDBACK), gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")));
+			help_menu->set_item_icon(help_menu->get_item_index(HELP_COMMUNITY), gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")));
+			help_menu->set_item_icon(help_menu->get_item_index(HELP_ABOUT), gui_base->get_theme_icon(SNAME("Godot"), SNAME("EditorIcons")));
+			help_menu->set_item_icon(help_menu->get_item_index(HELP_SUPPORT_GODOT_DEVELOPMENT), gui_base->get_theme_icon(SNAME("Heart"), SNAME("EditorIcons")));
 
 			for (int i = 0; i < main_editor_buttons.size(); i++) {
 				main_editor_buttons.write[i]->add_theme_font_override("font", gui_base->get_theme_font(SNAME("main_button_font"), SNAME("EditorFonts")));
@@ -1942,6 +1938,21 @@ void EditorNode::_dialog_action(String p_file) {
 			}
 		} break;
 
+		case FILE_SAVE_AND_RUN_MAIN_SCENE: {
+			ProjectSettings::get_singleton()->set("application/run/main_scene", p_file);
+			ProjectSettings::get_singleton()->save();
+
+			if (file->get_file_mode() == EditorFileDialog::FILE_MODE_SAVE_FILE) {
+				_save_default_environment();
+				_save_scene_with_preview(p_file);
+				if ((bool)pick_main_scene->get_meta("from_native", false)) {
+					run_native->resume_run_native();
+				} else {
+					_run(false, p_file);
+				}
+			}
+		} break;
+
 		case FILE_EXPORT_MESH_LIBRARY: {
 			Ref<MeshLibrary> ml;
 			if (file_export_lib_merge->is_pressed() && FileAccess::exists(p_file)) {
@@ -2396,10 +2407,8 @@ void EditorNode::_run(bool p_current, const String &p_custom) {
 		}
 
 		if (scene->get_scene_file_path().is_empty()) {
-			current_menu_option = -1;
-			_menu_option(FILE_SAVE_AS_SCENE);
-			// Set the option to save and run so when the dialog is accepted, the scene runs.
 			current_menu_option = FILE_SAVE_AND_RUN;
+			_menu_option_confirm(FILE_SAVE_AS_SCENE, true);
 			file->set_title(TTR("Save scene before running..."));
 			return;
 		}
@@ -2414,6 +2423,7 @@ void EditorNode::_run(bool p_current, const String &p_custom) {
 		if (!ensure_main_scene(false)) {
 			return;
 		}
+		run_filename = GLOBAL_DEF_BASIC("application/run/main_scene", "");
 	}
 
 	if (bool(EDITOR_GET("run/auto_save/save_before_running"))) {
@@ -3181,17 +3191,15 @@ void EditorNode::_update_file_menu_opened() {
 	Ref<Shortcut> reopen_closed_scene_sc = ED_GET_SHORTCUT("editor/reopen_closed_scene");
 	reopen_closed_scene_sc->set_name(TTR("Reopen Closed Scene"));
 
-	PopupMenu *pop = file_menu->get_popup();
-	pop->set_item_disabled(pop->get_item_index(FILE_OPEN_PREV), previous_scenes.is_empty());
+	file_menu->set_item_disabled(file_menu->get_item_index(FILE_OPEN_PREV), previous_scenes.is_empty());
 
 	const UndoRedo &undo_redo = editor_data.get_undo_redo();
-	pop->set_item_disabled(pop->get_item_index(EDIT_UNDO), !undo_redo.has_undo());
-	pop->set_item_disabled(pop->get_item_index(EDIT_REDO), !undo_redo.has_redo());
+	file_menu->set_item_disabled(file_menu->get_item_index(EDIT_UNDO), !undo_redo.has_undo());
+	file_menu->set_item_disabled(file_menu->get_item_index(EDIT_REDO), !undo_redo.has_redo());
 }
 
 void EditorNode::_update_file_menu_closed() {
-	PopupMenu *pop = file_menu->get_popup();
-	pop->set_item_disabled(pop->get_item_index(FILE_OPEN_PREV), false);
+	file_menu->set_item_disabled(file_menu->get_item_index(FILE_OPEN_PREV), false);
 }
 
 Control *EditorNode::get_main_control() {
@@ -4102,8 +4110,15 @@ void EditorNode::_pick_main_scene_custom_action(const String &p_custom_action_na
 		}
 
 		pick_main_scene->hide();
-		current_menu_option = SETTINGS_PICK_MAIN_SCENE;
-		_dialog_action(scene->get_scene_file_path());
+
+		if (!FileAccess::exists(scene->get_scene_file_path())) {
+			current_menu_option = FILE_SAVE_AND_RUN_MAIN_SCENE;
+			_menu_option_confirm(FILE_SAVE_AS_SCENE, true);
+			file->set_title(TTR("Save scene before running..."));
+		} else {
+			current_menu_option = SETTINGS_PICK_MAIN_SCENE;
+			_dialog_action(scene->get_scene_file_path());
+		}
 	}
 }
 
@@ -6130,7 +6145,7 @@ EditorNode::EditorNode() {
 		rmp.instantiate();
 		EditorInspector::add_inspector_plugin(rmp);
 
-		Ref<EditorInspectorShaderModePlugin> smp;
+		Ref<EditorInspectorVisualShaderModePlugin> smp;
 		smp.instantiate();
 		EditorInspector::add_inspector_plugin(smp);
 	}
@@ -6450,15 +6465,20 @@ EditorNode::EditorNode() {
 	main_control->add_theme_constant_override("separation", 0);
 	scene_root_parent->add_child(main_control);
 
-	HBoxContainer *left_menu_hb = memnew(HBoxContainer);
-	menu_hb->add_child(left_menu_hb);
+	bool global_menu = !bool(EDITOR_GET("interface/editor/use_embedded_menu")) && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_GLOBAL_MENU);
 
-	file_menu = memnew(MenuButton);
-	file_menu->set_flat(false);
-	file_menu->set_switch_on_hover(true);
-	file_menu->set_text(TTR("Scene"));
-	file_menu->add_theme_style_override("hover", gui_base->get_theme_stylebox(SNAME("MenuHover"), SNAME("EditorStyles")));
-	left_menu_hb->add_child(file_menu);
+	main_menu = memnew(MenuBar);
+	menu_hb->add_child(main_menu);
+	main_menu->add_theme_style_override("hover", gui_base->get_theme_stylebox(SNAME("MenuHover"), SNAME("EditorStyles")));
+	main_menu->set_flat(true);
+	main_menu->set_start_index(0); // Main menu, add to the start of global menu.
+	main_menu->set_prefer_global_menu(global_menu);
+	main_menu->set_switch_on_hover(true);
+
+	file_menu = memnew(PopupMenu);
+	file_menu->set_name(TTR("Scene"));
+	main_menu->add_child(file_menu);
+	main_menu->set_menu_tooltip(0, TTR("Operations with scene files."));
 
 	prev_scene = memnew(Button);
 	prev_scene->set_flat(true);
@@ -6528,84 +6548,75 @@ EditorNode::EditorNode() {
 	command_palette->set_title(TTR("Command Palette"));
 	gui_base->add_child(command_palette);
 
-	PopupMenu *p;
-
-	file_menu->set_tooltip(TTR("Operations with scene files."));
-
-	p = file_menu->get_popup();
+	file_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/new_scene", TTR("New Scene"), KeyModifierMask::CMD + Key::N), FILE_NEW_SCENE);
+	file_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/new_inherited_scene", TTR("New Inherited Scene..."), KeyModifierMask::CMD + KeyModifierMask::SHIFT + Key::N), FILE_NEW_INHERITED_SCENE);
+	file_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/open_scene", TTR("Open Scene..."), KeyModifierMask::CMD + Key::O), FILE_OPEN_SCENE);
+	file_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/reopen_closed_scene", TTR("Reopen Closed Scene"), KeyModifierMask::CMD + KeyModifierMask::SHIFT + Key::T), FILE_OPEN_PREV);
+	file_menu->add_submenu_item(TTR("Open Recent"), "RecentScenes", FILE_OPEN_RECENT);
 
-	p->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/new_scene", TTR("New Scene"), KeyModifierMask::CMD + Key::N), FILE_NEW_SCENE);
-	p->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/new_inherited_scene", TTR("New Inherited Scene..."), KeyModifierMask::CMD + KeyModifierMask::SHIFT + Key::N), FILE_NEW_INHERITED_SCENE);
-	p->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/open_scene", TTR("Open Scene..."), KeyModifierMask::CMD + Key::O), FILE_OPEN_SCENE);
-	p->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/reopen_closed_scene", TTR("Reopen Closed Scene"), KeyModifierMask::CMD + KeyModifierMask::SHIFT + Key::T), FILE_OPEN_PREV);
-	p->add_submenu_item(TTR("Open Recent"), "RecentScenes", FILE_OPEN_RECENT);
-
-	p->add_separator();
-	p->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/save_scene", TTR("Save Scene"), KeyModifierMask::CMD + Key::S), FILE_SAVE_SCENE);
-	p->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/save_scene_as", TTR("Save Scene As..."), KeyModifierMask::CMD + KeyModifierMask::SHIFT + Key::S), FILE_SAVE_AS_SCENE);
-	p->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/save_all_scenes", TTR("Save All Scenes"), KeyModifierMask::CMD + KeyModifierMask::SHIFT + KeyModifierMask::ALT + Key::S), FILE_SAVE_ALL_SCENES);
+	file_menu->add_separator();
+	file_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/save_scene", TTR("Save Scene"), KeyModifierMask::CMD + Key::S), FILE_SAVE_SCENE);
+	file_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/save_scene_as", TTR("Save Scene As..."), KeyModifierMask::CMD + KeyModifierMask::SHIFT + Key::S), FILE_SAVE_AS_SCENE);
+	file_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/save_all_scenes", TTR("Save All Scenes"), KeyModifierMask::CMD + KeyModifierMask::SHIFT + KeyModifierMask::ALT + Key::S), FILE_SAVE_ALL_SCENES);
 
-	p->add_separator();
+	file_menu->add_separator();
 
-	p->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/quick_open", TTR("Quick Open..."), KeyModifierMask::SHIFT + KeyModifierMask::ALT + Key::O), FILE_QUICK_OPEN);
-	p->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/quick_open_scene", TTR("Quick Open Scene..."), KeyModifierMask::CMD + KeyModifierMask::SHIFT + Key::O), FILE_QUICK_OPEN_SCENE);
-	p->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/quick_open_script", TTR("Quick Open Script..."), KeyModifierMask::CMD + KeyModifierMask::ALT + Key::O), FILE_QUICK_OPEN_SCRIPT);
+	file_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/quick_open", TTR("Quick Open..."), KeyModifierMask::SHIFT + KeyModifierMask::ALT + Key::O), FILE_QUICK_OPEN);
+	file_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/quick_open_scene", TTR("Quick Open Scene..."), KeyModifierMask::CMD + KeyModifierMask::SHIFT + Key::O), FILE_QUICK_OPEN_SCENE);
+	file_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/quick_open_script", TTR("Quick Open Script..."), KeyModifierMask::CMD + KeyModifierMask::ALT + Key::O), FILE_QUICK_OPEN_SCRIPT);
 
-	p->add_separator();
+	file_menu->add_separator();
 	export_as_menu = memnew(PopupMenu);
 	export_as_menu->set_name("Export");
-	p->add_child(export_as_menu);
-	p->add_submenu_item(TTR("Export As..."), "Export");
+	file_menu->add_child(export_as_menu);
+	file_menu->add_submenu_item(TTR("Export As..."), "Export");
 	export_as_menu->add_shortcut(ED_SHORTCUT("editor/export_as_mesh_library", TTR("MeshLibrary...")), FILE_EXPORT_MESH_LIBRARY);
 	export_as_menu->connect("index_pressed", callable_mp(this, &EditorNode::_export_as_menu_option));
 
-	p->add_separator();
-	p->add_shortcut(ED_GET_SHORTCUT("ui_undo"), EDIT_UNDO, true);
-	p->add_shortcut(ED_GET_SHORTCUT("ui_redo"), EDIT_REDO, true);
+	file_menu->add_separator();
+	file_menu->add_shortcut(ED_GET_SHORTCUT("ui_undo"), EDIT_UNDO, true);
+	file_menu->add_shortcut(ED_GET_SHORTCUT("ui_redo"), EDIT_REDO, true);
 
-	p->add_separator();
-	p->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/reload_saved_scene", TTR("Reload Saved Scene")), EDIT_RELOAD_SAVED_SCENE);
-	p->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/close_scene", TTR("Close Scene"), KeyModifierMask::CMD + KeyModifierMask::SHIFT + Key::W), FILE_CLOSE);
+	file_menu->add_separator();
+	file_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/reload_saved_scene", TTR("Reload Saved Scene")), EDIT_RELOAD_SAVED_SCENE);
+	file_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/close_scene", TTR("Close Scene"), KeyModifierMask::CMD + KeyModifierMask::SHIFT + Key::W), FILE_CLOSE);
 
 	recent_scenes = memnew(PopupMenu);
 	recent_scenes->set_name("RecentScenes");
-	p->add_child(recent_scenes);
+	file_menu->add_child(recent_scenes);
 	recent_scenes->connect("id_pressed", callable_mp(this, &EditorNode::_open_recent_scene));
 
-	p->add_separator();
-	p->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/file_quit", TTR("Quit"), KeyModifierMask::CMD + Key::Q), FILE_QUIT, true);
-
-	project_menu = memnew(MenuButton);
-	project_menu->set_flat(false);
-	project_menu->set_switch_on_hover(true);
-	project_menu->set_tooltip(TTR("Miscellaneous project or scene-wide tools."));
-	project_menu->set_text(TTR("Project"));
-	project_menu->add_theme_style_override("hover", gui_base->get_theme_stylebox(SNAME("MenuHover"), SNAME("EditorStyles")));
-	left_menu_hb->add_child(project_menu);
+	if (!global_menu || !OS::get_singleton()->has_feature("macos")) {
+		// On macOS  "Quit" and "About" options are in the "app" menu.
+		file_menu->add_separator();
+		file_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/file_quit", TTR("Quit"), KeyModifierMask::CMD + Key::Q), FILE_QUIT, true);
+	}
 
-	p = project_menu->get_popup();
+	project_menu = memnew(PopupMenu);
+	project_menu->set_name(TTR("Project"));
+	main_menu->add_child(project_menu);
 
-	p->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/project_settings", TTR("Project Settings..."), Key::NONE, TTR("Project Settings")), RUN_SETTINGS);
-	p->connect("id_pressed", callable_mp(this, &EditorNode::_menu_option));
+	project_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/project_settings", TTR("Project Settings..."), Key::NONE, TTR("Project Settings")), RUN_SETTINGS);
+	project_menu->connect("id_pressed", callable_mp(this, &EditorNode::_menu_option));
 
 	vcs_actions_menu = VersionControlEditorPlugin::get_singleton()->get_version_control_actions_panel();
 	vcs_actions_menu->set_name("Version Control");
 	vcs_actions_menu->connect("index_pressed", callable_mp(this, &EditorNode::_version_control_menu_option));
-	p->add_separator();
-	p->add_child(vcs_actions_menu);
-	p->add_submenu_item(TTR("Version Control"), "Version Control");
+	project_menu->add_separator();
+	project_menu->add_child(vcs_actions_menu);
+	project_menu->add_submenu_item(TTR("Version Control"), "Version Control");
 	vcs_actions_menu->add_item(TTR("Create Version Control Metadata"), RUN_VCS_METADATA);
 	vcs_actions_menu->add_item(TTR("Set Up Version Control"), RUN_VCS_SETTINGS);
 	vcs_actions_menu->add_item(TTR("Shut Down Version Control"), RUN_VCS_SHUT_DOWN);
 
-	p->add_separator();
-	p->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/export", TTR("Export..."), Key::NONE, TTR("Export")), FILE_EXPORT_PROJECT);
-	p->add_item(TTR("Install Android Build Template..."), FILE_INSTALL_ANDROID_SOURCE);
-	p->add_item(TTR("Open User Data Folder"), RUN_USER_DATA_FOLDER);
+	project_menu->add_separator();
+	project_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/export", TTR("Export..."), Key::NONE, TTR("Export")), FILE_EXPORT_PROJECT);
+	project_menu->add_item(TTR("Install Android Build Template..."), FILE_INSTALL_ANDROID_SOURCE);
+	project_menu->add_item(TTR("Open User Data Folder"), RUN_USER_DATA_FOLDER);
 
-	p->add_separator();
-	p->add_item(TTR("Customize Engine Build Configuration..."), TOOLS_BUILD_PROFILE_MANAGER);
-	p->add_separator();
+	project_menu->add_separator();
+	project_menu->add_item(TTR("Customize Engine Build Configuration..."), TOOLS_BUILD_PROFILE_MANAGER);
+	project_menu->add_separator();
 
 	plugin_config_dialog = memnew(PluginConfigDialog);
 	plugin_config_dialog->connect("plugin_ready", callable_mp(this, &EditorNode::_on_plugin_ready));
@@ -6614,15 +6625,15 @@ EditorNode::EditorNode() {
 	tool_menu = memnew(PopupMenu);
 	tool_menu->set_name("Tools");
 	tool_menu->connect("index_pressed", callable_mp(this, &EditorNode::_tool_menu_option));
-	p->add_child(tool_menu);
-	p->add_submenu_item(TTR("Tools"), "Tools");
+	project_menu->add_child(tool_menu);
+	project_menu->add_submenu_item(TTR("Tools"), "Tools");
 	tool_menu->add_item(TTR("Orphan Resource Explorer..."), TOOLS_ORPHAN_RESOURCES);
 
-	p->add_separator();
-	p->add_shortcut(ED_SHORTCUT("editor/reload_current_project", TTR("Reload Current Project")), RELOAD_CURRENT_PROJECT);
+	project_menu->add_separator();
+	project_menu->add_shortcut(ED_SHORTCUT("editor/reload_current_project", TTR("Reload Current Project")), RELOAD_CURRENT_PROJECT);
 	ED_SHORTCUT_AND_COMMAND("editor/quit_to_project_list", TTR("Quit to Project List"), KeyModifierMask::CMD + KeyModifierMask::SHIFT + Key::Q);
 	ED_SHORTCUT_OVERRIDE("editor/quit_to_project_list", "macos", KeyModifierMask::SHIFT + KeyModifierMask::ALT + Key::Q);
-	p->add_shortcut(ED_GET_SHORTCUT("editor/quit_to_project_list"), RUN_PROJECT_MANAGER, true);
+	project_menu->add_shortcut(ED_GET_SHORTCUT("editor/quit_to_project_list"), RUN_PROJECT_MANAGER, true);
 
 	menu_hb->add_spacer();
 
@@ -6630,85 +6641,79 @@ EditorNode::EditorNode() {
 	menu_hb->add_child(main_editor_button_vb);
 
 	// Options are added and handled by DebuggerEditorPlugin.
-	debug_menu = memnew(MenuButton);
-	debug_menu->set_flat(false);
-	debug_menu->set_switch_on_hover(true);
-	debug_menu->set_text(TTR("Debug"));
-	debug_menu->add_theme_style_override("hover", gui_base->get_theme_stylebox(SNAME("MenuHover"), SNAME("EditorStyles")));
-	left_menu_hb->add_child(debug_menu);
+	debug_menu = memnew(PopupMenu);
+	debug_menu->set_name(TTR("Debug"));
+	main_menu->add_child(debug_menu);
 
 	menu_hb->add_spacer();
 
-	settings_menu = memnew(MenuButton);
-	settings_menu->set_flat(false);
-	settings_menu->set_switch_on_hover(true);
-	settings_menu->set_text(TTR("Editor"));
-	settings_menu->add_theme_style_override("hover", gui_base->get_theme_stylebox(SNAME("MenuHover"), SNAME("EditorStyles")));
-	left_menu_hb->add_child(settings_menu);
-
-	p = settings_menu->get_popup();
+	settings_menu = memnew(PopupMenu);
+	settings_menu->set_name(TTR("Editor"));
+	main_menu->add_child(settings_menu);
 
 	ED_SHORTCUT_AND_COMMAND("editor/editor_settings", TTR("Editor Settings..."));
 	ED_SHORTCUT_OVERRIDE("editor/editor_settings", "macos", KeyModifierMask::CMD + Key::COMMA);
-	p->add_shortcut(ED_GET_SHORTCUT("editor/editor_settings"), SETTINGS_PREFERENCES);
-	p->add_shortcut(ED_SHORTCUT("editor/command_palette", TTR("Command Palette..."), KeyModifierMask::CMD | KeyModifierMask::SHIFT | Key::P), HELP_COMMAND_PALETTE);
-	p->add_separator();
+	settings_menu->add_shortcut(ED_GET_SHORTCUT("editor/editor_settings"), SETTINGS_PREFERENCES);
+	settings_menu->add_shortcut(ED_SHORTCUT("editor/command_palette", TTR("Command Palette..."), KeyModifierMask::CMD | KeyModifierMask::SHIFT | Key::P), HELP_COMMAND_PALETTE);
+	settings_menu->add_separator();
 
 	editor_layouts = memnew(PopupMenu);
 	editor_layouts->set_name("Layouts");
-	p->add_child(editor_layouts);
+	settings_menu->add_child(editor_layouts);
 	editor_layouts->connect("id_pressed", callable_mp(this, &EditorNode::_layout_menu_option));
-	p->add_submenu_item(TTR("Editor Layout"), "Layouts");
-	p->add_separator();
+	settings_menu->add_submenu_item(TTR("Editor Layout"), "Layouts");
+	settings_menu->add_separator();
 
 	ED_SHORTCUT_AND_COMMAND("editor/take_screenshot", TTR("Take Screenshot"), KeyModifierMask::CTRL | Key::F12);
 	ED_SHORTCUT_OVERRIDE("editor/take_screenshot", "macos", KeyModifierMask::CMD | Key::F12);
-	p->add_shortcut(ED_GET_SHORTCUT("editor/take_screenshot"), EDITOR_SCREENSHOT);
+	settings_menu->add_shortcut(ED_GET_SHORTCUT("editor/take_screenshot"), EDITOR_SCREENSHOT);
 
-	p->set_item_tooltip(-1, TTR("Screenshots are stored in the Editor Data/Settings Folder."));
+	settings_menu->set_item_tooltip(-1, TTR("Screenshots are stored in the Editor Data/Settings Folder."));
 
 	ED_SHORTCUT_AND_COMMAND("editor/fullscreen_mode", TTR("Toggle Fullscreen"), KeyModifierMask::SHIFT | Key::F11);
 	ED_SHORTCUT_OVERRIDE("editor/fullscreen_mode", "macos", KeyModifierMask::CMD | KeyModifierMask::CTRL | Key::F);
-	p->add_shortcut(ED_GET_SHORTCUT("editor/fullscreen_mode"), SETTINGS_TOGGLE_FULLSCREEN);
+	settings_menu->add_shortcut(ED_GET_SHORTCUT("editor/fullscreen_mode"), SETTINGS_TOGGLE_FULLSCREEN);
 
-	p->add_separator();
+	settings_menu->add_separator();
 
 	if (OS::get_singleton()->get_data_path() == OS::get_singleton()->get_config_path()) {
 		// Configuration and data folders are located in the same place (Windows/MacOS).
-		p->add_item(TTR("Open Editor Data/Settings Folder"), SETTINGS_EDITOR_DATA_FOLDER);
+		settings_menu->add_item(TTR("Open Editor Data/Settings Folder"), SETTINGS_EDITOR_DATA_FOLDER);
 	} else {
 		// Separate configuration and data folders (Linux).
-		p->add_item(TTR("Open Editor Data Folder"), SETTINGS_EDITOR_DATA_FOLDER);
-		p->add_item(TTR("Open Editor Settings Folder"), SETTINGS_EDITOR_CONFIG_FOLDER);
+		settings_menu->add_item(TTR("Open Editor Data Folder"), SETTINGS_EDITOR_DATA_FOLDER);
+		settings_menu->add_item(TTR("Open Editor Settings Folder"), SETTINGS_EDITOR_CONFIG_FOLDER);
 	}
-	p->add_separator();
+	settings_menu->add_separator();
 
-	p->add_item(TTR("Manage Editor Features..."), SETTINGS_MANAGE_FEATURE_PROFILES);
-	p->add_item(TTR("Manage Export Templates..."), SETTINGS_MANAGE_EXPORT_TEMPLATES);
+	settings_menu->add_item(TTR("Manage Editor Features..."), SETTINGS_MANAGE_FEATURE_PROFILES);
+	settings_menu->add_item(TTR("Manage Export Templates..."), SETTINGS_MANAGE_EXPORT_TEMPLATES);
 
-	help_menu = memnew(MenuButton);
-	help_menu->set_flat(false);
-	help_menu->set_switch_on_hover(true);
-	help_menu->set_text(TTR("Help"));
-	help_menu->add_theme_style_override("hover", gui_base->get_theme_stylebox(SNAME("MenuHover"), SNAME("EditorStyles")));
-	left_menu_hb->add_child(help_menu);
+	help_menu = memnew(PopupMenu);
+	help_menu->set_name(TTR("Help"));
+	main_menu->add_child(help_menu);
 
-	p = help_menu->get_popup();
-	p->connect("id_pressed", callable_mp(this, &EditorNode::_menu_option));
+	help_menu->connect("id_pressed", callable_mp(this, &EditorNode::_menu_option));
 
 	ED_SHORTCUT_AND_COMMAND("editor/editor_help", TTR("Search Help"), Key::F1);
 	ED_SHORTCUT_OVERRIDE("editor/editor_help", "macos", KeyModifierMask::ALT | Key::SPACE);
-	p->add_icon_shortcut(gui_base->get_theme_icon(SNAME("HelpSearch"), SNAME("EditorIcons")), ED_GET_SHORTCUT("editor/editor_help"), HELP_SEARCH);
-	p->add_separator();
-	p->add_icon_shortcut(gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")), ED_SHORTCUT_AND_COMMAND("editor/online_docs", TTR("Online Documentation")), HELP_DOCS);
-	p->add_icon_shortcut(gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")), ED_SHORTCUT_AND_COMMAND("editor/q&a", TTR("Questions & Answers")), HELP_QA);
-	p->add_icon_shortcut(gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")), ED_SHORTCUT_AND_COMMAND("editor/report_a_bug", TTR("Report a Bug")), HELP_REPORT_A_BUG);
-	p->add_icon_shortcut(gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")), ED_SHORTCUT_AND_COMMAND("editor/suggest_a_feature", TTR("Suggest a Feature")), HELP_SUGGEST_A_FEATURE);
-	p->add_icon_shortcut(gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")), ED_SHORTCUT_AND_COMMAND("editor/send_docs_feedback", TTR("Send Docs Feedback")), HELP_SEND_DOCS_FEEDBACK);
-	p->add_icon_shortcut(gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")), ED_SHORTCUT_AND_COMMAND("editor/community", TTR("Community")), HELP_COMMUNITY);
-	p->add_separator();
-	p->add_icon_shortcut(gui_base->get_theme_icon(SNAME("Godot"), SNAME("EditorIcons")), ED_SHORTCUT_AND_COMMAND("editor/about", TTR("About Godot")), HELP_ABOUT);
-	p->add_icon_shortcut(gui_base->get_theme_icon(SNAME("Heart"), SNAME("EditorIcons")), ED_SHORTCUT_AND_COMMAND("editor/support_development", TTR("Support Godot Development")), HELP_SUPPORT_GODOT_DEVELOPMENT);
+	help_menu->add_icon_shortcut(gui_base->get_theme_icon(SNAME("HelpSearch"), SNAME("EditorIcons")), ED_GET_SHORTCUT("editor/editor_help"), HELP_SEARCH);
+	help_menu->add_separator();
+	help_menu->add_icon_shortcut(gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")), ED_SHORTCUT_AND_COMMAND("editor/online_docs", TTR("Online Documentation")), HELP_DOCS);
+	help_menu->add_icon_shortcut(gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")), ED_SHORTCUT_AND_COMMAND("editor/q&a", TTR("Questions & Answers")), HELP_QA);
+	help_menu->add_icon_shortcut(gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")), ED_SHORTCUT_AND_COMMAND("editor/report_a_bug", TTR("Report a Bug")), HELP_REPORT_A_BUG);
+	help_menu->add_icon_shortcut(gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")), ED_SHORTCUT_AND_COMMAND("editor/suggest_a_feature", TTR("Suggest a Feature")), HELP_SUGGEST_A_FEATURE);
+	help_menu->add_icon_shortcut(gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")), ED_SHORTCUT_AND_COMMAND("editor/send_docs_feedback", TTR("Send Docs Feedback")), HELP_SEND_DOCS_FEEDBACK);
+	help_menu->add_icon_shortcut(gui_base->get_theme_icon(SNAME("ExternalLink"), SNAME("EditorIcons")), ED_SHORTCUT_AND_COMMAND("editor/community", TTR("Community")), HELP_COMMUNITY);
+	help_menu->add_separator();
+	if (!global_menu || !OS::get_singleton()->has_feature("macos")) {
+		// On macOS  "Quit" and "About" options are in the "app" menu.
+		help_menu->add_icon_shortcut(gui_base->get_theme_icon(SNAME("Godot"), SNAME("EditorIcons")), ED_SHORTCUT_AND_COMMAND("editor/about", TTR("About Godot")), HELP_ABOUT);
+	}
+	help_menu->add_icon_shortcut(gui_base->get_theme_icon(SNAME("Heart"), SNAME("EditorIcons")), ED_SHORTCUT_AND_COMMAND("editor/support_development", TTR("Support Godot Development")), HELP_SUPPORT_GODOT_DEVELOPMENT);
+
+	Control *right_spacer = memnew(Control);
+	menu_hb->add_child(right_spacer);
 
 	HBoxContainer *play_hb = memnew(HBoxContainer);
 	menu_hb->add_child(play_hb);
@@ -6857,7 +6862,7 @@ EditorNode::EditorNode() {
 	right_menu_hb->add_child(update_spinner);
 	update_spinner->set_icon(gui_base->get_theme_icon(SNAME("Progress1"), SNAME("EditorIcons")));
 	update_spinner->get_popup()->connect("id_pressed", callable_mp(this, &EditorNode::_menu_option));
-	p = update_spinner->get_popup();
+	PopupMenu *p = update_spinner->get_popup();
 	p->add_radio_check_item(TTR("Update Continuously"), SETTINGS_UPDATE_CONTINUOUSLY);
 	p->add_radio_check_item(TTR("Update When Changed"), SETTINGS_UPDATE_WHEN_CHANGED);
 	p->add_separator();
@@ -7077,11 +7082,11 @@ EditorNode::EditorNode() {
 	gui_base->add_child(file_script);
 	file_script->connect("file_selected", callable_mp(this, &EditorNode::_dialog_action));
 
-	file_menu->get_popup()->connect("id_pressed", callable_mp(this, &EditorNode::_menu_option));
+	file_menu->connect("id_pressed", callable_mp(this, &EditorNode::_menu_option));
 	file_menu->connect("about_to_popup", callable_mp(this, &EditorNode::_update_file_menu_opened));
-	file_menu->get_popup()->connect("popup_hide", callable_mp(this, &EditorNode::_update_file_menu_closed));
+	file_menu->connect("popup_hide", callable_mp(this, &EditorNode::_update_file_menu_closed));
 
-	settings_menu->get_popup()->connect("id_pressed", callable_mp(this, &EditorNode::_menu_option));
+	settings_menu->connect("id_pressed", callable_mp(this, &EditorNode::_menu_option));
 
 	file->connect("file_selected", callable_mp(this, &EditorNode::_dialog_action));
 	file_templates->connect("file_selected", callable_mp(this, &EditorNode::_dialog_action));
@@ -7192,7 +7197,7 @@ EditorNode::EditorNode() {
 	add_editor_plugin(memnew(NavigationPolygonEditorPlugin));
 	add_editor_plugin(memnew(Path2DEditorPlugin));
 	add_editor_plugin(memnew(Polygon2DEditorPlugin));
-	add_editor_plugin(memnew(RayCast2DEditorPlugin));
+	add_editor_plugin(memnew(Cast2DEditorPlugin));
 	add_editor_plugin(memnew(Skeleton2DEditorPlugin));
 	add_editor_plugin(memnew(Sprite2DEditorPlugin));
 	add_editor_plugin(memnew(TilesEditorPlugin));
@@ -7364,11 +7369,14 @@ EditorNode::EditorNode() {
 
 	screenshot_timer = memnew(Timer);
 	screenshot_timer->set_one_shot(true);
-	screenshot_timer->set_wait_time(settings_menu->get_popup()->get_submenu_popup_delay() + 0.1f);
+	screenshot_timer->set_wait_time(settings_menu->get_submenu_popup_delay() + 0.1f);
 	screenshot_timer->connect("timeout", callable_mp(this, &EditorNode::_request_screenshot));
 	add_child(screenshot_timer);
 	screenshot_timer->set_owner(get_owner());
 
+	main_menu->set_custom_minimum_size(Size2(MAX(main_menu->get_minimum_size().x, play_hb->get_minimum_size().x + right_menu_hb->get_minimum_size().x), 0));
+	right_spacer->set_custom_minimum_size(Size2(MAX(0, main_menu->get_minimum_size().x - play_hb->get_minimum_size().x - right_menu_hb->get_minimum_size().x), 0));
+
 	String exec = OS::get_singleton()->get_executable_path();
 	// Save editor executable path for third-party tools.
 	EditorSettings::get_singleton()->set_project_metadata("editor_metadata", "executable_path", exec);
diff --git a/editor/editor_node.h b/editor/editor_node.h
index 0201e84eaf..f7a102b4c7 100644
--- a/editor/editor_node.h
+++ b/editor/editor_node.h
@@ -78,6 +78,7 @@ class FileSystemDock;
 class HSplitContainer;
 class ImportDock;
 class LinkButton;
+class MenuBar;
 class MenuButton;
 class NodeDock;
 class OrphanResourcesDialog;
@@ -141,6 +142,7 @@ private:
 		FILE_SAVE_AS_SCENE,
 		FILE_SAVE_ALL_SCENES,
 		FILE_SAVE_AND_RUN,
+		FILE_SAVE_AND_RUN_MAIN_SCENE,
 		FILE_SHOW_IN_FILESYSTEM,
 		FILE_EXPORT_PROJECT,
 		FILE_EXPORT_MESH_LIBRARY,
@@ -321,11 +323,12 @@ private:
 
 	HBoxContainer *menu_hb = nullptr;
 	Control *main_control = nullptr;
-	MenuButton *file_menu = nullptr;
-	MenuButton *project_menu = nullptr;
-	MenuButton *debug_menu = nullptr;
-	MenuButton *settings_menu = nullptr;
-	MenuButton *help_menu = nullptr;
+	MenuBar *main_menu = nullptr;
+	PopupMenu *file_menu = nullptr;
+	PopupMenu *project_menu = nullptr;
+	PopupMenu *debug_menu = nullptr;
+	PopupMenu *settings_menu = nullptr;
+	PopupMenu *help_menu = nullptr;
 	PopupMenu *tool_menu = nullptr;
 	PopupMenu *export_as_menu = nullptr;
 	Button *export_button = nullptr;
diff --git a/editor/editor_path.cpp b/editor/editor_path.cpp
index dc77b5fea9..87ebd3e1c1 100644
--- a/editor/editor_path.cpp
+++ b/editor/editor_path.cpp
@@ -72,7 +72,7 @@ void EditorPath::_add_children_to_popup(Object *p_obj, int p_depth) {
 
 		int index = sub_objects_menu->get_item_count();
 		sub_objects_menu->add_icon_item(icon, proper_name, objects.size());
-		sub_objects_menu->set_item_horizontal_offset(index, p_depth * 10 * EDSCALE);
+		sub_objects_menu->set_item_indent(index, p_depth);
 		objects.push_back(obj->get_instance_id());
 
 		_add_children_to_popup(obj, p_depth + 1);
diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp
index 566c22f5a9..400ad1ebac 100644
--- a/editor/editor_plugin.cpp
+++ b/editor/editor_plugin.cpp
@@ -445,7 +445,7 @@ void EditorPlugin::add_control_to_container(CustomControlContainer p_location, C
 			CanvasItemEditor::get_singleton()->get_bottom_split()->add_child(p_control);
 
 		} break;
-		case CONTAINER_PROPERTY_EDITOR_BOTTOM: {
+		case CONTAINER_INSPECTOR_BOTTOM: {
 			InspectorDock::get_singleton()->get_addon_area()->add_child(p_control);
 
 		} break;
@@ -498,7 +498,7 @@ void EditorPlugin::remove_control_from_container(CustomControlContainer p_locati
 			CanvasItemEditor::get_singleton()->get_bottom_split()->remove_child(p_control);
 
 		} break;
-		case CONTAINER_PROPERTY_EDITOR_BOTTOM: {
+		case CONTAINER_INSPECTOR_BOTTOM: {
 			InspectorDock::get_singleton()->get_addon_area()->remove_child(p_control);
 
 		} break;
@@ -950,7 +950,7 @@ void EditorPlugin::_bind_methods() {
 	BIND_ENUM_CONSTANT(CONTAINER_CANVAS_EDITOR_SIDE_LEFT);
 	BIND_ENUM_CONSTANT(CONTAINER_CANVAS_EDITOR_SIDE_RIGHT);
 	BIND_ENUM_CONSTANT(CONTAINER_CANVAS_EDITOR_BOTTOM);
-	BIND_ENUM_CONSTANT(CONTAINER_PROPERTY_EDITOR_BOTTOM);
+	BIND_ENUM_CONSTANT(CONTAINER_INSPECTOR_BOTTOM);
 	BIND_ENUM_CONSTANT(CONTAINER_PROJECT_SETTING_TAB_LEFT);
 	BIND_ENUM_CONSTANT(CONTAINER_PROJECT_SETTING_TAB_RIGHT);
 
diff --git a/editor/editor_plugin.h b/editor/editor_plugin.h
index 84c63d1021..3f9d276b6a 100644
--- a/editor/editor_plugin.h
+++ b/editor/editor_plugin.h
@@ -184,7 +184,7 @@ public:
 		CONTAINER_CANVAS_EDITOR_SIDE_LEFT,
 		CONTAINER_CANVAS_EDITOR_SIDE_RIGHT,
 		CONTAINER_CANVAS_EDITOR_BOTTOM,
-		CONTAINER_PROPERTY_EDITOR_BOTTOM,
+		CONTAINER_INSPECTOR_BOTTOM,
 		CONTAINER_PROJECT_SETTING_TAB_LEFT,
 		CONTAINER_PROJECT_SETTING_TAB_RIGHT,
 	};
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp
index 5298b818e7..f434df3a1e 100644
--- a/editor/editor_properties.cpp
+++ b/editor/editor_properties.cpp
@@ -133,6 +133,11 @@ void EditorPropertyMultilineText::_text_changed() {
 void EditorPropertyMultilineText::_open_big_text() {
 	if (!big_text_dialog) {
 		big_text = memnew(TextEdit);
+		if (expression) {
+			big_text->set_syntax_highlighter(text->get_syntax_highlighter());
+			big_text->add_theme_font_override("font", get_theme_font(SNAME("expression"), SNAME("EditorFonts")));
+			big_text->add_theme_font_size_override("font_size", get_theme_font_size(SNAME("expression_size"), SNAME("EditorFonts")));
+		}
 		big_text->connect("text_changed", callable_mp(this, &EditorPropertyMultilineText::_big_text_changed));
 		big_text->set_line_wrapping_mode(TextEdit::LineWrappingMode::LINE_WRAPPING_BOUNDARY);
 		big_text_dialog = memnew(AcceptDialog);
@@ -162,12 +167,24 @@ void EditorPropertyMultilineText::_notification(int p_what) {
 		case NOTIFICATION_ENTER_TREE: {
 			Ref<Texture2D> df = get_theme_icon(SNAME("DistractionFree"), SNAME("EditorIcons"));
 			open_big_text->set_icon(df);
-			Ref<Font> font = get_theme_font(SNAME("font"), SNAME("Label"));
-			int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Label"));
-			text->set_custom_minimum_size(Vector2(0, font->get_height(font_size) * 6));
-			text->add_theme_font_override("font", get_theme_font("expression", "EditorFonts"));
-			text->add_theme_font_size_override("font_size", get_theme_font_size("expression_size", "EditorFonts"));
 
+			Ref<Font> font;
+			int font_size;
+			if (expression) {
+				font = get_theme_font(SNAME("expression"), SNAME("EditorFonts"));
+				font_size = get_theme_font_size(SNAME("expression_size"), SNAME("EditorFonts"));
+
+				text->add_theme_font_override("font", font);
+				text->add_theme_font_size_override("font_size", font_size);
+				if (big_text) {
+					big_text->add_theme_font_override("font", font);
+					big_text->add_theme_font_size_override("font_size", font_size);
+				}
+			} else {
+				font = get_theme_font(SNAME("font"), SNAME("TextEdit"));
+				font_size = get_theme_font_size(SNAME("font_size"), SNAME("TextEdit"));
+			}
+			text->set_custom_minimum_size(Vector2(0, font->get_height(font_size) * 6));
 		} break;
 	}
 }
@@ -490,13 +507,55 @@ void EditorPropertyPath::_path_focus_exited() {
 	_path_selected(path->get_text());
 }
 
+void EditorPropertyPath::_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) {
+	const Dictionary drag_data = p_data;
+	if (!drag_data.has("type")) {
+		return;
+	}
+	if (String(drag_data["type"]) != "files") {
+		return;
+	}
+	const Vector<String> filesPaths = drag_data["files"];
+	if (filesPaths.size() == 0) {
+		return;
+	}
+
+	emit_changed(get_edited_property(), filesPaths[0]);
+	update_property();
+}
+
+bool EditorPropertyPath::_can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const {
+	const Dictionary drag_data = p_data;
+	if (!drag_data.has("type")) {
+		return false;
+	}
+	if (String(drag_data["type"]) != "files") {
+		return false;
+	}
+	const Vector<String> filesPaths = drag_data["files"];
+	if (filesPaths.size() == 0) {
+		return false;
+	}
+
+	for (const String &extension : extensions) {
+		if (filesPaths[0].ends_with(extension.substr(1, extension.size() - 1))) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
 void EditorPropertyPath::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("_can_drop_data_fw", "position", "data", "from"), &EditorPropertyPath::_can_drop_data_fw);
+	ClassDB::bind_method(D_METHOD("_drop_data_fw", "position", "data", "from"), &EditorPropertyPath::_drop_data_fw);
 }
 
 EditorPropertyPath::EditorPropertyPath() {
 	HBoxContainer *path_hb = memnew(HBoxContainer);
 	add_child(path_hb);
 	path = memnew(LineEdit);
+	path->set_drag_forwarding(this);
 	path->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE);
 	path_hb->add_child(path);
 	path->connect("text_submitted", callable_mp(this, &EditorPropertyPath::_path_selected));
@@ -1088,6 +1147,17 @@ void EditorPropertyLayersGrid::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("rename_confirmed", PropertyInfo(Variant::INT, "layer_id"), PropertyInfo(Variant::STRING, "new_name")));
 }
 
+void EditorPropertyLayers::_notification(int p_what) {
+	switch (p_what) {
+		case NOTIFICATION_ENTER_TREE:
+		case NOTIFICATION_THEME_CHANGED: {
+			button->set_normal_texture(get_theme_icon(SNAME("GuiTabMenuHl"), SNAME("EditorIcons")));
+			button->set_pressed_texture(get_theme_icon(SNAME("GuiTabMenuHl"), SNAME("EditorIcons")));
+			button->set_disabled_texture(get_theme_icon(SNAME("GuiTabMenu"), SNAME("EditorIcons")));
+		} break;
+	}
+}
+
 void EditorPropertyLayers::_set_read_only(bool p_read_only) {
 	button->set_disabled(p_read_only);
 	grid->set_read_only(p_read_only);
@@ -1224,9 +1294,9 @@ EditorPropertyLayers::EditorPropertyLayers() {
 	grid->set_h_size_flags(SIZE_EXPAND_FILL);
 	hb->add_child(grid);
 
-	button = memnew(Button);
+	button = memnew(TextureButton);
+	button->set_stretch_mode(TextureButton::STRETCH_KEEP_CENTERED);
 	button->set_toggle_mode(true);
-	button->set_text("...");
 	button->connect("pressed", callable_mp(this, &EditorPropertyLayers::_button_pressed));
 	hb->add_child(button);
 
diff --git a/editor/editor_properties.h b/editor/editor_properties.h
index 6a1360d2ca..c1dfb5cb1e 100644
--- a/editor/editor_properties.h
+++ b/editor/editor_properties.h
@@ -142,6 +142,8 @@ class EditorPropertyPath : public EditorProperty {
 	void _path_selected(const String &p_path);
 	void _path_pressed();
 	void _path_focus_exited();
+	void _drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from);
+	bool _can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;
 
 protected:
 	virtual void _set_read_only(bool p_read_only) override;
@@ -340,13 +342,14 @@ private:
 	String basename;
 	LayerType layer_type;
 	PopupMenu *layers = nullptr;
-	Button *button = nullptr;
+	TextureButton *button = nullptr;
 
 	void _button_pressed();
 	void _menu_pressed(int p_menu);
 	void _refresh_names();
 
 protected:
+	void _notification(int p_what);
 	virtual void _set_read_only(bool p_read_only) override;
 	static void _bind_methods();
 
diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp
index d850773a6d..e5c1836205 100644
--- a/editor/editor_resource_picker.cpp
+++ b/editor/editor_resource_picker.cpp
@@ -184,6 +184,21 @@ void EditorResourcePicker::_update_menu_items() {
 		edit_menu->add_icon_item(get_theme_icon(SNAME("Edit"), SNAME("EditorIcons")), TTR("Edit"), OBJ_MENU_EDIT);
 		edit_menu->add_icon_item(get_theme_icon(SNAME("Clear"), SNAME("EditorIcons")), TTR("Clear"), OBJ_MENU_CLEAR);
 		edit_menu->add_icon_item(get_theme_icon(SNAME("Duplicate"), SNAME("EditorIcons")), TTR("Make Unique"), OBJ_MENU_MAKE_UNIQUE);
+
+		// Check whether the resource has subresources.
+		List<PropertyInfo> property_list;
+		edited_resource->get_property_list(&property_list);
+		bool has_subresources = false;
+		for (PropertyInfo &p : property_list) {
+			if ((p.type == Variant::OBJECT) && (p.hint == PROPERTY_HINT_RESOURCE_TYPE) && (p.name != "script")) {
+				has_subresources = true;
+				break;
+			}
+		}
+		if (has_subresources) {
+			edit_menu->add_icon_item(get_theme_icon(SNAME("Duplicate"), SNAME("EditorIcons")), TTR("Make Unique (Recursive)"), OBJ_MENU_MAKE_UNIQUE_RECURSIVE);
+		}
+
 		edit_menu->add_icon_item(get_theme_icon(SNAME("Save"), SNAME("EditorIcons")), TTR("Save"), OBJ_MENU_SAVE);
 
 		if (edited_resource->get_path().is_resource_file()) {
@@ -297,28 +312,22 @@ void EditorResourcePicker::_edit_menu_cbk(int p_which) {
 				return;
 			}
 
-			List<PropertyInfo> property_list;
-			edited_resource->get_property_list(&property_list);
-			List<Pair<String, Variant>> propvalues;
-			for (const PropertyInfo &pi : property_list) {
-				Pair<String, Variant> p;
-				if (pi.usage & PROPERTY_USAGE_STORAGE) {
-					p.first = pi.name;
-					p.second = edited_resource->get(pi.name);
-				}
+			Ref<Resource> unique_resource = edited_resource->duplicate();
+			ERR_FAIL_COND(unique_resource.is_null());
 
-				propvalues.push_back(p);
+			edited_resource = unique_resource;
+			emit_signal(SNAME("resource_changed"), edited_resource);
+			_update_resource();
+		} break;
+
+		case OBJ_MENU_MAKE_UNIQUE_RECURSIVE: {
+			if (edited_resource.is_null()) {
+				return;
 			}
 
-			String orig_type = edited_resource->get_class();
-			Object *inst = ClassDB::instantiate(orig_type);
-			Ref<Resource> unique_resource = Ref<Resource>(Object::cast_to<Resource>(inst));
+			Ref<Resource> unique_resource = edited_resource->duplicate(true);
 			ERR_FAIL_COND(unique_resource.is_null());
 
-			for (const Pair<String, Variant> &p : propvalues) {
-				unique_resource->set(p.first, p.second);
-			}
-
 			edited_resource = unique_resource;
 			emit_signal(SNAME("resource_changed"), edited_resource);
 			_update_resource();
diff --git a/editor/editor_resource_picker.h b/editor/editor_resource_picker.h
index d36e742bcd..3a4d5985bd 100644
--- a/editor/editor_resource_picker.h
+++ b/editor/editor_resource_picker.h
@@ -66,6 +66,7 @@ class EditorResourcePicker : public HBoxContainer {
 		OBJ_MENU_EDIT,
 		OBJ_MENU_CLEAR,
 		OBJ_MENU_MAKE_UNIQUE,
+		OBJ_MENU_MAKE_UNIQUE_RECURSIVE,
 		OBJ_MENU_SAVE,
 		OBJ_MENU_COPY,
 		OBJ_MENU_PASTE,
diff --git a/editor/editor_sectioned_inspector.cpp b/editor/editor_sectioned_inspector.cpp
index 801a1a4641..cbca3e9dcd 100644
--- a/editor/editor_sectioned_inspector.cpp
+++ b/editor/editor_sectioned_inspector.cpp
@@ -114,11 +114,11 @@ class SectionedInspectorFilter : public Object {
 	}
 
 	bool property_can_revert(const String &p_name) {
-		return edited->call("property_can_revert", section + "/" + p_name);
+		return edited->property_can_revert(section + "/" + p_name);
 	}
 
 	Variant property_get_revert(const String &p_name) {
-		return edited->call("property_get_revert", section + "/" + p_name);
+		return edited->property_get_revert(section + "/" + p_name);
 	}
 
 protected:
diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp
index 80e77a1125..36e64cbd7a 100644
--- a/editor/editor_settings.cpp
+++ b/editor/editor_settings.cpp
@@ -406,6 +406,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	_initial_set("interface/editor/debug/enable_pseudolocalization", false);
 	set_restart_if_changed("interface/editor/debug/enable_pseudolocalization", true);
 	// Use pseudolocalization in editor.
+	EDITOR_SETTING_USAGE(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/use_embedded_menu", false, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED)
 
 	EDITOR_SETTING_USAGE(Variant::FLOAT, PROPERTY_HINT_RANGE, "interface/editor/custom_display_scale", 1.0, "0.5,3,0.01", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED)
 	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "interface/editor/main_font_size", 14, "8,48,1")
@@ -1073,24 +1074,25 @@ Variant _EDITOR_GET(const String &p_setting) {
 	return EditorSettings::get_singleton()->get(p_setting);
 }
 
-bool EditorSettings::property_can_revert(const String &p_setting) {
-	if (!props.has(p_setting)) {
+bool EditorSettings::_property_can_revert(const StringName &p_name) const {
+	if (!props.has(p_name)) {
 		return false;
 	}
 
-	if (!props[p_setting].has_default_value) {
+	if (!props[p_name].has_default_value) {
 		return false;
 	}
 
-	return props[p_setting].initial != props[p_setting].variant;
+	return props[p_name].initial != props[p_name].variant;
 }
 
-Variant EditorSettings::property_get_revert(const String &p_setting) {
-	if (!props.has(p_setting) || !props[p_setting].has_default_value) {
-		return Variant();
+bool EditorSettings::_property_get_revert(const StringName &p_name, Variant &r_property) const {
+	if (!props.has(p_name) || !props[p_name].has_default_value) {
+		return false;
 	}
 
-	return props[p_setting].initial;
+	r_property = props[p_name].initial;
+	return true;
 }
 
 void EditorSettings::add_property_hint(const PropertyInfo &p_hint) {
@@ -1621,8 +1623,6 @@ void EditorSettings::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_setting", "name"), &EditorSettings::get_setting);
 	ClassDB::bind_method(D_METHOD("erase", "property"), &EditorSettings::erase);
 	ClassDB::bind_method(D_METHOD("set_initial_value", "name", "value", "update_current"), &EditorSettings::set_initial_value);
-	ClassDB::bind_method(D_METHOD("property_can_revert", "name"), &EditorSettings::property_can_revert);
-	ClassDB::bind_method(D_METHOD("property_get_revert", "name"), &EditorSettings::property_get_revert);
 	ClassDB::bind_method(D_METHOD("add_property_info", "info"), &EditorSettings::_add_property_info_bind);
 
 	ClassDB::bind_method(D_METHOD("set_project_metadata", "section", "key", "data"), &EditorSettings::set_project_metadata);
diff --git a/editor/editor_settings.h b/editor/editor_settings.h
index 5faeec88c8..f921171c57 100644
--- a/editor/editor_settings.h
+++ b/editor/editor_settings.h
@@ -100,6 +100,8 @@ private:
 	void _initial_set(const StringName &p_name, const Variant &p_value);
 	void _get_property_list(List<PropertyInfo> *p_list) const;
 	void _add_property_info_bind(const Dictionary &p_info);
+	bool _property_can_revert(const StringName &p_name) const;
+	bool _property_get_revert(const StringName &p_name, Variant &r_property) const;
 
 	void _load_defaults(Ref<ConfigFile> p_extra_config = Ref<ConfigFile>());
 	void _load_godot2_text_editor_theme();
@@ -138,8 +140,6 @@ public:
 			_set_only(p_setting, p_value);
 		}
 	}
-	bool property_can_revert(const String &p_setting);
-	Variant property_get_revert(const String &p_setting);
 	void add_property_hint(const PropertyInfo &p_hint);
 	Array get_changed_settings() const;
 	bool check_changed_settings_in_group(const String &p_setting_prefix) const;
diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp
index d188871f59..3da9899052 100644
--- a/editor/editor_themes.cpp
+++ b/editor/editor_themes.cpp
@@ -788,6 +788,25 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
 	editor_log_button_pressed->set_border_color(accent_color);
 	theme->set_stylebox("pressed", "EditorLogFilterButton", editor_log_button_pressed);
 
+	// MenuBar
+	theme->set_stylebox("normal", "MenuBar", style_widget);
+	theme->set_stylebox("hover", "MenuBar", style_widget_hover);
+	theme->set_stylebox("pressed", "MenuBar", style_widget_pressed);
+	theme->set_stylebox("focus", "MenuBar", style_widget_focus);
+	theme->set_stylebox("disabled", "MenuBar", style_widget_disabled);
+
+	theme->set_color("font_color", "MenuBar", font_color);
+	theme->set_color("font_hover_color", "MenuBar", font_hover_color);
+	theme->set_color("font_focus_color", "MenuBar", font_focus_color);
+	theme->set_color("font_pressed_color", "MenuBar", accent_color);
+	theme->set_color("font_disabled_color", "MenuBar", font_disabled_color);
+
+	theme->set_color("icon_normal_color", "MenuBar", icon_normal_color);
+	theme->set_color("icon_hover_color", "MenuBar", icon_hover_color);
+	theme->set_color("icon_focus_color", "MenuBar", icon_focus_color);
+	theme->set_color("icon_pressed_color", "MenuBar", icon_pressed_color);
+	theme->set_color("icon_disabled_color", "MenuBar", icon_disabled_color);
+
 	// OptionButton
 	Ref<StyleBoxFlat> style_option_button_focus = style_widget_focus->duplicate();
 	Ref<StyleBoxFlat> style_option_button_normal = style_widget->duplicate();
@@ -901,18 +920,20 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
 	theme->set_stylebox("panel", "PopupDialog", style_popup);
 
 	// PopupMenu
-	const int popup_menu_margin_size = default_margin_size * 1.5 * EDSCALE;
 	Ref<StyleBoxFlat> style_popup_menu = style_popup->duplicate();
 	// Use 1 pixel for the sides, since if 0 is used, the highlight of hovered items is drawn
 	// on top of the popup border. This causes a 'gap' in the panel border when an item is highlighted,
 	// and it looks weird. 1px solves this.
-	style_popup_menu->set_default_margin(SIDE_LEFT, 1 * EDSCALE);
-	style_popup_menu->set_default_margin(SIDE_TOP, popup_menu_margin_size);
-	style_popup_menu->set_default_margin(SIDE_RIGHT, 1 * EDSCALE);
-	style_popup_menu->set_default_margin(SIDE_BOTTOM, popup_menu_margin_size);
+	style_popup_menu->set_default_margin(SIDE_LEFT, EDSCALE);
+	style_popup_menu->set_default_margin(SIDE_TOP, 2 * EDSCALE);
+	style_popup_menu->set_default_margin(SIDE_RIGHT, EDSCALE);
+	style_popup_menu->set_default_margin(SIDE_BOTTOM, 2 * EDSCALE);
 	// Always display a border for PopupMenus so they can be distinguished from their background.
-	style_popup_menu->set_border_width_all(1 * EDSCALE);
+	style_popup_menu->set_border_width_all(EDSCALE);
 	style_popup_menu->set_border_color(dark_color_2);
+	// Popups are separate windows by default in the editor. Windows currently don't support per-pixel transparency
+	// in 4.0, and even if it was, it may not always work in practice (e.g. running with compositing disabled).
+	style_popup_menu->set_corner_radius_all(0);
 	theme->set_stylebox("panel", "PopupMenu", style_popup_menu);
 
 	Ref<StyleBoxFlat> style_menu_hover = style_widget_hover->duplicate();
@@ -945,12 +966,12 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
 
 	// Force the v_separation to be even so that the spacing on top and bottom is even.
 	// If the vsep is odd and cannot be split into 2 even groups (of pixels), then it will be lopsided.
-	// We add 2 to the vsep to give it some extra spacing which looks a bit more modern (see Windows, for example)
-	int vsep_base = extra_spacing + default_margin_size + 2;
-	int force_even_vsep = vsep_base + (vsep_base % 2);
+	// We add 2 to the vsep to give it some extra spacing which looks a bit more modern (see Windows, for example).
+	const int vsep_base = extra_spacing + default_margin_size + 6;
+	const int force_even_vsep = vsep_base + (vsep_base % 2);
 	theme->set_constant("v_separation", "PopupMenu", force_even_vsep * EDSCALE);
-	theme->set_constant("item_start_padding", "PopupMenu", popup_menu_margin_size * EDSCALE);
-	theme->set_constant("item_end_padding", "PopupMenu", popup_menu_margin_size * EDSCALE);
+	theme->set_constant("item_start_padding", "PopupMenu", default_margin_size * 1.5 * EDSCALE);
+	theme->set_constant("item_end_padding", "PopupMenu", default_margin_size * 1.5 * EDSCALE);
 
 	// Sub-inspectors
 	for (int i = 0; i < 16; i++) {
@@ -1263,7 +1284,6 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
 	theme->set_stylebox("focus", "LineEdit", style_widget_focus);
 	theme->set_stylebox("read_only", "LineEdit", style_line_edit_disabled);
 	theme->set_icon("clear", "LineEdit", theme->get_icon(SNAME("GuiClose"), SNAME("EditorIcons")));
-	theme->set_color("read_only", "LineEdit", font_disabled_color);
 	theme->set_color("font_color", "LineEdit", font_color);
 	theme->set_color("font_selected_color", "LineEdit", mono_color);
 	theme->set_color("font_uneditable_color", "LineEdit", font_readonly_color);
@@ -1456,12 +1476,23 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
 	style_tooltip->set_bg_color(dark_color_3 * Color(0.8, 0.8, 0.8, 0.9));
 	style_tooltip->set_border_width_all(0);
 	theme->set_color("font_color", "TooltipLabel", font_hover_color);
-	theme->set_color("font_color_shadow", "TooltipLabel", Color(0, 0, 0, 0));
+	theme->set_color("font_shadow_color", "TooltipLabel", Color(0, 0, 0, 0));
 	theme->set_stylebox("panel", "TooltipPanel", style_tooltip);
 
 	// PopupPanel
 	theme->set_stylebox("panel", "PopupPanel", style_popup);
 
+	Ref<StyleBoxFlat> control_editor_popup_style = style_popup->duplicate();
+	control_editor_popup_style->set_shadow_size(0);
+	control_editor_popup_style->set_default_margin(SIDE_LEFT, default_margin_size * EDSCALE);
+	control_editor_popup_style->set_default_margin(SIDE_TOP, default_margin_size * EDSCALE);
+	control_editor_popup_style->set_default_margin(SIDE_RIGHT, default_margin_size * EDSCALE);
+	control_editor_popup_style->set_default_margin(SIDE_BOTTOM, default_margin_size * EDSCALE);
+	control_editor_popup_style->set_border_width_all(0);
+
+	theme->set_stylebox("panel", "ControlEditorPopupButton", control_editor_popup_style);
+	theme->set_type_variation("ControlEditorPopupButton", "PopupPanel");
+
 	// SpinBox
 	theme->set_icon("updown", "SpinBox", theme->get_icon(SNAME("GuiSpinboxUpdown"), SNAME("EditorIcons")));
 	theme->set_icon("updown_disabled", "SpinBox", theme->get_icon(SNAME("GuiSpinboxUpdownDisabled"), SNAME("EditorIcons")));
diff --git a/editor/export/editor_export_platform.cpp b/editor/export/editor_export_platform.cpp
index 34b407779e..ab1586cb77 100644
--- a/editor/export/editor_export_platform.cpp
+++ b/editor/export/editor_export_platform.cpp
@@ -429,24 +429,21 @@ void EditorExportPlatform::_edit_filter_list(HashSet<String> &r_list, const Stri
 	_edit_files_with_filter(da, filters, r_list, exclude);
 }
 
-EditorExportPlatform::FeatureContainers EditorExportPlatform::get_feature_containers(const Ref<EditorExportPreset> &p_preset, bool p_debug) const {
+HashSet<String> EditorExportPlatform::get_features(const Ref<EditorExportPreset> &p_preset, bool p_debug) const {
 	Ref<EditorExportPlatform> platform = p_preset->get_platform();
 	List<String> feature_list;
 	platform->get_platform_features(&feature_list);
 	platform->get_preset_features(p_preset, &feature_list);
 
-	FeatureContainers result;
+	HashSet<String> result;
 	for (const String &E : feature_list) {
-		result.features.insert(E);
-		result.features_pv.push_back(E);
+		result.insert(E);
 	}
 
 	if (p_debug) {
-		result.features.insert("debug");
-		result.features_pv.push_back("debug");
+		result.insert("debug");
 	} else {
-		result.features.insert("release");
-		result.features_pv.push_back("release");
+		result.insert("release");
 	}
 
 	if (!p_preset->get_custom_features().is_empty()) {
@@ -455,8 +452,7 @@ EditorExportPlatform::FeatureContainers EditorExportPlatform::get_feature_contai
 		for (int i = 0; i < tmp_custom_list.size(); i++) {
 			String f = tmp_custom_list[i].strip_edges();
 			if (!f.is_empty()) {
-				result.features.insert(f);
-				result.features_pv.push_back(f);
+				result.insert(f);
 			}
 		}
 	}
@@ -465,14 +461,18 @@ EditorExportPlatform::FeatureContainers EditorExportPlatform::get_feature_contai
 }
 
 EditorExportPlatform::ExportNotifier::ExportNotifier(EditorExportPlatform &p_platform, const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags) {
-	FeatureContainers features = p_platform.get_feature_containers(p_preset, p_debug);
+	HashSet<String> features = p_platform.get_features(p_preset, p_debug);
 	Vector<Ref<EditorExportPlugin>> export_plugins = EditorExport::get_singleton()->get_export_plugins();
 	//initial export plugin callback
 	for (int i = 0; i < export_plugins.size(); i++) {
 		if (export_plugins[i]->get_script_instance()) { //script based
-			export_plugins.write[i]->_export_begin_script(features.features_pv, p_debug, p_path, p_flags);
+			PackedStringArray features_psa;
+			for (const String &feature : features) {
+				features_psa.push_back(feature);
+			}
+			export_plugins.write[i]->_export_begin_script(features_psa, p_debug, p_path, p_flags);
 		} else {
-			export_plugins.write[i]->_export_begin(features.features, p_debug, p_path, p_flags);
+			export_plugins.write[i]->_export_begin(features, p_debug, p_path, p_flags);
 		}
 	}
 }
@@ -621,9 +621,7 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> &
 		export_plugins.write[i]->_clear();
 	}
 
-	FeatureContainers feature_containers = get_feature_containers(p_preset, p_debug);
-	HashSet<String> &features = feature_containers.features;
-	Vector<String> &features_pv = feature_containers.features_pv;
+	HashSet<String> features = get_features(p_preset, p_debug);
 
 	//store everything in the export medium
 	int idx = 0;
@@ -709,7 +707,11 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> &
 			bool do_export = true;
 			for (int i = 0; i < export_plugins.size(); i++) {
 				if (export_plugins[i]->get_script_instance()) { //script based
-					export_plugins.write[i]->_export_file_script(path, type, features_pv);
+					PackedStringArray features_psa;
+					for (const String &feature : features) {
+						features_psa.push_back(feature);
+					}
+					export_plugins.write[i]->_export_file_script(path, type, features_psa);
 				} else {
 					export_plugins.write[i]->_export_file(path, type, features);
 				}
@@ -1174,5 +1176,23 @@ void EditorExportPlatform::gen_export_flags(Vector<String> &r_flags, int p_flags
 	}
 }
 
+bool EditorExportPlatform::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
+	String templates_error;
+	bool valid_export_configuration = has_valid_export_configuration(p_preset, templates_error, r_missing_templates);
+
+	String project_configuration_error;
+	bool valid_project_configuration = has_valid_project_configuration(p_preset, project_configuration_error);
+
+	if (!templates_error.is_empty()) {
+		r_error += templates_error;
+	}
+
+	if (!project_configuration_error.is_empty()) {
+		r_error += project_configuration_error;
+	}
+
+	return valid_export_configuration && valid_project_configuration;
+}
+
 EditorExportPlatform::EditorExportPlatform() {
 }
diff --git a/editor/export/editor_export_platform.h b/editor/export/editor_export_platform.h
index 832a0cf846..c870ee66aa 100644
--- a/editor/export/editor_export_platform.h
+++ b/editor/export/editor_export_platform.h
@@ -85,11 +85,6 @@ private:
 		EditorProgress *ep = nullptr;
 	};
 
-	struct FeatureContainers {
-		HashSet<String> features;
-		Vector<String> features_pv;
-	};
-
 	Vector<ExportMessage> messages;
 
 	void _export_find_resources(EditorFileSystemDirectory *p_dir, HashSet<String> &p_paths);
@@ -110,7 +105,7 @@ protected:
 		~ExportNotifier();
 	};
 
-	FeatureContainers get_feature_containers(const Ref<EditorExportPreset> &p_preset, bool p_debug) const;
+	HashSet<String> get_features(const Ref<EditorExportPreset> &p_preset, bool p_debug) const;
 
 	bool exists_export_template(String template_file_name, String *err) const;
 	String find_export_template(String template_file_name, String *err = nullptr) const;
@@ -205,7 +200,9 @@ public:
 	virtual Ref<Texture2D> get_run_icon() const { return get_logo(); }
 
 	String test_etc2() const;
-	virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const = 0;
+	bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const;
+	virtual bool has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const = 0;
+	virtual bool has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const = 0;
 
 	virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const = 0;
 	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0) = 0;
diff --git a/editor/export/editor_export_platform_pc.cpp b/editor/export/editor_export_platform_pc.cpp
index 5e0044f2ae..9fca4c908a 100644
--- a/editor/export/editor_export_platform_pc.cpp
+++ b/editor/export/editor_export_platform_pc.cpp
@@ -75,7 +75,7 @@ Ref<Texture2D> EditorExportPlatformPC::get_logo() const {
 	return logo;
 }
 
-bool EditorExportPlatformPC::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
+bool EditorExportPlatformPC::has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
 	String err;
 	bool valid = false;
 
@@ -106,6 +106,10 @@ bool EditorExportPlatformPC::can_export(const Ref<EditorExportPreset> &p_preset,
 	return valid;
 }
 
+bool EditorExportPlatformPC::has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const {
+	return true;
+}
+
 Error EditorExportPlatformPC::export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags) {
 	ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags);
 
diff --git a/editor/export/editor_export_platform_pc.h b/editor/export/editor_export_platform_pc.h
index bdb86e924a..cf96db6c2d 100644
--- a/editor/export/editor_export_platform_pc.h
+++ b/editor/export/editor_export_platform_pc.h
@@ -52,7 +52,8 @@ public:
 	virtual String get_os_name() const override;
 	virtual Ref<Texture2D> get_logo() const override;
 
-	virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
+	virtual bool has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
+	virtual bool has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const override;
 	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0) override;
 	virtual Error sign_shared_object(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path);
 	virtual String get_template_file_name(const String &p_target, const String &p_arch) const = 0;
diff --git a/editor/export/project_export.cpp b/editor/export/project_export.cpp
index cb82cefbbb..76493d330f 100644
--- a/editor/export/project_export.cpp
+++ b/editor/export/project_export.cpp
@@ -219,6 +219,7 @@ void ProjectExportDialog::_edit_preset(int p_index) {
 	export_path->show();
 	duplicate_preset->set_disabled(false);
 	delete_preset->set_disabled(false);
+	get_ok_button()->set_disabled(false);
 	name->set_text(current->get_name());
 
 	List<String> extension_list = current->get_platform()->get_binary_extensions(current);
@@ -265,7 +266,6 @@ void ProjectExportDialog::_edit_preset(int p_index) {
 
 		export_warning->hide();
 		export_button->set_disabled(true);
-		get_ok_button()->set_disabled(true);
 	} else {
 		if (error != String()) {
 			Vector<String> items = error.split("\n", false);
@@ -285,7 +285,6 @@ void ProjectExportDialog::_edit_preset(int p_index) {
 		export_error->hide();
 		export_templates_error->hide();
 		export_button->set_disabled(false);
-		get_ok_button()->set_disabled(false);
 	}
 
 	custom_features->set_text(current->get_custom_features());
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
index 6638e2f42f..b823db68f0 100644
--- a/editor/filesystem_dock.cpp
+++ b/editor/filesystem_dock.cpp
@@ -1531,14 +1531,13 @@ void FileSystemDock::_folder_removed(String p_folder) {
 
 void FileSystemDock::_rename_operation_confirm() {
 	String new_name = rename_dialog_text->get_text().strip_edges();
-	String old_name = tree->get_selected()->get_text(0);
 	if (new_name.length() == 0) {
 		EditorNode::get_singleton()->show_warning(TTR("No name provided."));
 		return;
 	} else if (new_name.contains("/") || new_name.contains("\\") || new_name.contains(":")) {
 		EditorNode::get_singleton()->show_warning(TTR("Name contains invalid characters."));
 		return;
-	} else if (to_rename.is_file && old_name.get_extension() != new_name.get_extension()) {
+	} else if (to_rename.is_file && to_rename.path.get_extension() != new_name.get_extension()) {
 		if (!EditorFileSystem::get_singleton()->get_valid_extensions().find(new_name.get_extension())) {
 			EditorNode::get_singleton()->show_warning(TTR("This file extension is not recognized by the editor.\nIf you want to rename it anyway, use your operating system's file manager.\nAfter renaming to an unknown extension, the file won't be shown in the editor anymore."));
 			return;
diff --git a/editor/icons/AudioStream.svg b/editor/icons/AudioStream.svg
new file mode 100644
index 0000000000..5d92dc25a5
--- /dev/null
+++ b/editor/icons/AudioStream.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="8" x2="8" y1="1" y2="15"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path d="m12 2a-1 1 0 0 1 1 1-1 1 0 0 1 -1 1c-4.4301 0-8 3.5699-8 8a-1 1 0 0 1 -1 1-1 1 0 0 1 -1-1c0-5.511 4.489-10 10-10zm0 4a-1 1 0 0 1 1 1-1 1 0 0 1 -1 1c-2.221 0-4 1.779-4 4a-1 1 0 0 1 -1 1-1 1 0 0 1 -1-1c0-3.3018 2.6981-6 6-6zm0 4a-2 2 0 0 1 2 2-2 2 0 0 1 -2 2-2 2 0 0 1 -2-2-2 2 0 0 1 2-2z" fill="url(#a)"/></svg>
diff --git a/editor/icons/AudioStreamGenerator.svg b/editor/icons/AudioStreamGenerator.svg
new file mode 100644
index 0000000000..55b0fb9d92
--- /dev/null
+++ b/editor/icons/AudioStreamGenerator.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="8" x2="8" y1="1" y2="15"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path d="m14 9-3 5-3-12-3 7-3-2" fill="none" stroke="url(#a)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/></svg>
diff --git a/editor/icons/AudioStreamMicrophone.svg b/editor/icons/AudioStreamMicrophone.svg
new file mode 100644
index 0000000000..51009e9d53
--- /dev/null
+++ b/editor/icons/AudioStreamMicrophone.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="8" x2="8" y1="1" y2="15"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path d="m7 1c-1.108 0-2 .892-2 2h2v1h-2v2h2v1h-2c0 1.108.892 2 2 2v4l-2 2h6l-2-2v-4c1.108 0 2-.892 2-2h-2v-1h2v-2h-2v-1h2c0-1.108-.892-2-2-2z" fill="url(#a)"/></svg>
diff --git a/editor/icons/AudioStreamRandomizer.svg b/editor/icons/AudioStreamRandomizer.svg
new file mode 100644
index 0000000000..1696dff795
--- /dev/null
+++ b/editor/icons/AudioStreamRandomizer.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="8" x2="8" y1="1" y2="15"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path d="m7.9999997 1c6.6837543 0 7.0000003.3165085 7.0000003 7.0057779 0 6.6877711-.286255 6.9755641-6.9367525 6.9938021-3.0191555.008313-4.4456225-.105997-5.1863245-.415726-1.570375-.65669-1.876923-1.727949-1.876923-6.5780761 0-6.6892694.316247-7.0057779 6.9999997-7.0057779zm3.5299143 1.7638478c-1.5662016 0-2.4379256 1.7724432-1.475213 2.9973439.738933.9401693 2.041543 1.025967 2.876923.1899002 1.183646-1.1846229.303279-3.1872441-1.40171-3.1872441zm-3.5760682 3.2710739c-1.5661974 0-2.4379268 1.7707341-1.4752138 2.9956331.7389365.9401892 2.0415435 1.0276772 2.8769233.191611 1.1836457-1.1846231.3032798-3.1872441-1.4017095-3.1872441zm-3.5538458 3.4729499c-.958537.031867-1.875214.7423284-1.875214 1.8493884 0 1.564955 2.248443 2.516522 3.249573 1.375494.7905175-.900982.8551191-1.664857.208547-2.487522-.416627-.5300879-1.007786-.7565128-1.582906-.7373604z" fill="url(#a)"/></svg>
diff --git a/editor/icons/ContainerLayout.svg b/editor/icons/ContainerLayout.svg
new file mode 100644
index 0000000000..feabc2c350
--- /dev/null
+++ b/editor/icons/ContainerLayout.svg
@@ -0,0 +1 @@
+<svg clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><g fill-rule="nonzero"><path d="m3 1c-1.105 0-2 .895-2 2h2zm2 0v2h2v-2zm4 0v2h2v-2zm4 0v2h2c0-1.105-.895-2-2-2zm-12 4v2h2v-2zm12 0v2h2v-2zm-12 4v2h2v-2zm12 0v2h2v-2zm-12 4c0 1.105.895 2 2 2v-2zm4 0v2h2v-2zm4 0v2h2v-2zm4 0v2c1.105 0 2-.895 2-2z" fill="#8eef97"/><path d="m7 7h4v4h-4z" fill="#d6d6d6"/></g></svg>
diff --git a/editor/icons/ControlLayout.svg b/editor/icons/ControlLayout.svg
index 11dd2554be..8503e3313c 100644
--- a/editor/icons/ControlLayout.svg
+++ b/editor/icons/ControlLayout.svg
@@ -1 +1 @@
-<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m1 1v14h14v-14zm2 2h3v3h-3zm5 0h5v3h-5zm-5 5h3v5h-3zm5 0h5v5h-5z" fill="#8eef97"/></svg>
+<svg clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><g fill-rule="nonzero"><path d="m11.793 8v-2h-3.793v-2.113h-2v2.113h-2.142v2h2.142v3.967h2v-3.967z" fill="#d6d6d6"/><path d="m8 .345c-4.199 0-7.655 3.456-7.655 7.655s3.456 7.655 7.655 7.655 7.655-3.456 7.655-7.655-3.456-7.655-7.655-7.655zm0 1.999c3.103 0 5.656 2.553 5.656 5.656s-2.553 5.656-5.656 5.656-5.656-2.553-5.656-5.656 2.553-5.656 5.656-5.656z" fill="#8eef97"/></g></svg>
diff --git a/editor/icons/DefaultProjectIcon.svg b/editor/icons/DefaultProjectIcon.svg
index f81ba4d390..adc26df6c2 100644
--- a/editor/icons/DefaultProjectIcon.svg
+++ b/editor/icons/DefaultProjectIcon.svg
@@ -1 +1 @@
-<svg height="64" viewBox="0 0 64 64" width="64" xmlns="http://www.w3.org/2000/svg"><g stroke-linejoin="round"><path d="m8 0c-4.432 0-8 3.568-8 8v48c0 4.432 3.568 8 8 8h48c4.432 0 8-3.568 8-8v-48c0-4.432-3.568-8-8-8z" fill="#355570" stroke-linecap="round" stroke-width="2"/><path d="m8 0c-4.432 0-8 3.568-8 8v48c0 4.432 3.568 8 8 8h48c4.432 0 8-3.568 8-8v-48c0-4.432-3.568-8-8-8zm0 2h48c3.324 0 6 2.676 6 6v48c0 3.324-2.676 6-6 6h-48c-3.324 0-6-2.676-6-6v-48c0-3.324 2.676-6 6-6z" fill-opacity=".19608" stroke-linecap="round" stroke-width="2"/><path d="m27.254 10c-2.1314.47383-4.2401 1.134-6.2168 2.1289.04521 1.7455.15796 3.4164.38672 5.1152-.76768.4919-1.574.91443-2.291 1.4902-.72854.5604-1.4731 1.0965-2.1328 1.752-1.3179-.8716-2.7115-1.691-4.1484-2.4141-1.549 1.667-2.9985 3.4672-4.1816 5.4805.89011 1.4399 1.8209 2.7894 2.8242 4.0703h.027343v9.9453 1.2617 1.1504l-.009765 1.6309h-.001953c.0031.7321.011718 1.5356.011718 1.6953 0 7.1942 9.1264 10.652 20.465 10.691h.013672.013672c11.338-.04 20.461-3.4972 20.461-10.691 0-.1626.010282-.96271.013672-1.6953h-.001953l-.011719-1.6309v-.98633l.003907-.001953v-11.369h.027343c1.0035-1.2809 1.9337-2.6304 2.8242-4.0703-1.1827-2.0133-2.6327-3.8135-4.1816-5.4805-1.4366.7231-2.8325 1.5425-4.1504 2.4141-.65947-.6555-1.4013-1.1916-2.1309-1.752-.71682-.5758-1.5248-.99833-2.291-1.4902.22813-1.6988.3413-3.3697.38672-5.1152-1.977-.99494-4.0863-1.6551-6.2188-2.1289-.85139 1.4309-1.6285 2.9812-2.3066 4.4961-.80409-.1344-1.613-.18571-2.4219-.19531h-.015625-.015625c-.81037.01-1.6176.060513-2.4219.19531-.67768-1.5149-1.4559-3.0652-2.3086-4.4961z" fill="#fff" stroke="#fff" stroke-width="3"/></g><g stroke-width=".32031" transform="matrix(.050279 0 0 .050279 6.2574 1.18)"><path d="m0 0s-.325 1.994-.515 1.976l-36.182-3.491c-2.879-.278-5.115-2.574-5.317-5.459l-.994-14.247-27.992-1.997-1.904 12.912c-.424 2.872-2.932 5.037-5.835 5.037h-38.188c-2.902 0-5.41-2.165-5.834-5.037l-1.905-12.912-27.992 1.997-.994 14.247c-.202 2.886-2.438 5.182-5.317 5.46l-36.2 3.49c-.187.018-.324-1.978-.511-1.978l-.049-7.83 30.658-4.944 1.004-14.374c.203-2.91 2.551-5.263 5.463-5.472l38.551-2.75c.146-.01.29-.016.434-.016 2.897 0 5.401 2.166 5.825 5.038l1.959 13.286h28.005l1.959-13.286c.423-2.871 2.93-5.037 5.831-5.037.142 0 .284.005.423.015l38.556 2.75c2.911.209 5.26 2.562 5.463 5.472l1.003 14.374 30.645 4.966z" fill="#fff" transform="matrix(4.1626 0 0 -4.1626 919.24 771.67)"/><path d="m0 0v-59.041c.108-.001.216-.005.323-.015l36.196-3.49c1.896-.183 3.382-1.709 3.514-3.609l1.116-15.978 31.574-2.253 2.175 14.747c.282 1.912 1.922 3.329 3.856 3.329h38.188c1.933 0 3.573-1.417 3.855-3.329l2.175-14.747 31.575 2.253 1.115 15.978c.133 1.9 1.618 3.425 3.514 3.609l36.182 3.49c.107.01.214.014.322.015v4.711l.015.005v54.325h.134c4.795 6.12 9.232 12.569 13.487 19.449-5.651 9.62-12.575 18.217-19.976 26.182-6.864-3.455-13.531-7.369-19.828-11.534-3.151 3.132-6.7 5.694-10.186 8.372-3.425 2.751-7.285 4.768-10.946 7.118 1.09 8.117 1.629 16.108 1.846 24.448-9.446 4.754-19.519 7.906-29.708 10.17-4.068-6.837-7.788-14.241-11.028-21.479-3.842.642-7.702.88-11.567.926v.006c-.027 0-.052-.006-.075-.006-.024 0-.049.006-.073.006v-.006c-3.872-.046-7.729-.284-11.572-.926-3.238 7.238-6.956 14.642-11.03 21.479-10.184-2.264-20.258-5.416-29.703-10.17.216-8.34.755-16.331 1.848-24.448-3.668-2.35-7.523-4.367-10.949-7.118-3.481-2.678-7.036-5.24-10.188-8.372-6.297 4.165-12.962 8.079-19.828 11.534-7.401-7.965-14.321-16.562-19.974-26.182 4.253-6.88 8.693-13.329 13.487-19.449z" fill="#478cbf" transform="matrix(4.1626 0 0 -4.1626 104.7 525.91)"/><path d="m0 0-1.121-16.063c-.135-1.936-1.675-3.477-3.611-3.616l-38.555-2.751c-.094-.007-.188-.01-.281-.01-1.916 0-3.569 1.406-3.852 3.33l-2.211 14.994h-31.459l-2.211-14.994c-.297-2.018-2.101-3.469-4.133-3.32l-38.555 2.751c-1.936.139-3.476 1.68-3.611 3.616l-1.121 16.063-32.547 3.138c.015-3.498.06-7.33.06-8.093 0-34.374 43.605-50.896 97.781-51.086h.133c54.176.19 97.766 16.712 97.766 51.086 0 .777.047 4.593.063 8.093z" fill="#478cbf" transform="matrix(4.1626 0 0 -4.1626 784.07 817.24)"/><path d="m0 0c0-12.052-9.765-21.815-21.813-21.815-12.042 0-21.81 9.763-21.81 21.815 0 12.044 9.768 21.802 21.81 21.802 12.048 0 21.813-9.758 21.813-21.802" fill="#fff" transform="matrix(4.1626 0 0 -4.1626 389.21 625.67)"/><path d="m0 0c0-7.994-6.479-14.473-14.479-14.473-7.996 0-14.479 6.479-14.479 14.473s6.483 14.479 14.479 14.479c8 0 14.479-6.485 14.479-14.479" fill="#414042" transform="matrix(4.1626 0 0 -4.1626 367.37 631.06)"/><path d="m0 0c-3.878 0-7.021 2.858-7.021 6.381v20.081c0 3.52 3.143 6.381 7.021 6.381s7.028-2.861 7.028-6.381v-20.081c0-3.523-3.15-6.381-7.028-6.381" fill="#fff" transform="matrix(4.1626 0 0 -4.1626 511.99 724.74)"/><path d="m0 0c0-12.052 9.765-21.815 21.815-21.815 12.041 0 21.808 9.763 21.808 21.815 0 12.044-9.767 21.802-21.808 21.802-12.05 0-21.815-9.758-21.815-21.802" fill="#fff" transform="matrix(4.1626 0 0 -4.1626 634.79 625.67)"/><path d="m0 0c0-7.994 6.477-14.473 14.471-14.473 8.002 0 14.479 6.479 14.479 14.473s-6.477 14.479-14.479 14.479c-7.994 0-14.471-6.485-14.471-14.479" fill="#414042" transform="matrix(4.1626 0 0 -4.1626 656.64 631.06)"/></g></svg>
+<svg height="128" width="128" xmlns="http://www.w3.org/2000/svg"><g transform="translate(32 32)"><path d="m-16-32c-8.86 0-16 7.13-16 15.99v95.98c0 8.86 7.13 15.99 16 15.99h96c8.86 0 16-7.13 16-15.99v-95.98c0-8.85-7.14-15.99-16-15.99z" fill="#363d52"/><path d="m-16-32c-8.86 0-16 7.13-16 15.99v95.98c0 8.86 7.13 15.99 16 15.99h96c8.86 0 16-7.13 16-15.99v-95.98c0-8.85-7.14-15.99-16-15.99zm0 4h96c6.64 0 12 5.35 12 11.99v95.98c0 6.64-5.35 11.99-12 11.99h-96c-6.64 0-12-5.35-12-11.99v-95.98c0-6.64 5.36-11.99 12-11.99z" fill-opacity=".4"/></g><g stroke-width="9.92746" transform="matrix(.10073078 0 0 .10073078 12.425923 2.256365)"><path d="m0 0s-.325 1.994-.515 1.976l-36.182-3.491c-2.879-.278-5.115-2.574-5.317-5.459l-.994-14.247-27.992-1.997-1.904 12.912c-.424 2.872-2.932 5.037-5.835 5.037h-38.188c-2.902 0-5.41-2.165-5.834-5.037l-1.905-12.912-27.992 1.997-.994 14.247c-.202 2.886-2.438 5.182-5.317 5.46l-36.2 3.49c-.187.018-.324-1.978-.511-1.978l-.049-7.83 30.658-4.944 1.004-14.374c.203-2.91 2.551-5.263 5.463-5.472l38.551-2.75c.146-.01.29-.016.434-.016 2.897 0 5.401 2.166 5.825 5.038l1.959 13.286h28.005l1.959-13.286c.423-2.871 2.93-5.037 5.831-5.037.142 0 .284.005.423.015l38.556 2.75c2.911.209 5.26 2.562 5.463 5.472l1.003 14.374 30.645 4.966z" fill="#fff" transform="matrix(4.162611 0 0 -4.162611 919.24059 771.67186)"/><path d="m0 0v-47.514-6.035-5.492c.108-.001.216-.005.323-.015l36.196-3.49c1.896-.183 3.382-1.709 3.514-3.609l1.116-15.978 31.574-2.253 2.175 14.747c.282 1.912 1.922 3.329 3.856 3.329h38.188c1.933 0 3.573-1.417 3.855-3.329l2.175-14.747 31.575 2.253 1.115 15.978c.133 1.9 1.618 3.425 3.514 3.609l36.182 3.49c.107.01.214.014.322.015v4.711l.015.005v54.325c5.09692 6.4164715 9.92323 13.494208 13.621 19.449-5.651 9.62-12.575 18.217-19.976 26.182-6.864-3.455-13.531-7.369-19.828-11.534-3.151 3.132-6.7 5.694-10.186 8.372-3.425 2.751-7.285 4.768-10.946 7.118 1.09 8.117 1.629 16.108 1.846 24.448-9.446 4.754-19.519 7.906-29.708 10.17-4.068-6.837-7.788-14.241-11.028-21.479-3.842.642-7.702.88-11.567.926v.006c-.027 0-.052-.006-.075-.006-.024 0-.049.006-.073.006v-.006c-3.872-.046-7.729-.284-11.572-.926-3.238 7.238-6.956 14.642-11.03 21.479-10.184-2.264-20.258-5.416-29.703-10.17.216-8.34.755-16.331 1.848-24.448-3.668-2.35-7.523-4.367-10.949-7.118-3.481-2.678-7.036-5.24-10.188-8.372-6.297 4.165-12.962 8.079-19.828 11.534-7.401-7.965-14.321-16.562-19.974-26.182 4.4426579-6.973692 9.2079702-13.9828876 13.621-19.449z" fill="#478cbf" transform="matrix(4.162611 0 0 -4.162611 104.69892 525.90697)"/><path d="m0 0-1.121-16.063c-.135-1.936-1.675-3.477-3.611-3.616l-38.555-2.751c-.094-.007-.188-.01-.281-.01-1.916 0-3.569 1.406-3.852 3.33l-2.211 14.994h-31.459l-2.211-14.994c-.297-2.018-2.101-3.469-4.133-3.32l-38.555 2.751c-1.936.139-3.476 1.68-3.611 3.616l-1.121 16.063-32.547 3.138c.015-3.498.06-7.33.06-8.093 0-34.374 43.605-50.896 97.781-51.086h.066.067c54.176.19 97.766 16.712 97.766 51.086 0 .777.047 4.593.063 8.093z" fill="#478cbf" transform="matrix(4.162611 0 0 -4.162611 784.07144 817.24284)"/><path d="m0 0c0-12.052-9.765-21.815-21.813-21.815-12.042 0-21.81 9.763-21.81 21.815 0 12.044 9.768 21.802 21.81 21.802 12.048 0 21.813-9.758 21.813-21.802" fill="#fff" transform="matrix(4.162611 0 0 -4.162611 389.21484 625.67104)"/><path d="m0 0c0-7.994-6.479-14.473-14.479-14.473-7.996 0-14.479 6.479-14.479 14.473s6.483 14.479 14.479 14.479c8 0 14.479-6.485 14.479-14.479" fill="#414042" transform="matrix(4.162611 0 0 -4.162611 367.36686 631.05679)"/><path d="m0 0c-3.878 0-7.021 2.858-7.021 6.381v20.081c0 3.52 3.143 6.381 7.021 6.381s7.028-2.861 7.028-6.381v-20.081c0-3.523-3.15-6.381-7.028-6.381" fill="#fff" transform="matrix(4.162611 0 0 -4.162611 511.99336 724.73954)"/><path d="m0 0c0-12.052 9.765-21.815 21.815-21.815 12.041 0 21.808 9.763 21.808 21.815 0 12.044-9.767 21.802-21.808 21.802-12.05 0-21.815-9.758-21.815-21.802" fill="#fff" transform="matrix(4.162611 0 0 -4.162611 634.78706 625.67104)"/><path d="m0 0c0-7.994 6.477-14.473 14.471-14.473 8.002 0 14.479 6.479 14.479 14.473s-6.477 14.479-14.479 14.479c-7.994 0-14.471-6.485-14.471-14.479" fill="#414042" transform="matrix(4.162611 0 0 -4.162611 656.64056 631.05679)"/></g></svg>
diff --git a/editor/icons/MenuBar.svg b/editor/icons/MenuBar.svg
new file mode 100644
index 0000000000..0a53f07f85
--- /dev/null
+++ b/editor/icons/MenuBar.svg
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="M2 6a1 1 0 0 0-1 1v7a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V7a1 1 0 0 0-1-1Zm1 2h10v2H3Zm0 3h10v2H3ZM1 1v4h6V1Zm1 1h4L4 4Z" fill="#8eef97"/></svg>
diff --git a/editor/icons/NodeWarnings2.svg b/editor/icons/NodeWarnings2.svg
new file mode 100644
index 0000000000..e0385c28d1
--- /dev/null
+++ b/editor/icons/NodeWarnings2.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m8.0292969 2.0019531a1.0001 1.0001 0 0 0 -.8867188.484375l-6 9.9999999a1.0001 1.0001 0 0 0 .8574219 1.513672h12a1.0001 1.0001 0 0 0 .857422-1.513672l-2.326172-3.876953c-.89392-.5083134-1.507327-1.4610509-1.529297-2.5488281l-2.1445311-3.5742188a1.0001 1.0001 0 0 0 -.828125-.484375zm-1.0292969 2.9980469h2v5h-2zm0 6h2v2h-2z" fill="#ffdd65"/><g fill="#f95252"><path d="m14 0a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -2-2z"/><path d="m15.447266 4.6210938c-.430501.2402237-.923653.3789062-1.447266.3789062-.522676 0-1.015355-.1375274-1.445312-.3769531a2 2 0 0 0 -.554688 1.3769531 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -.552734-1.3789062z"/></g></svg>
diff --git a/editor/icons/NodeWarnings3.svg b/editor/icons/NodeWarnings3.svg
new file mode 100644
index 0000000000..53c0e70034
--- /dev/null
+++ b/editor/icons/NodeWarnings3.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m8.0292969 2.0019531a1.0001 1.0001 0 0 0 -.8867188.484375l-6 9.9999999a1.0001 1.0001 0 0 0 .8574219 1.513672h12a1.0001 1.0001 0 0 0 .982422-1.171875c-.308689.108606-.638692.171875-.982422.171875-1.645008 0-3-1.354992-3-3a1.0001 1.0001 0 0 0 0-.0019531c.002071-.7569921.302544-1.4803618.818359-2.0332031-.464296-.5178712-.798903-1.1662278-.816406-1.9042969l-2.1445311-3.5742188a1.0001 1.0001 0 0 0 -.828125-.484375zm-1.0292969 2.9980469h2v5h-2zm6.095703 4.7636719c-.02286.0837076-.095296.1479891-.095703.2363281v.001953c.001004.551209.418791.97816.964844.996094l-.712891-1.1875001c-.051505-.0169949-.103183-.0337067-.15625-.046875zm-6.095703 1.2363281h2v2h-2z" fill="#ffdd65"/><path d="m14 0a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -2-2zm1.447266 4.6210938c-.430501.2402237-.923653.3789062-1.447266.3789062-.522676 0-1.015355-.1375274-1.445312-.3769531a2 2 0 0 0 -.554688 1.3769531 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -.552734-1.3789062zm0 4c-.430501.2402236-.923653.3789062-1.447266.3789062-.522676 0-1.015355-.1375274-1.445312-.3769531a2 2 0 0 0 -.554688 1.3769531 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -.552734-1.3789062z" fill="#f95252" stroke-dashoffset="16.5" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/></svg>
diff --git a/editor/icons/NodeWarnings4Plus.svg b/editor/icons/NodeWarnings4Plus.svg
new file mode 100644
index 0000000000..64c0a0671d
--- /dev/null
+++ b/editor/icons/NodeWarnings4Plus.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m8.0292969 2.0019531a1.0001 1.0001 0 0 0 -.8867188.484375l-6 9.9999999a1.0001 1.0001 0 0 0 .8574219 1.513672h9a1.0001 1.0001 0 0 0 0-.001953c.002025-.740254.278882-1.453739.773438-2.001953-.478045-.532242-.773438-1.231924-.773438-1.996094a1.0001 1.0001 0 0 0 0-.0019531c.002071-.7569921.302544-1.4803618.818359-2.0332031-.464296-.5178713-.798903-1.1662278-.816406-1.9042969l-2.1445311-3.5742188a1.0001 1.0001 0 0 0 -.828125-.484375zm-1.0292969 2.9980469h2v5h-2zm6.095703 4.7636719c-.02286.0837076-.095296.1479891-.095703.2363281v.001953c.001004.551209.418791.97816.964844.996094l-.712891-1.1875001c-.051505-.0169949-.103183-.0337067-.15625-.046875zm-6.095703 1.2363281h2v2h-2zm6.095703 2.763672c-.02286.083707-.095296.147988-.095703.236328h1c-.326848 0-.598793-.160518-.904297-.236328z" fill="#ffdd65"/><g fill="#f95252" stroke-dashoffset="16.5" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m14 0a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -2-2z"/><path d="m15.447266 8.6210938c-.430501.2402236-.923653.3789062-1.447266.3789062-.522676 0-1.015355-.1375274-1.445312-.3769531a2 2 0 0 0 -.554688 1.3769531 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -.552734-1.3789062z"/><path d="m15.447266 4.6210938c-.430501.2402237-.923653.3789062-1.447266.3789062-.522676 0-1.015355-.1375274-1.445312-.3769531a2 2 0 0 0 -.554688 1.3769531 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -.552734-1.3789062z"/><path d="m15.447266 12.621094c-.430501.240224-.923653.378906-1.447266.378906-.522676 0-1.015355-.137527-1.445312-.376953a2 2 0 0 0 -.554688 1.376953 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0 -.552734-1.378906z"/></g></svg>
diff --git a/editor/icons/TorusMesh.svg b/editor/icons/TorusMesh.svg
new file mode 100644
index 0000000000..2ed973d3cf
--- /dev/null
+++ b/editor/icons/TorusMesh.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><ellipse cx="8" cy="7.5" fill="none" rx="6" ry="3.5" stroke="#ffca5f" stroke-linecap="square" stroke-linejoin="round" stroke-width="2"/></svg>
diff --git a/editor/import/resource_importer_layered_texture.cpp b/editor/import/resource_importer_layered_texture.cpp
index a5dfd67d18..b301bbf0f9 100644
--- a/editor/import/resource_importer_layered_texture.cpp
+++ b/editor/import/resource_importer_layered_texture.cpp
@@ -139,7 +139,7 @@ void ResourceImporterLayeredTexture::get_import_options(const String &p_path, Li
 	r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "compress/lossy_quality", PROPERTY_HINT_RANGE, "0,1,0.01"), 0.7));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "compress/hdr_compression", PROPERTY_HINT_ENUM, "Disabled,Opaque Only,Always"), 1));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "compress/bptc_ldr", PROPERTY_HINT_ENUM, "Disabled,Enabled,RGBA Only"), 0));
-	r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "compress/channel_pack", PROPERTY_HINT_ENUM, "sRGB Friendly,Optimized"), 0));
+	r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "compress/channel_pack", PROPERTY_HINT_ENUM, "sRGB Friendly,Optimized,Normal Map (RG Channels)"), 0));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "mipmaps/generate"), true));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "mipmaps/limit", PROPERTY_HINT_RANGE, "-1,256"), -1));
 
@@ -250,7 +250,7 @@ void ResourceImporterLayeredTexture::_save_tex(Vector<Ref<Image>> p_images, cons
 			}
 
 			if (p_mipmaps) {
-				p_images.write[i]->generate_mipmaps();
+				p_images.write[i]->generate_mipmaps(p_csource == Image::COMPRESS_SOURCE_NORMAL);
 			} else {
 				p_images.write[i]->clear_mipmaps();
 			}
@@ -354,6 +354,9 @@ Error ResourceImporterLayeredTexture::import(const String &p_source_file, const
 	Image::CompressSource csource = Image::COMPRESS_SOURCE_GENERIC;
 	if (channel_pack == 0) {
 		csource = Image::COMPRESS_SOURCE_SRGB;
+	} else if (channel_pack == 2) {
+		// force normal
+		csource = Image::COMPRESS_SOURCE_NORMAL;
 	}
 
 	Image::UsedChannels used_channels = image->detect_used_channels(csource);
@@ -391,7 +394,7 @@ Error ResourceImporterLayeredTexture::import(const String &p_source_file, const
 	texture_import->bptc_ldr = bptc_ldr;
 	texture_import->mipmaps = mipmaps;
 	texture_import->used_channels = used_channels;
-	_check_compress_ctex(texture_import);
+	_check_compress_ctex(p_source_file, texture_import);
 	if (r_metadata) {
 		Dictionary metadata;
 		metadata["vram_texture"] = compress_mode == COMPRESS_VRAM_COMPRESSED;
@@ -472,7 +475,7 @@ ResourceImporterLayeredTexture::ResourceImporterLayeredTexture() {
 ResourceImporterLayeredTexture::~ResourceImporterLayeredTexture() {
 }
 
-void ResourceImporterLayeredTexture::_check_compress_ctex(Ref<LayeredTextureImport> r_texture_import) {
+void ResourceImporterLayeredTexture::_check_compress_ctex(const String &p_source_file, Ref<LayeredTextureImport> r_texture_import) {
 	String extension = get_save_extension();
 	ERR_FAIL_NULL(r_texture_import->csource);
 	if (r_texture_import->compress_mode != COMPRESS_VRAM_COMPRESSED) {
@@ -542,5 +545,5 @@ void ResourceImporterLayeredTexture::_check_compress_ctex(Ref<LayeredTextureImpo
 		}
 		return;
 	}
-	EditorNode::add_io_error(TTR("Warning, no suitable PC VRAM compression enabled in Project Settings. This texture will not display correctly on PC."));
+	EditorNode::add_io_error(vformat(TTR("%s: No suitable PC VRAM compression algorithm enabled in Project Settings (S3TC or BPTC). This texture may not display correctly on desktop platforms."), p_source_file));
 }
diff --git a/editor/import/resource_importer_layered_texture.h b/editor/import/resource_importer_layered_texture.h
index 5a29010c3b..e292390fb3 100644
--- a/editor/import/resource_importer_layered_texture.h
+++ b/editor/import/resource_importer_layered_texture.h
@@ -87,7 +87,7 @@ protected:
 	static ResourceImporterLayeredTexture *singleton;
 
 public:
-	void _check_compress_ctex(Ref<LayeredTextureImport> r_texture_import);
+	void _check_compress_ctex(const String &p_source_file, Ref<LayeredTextureImport> r_texture_import);
 
 	static ResourceImporterLayeredTexture *get_singleton() { return singleton; }
 	virtual String get_importer_name() const override;
diff --git a/editor/import/resource_importer_texture.cpp b/editor/import/resource_importer_texture.cpp
index deb3047864..0eed6184c0 100644
--- a/editor/import/resource_importer_texture.cpp
+++ b/editor/import/resource_importer_texture.cpp
@@ -597,7 +597,7 @@ Error ResourceImporterTexture::import(const String &p_source_file, const String
 		}
 
 		if (!ok_on_pc) {
-			EditorNode::add_io_error(TTR("Warning, no suitable PC VRAM compression enabled in Project Settings. This texture will not display correctly on PC."));
+			EditorNode::add_io_error(vformat(TTR("%s: No suitable desktop VRAM compression algorithm enabled in Project Settings (S3TC or BPTC). This texture may not display correctly on desktop platforms."), p_source_file));
 		}
 	} else {
 		//import normally
diff --git a/editor/plugins/abstract_polygon_2d_editor.cpp b/editor/plugins/abstract_polygon_2d_editor.cpp
index cb77cd78bf..a7d7c0145a 100644
--- a/editor/plugins/abstract_polygon_2d_editor.cpp
+++ b/editor/plugins/abstract_polygon_2d_editor.cpp
@@ -294,9 +294,9 @@ bool AbstractPolygon2DEditor::forward_gui_input(const Ref<InputEvent> &p_event)
 							_commit_action();
 							return true;
 						} else {
-							pre_move_edit = vertices;
 							edited_point = PosVertex(insert.polygon, insert.vertex + 1, xform.affine_inverse().xform(insert.pos));
 							vertices.insert(edited_point.vertex, edited_point.pos);
+							pre_move_edit = vertices;
 							selected_point = Vertex(edited_point.polygon, edited_point.vertex);
 							edge_point = PosVertex();
 
diff --git a/editor/plugins/animation_library_editor.cpp b/editor/plugins/animation_library_editor.cpp
index cae33edecb..c36ae1c521 100644
--- a/editor/plugins/animation_library_editor.cpp
+++ b/editor/plugins/animation_library_editor.cpp
@@ -149,13 +149,35 @@ void AnimationLibraryEditor::_file_popup_selected(int p_id) {
 	}
 	switch (p_id) {
 		case FILE_MENU_SAVE_LIBRARY: {
-			if (al->get_path().is_resource_file()) {
+			if (al->get_path().is_resource_file() && !FileAccess::exists(al->get_path() + ".import")) {
 				EditorNode::get_singleton()->save_resource(al);
 				break;
 			}
 			[[fallthrough]];
 		}
 		case FILE_MENU_SAVE_AS_LIBRARY: {
+			// Check if we're allowed to save this
+			{
+				String al_path = al->get_path();
+				if (!al_path.is_resource_file()) {
+					int srpos = al_path.find("::");
+					if (srpos != -1) {
+						String base = al_path.substr(0, srpos);
+						if (!get_tree()->get_edited_scene_root() || get_tree()->get_edited_scene_root()->get_scene_file_path() != base) {
+							error_dialog->set_text(TTR("This animation library can't be saved because it does not belong to the edited scene. Make it unique first."));
+							error_dialog->popup_centered();
+							return;
+						}
+					}
+				} else {
+					if (FileAccess::exists(al_path + ".import")) {
+						error_dialog->set_text(TTR("This animation library can't be saved because it was imported from another file. Make it unique first."));
+						error_dialog->popup_centered();
+						return;
+					}
+				}
+			}
+
 			file_dialog->set_file_mode(EditorFileDialog::FILE_MODE_SAVE_FILE);
 			file_dialog->set_title(TTR("Save Library"));
 			if (al->get_path().is_resource_file()) {
@@ -178,6 +200,9 @@ void AnimationLibraryEditor::_file_popup_selected(int p_id) {
 
 			Ref<AnimationLibrary> ald = al->duplicate();
 
+			// TODO: should probably make all foreign animations assigned to this library
+			// unique too.
+
 			UndoRedo *undo_redo = EditorNode::get_singleton()->get_undo_redo();
 			undo_redo->create_action(vformat(TTR("Make Animation Library Unique: %s"), lib_name));
 			undo_redo->add_do_method(player, "remove_animation_library", lib_name);
@@ -188,19 +213,43 @@ void AnimationLibraryEditor::_file_popup_selected(int p_id) {
 			undo_redo->add_undo_method(this, "_update_editor", player);
 			undo_redo->commit_action();
 
+			update_tree();
+
 		} break;
 		case FILE_MENU_EDIT_LIBRARY: {
 			EditorNode::get_singleton()->push_item(al.ptr());
 		} break;
 
 		case FILE_MENU_SAVE_ANIMATION: {
-			if (anim->get_path().is_resource_file()) {
+			if (anim->get_path().is_resource_file() && !FileAccess::exists(anim->get_path() + ".import")) {
 				EditorNode::get_singleton()->save_resource(anim);
 				break;
 			}
 			[[fallthrough]];
 		}
 		case FILE_MENU_SAVE_AS_ANIMATION: {
+			// Check if we're allowed to save this
+			{
+				String anim_path = al->get_path();
+				if (!anim_path.is_resource_file()) {
+					int srpos = anim_path.find("::");
+					if (srpos != -1) {
+						String base = anim_path.substr(0, srpos);
+						if (!get_tree()->get_edited_scene_root() || get_tree()->get_edited_scene_root()->get_scene_file_path() != base) {
+							error_dialog->set_text(TTR("This animation can't be saved because it does not belong to the edited scene. Make it unique first."));
+							error_dialog->popup_centered();
+							return;
+						}
+					}
+				} else {
+					if (FileAccess::exists(anim_path + ".import")) {
+						error_dialog->set_text(TTR("This animation can't be saved because it was imported from another file. Make it unique first."));
+						error_dialog->popup_centered();
+						return;
+					}
+				}
+			}
+
 			file_dialog->set_file_mode(EditorFileDialog::FILE_MODE_SAVE_FILE);
 			file_dialog->set_title(TTR("Save Animation"));
 			if (anim->get_path().is_resource_file()) {
@@ -232,6 +281,8 @@ void AnimationLibraryEditor::_file_popup_selected(int p_id) {
 			undo_redo->add_do_method(this, "_update_editor", player);
 			undo_redo->add_undo_method(this, "_update_editor", player);
 			undo_redo->commit_action();
+
+			update_tree();
 		} break;
 		case FILE_MENU_EDIT_ANIMATION: {
 			EditorNode::get_singleton()->push_item(anim.ptr());
@@ -577,19 +628,45 @@ void AnimationLibraryEditor::update_tree() {
 		} else {
 			libitem->set_suffix(0, "");
 		}
-		libitem->set_editable(0, true);
-		libitem->set_metadata(0, K);
-		libitem->set_icon(0, get_theme_icon("AnimationLibrary", "EditorIcons"));
-		libitem->add_button(0, get_theme_icon("Add", "EditorIcons"), LIB_BUTTON_ADD, false, TTR("Add Animation to Library"));
-		libitem->add_button(0, get_theme_icon("Load", "EditorIcons"), LIB_BUTTON_LOAD, false, TTR("Load animation from file and add to library"));
-		libitem->add_button(0, get_theme_icon("ActionPaste", "EditorIcons"), LIB_BUTTON_PASTE, false, TTR("Paste Animation to Library from clipboard"));
+
 		Ref<AnimationLibrary> al = player->call("get_animation_library", K);
-		if (al->get_path().is_resource_file()) {
-			libitem->set_text(1, al->get_path().get_file());
-			libitem->set_tooltip(1, al->get_path());
-		} else {
+		bool animation_library_is_foreign = false;
+		String al_path = al->get_path();
+		if (!al_path.is_resource_file()) {
 			libitem->set_text(1, TTR("[built-in]"));
+			libitem->set_tooltip(1, al_path);
+			int srpos = al_path.find("::");
+			if (srpos != -1) {
+				String base = al_path.substr(0, srpos);
+				if (ResourceLoader::get_resource_type(base) == "PackedScene") {
+					if (!get_tree()->get_edited_scene_root() || get_tree()->get_edited_scene_root()->get_scene_file_path() != base) {
+						animation_library_is_foreign = true;
+						libitem->set_text(1, TTR("[foreign]"));
+					}
+				} else {
+					if (FileAccess::exists(base + ".import")) {
+						animation_library_is_foreign = true;
+						libitem->set_text(1, TTR("[imported]"));
+					}
+				}
+			}
+		} else {
+			if (FileAccess::exists(al_path + ".import")) {
+				animation_library_is_foreign = true;
+				libitem->set_text(1, TTR("[imported]"));
+			} else {
+				libitem->set_text(1, al_path.get_file());
+			}
 		}
+
+		libitem->set_editable(0, !animation_library_is_foreign);
+		libitem->set_metadata(0, K);
+		libitem->set_icon(0, get_theme_icon("AnimationLibrary", "EditorIcons"));
+
+		libitem->add_button(0, get_theme_icon("Add", "EditorIcons"), LIB_BUTTON_ADD, animation_library_is_foreign, TTR("Add Animation to Library"));
+		libitem->add_button(0, get_theme_icon("Load", "EditorIcons"), LIB_BUTTON_LOAD, animation_library_is_foreign, TTR("Load animation from file and add to library"));
+		libitem->add_button(0, get_theme_icon("ActionPaste", "EditorIcons"), LIB_BUTTON_PASTE, animation_library_is_foreign, TTR("Paste Animation to Library from clipboard"));
+
 		libitem->add_button(1, get_theme_icon("Save", "EditorIcons"), LIB_BUTTON_FILE, false, TTR("Save animation library to resource on disk"));
 		libitem->add_button(1, get_theme_icon("Remove", "EditorIcons"), LIB_BUTTON_DELETE, false, TTR("Remove animation library"));
 
@@ -600,20 +677,38 @@ void AnimationLibraryEditor::update_tree() {
 		for (const StringName &L : animations) {
 			TreeItem *anitem = tree->create_item(libitem);
 			anitem->set_text(0, L);
-			anitem->set_editable(0, true);
+			anitem->set_editable(0, !animation_library_is_foreign);
 			anitem->set_metadata(0, L);
 			anitem->set_icon(0, get_theme_icon("Animation", "EditorIcons"));
-			anitem->add_button(0, get_theme_icon("ActionCopy", "EditorIcons"), ANIM_BUTTON_COPY, false, TTR("Copy animation to clipboard"));
-			Ref<Animation> anim = al->get_animation(L);
+			anitem->add_button(0, get_theme_icon("ActionCopy", "EditorIcons"), ANIM_BUTTON_COPY, animation_library_is_foreign, TTR("Copy animation to clipboard"));
 
-			if (anim->get_path().is_resource_file()) {
-				anitem->set_text(1, anim->get_path().get_file());
-				anitem->set_tooltip(1, anim->get_path());
-			} else {
+			Ref<Animation> anim = al->get_animation(L);
+			String anim_path = anim->get_path();
+			if (!anim_path.is_resource_file()) {
 				anitem->set_text(1, TTR("[built-in]"));
+				anitem->set_tooltip(1, anim_path);
+				int srpos = anim_path.find("::");
+				if (srpos != -1) {
+					String base = anim_path.substr(0, srpos);
+					if (ResourceLoader::get_resource_type(base) == "PackedScene") {
+						if (!get_tree()->get_edited_scene_root() || get_tree()->get_edited_scene_root()->get_scene_file_path() != base) {
+							anitem->set_text(1, TTR("[foreign]"));
+						}
+					} else {
+						if (FileAccess::exists(base + ".import")) {
+							anitem->set_text(1, TTR("[imported]"));
+						}
+					}
+				}
+			} else {
+				if (FileAccess::exists(anim_path + ".import")) {
+					anitem->set_text(1, TTR("[imported]"));
+				} else {
+					anitem->set_text(1, anim_path.get_file());
+				}
 			}
-			anitem->add_button(1, get_theme_icon("Save", "EditorIcons"), ANIM_BUTTON_FILE, false, TTR("Save animation to resource on disk"));
-			anitem->add_button(1, get_theme_icon("Remove", "EditorIcons"), ANIM_BUTTON_DELETE, false, TTR("Remove animation from Library"));
+			anitem->add_button(1, get_theme_icon("Save", "EditorIcons"), ANIM_BUTTON_FILE, animation_library_is_foreign, TTR("Save animation to resource on disk"));
+			anitem->add_button(1, get_theme_icon("Remove", "EditorIcons"), ANIM_BUTTON_DELETE, animation_library_is_foreign, TTR("Remove animation from Library"));
 		}
 	}
 }
diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp
index 57203ec147..516079673d 100644
--- a/editor/plugins/animation_player_editor_plugin.cpp
+++ b/editor/plugins/animation_player_editor_plugin.cpp
@@ -55,7 +55,7 @@ void AnimationPlayerEditor::_node_removed(Node *p_node) {
 
 		set_process(false);
 
-		track_editor->set_animation(Ref<Animation>());
+		track_editor->set_animation(Ref<Animation>(), true);
 		track_editor->set_root(nullptr);
 		track_editor->show_select_node_warning(true);
 		_update_player();
@@ -283,7 +283,28 @@ void AnimationPlayerEditor::_animation_selected(int p_which) {
 
 		Ref<Animation> anim = player->get_animation(current);
 		{
-			track_editor->set_animation(anim);
+			bool animation_library_is_foreign = false;
+			if (!anim->get_path().is_resource_file()) {
+				int srpos = anim->get_path().find("::");
+				if (srpos != -1) {
+					String base = anim->get_path().substr(0, srpos);
+					if (ResourceLoader::get_resource_type(base) == "PackedScene") {
+						if (!get_tree()->get_edited_scene_root() || get_tree()->get_edited_scene_root()->get_scene_file_path() != base) {
+							animation_library_is_foreign = true;
+						}
+					} else {
+						if (FileAccess::exists(base + ".import")) {
+							animation_library_is_foreign = true;
+						}
+					}
+				}
+			} else {
+				if (FileAccess::exists(anim->get_path() + ".import")) {
+					animation_library_is_foreign = true;
+				}
+			}
+
+			track_editor->set_animation(anim, animation_library_is_foreign);
 			Node *root = player->get_node(player->get_root());
 			if (root) {
 				track_editor->set_root(root);
@@ -292,7 +313,7 @@ void AnimationPlayerEditor::_animation_selected(int p_which) {
 		frame->set_max((double)anim->get_length());
 
 	} else {
-		track_editor->set_animation(Ref<Animation>());
+		track_editor->set_animation(Ref<Animation>(), true);
 		track_editor->set_root(nullptr);
 	}
 
@@ -751,14 +772,36 @@ void AnimationPlayerEditor::_animation_edit() {
 	String current = _get_current();
 	if (current != String()) {
 		Ref<Animation> anim = player->get_animation(current);
-		track_editor->set_animation(anim);
+
+		bool animation_library_is_foreign = false;
+		if (!anim->get_path().is_resource_file()) {
+			int srpos = anim->get_path().find("::");
+			if (srpos != -1) {
+				String base = anim->get_path().substr(0, srpos);
+				if (ResourceLoader::get_resource_type(base) == "PackedScene") {
+					if (!get_tree()->get_edited_scene_root() || get_tree()->get_edited_scene_root()->get_scene_file_path() != base) {
+						animation_library_is_foreign = true;
+					}
+				} else {
+					if (FileAccess::exists(base + ".import")) {
+						animation_library_is_foreign = true;
+					}
+				}
+			}
+		} else {
+			if (FileAccess::exists(anim->get_path() + ".import")) {
+				animation_library_is_foreign = true;
+			}
+		}
+
+		track_editor->set_animation(anim, animation_library_is_foreign);
 
 		Node *root = player->get_node(player->get_root());
 		if (root) {
 			track_editor->set_root(root);
 		}
 	} else {
-		track_editor->set_animation(Ref<Animation>());
+		track_editor->set_animation(Ref<Animation>(), true);
 		track_editor->set_root(nullptr);
 	}
 }
@@ -812,13 +855,37 @@ void AnimationPlayerEditor::_update_player() {
 
 	int active_idx = -1;
 	bool no_anims_found = true;
+	bool foreign_global_anim_lib = false;
 
 	for (const StringName &K : libraries) {
 		if (K != StringName()) {
 			animation->add_separator(K);
 		}
 
+		// Check if the global library is foreign since we want to disable options for adding/remove/renaming animations if it is.
 		Ref<AnimationLibrary> library = player->get_animation_library(K);
+		if (K == "") {
+			if (!library->get_path().is_resource_file()) {
+				int srpos = library->get_path().find("::");
+				if (srpos != -1) {
+					String base = library->get_path().substr(0, srpos);
+					if (ResourceLoader::get_resource_type(base) == "PackedScene") {
+						if (!get_tree()->get_edited_scene_root() || get_tree()->get_edited_scene_root()->get_scene_file_path() != base) {
+							foreign_global_anim_lib = true;
+						}
+					} else {
+						if (FileAccess::exists(base + ".import")) {
+							foreign_global_anim_lib = true;
+						}
+					}
+				}
+			} else {
+				if (FileAccess::exists(library->get_path() + ".import")) {
+					foreign_global_anim_lib = true;
+				}
+			}
+		}
+
 		List<StringName> animlist;
 		library->get_animation_list(&animlist);
 
@@ -835,7 +902,13 @@ void AnimationPlayerEditor::_update_player() {
 			no_anims_found = false;
 		}
 	}
-#define ITEM_CHECK_DISABLED(m_item) tool_anim->get_popup()->set_item_disabled(tool_anim->get_popup()->get_item_index(m_item), no_anims_found)
+#define ITEM_CHECK_DISABLED(m_item) tool_anim->get_popup()->set_item_disabled(tool_anim->get_popup()->get_item_index(m_item), foreign_global_anim_lib)
+
+	ITEM_CHECK_DISABLED(TOOL_NEW_ANIM);
+
+#undef ITEM_CHECK_DISABLED
+
+#define ITEM_CHECK_DISABLED(m_item) tool_anim->get_popup()->set_item_disabled(tool_anim->get_popup()->get_item_index(m_item), no_anims_found || foreign_global_anim_lib)
 
 	ITEM_CHECK_DISABLED(TOOL_DUPLICATE_ANIM);
 	ITEM_CHECK_DISABLED(TOOL_RENAME_ANIM);
@@ -877,7 +950,29 @@ void AnimationPlayerEditor::_update_player() {
 	if (!no_anims_found) {
 		String current = animation->get_item_text(animation->get_selected());
 		Ref<Animation> anim = player->get_animation(current);
-		track_editor->set_animation(anim);
+
+		bool animation_library_is_foreign = false;
+		if (!anim->get_path().is_resource_file()) {
+			int srpos = anim->get_path().find("::");
+			if (srpos != -1) {
+				String base = anim->get_path().substr(0, srpos);
+				if (ResourceLoader::get_resource_type(base) == "PackedScene") {
+					if (!get_tree()->get_edited_scene_root() || get_tree()->get_edited_scene_root()->get_scene_file_path() != base) {
+						animation_library_is_foreign = true;
+					}
+				} else {
+					if (FileAccess::exists(base + ".import")) {
+						animation_library_is_foreign = true;
+					}
+				}
+			}
+		} else {
+			if (FileAccess::exists(anim->get_path() + ".import")) {
+				animation_library_is_foreign = true;
+			}
+		}
+
+		track_editor->set_animation(anim, animation_library_is_foreign);
 		Node *root = player->get_node(player->get_root());
 		if (root) {
 			track_editor->set_root(root);
@@ -1426,19 +1521,19 @@ void AnimationPlayerEditor::_prepare_onion_layers_2() {
 	// Render every past/future step with the capture shader.
 
 	RS::get_singleton()->canvas_item_set_material(onion.capture.canvas_item, onion.capture.material->get_rid());
-	onion.capture.material->set_shader_param("bkg_color", GLOBAL_GET("rendering/environment/defaults/default_clear_color"));
-	onion.capture.material->set_shader_param("differences_only", onion.differences_only);
-	onion.capture.material->set_shader_param("present", onion.differences_only ? RS::get_singleton()->viewport_get_texture(present_rid) : RID());
+	onion.capture.material->set_shader_uniform("bkg_color", GLOBAL_GET("rendering/environment/defaults/default_clear_color"));
+	onion.capture.material->set_shader_uniform("differences_only", onion.differences_only);
+	onion.capture.material->set_shader_uniform("present", onion.differences_only ? RS::get_singleton()->viewport_get_texture(present_rid) : RID());
 
 	int step_off_a = onion.past ? -onion.steps : 0;
 	int step_off_b = onion.future ? onion.steps : 0;
 	int cidx = 0;
-	onion.capture.material->set_shader_param("dir_color", onion.force_white_modulate ? Color(1, 1, 1) : Color(EDITOR_GET("editors/animation/onion_layers_past_color")));
+	onion.capture.material->set_shader_uniform("dir_color", onion.force_white_modulate ? Color(1, 1, 1) : Color(EDITOR_GET("editors/animation/onion_layers_past_color")));
 	for (int step_off = step_off_a; step_off <= step_off_b; step_off++) {
 		if (step_off == 0) {
 			// Skip present step and switch to the color of future.
 			if (!onion.force_white_modulate) {
-				onion.capture.material->set_shader_param("dir_color", EDITOR_GET("editors/animation/onion_layers_future_color"));
+				onion.capture.material->set_shader_uniform("dir_color", EDITOR_GET("editors/animation/onion_layers_future_color"));
 			}
 			continue;
 		}
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index 6f8d33532f..fc70ace331 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -4237,13 +4237,13 @@ void CanvasItemEditor::_insert_animation_keys(bool p_location, bool p_rotation,
 			Control *ctrl = Object::cast_to<Control>(canvas_item);
 
 			if (key_pos) {
-				te->insert_node_value_key(ctrl, "rect_position", ctrl->get_position(), p_on_existing);
+				te->insert_node_value_key(ctrl, "position", ctrl->get_position(), p_on_existing);
 			}
 			if (key_rot) {
-				te->insert_node_value_key(ctrl, "rect_rotation", ctrl->get_rotation(), p_on_existing);
+				te->insert_node_value_key(ctrl, "rotation", ctrl->get_rotation(), p_on_existing);
 			}
 			if (key_scale) {
-				te->insert_node_value_key(ctrl, "rect_size", ctrl->get_size(), p_on_existing);
+				te->insert_node_value_key(ctrl, "size", ctrl->get_size(), p_on_existing);
 			}
 		}
 	}
@@ -5020,17 +5020,36 @@ CanvasItemEditor::CanvasItemEditor() {
 	controls_vb->set_begin(Point2(5, 5));
 
 	// To ensure that scripts can parse the list of shortcuts correctly, we have to define
-	// those shortcuts one by one. Define shortcut before using it (by EditorZoomWidget)
-	ED_SHORTCUT("canvas_item_editor/zoom_3.125_percent", TTR("Zoom to 3.125%"), KeyModifierMask::SHIFT | Key::KEY_5);
-	ED_SHORTCUT("canvas_item_editor/zoom_6.25_percent", TTR("Zoom to 6.25%"), KeyModifierMask::SHIFT | Key::KEY_4);
-	ED_SHORTCUT("canvas_item_editor/zoom_12.5_percent", TTR("Zoom to 12.5%"), KeyModifierMask::SHIFT | Key::KEY_3);
-	ED_SHORTCUT("canvas_item_editor/zoom_25_percent", TTR("Zoom to 25%"), KeyModifierMask::SHIFT | Key::KEY_2);
-	ED_SHORTCUT("canvas_item_editor/zoom_50_percent", TTR("Zoom to 50%"), KeyModifierMask::SHIFT | Key::KEY_1);
-	ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_100_percent", TTR("Zoom to 100%"), { (int32_t)Key::KEY_1, (int32_t)(KeyModifierMask::CMD | Key::KEY_0) });
-	ED_SHORTCUT("canvas_item_editor/zoom_200_percent", TTR("Zoom to 200%"), Key::KEY_2);
-	ED_SHORTCUT("canvas_item_editor/zoom_400_percent", TTR("Zoom to 400%"), Key::KEY_3);
-	ED_SHORTCUT("canvas_item_editor/zoom_800_percent", TTR("Zoom to 800%"), Key::KEY_4);
-	ED_SHORTCUT("canvas_item_editor/zoom_1600_percent", TTR("Zoom to 1600%"), Key::KEY_5);
+	// those shortcuts one by one. Define shortcut before using it (by EditorZoomWidget).
+	ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_3.125_percent", TTR("Zoom to 3.125%"),
+			{ int32_t(KeyModifierMask::SHIFT | Key::KEY_5), int32_t(KeyModifierMask::SHIFT | Key::KP_5) });
+
+	ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_6.25_percent", TTR("Zoom to 6.25%"),
+			{ int32_t(KeyModifierMask::SHIFT | Key::KEY_4), int32_t(KeyModifierMask::SHIFT | Key::KP_4) });
+
+	ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_12.5_percent", TTR("Zoom to 12.5%"),
+			{ int32_t(KeyModifierMask::SHIFT | Key::KEY_3), int32_t(KeyModifierMask::SHIFT | Key::KP_3) });
+
+	ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_25_percent", TTR("Zoom to 25%"),
+			{ int32_t(KeyModifierMask::SHIFT | Key::KEY_2), int32_t(KeyModifierMask::SHIFT | Key::KP_2) });
+
+	ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_50_percent", TTR("Zoom to 50%"),
+			{ int32_t(KeyModifierMask::SHIFT | Key::KEY_1), int32_t(KeyModifierMask::SHIFT | Key::KP_1) });
+
+	ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_100_percent", TTR("Zoom to 100%"),
+			{ int32_t(Key::KEY_1), int32_t(KeyModifierMask::CMD | Key::KEY_0), int32_t(Key::KP_1), int32_t(KeyModifierMask::CMD | Key::KP_0) });
+
+	ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_200_percent", TTR("Zoom to 200%"),
+			{ int32_t(Key::KEY_2), int32_t(Key::KP_2) });
+
+	ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_400_percent", TTR("Zoom to 400%"),
+			{ int32_t(Key::KEY_3), int32_t(Key::KP_3) });
+
+	ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_800_percent", TTR("Zoom to 800%"),
+			{ int32_t(Key::KEY_4), int32_t(Key::KP_4) });
+
+	ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_1600_percent", TTR("Zoom to 1600%"),
+			{ int32_t(Key::KEY_5), int32_t(Key::KP_5) });
 
 	zoom_widget = memnew(EditorZoomWidget);
 	controls_vb->add_child(zoom_widget);
diff --git a/editor/plugins/ray_cast_2d_editor_plugin.cpp b/editor/plugins/cast_2d_editor_plugin.cpp
index 6f247a37ef..18c38e7ab8 100644
--- a/editor/plugins/ray_cast_2d_editor_plugin.cpp
+++ b/editor/plugins/cast_2d_editor_plugin.cpp
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  ray_cast_2d_editor_plugin.cpp                                        */
+/*  cast_2d_editor_plugin.cpp                                            */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,30 +28,32 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "ray_cast_2d_editor_plugin.h"
+#include "cast_2d_editor_plugin.h"
 
 #include "canvas_item_editor_plugin.h"
 #include "editor/editor_node.h"
+#include "scene/2d/ray_cast_2d.h"
+#include "scene/2d/shape_cast_2d.h"
 
-void RayCast2DEditor::_notification(int p_what) {
+void Cast2DEditor::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
-			get_tree()->connect("node_removed", callable_mp(this, &RayCast2DEditor::_node_removed));
+			get_tree()->connect("node_removed", callable_mp(this, &Cast2DEditor::_node_removed));
 		} break;
 
 		case NOTIFICATION_EXIT_TREE: {
-			get_tree()->disconnect("node_removed", callable_mp(this, &RayCast2DEditor::_node_removed));
+			get_tree()->disconnect("node_removed", callable_mp(this, &Cast2DEditor::_node_removed));
 		} break;
 	}
 }
 
-void RayCast2DEditor::_node_removed(Node *p_node) {
+void Cast2DEditor::_node_removed(Node *p_node) {
 	if (p_node == node) {
 		node = nullptr;
 	}
 }
 
-bool RayCast2DEditor::forward_canvas_gui_input(const Ref<InputEvent> &p_event) {
+bool Cast2DEditor::forward_canvas_gui_input(const Ref<InputEvent> &p_event) {
 	if (!node || !node->is_visible_in_tree()) {
 		return false;
 	}
@@ -60,10 +62,12 @@ bool RayCast2DEditor::forward_canvas_gui_input(const Ref<InputEvent> &p_event) {
 
 	Ref<InputEventMouseButton> mb = p_event;
 	if (mb.is_valid() && mb->get_button_index() == MouseButton::LEFT) {
+		Vector2 target_position = node->get("target_position");
+
 		if (mb->is_pressed()) {
-			if (xform.xform(node->get_target_position()).distance_to(mb->get_position()) < 8) {
+			if (xform.xform(target_position).distance_to(mb->get_position()) < 8) {
 				pressed = true;
-				original_target_position = node->get_target_position();
+				original_target_position = target_position;
 
 				return true;
 			} else {
@@ -73,9 +77,9 @@ bool RayCast2DEditor::forward_canvas_gui_input(const Ref<InputEvent> &p_event) {
 			}
 		} else if (pressed) {
 			undo_redo->create_action(TTR("Set target_position"));
-			undo_redo->add_do_method(node, "set_target_position", node->get_target_position());
+			undo_redo->add_do_property(node, "target_position", target_position);
 			undo_redo->add_do_method(canvas_item_editor, "update_viewport");
-			undo_redo->add_undo_method(node, "set_target_position", original_target_position);
+			undo_redo->add_undo_property(node, "target_position", original_target_position);
 			undo_redo->add_undo_method(canvas_item_editor, "update_viewport");
 			undo_redo->commit_action();
 
@@ -90,7 +94,7 @@ bool RayCast2DEditor::forward_canvas_gui_input(const Ref<InputEvent> &p_event) {
 		Vector2 point = canvas_item_editor->snap_point(canvas_item_editor->get_canvas_transform().affine_inverse().xform(mm->get_position()));
 		point = node->get_global_transform().affine_inverse().xform(point);
 
-		node->set_target_position(point);
+		node->set("target_position", point);
 		canvas_item_editor->update_viewport();
 		node->notify_property_list_changed();
 
@@ -100,7 +104,7 @@ bool RayCast2DEditor::forward_canvas_gui_input(const Ref<InputEvent> &p_event) {
 	return false;
 }
 
-void RayCast2DEditor::forward_canvas_draw_over_viewport(Control *p_overlay) {
+void Cast2DEditor::forward_canvas_draw_over_viewport(Control *p_overlay) {
 	if (!node || !node->is_visible_in_tree()) {
 		return;
 	}
@@ -108,16 +112,16 @@ void RayCast2DEditor::forward_canvas_draw_over_viewport(Control *p_overlay) {
 	Transform2D gt = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
 
 	const Ref<Texture2D> handle = get_theme_icon(SNAME("EditorHandle"), SNAME("EditorIcons"));
-	p_overlay->draw_texture(handle, gt.xform(node->get_target_position()) - handle->get_size() / 2);
+	p_overlay->draw_texture(handle, gt.xform((Vector2)node->get("target_position")) - handle->get_size() / 2);
 }
 
-void RayCast2DEditor::edit(Node *p_node) {
+void Cast2DEditor::edit(Node2D *p_node) {
 	if (!canvas_item_editor) {
 		canvas_item_editor = CanvasItemEditor::get_singleton();
 	}
 
-	if (p_node) {
-		node = Object::cast_to<RayCast2D>(p_node);
+	if (Object::cast_to<RayCast2D>(p_node) || Object::cast_to<ShapeCast2D>(p_node)) {
+		node = p_node;
 	} else {
 		node = nullptr;
 	}
@@ -125,27 +129,27 @@ void RayCast2DEditor::edit(Node *p_node) {
 	canvas_item_editor->update_viewport();
 }
 
-RayCast2DEditor::RayCast2DEditor() {
+Cast2DEditor::Cast2DEditor() {
 	undo_redo = EditorNode::get_singleton()->get_undo_redo();
 }
 
 ///////////////////////
 
-void RayCast2DEditorPlugin::edit(Object *p_object) {
-	ray_cast_2d_editor->edit(Object::cast_to<RayCast2D>(p_object));
+void Cast2DEditorPlugin::edit(Object *p_object) {
+	cast_2d_editor->edit(Object::cast_to<Node2D>(p_object));
 }
 
-bool RayCast2DEditorPlugin::handles(Object *p_object) const {
-	return Object::cast_to<RayCast2D>(p_object) != nullptr;
+bool Cast2DEditorPlugin::handles(Object *p_object) const {
+	return Object::cast_to<RayCast2D>(p_object) != nullptr || Object::cast_to<ShapeCast2D>(p_object) != nullptr;
 }
 
-void RayCast2DEditorPlugin::make_visible(bool p_visible) {
+void Cast2DEditorPlugin::make_visible(bool p_visible) {
 	if (!p_visible) {
 		edit(nullptr);
 	}
 }
 
-RayCast2DEditorPlugin::RayCast2DEditorPlugin() {
-	ray_cast_2d_editor = memnew(RayCast2DEditor);
-	EditorNode::get_singleton()->get_gui_base()->add_child(ray_cast_2d_editor);
+Cast2DEditorPlugin::Cast2DEditorPlugin() {
+	cast_2d_editor = memnew(Cast2DEditor);
+	EditorNode::get_singleton()->get_gui_base()->add_child(cast_2d_editor);
 }
diff --git a/editor/plugins/ray_cast_2d_editor_plugin.h b/editor/plugins/cast_2d_editor_plugin.h
index 74628da0e4..d9c0cc4a06 100644
--- a/editor/plugins/ray_cast_2d_editor_plugin.h
+++ b/editor/plugins/cast_2d_editor_plugin.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  ray_cast_2d_editor_plugin.h                                          */
+/*  cast_2d_editor_plugin.h                                              */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,20 +28,20 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef RAY_CAST_2D_EDITOR_PLUGIN_H
-#define RAY_CAST_2D_EDITOR_PLUGIN_H
+#ifndef CAST_2D_EDITOR_PLUGIN_H
+#define CAST_2D_EDITOR_PLUGIN_H
 
 #include "editor/editor_plugin.h"
-#include "scene/2d/ray_cast_2d.h"
+#include "scene/2d/node_2d.h"
 
 class CanvasItemEditor;
 
-class RayCast2DEditor : public Control {
-	GDCLASS(RayCast2DEditor, Control);
+class Cast2DEditor : public Control {
+	GDCLASS(Cast2DEditor, Control);
 
 	UndoRedo *undo_redo = nullptr;
 	CanvasItemEditor *canvas_item_editor = nullptr;
-	RayCast2D *node;
+	Node2D *node;
 
 	bool pressed = false;
 	Point2 original_target_position;
@@ -53,27 +53,27 @@ protected:
 public:
 	bool forward_canvas_gui_input(const Ref<InputEvent> &p_event);
 	void forward_canvas_draw_over_viewport(Control *p_overlay);
-	void edit(Node *p_node);
+	void edit(Node2D *p_node);
 
-	RayCast2DEditor();
+	Cast2DEditor();
 };
 
-class RayCast2DEditorPlugin : public EditorPlugin {
-	GDCLASS(RayCast2DEditorPlugin, EditorPlugin);
+class Cast2DEditorPlugin : public EditorPlugin {
+	GDCLASS(Cast2DEditorPlugin, EditorPlugin);
 
-	RayCast2DEditor *ray_cast_2d_editor = nullptr;
+	Cast2DEditor *cast_2d_editor = nullptr;
 
 public:
-	virtual bool forward_canvas_gui_input(const Ref<InputEvent> &p_event) override { return ray_cast_2d_editor->forward_canvas_gui_input(p_event); }
-	virtual void forward_canvas_draw_over_viewport(Control *p_overlay) override { ray_cast_2d_editor->forward_canvas_draw_over_viewport(p_overlay); }
+	virtual bool forward_canvas_gui_input(const Ref<InputEvent> &p_event) override { return cast_2d_editor->forward_canvas_gui_input(p_event); }
+	virtual void forward_canvas_draw_over_viewport(Control *p_overlay) override { cast_2d_editor->forward_canvas_draw_over_viewport(p_overlay); }
 
-	virtual String get_name() const override { return "RayCast2D"; }
+	virtual String get_name() const override { return "Cast2D"; }
 	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool visible) override;
 
-	RayCast2DEditorPlugin();
+	Cast2DEditorPlugin();
 };
 
-#endif // RAY_CAST_2D_EDITOR_PLUGIN_H
+#endif // CAST_2D_EDITOR_PLUGIN_H
diff --git a/editor/plugins/control_editor_plugin.cpp b/editor/plugins/control_editor_plugin.cpp
index 2756e45cf4..ff5d112956 100644
--- a/editor/plugins/control_editor_plugin.cpp
+++ b/editor/plugins/control_editor_plugin.cpp
@@ -31,10 +31,13 @@
 #include "control_editor_plugin.h"
 
 #include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/plugins/canvas_item_editor_plugin.h"
 #include "scene/gui/separator.h"
 
+// Inspector controls.
+
 void ControlPositioningWarning::_update_warning() {
 	if (!control_node) {
 		title_icon->set_texture(nullptr);
@@ -49,7 +52,7 @@ void ControlPositioningWarning::_update_warning() {
 		title_label->set_text(TTR("This node doesn't have a control parent."));
 		hint_label->set_text(TTR("Use the appropriate layout properties depending on where you are going to put it."));
 	} else if (Object::cast_to<Container>(parent_node)) {
-		title_icon->set_texture(get_theme_icon(SNAME("Container"), SNAME("EditorIcons")));
+		title_icon->set_texture(get_theme_icon(SNAME("ContainerLayout"), SNAME("EditorIcons")));
 		title_label->set_text(TTR("This node is a child of a container."));
 		hint_label->set_text(TTR("Use container properties for positioning."));
 	} else {
@@ -448,37 +451,280 @@ bool EditorInspectorPluginControl::parse_property(Object *p_object, const Varian
 	return false;
 }
 
-void ControlEditorToolbar::_set_anchors_and_offsets_preset(Control::LayoutPreset p_preset) {
+// Toolbars controls.
+
+Size2 ControlEditorPopupButton::get_minimum_size() const {
+	Vector2 base_size = Vector2(26, 26) * EDSCALE;
+
+	if (arrow_icon.is_null()) {
+		return base_size;
+	}
+
+	Vector2 final_size;
+	final_size.x = base_size.x + arrow_icon->get_width();
+	final_size.y = MAX(base_size.y, arrow_icon->get_height());
+
+	return final_size;
+}
+
+void ControlEditorPopupButton::toggled(bool p_pressed) {
+	if (!p_pressed) {
+		return;
+	}
+
+	Size2 size = get_size() * get_viewport()->get_canvas_transform().get_scale();
+
+	popup_panel->set_size(Size2(size.width, 0));
+	Point2 gp = get_screen_position();
+	gp.y += size.y;
+	if (is_layout_rtl()) {
+		gp.x += size.width - popup_panel->get_size().width;
+	}
+	popup_panel->set_position(gp);
+
+	popup_panel->popup();
+}
+
+void ControlEditorPopupButton::_popup_visibility_changed(bool p_visible) {
+	set_pressed(p_visible);
+}
+
+void ControlEditorPopupButton::_notification(int p_what) {
+	switch (p_what) {
+		case NOTIFICATION_ENTER_TREE:
+		case NOTIFICATION_THEME_CHANGED: {
+			arrow_icon = get_theme_icon("select_arrow", "Tree");
+		} break;
+
+		case NOTIFICATION_DRAW: {
+			if (arrow_icon.is_valid()) {
+				Vector2 arrow_pos = Point2(26, 0) * EDSCALE;
+				arrow_pos.y = get_size().y / 2 - arrow_icon->get_height() / 2;
+				draw_texture(arrow_icon, arrow_pos);
+			}
+		} break;
+
+		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED: {
+			popup_panel->set_layout_direction((Window::LayoutDirection)get_layout_direction());
+		} break;
+
+		case NOTIFICATION_VISIBILITY_CHANGED: {
+			if (!is_visible_in_tree()) {
+				popup_panel->hide();
+			}
+		} break;
+	}
+}
+
+ControlEditorPopupButton::ControlEditorPopupButton() {
+	set_flat(true);
+	set_toggle_mode(true);
+	set_focus_mode(FOCUS_NONE);
+
+	popup_panel = memnew(PopupPanel);
+	popup_panel->set_theme_type_variation("ControlEditorPopupButton");
+	add_child(popup_panel);
+	popup_panel->connect("about_to_popup", callable_mp(this, &ControlEditorPopupButton::_popup_visibility_changed).bind(true));
+	popup_panel->connect("popup_hide", callable_mp(this, &ControlEditorPopupButton::_popup_visibility_changed).bind(false));
+
+	popup_vbox = memnew(VBoxContainer);
+	popup_panel->add_child(popup_vbox);
+}
+
+void ControlEditorPresetPicker::_add_row_button(HBoxContainer *p_row, const int p_preset, const String &p_name) {
+	ERR_FAIL_COND(preset_buttons.has(p_preset));
+
+	Button *b = memnew(Button);
+	b->set_custom_minimum_size(Size2i(36, 36) * EDSCALE);
+	b->set_icon_alignment(HORIZONTAL_ALIGNMENT_CENTER);
+	b->set_tooltip(p_name);
+	b->set_flat(true);
+	p_row->add_child(b);
+	b->connect("pressed", callable_mp(this, &ControlEditorPresetPicker::_preset_button_pressed).bind(p_preset));
+
+	preset_buttons[p_preset] = b;
+}
+
+void ControlEditorPresetPicker::_add_separator(BoxContainer *p_box, Separator *p_separator) {
+	p_separator->add_theme_constant_override("separation", grid_separation);
+	p_separator->set_custom_minimum_size(Size2i(1, 1));
+	p_box->add_child(p_separator);
+}
+
+void AnchorPresetPicker::_preset_button_pressed(const int p_preset) {
+	emit_signal("anchors_preset_selected", p_preset);
+}
+
+void AnchorPresetPicker::_notification(int p_notification) {
+	switch (p_notification) {
+		case NOTIFICATION_ENTER_TREE:
+		case NOTIFICATION_THEME_CHANGED: {
+			preset_buttons[PRESET_TOP_LEFT]->set_icon(get_theme_icon(SNAME("ControlAlignTopLeft"), SNAME("EditorIcons")));
+			preset_buttons[PRESET_CENTER_TOP]->set_icon(get_theme_icon(SNAME("ControlAlignCenterTop"), SNAME("EditorIcons")));
+			preset_buttons[PRESET_TOP_RIGHT]->set_icon(get_theme_icon(SNAME("ControlAlignTopRight"), SNAME("EditorIcons")));
+
+			preset_buttons[PRESET_CENTER_LEFT]->set_icon(get_theme_icon(SNAME("ControlAlignCenterLeft"), SNAME("EditorIcons")));
+			preset_buttons[PRESET_CENTER]->set_icon(get_theme_icon(SNAME("ControlAlignCenter"), SNAME("EditorIcons")));
+			preset_buttons[PRESET_CENTER_RIGHT]->set_icon(get_theme_icon(SNAME("ControlAlignCenterRight"), SNAME("EditorIcons")));
+
+			preset_buttons[PRESET_BOTTOM_LEFT]->set_icon(get_theme_icon(SNAME("ControlAlignBottomLeft"), SNAME("EditorIcons")));
+			preset_buttons[PRESET_CENTER_BOTTOM]->set_icon(get_theme_icon(SNAME("ControlAlignCenterBottom"), SNAME("EditorIcons")));
+			preset_buttons[PRESET_BOTTOM_RIGHT]->set_icon(get_theme_icon(SNAME("ControlAlignBottomRight"), SNAME("EditorIcons")));
+
+			preset_buttons[PRESET_TOP_WIDE]->set_icon(get_theme_icon(SNAME("ControlAlignTopWide"), SNAME("EditorIcons")));
+			preset_buttons[PRESET_HCENTER_WIDE]->set_icon(get_theme_icon(SNAME("ControlAlignHCenterWide"), SNAME("EditorIcons")));
+			preset_buttons[PRESET_BOTTOM_WIDE]->set_icon(get_theme_icon(SNAME("ControlAlignBottomWide"), SNAME("EditorIcons")));
+
+			preset_buttons[PRESET_LEFT_WIDE]->set_icon(get_theme_icon(SNAME("ControlAlignLeftWide"), SNAME("EditorIcons")));
+			preset_buttons[PRESET_VCENTER_WIDE]->set_icon(get_theme_icon(SNAME("ControlAlignVCenterWide"), SNAME("EditorIcons")));
+			preset_buttons[PRESET_RIGHT_WIDE]->set_icon(get_theme_icon(SNAME("ControlAlignRightWide"), SNAME("EditorIcons")));
+
+			preset_buttons[PRESET_FULL_RECT]->set_icon(get_theme_icon(SNAME("ControlAlignFullRect"), SNAME("EditorIcons")));
+		} break;
+	}
+}
+
+void AnchorPresetPicker::_bind_methods() {
+	ADD_SIGNAL(MethodInfo("anchors_preset_selected", PropertyInfo(Variant::INT, "preset")));
+}
+
+AnchorPresetPicker::AnchorPresetPicker() {
+	VBoxContainer *main_vb = memnew(VBoxContainer);
+	main_vb->add_theme_constant_override("separation", grid_separation);
+	add_child(main_vb);
+
+	HBoxContainer *top_row = memnew(HBoxContainer);
+	top_row->set_alignment(BoxContainer::ALIGNMENT_CENTER);
+	top_row->add_theme_constant_override("separation", grid_separation);
+	main_vb->add_child(top_row);
+
+	_add_row_button(top_row, PRESET_TOP_LEFT, TTR("Top Left"));
+	_add_row_button(top_row, PRESET_CENTER_TOP, TTR("Center Top"));
+	_add_row_button(top_row, PRESET_TOP_RIGHT, TTR("Top Right"));
+	_add_separator(top_row, memnew(VSeparator));
+	_add_row_button(top_row, PRESET_TOP_WIDE, TTR("Top Wide"));
+
+	HBoxContainer *mid_row = memnew(HBoxContainer);
+	mid_row->set_alignment(BoxContainer::ALIGNMENT_CENTER);
+	mid_row->add_theme_constant_override("separation", grid_separation);
+	main_vb->add_child(mid_row);
+
+	_add_row_button(mid_row, PRESET_CENTER_LEFT, TTR("Center Left"));
+	_add_row_button(mid_row, PRESET_CENTER, TTR("Center"));
+	_add_row_button(mid_row, PRESET_CENTER_RIGHT, TTR("Center Right"));
+	_add_separator(mid_row, memnew(VSeparator));
+	_add_row_button(mid_row, PRESET_HCENTER_WIDE, TTR("HCenter Wide"));
+
+	HBoxContainer *bot_row = memnew(HBoxContainer);
+	bot_row->set_alignment(BoxContainer::ALIGNMENT_CENTER);
+	bot_row->add_theme_constant_override("separation", grid_separation);
+	main_vb->add_child(bot_row);
+
+	_add_row_button(bot_row, PRESET_BOTTOM_LEFT, TTR("Bottom Left"));
+	_add_row_button(bot_row, PRESET_CENTER_BOTTOM, TTR("Center Bottom"));
+	_add_row_button(bot_row, PRESET_BOTTOM_RIGHT, TTR("Bottom Right"));
+	_add_separator(bot_row, memnew(VSeparator));
+	_add_row_button(bot_row, PRESET_BOTTOM_WIDE, TTR("Bottom Wide"));
+
+	_add_separator(main_vb, memnew(HSeparator));
+
+	HBoxContainer *extra_row = memnew(HBoxContainer);
+	extra_row->set_alignment(BoxContainer::ALIGNMENT_CENTER);
+	extra_row->add_theme_constant_override("separation", grid_separation);
+	main_vb->add_child(extra_row);
+
+	_add_row_button(extra_row, PRESET_LEFT_WIDE, TTR("Left Wide"));
+	_add_row_button(extra_row, PRESET_VCENTER_WIDE, TTR("VCenter Wide"));
+	_add_row_button(extra_row, PRESET_RIGHT_WIDE, TTR("Right Wide"));
+	_add_separator(extra_row, memnew(VSeparator));
+	_add_row_button(extra_row, PRESET_FULL_RECT, TTR("Full Rect"));
+}
+
+void SizeFlagPresetPicker::_preset_button_pressed(const int p_preset) {
+	int flags = (SizeFlags)p_preset;
+	if (expand_button->is_pressed()) {
+		flags |= SIZE_EXPAND;
+	}
+
+	emit_signal("size_flags_selected", flags);
+}
+
+void SizeFlagPresetPicker::set_allowed_flags(Vector<SizeFlags> &p_flags) {
+	preset_buttons[SIZE_SHRINK_BEGIN]->set_disabled(!p_flags.has(SIZE_SHRINK_BEGIN));
+	preset_buttons[SIZE_SHRINK_CENTER]->set_disabled(!p_flags.has(SIZE_SHRINK_CENTER));
+	preset_buttons[SIZE_SHRINK_END]->set_disabled(!p_flags.has(SIZE_SHRINK_END));
+	preset_buttons[SIZE_FILL]->set_disabled(!p_flags.has(SIZE_FILL));
+
+	expand_button->set_disabled(!p_flags.has(SIZE_EXPAND));
+	if (p_flags.has(SIZE_EXPAND)) {
+		expand_button->set_tooltip(TTR("Enable to also set the Expand flag.\nDisable to only set Shrink/Fill flags."));
+	} else {
+		expand_button->set_pressed(false);
+		expand_button->set_tooltip(TTR("Some parents of the selected nodes do not support the Expand flag."));
+	}
+}
+
+void SizeFlagPresetPicker::_notification(int p_notification) {
+	switch (p_notification) {
+		case NOTIFICATION_ENTER_TREE:
+		case NOTIFICATION_THEME_CHANGED: {
+			if (vertical) {
+				preset_buttons[SIZE_SHRINK_BEGIN]->set_icon(get_theme_icon(SNAME("ControlAlignCenterTop"), SNAME("EditorIcons")));
+				preset_buttons[SIZE_SHRINK_CENTER]->set_icon(get_theme_icon(SNAME("ControlAlignCenter"), SNAME("EditorIcons")));
+				preset_buttons[SIZE_SHRINK_END]->set_icon(get_theme_icon(SNAME("ControlAlignCenterBottom"), SNAME("EditorIcons")));
+
+				preset_buttons[SIZE_FILL]->set_icon(get_theme_icon(SNAME("ControlAlignVCenterWide"), SNAME("EditorIcons")));
+			} else {
+				preset_buttons[SIZE_SHRINK_BEGIN]->set_icon(get_theme_icon(SNAME("ControlAlignCenterLeft"), SNAME("EditorIcons")));
+				preset_buttons[SIZE_SHRINK_CENTER]->set_icon(get_theme_icon(SNAME("ControlAlignCenter"), SNAME("EditorIcons")));
+				preset_buttons[SIZE_SHRINK_END]->set_icon(get_theme_icon(SNAME("ControlAlignCenterRight"), SNAME("EditorIcons")));
+
+				preset_buttons[SIZE_FILL]->set_icon(get_theme_icon(SNAME("ControlAlignHCenterWide"), SNAME("EditorIcons")));
+			}
+		} break;
+	}
+}
+
+void SizeFlagPresetPicker::_bind_methods() {
+	ADD_SIGNAL(MethodInfo("size_flags_selected", PropertyInfo(Variant::INT, "size_flags")));
+}
+
+SizeFlagPresetPicker::SizeFlagPresetPicker(bool p_vertical) {
+	vertical = p_vertical;
+
+	VBoxContainer *main_vb = memnew(VBoxContainer);
+	add_child(main_vb);
+
+	HBoxContainer *main_row = memnew(HBoxContainer);
+	main_row->set_alignment(BoxContainer::ALIGNMENT_CENTER);
+	main_row->add_theme_constant_override("separation", grid_separation);
+	main_vb->add_child(main_row);
+
+	_add_row_button(main_row, SIZE_SHRINK_BEGIN, TTR("Shrink Begin"));
+	_add_row_button(main_row, SIZE_SHRINK_CENTER, TTR("Shrink Center"));
+	_add_row_button(main_row, SIZE_SHRINK_END, TTR("Shrink End"));
+	_add_separator(main_row, memnew(VSeparator));
+	_add_row_button(main_row, SIZE_FILL, TTR("Fill"));
+
+	expand_button = memnew(CheckBox);
+	expand_button->set_flat(true);
+	expand_button->set_text(TTR("Align with Expand"));
+	expand_button->set_tooltip(TTR("Enable to also set the Expand flag.\nDisable to only set Shrink/Fill flags."));
+	main_vb->add_child(expand_button);
+}
+
+// Toolbar.
+
+void ControlEditorToolbar::_anchors_preset_selected(int p_preset) {
+	LayoutPreset preset = (LayoutPreset)p_preset;
 	List<Node *> selection = editor_selection->get_selected_node_list();
 
-	undo_redo->create_action(TTR("Change Anchors and Offsets"));
+	undo_redo->create_action(TTR("Change Anchors, Offsets, Grow Direction"));
 
 	for (Node *E : selection) {
 		Control *control = Object::cast_to<Control>(E);
 		if (control) {
-			undo_redo->add_do_method(control, "set_anchors_preset", p_preset);
-			switch (p_preset) {
-				case PRESET_TOP_LEFT:
-				case PRESET_TOP_RIGHT:
-				case PRESET_BOTTOM_LEFT:
-				case PRESET_BOTTOM_RIGHT:
-				case PRESET_CENTER_LEFT:
-				case PRESET_CENTER_TOP:
-				case PRESET_CENTER_RIGHT:
-				case PRESET_CENTER_BOTTOM:
-				case PRESET_CENTER:
-					undo_redo->add_do_method(control, "set_offsets_preset", p_preset, Control::PRESET_MODE_KEEP_SIZE);
-					break;
-				case PRESET_LEFT_WIDE:
-				case PRESET_TOP_WIDE:
-				case PRESET_RIGHT_WIDE:
-				case PRESET_BOTTOM_WIDE:
-				case PRESET_VCENTER_WIDE:
-				case PRESET_HCENTER_WIDE:
-				case PRESET_FULL_RECT:
-					undo_redo->add_do_method(control, "set_offsets_preset", p_preset, Control::PRESET_MODE_MINSIZE);
-					break;
-			}
+			undo_redo->add_do_property(control, "anchors_preset", preset);
 			undo_redo->add_undo_method(control, "_edit_set_state", control->_edit_get_state());
 		}
 	}
@@ -489,10 +735,10 @@ void ControlEditorToolbar::_set_anchors_and_offsets_preset(Control::LayoutPreset
 	anchor_mode_button->set_pressed(anchors_mode);
 }
 
-void ControlEditorToolbar::_set_anchors_and_offsets_to_keep_ratio() {
+void ControlEditorToolbar::_anchors_to_current_ratio() {
 	List<Node *> selection = editor_selection->get_selected_node_list();
 
-	undo_redo->create_action(TTR("Change Anchors and Offsets"));
+	undo_redo->create_action(TTR("Change Anchors, Offsets (Keep Ratio)"));
 
 	for (Node *E : selection) {
 		Control *control = Object::cast_to<Control>(E);
@@ -521,44 +767,41 @@ void ControlEditorToolbar::_set_anchors_and_offsets_to_keep_ratio() {
 	undo_redo->commit_action();
 }
 
-void ControlEditorToolbar::_set_anchors_preset(Control::LayoutPreset p_preset) {
-	List<Node *> selection = editor_selection->get_selected_node_list();
+void ControlEditorToolbar::_anchor_mode_toggled(bool p_status) {
+	List<Control *> selection = _get_edited_controls();
+	for (Control *E : selection) {
+		if (Object::cast_to<Container>(E->get_parent())) {
+			continue;
+		}
 
-	undo_redo->create_action(TTR("Change Anchors"));
-	for (Node *E : selection) {
-		Control *control = Object::cast_to<Control>(E);
-		if (control) {
-			undo_redo->add_do_method(control, "set_anchors_preset", p_preset);
-			undo_redo->add_undo_method(control, "_edit_set_state", control->_edit_get_state());
+		if (p_status) {
+			E->set_meta("_edit_use_anchors_", true);
+		} else {
+			E->remove_meta("_edit_use_anchors_");
 		}
 	}
 
-	undo_redo->commit_action();
+	anchors_mode = p_status;
+	CanvasItemEditor::get_singleton()->update_viewport();
 }
 
-void ControlEditorToolbar::_set_container_h_preset(Control::SizeFlags p_preset) {
+void ControlEditorToolbar::_container_flags_selected(int p_flags, bool p_vertical) {
 	List<Node *> selection = editor_selection->get_selected_node_list();
 
-	undo_redo->create_action(TTR("Change Horizontal Size Flags"));
-	for (Node *E : selection) {
-		Control *control = Object::cast_to<Control>(E);
-		if (control) {
-			undo_redo->add_do_method(control, "set_h_size_flags", p_preset);
-			undo_redo->add_undo_method(control, "_edit_set_state", control->_edit_get_state());
-		}
+	if (p_vertical) {
+		undo_redo->create_action(TTR("Change Vertical Size Flags"));
+	} else {
+		undo_redo->create_action(TTR("Change Horizontal Size Flags"));
 	}
 
-	undo_redo->commit_action();
-}
-
-void ControlEditorToolbar::_set_container_v_preset(Control::SizeFlags p_preset) {
-	List<Node *> selection = editor_selection->get_selected_node_list();
-
-	undo_redo->create_action(TTR("Change Horizontal Size Flags"));
 	for (Node *E : selection) {
 		Control *control = Object::cast_to<Control>(E);
 		if (control) {
-			undo_redo->add_do_method(control, "set_v_size_flags", p_preset);
+			if (p_vertical) {
+				undo_redo->add_do_method(control, "set_v_size_flags", p_flags);
+			} else {
+				undo_redo->add_do_method(control, "set_h_size_flags", p_flags);
+			}
 			undo_redo->add_undo_method(control, "_edit_set_state", control->_edit_get_state());
 		}
 	}
@@ -594,400 +837,205 @@ Vector2 ControlEditorToolbar::_position_to_anchor(const Control *p_control, Vect
 	return output;
 }
 
-void ControlEditorToolbar::_button_toggle_anchor_mode(bool p_status) {
-	List<Control *> selection = _get_edited_controls(false, false);
-	for (Control *E : selection) {
-		if (Object::cast_to<Container>(E->get_parent())) {
-			continue;
-		}
-
-		if (p_status) {
-			E->set_meta("_edit_use_anchors_", true);
-		} else {
-			E->remove_meta("_edit_use_anchors_");
-		}
-	}
-
-	anchors_mode = p_status;
-	CanvasItemEditor::get_singleton()->update_viewport();
-}
-
 bool ControlEditorToolbar::_is_node_locked(const Node *p_node) {
 	return p_node->get_meta("_edit_lock_", false);
 }
 
-List<Control *> ControlEditorToolbar::_get_edited_controls(bool retrieve_locked, bool remove_controls_if_parent_in_selection) {
+List<Control *> ControlEditorToolbar::_get_edited_controls() {
 	List<Control *> selection;
 	for (const KeyValue<Node *, Object *> &E : editor_selection->get_selection()) {
 		Control *control = Object::cast_to<Control>(E.key);
-		if (control && control->is_visible_in_tree() && control->get_viewport() == EditorNode::get_singleton()->get_scene_root() && (retrieve_locked || !_is_node_locked(control))) {
+		if (control && control->is_visible_in_tree() && control->get_viewport() == EditorNode::get_singleton()->get_scene_root() && !_is_node_locked(control)) {
 			selection.push_back(control);
 		}
 	}
 
-	if (remove_controls_if_parent_in_selection) {
-		List<Control *> filtered_selection;
-		for (Control *E : selection) {
-			if (!selection.find(E->get_parent())) {
-				filtered_selection.push_back(E);
-			}
-		}
-		return filtered_selection;
-	}
-
 	return selection;
 }
 
-void ControlEditorToolbar::_popup_callback(int p_op) {
-	switch (p_op) {
-		case ANCHORS_AND_OFFSETS_PRESET_TOP_LEFT: {
-			_set_anchors_and_offsets_preset(PRESET_TOP_LEFT);
-		} break;
-		case ANCHORS_AND_OFFSETS_PRESET_TOP_RIGHT: {
-			_set_anchors_and_offsets_preset(PRESET_TOP_RIGHT);
-		} break;
-		case ANCHORS_AND_OFFSETS_PRESET_BOTTOM_LEFT: {
-			_set_anchors_and_offsets_preset(PRESET_BOTTOM_LEFT);
-		} break;
-		case ANCHORS_AND_OFFSETS_PRESET_BOTTOM_RIGHT: {
-			_set_anchors_and_offsets_preset(PRESET_BOTTOM_RIGHT);
-		} break;
-		case ANCHORS_AND_OFFSETS_PRESET_CENTER_LEFT: {
-			_set_anchors_and_offsets_preset(PRESET_CENTER_LEFT);
-		} break;
-		case ANCHORS_AND_OFFSETS_PRESET_CENTER_RIGHT: {
-			_set_anchors_and_offsets_preset(PRESET_CENTER_RIGHT);
-		} break;
-		case ANCHORS_AND_OFFSETS_PRESET_CENTER_TOP: {
-			_set_anchors_and_offsets_preset(PRESET_CENTER_TOP);
-		} break;
-		case ANCHORS_AND_OFFSETS_PRESET_CENTER_BOTTOM: {
-			_set_anchors_and_offsets_preset(PRESET_CENTER_BOTTOM);
-		} break;
-		case ANCHORS_AND_OFFSETS_PRESET_CENTER: {
-			_set_anchors_and_offsets_preset(PRESET_CENTER);
-		} break;
-		case ANCHORS_AND_OFFSETS_PRESET_TOP_WIDE: {
-			_set_anchors_and_offsets_preset(PRESET_TOP_WIDE);
-		} break;
-		case ANCHORS_AND_OFFSETS_PRESET_LEFT_WIDE: {
-			_set_anchors_and_offsets_preset(PRESET_LEFT_WIDE);
-		} break;
-		case ANCHORS_AND_OFFSETS_PRESET_RIGHT_WIDE: {
-			_set_anchors_and_offsets_preset(PRESET_RIGHT_WIDE);
-		} break;
-		case ANCHORS_AND_OFFSETS_PRESET_BOTTOM_WIDE: {
-			_set_anchors_and_offsets_preset(PRESET_BOTTOM_WIDE);
-		} break;
-		case ANCHORS_AND_OFFSETS_PRESET_VCENTER_WIDE: {
-			_set_anchors_and_offsets_preset(PRESET_VCENTER_WIDE);
-		} break;
-		case ANCHORS_AND_OFFSETS_PRESET_HCENTER_WIDE: {
-			_set_anchors_and_offsets_preset(PRESET_HCENTER_WIDE);
-		} break;
-		case ANCHORS_AND_OFFSETS_PRESET_FULL_RECT: {
-			_set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
-		} break;
-		case ANCHORS_AND_OFFSETS_PRESET_KEEP_RATIO: {
-			_set_anchors_and_offsets_to_keep_ratio();
-		} break;
-
-		case ANCHORS_PRESET_TOP_LEFT: {
-			_set_anchors_preset(PRESET_TOP_LEFT);
-		} break;
-		case ANCHORS_PRESET_TOP_RIGHT: {
-			_set_anchors_preset(PRESET_TOP_RIGHT);
-		} break;
-		case ANCHORS_PRESET_BOTTOM_LEFT: {
-			_set_anchors_preset(PRESET_BOTTOM_LEFT);
-		} break;
-		case ANCHORS_PRESET_BOTTOM_RIGHT: {
-			_set_anchors_preset(PRESET_BOTTOM_RIGHT);
-		} break;
-		case ANCHORS_PRESET_CENTER_LEFT: {
-			_set_anchors_preset(PRESET_CENTER_LEFT);
-		} break;
-		case ANCHORS_PRESET_CENTER_RIGHT: {
-			_set_anchors_preset(PRESET_CENTER_RIGHT);
-		} break;
-		case ANCHORS_PRESET_CENTER_TOP: {
-			_set_anchors_preset(PRESET_CENTER_TOP);
-		} break;
-		case ANCHORS_PRESET_CENTER_BOTTOM: {
-			_set_anchors_preset(PRESET_CENTER_BOTTOM);
-		} break;
-		case ANCHORS_PRESET_CENTER: {
-			_set_anchors_preset(PRESET_CENTER);
-		} break;
-		case ANCHORS_PRESET_TOP_WIDE: {
-			_set_anchors_preset(PRESET_TOP_WIDE);
-		} break;
-		case ANCHORS_PRESET_LEFT_WIDE: {
-			_set_anchors_preset(PRESET_LEFT_WIDE);
-		} break;
-		case ANCHORS_PRESET_RIGHT_WIDE: {
-			_set_anchors_preset(PRESET_RIGHT_WIDE);
-		} break;
-		case ANCHORS_PRESET_BOTTOM_WIDE: {
-			_set_anchors_preset(PRESET_BOTTOM_WIDE);
-		} break;
-		case ANCHORS_PRESET_VCENTER_WIDE: {
-			_set_anchors_preset(PRESET_VCENTER_WIDE);
-		} break;
-		case ANCHORS_PRESET_HCENTER_WIDE: {
-			_set_anchors_preset(PRESET_HCENTER_WIDE);
-		} break;
-		case ANCHORS_PRESET_FULL_RECT: {
-			_set_anchors_preset(Control::PRESET_FULL_RECT);
-		} break;
-
-		case CONTAINERS_H_PRESET_FILL: {
-			_set_container_h_preset(Control::SIZE_FILL);
-		} break;
-		case CONTAINERS_H_PRESET_FILL_EXPAND: {
-			_set_container_h_preset(Control::SIZE_EXPAND_FILL);
-		} break;
-		case CONTAINERS_H_PRESET_SHRINK_BEGIN: {
-			_set_container_h_preset(Control::SIZE_SHRINK_BEGIN);
-		} break;
-		case CONTAINERS_H_PRESET_SHRINK_CENTER: {
-			_set_container_h_preset(Control::SIZE_SHRINK_CENTER);
-		} break;
-		case CONTAINERS_H_PRESET_SHRINK_END: {
-			_set_container_h_preset(Control::SIZE_SHRINK_END);
-		} break;
-
-		case CONTAINERS_V_PRESET_FILL: {
-			_set_container_v_preset(Control::SIZE_FILL);
-		} break;
-		case CONTAINERS_V_PRESET_FILL_EXPAND: {
-			_set_container_v_preset(Control::SIZE_EXPAND_FILL);
-		} break;
-		case CONTAINERS_V_PRESET_SHRINK_BEGIN: {
-			_set_container_v_preset(Control::SIZE_SHRINK_BEGIN);
-		} break;
-		case CONTAINERS_V_PRESET_SHRINK_CENTER: {
-			_set_container_v_preset(Control::SIZE_SHRINK_CENTER);
-		} break;
-		case CONTAINERS_V_PRESET_SHRINK_END: {
-			_set_container_v_preset(Control::SIZE_SHRINK_END);
-		} break;
-	}
-}
-
 void ControlEditorToolbar::_selection_changed() {
-	// Update the anchors_mode.
-	int nb_controls = 0;
-	int nb_valid_controls = 0;
-	int nb_anchors_mode = 0;
+	// Update toolbar visibility.
+	bool has_controls = false;
+	bool has_control_parents = false;
+	bool has_container_parents = false;
+
+	// Also update which size flags can be configured for the selected nodes.
+	Vector<SizeFlags> allowed_h_flags = {
+		SIZE_SHRINK_BEGIN,
+		SIZE_SHRINK_CENTER,
+		SIZE_SHRINK_END,
+		SIZE_FILL,
+		SIZE_EXPAND,
+	};
+	Vector<SizeFlags> allowed_v_flags = {
+		SIZE_SHRINK_BEGIN,
+		SIZE_SHRINK_CENTER,
+		SIZE_SHRINK_END,
+		SIZE_FILL,
+		SIZE_EXPAND,
+	};
 
-	List<Node *> selection = editor_selection->get_selected_node_list();
-	for (Node *E : selection) {
-		Control *control = Object::cast_to<Control>(E);
+	for (const KeyValue<Node *, Object *> &E : editor_selection->get_selection()) {
+		Control *control = Object::cast_to<Control>(E.key);
 		if (!control) {
 			continue;
 		}
+		has_controls = true;
 
-		nb_controls++;
+		if (Object::cast_to<Control>(control->get_parent())) {
+			has_control_parents = true;
+		}
 		if (Object::cast_to<Container>(control->get_parent())) {
-			continue;
+			has_container_parents = true;
+
+			Container *parent_container = Object::cast_to<Container>(control->get_parent());
+
+			Vector<int> container_h_flags = parent_container->get_allowed_size_flags_horizontal();
+			Vector<SizeFlags> tmp_flags = allowed_h_flags.duplicate();
+			for (int i = 0; i < allowed_h_flags.size(); i++) {
+				if (!container_h_flags.has((int)allowed_h_flags[i])) {
+					tmp_flags.erase(allowed_h_flags[i]);
+				}
+			}
+			allowed_h_flags = tmp_flags;
+
+			Vector<int> container_v_flags = parent_container->get_allowed_size_flags_vertical();
+			tmp_flags = allowed_v_flags.duplicate();
+			for (int i = 0; i < allowed_v_flags.size(); i++) {
+				if (!container_v_flags.has((int)allowed_v_flags[i])) {
+					tmp_flags.erase(allowed_v_flags[i]);
+				}
+			}
+			allowed_v_flags = tmp_flags;
 		}
+	}
+
+	// Set general toolbar visibility.
+	set_visible(has_controls);
+
+	// Set anchor tools visibility.
+	if (has_controls && (!has_control_parents || !has_container_parents)) {
+		anchors_button->set_visible(true);
+		anchor_mode_button->set_visible(true);
+
+		// Update anchor mode.
+		int nb_valid_controls = 0;
+		int nb_anchors_mode = 0;
 
-		nb_valid_controls++;
-		if (control->get_meta("_edit_use_anchors_", false)) {
-			nb_anchors_mode++;
+		List<Node *> selection = editor_selection->get_selected_node_list();
+		for (Node *E : selection) {
+			Control *control = Object::cast_to<Control>(E);
+			if (!control) {
+				continue;
+			}
+			if (Object::cast_to<Container>(control->get_parent())) {
+				continue;
+			}
+
+			nb_valid_controls++;
+			if (control->get_meta("_edit_use_anchors_", false)) {
+				nb_anchors_mode++;
+			}
 		}
+
+		anchors_mode = (nb_valid_controls == nb_anchors_mode);
+		anchor_mode_button->set_pressed(anchors_mode);
+	} else {
+		anchors_button->set_visible(false);
+		anchor_mode_button->set_visible(false);
+		anchor_mode_button->set_pressed(false);
 	}
 
-	anchors_mode = (nb_valid_controls == nb_anchors_mode);
-	anchor_mode_button->set_pressed(anchors_mode);
+	// Set container tools visibility.
+	if (has_controls && (!has_control_parents || has_container_parents)) {
+		containers_button->set_visible(true);
 
-	if (nb_controls > 0) {
-		set_physics_process(true);
+		// Update allowed size flags.
+		if (has_container_parents) {
+			container_h_picker->set_allowed_flags(allowed_h_flags);
+			container_v_picker->set_allowed_flags(allowed_v_flags);
+		} else {
+			Vector<SizeFlags> allowed_all_flags = {
+				SIZE_SHRINK_BEGIN,
+				SIZE_SHRINK_CENTER,
+				SIZE_SHRINK_END,
+				SIZE_FILL,
+				SIZE_EXPAND,
+			};
+
+			container_h_picker->set_allowed_flags(allowed_all_flags);
+			container_v_picker->set_allowed_flags(allowed_all_flags);
+		}
 	} else {
-		set_physics_process(false);
-		set_visible(false);
+		containers_button->set_visible(false);
 	}
 }
 
 void ControlEditorToolbar::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE:
-		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
-			anchor_presets_menu->set_icon(get_theme_icon(SNAME("ControlLayout"), SNAME("EditorIcons")));
-
-			PopupMenu *p = anchor_presets_menu->get_popup();
-			p->clear();
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignTopLeft"), SNAME("EditorIcons")), TTR("Top Left"), ANCHORS_AND_OFFSETS_PRESET_TOP_LEFT);
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignTopRight"), SNAME("EditorIcons")), TTR("Top Right"), ANCHORS_AND_OFFSETS_PRESET_TOP_RIGHT);
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignBottomRight"), SNAME("EditorIcons")), TTR("Bottom Right"), ANCHORS_AND_OFFSETS_PRESET_BOTTOM_RIGHT);
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignBottomLeft"), SNAME("EditorIcons")), TTR("Bottom Left"), ANCHORS_AND_OFFSETS_PRESET_BOTTOM_LEFT);
-			p->add_separator();
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignCenterLeft"), SNAME("EditorIcons")), TTR("Center Left"), ANCHORS_AND_OFFSETS_PRESET_CENTER_LEFT);
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignCenterTop"), SNAME("EditorIcons")), TTR("Center Top"), ANCHORS_AND_OFFSETS_PRESET_CENTER_TOP);
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignCenterRight"), SNAME("EditorIcons")), TTR("Center Right"), ANCHORS_AND_OFFSETS_PRESET_CENTER_RIGHT);
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignCenterBottom"), SNAME("EditorIcons")), TTR("Center Bottom"), ANCHORS_AND_OFFSETS_PRESET_CENTER_BOTTOM);
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignCenter"), SNAME("EditorIcons")), TTR("Center"), ANCHORS_AND_OFFSETS_PRESET_CENTER);
-			p->add_separator();
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignLeftWide"), SNAME("EditorIcons")), TTR("Left Wide"), ANCHORS_AND_OFFSETS_PRESET_LEFT_WIDE);
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignTopWide"), SNAME("EditorIcons")), TTR("Top Wide"), ANCHORS_AND_OFFSETS_PRESET_TOP_WIDE);
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignRightWide"), SNAME("EditorIcons")), TTR("Right Wide"), ANCHORS_AND_OFFSETS_PRESET_RIGHT_WIDE);
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignBottomWide"), SNAME("EditorIcons")), TTR("Bottom Wide"), ANCHORS_AND_OFFSETS_PRESET_BOTTOM_WIDE);
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignVCenterWide"), SNAME("EditorIcons")), TTR("VCenter Wide"), ANCHORS_AND_OFFSETS_PRESET_VCENTER_WIDE);
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignHCenterWide"), SNAME("EditorIcons")), TTR("HCenter Wide"), ANCHORS_AND_OFFSETS_PRESET_HCENTER_WIDE);
-			p->add_separator();
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignFullRect"), SNAME("EditorIcons")), TTR("Full Rect"), ANCHORS_AND_OFFSETS_PRESET_FULL_RECT);
-			p->add_icon_item(get_theme_icon(SNAME("Anchor"), SNAME("EditorIcons")), TTR("Keep Current Ratio"), ANCHORS_AND_OFFSETS_PRESET_KEEP_RATIO);
-			p->set_item_tooltip(19, TTR("Adjust anchors and offsets to match the current rect size."));
-
-			p->add_separator();
-			p->add_submenu_item(TTR("Anchors only"), "Anchors");
-			p->set_item_icon(21, get_theme_icon(SNAME("Anchor"), SNAME("EditorIcons")));
-
-			anchors_popup->clear();
-			anchors_popup->add_icon_item(get_theme_icon(SNAME("ControlAlignTopLeft"), SNAME("EditorIcons")), TTR("Top Left"), ANCHORS_PRESET_TOP_LEFT);
-			anchors_popup->add_icon_item(get_theme_icon(SNAME("ControlAlignTopRight"), SNAME("EditorIcons")), TTR("Top Right"), ANCHORS_PRESET_TOP_RIGHT);
-			anchors_popup->add_icon_item(get_theme_icon(SNAME("ControlAlignBottomRight"), SNAME("EditorIcons")), TTR("Bottom Right"), ANCHORS_PRESET_BOTTOM_RIGHT);
-			anchors_popup->add_icon_item(get_theme_icon(SNAME("ControlAlignBottomLeft"), SNAME("EditorIcons")), TTR("Bottom Left"), ANCHORS_PRESET_BOTTOM_LEFT);
-			anchors_popup->add_separator();
-			anchors_popup->add_icon_item(get_theme_icon(SNAME("ControlAlignCenterLeft"), SNAME("EditorIcons")), TTR("Center Left"), ANCHORS_PRESET_CENTER_LEFT);
-			anchors_popup->add_icon_item(get_theme_icon(SNAME("ControlAlignCenterTop"), SNAME("EditorIcons")), TTR("Center Top"), ANCHORS_PRESET_CENTER_TOP);
-			anchors_popup->add_icon_item(get_theme_icon(SNAME("ControlAlignCenterRight"), SNAME("EditorIcons")), TTR("Center Right"), ANCHORS_PRESET_CENTER_RIGHT);
-			anchors_popup->add_icon_item(get_theme_icon(SNAME("ControlAlignCenterBottom"), SNAME("EditorIcons")), TTR("Center Bottom"), ANCHORS_PRESET_CENTER_BOTTOM);
-			anchors_popup->add_icon_item(get_theme_icon(SNAME("ControlAlignCenter"), SNAME("EditorIcons")), TTR("Center"), ANCHORS_PRESET_CENTER);
-			anchors_popup->add_separator();
-			anchors_popup->add_icon_item(get_theme_icon(SNAME("ControlAlignLeftWide"), SNAME("EditorIcons")), TTR("Left Wide"), ANCHORS_PRESET_LEFT_WIDE);
-			anchors_popup->add_icon_item(get_theme_icon(SNAME("ControlAlignTopWide"), SNAME("EditorIcons")), TTR("Top Wide"), ANCHORS_PRESET_TOP_WIDE);
-			anchors_popup->add_icon_item(get_theme_icon(SNAME("ControlAlignRightWide"), SNAME("EditorIcons")), TTR("Right Wide"), ANCHORS_PRESET_RIGHT_WIDE);
-			anchors_popup->add_icon_item(get_theme_icon(SNAME("ControlAlignBottomWide"), SNAME("EditorIcons")), TTR("Bottom Wide"), ANCHORS_PRESET_BOTTOM_WIDE);
-			anchors_popup->add_icon_item(get_theme_icon(SNAME("ControlAlignVCenterWide"), SNAME("EditorIcons")), TTR("VCenter Wide"), ANCHORS_PRESET_VCENTER_WIDE);
-			anchors_popup->add_icon_item(get_theme_icon(SNAME("ControlAlignHCenterWide"), SNAME("EditorIcons")), TTR("HCenter Wide"), ANCHORS_PRESET_HCENTER_WIDE);
-			anchors_popup->add_separator();
-			anchors_popup->add_icon_item(get_theme_icon(SNAME("ControlAlignFullRect"), SNAME("EditorIcons")), TTR("Full Rect"), ANCHORS_PRESET_FULL_RECT);
-
+		case NOTIFICATION_THEME_CHANGED: {
+			anchors_button->set_icon(get_theme_icon(SNAME("ControlLayout"), SNAME("EditorIcons")));
 			anchor_mode_button->set_icon(get_theme_icon(SNAME("Anchor"), SNAME("EditorIcons")));
-
-			container_h_presets_menu->set_icon(get_theme_icon(SNAME("Container"), SNAME("EditorIcons")));
-			container_v_presets_menu->set_icon(get_theme_icon(SNAME("Container"), SNAME("EditorIcons")));
-
-			p = container_h_presets_menu->get_popup();
-			p->clear();
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignHCenterWide"), SNAME("EditorIcons")), TTR("Fill"), CONTAINERS_H_PRESET_FILL);
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignHCenterWide"), SNAME("EditorIcons")), TTR("Fill & Expand"), CONTAINERS_H_PRESET_FILL_EXPAND);
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignCenterLeft"), SNAME("EditorIcons")), TTR("Shrink Begin"), CONTAINERS_H_PRESET_SHRINK_BEGIN);
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignCenter"), SNAME("EditorIcons")), TTR("Shrink Center"), CONTAINERS_H_PRESET_SHRINK_CENTER);
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignCenterRight"), SNAME("EditorIcons")), TTR("Shrink End"), CONTAINERS_H_PRESET_SHRINK_END);
-
-			p = container_v_presets_menu->get_popup();
-			p->clear();
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignVCenterWide"), SNAME("EditorIcons")), TTR("Fill"), CONTAINERS_V_PRESET_FILL);
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignVCenterWide"), SNAME("EditorIcons")), TTR("Fill & Expand"), CONTAINERS_V_PRESET_FILL_EXPAND);
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignCenterTop"), SNAME("EditorIcons")), TTR("Shrink Begin"), CONTAINERS_V_PRESET_SHRINK_BEGIN);
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignCenter"), SNAME("EditorIcons")), TTR("Shrink Center"), CONTAINERS_V_PRESET_SHRINK_CENTER);
-			p->add_icon_item(get_theme_icon(SNAME("ControlAlignCenterBottom"), SNAME("EditorIcons")), TTR("Shrink End"), CONTAINERS_V_PRESET_SHRINK_END);
-		} break;
-
-		case NOTIFICATION_PHYSICS_PROCESS: {
-			bool has_control_parents = false;
-			bool has_container_parents = false;
-
-			// Update the viewport if the canvas_item changes
-			List<Control *> selection = _get_edited_controls(true);
-			for (Control *control : selection) {
-				if (Object::cast_to<Control>(control->get_parent())) {
-					has_control_parents = true;
-				}
-				if (Object::cast_to<Container>(control->get_parent())) {
-					has_container_parents = true;
-				}
-			}
-
-			// Show / Hide the control layout buttons.
-			if (selection.size() > 0) {
-				set_visible(true);
-
-				// Toggle anchor and container layout buttons depending on parents of the selected nodes.
-				// - If there are no control parents, enable everything.
-				// - If there are container parents, then enable only container buttons.
-				// - If there are NO container parents, then enable only anchor buttons.
-				bool enable_anchors = false;
-				bool enable_containers = false;
-				if (!has_control_parents) {
-					enable_anchors = true;
-					enable_containers = true;
-				} else if (has_container_parents) {
-					enable_containers = true;
-				} else {
-					enable_anchors = true;
-				}
-
-				if (enable_anchors) {
-					anchor_presets_menu->set_visible(true);
-					anchor_mode_button->set_visible(true);
-				} else {
-					anchor_presets_menu->set_visible(false);
-					anchor_mode_button->set_visible(false);
-				}
-
-				if (enable_containers) {
-					container_h_presets_menu->set_visible(true);
-					container_v_presets_menu->set_visible(true);
-				} else {
-					container_h_presets_menu->set_visible(false);
-					container_v_presets_menu->set_visible(false);
-				}
-			} else {
-				set_visible(false);
-			}
+			containers_button->set_icon(get_theme_icon(SNAME("ContainerLayout"), SNAME("EditorIcons")));
 		} break;
 	}
 }
 
 ControlEditorToolbar::ControlEditorToolbar() {
-	anchor_presets_menu = memnew(MenuButton);
-	anchor_presets_menu->set_shortcut_context(this);
-	anchor_presets_menu->set_text(TTR("Anchors"));
-	anchor_presets_menu->set_tooltip(TTR("Presets for the anchor and offset values of a Control node."));
-	add_child(anchor_presets_menu);
-	anchor_presets_menu->set_switch_on_hover(true);
+	add_child(memnew(VSeparator));
 
-	PopupMenu *p = anchor_presets_menu->get_popup();
-	p->connect("id_pressed", callable_mp(this, &ControlEditorToolbar::_popup_callback));
+	// Anchor and offset tools.
+	anchors_button = memnew(ControlEditorPopupButton);
+	anchors_button->set_tooltip(TTR("Presets for the anchor and offset values of a Control node."));
+	add_child(anchors_button);
 
-	anchors_popup = memnew(PopupMenu);
-	p->add_child(anchors_popup);
-	anchors_popup->set_name("Anchors");
-	anchors_popup->connect("id_pressed", callable_mp(this, &ControlEditorToolbar::_popup_callback));
+	Label *anchors_label = memnew(Label);
+	anchors_label->set_text(TTR("Anchor preset"));
+	anchors_button->get_popup_hbox()->add_child(anchors_label);
+	AnchorPresetPicker *anchors_picker = memnew(AnchorPresetPicker);
+	anchors_picker->set_h_size_flags(SIZE_SHRINK_CENTER);
+	anchors_button->get_popup_hbox()->add_child(anchors_picker);
+	anchors_picker->connect("anchors_preset_selected", callable_mp(this, &ControlEditorToolbar::_anchors_preset_selected));
+
+	anchors_button->get_popup_hbox()->add_child(memnew(HSeparator));
+
+	Button *keep_ratio_button = memnew(Button);
+	keep_ratio_button->set_text_alignment(HORIZONTAL_ALIGNMENT_LEFT);
+	keep_ratio_button->set_text(TTR("Set to Current Ratio"));
+	keep_ratio_button->set_tooltip(TTR("Adjust anchors and offsets to match the current rect size."));
+	anchors_button->get_popup_hbox()->add_child(keep_ratio_button);
+	keep_ratio_button->connect("pressed", callable_mp(this, &ControlEditorToolbar::_anchors_to_current_ratio));
 
 	anchor_mode_button = memnew(Button);
 	anchor_mode_button->set_flat(true);
 	anchor_mode_button->set_toggle_mode(true);
 	anchor_mode_button->set_tooltip(TTR("When active, moving Control nodes changes their anchors instead of their offsets."));
 	add_child(anchor_mode_button);
-	anchor_mode_button->connect("toggled", callable_mp(this, &ControlEditorToolbar::_button_toggle_anchor_mode));
-
-	add_child(memnew(VSeparator));
-
-	container_h_presets_menu = memnew(MenuButton);
-	container_h_presets_menu->set_shortcut_context(this);
-	container_h_presets_menu->set_text(TTR("Horizontal"));
-	container_h_presets_menu->set_tooltip(TTR("Horizontal sizing setting for children of a Container node."));
-	add_child(container_h_presets_menu);
-	container_h_presets_menu->set_switch_on_hover(true);
-
-	p = container_h_presets_menu->get_popup();
-	p->connect("id_pressed", callable_mp(this, &ControlEditorToolbar::_popup_callback));
-
-	container_v_presets_menu = memnew(MenuButton);
-	container_v_presets_menu->set_shortcut_context(this);
-	container_v_presets_menu->set_text(TTR("Vertical"));
-	container_v_presets_menu->set_tooltip(TTR("Vertical sizing setting for children of a Container node."));
-	add_child(container_v_presets_menu);
-	container_v_presets_menu->set_switch_on_hover(true);
-
-	p = container_v_presets_menu->get_popup();
-	p->connect("id_pressed", callable_mp(this, &ControlEditorToolbar::_popup_callback));
-
+	anchor_mode_button->connect("toggled", callable_mp(this, &ControlEditorToolbar::_anchor_mode_toggled));
+
+	// Container tools.
+	containers_button = memnew(ControlEditorPopupButton);
+	containers_button->set_tooltip(TTR("Sizing settings for children of a Container node."));
+	add_child(containers_button);
+
+	Label *container_h_label = memnew(Label);
+	container_h_label->set_text(TTR("Horizontal alignment"));
+	containers_button->get_popup_hbox()->add_child(container_h_label);
+	container_h_picker = memnew(SizeFlagPresetPicker(false));
+	containers_button->get_popup_hbox()->add_child(container_h_picker);
+	container_h_picker->connect("size_flags_selected", callable_mp(this, &ControlEditorToolbar::_container_flags_selected).bind(false));
+
+	containers_button->get_popup_hbox()->add_child(memnew(HSeparator));
+
+	Label *container_v_label = memnew(Label);
+	container_v_label->set_text(TTR("Vertical alignment"));
+	containers_button->get_popup_hbox()->add_child(container_v_label);
+	container_v_picker = memnew(SizeFlagPresetPicker(true));
+	containers_button->get_popup_hbox()->add_child(container_v_picker);
+	container_v_picker->connect("size_flags_selected", callable_mp(this, &ControlEditorToolbar::_container_flags_selected).bind(true));
+
+	// Editor connections.
 	undo_redo = EditorNode::get_singleton()->get_undo_redo();
 	editor_selection = EditorNode::get_singleton()->get_editor_selection();
 	editor_selection->add_editor_plugin(this);
@@ -998,6 +1046,8 @@ ControlEditorToolbar::ControlEditorToolbar() {
 
 ControlEditorToolbar *ControlEditorToolbar::singleton = nullptr;
 
+// Editor plugin.
+
 ControlEditorPlugin::ControlEditorPlugin() {
 	toolbar = memnew(ControlEditorToolbar);
 	toolbar->hide();
diff --git a/editor/plugins/control_editor_plugin.h b/editor/plugins/control_editor_plugin.h
index 11389bc095..f1b9190a0b 100644
--- a/editor/plugins/control_editor_plugin.h
+++ b/editor/plugins/control_editor_plugin.h
@@ -33,14 +33,18 @@
 
 #include "editor/editor_plugin.h"
 #include "scene/gui/box_container.h"
+#include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/margin_container.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
+#include "scene/gui/popup.h"
+#include "scene/gui/separator.h"
 #include "scene/gui/texture_rect.h"
 
+// Inspector controls.
 class ControlPositioningWarning : public MarginContainer {
 	GDCLASS(ControlPositioningWarning, MarginContainer);
 
@@ -125,102 +129,101 @@ public:
 	virtual bool parse_property(Object *p_object, const Variant::Type p_type, const String &p_path, const PropertyHint p_hint, const String &p_hint_text, const uint32_t p_usage, const bool p_wide = false) override;
 };
 
+// Toolbar controls.
+class ControlEditorPopupButton : public Button {
+	GDCLASS(ControlEditorPopupButton, Button);
+
+	Ref<Texture2D> arrow_icon;
+
+	PopupPanel *popup_panel = nullptr;
+	VBoxContainer *popup_vbox = nullptr;
+
+	void _popup_visibility_changed(bool p_visible);
+
+protected:
+	void _notification(int p_what);
+
+public:
+	virtual Size2 get_minimum_size() const override;
+	virtual void toggled(bool p_pressed) override;
+
+	VBoxContainer *get_popup_hbox() const { return popup_vbox; }
+
+	ControlEditorPopupButton();
+};
+
+class ControlEditorPresetPicker : public MarginContainer {
+	GDCLASS(ControlEditorPresetPicker, MarginContainer);
+
+	virtual void _preset_button_pressed(const int p_preset) {}
+
+protected:
+	static constexpr int grid_separation = 0;
+	HashMap<int, Button *> preset_buttons;
+
+	void _add_row_button(HBoxContainer *p_row, const int p_preset, const String &p_name);
+	void _add_separator(BoxContainer *p_box, Separator *p_separator);
+
+public:
+	ControlEditorPresetPicker() {}
+};
+
+class AnchorPresetPicker : public ControlEditorPresetPicker {
+	GDCLASS(AnchorPresetPicker, ControlEditorPresetPicker);
+
+	virtual void _preset_button_pressed(const int p_preset) override;
+
+protected:
+	void _notification(int p_notification);
+	static void _bind_methods();
+
+public:
+	AnchorPresetPicker();
+};
+
+class SizeFlagPresetPicker : public ControlEditorPresetPicker {
+	GDCLASS(SizeFlagPresetPicker, ControlEditorPresetPicker);
+
+	CheckBox *expand_button;
+
+	bool vertical = false;
+
+	virtual void _preset_button_pressed(const int p_preset) override;
+
+protected:
+	void _notification(int p_notification);
+	static void _bind_methods();
+
+public:
+	void set_allowed_flags(Vector<SizeFlags> &p_flags);
+
+	SizeFlagPresetPicker(bool p_vertical);
+};
+
 class ControlEditorToolbar : public HBoxContainer {
 	GDCLASS(ControlEditorToolbar, HBoxContainer);
 
 	UndoRedo *undo_redo = nullptr;
 	EditorSelection *editor_selection = nullptr;
 
-	enum MenuOption {
-		ANCHORS_AND_OFFSETS_PRESET_TOP_LEFT,
-		ANCHORS_AND_OFFSETS_PRESET_TOP_RIGHT,
-		ANCHORS_AND_OFFSETS_PRESET_BOTTOM_LEFT,
-		ANCHORS_AND_OFFSETS_PRESET_BOTTOM_RIGHT,
-		ANCHORS_AND_OFFSETS_PRESET_CENTER_LEFT,
-		ANCHORS_AND_OFFSETS_PRESET_CENTER_RIGHT,
-		ANCHORS_AND_OFFSETS_PRESET_CENTER_TOP,
-		ANCHORS_AND_OFFSETS_PRESET_CENTER_BOTTOM,
-		ANCHORS_AND_OFFSETS_PRESET_CENTER,
-		ANCHORS_AND_OFFSETS_PRESET_TOP_WIDE,
-		ANCHORS_AND_OFFSETS_PRESET_LEFT_WIDE,
-		ANCHORS_AND_OFFSETS_PRESET_RIGHT_WIDE,
-		ANCHORS_AND_OFFSETS_PRESET_BOTTOM_WIDE,
-		ANCHORS_AND_OFFSETS_PRESET_VCENTER_WIDE,
-		ANCHORS_AND_OFFSETS_PRESET_HCENTER_WIDE,
-		ANCHORS_AND_OFFSETS_PRESET_FULL_RECT,
-
-		ANCHORS_AND_OFFSETS_PRESET_KEEP_RATIO,
-
-		ANCHORS_PRESET_TOP_LEFT,
-		ANCHORS_PRESET_TOP_RIGHT,
-		ANCHORS_PRESET_BOTTOM_LEFT,
-		ANCHORS_PRESET_BOTTOM_RIGHT,
-		ANCHORS_PRESET_CENTER_LEFT,
-		ANCHORS_PRESET_CENTER_RIGHT,
-		ANCHORS_PRESET_CENTER_TOP,
-		ANCHORS_PRESET_CENTER_BOTTOM,
-		ANCHORS_PRESET_CENTER,
-		ANCHORS_PRESET_TOP_WIDE,
-		ANCHORS_PRESET_LEFT_WIDE,
-		ANCHORS_PRESET_RIGHT_WIDE,
-		ANCHORS_PRESET_BOTTOM_WIDE,
-		ANCHORS_PRESET_VCENTER_WIDE,
-		ANCHORS_PRESET_HCENTER_WIDE,
-		ANCHORS_PRESET_FULL_RECT,
-
-		// Offsets Presets are not currently in use.
-		OFFSETS_PRESET_TOP_LEFT,
-		OFFSETS_PRESET_TOP_RIGHT,
-		OFFSETS_PRESET_BOTTOM_LEFT,
-		OFFSETS_PRESET_BOTTOM_RIGHT,
-		OFFSETS_PRESET_CENTER_LEFT,
-		OFFSETS_PRESET_CENTER_RIGHT,
-		OFFSETS_PRESET_CENTER_TOP,
-		OFFSETS_PRESET_CENTER_BOTTOM,
-		OFFSETS_PRESET_CENTER,
-		OFFSETS_PRESET_TOP_WIDE,
-		OFFSETS_PRESET_LEFT_WIDE,
-		OFFSETS_PRESET_RIGHT_WIDE,
-		OFFSETS_PRESET_BOTTOM_WIDE,
-		OFFSETS_PRESET_VCENTER_WIDE,
-		OFFSETS_PRESET_HCENTER_WIDE,
-		OFFSETS_PRESET_FULL_RECT,
-
-		CONTAINERS_H_PRESET_FILL,
-		CONTAINERS_H_PRESET_FILL_EXPAND,
-		CONTAINERS_H_PRESET_SHRINK_BEGIN,
-		CONTAINERS_H_PRESET_SHRINK_CENTER,
-		CONTAINERS_H_PRESET_SHRINK_END,
-		CONTAINERS_V_PRESET_FILL,
-		CONTAINERS_V_PRESET_FILL_EXPAND,
-		CONTAINERS_V_PRESET_SHRINK_BEGIN,
-		CONTAINERS_V_PRESET_SHRINK_CENTER,
-		CONTAINERS_V_PRESET_SHRINK_END,
-	};
-
-	MenuButton *anchor_presets_menu = nullptr;
-	PopupMenu *anchors_popup = nullptr;
-	MenuButton *container_h_presets_menu = nullptr;
-	MenuButton *container_v_presets_menu = nullptr;
-
+	ControlEditorPopupButton *anchors_button = nullptr;
+	ControlEditorPopupButton *containers_button = nullptr;
 	Button *anchor_mode_button = nullptr;
 
+	SizeFlagPresetPicker *container_h_picker = nullptr;
+	SizeFlagPresetPicker *container_v_picker = nullptr;
+
 	bool anchors_mode = false;
 
-	void _set_anchors_preset(Control::LayoutPreset p_preset);
-	void _set_anchors_and_offsets_preset(Control::LayoutPreset p_preset);
-	void _set_anchors_and_offsets_to_keep_ratio();
-	void _set_container_h_preset(Control::SizeFlags p_preset);
-	void _set_container_v_preset(Control::SizeFlags p_preset);
+	void _anchors_preset_selected(int p_preset);
+	void _anchors_to_current_ratio();
+	void _anchor_mode_toggled(bool p_status);
+	void _container_flags_selected(int p_flags, bool p_vertical);
 
 	Vector2 _anchor_to_position(const Control *p_control, Vector2 anchor);
 	Vector2 _position_to_anchor(const Control *p_control, Vector2 position);
-
-	void _button_toggle_anchor_mode(bool p_status);
-
 	bool _is_node_locked(const Node *p_node);
-	List<Control *> _get_edited_controls(bool retrieve_locked = false, bool remove_controls_if_parent_in_selection = true);
-	void _popup_callback(int p_op);
+	List<Control *> _get_edited_controls();
 	void _selection_changed();
 
 protected:
@@ -236,6 +239,7 @@ public:
 	ControlEditorToolbar();
 };
 
+// Editor plugin.
 class ControlEditorPlugin : public EditorPlugin {
 	GDCLASS(ControlEditorPlugin, EditorPlugin);
 
diff --git a/editor/plugins/debugger_editor_plugin.cpp b/editor/plugins/debugger_editor_plugin.cpp
index c572b5b7fe..40e7dfead2 100644
--- a/editor/plugins/debugger_editor_plugin.cpp
+++ b/editor/plugins/debugger_editor_plugin.cpp
@@ -40,7 +40,7 @@
 #include "editor/plugins/script_editor_plugin.h"
 #include "scene/gui/menu_button.h"
 
-DebuggerEditorPlugin::DebuggerEditorPlugin(MenuButton *p_debug_menu) {
+DebuggerEditorPlugin::DebuggerEditorPlugin(PopupMenu *p_debug_menu) {
 	EditorDebuggerServer::initialize();
 
 	ED_SHORTCUT("debugger/step_into", TTR("Step Into"), Key::F11);
@@ -61,30 +61,29 @@ DebuggerEditorPlugin::DebuggerEditorPlugin(MenuButton *p_debug_menu) {
 
 	// Main editor debug menu.
 	debug_menu = p_debug_menu;
-	PopupMenu *p = debug_menu->get_popup();
-	p->set_hide_on_checkable_item_selection(false);
-	p->add_check_shortcut(ED_SHORTCUT("editor/deploy_with_remote_debug", TTR("Deploy with Remote Debug")), RUN_DEPLOY_REMOTE_DEBUG);
-	p->set_item_tooltip(-1,
+	debug_menu->set_hide_on_checkable_item_selection(false);
+	debug_menu->add_check_shortcut(ED_SHORTCUT("editor/deploy_with_remote_debug", TTR("Deploy with Remote Debug")), RUN_DEPLOY_REMOTE_DEBUG);
+	debug_menu->set_item_tooltip(-1,
 			TTR("When this option is enabled, using one-click deploy will make the executable attempt to connect to this computer's IP so the running project can be debugged.\nThis option is intended to be used for remote debugging (typically with a mobile device).\nYou don't need to enable it to use the GDScript debugger locally."));
-	p->add_check_shortcut(ED_SHORTCUT("editor/small_deploy_with_network_fs", TTR("Small Deploy with Network Filesystem")), RUN_FILE_SERVER);
-	p->set_item_tooltip(-1,
+	debug_menu->add_check_shortcut(ED_SHORTCUT("editor/small_deploy_with_network_fs", TTR("Small Deploy with Network Filesystem")), RUN_FILE_SERVER);
+	debug_menu->set_item_tooltip(-1,
 			TTR("When this option is enabled, using one-click deploy for Android will only export an executable without the project data.\nThe filesystem will be provided from the project by the editor over the network.\nOn Android, deploying will use the USB cable for faster performance. This option speeds up testing for projects with large assets."));
-	p->add_separator();
-	p->add_check_shortcut(ED_SHORTCUT("editor/visible_collision_shapes", TTR("Visible Collision Shapes")), RUN_DEBUG_COLLISONS);
-	p->set_item_tooltip(-1,
+	debug_menu->add_separator();
+	debug_menu->add_check_shortcut(ED_SHORTCUT("editor/visible_collision_shapes", TTR("Visible Collision Shapes")), RUN_DEBUG_COLLISONS);
+	debug_menu->set_item_tooltip(-1,
 			TTR("When this option is enabled, collision shapes and raycast nodes (for 2D and 3D) will be visible in the running project."));
-	p->add_check_shortcut(ED_SHORTCUT("editor/visible_paths", TTR("Visible Paths")), RUN_DEBUG_PATHS);
-	p->set_item_tooltip(-1,
+	debug_menu->add_check_shortcut(ED_SHORTCUT("editor/visible_paths", TTR("Visible Paths")), RUN_DEBUG_PATHS);
+	debug_menu->set_item_tooltip(-1,
 			TTR("When this option is enabled, curve resources used by path nodes will be visible in the running project."));
-	p->add_check_shortcut(ED_SHORTCUT("editor/visible_navigation", TTR("Visible Navigation")), RUN_DEBUG_NAVIGATION);
-	p->set_item_tooltip(-1,
+	debug_menu->add_check_shortcut(ED_SHORTCUT("editor/visible_navigation", TTR("Visible Navigation")), RUN_DEBUG_NAVIGATION);
+	debug_menu->set_item_tooltip(-1,
 			TTR("When this option is enabled, navigation meshes and polygons will be visible in the running project."));
-	p->add_separator();
-	p->add_check_shortcut(ED_SHORTCUT("editor/sync_scene_changes", TTR("Synchronize Scene Changes")), RUN_LIVE_DEBUG);
-	p->set_item_tooltip(-1,
+	debug_menu->add_separator();
+	debug_menu->add_check_shortcut(ED_SHORTCUT("editor/sync_scene_changes", TTR("Synchronize Scene Changes")), RUN_LIVE_DEBUG);
+	debug_menu->set_item_tooltip(-1,
 			TTR("When this option is enabled, any changes made to the scene in the editor will be replicated in the running project.\nWhen used remotely on a device, this is more efficient when the network filesystem option is enabled."));
-	p->add_check_shortcut(ED_SHORTCUT("editor/sync_script_changes", TTR("Synchronize Script Changes")), RUN_RELOAD_SCRIPTS);
-	p->set_item_tooltip(-1,
+	debug_menu->add_check_shortcut(ED_SHORTCUT("editor/sync_script_changes", TTR("Synchronize Script Changes")), RUN_RELOAD_SCRIPTS);
+	debug_menu->set_item_tooltip(-1,
 			TTR("When this option is enabled, any script that is saved will be reloaded in the running project.\nWhen used remotely on a device, this is more efficient when the network filesystem option is enabled."));
 
 	// Multi-instance, start/stop
@@ -92,9 +91,9 @@ DebuggerEditorPlugin::DebuggerEditorPlugin(MenuButton *p_debug_menu) {
 	instances_menu->set_name("run_instances");
 	instances_menu->set_hide_on_checkable_item_selection(false);
 
-	p->add_child(instances_menu);
-	p->add_separator();
-	p->add_submenu_item(TTR("Run Multiple Instances"), "run_instances");
+	debug_menu->add_child(instances_menu);
+	debug_menu->add_separator();
+	debug_menu->add_submenu_item(TTR("Run Multiple Instances"), "run_instances");
 
 	instances_menu->add_radio_check_item(TTR("Run 1 Instance"));
 	instances_menu->set_item_metadata(0, 1);
@@ -106,7 +105,7 @@ DebuggerEditorPlugin::DebuggerEditorPlugin(MenuButton *p_debug_menu) {
 	instances_menu->set_item_metadata(3, 4);
 	instances_menu->set_item_checked(0, true);
 	instances_menu->connect("index_pressed", callable_mp(this, &DebuggerEditorPlugin::_select_run_count));
-	p->connect("id_pressed", callable_mp(this, &DebuggerEditorPlugin::_menu_option));
+	debug_menu->connect("id_pressed", callable_mp(this, &DebuggerEditorPlugin::_menu_option));
 }
 
 DebuggerEditorPlugin::~DebuggerEditorPlugin() {
@@ -125,7 +124,7 @@ void DebuggerEditorPlugin::_select_run_count(int p_index) {
 void DebuggerEditorPlugin::_menu_option(int p_option) {
 	switch (p_option) {
 		case RUN_FILE_SERVER: {
-			bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_FILE_SERVER));
+			bool ischecked = debug_menu->is_item_checked(debug_menu->get_item_index(RUN_FILE_SERVER));
 
 			if (ischecked) {
 				file_server->stop();
@@ -133,45 +132,45 @@ void DebuggerEditorPlugin::_menu_option(int p_option) {
 				file_server->start();
 			}
 
-			debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_FILE_SERVER), !ischecked);
+			debug_menu->set_item_checked(debug_menu->get_item_index(RUN_FILE_SERVER), !ischecked);
 			EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_file_server", !ischecked);
 
 		} break;
 		case RUN_LIVE_DEBUG: {
-			bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_LIVE_DEBUG));
+			bool ischecked = debug_menu->is_item_checked(debug_menu->get_item_index(RUN_LIVE_DEBUG));
 
-			debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_LIVE_DEBUG), !ischecked);
+			debug_menu->set_item_checked(debug_menu->get_item_index(RUN_LIVE_DEBUG), !ischecked);
 			EditorDebuggerNode::get_singleton()->set_live_debugging(!ischecked);
 			EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_live_debug", !ischecked);
 
 		} break;
 		case RUN_DEPLOY_REMOTE_DEBUG: {
-			bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEPLOY_REMOTE_DEBUG));
-			debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEPLOY_REMOTE_DEBUG), !ischecked);
+			bool ischecked = debug_menu->is_item_checked(debug_menu->get_item_index(RUN_DEPLOY_REMOTE_DEBUG));
+			debug_menu->set_item_checked(debug_menu->get_item_index(RUN_DEPLOY_REMOTE_DEBUG), !ischecked);
 			EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_deploy_remote_debug", !ischecked);
 
 		} break;
 		case RUN_DEBUG_COLLISONS: {
-			bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEBUG_COLLISONS));
-			debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEBUG_COLLISONS), !ischecked);
+			bool ischecked = debug_menu->is_item_checked(debug_menu->get_item_index(RUN_DEBUG_COLLISONS));
+			debug_menu->set_item_checked(debug_menu->get_item_index(RUN_DEBUG_COLLISONS), !ischecked);
 			EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_debug_collisons", !ischecked);
 
 		} break;
 		case RUN_DEBUG_PATHS: {
-			bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEBUG_PATHS));
-			debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEBUG_PATHS), !ischecked);
+			bool ischecked = debug_menu->is_item_checked(debug_menu->get_item_index(RUN_DEBUG_PATHS));
+			debug_menu->set_item_checked(debug_menu->get_item_index(RUN_DEBUG_PATHS), !ischecked);
 			EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_debug_paths", !ischecked);
 
 		} break;
 		case RUN_DEBUG_NAVIGATION: {
-			bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEBUG_NAVIGATION));
-			debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_DEBUG_NAVIGATION), !ischecked);
+			bool ischecked = debug_menu->is_item_checked(debug_menu->get_item_index(RUN_DEBUG_NAVIGATION));
+			debug_menu->set_item_checked(debug_menu->get_item_index(RUN_DEBUG_NAVIGATION), !ischecked);
 			EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_debug_navigation", !ischecked);
 
 		} break;
 		case RUN_RELOAD_SCRIPTS: {
-			bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_RELOAD_SCRIPTS));
-			debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_RELOAD_SCRIPTS), !ischecked);
+			bool ischecked = debug_menu->is_item_checked(debug_menu->get_item_index(RUN_RELOAD_SCRIPTS));
+			debug_menu->set_item_checked(debug_menu->get_item_index(RUN_RELOAD_SCRIPTS), !ischecked);
 
 			ScriptEditor::get_singleton()->set_live_auto_reload_running_scripts(!ischecked);
 			EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_reload_scripts", !ischecked);
diff --git a/editor/plugins/debugger_editor_plugin.h b/editor/plugins/debugger_editor_plugin.h
index fb963385cd..d8871128c3 100644
--- a/editor/plugins/debugger_editor_plugin.h
+++ b/editor/plugins/debugger_editor_plugin.h
@@ -41,7 +41,7 @@ class DebuggerEditorPlugin : public EditorPlugin {
 	GDCLASS(DebuggerEditorPlugin, EditorPlugin);
 
 private:
-	MenuButton *debug_menu = nullptr;
+	PopupMenu *debug_menu = nullptr;
 	EditorFileServer *file_server = nullptr;
 	PopupMenu *instances_menu = nullptr;
 
@@ -64,7 +64,7 @@ public:
 	virtual String get_name() const override { return "Debugger"; }
 	bool has_main_screen() const override { return false; }
 
-	DebuggerEditorPlugin(MenuButton *p_menu);
+	DebuggerEditorPlugin(PopupMenu *p_menu);
 	~DebuggerEditorPlugin();
 };
 
diff --git a/editor/plugins/font_config_plugin.cpp b/editor/plugins/font_config_plugin.cpp
index cadb974345..c7d3e92802 100644
--- a/editor/plugins/font_config_plugin.cpp
+++ b/editor/plugins/font_config_plugin.cpp
@@ -100,11 +100,6 @@ bool EditorPropertyFontOTObject::_get(const StringName &p_name, Variant &r_ret)
 	return false;
 }
 
-void EditorPropertyFontOTObject::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("property_can_revert", "name"), &EditorPropertyFontOTObject::property_can_revert);
-	ClassDB::bind_method(D_METHOD("property_get_revert", "name"), &EditorPropertyFontOTObject::property_get_revert);
-}
-
 void EditorPropertyFontOTObject::set_dict(const Dictionary &p_dict) {
 	dict = p_dict;
 }
@@ -121,7 +116,7 @@ Dictionary EditorPropertyFontOTObject::get_defaults() {
 	return defaults_dict;
 }
 
-bool EditorPropertyFontOTObject::property_can_revert(const String &p_name) {
+bool EditorPropertyFontOTObject::_property_can_revert(const StringName &p_name) const {
 	String name = p_name;
 
 	if (name.begins_with("keys")) {
@@ -136,18 +131,19 @@ bool EditorPropertyFontOTObject::property_can_revert(const String &p_name) {
 	return false;
 }
 
-Variant EditorPropertyFontOTObject::property_get_revert(const String &p_name) {
+bool EditorPropertyFontOTObject::_property_get_revert(const StringName &p_name, Variant &r_property) const {
 	String name = p_name;
 
 	if (name.begins_with("keys")) {
 		int key = name.get_slicec('/', 1).to_int();
 		if (defaults_dict.has(key)) {
 			Vector3i range = defaults_dict[key];
-			return range.z;
+			r_property = range.z;
+			return true;
 		}
 	}
 
-	return Variant();
+	return false;
 }
 
 /*************************************************************************/
diff --git a/editor/plugins/font_config_plugin.h b/editor/plugins/font_config_plugin.h
index 3eaa2fdc17..41dde3cc59 100644
--- a/editor/plugins/font_config_plugin.h
+++ b/editor/plugins/font_config_plugin.h
@@ -66,7 +66,8 @@ class EditorPropertyFontOTObject : public RefCounted {
 protected:
 	bool _set(const StringName &p_name, const Variant &p_value);
 	bool _get(const StringName &p_name, Variant &r_ret) const;
-	static void _bind_methods();
+	bool _property_can_revert(const StringName &p_name) const;
+	bool _property_get_revert(const StringName &p_name, Variant &r_property) const;
 
 public:
 	void set_dict(const Dictionary &p_dict);
@@ -75,9 +76,6 @@ public:
 	void set_defaults(const Dictionary &p_dict);
 	Dictionary get_defaults();
 
-	bool property_can_revert(const String &p_name);
-	Variant property_get_revert(const String &p_name);
-
 	EditorPropertyFontOTObject(){};
 };
 
diff --git a/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp b/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp
index 643a470425..b54cb515e4 100644
--- a/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp
+++ b/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp
@@ -140,7 +140,7 @@ void GPUParticlesCollisionSDF3DEditorPlugin::_sdf_save_path_and_bake(const Strin
 	if (col_sdf) {
 		Ref<Image> bake_img = col_sdf->bake();
 		if (bake_img.is_null()) {
-			EditorNode::get_singleton()->show_warning(TTR("Bake Error."));
+			EditorNode::get_singleton()->show_warning(TTR("No faces detected during GPUParticlesCollisionSDF3D bake.\nCheck whether there are visible meshes matching the bake mask within its extents."));
 			return;
 		}
 
diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp
index 00fc8cc7d6..1b4d98fc3f 100644
--- a/editor/plugins/material_editor_plugin.cpp
+++ b/editor/plugins/material_editor_plugin.cpp
@@ -340,17 +340,17 @@ Ref<Resource> StandardMaterial3DConversionPlugin::convert(const Ref<Resource> &p
 	smat->set_shader(shader);
 
 	List<PropertyInfo> params;
-	RS::get_singleton()->shader_get_param_list(mat->get_shader_rid(), &params);
+	RS::get_singleton()->shader_get_shader_uniform_list(mat->get_shader_rid(), &params);
 
 	for (const PropertyInfo &E : params) {
 		// Texture parameter has to be treated specially since StandardMaterial3D saved it
 		// as RID but ShaderMaterial needs Texture itself
 		Ref<Texture2D> texture = mat->get_texture_by_name(E.name);
 		if (texture.is_valid()) {
-			smat->set_shader_param(E.name, texture);
+			smat->set_shader_uniform(E.name, texture);
 		} else {
 			Variant value = RS::get_singleton()->material_get_param(mat->get_rid(), E.name);
-			smat->set_shader_param(E.name, value);
+			smat->set_shader_uniform(E.name, value);
 		}
 	}
 
@@ -386,17 +386,17 @@ Ref<Resource> ORMMaterial3DConversionPlugin::convert(const Ref<Resource> &p_reso
 	smat->set_shader(shader);
 
 	List<PropertyInfo> params;
-	RS::get_singleton()->shader_get_param_list(mat->get_shader_rid(), &params);
+	RS::get_singleton()->shader_get_shader_uniform_list(mat->get_shader_rid(), &params);
 
 	for (const PropertyInfo &E : params) {
 		// Texture parameter has to be treated specially since ORMMaterial3D saved it
 		// as RID but ShaderMaterial needs Texture itself
 		Ref<Texture2D> texture = mat->get_texture_by_name(E.name);
 		if (texture.is_valid()) {
-			smat->set_shader_param(E.name, texture);
+			smat->set_shader_uniform(E.name, texture);
 		} else {
 			Variant value = RS::get_singleton()->material_get_param(mat->get_rid(), E.name);
-			smat->set_shader_param(E.name, value);
+			smat->set_shader_uniform(E.name, value);
 		}
 	}
 
@@ -432,11 +432,11 @@ Ref<Resource> ParticlesMaterialConversionPlugin::convert(const Ref<Resource> &p_
 	smat->set_shader(shader);
 
 	List<PropertyInfo> params;
-	RS::get_singleton()->shader_get_param_list(mat->get_shader_rid(), &params);
+	RS::get_singleton()->shader_get_shader_uniform_list(mat->get_shader_rid(), &params);
 
 	for (const PropertyInfo &E : params) {
 		Variant value = RS::get_singleton()->material_get_param(mat->get_rid(), E.name);
-		smat->set_shader_param(E.name, value);
+		smat->set_shader_uniform(E.name, value);
 	}
 
 	smat->set_render_priority(mat->get_render_priority());
@@ -471,11 +471,11 @@ Ref<Resource> CanvasItemMaterialConversionPlugin::convert(const Ref<Resource> &p
 	smat->set_shader(shader);
 
 	List<PropertyInfo> params;
-	RS::get_singleton()->shader_get_param_list(mat->get_shader_rid(), &params);
+	RS::get_singleton()->shader_get_shader_uniform_list(mat->get_shader_rid(), &params);
 
 	for (const PropertyInfo &E : params) {
 		Variant value = RS::get_singleton()->material_get_param(mat->get_rid(), E.name);
-		smat->set_shader_param(E.name, value);
+		smat->set_shader_uniform(E.name, value);
 	}
 
 	smat->set_render_priority(mat->get_render_priority());
@@ -510,11 +510,11 @@ Ref<Resource> ProceduralSkyMaterialConversionPlugin::convert(const Ref<Resource>
 	smat->set_shader(shader);
 
 	List<PropertyInfo> params;
-	RS::get_singleton()->shader_get_param_list(mat->get_shader_rid(), &params);
+	RS::get_singleton()->shader_get_shader_uniform_list(mat->get_shader_rid(), &params);
 
 	for (const PropertyInfo &E : params) {
 		Variant value = RS::get_singleton()->material_get_param(mat->get_rid(), E.name);
-		smat->set_shader_param(E.name, value);
+		smat->set_shader_uniform(E.name, value);
 	}
 
 	smat->set_render_priority(mat->get_render_priority());
@@ -549,11 +549,11 @@ Ref<Resource> PanoramaSkyMaterialConversionPlugin::convert(const Ref<Resource> &
 	smat->set_shader(shader);
 
 	List<PropertyInfo> params;
-	RS::get_singleton()->shader_get_param_list(mat->get_shader_rid(), &params);
+	RS::get_singleton()->shader_get_shader_uniform_list(mat->get_shader_rid(), &params);
 
 	for (const PropertyInfo &E : params) {
 		Variant value = RS::get_singleton()->material_get_param(mat->get_rid(), E.name);
-		smat->set_shader_param(E.name, value);
+		smat->set_shader_uniform(E.name, value);
 	}
 
 	smat->set_render_priority(mat->get_render_priority());
@@ -588,11 +588,11 @@ Ref<Resource> PhysicalSkyMaterialConversionPlugin::convert(const Ref<Resource> &
 	smat->set_shader(shader);
 
 	List<PropertyInfo> params;
-	RS::get_singleton()->shader_get_param_list(mat->get_shader_rid(), &params);
+	RS::get_singleton()->shader_get_shader_uniform_list(mat->get_shader_rid(), &params);
 
 	for (const PropertyInfo &E : params) {
 		Variant value = RS::get_singleton()->material_get_param(mat->get_rid(), E.name);
-		smat->set_shader_param(E.name, value);
+		smat->set_shader_uniform(E.name, value);
 	}
 
 	smat->set_render_priority(mat->get_render_priority());
@@ -627,11 +627,11 @@ Ref<Resource> FogMaterialConversionPlugin::convert(const Ref<Resource> &p_resour
 	smat->set_shader(shader);
 
 	List<PropertyInfo> params;
-	RS::get_singleton()->shader_get_param_list(mat->get_shader_rid(), &params);
+	RS::get_singleton()->shader_get_shader_uniform_list(mat->get_shader_rid(), &params);
 
 	for (const PropertyInfo &E : params) {
 		Variant value = RS::get_singleton()->material_get_param(mat->get_rid(), E.name);
-		smat->set_shader_param(E.name, value);
+		smat->set_shader_uniform(E.name, value);
 	}
 
 	smat->set_render_priority(mat->get_render_priority());
diff --git a/editor/plugins/node_3d_editor_gizmos.cpp b/editor/plugins/node_3d_editor_gizmos.cpp
index 0070226d40..e8f143a637 100644
--- a/editor/plugins/node_3d_editor_gizmos.cpp
+++ b/editor/plugins/node_3d_editor_gizmos.cpp
@@ -4839,6 +4839,10 @@ void CollisionPolygon3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 ////
 
 NavigationRegion3DGizmoPlugin::NavigationRegion3DGizmoPlugin() {
+	create_material("face_material", NavigationServer3D::get_singleton()->get_debug_navigation_geometry_face_color(), false, false, true);
+	create_material("face_material_disabled", NavigationServer3D::get_singleton()->get_debug_navigation_geometry_face_disabled_color(), false, false, true);
+	create_material("edge_material", NavigationServer3D::get_singleton()->get_debug_navigation_geometry_edge_color());
+	create_material("edge_material_disabled", NavigationServer3D::get_singleton()->get_debug_navigation_geometry_edge_disabled_color());
 }
 
 bool NavigationRegion3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
@@ -4924,6 +4928,7 @@ void NavigationRegion3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 	tmesh->create(tmeshfaces);
 
 	p_gizmo->add_collision_triangles(tmesh);
+	p_gizmo->add_collision_segments(lines);
 
 	Ref<ArrayMesh> debug_mesh = Ref<ArrayMesh>(memnew(ArrayMesh));
 	int polygon_count = navigationmesh->get_polygon_count();
@@ -4945,6 +4950,7 @@ void NavigationRegion3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 	face_mesh_array[Mesh::ARRAY_VERTEX] = face_vertex_array;
 
 	// if enabled add vertex colors to colorize each face individually
+	RandomPCG rand;
 	bool enabled_geometry_face_random_color = NavigationServer3D::get_singleton()->get_debug_navigation_enable_geometry_face_random_color();
 	if (enabled_geometry_face_random_color) {
 		Color debug_navigation_geometry_face_color = NavigationServer3D::get_singleton()->get_debug_navigation_geometry_face_color();
@@ -4954,7 +4960,9 @@ void NavigationRegion3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 		face_color_array.resize(polygon_count * 3);
 
 		for (int i = 0; i < polygon_count; i++) {
-			polygon_color = debug_navigation_geometry_face_color * (Color(Math::randf(), Math::randf(), Math::randf()));
+			// Generate the polygon color, slightly randomly modified from the settings one.
+			polygon_color.set_hsv(debug_navigation_geometry_face_color.get_h() + rand.random(-1.0, 1.0) * 0.1, debug_navigation_geometry_face_color.get_s(), debug_navigation_geometry_face_color.get_v() + rand.random(-1.0, 1.0) * 0.2);
+			polygon_color.a = debug_navigation_geometry_face_color.a;
 
 			Vector<int> polygon = navigationmesh->get_polygon(i);
 
@@ -4966,12 +4974,10 @@ void NavigationRegion3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 	}
 
 	debug_mesh->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, face_mesh_array);
-	Ref<StandardMaterial3D> debug_geometry_face_material = NavigationServer3D::get_singleton_mut()->get_debug_navigation_geometry_face_material();
-	debug_mesh->surface_set_material(0, debug_geometry_face_material);
+	p_gizmo->add_mesh(debug_mesh, navigationregion->is_enabled() ? get_material("face_material", p_gizmo) : get_material("face_material_disabled", p_gizmo));
 
 	// if enabled build geometry edge line surface
 	bool enabled_edge_lines = NavigationServer3D::get_singleton()->get_debug_navigation_enable_edge_lines();
-
 	if (enabled_edge_lines) {
 		Vector<Vector3> line_vertex_array;
 		line_vertex_array.resize(polygon_count * 6);
@@ -4987,27 +4993,8 @@ void NavigationRegion3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 			line_vertex_array.push_back(vertices[polygon[0]]);
 		}
 
-		Array line_mesh_array;
-		line_mesh_array.resize(Mesh::ARRAY_MAX);
-		line_mesh_array[Mesh::ARRAY_VERTEX] = line_vertex_array;
-		debug_mesh->add_surface_from_arrays(Mesh::PRIMITIVE_LINES, line_mesh_array);
-		Ref<StandardMaterial3D> debug_geometry_edge_material = NavigationServer3D::get_singleton_mut()->get_debug_navigation_geometry_edge_material();
-		debug_mesh->surface_set_material(1, debug_geometry_edge_material);
+		p_gizmo->add_lines(line_vertex_array, navigationregion->is_enabled() ? get_material("edge_material", p_gizmo) : get_material("edge_material_disabled", p_gizmo));
 	}
-
-	if (!navigationregion->is_enabled()) {
-		if (debug_mesh.is_valid()) {
-			if (debug_mesh->get_surface_count() > 0) {
-				debug_mesh->surface_set_material(0, NavigationServer3D::get_singleton_mut()->get_debug_navigation_geometry_face_disabled_material());
-			}
-			if (debug_mesh->get_surface_count() > 1) {
-				debug_mesh->surface_set_material(1, NavigationServer3D::get_singleton_mut()->get_debug_navigation_geometry_edge_disabled_material());
-			}
-		}
-	}
-
-	p_gizmo->add_mesh(debug_mesh);
-	p_gizmo->add_collision_segments(lines);
 }
 
 //////
diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp
index ba505a9abb..6afc6798d0 100644
--- a/editor/plugins/node_3d_editor_plugin.cpp
+++ b/editor/plugins/node_3d_editor_plugin.cpp
@@ -1386,25 +1386,17 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 		const real_t zoom_factor = 1 + (ZOOM_FREELOOK_MULTIPLIER - 1) * b->get_factor();
 		switch (b->get_button_index()) {
 			case MouseButton::WHEEL_UP: {
-				if (b->is_alt_pressed()) {
-					scale_fov(-0.05);
+				if (is_freelook_active()) {
+					scale_freelook_speed(zoom_factor);
 				} else {
-					if (is_freelook_active()) {
-						scale_freelook_speed(zoom_factor);
-					} else {
-						scale_cursor_distance(1.0 / zoom_factor);
-					}
+					scale_cursor_distance(1.0 / zoom_factor);
 				}
 			} break;
 			case MouseButton::WHEEL_DOWN: {
-				if (b->is_alt_pressed()) {
-					scale_fov(0.05);
+				if (is_freelook_active()) {
+					scale_freelook_speed(1.0 / zoom_factor);
 				} else {
-					if (is_freelook_active()) {
-						scale_freelook_speed(1.0 / zoom_factor);
-					} else {
-						scale_cursor_distance(zoom_factor);
-					}
+					scale_cursor_distance(zoom_factor);
 				}
 			} break;
 			case MouseButton::RIGHT: {
@@ -6408,7 +6400,7 @@ void fragment() {
 				Ref<ShaderMaterial> rotate_mat = memnew(ShaderMaterial);
 				rotate_mat->set_render_priority(Material::RENDER_PRIORITY_MAX);
 				rotate_mat->set_shader(rotate_shader);
-				rotate_mat->set_shader_param("albedo", col);
+				rotate_mat->set_shader_uniform("albedo", col);
 				rotate_gizmo_color[i] = rotate_mat;
 
 				Array arrays = surftool->commit_to_arrays();
@@ -6416,7 +6408,7 @@ void fragment() {
 				rotate_gizmo[i]->surface_set_material(0, rotate_mat);
 
 				Ref<ShaderMaterial> rotate_mat_hl = rotate_mat->duplicate();
-				rotate_mat_hl->set_shader_param("albedo", albedo);
+				rotate_mat_hl->set_shader_uniform("albedo", albedo);
 				rotate_gizmo_color_hl[i] = rotate_mat_hl;
 
 				if (i == 2) { // Rotation white outline
@@ -6457,7 +6449,7 @@ void fragment() {
 )");
 
 					border_mat->set_shader(border_shader);
-					border_mat->set_shader_param("albedo", Color(0.75, 0.75, 0.75, col.a / 3.0));
+					border_mat->set_shader_uniform("albedo", Color(0.75, 0.75, 0.75, col.a / 3.0));
 
 					rotate_gizmo[3] = Ref<ArrayMesh>(memnew(ArrayMesh));
 					rotate_gizmo[3]->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, arrays);
@@ -6710,8 +6702,8 @@ void Node3DEditor::_init_grid() {
 		fade_size = CLAMP(fade_size, min_fade_size, max_fade_size);
 
 		real_t grid_fade_size = (grid_size - primary_grid_steps) * fade_size;
-		grid_mat[c]->set_shader_param("grid_size", grid_fade_size);
-		grid_mat[c]->set_shader_param("orthogonal", orthogonal);
+		grid_mat[c]->set_shader_uniform("grid_size", grid_fade_size);
+		grid_mat[c]->set_shader_uniform("orthogonal", orthogonal);
 
 		// Cache these so we don't have to re-access memory.
 		Vector<Vector3> &ref_grid = grid_points[c];
@@ -7559,9 +7551,9 @@ void Node3DEditor::_sun_direction_draw() {
 	sun_direction->draw_rect(Rect2(Vector2(), sun_direction->get_size()), Color(1, 1, 1, 1));
 	Vector3 z_axis = preview_sun->get_transform().basis.get_column(Vector3::AXIS_Z);
 	z_axis = get_editor_viewport(0)->camera->get_camera_transform().basis.xform_inv(z_axis);
-	sun_direction_material->set_shader_param("sun_direction", Vector3(z_axis.x, -z_axis.y, z_axis.z));
+	sun_direction_material->set_shader_uniform("sun_direction", Vector3(z_axis.x, -z_axis.y, z_axis.z));
 	Color color = sun_color->get_pick_color() * sun_energy->get_value();
-	sun_direction_material->set_shader_param("sun_color", Vector3(color.r, color.g, color.b));
+	sun_direction_material->set_shader_uniform("sun_color", Vector3(color.r, color.g, color.b));
 }
 
 void Node3DEditor::_preview_settings_changed() {
@@ -8162,8 +8154,8 @@ void fragment() {
 )");
 		sun_direction_material.instantiate();
 		sun_direction_material->set_shader(sun_direction_shader);
-		sun_direction_material->set_shader_param("sun_direction", Vector3(0, 0, 1));
-		sun_direction_material->set_shader_param("sun_color", Vector3(1, 1, 1));
+		sun_direction_material->set_shader_uniform("sun_direction", Vector3(0, 0, 1));
+		sun_direction_material->set_shader_uniform("sun_color", Vector3(1, 1, 1));
 		sun_direction->set_material(sun_direction_material);
 
 		HBoxContainer *sun_angle_hbox = memnew(HBoxContainer);
diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp
index bbf5ffa462..c53ac59c11 100644
--- a/editor/plugins/script_editor_plugin.cpp
+++ b/editor/plugins/script_editor_plugin.cpp
@@ -1853,10 +1853,12 @@ void ScriptEditor::_update_members_overview_visibility() {
 
 	if (members_overview_enabled && se->show_members_overview()) {
 		members_overview_alphabeta_sort_button->set_visible(true);
+		filter_methods->set_visible(true);
 		members_overview->set_visible(true);
 		overview_vbox->set_visible(true);
 	} else {
 		members_overview_alphabeta_sort_button->set_visible(false);
+		filter_methods->set_visible(false);
 		members_overview->set_visible(false);
 		overview_vbox->set_visible(false);
 	}
@@ -1911,6 +1913,7 @@ void ScriptEditor::_update_help_overview_visibility() {
 
 	if (help_overview_enabled) {
 		members_overview_alphabeta_sort_button->set_visible(false);
+		filter_methods->set_visible(false);
 		help_overview->set_visible(true);
 		overview_vbox->set_visible(true);
 		filename->set_text(se->get_name());
diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp
index e700412188..d70c50f72a 100644
--- a/editor/plugins/shader_editor_plugin.cpp
+++ b/editor/plugins/shader_editor_plugin.cpp
@@ -47,6 +47,50 @@
 #include "servers/rendering/shader_preprocessor.h"
 #include "servers/rendering/shader_types.h"
 
+/*** SHADER SYNTAX HIGHLIGHTER ****/
+
+Dictionary GDShaderSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_line) {
+	Dictionary color_map;
+
+	for (const Point2i &region : disabled_branch_regions) {
+		if (p_line >= region.x && p_line <= region.y) {
+			Dictionary highlighter_info;
+			highlighter_info["color"] = disabled_branch_color;
+
+			color_map[0] = highlighter_info;
+			return color_map;
+		}
+	}
+
+	return CodeHighlighter::_get_line_syntax_highlighting_impl(p_line);
+}
+
+void GDShaderSyntaxHighlighter::add_disabled_branch_region(const Point2i &p_region) {
+	ERR_FAIL_COND(p_region.x < 0);
+	ERR_FAIL_COND(p_region.y < 0);
+
+	for (int i = 0; i < disabled_branch_regions.size(); i++) {
+		ERR_FAIL_COND_MSG(disabled_branch_regions[i].x == p_region.x, "Branch region with a start line '" + itos(p_region.x) + "' already exists.");
+	}
+
+	Point2i disabled_branch_region;
+	disabled_branch_region.x = p_region.x;
+	disabled_branch_region.y = p_region.y;
+	disabled_branch_regions.push_back(disabled_branch_region);
+
+	clear_highlighting_cache();
+}
+
+void GDShaderSyntaxHighlighter::clear_disabled_branch_regions() {
+	disabled_branch_regions.clear();
+	clear_highlighting_cache();
+}
+
+void GDShaderSyntaxHighlighter::set_disabled_branch_color(const Color &p_color) {
+	disabled_branch_color = p_color;
+	clear_highlighting_cache();
+}
+
 /*** SHADER SCRIPT EDITOR ****/
 
 static bool saved_warnings_enabled = false;
@@ -134,6 +178,7 @@ void ShaderTextEditor::set_edited_code(const String &p_code) {
 	get_text_editor()->clear_undo_history();
 	get_text_editor()->call_deferred(SNAME("set_h_scroll"), 0);
 	get_text_editor()->call_deferred(SNAME("set_v_scroll"), 0);
+	get_text_editor()->tag_saved_version();
 
 	_validate_script();
 	_line_col_changed();
@@ -263,6 +308,7 @@ void ShaderTextEditor::_load_theme_settings() {
 	syntax_highlighter->clear_color_regions();
 	syntax_highlighter->add_color_region("/*", "*/", comment_color, false);
 	syntax_highlighter->add_color_region("//", "", comment_color, true);
+	syntax_highlighter->set_disabled_branch_color(comment_color);
 
 	text_editor->clear_comment_delimiters();
 	text_editor->add_comment_delimiter("/*", "*/", false);
@@ -345,7 +391,7 @@ void ShaderTextEditor::_code_complete_script(const String &p_code, List<ScriptLa
 	if (!complete_from_path.ends_with("/")) {
 		complete_from_path += "/";
 	}
-	preprocessor.preprocess(p_code, code, nullptr, nullptr, nullptr, &pp_options, _complete_include_paths);
+	preprocessor.preprocess(p_code, "", code, nullptr, nullptr, nullptr, nullptr, &pp_options, _complete_include_paths);
 	complete_from_path = String();
 	if (pp_options.size()) {
 		for (const ScriptLanguage::CodeCompletionOption &E : pp_options) {
@@ -391,11 +437,29 @@ void ShaderTextEditor::_validate_script() {
 	String code_pp;
 	String error_pp;
 	List<ShaderPreprocessor::FilePosition> err_positions;
-	last_compile_result = preprocessor.preprocess(code, code_pp, &error_pp, &err_positions);
+	List<ShaderPreprocessor::Region> regions;
+	String filename;
+	if (shader.is_valid()) {
+		filename = shader->get_path();
+	} else if (shader_inc.is_valid()) {
+		filename = shader_inc->get_path();
+	}
+	last_compile_result = preprocessor.preprocess(code, filename, code_pp, &error_pp, &err_positions, &regions);
 
 	for (int i = 0; i < get_text_editor()->get_line_count(); i++) {
 		get_text_editor()->set_line_background_color(i, Color(0, 0, 0, 0));
 	}
+
+	syntax_highlighter->clear_disabled_branch_regions();
+	for (const ShaderPreprocessor::Region &region : regions) {
+		if (!region.enabled) {
+			if (filename != region.file) {
+				continue;
+			}
+			syntax_highlighter->add_disabled_branch_region(Point2i(region.from_line, region.to_line));
+		}
+	}
+
 	set_error("");
 	set_error_count(0);
 
@@ -843,6 +907,7 @@ void ShaderEditor::save_external_data(const String &p_str) {
 	if (shader_inc.is_valid() && shader_inc != edited_shader_inc) {
 		ResourceSaver::save(shader_inc);
 	}
+	shader_editor->get_text_editor()->tag_saved_version();
 
 	disk_changed->hide();
 }
@@ -851,6 +916,10 @@ void ShaderEditor::validate_script() {
 	shader_editor->_validate_script();
 }
 
+bool ShaderEditor::is_unsaved() const {
+	return shader_editor->get_text_editor()->get_saved_version() != shader_editor->get_text_editor()->get_version();
+}
+
 void ShaderEditor::apply_shaders() {
 	String editor_code = shader_editor->get_text_editor()->get_text();
 	if (shader.is_valid()) {
@@ -1127,36 +1196,34 @@ ShaderEditor::ShaderEditor() {
 void ShaderEditorPlugin::_update_shader_list() {
 	shader_list->clear();
 	for (uint32_t i = 0; i < edited_shaders.size(); i++) {
-		String text;
-		String path;
-		String _class;
-		String shader_name;
-		if (edited_shaders[i].shader.is_valid()) {
-			Ref<Shader> shader = edited_shaders[i].shader;
-
-			path = shader->get_path();
-			_class = shader->get_class();
-			shader_name = shader->get_name();
-		} else {
-			Ref<ShaderInclude> shader_inc = edited_shaders[i].shader_inc;
-
-			path = shader_inc->get_path();
-			_class = shader_inc->get_class();
-			shader_name = shader_inc->get_name();
+		Ref<Resource> shader = edited_shaders[i].shader;
+		if (shader.is_null()) {
+			shader = edited_shaders[i].shader_inc;
 		}
 
-		if (path.is_resource_file()) {
-			text = path.get_file();
-		} else if (shader_name != "") {
-			text = shader_name;
-		} else {
-			if (edited_shaders[i].shader.is_valid()) {
-				text = _class + ":" + itos(edited_shaders[i].shader->get_instance_id());
-			} else {
-				text = _class + ":" + itos(edited_shaders[i].shader_inc->get_instance_id());
+		String path = shader->get_path();
+		String text = path.get_file();
+		if (text.is_empty()) {
+			// This appears for newly created built-in shaders before saving the scene.
+			text = TTR("[unsaved]");
+		} else if (shader->is_built_in()) {
+			const String &shader_name = shader->get_name();
+			if (!shader_name.is_empty()) {
+				text = vformat("%s (%s)", shader_name, text.get_slice("::", 0));
 			}
 		}
 
+		bool unsaved = false;
+		if (edited_shaders[i].shader_editor) {
+			unsaved = edited_shaders[i].shader_editor->is_unsaved();
+		}
+		// TODO: Handle visual shaders too.
+
+		if (unsaved) {
+			text += "(*)";
+		}
+
+		String _class = shader->get_class();
 		if (!shader_list->has_theme_icon(_class, SNAME("EditorIcons"))) {
 			_class = "TextFile";
 		}
@@ -1206,7 +1273,7 @@ void ShaderEditorPlugin::edit(Object *p_object) {
 		es.shader_editor = memnew(ShaderEditor);
 		es.shader_editor->edit(si);
 		shader_tabs->add_child(es.shader_editor);
-		es.shader_editor->connect("validation_changed", callable_mp(this, &ShaderEditorPlugin::_update_shader_list_status));
+		es.shader_editor->connect("validation_changed", callable_mp(this, &ShaderEditorPlugin::_update_shader_list));
 	} else {
 		Shader *s = Object::cast_to<Shader>(p_object);
 		for (uint32_t i = 0; i < edited_shaders.size(); i++) {
@@ -1226,7 +1293,7 @@ void ShaderEditorPlugin::edit(Object *p_object) {
 			es.shader_editor = memnew(ShaderEditor);
 			shader_tabs->add_child(es.shader_editor);
 			es.shader_editor->edit(s);
-			es.shader_editor->connect("validation_changed", callable_mp(this, &ShaderEditorPlugin::_update_shader_list_status));
+			es.shader_editor->connect("validation_changed", callable_mp(this, &ShaderEditorPlugin::_update_shader_list));
 		}
 	}
 
@@ -1272,6 +1339,7 @@ void ShaderEditorPlugin::save_external_data() {
 			edited_shaders[i].shader_editor->save_external_data();
 		}
 	}
+	_update_shader_list();
 }
 
 void ShaderEditorPlugin::apply_changes() {
@@ -1289,6 +1357,12 @@ void ShaderEditorPlugin::_shader_selected(int p_index) {
 	shader_tabs->set_current_tab(p_index);
 }
 
+void ShaderEditorPlugin::_shader_list_clicked(int p_item, Vector2 p_local_mouse_pos, MouseButton p_mouse_button_index) {
+	if (p_mouse_button_index == MouseButton::MIDDLE) {
+		_close_shader(p_item);
+	}
+}
+
 void ShaderEditorPlugin::_close_shader(int p_index) {
 	int index = shader_tabs->get_current_tab();
 	ERR_FAIL_INDEX(index, shader_tabs->get_tab_count());
@@ -1408,6 +1482,7 @@ ShaderEditorPlugin::ShaderEditorPlugin() {
 	shader_list->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	vb->add_child(shader_list);
 	shader_list->connect("item_selected", callable_mp(this, &ShaderEditorPlugin::_shader_selected));
+	shader_list->connect("item_clicked", callable_mp(this, &ShaderEditorPlugin::_shader_list_clicked));
 
 	main_split->add_child(vb);
 	vb->set_custom_minimum_size(Size2(200, 300) * EDSCALE);
diff --git a/editor/plugins/shader_editor_plugin.h b/editor/plugins/shader_editor_plugin.h
index 907de6ea87..0980cc4db2 100644
--- a/editor/plugins/shader_editor_plugin.h
+++ b/editor/plugins/shader_editor_plugin.h
@@ -48,6 +48,21 @@ class VisualShaderEditor;
 class HSplitContainer;
 class ShaderCreateDialog;
 
+class GDShaderSyntaxHighlighter : public CodeHighlighter {
+	GDCLASS(GDShaderSyntaxHighlighter, CodeHighlighter)
+
+private:
+	Vector<Point2i> disabled_branch_regions;
+	Color disabled_branch_color;
+
+public:
+	virtual Dictionary _get_line_syntax_highlighting_impl(int p_line) override;
+
+	void add_disabled_branch_region(const Point2i &p_region);
+	void clear_disabled_branch_regions();
+	void set_disabled_branch_color(const Color &p_color);
+};
+
 class ShaderTextEditor : public CodeTextEditor {
 	GDCLASS(ShaderTextEditor, CodeTextEditor);
 
@@ -57,7 +72,7 @@ class ShaderTextEditor : public CodeTextEditor {
 		_ALWAYS_INLINE_ bool operator()(const ShaderWarning &p_a, const ShaderWarning &p_b) const { return (p_a.get_line() < p_b.get_line()); }
 	};
 
-	Ref<CodeHighlighter> syntax_highlighter;
+	Ref<GDShaderSyntaxHighlighter> syntax_highlighter;
 	RichTextLabel *warnings_panel = nullptr;
 	Ref<Shader> shader;
 	Ref<ShaderInclude> shader_inc;
@@ -185,6 +200,7 @@ public:
 	void goto_line_selection(int p_line, int p_begin, int p_end);
 	void save_external_data(const String &p_str = "");
 	void validate_script();
+	bool is_unsaved() const;
 
 	virtual Size2 get_minimum_size() const override { return Size2(0, 200); }
 
@@ -226,6 +242,7 @@ class ShaderEditorPlugin : public EditorPlugin {
 
 	void _update_shader_list();
 	void _shader_selected(int p_index);
+	void _shader_list_clicked(int p_item, Vector2 p_local_mouse_pos, MouseButton p_mouse_button_index);
 	void _menu_item_pressed(int p_index);
 	void _resource_saved(Object *obj);
 	void _close_shader(int p_index);
@@ -235,8 +252,6 @@ class ShaderEditorPlugin : public EditorPlugin {
 	void _update_shader_list_status();
 
 public:
-	virtual String get_name() const override { return "Shader"; }
-	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/editor/plugins/skeleton_3d_editor_plugin.cpp b/editor/plugins/skeleton_3d_editor_plugin.cpp
index ed0d14efb7..c453ed26aa 100644
--- a/editor/plugins/skeleton_3d_editor_plugin.cpp
+++ b/editor/plugins/skeleton_3d_editor_plugin.cpp
@@ -921,8 +921,8 @@ void fragment() {
 )");
 	handle_material->set_shader(handle_shader);
 	Ref<Texture2D> handle = EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("EditorBoneHandle"), SNAME("EditorIcons"));
-	handle_material->set_shader_param("point_size", handle->get_width());
-	handle_material->set_shader_param("texture_albedo", handle);
+	handle_material->set_shader_uniform("point_size", handle->get_width());
+	handle_material->set_shader_uniform("texture_albedo", handle);
 
 	handles_mesh_instance = memnew(MeshInstance3D);
 	handles_mesh_instance->set_cast_shadows_setting(GeometryInstance3D::SHADOW_CASTING_SETTING_OFF);
diff --git a/editor/plugins/sprite_2d_editor_plugin.cpp b/editor/plugins/sprite_2d_editor_plugin.cpp
index 3323d865c2..7d350fd46f 100644
--- a/editor/plugins/sprite_2d_editor_plugin.cpp
+++ b/editor/plugins/sprite_2d_editor_plugin.cpp
@@ -160,6 +160,11 @@ void Sprite2DEditor::_menu_option(int p_option) {
 }
 
 void Sprite2DEditor::_update_mesh_data() {
+	if (node->get_owner() != get_tree()->get_edited_scene_root()) {
+		err_dialog->set_text(TTR("Can't convert a Sprite2D from a foreign scene."));
+		err_dialog->popup_centered();
+	}
+
 	Ref<Texture2D> texture = node->get_texture();
 	if (texture.is_null()) {
 		err_dialog->set_text(TTR("Sprite2D is empty!"));
diff --git a/editor/plugins/texture_3d_editor_plugin.cpp b/editor/plugins/texture_3d_editor_plugin.cpp
index 0fc7079a24..64cafa17f3 100644
--- a/editor/plugins/texture_3d_editor_plugin.cpp
+++ b/editor/plugins/texture_3d_editor_plugin.cpp
@@ -57,8 +57,8 @@ void Texture3DEditor::_texture_changed() {
 }
 
 void Texture3DEditor::_update_material() {
-	material->set_shader_param("layer", (layer->get_value() + 0.5) / texture->get_depth());
-	material->set_shader_param("tex", texture->get_rid());
+	material->set_shader_uniform("layer", (layer->get_value() + 0.5) / texture->get_depth());
+	material->set_shader_uniform("tex", texture->get_rid());
 
 	String format = Image::get_format_name(texture->get_format());
 
diff --git a/editor/plugins/texture_editor_plugin.cpp b/editor/plugins/texture_editor_plugin.cpp
index f6b02d5f80..be382759f5 100644
--- a/editor/plugins/texture_editor_plugin.cpp
+++ b/editor/plugins/texture_editor_plugin.cpp
@@ -137,7 +137,7 @@ TexturePreview::TexturePreview(Ref<Texture2D> p_texture, bool p_show_metadata) {
 
 		// It's okay that these colors are static since the grid color is static too.
 		metadata_label->add_theme_color_override("font_color", Color::named("white"));
-		metadata_label->add_theme_color_override("font_color_shadow", Color::named("black"));
+		metadata_label->add_theme_color_override("font_shadow_color", Color::named("black"));
 
 		metadata_label->add_theme_font_size_override("font_size", 14 * EDSCALE);
 		metadata_label->add_theme_color_override("font_outline_color", Color::named("black"));
diff --git a/editor/plugins/texture_layered_editor_plugin.cpp b/editor/plugins/texture_layered_editor_plugin.cpp
index cb146fd342..2c6f70463d 100644
--- a/editor/plugins/texture_layered_editor_plugin.cpp
+++ b/editor/plugins/texture_layered_editor_plugin.cpp
@@ -68,9 +68,9 @@ void TextureLayeredEditor::_texture_changed() {
 }
 
 void TextureLayeredEditor::_update_material() {
-	materials[0]->set_shader_param("layer", layer->get_value());
-	materials[2]->set_shader_param("layer", layer->get_value());
-	materials[texture->get_layered_type()]->set_shader_param("tex", texture->get_rid());
+	materials[0]->set_shader_uniform("layer", layer->get_value());
+	materials[2]->set_shader_uniform("layer", layer->get_value());
+	materials[texture->get_layered_type()]->set_shader_uniform("tex", texture->get_rid());
 
 	Vector3 v(1, 1, 1);
 	v.normalize();
@@ -79,10 +79,10 @@ void TextureLayeredEditor::_update_material() {
 	b.rotate(Vector3(1, 0, 0), x_rot);
 	b.rotate(Vector3(0, 1, 0), y_rot);
 
-	materials[1]->set_shader_param("normal", v);
-	materials[1]->set_shader_param("rot", b);
-	materials[2]->set_shader_param("normal", v);
-	materials[2]->set_shader_param("rot", b);
+	materials[1]->set_shader_uniform("normal", v);
+	materials[1]->set_shader_uniform("rot", b);
+	materials[2]->set_shader_uniform("normal", v);
+	materials[2]->set_shader_uniform("rot", b);
 
 	String format = Image::get_format_name(texture->get_format());
 
diff --git a/editor/plugins/theme_editor_plugin.cpp b/editor/plugins/theme_editor_plugin.cpp
index 2a61ea0baa..bbc22c8622 100644
--- a/editor/plugins/theme_editor_plugin.cpp
+++ b/editor/plugins/theme_editor_plugin.cpp
@@ -3381,6 +3381,7 @@ ThemeTypeEditor::ThemeTypeEditor() {
 
 	theme_type_list = memnew(OptionButton);
 	theme_type_list->set_h_size_flags(SIZE_EXPAND_FILL);
+	theme_type_list->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS);
 	type_list_hb->add_child(theme_type_list);
 	theme_type_list->connect("item_selected", callable_mp(this, &ThemeTypeEditor::_list_type_selected));
 
diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp
index ad82f2e9b2..cf24095582 100644
--- a/editor/plugins/visual_shader_editor_plugin.cpp
+++ b/editor/plugins/visual_shader_editor_plugin.cpp
@@ -5577,8 +5577,12 @@ VisualShaderEditor::VisualShaderEditor() {
 	add_options.push_back(AddOption("Reciprocal", "Vector", "Functions", "VisualShaderNodeVectorFunc", TTR("1.0 / vector"), { VisualShaderNodeVectorFunc::FUNC_RECIPROCAL, VisualShaderNodeVectorFunc::OP_TYPE_VECTOR_2D }, VisualShaderNode::PORT_TYPE_VECTOR_2D));
 	add_options.push_back(AddOption("Reciprocal", "Vector", "Functions", "VisualShaderNodeVectorFunc", TTR("1.0 / vector"), { VisualShaderNodeVectorFunc::FUNC_RECIPROCAL, VisualShaderNodeVectorFunc::OP_TYPE_VECTOR_3D }, VisualShaderNode::PORT_TYPE_VECTOR_3D));
 	add_options.push_back(AddOption("Reciprocal", "Vector", "Functions", "VisualShaderNodeVectorFunc", TTR("1.0 / vector"), { VisualShaderNodeVectorFunc::FUNC_RECIPROCAL, VisualShaderNodeVectorFunc::OP_TYPE_VECTOR_4D }, VisualShaderNode::PORT_TYPE_VECTOR_4D));
+	add_options.push_back(AddOption("Reflect", "Vector", "Functions", "VisualShaderNodeVectorOp", TTR("Returns the vector that points in the direction of reflection ( a : incident vector, b : normal vector )."), { VisualShaderNodeVectorOp::OP_REFLECT, VisualShaderNodeVectorFunc::OP_TYPE_VECTOR_2D }, VisualShaderNode::PORT_TYPE_VECTOR_2D));
 	add_options.push_back(AddOption("Reflect", "Vector", "Functions", "VisualShaderNodeVectorOp", TTR("Returns the vector that points in the direction of reflection ( a : incident vector, b : normal vector )."), { VisualShaderNodeVectorOp::OP_REFLECT, VisualShaderNodeVectorFunc::OP_TYPE_VECTOR_3D }, VisualShaderNode::PORT_TYPE_VECTOR_3D));
+	add_options.push_back(AddOption("Reflect", "Vector", "Functions", "VisualShaderNodeVectorOp", TTR("Returns the vector that points in the direction of reflection ( a : incident vector, b : normal vector )."), { VisualShaderNodeVectorOp::OP_REFLECT, VisualShaderNodeVectorFunc::OP_TYPE_VECTOR_4D }, VisualShaderNode::PORT_TYPE_VECTOR_4D));
+	add_options.push_back(AddOption("Refract", "Vector", "Functions", "VisualShaderNodeVectorRefract", TTR("Returns the vector that points in the direction of refraction."), {}, VisualShaderNode::PORT_TYPE_VECTOR_2D));
 	add_options.push_back(AddOption("Refract", "Vector", "Functions", "VisualShaderNodeVectorRefract", TTR("Returns the vector that points in the direction of refraction."), {}, VisualShaderNode::PORT_TYPE_VECTOR_3D));
+	add_options.push_back(AddOption("Refract", "Vector", "Functions", "VisualShaderNodeVectorRefract", TTR("Returns the vector that points in the direction of refraction."), {}, VisualShaderNode::PORT_TYPE_VECTOR_4D));
 	add_options.push_back(AddOption("Round", "Vector", "Functions", "VisualShaderNodeVectorFunc", TTR("Finds the nearest integer to the parameter."), { VisualShaderNodeVectorFunc::FUNC_ROUND, VisualShaderNodeVectorFunc::OP_TYPE_VECTOR_2D }, VisualShaderNode::PORT_TYPE_VECTOR_2D));
 	add_options.push_back(AddOption("Round", "Vector", "Functions", "VisualShaderNodeVectorFunc", TTR("Finds the nearest integer to the parameter."), { VisualShaderNodeVectorFunc::FUNC_ROUND, VisualShaderNodeVectorFunc::OP_TYPE_VECTOR_3D }, VisualShaderNode::PORT_TYPE_VECTOR_3D));
 	add_options.push_back(AddOption("Round", "Vector", "Functions", "VisualShaderNodeVectorFunc", TTR("Finds the nearest integer to the parameter."), { VisualShaderNodeVectorFunc::FUNC_ROUND, VisualShaderNodeVectorFunc::OP_TYPE_VECTOR_4D }, VisualShaderNode::PORT_TYPE_VECTOR_4D));
@@ -6059,7 +6063,7 @@ Control *VisualShaderNodePluginDefault::create_editor(const Ref<Resource> &p_par
 	return editor;
 }
 
-void EditorPropertyShaderMode::_option_selected(int p_which) {
+void EditorPropertyVisualShaderMode::_option_selected(int p_which) {
 	Ref<VisualShader> visual_shader(Object::cast_to<VisualShader>(get_edited_object()));
 	if (visual_shader->get_mode() == p_which) {
 		return;
@@ -6145,39 +6149,39 @@ void EditorPropertyShaderMode::_option_selected(int p_which) {
 	undo_redo->commit_action();
 }
 
-void EditorPropertyShaderMode::update_property() {
+void EditorPropertyVisualShaderMode::update_property() {
 	int which = get_edited_object()->get(get_edited_property());
 	options->select(which);
 }
 
-void EditorPropertyShaderMode::setup(const Vector<String> &p_options) {
+void EditorPropertyVisualShaderMode::setup(const Vector<String> &p_options) {
 	for (int i = 0; i < p_options.size(); i++) {
 		options->add_item(p_options[i], i);
 	}
 }
 
-void EditorPropertyShaderMode::set_option_button_clip(bool p_enable) {
+void EditorPropertyVisualShaderMode::set_option_button_clip(bool p_enable) {
 	options->set_clip_text(p_enable);
 }
 
-void EditorPropertyShaderMode::_bind_methods() {
+void EditorPropertyVisualShaderMode::_bind_methods() {
 }
 
-EditorPropertyShaderMode::EditorPropertyShaderMode() {
+EditorPropertyVisualShaderMode::EditorPropertyVisualShaderMode() {
 	options = memnew(OptionButton);
 	options->set_clip_text(true);
 	add_child(options);
 	add_focusable(options);
-	options->connect("item_selected", callable_mp(this, &EditorPropertyShaderMode::_option_selected));
+	options->connect("item_selected", callable_mp(this, &EditorPropertyVisualShaderMode::_option_selected));
 }
 
-bool EditorInspectorShaderModePlugin::can_handle(Object *p_object) {
+bool EditorInspectorVisualShaderModePlugin::can_handle(Object *p_object) {
 	return true; // Can handle everything.
 }
 
-bool EditorInspectorShaderModePlugin::parse_property(Object *p_object, const Variant::Type p_type, const String &p_path, const PropertyHint p_hint, const String &p_hint_text, const uint32_t p_usage, const bool p_wide) {
+bool EditorInspectorVisualShaderModePlugin::parse_property(Object *p_object, const Variant::Type p_type, const String &p_path, const PropertyHint p_hint, const String &p_hint_text, const uint32_t p_usage, const bool p_wide) {
 	if (p_path == "mode" && p_object->is_class("VisualShader") && p_type == Variant::INT) {
-		EditorPropertyShaderMode *mode_editor = memnew(EditorPropertyShaderMode);
+		EditorPropertyVisualShaderMode *mode_editor = memnew(EditorPropertyVisualShaderMode);
 		Vector<String> options = p_hint_text.split(",");
 		mode_editor->setup(options);
 		add_property_editor(p_path, mode_editor);
@@ -6228,7 +6232,7 @@ void VisualShaderNodePortPreview::_shader_changed() {
 		}
 		if (src_mat && src_mat->get_shader().is_valid()) {
 			List<PropertyInfo> params;
-			src_mat->get_shader()->get_param_list(&params);
+			src_mat->get_shader()->get_shader_uniform_list(&params);
 			for (const PropertyInfo &E : params) {
 				material->set(E.name, src_mat->get(E.name));
 			}
diff --git a/editor/plugins/visual_shader_editor_plugin.h b/editor/plugins/visual_shader_editor_plugin.h
index b846c34f9e..b6a3b43754 100644
--- a/editor/plugins/visual_shader_editor_plugin.h
+++ b/editor/plugins/visual_shader_editor_plugin.h
@@ -529,8 +529,8 @@ public:
 	virtual Control *create_editor(const Ref<Resource> &p_parent_resource, const Ref<VisualShaderNode> &p_node) override;
 };
 
-class EditorPropertyShaderMode : public EditorProperty {
-	GDCLASS(EditorPropertyShaderMode, EditorProperty);
+class EditorPropertyVisualShaderMode : public EditorProperty {
+	GDCLASS(EditorPropertyVisualShaderMode, EditorProperty);
 	OptionButton *options = nullptr;
 
 	void _option_selected(int p_which);
@@ -542,11 +542,11 @@ public:
 	void setup(const Vector<String> &p_options);
 	virtual void update_property() override;
 	void set_option_button_clip(bool p_enable);
-	EditorPropertyShaderMode();
+	EditorPropertyVisualShaderMode();
 };
 
-class EditorInspectorShaderModePlugin : public EditorInspectorPlugin {
-	GDCLASS(EditorInspectorShaderModePlugin, EditorInspectorPlugin);
+class EditorInspectorVisualShaderModePlugin : public EditorInspectorPlugin {
+	GDCLASS(EditorInspectorVisualShaderModePlugin, EditorInspectorPlugin);
 
 public:
 	virtual bool can_handle(Object *p_object) override;
diff --git a/editor/project_converter_3_to_4.cpp b/editor/project_converter_3_to_4.cpp
index b564195911..924b735012 100644
--- a/editor/project_converter_3_to_4.cpp
+++ b/editor/project_converter_3_to_4.cpp
@@ -42,7 +42,8 @@ const int ERROR_CODE = 77;
 #include "core/templates/hash_map.h"
 #include "core/templates/list.h"
 
-const int CONVERSION_MAX_FILE_SIZE = 1024 * 1024 * 4; // 4 MB
+const uint64_t CONVERSION_MAX_FILE_SIZE_MB = 4;
+const uint64_t CONVERSION_MAX_FILE_SIZE = 1024 * 1024 * CONVERSION_MAX_FILE_SIZE_MB;
 
 static const char *enum_renames[][2] = {
 	//// constants
@@ -255,6 +256,7 @@ static const char *gdscript_function_renames[][2] = {
 	{ "damped_spring_joint_create", "joint_make_damped_spring" }, // PhysicsServer2D
 	{ "damped_string_joint_get_param", "damped_spring_joint_get_param" }, // PhysicsServer2D
 	{ "damped_string_joint_set_param", "damped_spring_joint_set_param" }, // PhysicsServer2D
+	{ "dectime", "move_toward" }, // GDScript, Math functions
 	{ "delete_char_at_cursor", "delete_char_at_caret" }, // LineEdit
 	{ "deselect_items", "deselect_all" }, // FileDialog
 	{ "disable_plugin", "_disable_plugin" }, // EditorPlugin
@@ -356,6 +358,7 @@ static const char *gdscript_function_renames[][2] = {
 	{ "get_scancode_with_modifiers", "get_keycode_with_modifiers" }, // InputEventKey
 	{ "get_shift", "is_shift_pressed" }, // InputEventWithModifiers
 	{ "get_size_override", "get_size_2d_override" }, // SubViewport
+	{ "get_slide_count", "get_slide_collision_count" }, // CharacterBody2D, CharacterBody3D
 	{ "get_slips_on_slope", "get_slide_on_slope" }, // SeparationRayShape2D, SeparationRayShape3D
 	{ "get_space_override_mode", "get_gravity_space_override_mode" }, // Area2D
 	{ "get_speed", "get_velocity" }, // InputEventMouseMotion
@@ -427,6 +430,7 @@ static const char *gdscript_function_renames[][2] = {
 	{ "joint_create_slider", "joint_make_slider" }, // PhysicsServer3D
 	{ "line_intersects_line_2d", "line_intersects_line" }, // Geometry2D
 	{ "load_from_globals", "load_from_project_settings" }, // InputMap
+	{ "load_interactive", "load_threaded_request" }, // ResourceLoader - load_threaded_request is alternative, but is used differently
 	{ "make_convex_from_brothers", "make_convex_from_siblings" }, // CollisionShape3D
 	{ "make_visible", "_make_visible" }, // EditorPlugin
 	{ "merge_polygons_2d", "merge_polygons" }, // Geometry2D
@@ -484,6 +488,7 @@ static const char *gdscript_function_renames[][2] = {
 	{ "set_enabled_focus_mode", "set_focus_mode" }, // BaseButton
 	{ "set_endian_swap", "set_big_endian" }, // File
 	{ "set_expand_to_text_length", "set_expand_to_text_length_enabled" }, // LineEdit
+	{ "set_filename", "set_scene_file_path" }, // Node, WARNING, this may be used in a lot of other places
 	{ "set_focus_neighbour", "set_focus_neighbor" }, // Control
 	{ "set_frame_color", "set_color" }, // ColorRect
 	{ "set_global_rate_scale", "set_playback_speed_scale" }, // AudioServer
@@ -511,6 +516,7 @@ static const char *gdscript_function_renames[][2] = {
 	{ "set_region_filter_clip", "set_region_filter_clip_enabled" }, // Sprite2D
 	{ "set_rotate", "set_rotates" }, // PathFollow2D
 	{ "set_scancode", "set_keycode" }, // InputEventKey
+	{ "set_shader_param", "set_shader_uniform" }, // ShaderMaterial
 	{ "set_shift", "set_shift_pressed" }, // InputEventWithModifiers
 	{ "set_size_override", "set_size_2d_override" }, // SubViewport broke ImageTexture
 	{ "set_size_override_stretch", "set_size_2d_override_stretch" }, // SubViewport
@@ -975,6 +981,7 @@ static const char *gdscript_properties_renames[][2] = {
 	//	{ "wrap_enabled", "wrap_mode" }, // TextEdit
 	//	{ "zfar", "far" }, // Camera3D
 	//	{ "znear", "near" }, // Camera3D
+	//	{ "filename", "scene_file_path" }, // Node
 	{ "as_normalmap", "as_normal_map" }, // NoiseTexture
 	{ "bbcode_text", "text" }, // RichTextLabel
 	{ "caret_moving_by_right_click", "caret_move_on_right_click" }, // TextEdit
@@ -1374,7 +1381,6 @@ static const char *class_renames[][2] = {
 	{ "Spatial", "Node3D" },
 	{ "SpatialGizmo", "Node3DGizmo" },
 	{ "SpatialMaterial", "StandardMaterial3D" },
-	{ "SpatialVelocityTracker", "VelocityTracker3D" },
 	{ "SphereShape", "SphereShape3D" },
 	{ "SpotLight", "SpotLight3D" },
 	{ "SpringArm", "SpringArm3D" },
@@ -1595,12 +1601,34 @@ static const char *colors_renames[][2] = {
 	{ nullptr, nullptr },
 };
 
+class ProjectConverter3To4::RegExContainer {
+public:
+	RegEx reg_is_empty = RegEx("\\bempty\\(");
+	RegEx reg_super = RegEx("([\t ])\\.([a-zA-Z_])");
+	RegEx reg_json_to = RegEx("\\bto_json\\b");
+	RegEx reg_json_parse = RegEx("([\t]{0,})([^\n]+)parse_json\\(([^\n]+)");
+	RegEx reg_json_non_new = RegEx("([\t]{0,})([^\n]+)JSON\\.parse\\(([^\n]+)");
+	RegEx reg_export = RegEx("export\\(([a-zA-Z0-9_]+)\\)[ ]+var[ ]+([a-zA-Z0-9_]+)");
+	RegEx reg_export_advanced = RegEx("export\\(([^)^\n]+)\\)[ ]+var[ ]+([a-zA-Z0-9_]+)([^\n]+)");
+	RegEx reg_setget_setget = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+([a-zA-Z0-9_]+)[ \t]*,[ \t]*([a-zA-Z0-9_]+)");
+	RegEx reg_setget_set = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+([a-zA-Z0-9_]+)[ \t]*[,]*[^a-z^A-Z^0-9^_]*$");
+	RegEx reg_setget_get = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+,[ \t]*([a-zA-Z0-9_]+)[ \t]*$");
+	RegEx reg_join = RegEx("([\\(\\)a-zA-Z0-9_]+)\\.join\\(([^\n^\\)]+)\\)");
+	RegEx reg_mixed_tab_space = RegEx("([\t]+)([ ]+)");
+	RegEx reg_image_lock = RegEx("([a-zA-Z0-9_\\.]+)\\.lock\\(\\)");
+	RegEx reg_image_unlock = RegEx("([a-zA-Z0-9_\\.]+)\\.unlock\\(\\)");
+	RegEx reg_os_fullscreen = RegEx("OS.window_fullscreen[= ]+([^#^\n]+)");
+	RegEx reg_instantiate = RegEx("\\.instance\\(([^\\)]*)\\)");
+};
+
 // Function responsible for converting project
 int ProjectConverter3To4::convert() {
 	print_line("Starting conversion.");
 
+	RegExContainer reg_container = RegExContainer();
+
 	ERR_FAIL_COND_V_MSG(!test_array_names(), ERROR_CODE, "Cannot start converting due to problems with data in arrays.");
-	ERR_FAIL_COND_V_MSG(!test_conversion(), ERROR_CODE, "Cannot start converting due to problems with converting arrays.");
+	ERR_FAIL_COND_V_MSG(!test_conversion(reg_container), ERROR_CODE, "Cannot start converting due to problems with converting arrays.");
 
 	// Checking if folder contains valid Godot 3 project.
 	// Project cannot be converted 2 times
@@ -1640,7 +1668,7 @@ int ProjectConverter3To4::convert() {
 		uint64_t start_time = Time::get_singleton()->get_ticks_msec();
 
 		if (file_name.ends_with(".shader")) {
-			DirAccess::remove_file_or_error(file_name);
+			DirAccess::remove_file_or_error(file_name.trim_prefix("res://"));
 			file_name = file_name.replace(".shader", ".gdshader");
 		}
 
@@ -1653,7 +1681,7 @@ int ProjectConverter3To4::convert() {
 				rename_enums(file_content); // Require to additional rename
 
 				rename_common(gdscript_function_renames, file_content);
-				rename_gdscript_functions(file_content); // Require to additional rename
+				rename_gdscript_functions(file_content, reg_container, false); // Require to additional rename
 
 				rename_common(project_settings_renames, file_content);
 				rename_gdscript_keywords(file_content);
@@ -1663,7 +1691,6 @@ int ProjectConverter3To4::convert() {
 				rename_common(builtin_types_renames, file_content);
 
 				custom_rename(file_content, "\\.shader", ".gdshader");
-				custom_rename(file_content, "instance", "instantiate");
 			} else if (file_name.ends_with(".tscn")) {
 				rename_classes(file_content); // Using only specialized function
 
@@ -1671,7 +1698,7 @@ int ProjectConverter3To4::convert() {
 				rename_enums(file_content); // Require to additional rename
 
 				rename_common(gdscript_function_renames, file_content);
-				rename_gdscript_functions(file_content); // Require to additional rename
+				rename_gdscript_functions(file_content, reg_container, true); // Require to additional rename
 
 				rename_common(project_settings_renames, file_content);
 				rename_gdscript_keywords(file_content);
@@ -1688,6 +1715,7 @@ int ProjectConverter3To4::convert() {
 				rename_common(csharp_properties_renames, file_content);
 				rename_common(csharp_signals_renames, file_content);
 				rename_csharp_functions(file_content);
+				rename_csharp_attributes(file_content);
 				custom_rename(file_content, "public class ", "public partial class ");
 			} else if (file_name.ends_with(".gdshader") || file_name.ends_with(".shader")) {
 				rename_common(shaders_renames, file_content);
@@ -1708,7 +1736,7 @@ int ProjectConverter3To4::convert() {
 				continue;
 			}
 		} else {
-			reason.append("    ERROR: File has exceeded the maximum size allowed - 500 KB");
+			reason.append("    ERROR: File has exceeded the maximum size allowed - " + itos(CONVERSION_MAX_FILE_SIZE_MB) + " MB");
 			is_ignored = true;
 		}
 
@@ -1718,7 +1746,7 @@ int ProjectConverter3To4::convert() {
 			uint64_t hash_after = file_content.hash64();
 			// Don't need to save file without any changes
 			// Save if this is a shader, because it was renamed
-			if (hash_before != hash_after || file_name.find(".gdshader") != -1) {
+			if (hash_before != hash_after || file_name.ends_with(".gdshader")) {
 				converted_files++;
 
 				Ref<FileAccess> file = FileAccess::open(file_name, FileAccess::WRITE);
@@ -1742,8 +1770,10 @@ int ProjectConverter3To4::convert() {
 int ProjectConverter3To4::validate_conversion() {
 	print_line("Starting checking if project conversion can be done.");
 
+	RegExContainer reg_container = RegExContainer();
+
 	ERR_FAIL_COND_V_MSG(!test_array_names(), ERROR_CODE, "Cannot start converting due to problems with data in arrays.");
-	ERR_FAIL_COND_V_MSG(!test_conversion(), ERROR_CODE, "Cannot start converting due to problems with converting arrays.");
+	ERR_FAIL_COND_V_MSG(!test_conversion(reg_container), ERROR_CODE, "Cannot start converting due to problems with converting arrays.");
 
 	// Checking if folder contains valid Godot 3 project.
 	// Project cannot be converted 2 times
@@ -1784,7 +1814,7 @@ int ProjectConverter3To4::validate_conversion() {
 		bool is_ignored = false;
 		uint64_t start_time = Time::get_singleton()->get_ticks_msec();
 
-		if (file_name.ends_with(".sader")) {
+		if (file_name.ends_with(".shader")) {
 			reason.append("\tFile extension will be renamed from `shader` to `gdshader`.");
 		}
 
@@ -1796,7 +1826,7 @@ int ProjectConverter3To4::validate_conversion() {
 				changed_elements.append_array(check_for_rename_enums(file_content));
 
 				changed_elements.append_array(check_for_rename_common(gdscript_function_renames, file_content));
-				changed_elements.append_array(check_for_rename_gdscript_functions(file_content));
+				changed_elements.append_array(check_for_rename_gdscript_functions(file_content, reg_container, false));
 
 				changed_elements.append_array(check_for_rename_common(project_settings_renames, file_content));
 				changed_elements.append_array(check_for_rename_gdscript_keywords(file_content));
@@ -1805,7 +1835,6 @@ int ProjectConverter3To4::validate_conversion() {
 				changed_elements.append_array(check_for_rename_common(shaders_renames, file_content));
 				changed_elements.append_array(check_for_rename_common(builtin_types_renames, file_content));
 
-				changed_elements.append_array(check_for_custom_rename(file_content, "instance", "instantiate"));
 				changed_elements.append_array(check_for_custom_rename(file_content, "\\.shader", ".gdshader"));
 			} else if (file_name.ends_with(".tscn")) {
 				changed_elements.append_array(check_for_rename_classes(file_content));
@@ -1814,7 +1843,7 @@ int ProjectConverter3To4::validate_conversion() {
 				changed_elements.append_array(check_for_rename_enums(file_content));
 
 				changed_elements.append_array(check_for_rename_common(gdscript_function_renames, file_content));
-				changed_elements.append_array(check_for_rename_gdscript_functions(file_content));
+				changed_elements.append_array(check_for_rename_gdscript_functions(file_content, reg_container, true));
 
 				changed_elements.append_array(check_for_rename_common(project_settings_renames, file_content));
 				changed_elements.append_array(check_for_rename_gdscript_keywords(file_content));
@@ -1831,6 +1860,7 @@ int ProjectConverter3To4::validate_conversion() {
 				changed_elements.append_array(check_for_rename_common(csharp_properties_renames, file_content));
 				changed_elements.append_array(check_for_rename_common(csharp_signals_renames, file_content));
 				changed_elements.append_array(check_for_rename_csharp_functions(file_content));
+				changed_elements.append_array(check_for_rename_csharp_attributes(file_content));
 				changed_elements.append_array(check_for_custom_rename(file_content, "public class ", "public partial class "));
 			} else if (file_name.ends_with(".gdshader") || file_name.ends_with(".shader")) {
 				changed_elements.append_array(check_for_rename_common(shaders_renames, file_content));
@@ -1851,7 +1881,7 @@ int ProjectConverter3To4::validate_conversion() {
 				continue;
 			}
 		} else {
-			reason.append("\tERROR: File has exceeded the maximum size allowed - 500 KB");
+			reason.append("\tERROR: File has exceeded the maximum size allowed  - " + itos(CONVERSION_MAX_FILE_SIZE_MB) + " MB");
 			is_ignored = true;
 		}
 
@@ -1928,6 +1958,17 @@ bool ProjectConverter3To4::test_conversion_single_additional(String name, String
 	return true;
 }
 
+bool ProjectConverter3To4::test_conversion_single_additional_builtin(String name, String expected, void (ProjectConverter3To4::*func)(String &, const RegExContainer &, bool), String what, const RegExContainer &reg_container, bool builtin_script) {
+	String got = name;
+	(this->*func)(got, reg_container, builtin_script);
+	if (expected != got) {
+		ERR_PRINT("Failed to convert " + what + " `" + name + "` to `" + expected + "`, got instead `" + got + "`");
+		return false;
+	}
+
+	return true;
+}
+
 bool ProjectConverter3To4::test_conversion_single_normal(String name, String expected, const char *array[][2], String what) {
 	String got = name;
 	rename_common(array, got);
@@ -1939,7 +1980,7 @@ bool ProjectConverter3To4::test_conversion_single_normal(String name, String exp
 }
 
 // Validate if conversions are proper
-bool ProjectConverter3To4::test_conversion() {
+bool ProjectConverter3To4::test_conversion(const RegExContainer &reg_container) {
 	bool valid = true;
 
 	valid = valid & test_conversion_single_normal("Spatial", "Node3D", class_renames, "class");
@@ -1970,26 +2011,37 @@ bool ProjectConverter3To4::test_conversion() {
 	valid = valid & test_conversion_single_additional("(Disconnect(A,B,C) != OK):", "(Disconnect(A,new Callable(B,C)) != OK):", &ProjectConverter3To4::rename_csharp_functions, "custom rename csharp");
 	valid = valid & test_conversion_single_additional("(IsConnected(A,B,C) != OK):", "(IsConnected(A,new Callable(B,C)) != OK):", &ProjectConverter3To4::rename_csharp_functions, "custom rename");
 
-	valid = valid & test_conversion_single_additional("OS.window_fullscreen = Settings.fullscreen", "ProjectSettings.set(\"display/window/size/fullscreen\", Settings.fullscreen)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
+	valid = valid & test_conversion_single_additional("[Remote]", "[RPC(MultiplayerAPI.RPCMode.AnyPeer)]", &ProjectConverter3To4::rename_csharp_attributes, "custom rename csharp");
+	valid = valid & test_conversion_single_additional("[RemoteSync]", "[RPC(MultiplayerAPI.RPCMode.AnyPeer, CallLocal = true)]", &ProjectConverter3To4::rename_csharp_attributes, "custom rename csharp");
+	valid = valid & test_conversion_single_additional("[Sync]", "[RPC(MultiplayerAPI.RPCMode.AnyPeer, CallLocal = true)]", &ProjectConverter3To4::rename_csharp_attributes, "custom rename csharp");
+	valid = valid & test_conversion_single_additional("[Slave]", "[RPC]", &ProjectConverter3To4::rename_csharp_attributes, "custom rename csharp");
+	valid = valid & test_conversion_single_additional("[Puppet]", "[RPC]", &ProjectConverter3To4::rename_csharp_attributes, "custom rename csharp");
+	valid = valid & test_conversion_single_additional("[PuppetSync]", "[RPC(CallLocal = true)]", &ProjectConverter3To4::rename_csharp_attributes, "custom rename csharp");
+	valid = valid & test_conversion_single_additional("[Master]", "The master and mastersync rpc behavior is not officially supported anymore. Try using another keyword or making custom logic using Multiplayer.GetRemoteSenderId()\n[RPC]", &ProjectConverter3To4::rename_csharp_attributes, "custom rename csharp");
+	valid = valid & test_conversion_single_additional("[MasterSync]", "The master and mastersync rpc behavior is not officially supported anymore. Try using another keyword or making custom logic using Multiplayer.GetRemoteSenderId()\n[RPC(CallLocal = true)]", &ProjectConverter3To4::rename_csharp_attributes, "custom rename csharp");
+
+	valid = valid & test_conversion_single_additional_builtin("OS.window_fullscreen = Settings.fullscreen", "ProjectSettings.set(\"display/window/size/fullscreen\", Settings.fullscreen)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("OS.window_fullscreen = Settings.fullscreen", "ProjectSettings.set(\\\"display/window/size/fullscreen\\\", Settings.fullscreen)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, true);
+	valid = valid & test_conversion_single_additional_builtin("OS.get_window_safe_area()", "DisplayServer.get_display_safe_area()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
 
-	valid = valid & test_conversion_single_additional("\tvar aa = roman(r.move_and_slide( a, b, c, d, e, f )) # Roman", "\tr.set_motion_velocity(a)\n\tr.set_up_direction(b)\n\tr.set_floor_stop_on_slope_enabled(c)\n\tr.set_max_slides(d)\n\tr.set_floor_max_angle(e)\n\t# TODOConverter40 infinite_inertia were removed in Godot 4.0 - previous value `f`\n\tvar aa = roman(r.move_and_slide()) # Roman", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("\tvar aa = roman(r.move_and_slide_with_snap( a, g, b, c, d, e, f )) # Roman", "\tr.set_motion_velocity(a)\n\t# TODOConverter40 looks that snap in Godot 4.0 is float, not vector like in Godot 3 - previous value `g`\n\tr.set_up_direction(b)\n\tr.set_floor_stop_on_slope_enabled(c)\n\tr.set_max_slides(d)\n\tr.set_floor_max_angle(e)\n\t# TODOConverter40 infinite_inertia were removed in Godot 4.0 - previous value `f`\n\tvar aa = roman(r.move_and_slide()) # Roman", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
+	valid = valid & test_conversion_single_additional_builtin("\tvar aa = roman(r.move_and_slide( a, b, c, d, e, f )) # Roman", "\tr.set_velocity(a)\n\tr.set_up_direction(b)\n\tr.set_floor_stop_on_slope_enabled(c)\n\tr.set_max_slides(d)\n\tr.set_floor_max_angle(e)\n\t# TODOConverter40 infinite_inertia were removed in Godot 4.0 - previous value `f`\n\tr.move_and_slide()\n\tvar aa = roman(r.velocity) # Roman", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("\tvar aa = roman(r.move_and_slide_with_snap( a, g, b, c, d, e, f )) # Roman", "\tr.set_velocity(a)\n\t# TODOConverter40 looks that snap in Godot 4.0 is float, not vector like in Godot 3 - previous value `g`\n\tr.set_up_direction(b)\n\tr.set_floor_stop_on_slope_enabled(c)\n\tr.set_max_slides(d)\n\tr.set_floor_max_angle(e)\n\t# TODOConverter40 infinite_inertia were removed in Godot 4.0 - previous value `f`\n\tr.move_and_slide()\n\tvar aa = roman(r.velocity) # Roman", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
 
-	valid = valid & test_conversion_single_additional("list_dir_begin( a , b )", "list_dir_begin() # TODOGODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("list_dir_begin( a )", "list_dir_begin() # TODOGODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("list_dir_begin( )", "list_dir_begin() # TODOGODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
+	valid = valid & test_conversion_single_additional_builtin("list_dir_begin( a , b )", "list_dir_begin() # TODOGODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("list_dir_begin( a )", "list_dir_begin() # TODOGODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("list_dir_begin( )", "list_dir_begin() # TODOGODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
 
-	valid = valid & test_conversion_single_additional("sort_custom( a , b )", "sort_custom(Callable(a,b))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
+	valid = valid & test_conversion_single_additional_builtin("sort_custom( a , b )", "sort_custom(Callable(a,b))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
 
-	valid = valid & test_conversion_single_additional("func c(var a, var b)", "func c(a, b)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
+	valid = valid & test_conversion_single_additional_builtin("func c(var a, var b)", "func c(a, b)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
 
-	valid = valid & test_conversion_single_additional("draw_line(1, 2, 3, 4, 5)", "draw_line(1,2,3,4)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
+	valid = valid & test_conversion_single_additional_builtin("draw_line(1, 2, 3, 4, 5)", "draw_line(1,2,3,4)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
 
-	valid = valid & test_conversion_single_additional("\timage.lock()", "\tfalse # image.lock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("\timage.unlock()", "\tfalse # image.unlock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("\troman.image.unlock()", "\tfalse # roman.image.unlock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("\tmtx.lock()", "\tmtx.lock()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("\tmutex.unlock()", "\tmutex.unlock()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
+	valid = valid & test_conversion_single_additional_builtin("\timage.lock()", "\tfalse # image.lock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("\timage.unlock()", "\tfalse # image.unlock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("\troman.image.unlock()", "\tfalse # roman.image.unlock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("\tmtx.lock()", "\tmtx.lock()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("\tmutex.unlock()", "\tmutex.unlock()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
 
 	valid = valid & test_conversion_single_additional("\nonready", "\n@onready", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
 	valid = valid & test_conversion_single_additional("onready", "@onready", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
@@ -2002,82 +2054,94 @@ bool ProjectConverter3To4::test_conversion() {
 	valid = valid & test_conversion_single_additional("tool", "@tool", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
 	valid = valid & test_conversion_single_additional("\n    tool", "\n    tool", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
 	valid = valid & test_conversion_single_additional("\n\ntool", "\n\n@tool", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
-	valid = valid & test_conversion_single_additional("\n\nmaster func", "\n\n@rpc(any) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
-	valid = valid & test_conversion_single_additional("\n\npuppet func", "\n\n@rpc(auth) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
-	valid = valid & test_conversion_single_additional("\n\nremote func", "\n\n@rpc(any) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
-	valid = valid & test_conversion_single_additional("\n\nremotesync func", "\n\n@rpc(any,sync) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
-	valid = valid & test_conversion_single_additional("\n\nsync func", "\n\n@rpc(any,sync) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
-	valid = valid & test_conversion_single_additional("\n\npuppetsync func", "\n\n@rpc(auth,sync) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
-	valid = valid & test_conversion_single_additional("\n\nmastersync func", "\n\n@rpc(any,sync) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
-
-	valid = valid & test_conversion_single_additional("var size : Vector2 = Vector2() setget set_function , get_function", "var size : Vector2 = Vector2() :\n	get:\n		return size # TODOConverter40 Copy here content of get_function\n	set(mod_value):\n		mod_value  # TODOConverter40 Copy here content of set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("var size : Vector2 = Vector2() setget set_function , ", "var size : Vector2 = Vector2() :\n	get:\n		return size # TODOConverter40 Non existent get function \n	set(mod_value):\n		mod_value  # TODOConverter40 Copy here content of set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("var size : Vector2 = Vector2() setget set_function", "var size : Vector2 = Vector2() :\n	get:\n		return size # TODOConverter40 Non existent get function \n	set(mod_value):\n		mod_value  # TODOConverter40 Copy here content of set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("var size : Vector2 = Vector2() setget  , get_function", "var size : Vector2 = Vector2() :\n	get:\n		return size # TODOConverter40 Copy here content of get_function \n	set(mod_value):\n		mod_value  # TODOConverter40  Non existent set function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-
-	valid = valid & test_conversion_single_additional("get_node(@", "get_node(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-
-	valid = valid & test_conversion_single_additional("yield(this, \"timeout\")", "await this.timeout", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-
-	valid = valid & test_conversion_single_additional(" Transform.xform(Vector3(a,b,c)) ", " Transform * Vector3(a,b,c) ", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional(" Transform.xform_inv(Vector3(a,b,c)) ", " Vector3(a,b,c) * Transform ", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-
-	valid = valid & test_conversion_single_additional("export(float) var lifetime = 3.0", "export var lifetime: float = 3.0", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("export(String, 'AnonymousPro', 'CourierPrime') var _font_name = 'AnonymousPro'", "export var _font_name = 'AnonymousPro' # (String, 'AnonymousPro', 'CourierPrime')", &ProjectConverter3To4::rename_gdscript_functions, "custom rename"); // TODO, this is only a workaround
-	valid = valid & test_conversion_single_additional("export(PackedScene) var mob_scene", "export var mob_scene: PackedScene", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-
-	valid = valid & test_conversion_single_additional("var d = parse_json(roman(sfs))", "var test_json_conv = JSON.new()\ntest_json_conv.parse(roman(sfs))\nvar d = test_json_conv.get_data()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-
-	valid = valid & test_conversion_single_additional("to_json( AA ) szon", "JSON.new().stringify( AA ) szon", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("s to_json", "s JSON.new().stringify", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("AF to_json2", "AF to_json2", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("var rr = JSON.parse(a)", "var test_json_conv = JSON.new()\ntest_json_conv.parse(a)\nvar rr = test_json_conv.get_data()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-
-	valid = valid & test_conversion_single_additional("empty()", "is_empty()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional(".empty", ".empty", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-
-	valid = valid & test_conversion_single_additional(").roman(", ").roman(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("\t.roman(", "\tsuper.roman(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional(" .roman(", " super.roman(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional(".1", ".1", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional(" .1", " .1", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("'.'", "'.'", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("'.a'", "'.a'", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("\t._input(_event)", "\tsuper._input(_event)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-
-	valid = valid & test_conversion_single_additional("(start(A,B,C,D,E,F,G) != OK):", "(start(A,Callable(B,C),D,E,F,G) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("(connect(A,B,C,D,E,F,G) != OK):", "(connect(A,Callable(B,C),D,E,F,G) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("(connect(A,B,C) != OK):", "(connect(A,Callable(B,C)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("disconnect(A,B,C) != OK):", "disconnect(A,Callable(B,C)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("is_connected(A,B,C) != OK):", "is_connected(A,Callable(B,C)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("is_connected(A,B,C))", "is_connected(A,Callable(B,C)))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-
-	valid = valid & test_conversion_single_additional("func _init(p_x:int)->void:", "func _init(p_x:int):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("q_PackedDataContainer._iter_init(variable1)", "q_PackedDataContainer._iter_init(variable1)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-
-	valid = valid & test_conversion_single_additional("assert(speed < 20, str(randi()%10))", "assert(speed < 20) #,str(randi()%10))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("assert(speed < 2)", "assert(speed < 2)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("assert(false, \"Missing type --\" + str(argument.type) + \"--, needs to be added to project\")", "assert(false) #,\"Missing type --\" + str(argument.type) + \"--, needs to be added to project\")", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-
-	valid = valid & test_conversion_single_additional("create_from_image(aa, bb)", "create_from_image(aa) #,bb", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("q_ImageTexture.create_from_image(variable1, variable2)", "q_ImageTexture.create_from_image(variable1) #,variable2", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-
-	valid = valid & test_conversion_single_additional("set_cell_item(a, b, c, d ,e) # AA", "set_cell_item( Vector3(a,b,c) ,d,e) # AA", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("set_cell_item(a, b)", "set_cell_item(a, b)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("get_cell_item_orientation(a, b,c)", "get_cell_item_orientation(Vector3i(a,b,c))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("get_cell_item(a, b,c)", "get_cell_item(Vector3i(a,b,c))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("map_to_world(a, b,c)", "map_to_world(Vector3i(a,b,c))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-
-	valid = valid & test_conversion_single_additional("PackedStringArray(req_godot).join('.')", "'.'.join(PackedStringArray(req_godot))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("=PackedStringArray(req_godot).join('.')", "='.'.join(PackedStringArray(req_godot))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-
-	valid = valid & test_conversion_single_additional("    aa", "    aa", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("\taa", "\taa", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("\t    aa", "\taa", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("    \taa", "    \taa", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-
-	valid = valid & test_conversion_single_additional("apply_force(position, impulse)", "apply_force(impulse, position)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
-	valid = valid & test_conversion_single_additional("apply_impulse(position, impulse)", "apply_impulse(impulse, position)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename");
+	valid = valid & test_conversion_single_additional("\n\nremote func", "\n\n@rpc(any_peer) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
+	valid = valid & test_conversion_single_additional("\n\nremotesync func", "\n\n@rpc(any_peer, call_local) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
+	valid = valid & test_conversion_single_additional("\n\nsync func", "\n\n@rpc(any_peer, call_local) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
+	valid = valid & test_conversion_single_additional("\n\nslave func", "\n\n@rpc func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
+	valid = valid & test_conversion_single_additional("\n\npuppet func", "\n\n@rpc func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
+	valid = valid & test_conversion_single_additional("\n\npuppetsync func", "\n\n@rpc(call_local) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
+	valid = valid & test_conversion_single_additional("\n\nmaster func", "\n\nThe master and mastersync rpc behavior is not officially supported anymore. Try using another keyword or making custom logic using get_multiplayer().get_remote_sender_id()\n@rpc func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
+	valid = valid & test_conversion_single_additional("\n\nmastersync func", "\n\nThe master and mastersync rpc behavior is not officially supported anymore. Try using another keyword or making custom logic using get_multiplayer().get_remote_sender_id()\n@rpc(call_local) func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword");
+
+	valid = valid & test_conversion_single_additional_builtin("var size : Vector2 = Vector2() setget set_function , get_function", "var size : Vector2 = Vector2() :\n	get:\n		return size # TODOConverter40 Copy here content of get_function\n	set(mod_value):\n		mod_value  # TODOConverter40 Copy here content of set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("var size : Vector2 = Vector2() setget set_function , ", "var size : Vector2 = Vector2() :\n	get:\n		return size # TODOConverter40 Non existent get function \n	set(mod_value):\n		mod_value  # TODOConverter40 Copy here content of set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("var size : Vector2 = Vector2() setget set_function", "var size : Vector2 = Vector2() :\n	get:\n		return size # TODOConverter40 Non existent get function \n	set(mod_value):\n		mod_value  # TODOConverter40 Copy here content of set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("var size : Vector2 = Vector2() setget  , get_function", "var size : Vector2 = Vector2() :\n	get:\n		return size # TODOConverter40 Copy here content of get_function \n	set(mod_value):\n		mod_value  # TODOConverter40  Non existent set function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+
+	valid = valid & test_conversion_single_additional_builtin("get_node(@", "get_node(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+
+	valid = valid & test_conversion_single_additional_builtin("yield(this, \"timeout\")", "await this.timeout", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("yield(this, \\\"timeout\\\")", "await this.timeout", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, true);
+
+	valid = valid & test_conversion_single_additional_builtin(" Transform.xform(Vector3(a,b,c)) ", " Transform * Vector3(a,b,c) ", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin(" Transform.xform_inv(Vector3(a,b,c)) ", " Vector3(a,b,c) * Transform ", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+
+	valid = valid & test_conversion_single_additional_builtin("export(float) var lifetime = 3.0", "export var lifetime: float = 3.0", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("export(String, 'AnonymousPro', 'CourierPrime') var _font_name = 'AnonymousPro'", "export var _font_name = 'AnonymousPro' # (String, 'AnonymousPro', 'CourierPrime')", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); // TODO, this is only a workaround
+	valid = valid & test_conversion_single_additional_builtin("export(PackedScene) var mob_scene", "export var mob_scene: PackedScene", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+
+	valid = valid & test_conversion_single_additional_builtin("var d = parse_json(roman(sfs))", "var test_json_conv = JSON.new()\ntest_json_conv.parse(roman(sfs))\nvar d = test_json_conv.get_data()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+
+	valid = valid & test_conversion_single_additional_builtin("to_json( AA ) szon", "JSON.new().stringify( AA ) szon", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("s to_json", "s JSON.new().stringify", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("AF to_json2", "AF to_json2", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("var rr = JSON.parse(a)", "var test_json_conv = JSON.new()\ntest_json_conv.parse(a)\nvar rr = test_json_conv.get_data()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+
+	valid = valid & test_conversion_single_additional_builtin("empty()", "is_empty()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin(".empty", ".empty", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+
+	valid = valid & test_conversion_single_additional_builtin(").roman(", ").roman(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("\t.roman(", "\tsuper.roman(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin(" .roman(", " super.roman(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin(".1", ".1", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin(" .1", " .1", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("'.'", "'.'", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("'.a'", "'.a'", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("\t._input(_event)", "\tsuper._input(_event)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+
+	valid = valid & test_conversion_single_additional_builtin("(connect(A,B,C) != OK):", "(connect(A,Callable(B,C)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("(connect(A,B,C,D) != OK):", "(connect(A,Callable(B,C).bind(D)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("(connect(A,B,C,[D]) != OK):", "(connect(A,Callable(B,C).bind(D)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("(connect(A,B,C,D,E) != OK):", "(connect(A,Callable(B,C).bind(D),E) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+
+	valid = valid & test_conversion_single_additional_builtin("(start(A,B) != OK):", "(start(Callable(A,B)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("func start(A,B):", "func start(A,B):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("(start(A,B,C,D,E,F,G) != OK):", "(start(Callable(A,B).bind(C),D,E,F,G) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("disconnect(A,B,C) != OK):", "disconnect(A,Callable(B,C)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("is_connected(A,B,C) != OK):", "is_connected(A,Callable(B,C)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("is_connected(A,B,C))", "is_connected(A,Callable(B,C)))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+
+	valid = valid & test_conversion_single_additional_builtin("(tween_method(A,B,C,D,E).foo())", "(tween_method(Callable(A,B),C,D,E).foo())", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("(tween_method(A,B,C,D,E,[F,G]).foo())", "(tween_method(Callable(A,B).bind(F,G),C,D,E).foo())", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("(tween_callback(A,B).foo())", "(tween_callback(Callable(A,B)).foo())", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("(tween_callback(A,B,[C,D]).foo())", "(tween_callback(Callable(A,B).bind(C,D)).foo())", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+
+	valid = valid & test_conversion_single_additional_builtin("func _init(p_x:int)->void:", "func _init(p_x:int):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("q_PackedDataContainer._iter_init(variable1)", "q_PackedDataContainer._iter_init(variable1)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+
+	valid = valid & test_conversion_single_additional_builtin("assert(speed < 20, str(randi()%10))", "assert(speed < 20) #,str(randi()%10))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("assert(speed < 2)", "assert(speed < 2)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("assert(false, \"Missing type --\" + str(argument.type) + \"--, needs to be added to project\")", "assert(false) #,\"Missing type --\" + str(argument.type) + \"--, needs to be added to project\")", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+
+	valid = valid & test_conversion_single_additional_builtin("create_from_image(aa, bb)", "create_from_image(aa) #,bb", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("q_ImageTexture.create_from_image(variable1, variable2)", "q_ImageTexture.create_from_image(variable1) #,variable2", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+
+	valid = valid & test_conversion_single_additional_builtin("set_cell_item(a, b, c, d ,e) # AA", "set_cell_item( Vector3(a,b,c) ,d,e) # AA", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("set_cell_item(a, b)", "set_cell_item(a, b)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("get_cell_item_orientation(a, b,c)", "get_cell_item_orientation(Vector3i(a,b,c))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("get_cell_item(a, b,c)", "get_cell_item(Vector3i(a,b,c))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("map_to_world(a, b,c)", "map_to_world(Vector3i(a,b,c))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+
+	valid = valid & test_conversion_single_additional_builtin("PackedStringArray(req_godot).join('.')", "'.'.join(PackedStringArray(req_godot))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("=PackedStringArray(req_godot).join('.')", "='.'.join(PackedStringArray(req_godot))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+
+	valid = valid & test_conversion_single_additional_builtin("    aa", "    aa", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("\taa", "\taa", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("\t    aa", "\taa", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("    \taa", "    \taa", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+
+	valid = valid & test_conversion_single_additional_builtin("apply_force(position, impulse)", "apply_force(impulse, position)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
+	valid = valid & test_conversion_single_additional_builtin("apply_impulse(position, impulse)", "apply_impulse(impulse, position)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
 
 	valid = valid & test_conversion_single_additional("AAA Color.white AF", "AAA Color.WHITE AF", &ProjectConverter3To4::rename_enums, "custom rename");
 
@@ -2123,6 +2187,15 @@ bool ProjectConverter3To4::test_conversion() {
 	}
 	valid = valid & (got == expected);
 }
+{
+	String base = "var node = $world/ukraine/lviv.";
+	String expected = "$world/ukraine/lviv.";
+	String got = get_object_of_execution(base);
+	if (got != expected) {
+		ERR_PRINT("Failed to get proper data from get_object_of_execution `" + base + "` should return `" + expected + "`(" + itos(expected.size()) + "), got instead `" + got + "`(" + itos(got.size()) + ")");
+	}
+	valid = valid & (got == expected);
+}
 }
 // get_starting_space
 {
@@ -2474,22 +2547,43 @@ String ProjectConverter3To4::get_starting_space(const String &line) const {
 // so it is `var roman = kieliszek.` and this function return `kieliszek.`
 String ProjectConverter3To4::get_object_of_execution(const String &line) const {
 	int end = line.size() - 1; // Last one is \0
+	int variable_start = end - 1;
 	int start = end - 1;
 
+	bool is_possibly_nodepath = false;
+	bool is_valid_nodepath = false;
+
 	while (start >= 0) {
 		char32_t character = line[start];
-		if ((character >= 'A' && character <= 'Z') || (character >= 'a' && character <= 'z') || character == '.' || character == '_') {
+		bool is_variable_char = (character >= 'A' && character <= 'Z') || (character >= 'a' && character <= 'z') || character == '.' || character == '_';
+		bool is_nodepath_start = character == '$';
+		bool is_nodepath_sep = character == '/';
+		if (is_variable_char || is_nodepath_start || is_nodepath_sep) {
 			if (start == 0) {
 				break;
+			} else if (is_nodepath_sep) {
+				// Freeze variable_start, try to fetch more chars since this might be node path literal
+				is_possibly_nodepath = true;
+			} else if (is_nodepath_start) {
+				// Found $, this is a node path literal
+				is_valid_nodepath = true;
+				break;
+			}
+			if (!is_possibly_nodepath) {
+				variable_start--;
 			}
 			start--;
 			continue;
 		} else {
-			start++; // Found invalid character, needs to be ignored
+			// Abandon all hope, this is neither a variable nor a node path literal
+			variable_start++; // Found invalid character, needs to be ignored
 			break;
 		}
 	}
-	return line.substr(start, (end - start));
+	if (is_valid_nodepath) {
+		variable_start = start;
+	}
+	return line.substr(variable_start, (end - variable_start));
 }
 
 void ProjectConverter3To4::rename_enums(String &file_content) {
@@ -2535,7 +2629,7 @@ Vector<String> ProjectConverter3To4::check_for_rename_enums(Vector<String> &file
 void ProjectConverter3To4::rename_classes(String &file_content) {
 	int current_index = 0;
 
-	// TODO Maybe it is better way to not rename gd, tscn and other files which are named are classes
+	// TODO Maybe it is better way to not rename gd, tscn and other files which are named as classes
 	while (class_renames[current_index][0]) {
 		// Begin renaming workaround `Resource.gd` -> `RefCounter.gd`
 		RegEx reg_before = RegEx(String("\\b") + class_renames[current_index][0] + ".tscn\\b");
@@ -2625,432 +2719,11 @@ Vector<String> ProjectConverter3To4::check_for_rename_classes(Vector<String> &fi
 	return found_things;
 }
 
-void ProjectConverter3To4::rename_gdscript_functions(String &file_content) {
-	// Custom renaming, each rule needs to be set manually
-	// Don't forget to put validate each rule in validate_conversion function
+void ProjectConverter3To4::rename_gdscript_functions(String &file_content, const RegExContainer &reg_container, bool builtin) {
 	Vector<String> lines = file_content.split("\n");
 
-	RegEx reg_is_empty = RegEx("\\bempty\\(");
-	RegEx reg_super = RegEx("([\t ])\\.([a-zA-Z_])");
-	RegEx reg_json_to = RegEx("\\bto_json\\b");
-	RegEx reg_json_parse = RegEx("([\t]{0,})([^\n]+)parse_json\\(([^\n]+)");
-	RegEx reg_json_non_new = RegEx("([\t]{0,})([^\n]+)JSON\\.parse\\(([^\n]+)");
-	RegEx reg_export = RegEx("export\\(([a-zA-Z0-9_]+)\\)[ ]+var[ ]+([a-zA-Z0-9_]+)");
-	RegEx reg_export_advanced = RegEx("export\\(([^)^\n]+)\\)[ ]+var[ ]+([a-zA-Z0-9_]+)([^\n]+)");
-	RegEx reg_setget_setget = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+([a-zA-Z0-9_]+)[ \t]*,[ \t]*([a-zA-Z0-9_]+)");
-	RegEx reg_setget_set = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+([a-zA-Z0-9_]+)[ \t]*[,]*[^a-z^A-Z^0-9^_]*$");
-	RegEx reg_setget_get = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+,[ \t]*([a-zA-Z0-9_]+)[ \t]*$");
-	RegEx reg_join = RegEx("([\\(\\)a-zA-Z0-9_]+)\\.join\\(([^\n^\\)]+)\\)");
-	RegEx reg_mixed_tab_space = RegEx("([\t]+)([ ]+)");
-	RegEx reg_image_lock = RegEx("([a-zA-Z0-9_\\.]+)\\.lock\\(\\)");
-	RegEx reg_image_unlock = RegEx("([a-zA-Z0-9_\\.]+)\\.unlock\\(\\)");
-	RegEx reg_os_fullscreen = RegEx("OS.window_fullscreen[= ]+([^#^\n]+)");
-
-	CRASH_COND(!reg_is_empty.is_valid());
-	CRASH_COND(!reg_super.is_valid());
-	CRASH_COND(!reg_json_to.is_valid());
-	CRASH_COND(!reg_json_parse.is_valid());
-	CRASH_COND(!reg_json_non_new.is_valid());
-	CRASH_COND(!reg_export.is_valid());
-	CRASH_COND(!reg_export_advanced.is_valid());
-	CRASH_COND(!reg_setget_setget.is_valid());
-	CRASH_COND(!reg_setget_set.is_valid());
-	CRASH_COND(!reg_setget_get.is_valid());
-	CRASH_COND(!reg_join.is_valid());
-	CRASH_COND(!reg_mixed_tab_space.is_valid());
-	CRASH_COND(!reg_image_lock.is_valid());
-	CRASH_COND(!reg_image_unlock.is_valid());
-	CRASH_COND(!reg_os_fullscreen.is_valid());
-
 	for (String &line : lines) {
-		if (line.find("mtx") == -1 && line.find("mutex") == -1 && line.find("Mutex") == -1) {
-			line = reg_image_lock.sub(line, "false # $1.lock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", true);
-			line = reg_image_unlock.sub(line, "false # $1.unlock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", true);
-		}
-
-		// Mixed use of spaces and tabs - tabs as first - TODO, this probably is problem problem, but not sure
-		line = reg_mixed_tab_space.sub(line, "$1", true);
-
-		// PackedStringArray(req_godot).join('.') -> '.'.join(PackedStringArray(req_godot))       PoolStringArray
-		line = reg_join.sub(line, "$2.join($1)", true);
-
-		// -- empty() -> is_empty()       Pool*Array
-		line = reg_is_empty.sub(line, "is_empty(", true);
-
-		// -- \t.func() -> \tsuper.func()       Object
-		line = reg_super.sub(line, "$1super.$2", true); // TODO, not sure if possible, but for now this brake String text e.g. "Choosen .gitignore" -> "Choosen super.gitignore"
-
-		// -- JSON.parse(a) -> JSON.new().parse(a) etc.    JSON
-		line = reg_json_non_new.sub(line, "$1var test_json_conv = JSON.new()\n$1test_json_conv.parse($3\n$1$2test_json_conv.get_data()", true);
-
-		// -- to_json(a) -> JSON.new().stringify(a)     Object
-		line = reg_json_to.sub(line, "JSON.new().stringify", true);
-
-		// -- parse_json(a) -> JSON.get_data() etc.    Object
-		line = reg_json_parse.sub(line, "$1var test_json_conv = JSON.new()\n$1test_json_conv.parse($3\n$1$2test_json_conv.get_data()", true);
-
-		// -- get_node(@ -> get_node(       Node
-		line = line.replace("get_node(@", "get_node(");
-
-		// export(float) var lifetime = 3.0 -> export var lifetime: float = 3.0     GDScript
-		line = reg_export.sub(line, "export var $2: $1");
-
-		// export(String, 'AnonymousPro', 'CourierPrime') var _font_name = 'AnonymousPro' -> export var _font_name = 'AnonymousPro' #(String, 'AnonymousPro', 'CourierPrime')   GDScript
-		line = reg_export_advanced.sub(line, "export var $2$3 # ($1)");
-
-		// Setget Setget
-		line = reg_setget_setget.sub(line, "var $1$2:\n\tget:\n\t\treturn $1 # TODOConverter40 Copy here content of $4\n\tset(mod_value):\n\t\tmod_value  # TODOConverter40 Copy here content of $3", true);
-
-		// Setget set
-		line = reg_setget_set.sub(line, "var $1$2:\n\tget:\n\t\treturn $1 # TODOConverter40 Non existent get function \n\tset(mod_value):\n\t\tmod_value  # TODOConverter40 Copy here content of $3", true);
-
-		// Setget get
-		line = reg_setget_get.sub(line, "var $1$2:\n\tget:\n\t\treturn $1 # TODOConverter40 Copy here content of $3 \n\tset(mod_value):\n\t\tmod_value  # TODOConverter40  Non existent set function", true);
-
-		// OS.window_fullscreen = true -> ProjectSettings.set("display/window/size/fullscreen",true)
-		line = reg_os_fullscreen.sub(line, "ProjectSettings.set(\"display/window/size/fullscreen\", $1)", true);
-
-		// -- r.move_and_slide( a, b, c, d, e )  ->  r.set_motion_velocity(a) ... r.move_and_slide()         KinematicBody
-		if (line.find("move_and_slide(") != -1) {
-			int start = line.find("move_and_slide(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				String base_obj = get_object_of_execution(line.substr(0, start));
-				String starting_space = get_starting_space(line);
-
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() >= 1) {
-					String line_new;
-
-					// motion_velocity
-					line_new += starting_space + base_obj + "set_motion_velocity(" + parts[0] + ")\n";
-
-					// up_direction
-					if (parts.size() >= 2) {
-						line_new += starting_space + base_obj + "set_up_direction(" + parts[1] + ")\n";
-					}
-
-					// stop_on_slope
-					if (parts.size() >= 3) {
-						line_new += starting_space + base_obj + "set_floor_stop_on_slope_enabled(" + parts[2] + ")\n";
-					}
-
-					// max_slides
-					if (parts.size() >= 4) {
-						line_new += starting_space + base_obj + "set_max_slides(" + parts[3] + ")\n";
-					}
-
-					// floor_max_angle
-					if (parts.size() >= 5) {
-						line_new += starting_space + base_obj + "set_floor_max_angle(" + parts[4] + ")\n";
-					}
-
-					// infiinite_interia
-					if (parts.size() >= 6) {
-						line_new += starting_space + "# TODOConverter40 infinite_inertia were removed in Godot 4.0 - previous value `" + parts[5] + "`\n";
-					}
-
-					line = line_new + line.substr(0, start) + "move_and_slide()" + line.substr(end + start);
-				}
-			}
-		}
-
-		// -- r.move_and_slide_with_snap( a, b, c, d, e )  ->  r.set_motion_velocity(a) ... r.move_and_slide()         KinematicBody
-		if (line.find("move_and_slide_with_snap(") != -1) {
-			int start = line.find("move_and_slide_with_snap(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				String base_obj = get_object_of_execution(line.substr(0, start));
-				String starting_space = get_starting_space(line);
-
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() >= 1) {
-					String line_new;
-
-					// motion_velocity
-					line_new += starting_space + base_obj + "set_motion_velocity(" + parts[0] + ")\n";
-
-					// snap
-					if (parts.size() >= 2) {
-						line_new += starting_space + "# TODOConverter40 looks that snap in Godot 4.0 is float, not vector like in Godot 3 - previous value `" + parts[1] + "`\n";
-					}
-
-					// up_direction
-					if (parts.size() >= 3) {
-						line_new += starting_space + base_obj + "set_up_direction(" + parts[2] + ")\n";
-					}
-
-					// stop_on_slope
-					if (parts.size() >= 4) {
-						line_new += starting_space + base_obj + "set_floor_stop_on_slope_enabled(" + parts[3] + ")\n";
-					}
-
-					// max_slides
-					if (parts.size() >= 5) {
-						line_new += starting_space + base_obj + "set_max_slides(" + parts[4] + ")\n";
-					}
-
-					// floor_max_angle
-					if (parts.size() >= 6) {
-						line_new += starting_space + base_obj + "set_floor_max_angle(" + parts[5] + ")\n";
-					}
-
-					// infiinite_interia
-					if (parts.size() >= 7) {
-						line_new += starting_space + "# TODOConverter40 infinite_inertia were removed in Godot 4.0 - previous value `" + parts[6] + "`\n";
-					}
-
-					line = line_new + line.substr(0, start) + "move_and_slide()" + line.substr(end + start);
-				}
-			}
-		}
-
-		// -- sort_custom( a , b )  ->  sort_custom(Callable( a , b ))            Object
-		if (line.find("sort_custom(") != -1) {
-			int start = line.find("sort_custom(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 2) {
-					line = line.substr(0, start) + "sort_custom(Callable(" + parts[0] + "," + parts[1] + "))" + line.substr(end + start);
-				}
-			}
-		}
-
-		// -- list_dir_begin( )  ->  list_dir_begin()            Object
-		if (line.find("list_dir_begin(") != -1) {
-			int start = line.find("list_dir_begin(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				line = line.substr(0, start) + "list_dir_begin() " + line.substr(end + start) + "# TODOGODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547";
-			}
-		}
-
-		// -- draw_line(1,2,3,4,5) -> draw_line(1,2,3,4)            CanvasItem
-		if (line.find("draw_line(") != -1) {
-			int start = line.find("draw_line(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 5) {
-					line = line.substr(0, start) + "draw_line(" + parts[0] + "," + parts[1] + "," + parts[2] + "," + parts[3] + ")" + line.substr(end + start);
-				}
-			}
-		}
-
-		// -- func c(var a, var b) -> func c(a, b)
-		if (line.find("func ") != -1 && line.find("var ") != -1) {
-			int start = line.find("func ");
-			start = line.substr(start).find("(") + start;
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-
-				String start_string = line.substr(0, start) + "(";
-				for (int i = 0; i < parts.size(); i++) {
-					start_string += parts[i].strip_edges().trim_prefix("var ");
-					if (i != parts.size() - 1) {
-						start_string += ", ";
-					}
-				}
-				line = start_string + ")" + line.substr(end + start);
-			}
-		}
-
-		// -- yield(this, \"timeout\") -> await this.timeout         GDScript
-		if (line.find("yield(") != -1) {
-			int start = line.find("yield(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 2) {
-					line = line.substr(0, start) + "await " + parts[0] + "." + parts[1].replace("\"", "").replace("\'", "").replace(" ", "") + line.substr(end + start);
-				}
-			}
-		}
-
-		// -- parse_json( AA ) -> TODO       Object
-		if (line.find("parse_json(") != -1) {
-			int start = line.find("parse_json(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				line = line.substr(0, start) + "JSON.new().stringify(" + connect_arguments(parts, 0) + ")" + line.substr(end + start);
-			}
-		}
-
-		// -- .xform(Vector3(a,b,c)) -> * Vector3(a,b,c)            Transform
-		if (line.find(".xform(") != -1) {
-			int start = line.find(".xform(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 1) {
-					line = line.substr(0, start) + " * " + parts[0] + line.substr(end + start);
-				}
-			}
-		}
-
-		// -- .xform_inv(Vector3(a,b,c)) -> * Vector3(a,b,c)       Transform
-		if (line.find(".xform_inv(") != -1) {
-			int start = line.find(".xform_inv(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				String object_exec = get_object_of_execution(line.substr(0, start));
-				if (line.find(object_exec + ".xform") != -1) {
-					int start2 = line.find(object_exec + ".xform");
-					Vector<String> parts = parse_arguments(line.substr(start, end));
-					if (parts.size() == 1) {
-						line = line.substr(0, start2) + parts[0] + " * " + object_exec + line.substr(end + start);
-					}
-				}
-			}
-		}
-
-		// -- connect(,,,things) -> connect(,Callable(,),things)      Object
-		if (line.find("connect(") != -1) {
-			int start = line.find("connect(");
-			// Protection from disconnect
-			if (start == 0 || line.get(start - 1) != 's') {
-				int end = get_end_parenthess(line.substr(start)) + 1;
-				if (end > -1) {
-					Vector<String> parts = parse_arguments(line.substr(start, end));
-					if (parts.size() >= 3) {
-						line = line.substr(0, start) + "connect(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + ")" + connect_arguments(parts, 3) + ")" + line.substr(end + start);
-					}
-				}
-			}
-		}
-		// -- disconnect(a,b,c) -> disconnect(a,Callable(b,c))      Object
-		if (line.find("disconnect(") != -1) {
-			int start = line.find("disconnect(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 3) {
-					line = line.substr(0, start) + "disconnect(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
-				}
-			}
-		}
-		// -- is_connected(a,b,c) -> is_connected(a,Callable(b,c))      Object
-		if (line.find("is_connected(") != -1) {
-			int start = line.find("is_connected(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 3) {
-					line = line.substr(0, start) + "is_connected(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
-				}
-			}
-		}
-		// -- start(a,b,c) -> start(a,Callable(b,c))      Thread
-		if (line.find("start(") != -1) {
-			int start = line.find("start(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() >= 3) {
-					line = line.substr(0, start) + "start(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + ")" + connect_arguments(parts, 3) + ")" + line.substr(end + start);
-				}
-			}
-		}
-		// -- func _init(p_x:int)->void:  -> func _init(p_x:int):    Object # https://github.com/godotengine/godot/issues/50589
-		if (line.find(" _init(") != -1) {
-			int start = line.find(" _init(");
-			int end = line.rfind(":") + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				line = line.substr(0, start) + " _init(" + connect_arguments(parts, 0) + "):" + line.substr(end + start);
-			}
-		}
-		//  assert(speed < 20, str(randi()%10))  ->  assert(speed < 20) #,str(randi()%10))    GDScript - GDScript bug constant message
-		if (line.find("assert(") != -1) {
-			int start = line.find("assert(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 2) {
-					line = line.substr(0, start) + "assert(" + parts[0] + ") " + line.substr(end + start) + "#," + parts[1] + ")";
-				}
-			}
-		}
-		//  create_from_image(aa, bb)  ->   create_from_image(aa) #, bb   ImageTexture
-		if (line.find("create_from_image(") != -1) {
-			int start = line.find("create_from_image(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 2) {
-					line = line.substr(0, start) + "create_from_image(" + parts[0] + ") " + "#," + parts[1] + line.substr(end + start);
-				}
-			}
-		}
-		//  set_cell_item(a, b, c, d ,e)  ->   set_cell_item(Vector3(a, b, c), d ,e)
-		if (line.find("set_cell_item(") != -1) {
-			int start = line.find("set_cell_item(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() > 2) {
-					line = line.substr(0, start) + "set_cell_item( Vector3(" + parts[0] + "," + parts[1] + "," + parts[2] + ") " + connect_arguments(parts, 3) + ")" + line.substr(end + start);
-				}
-			}
-		}
-		//  get_cell_item(a, b, c)  ->   get_cell_item(Vector3i(a, b, c))
-		if (line.find("get_cell_item(") != -1) {
-			int start = line.find("get_cell_item(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 3) {
-					line = line.substr(0, start) + "get_cell_item(Vector3i(" + parts[0] + "," + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
-				}
-			}
-		}
-		//  get_cell_item_orientation(a, b, c)  ->   get_cell_item_orientation(Vector3i(a, b, c))
-		if (line.find("get_cell_item_orientation(") != -1) {
-			int start = line.find("get_cell_item_orientation(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 3) {
-					line = line.substr(0, start) + "get_cell_item_orientation(Vector3i(" + parts[0] + "," + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
-				}
-			}
-		}
-		//  apply_impulse(A, B)  ->   apply_impulse(B, A)
-		if (line.find("apply_impulse(") != -1) {
-			int start = line.find("apply_impulse(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 2) {
-					line = line.substr(0, start) + "apply_impulse(" + parts[1] + ", " + parts[0] + ")" + line.substr(end + start);
-				}
-			}
-		}
-		//  apply_force(A, B)  ->   apply_force(B, A)
-		if (line.find("apply_force(") != -1) {
-			int start = line.find("apply_force(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 2) {
-					line = line.substr(0, start) + "apply_force(" + parts[1] + ", " + parts[0] + ")" + line.substr(end + start);
-				}
-			}
-		}
-		//  map_to_world(a, b, c)  ->   map_to_world(Vector3i(a, b, c))
-		if (line.find("map_to_world(") != -1) {
-			int start = line.find("map_to_world(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 3) {
-					line = line.substr(0, start) + "map_to_world(Vector3i(" + parts[0] + "," + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
-				}
-			}
-		}
+		process_gdscript_line(line, reg_container, builtin);
 	}
 
 	// Collect vector to string
@@ -3064,478 +2737,519 @@ void ProjectConverter3To4::rename_gdscript_functions(String &file_content) {
 	}
 };
 
-// This is almost 1:1 copy of function which rename gdscript functions
-Vector<String> ProjectConverter3To4::check_for_rename_gdscript_functions(Vector<String> &file_content) {
+Vector<String> ProjectConverter3To4::check_for_rename_gdscript_functions(Vector<String> &file_content, const RegExContainer &reg_container, bool builtin) {
 	int current_line = 1;
 
 	Vector<String> found_things;
 
-	RegEx reg_is_empty = RegEx("\\bempty\\(");
-	RegEx reg_super = RegEx("([\t ])\\.([a-zA-Z_])");
-	RegEx reg_json_to = RegEx("\\bto_json\\b");
-	RegEx reg_json_parse = RegEx("([\t]{0,})([^\n]+)parse_json\\(([^\n]+)");
-	RegEx reg_json_non_new = RegEx("([\t]{0,})([^\n]+)JSON\\.parse\\(([^\n]+)");
-	RegEx reg_export = RegEx("export\\(([a-zA-Z0-9_]+)\\)[ ]+var[ ]+([a-zA-Z0-9_]+)");
-	RegEx reg_export_advanced = RegEx("export\\(([^)^\n]+)\\)[ ]+var[ ]+([a-zA-Z0-9_]+)([^\n]+)");
-	RegEx reg_setget_setget = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+([a-zA-Z0-9_]+)[ \t]*,[ \t]*([a-zA-Z0-9_]+)");
-	RegEx reg_setget_set = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+([a-zA-Z0-9_]+)[ \t]*[,]*[^a-z^A-Z^0-9^_]*$");
-	RegEx reg_setget_get = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+)setget[ \t]+,[ \t]*([a-zA-Z0-9_]+)[ \t]*$");
-	RegEx reg_join = RegEx("([\\(\\)a-zA-Z0-9_]+)\\.join\\(([^\n^\\)]+)\\)");
-	RegEx reg_mixed_tab_space = RegEx("([\t]+)([ ]+)");
-	RegEx reg_image_lock = RegEx("([a-zA-Z0-9_\\.]+)\\.lock\\(\\)");
-	RegEx reg_image_unlock = RegEx("([a-zA-Z0-9_\\.]+)\\.unlock\\(\\)");
-	RegEx reg_os_fullscreen = RegEx("OS.window_fullscreen[= ]+([^#^\n]+)");
-
-	CRASH_COND(!reg_is_empty.is_valid());
-	CRASH_COND(!reg_super.is_valid());
-	CRASH_COND(!reg_json_to.is_valid());
-	CRASH_COND(!reg_json_parse.is_valid());
-	CRASH_COND(!reg_json_non_new.is_valid());
-	CRASH_COND(!reg_export.is_valid());
-	CRASH_COND(!reg_export_advanced.is_valid());
-	CRASH_COND(!reg_setget_setget.is_valid());
-	CRASH_COND(!reg_setget_set.is_valid());
-	CRASH_COND(!reg_setget_get.is_valid());
-	CRASH_COND(!reg_join.is_valid());
-	CRASH_COND(!reg_mixed_tab_space.is_valid());
-	CRASH_COND(!reg_image_lock.is_valid());
-	CRASH_COND(!reg_image_unlock.is_valid());
-	CRASH_COND(!reg_os_fullscreen.is_valid());
-
 	for (String &line : file_content) {
 		String old_line = line;
-
-		if (line.find("mtx") == -1 && line.find("mutex") == -1 && line.find("Mutex") == -1) {
-			line = reg_image_lock.sub(line, "false # $1.lock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", true);
-			line = reg_image_unlock.sub(line, "false # $1.unlock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", true);
+		process_gdscript_line(line, reg_container, builtin);
+		if (old_line != line) {
+			found_things.append(simple_line_formatter(current_line, old_line, line));
 		}
+	}
 
-		// Mixed use of spaces and tabs - tabs as first - TODO, this probably is problem problem, but not sure
-		line = reg_mixed_tab_space.sub(line, "$1", true);
+	return found_things;
+}
+void ProjectConverter3To4::process_gdscript_line(String &line, const RegExContainer &reg_container, bool builtin) {
+	if (line.find("mtx") == -1 && line.find("mutex") == -1 && line.find("Mutex") == -1) {
+		line = reg_container.reg_image_lock.sub(line, "false # $1.lock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", true);
+		line = reg_container.reg_image_unlock.sub(line, "false # $1.unlock() # TODOConverter40, image no longer require locking, `false` helps to not broke one line if/else, so can be freely removed", true);
+	}
 
-		// PackedStringArray(req_godot).join('.') -> '.'.join(PackedStringArray(req_godot))       PoolStringArray
-		line = reg_join.sub(line, "$2.join($1)", true);
+	// Mixed use of spaces and tabs - tabs as first - TODO, this probably is problem problem, but not sure
+	line = reg_container.reg_mixed_tab_space.sub(line, "$1", true);
 
-		// -- empty() -> is_empty()       Pool*Array
-		line = reg_is_empty.sub(line, "is_empty(", true);
+	// PackedStringArray(req_godot).join('.') -> '.'.join(PackedStringArray(req_godot))       PoolStringArray
+	line = reg_container.reg_join.sub(line, "$2.join($1)", true);
 
-		// -- \t.func() -> \tsuper.func()       Object
-		line = reg_super.sub(line, "$1super.$2", true); // TODO, not sure if possible, but for now this brake String text e.g. "Choosen .gitignore" -> "Choosen super.gitignore"
+	// -- empty() -> is_empty()       Pool*Array
+	line = reg_container.reg_is_empty.sub(line, "is_empty(", true);
 
-		// -- JSON.parse(a) -> JSON.new().parse(a) etc.    JSON
-		line = reg_json_non_new.sub(line, "$1var test_json_conv = JSON.new()\n$1test_json_conv.parse($3\n$1$2test_json_conv.get_data()", true);
+	// -- \t.func() -> \tsuper.func()       Object
+	line = reg_container.reg_super.sub(line, "$1super.$2", true); // TODO, not sure if possible, but for now this brake String text e.g. "Choosen .gitignore" -> "Choosen super.gitignore"
 
-		// -- to_json(a) -> JSON.new().stringify(a)     Object
-		line = reg_json_to.sub(line, "JSON.new().stringify", true);
+	// -- JSON.parse(a) -> JSON.new().parse(a) etc.    JSON
+	line = reg_container.reg_json_non_new.sub(line, "$1var test_json_conv = JSON.new()\n$1test_json_conv.parse($3\n$1$2test_json_conv.get_data()", true);
 
-		// -- parse_json(a) -> JSON.get_data() etc.    Object
-		line = reg_json_parse.sub(line, "$1var test_json_conv = JSON.new()\n$1test_json_conv.parse($3\n$1$2test_json_conv.get_data()", true);
+	// -- to_json(a) -> JSON.new().stringify(a)     Object
+	line = reg_container.reg_json_to.sub(line, "JSON.new().stringify", true);
 
-		// -- get_node(@ -> get_node(       Node
-		line = line.replace("get_node(@", "get_node(");
+	// -- parse_json(a) -> JSON.get_data() etc.    Object
+	line = reg_container.reg_json_parse.sub(line, "$1var test_json_conv = JSON.new()\n$1test_json_conv.parse($3\n$1$2test_json_conv.get_data()", true);
 
-		// export(float) var lifetime = 3.0 -> export var lifetime: float = 3.0     GDScript
-		line = reg_export.sub(line, "export var $2: $1");
+	// -- get_node(@ -> get_node(       Node
+	line = line.replace("get_node(@", "get_node(");
 
-		// export(String, 'AnonymousPro', 'CourierPrime') var _font_name = 'AnonymousPro' -> export var _font_name = 'AnonymousPro' #(String, 'AnonymousPro', 'CourierPrime')   GDScript
-		line = reg_export_advanced.sub(line, "export var $2$3 # ($1)");
+	// export(float) var lifetime = 3.0 -> export var lifetime: float = 3.0     GDScript
+	line = reg_container.reg_export.sub(line, "export var $2: $1");
 
-		// Setget Setget
-		line = reg_setget_setget.sub(line, "var $1$2:\n\tget:\n\t\treturn $1 # TODOConverter40 Copy here content of $4\n\tset(mod_value):\n\t\tmod_value  # TODOConverter40 Copy here content of $3", true);
+	// export(String, 'AnonymousPro', 'CourierPrime') var _font_name = 'AnonymousPro' -> export var _font_name = 'AnonymousPro' #(String, 'AnonymousPro', 'CourierPrime')   GDScript
+	line = reg_container.reg_export_advanced.sub(line, "export var $2$3 # ($1)");
 
-		// Setget set
-		line = reg_setget_set.sub(line, "var $1$2:\n\tget:\n\t\treturn $1 # TODOConverter40 Non existent get function \n\tset(mod_value):\n\t\tmod_value  # TODOConverter40 Copy here content of $3", true);
+	// Setget Setget
+	line = reg_container.reg_setget_setget.sub(line, "var $1$2:\n\tget:\n\t\treturn $1 # TODOConverter40 Copy here content of $4\n\tset(mod_value):\n\t\tmod_value  # TODOConverter40 Copy here content of $3", true);
 
-		// Setget get
-		line = reg_setget_get.sub(line, "var $1$2:\n\tget:\n\t\treturn $1 # TODOConverter40 Copy here content of $3 \n\tset(mod_value):\n\t\tmod_value  # TODOConverter40  Non existent set function", true);
+	// Setget set
+	line = reg_container.reg_setget_set.sub(line, "var $1$2:\n\tget:\n\t\treturn $1 # TODOConverter40 Non existent get function \n\tset(mod_value):\n\t\tmod_value  # TODOConverter40 Copy here content of $3", true);
 
-		// OS.window_fullscreen = true -> ProjectSettings.set("display/window/size/fullscreen",true)
-		line = reg_os_fullscreen.sub(line, "ProjectSettings.set(\"display/window/size/fullscreen\", $1)", true);
+	// Setget get
+	line = reg_container.reg_setget_get.sub(line, "var $1$2:\n\tget:\n\t\treturn $1 # TODOConverter40 Copy here content of $3 \n\tset(mod_value):\n\t\tmod_value  # TODOConverter40  Non existent set function", true);
 
-		// -- r.move_and_slide( a, b, c, d, e )  ->  r.set_motion_velocity(a) ... r.move_and_slide()         KinematicBody
-		if (line.find("move_and_slide(") != -1) {
-			int start = line.find("move_and_slide(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				String base_obj = get_object_of_execution(line.substr(0, start));
-				String starting_space = get_starting_space(line);
+	// OS.window_fullscreen = true -> ProjectSettings.set("display/window/size/fullscreen",true)
+	if (builtin) {
+		line = reg_container.reg_os_fullscreen.sub(line, "ProjectSettings.set(\\\"display/window/size/fullscreen\\\", $1)", true);
+	} else {
+		line = reg_container.reg_os_fullscreen.sub(line, "ProjectSettings.set(\"display/window/size/fullscreen\", $1)", true);
+	}
 
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() >= 1) {
-					String line_new;
+	// Instantiate
+	line = reg_container.reg_instantiate.sub(line, ".instantiate($1)", true);
 
-					// motion_velocity
-					line_new += starting_space + base_obj + "set_motion_velocity(" + parts[0] + ")\n";
+	// -- r.move_and_slide( a, b, c, d, e )  ->  r.set_velocity(a) ... r.move_and_slide()         KinematicBody
+	if (line.find("move_and_slide(") != -1) {
+		int start = line.find("move_and_slide(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			String base_obj = get_object_of_execution(line.substr(0, start));
+			String starting_space = get_starting_space(line);
 
-					// up_direction
-					if (parts.size() >= 2) {
-						line_new += starting_space + base_obj + "set_up_direction(" + parts[1] + ")\n";
-					}
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() >= 1) {
+				String line_new;
 
-					// stop_on_slope
-					if (parts.size() >= 3) {
-						line_new += starting_space + base_obj + "set_floor_stop_on_slope_enabled(" + parts[2] + ")\n";
-					}
+				// motion_velocity
+				line_new += starting_space + base_obj + "set_velocity(" + parts[0] + ")\n";
 
-					// max_slides
-					if (parts.size() >= 4) {
-						line_new += starting_space + base_obj + "set_max_slides(" + parts[3] + ")\n";
-					}
+				// up_direction
+				if (parts.size() >= 2) {
+					line_new += starting_space + base_obj + "set_up_direction(" + parts[1] + ")\n";
+				}
 
-					// floor_max_angle
-					if (parts.size() >= 5) {
-						line_new += starting_space + base_obj + "set_floor_max_angle(" + parts[4] + ")\n";
-					}
+				// stop_on_slope
+				if (parts.size() >= 3) {
+					line_new += starting_space + base_obj + "set_floor_stop_on_slope_enabled(" + parts[2] + ")\n";
+				}
 
-					// infiinite_interia
-					if (parts.size() >= 6) {
-						line_new += starting_space + "# TODOConverter40 infinite_inertia were removed in Godot 4.0 - previous value `" + parts[5] + "`\n";
-					}
+				// max_slides
+				if (parts.size() >= 4) {
+					line_new += starting_space + base_obj + "set_max_slides(" + parts[3] + ")\n";
+				}
+
+				// floor_max_angle
+				if (parts.size() >= 5) {
+					line_new += starting_space + base_obj + "set_floor_max_angle(" + parts[4] + ")\n";
+				}
 
-					line = line_new + line.substr(0, start) + "move_and_slide()" + line.substr(end + start);
+				// infiinite_interia
+				if (parts.size() >= 6) {
+					line_new += starting_space + "# TODOConverter40 infinite_inertia were removed in Godot 4.0 - previous value `" + parts[5] + "`\n";
 				}
+
+				line_new += starting_space + base_obj + "move_and_slide()\n";
+				line = line_new + line.substr(0, start) + "velocity" + line.substr(end + start);
 			}
 		}
+	}
 
-		// -- r.move_and_slide_with_snap( a, b, c, d, e )  ->  r.set_motion_velocity(a) ... r.move_and_slide()         KinematicBody
-		if (line.find("move_and_slide_with_snap(") != -1) {
-			int start = line.find("move_and_slide_with_snap(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				String base_obj = get_object_of_execution(line.substr(0, start));
-				String starting_space = get_starting_space(line);
-
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() >= 1) {
-					String line_new;
+	// -- r.move_and_slide_with_snap( a, b, c, d, e )  ->  r.set_velocity(a) ... r.move_and_slide()         KinematicBody
+	if (line.find("move_and_slide_with_snap(") != -1) {
+		int start = line.find("move_and_slide_with_snap(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			String base_obj = get_object_of_execution(line.substr(0, start));
+			String starting_space = get_starting_space(line);
 
-					// motion_velocity
-					line_new += starting_space + base_obj + "set_motion_velocity(" + parts[0] + ")\n";
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() >= 1) {
+				String line_new;
 
-					// snap
-					if (parts.size() >= 2) {
-						line_new += starting_space + "# TODOConverter40 looks that snap in Godot 4.0 is float, not vector like in Godot 3 - previous value `" + parts[1] + "`\n";
-					}
+				// motion_velocity
+				line_new += starting_space + base_obj + "set_velocity(" + parts[0] + ")\n";
 
-					// up_direction
-					if (parts.size() >= 3) {
-						line_new += starting_space + base_obj + "set_up_direction(" + parts[2] + ")\n";
-					}
+				// snap
+				if (parts.size() >= 2) {
+					line_new += starting_space + "# TODOConverter40 looks that snap in Godot 4.0 is float, not vector like in Godot 3 - previous value `" + parts[1] + "`\n";
+				}
 
-					// stop_on_slope
-					if (parts.size() >= 4) {
-						line_new += starting_space + base_obj + "set_floor_stop_on_slope_enabled(" + parts[3] + ")\n";
-					}
+				// up_direction
+				if (parts.size() >= 3) {
+					line_new += starting_space + base_obj + "set_up_direction(" + parts[2] + ")\n";
+				}
 
-					// max_slides
-					if (parts.size() >= 5) {
-						line_new += starting_space + base_obj + "set_max_slides(" + parts[4] + ")\n";
-					}
+				// stop_on_slope
+				if (parts.size() >= 4) {
+					line_new += starting_space + base_obj + "set_floor_stop_on_slope_enabled(" + parts[3] + ")\n";
+				}
 
-					// floor_max_angle
-					if (parts.size() >= 6) {
-						line_new += starting_space + base_obj + "set_floor_max_angle(" + parts[5] + ")\n";
-					}
+				// max_slides
+				if (parts.size() >= 5) {
+					line_new += starting_space + base_obj + "set_max_slides(" + parts[4] + ")\n";
+				}
 
-					// infiinite_interia
-					if (parts.size() >= 7) {
-						line_new += starting_space + "# TODOConverter40 infinite_inertia were removed in Godot 4.0 - previous value `" + parts[6] + "`\n";
-					}
+				// floor_max_angle
+				if (parts.size() >= 6) {
+					line_new += starting_space + base_obj + "set_floor_max_angle(" + parts[5] + ")\n";
+				}
 
-					line = line_new + line.substr(0, start) + "move_and_slide()" + line.substr(end + start);
+				// infiinite_interia
+				if (parts.size() >= 7) {
+					line_new += starting_space + "# TODOConverter40 infinite_inertia were removed in Godot 4.0 - previous value `" + parts[6] + "`\n";
 				}
+
+				line_new += starting_space + base_obj + "move_and_slide()\n";
+				line = line_new + line.substr(0, start) + "velocity" + line.substr(end + start); // move_and_slide used to return velocity
 			}
 		}
+	}
 
-		// -- sort_custom( a , b )  ->  sort_custom(Callable( a , b ))            Object
-		if (line.find("sort_custom(") != -1) {
-			int start = line.find("sort_custom(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 2) {
-					line = line.substr(0, start) + "sort_custom(Callable(" + parts[0] + "," + parts[1] + "))" + line.substr(end + start);
-				}
+	// -- sort_custom( a , b )  ->  sort_custom(Callable( a , b ))            Object
+	if (line.find("sort_custom(") != -1) {
+		int start = line.find("sort_custom(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() == 2) {
+				line = line.substr(0, start) + "sort_custom(Callable(" + parts[0] + "," + parts[1] + "))" + line.substr(end + start);
 			}
 		}
+	}
 
-		// -- draw_line(1,2,3,4,5) -> draw_line(1,2,3,4)            CanvasItem
-		if (line.find("draw_line(") != -1) {
-			int start = line.find("draw_line(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 5) {
-					line = line.substr(0, start) + "draw_line(" + parts[0] + "," + parts[1] + "," + parts[2] + "," + parts[3] + ")" + line.substr(end + start);
-				}
-			}
+	// -- list_dir_begin( )  ->  list_dir_begin()            Object
+	if (line.find("list_dir_begin(") != -1) {
+		int start = line.find("list_dir_begin(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			line = line.substr(0, start) + "list_dir_begin() " + line.substr(end + start) + "# TODOGODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547";
 		}
+	}
 
-		// -- func c(var a, var b) -> func c(a, b)
-		if (line.find("func ") != -1 && line.find("var ") != -1) {
-			int start = line.find("func ");
-			start = line.substr(start).find("(") + start;
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
+	// -- draw_line(1,2,3,4,5) -> draw_line(1,2,3,4)            CanvasItem
+	if (line.find("draw_line(") != -1) {
+		int start = line.find("draw_line(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() == 5) {
+				line = line.substr(0, start) + "draw_line(" + parts[0] + "," + parts[1] + "," + parts[2] + "," + parts[3] + ")" + line.substr(end + start);
+			}
+		}
+	}
 
-				String start_string = line.substr(0, start) + "(";
-				for (int i = 0; i < parts.size(); i++) {
-					start_string += parts[i].strip_edges().trim_prefix("var ");
-					if (i != parts.size() - 1) {
-						start_string += ", ";
-					}
+	// -- func c(var a, var b) -> func c(a, b)
+	if (line.find("func ") != -1 && line.find("var ") != -1) {
+		int start = line.find("func ");
+		start = line.substr(start).find("(") + start;
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+
+			String start_string = line.substr(0, start) + "(";
+			for (int i = 0; i < parts.size(); i++) {
+				start_string += parts[i].strip_edges().trim_prefix("var ");
+				if (i != parts.size() - 1) {
+					start_string += ", ";
 				}
-				line = start_string + ")" + line.substr(end + start);
 			}
+			line = start_string + ")" + line.substr(end + start);
 		}
+	}
 
-		// -- yield(this, \"timeout\") -> await this.timeout         GDScript
-		if (line.find("yield(") != -1) {
-			int start = line.find("yield(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 2) {
+	// -- yield(this, \"timeout\") -> await this.timeout         GDScript
+	if (line.find("yield(") != -1) {
+		int start = line.find("yield(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() == 2) {
+				if (builtin) {
+					line = line.substr(0, start) + "await " + parts[0] + "." + parts[1].replace("\\\"", "").replace("\\'", "").replace(" ", "") + line.substr(end + start);
+				} else {
 					line = line.substr(0, start) + "await " + parts[0] + "." + parts[1].replace("\"", "").replace("\'", "").replace(" ", "") + line.substr(end + start);
 				}
 			}
 		}
+	}
 
-		// -- parse_json( AA ) -> TODO       Object
-		if (line.find("parse_json(") != -1) {
-			int start = line.find("parse_json(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				line = line.substr(0, start) + "JSON.new().stringify(" + connect_arguments(parts, 0) + ")" + line.substr(end + start);
-			}
+	// -- parse_json( AA ) -> TODO       Object
+	if (line.find("parse_json(") != -1) {
+		int start = line.find("parse_json(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			line = line.substr(0, start) + "JSON.new().stringify(" + connect_arguments(parts, 0) + ")" + line.substr(end + start);
 		}
+	}
 
-		// -- .xform(Vector3(a,b,c)) -> * Vector3(a,b,c)            Transform
-		if (line.find(".xform(") != -1) {
-			int start = line.find(".xform(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 1) {
-					line = line.substr(0, start) + " * " + parts[0] + line.substr(end + start);
-				}
+	// -- .xform(Vector3(a,b,c)) -> * Vector3(a,b,c)            Transform
+	if (line.find(".xform(") != -1) {
+		int start = line.find(".xform(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() == 1) {
+				line = line.substr(0, start) + " * " + parts[0] + line.substr(end + start);
 			}
 		}
+	}
 
-		// -- .xform_inv(Vector3(a,b,c)) -> / Vector3(a,b,c)       Transform
-		if (line.find(".xform_inv(") != -1) {
-			int start = line.find(".xform_inv(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
+	// -- .xform_inv(Vector3(a,b,c)) -> * Vector3(a,b,c)       Transform
+	if (line.find(".xform_inv(") != -1) {
+		int start = line.find(".xform_inv(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			String object_exec = get_object_of_execution(line.substr(0, start));
+			if (line.find(object_exec + ".xform") != -1) {
+				int start2 = line.find(object_exec + ".xform");
 				Vector<String> parts = parse_arguments(line.substr(start, end));
 				if (parts.size() == 1) {
-					line = line.substr(0, start) + " / " + parts[0] + line.substr(end + start);
+					line = line.substr(0, start2) + parts[0] + " * " + object_exec + line.substr(end + start);
 				}
 			}
 		}
+	}
 
-		// -- connect(,,,things) -> connect(,Callable(,),things)      Object
-		if (line.find("connect(") != -1) {
-			int start = line.find("connect(");
-			// Protection from disconnect
-			if (start == 0 || line.get(start - 1) != 's') {
-				int end = get_end_parenthess(line.substr(start)) + 1;
-				if (end > -1) {
-					Vector<String> parts = parse_arguments(line.substr(start, end));
-					if (parts.size() >= 3) {
-						line = line.substr(0, start) + "connect(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + ")" + connect_arguments(parts, 3) + ")" + line.substr(end + start);
-					}
-				}
-			}
-		}
-		// -- disconnect(a,b,c) -> disconnect(a,Callable(b,c))      Object
-		if (line.find("disconnect(") != -1) {
-			int start = line.find("disconnect(");
+	// -- "(connect(A,B,C,D,E) != OK):", "(connect(A,Callable(B,C).bind(D),E)      Object
+	if (line.find("connect(") != -1) {
+		int start = line.find("connect(");
+		// Protection from disconnect
+		if (start == 0 || line.get(start - 1) != 's') {
 			int end = get_end_parenthess(line.substr(start)) + 1;
 			if (end > -1) {
 				Vector<String> parts = parse_arguments(line.substr(start, end));
 				if (parts.size() == 3) {
-					line = line.substr(0, start) + "disconnect(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
+					line = line.substr(0, start) + "connect(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
+				} else if (parts.size() >= 4) {
+					line = line.substr(0, start) + "connect(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + ").bind(" + parts[3].lstrip("[").rstrip("]") + ")" + connect_arguments(parts, 4) + ")" + line.substr(end + start);
 				}
 			}
 		}
-		// -- is_connected(a,b,c) -> is_connected(a,Callable(b,c))      Object
-		if (line.find("is_connected(") != -1) {
-			int start = line.find("is_connected(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 3) {
-					line = line.substr(0, start) + "is_connected(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
-				}
+	}
+	// -- disconnect(a,b,c) -> disconnect(a,Callable(b,c))      Object
+	if (line.find("disconnect(") != -1) {
+		int start = line.find("disconnect(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() == 3) {
+				line = line.substr(0, start) + "disconnect(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
 			}
 		}
-		// -- start(a,b,c) -> start(a,Callable(b,c))      Thread
-		if (line.find("start(") != -1) {
-			int start = line.find("start(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() >= 3) {
-					line = line.substr(0, start) + "start(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + ")" + connect_arguments(parts, 3) + ")" + line.substr(end + start);
-				}
+	}
+	// -- is_connected(a,b,c) -> is_connected(a,Callable(b,c))      Object
+	if (line.find("is_connected(") != -1) {
+		int start = line.find("is_connected(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() == 3) {
+				line = line.substr(0, start) + "is_connected(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
 			}
 		}
-		// -- func _init(p_x:int)->void:  -> func _init(p_x:int):    Object # https://github.com/godotengine/godot/issues/50589
-		if (line.find(" _init(") != -1) {
-			int start = line.find(" _init(");
-			int end = line.rfind(":") + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				line = line.substr(0, start) + " _init(" + connect_arguments(parts, 0) + "):" + line.substr(end + start);
+	}
+	// -- "(tween_method(A,B,C,D,E) != OK):", "(tween_method(Callable(A,B),C,D,E)      Object
+	// -- "(tween_method(A,B,C,D,E,[F,G]) != OK):", "(tween_method(Callable(A,B).bind(F,G),C,D,E)      Object
+	if (line.find("tween_method(") != -1) {
+		int start = line.find("tween_method(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() == 5) {
+				line = line.substr(0, start) + "tween_method(Callable(" + parts[0] + "," + parts[1] + ")," + parts[2] + "," + parts[3] + "," + parts[4] + ")" + line.substr(end + start);
+			} else if (parts.size() >= 6) {
+				line = line.substr(0, start) + "tween_method(Callable(" + parts[0] + "," + parts[1] + ").bind(" + connect_arguments(parts, 5).substr(1).lstrip("[").rstrip("]") + ")," + parts[2] + "," + parts[3] + "," + parts[4] + ")" + line.substr(end + start);
 			}
 		}
-		//  assert(speed < 20, str(randi()%10))  ->  assert(speed < 20) #,str(randi()%10))    GDScript - GDScript bug constant message
-		if (line.find("assert(") != -1) {
-			int start = line.find("assert(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 2) {
-					line = line.substr(0, start) + "assert(" + parts[0] + ") " + line.substr(end + start) + "#," + parts[1] + ")";
-				}
+	}
+	// -- "(tween_callback(A,B,[C,D]) != OK):", "(connect(Callable(A,B).bind(C,D))      Object
+	if (line.find("tween_callback(") != -1) {
+		int start = line.find("tween_callback(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() == 2) {
+				line = line.substr(0, start) + "tween_callback(Callable(" + parts[0] + "," + parts[1] + "))" + line.substr(end + start);
+			} else if (parts.size() >= 3) {
+				line = line.substr(0, start) + "tween_callback(Callable(" + parts[0] + "," + parts[1] + ").bind(" + connect_arguments(parts, 2).substr(1).lstrip("[").rstrip("]") + "))" + line.substr(end + start);
 			}
 		}
-		//  create_from_image(aa, bb)  ->   create_from_image(aa) #, bb   ImageTexture
-		if (line.find("create_from_image(") != -1) {
-			int start = line.find("create_from_image(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
+	}
+	// -- start(a,b) -> start(Callable(a,b))      Thread
+	// -- start(a,b,c,d) -> start(Callable(a,b).bind(c),d)      Thread
+	if (line.find("start(") != -1) {
+		int start = line.find("start(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		// Protection from 'func start'
+		if (!line.begins_with("func ")) {
 			if (end > -1) {
 				Vector<String> parts = parse_arguments(line.substr(start, end));
 				if (parts.size() == 2) {
-					line = line.substr(0, start) + "create_from_image(" + parts[0] + ") " + "#," + parts[1] + line.substr(end + start);
+					line = line.substr(0, start) + "start(Callable(" + parts[0] + "," + parts[1] + "))" + line.substr(end + start);
+				} else if (parts.size() >= 3) {
+					line = line.substr(0, start) + "start(Callable(" + parts[0] + "," + parts[1] + ").bind(" + parts[2] + ")" + connect_arguments(parts, 3) + ")" + line.substr(end + start);
 				}
 			}
 		}
-		//  set_cell_item(a, b, c, d ,e)  ->   set_cell_item(Vector3(a, b, c), d ,e)
-		if (line.find("set_cell_item(") != -1) {
-			int start = line.find("set_cell_item(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() > 2) {
-					line = line.substr(0, start) + "set_cell_item( Vector3(" + parts[0] + "," + parts[1] + "," + parts[2] + ") " + connect_arguments(parts, 3) + ")" + line.substr(end + start);
-				}
+	}
+	// -- func _init(p_x:int)->void:  -> func _init(p_x:int):    Object # https://github.com/godotengine/godot/issues/50589
+	if (line.find(" _init(") != -1) {
+		int start = line.find(" _init(");
+		int end = line.rfind(":") + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			line = line.substr(0, start) + " _init(" + connect_arguments(parts, 0) + "):" + line.substr(end + start);
+		}
+	}
+	//  assert(speed < 20, str(randi()%10))  ->  assert(speed < 20) #,str(randi()%10))    GDScript - GDScript bug constant message
+	if (line.find("assert(") != -1) {
+		int start = line.find("assert(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() == 2) {
+				line = line.substr(0, start) + "assert(" + parts[0] + ") " + line.substr(end + start) + "#," + parts[1] + ")";
 			}
 		}
-		//  get_cell_item(a, b, c)  ->   get_cell_item(Vector3i(a, b, c))
-		if (line.find("get_cell_item(") != -1) {
-			int start = line.find("get_cell_item(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 3) {
-					line = line.substr(0, start) + "get_cell_item(Vector3i(" + parts[0] + "," + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
-				}
+	}
+	//  create_from_image(aa, bb)  ->   create_from_image(aa) #, bb   ImageTexture
+	if (line.find("create_from_image(") != -1) {
+		int start = line.find("create_from_image(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() == 2) {
+				line = line.substr(0, start) + "create_from_image(" + parts[0] + ") " + "#," + parts[1] + line.substr(end + start);
 			}
 		}
-		//  get_cell_item_orientation(a, b, c)  ->   get_cell_item_orientation(Vector3i(a, b, c))
-		if (line.find("get_cell_item_orientation(") != -1) {
-			int start = line.find("get_cell_item_orientation(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 3) {
-					line = line.substr(0, start) + "get_cell_item_orientation(Vector3i(" + parts[0] + "," + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
-				}
+	}
+	//  set_cell_item(a, b, c, d ,e)  ->   set_cell_item(Vector3(a, b, c), d ,e)
+	if (line.find("set_cell_item(") != -1) {
+		int start = line.find("set_cell_item(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() > 2) {
+				line = line.substr(0, start) + "set_cell_item( Vector3(" + parts[0] + "," + parts[1] + "," + parts[2] + ") " + connect_arguments(parts, 3) + ")" + line.substr(end + start);
 			}
 		}
-
-		//  apply_impulse(A, B)  ->   apply_impulse(B, A)
-		if (line.find("apply_impulse(") != -1) {
-			int start = line.find("apply_impulse(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 2) {
-					line = line.substr(0, start) + "apply_impulse(" + parts[1] + ", " + parts[0] + ")" + line.substr(end + start);
-				}
+	}
+	//  get_cell_item(a, b, c)  ->   get_cell_item(Vector3i(a, b, c))
+	if (line.find("get_cell_item(") != -1) {
+		int start = line.find("get_cell_item(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() == 3) {
+				line = line.substr(0, start) + "get_cell_item(Vector3i(" + parts[0] + "," + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
 			}
 		}
-		//  apply_force(A, B)  ->   apply_force(B, A)
-		if (line.find("apply_force(") != -1) {
-			int start = line.find("apply_force(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 2) {
-					line = line.substr(0, start) + "apply_force(" + parts[1] + ", " + parts[0] + ")" + line.substr(end + start);
-				}
+	}
+	//  get_cell_item_orientation(a, b, c)  ->   get_cell_item_orientation(Vector3i(a, b, c))
+	if (line.find("get_cell_item_orientation(") != -1) {
+		int start = line.find("get_cell_item_orientation(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() == 3) {
+				line = line.substr(0, start) + "get_cell_item_orientation(Vector3i(" + parts[0] + "," + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
 			}
 		}
-		//  map_to_world(a, b, c)  ->   map_to_world(Vector3i(a, b, c))
-		if (line.find("map_to_world(") != -1) {
-			int start = line.find("get_cell_item_orientation(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 3) {
-					line = line.substr(0, start) + "map_to_world(Vector3i(" + parts[0] + "," + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
-				}
+	}
+	//  apply_impulse(A, B)  ->   apply_impulse(B, A)
+	if (line.find("apply_impulse(") != -1) {
+		int start = line.find("apply_impulse(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() == 2) {
+				line = line.substr(0, start) + "apply_impulse(" + parts[1] + ", " + parts[0] + ")" + line.substr(end + start);
 			}
 		}
-
-		if (old_line != line) {
-			found_things.append(simple_line_formatter(current_line, old_line, line));
+	}
+	//  apply_force(A, B)  ->   apply_force(B, A)
+	if (line.find("apply_force(") != -1) {
+		int start = line.find("apply_force(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() == 2) {
+				line = line.substr(0, start) + "apply_force(" + parts[1] + ", " + parts[0] + ")" + line.substr(end + start);
+			}
+		}
+	}
+	//  map_to_world(a, b, c)  ->   map_to_world(Vector3i(a, b, c))
+	if (line.find("map_to_world(") != -1) {
+		int start = line.find("map_to_world(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() == 3) {
+				line = line.substr(0, start) + "map_to_world(Vector3i(" + parts[0] + "," + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
+			}
+		}
+	}
+	//  OS.get_window_safe_area()  ->   DisplayServer.get_display_safe_area()
+	if (line.find("OS.get_window_safe_area(") != -1) {
+		int start = line.find("OS.get_window_safe_area(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() == 0) {
+				line = line.substr(0, start) + "DisplayServer.get_display_safe_area()" + line.substr(end + start);
+			}
 		}
 	}
-
-	return found_things;
 }
 
-void ProjectConverter3To4::rename_csharp_functions(String &file_content) {
-	// Custom renaming, each rule needs to be set manually
-	// Don't forget to put validate each rule in validate_conversion function
-	Vector<String> lines = file_content.split("\n");
+void ProjectConverter3To4::process_csharp_line(String &line) {
+	// TODO maybe this can be changed to normal rule
+	line = line.replace("OS.GetWindowSafeArea()", "DisplayServer.ScreenGetUsableRect()");
 
-	for (String &line : lines) {
-		// TODO maybe this can be changed to normal rule
-		line = line.replace("OS.GetWindowSafeArea()", "DisplayServer.ScreenGetUsableRect()");
-
-		// -- Connect(,,,things) -> Connect(,Callable(,),things)      Object
-		if (line.find("Connect(") != -1) {
-			int start = line.find("Connect(");
-			// Protection from disconnect
-			if (start == 0 || line.get(start - 1) != 's') {
-				int end = get_end_parenthess(line.substr(start)) + 1;
-				if (end > -1) {
-					Vector<String> parts = parse_arguments(line.substr(start, end));
-					if (parts.size() >= 3) {
-						line = line.substr(0, start) + "Connect(" + parts[0] + ",new Callable(" + parts[1] + "," + parts[2] + ")" + connect_arguments(parts, 3) + ")" + line.substr(end + start);
-					}
-				}
-			}
-		}
-		// -- Disconnect(a,b,c) -> Disconnect(a,Callable(b,c))      Object
-		if (line.find("Disconnect(") != -1) {
-			int start = line.find("Disconnect(");
+	// -- Connect(,,,things) -> Connect(,Callable(,),things)      Object
+	if (line.find("Connect(") != -1) {
+		int start = line.find("Connect(");
+		// Protection from disconnect
+		if (start == 0 || line.get(start - 1) != 's') {
 			int end = get_end_parenthess(line.substr(start)) + 1;
 			if (end > -1) {
 				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 3) {
-					line = line.substr(0, start) + "Disconnect(" + parts[0] + ",new Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
+				if (parts.size() >= 3) {
+					line = line.substr(0, start) + "Connect(" + parts[0] + ",new Callable(" + parts[1] + "," + parts[2] + ")" + connect_arguments(parts, 3) + ")" + line.substr(end + start);
 				}
 			}
 		}
-		// -- IsConnected(a,b,c) -> IsConnected(a,Callable(b,c))      Object
-		if (line.find("IsConnected(") != -1) {
-			int start = line.find("IsConnected(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 3) {
-					line = line.substr(0, start) + "IsConnected(" + parts[0] + ",new Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
-				}
+	}
+	// -- Disconnect(a,b,c) -> Disconnect(a,Callable(b,c))      Object
+	if (line.find("Disconnect(") != -1) {
+		int start = line.find("Disconnect(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() == 3) {
+				line = line.substr(0, start) + "Disconnect(" + parts[0] + ",new Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
+			}
+		}
+	}
+	// -- IsConnected(a,b,c) -> IsConnected(a,Callable(b,c))      Object
+	if (line.find("IsConnected(") != -1) {
+		int start = line.find("IsConnected(");
+		int end = get_end_parenthess(line.substr(start)) + 1;
+		if (end > -1) {
+			Vector<String> parts = parse_arguments(line.substr(start, end));
+			if (parts.size() == 3) {
+				line = line.substr(0, start) + "IsConnected(" + parts[0] + ",new Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
 			}
 		}
 	}
+}
+
+void ProjectConverter3To4::rename_csharp_functions(String &file_content) {
+	Vector<String> lines = file_content.split("\n");
+
+	for (String &line : lines) {
+		process_csharp_line(line);
+	}
 
 	// Collect vector to string
 	file_content = "";
@@ -3556,47 +3270,7 @@ Vector<String> ProjectConverter3To4::check_for_rename_csharp_functions(Vector<St
 
 	for (String &line : file_content) {
 		String old_line = line;
-
-		// TODO maybe this can be changed to normal rule
-		line = line.replace("OS.GetWindowSafeArea()", "DisplayServer.ScreenGetUsableRect()");
-
-		// -- Connect(,,,things) -> connect(,Callable(,),things)      Object
-		if (line.find("Connect(") != -1) {
-			int start = line.find("Connect(");
-			// Protection from disconnect
-			if (start == 0 || line.get(start - 1) != 's') {
-				int end = get_end_parenthess(line.substr(start)) + 1;
-				if (end > -1) {
-					Vector<String> parts = parse_arguments(line.substr(start, end));
-					if (parts.size() >= 3) {
-						line = line.substr(0, start) + "Connect(" + parts[0] + ",new Callable(" + parts[1] + "," + parts[2] + ")" + connect_arguments(parts, 3) + ")" + line.substr(end + start);
-					}
-				}
-			}
-		}
-		// -- Disconnect(a,b,c) -> Disconnect(a,Callable(b,c))      Object
-		if (line.find("Disconnect(") != -1) {
-			int start = line.find("Disconnect(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 3) {
-					line = line.substr(0, start) + "Disconnect(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
-				}
-			}
-		}
-		// -- IsConnected(a,b,c) -> IsConnected(a,Callable(b,c))      Object
-		if (line.find("IsConnected(") != -1) {
-			int start = line.find("IsConnected(");
-			int end = get_end_parenthess(line.substr(start)) + 1;
-			if (end > -1) {
-				Vector<String> parts = parse_arguments(line.substr(start, end));
-				if (parts.size() == 3) {
-					line = line.substr(0, start) + "IsConnected(" + parts[0] + ",Callable(" + parts[1] + "," + parts[2] + "))" + line.substr(end + start);
-				}
-			}
-		}
-
+		process_csharp_line(line);
 		if (old_line != line) {
 			found_things.append(simple_line_formatter(current_line, old_line, line));
 		}
@@ -3605,88 +3279,205 @@ Vector<String> ProjectConverter3To4::check_for_rename_csharp_functions(Vector<St
 	return found_things;
 }
 
-void ProjectConverter3To4::rename_gdscript_keywords(String &file_content){
-	{ RegEx reg_tool = RegEx("([\n]+)tool");
-CRASH_COND(!reg_tool.is_valid());
-file_content = reg_tool.sub(file_content, "$1@tool", true);
-RegEx reg_tool2 = RegEx("^tool");
-CRASH_COND(!reg_tool2.is_valid());
-file_content = reg_tool2.sub(file_content, "@tool", true);
-}
-{
-	RegEx reg_export = RegEx("([\n\t]+)export\\b");
-	CRASH_COND(!reg_export.is_valid());
-	file_content = reg_export.sub(file_content, "$1@export", true);
-	RegEx reg_export2 = RegEx("^export");
-	CRASH_COND(!reg_export2.is_valid());
-	file_content = reg_export2.sub(file_content, "@export", true);
-}
-{
-	RegEx reg_onready = RegEx("([\n]+)onready");
-	CRASH_COND(!reg_onready.is_valid());
-	file_content = reg_onready.sub(file_content, "$1@onready", true);
-	RegEx reg_onready2 = RegEx("^onready");
-	CRASH_COND(!reg_onready2.is_valid());
-	file_content = reg_onready2.sub(file_content, "@onready", true);
-}
-{
-	RegEx reg_master = RegEx("([\n]+)master func");
-	CRASH_COND(!reg_master.is_valid());
-	file_content = reg_master.sub(file_content, "$1@rpc(any) func", true);
-	RegEx reg_master2 = RegEx("^master func");
-	CRASH_COND(!reg_master2.is_valid());
-	file_content = reg_master2.sub(file_content, "@rpc(any) func", true);
-}
-{
-	RegEx reg_puppet = RegEx("([\n]+)puppet func");
-	CRASH_COND(!reg_puppet.is_valid());
-	file_content = reg_puppet.sub(file_content, "$1@rpc(auth) func", true);
-	RegEx reg_puppet2 = RegEx("^puppet func");
-	CRASH_COND(!reg_puppet2.is_valid());
-	file_content = reg_puppet2.sub(file_content, "@rpc(auth) func", true);
-}
-{
-	RegEx reg_remote = RegEx("([\n]+)remote func");
-	CRASH_COND(!reg_remote.is_valid());
-	file_content = reg_remote.sub(file_content, "$1@rpc(any) func", true);
-	RegEx reg_remote2 = RegEx("^remote func");
-	CRASH_COND(!reg_remote2.is_valid());
-	file_content = reg_remote2.sub(file_content, "@rpc(any) func", true);
-}
-{
-	RegEx reg_remotesync = RegEx("([\n]+)remotesync func");
-	CRASH_COND(!reg_remotesync.is_valid());
-	file_content = reg_remotesync.sub(file_content, "$1@rpc(any,sync) func", true);
-	RegEx reg_remotesync2 = RegEx("^remotesync func");
-	CRASH_COND(!reg_remotesync2.is_valid());
-	file_content = reg_remotesync2.sub(file_content, "@rpc(any,sync) func", true);
-}
-{
-	RegEx reg_sync = RegEx("([\n]+)sync func");
-	CRASH_COND(!reg_sync.is_valid());
-	file_content = reg_sync.sub(file_content, "$1@rpc(any,sync) func", true);
-	RegEx reg_sync2 = RegEx("^sync func");
-	CRASH_COND(!reg_sync2.is_valid());
-	file_content = reg_sync2.sub(file_content, "@rpc(any,sync) func", true);
-}
-{
-	RegEx reg_puppetsync = RegEx("([\n]+)puppetsync func");
-	CRASH_COND(!reg_puppetsync.is_valid());
-	file_content = reg_puppetsync.sub(file_content, "$1@rpc(auth,sync) func", true);
-	RegEx reg_puppetsync2 = RegEx("^puppetsync func");
-	CRASH_COND(!reg_puppetsync2.is_valid());
-	file_content = reg_puppetsync2.sub(file_content, "@rpc(auth,sync) func", true);
+void ProjectConverter3To4::rename_csharp_attributes(String &file_content) {
+	// -- [Remote] -> [RPC(MultiplayerAPI.RPCMode.AnyPeer)]
+	{
+		RegEx reg_remote = RegEx("\\[Remote(Attribute)?(\\(\\))?\\]");
+		CRASH_COND(!reg_remote.is_valid());
+		file_content = reg_remote.sub(file_content, "[RPC(MultiplayerAPI.RPCMode.AnyPeer)]", true);
+	}
+	// -- [RemoteSync] -> [RPC(MultiplayerAPI.RPCMode.AnyPeer, CallLocal = true)]
+	{
+		RegEx reg_remotesync = RegEx("\\[(Remote)?Sync(Attribute)?(\\(\\))?\\]");
+		CRASH_COND(!reg_remotesync.is_valid());
+		file_content = reg_remotesync.sub(file_content, "[RPC(MultiplayerAPI.RPCMode.AnyPeer, CallLocal = true)]", true);
+	}
+	// -- [Puppet] -> [RPC]
+	{
+		RegEx reg_puppet = RegEx("\\[(Puppet|Slave)(Attribute)?(\\(\\))?\\]");
+		CRASH_COND(!reg_puppet.is_valid());
+		file_content = reg_puppet.sub(file_content, "[RPC]", true);
+	}
+	// -- [PuppetSync] -> [RPC(CallLocal = true)]
+	{
+		RegEx reg_puppetsync = RegEx("\\[PuppetSync(Attribute)?(\\(\\))?\\]");
+		CRASH_COND(!reg_puppetsync.is_valid());
+		file_content = reg_puppetsync.sub(file_content, "[RPC(CallLocal = true)]", true);
+	}
+	String error_message = "The master and mastersync rpc behavior is not officially supported anymore. Try using another keyword or making custom logic using Multiplayer.GetRemoteSenderId()\n";
+	// -- [Master] -> [RPC]
+	{
+		RegEx reg_remote = RegEx("\\[Master(Attribute)?(\\(\\))?\\]");
+		CRASH_COND(!reg_remote.is_valid());
+		file_content = reg_remote.sub(file_content, error_message + "[RPC]", true);
+	}
+	// -- [MasterSync] -> [RPC(CallLocal = true)]
+	{
+		RegEx reg_remote = RegEx("\\[MasterSync(Attribute)?(\\(\\))?\\]");
+		CRASH_COND(!reg_remote.is_valid());
+		file_content = reg_remote.sub(file_content, error_message + "[RPC(CallLocal = true)]", true);
+	}
 }
-{
-	RegEx reg_mastersync = RegEx("([\n]+)mastersync func");
-	CRASH_COND(!reg_mastersync.is_valid());
-	file_content = reg_mastersync.sub(file_content, "$1@rpc(any,sync) func", true);
-	RegEx reg_mastersync2 = RegEx("^mastersync func");
-	CRASH_COND(!reg_mastersync2.is_valid());
-	file_content = reg_mastersync2.sub(file_content, "@rpc(any,sync) func", true);
+
+Vector<String> ProjectConverter3To4::check_for_rename_csharp_attributes(Vector<String> &file_content) {
+	int current_line = 1;
+
+	Vector<String> found_things;
+
+	for (String &line : file_content) {
+		String old;
+		old = line;
+		{
+			RegEx regex = RegEx("\\[Remote(Attribute)?(\\(\\))?\\]");
+			CRASH_COND(!regex.is_valid());
+			line = regex.sub(line, "[RPC(MultiplayerAPI.RPCMode.AnyPeer)]", true);
+		}
+		if (old != line) {
+			found_things.append(line_formatter(current_line, "[Remote]", "[RPC(MultiplayerAPI.RPCMode.AnyPeer)]", line));
+		}
+		old = line;
+		{
+			RegEx regex = RegEx("\\[(Remote)?Sync(Attribute)?(\\(\\))?\\]");
+			CRASH_COND(!regex.is_valid());
+			line = regex.sub(line, "[RPC(MultiplayerAPI.RPCMode.AnyPeer, CallLocal = true)]", true);
+		}
+		if (old != line) {
+			found_things.append(line_formatter(current_line, "[RemoteSync]", "[RPC(MultiplayerAPI.RPCMode.AnyPeer, CallLocal = true)]", line));
+		}
+		old = line;
+		{
+			RegEx regex = RegEx("\\[Puppet(Attribute)?(\\(\\))?\\]");
+			CRASH_COND(!regex.is_valid());
+			line = regex.sub(line, "[RPC]", true);
+		}
+		if (old != line) {
+			found_things.append(line_formatter(current_line, "[Puppet]", "[RPC]", line));
+		}
+		old = line;
+		{
+			RegEx regex = RegEx("\\[(Puppet|Slave)Sync(Attribute)?(\\(\\))?\\]");
+			CRASH_COND(!regex.is_valid());
+			line = regex.sub(line, "[RPC(CallLocal = true)]", true);
+		}
+		if (old != line) {
+			found_things.append(line_formatter(current_line, "[PuppetSync]", "[RPC(CallLocal = true)]", line));
+		}
+		old = line;
+		{
+			RegEx regex = RegEx("\\[Master(Attribute)?(\\(\\))?\\]");
+			CRASH_COND(!regex.is_valid());
+			line = regex.sub(line, "[RPC]", true);
+		}
+		if (old != line) {
+			found_things.append(line_formatter(current_line, "[Master]", "[RPC]", line));
+		}
+		old = line;
+		{
+			RegEx regex = RegEx("\\[MasterSync(Attribute)?(\\(\\))?\\]");
+			CRASH_COND(!regex.is_valid());
+			line = regex.sub(line, "[RPC(CallLocal = true)]", true);
+		}
+		if (old != line) {
+			found_things.append(line_formatter(current_line, "[MasterSync]", "[RPC(CallLocal = true)]", line));
+		}
+
+		current_line++;
+	}
+
+	return found_things;
 }
+
+void ProjectConverter3To4::rename_gdscript_keywords(String &file_content) {
+	{
+		RegEx reg_first = RegEx("([\n]+)tool");
+		CRASH_COND(!reg_first.is_valid());
+		file_content = reg_first.sub(file_content, "$1@tool", true);
+		RegEx reg_second = RegEx("^tool");
+		CRASH_COND(!reg_second.is_valid());
+		file_content = reg_second.sub(file_content, "@tool", true);
+	}
+	{
+		RegEx reg_first = RegEx("([\n\t]+)export\\b");
+		CRASH_COND(!reg_first.is_valid());
+		file_content = reg_first.sub(file_content, "$1@export", true);
+		RegEx reg_second = RegEx("^export");
+		CRASH_COND(!reg_second.is_valid());
+		file_content = reg_second.sub(file_content, "@export", true);
+	}
+	{
+		RegEx reg_first = RegEx("([\n]+)onready");
+		CRASH_COND(!reg_first.is_valid());
+		file_content = reg_first.sub(file_content, "$1@onready", true);
+		RegEx reg_second = RegEx("^onready");
+		CRASH_COND(!reg_second.is_valid());
+		file_content = reg_second.sub(file_content, "@onready", true);
+	}
+	{
+		RegEx reg_first = RegEx("([\n]+)remote func");
+		CRASH_COND(!reg_first.is_valid());
+		file_content = reg_first.sub(file_content, "$1@rpc(any_peer) func", true);
+		RegEx reg_second = RegEx("^remote func");
+		CRASH_COND(!reg_second.is_valid());
+		file_content = reg_second.sub(file_content, "@rpc(any_peer) func", true);
+	}
+	{
+		RegEx reg_first = RegEx("([\n]+)remotesync func");
+		CRASH_COND(!reg_first.is_valid());
+		file_content = reg_first.sub(file_content, "$1@rpc(any_peer, call_local) func", true);
+		RegEx reg_second = RegEx("^remotesync func");
+		CRASH_COND(!reg_second.is_valid());
+		file_content = reg_second.sub(file_content, "@rpc(any_peer, call_local) func", true);
+	}
+	{
+		RegEx reg_first = RegEx("([\n]+)sync func");
+		CRASH_COND(!reg_first.is_valid());
+		file_content = reg_first.sub(file_content, "$1@rpc(any_peer, call_local) func", true);
+		RegEx reg_second = RegEx("^sync func");
+		CRASH_COND(!reg_second.is_valid());
+		file_content = reg_second.sub(file_content, "@rpc(any_peer, call_local) func", true);
+	}
+	{
+		RegEx reg_first = RegEx("([\n]+)slave func");
+		CRASH_COND(!reg_first.is_valid());
+		file_content = reg_first.sub(file_content, "$1@rpc func", true);
+		RegEx reg_second = RegEx("^slave func");
+		CRASH_COND(!reg_second.is_valid());
+		file_content = reg_second.sub(file_content, "@rpc func", true);
+	}
+	{
+		RegEx reg_first = RegEx("([\n]+)puppet func");
+		CRASH_COND(!reg_first.is_valid());
+		file_content = reg_first.sub(file_content, "$1@rpc func", true);
+		RegEx reg_second = RegEx("^puppet func");
+		CRASH_COND(!reg_second.is_valid());
+		file_content = reg_second.sub(file_content, "@rpc func", true);
+	}
+	{
+		RegEx reg_first = RegEx("([\n]+)puppetsync func");
+		CRASH_COND(!reg_first.is_valid());
+		file_content = reg_first.sub(file_content, "$1@rpc(call_local) func", true);
+		RegEx reg_second = RegEx("^puppetsync func");
+		CRASH_COND(!reg_second.is_valid());
+		file_content = reg_second.sub(file_content, "@rpc(call_local) func", true);
+	}
+	String error_message = "The master and mastersync rpc behavior is not officially supported anymore. Try using another keyword or making custom logic using get_multiplayer().get_remote_sender_id()\n";
+	{
+		RegEx reg_first = RegEx("([\n]+)master func");
+		CRASH_COND(!reg_first.is_valid());
+		file_content = reg_first.sub(file_content, "$1" + error_message + "@rpc func", true);
+		RegEx reg_second = RegEx("^master func");
+		CRASH_COND(!reg_second.is_valid());
+		file_content = reg_second.sub(file_content, error_message + "@rpc func", true);
+	}
+	{
+		RegEx reg_first = RegEx("([\n]+)mastersync func");
+		CRASH_COND(!reg_first.is_valid());
+		file_content = reg_first.sub(file_content, "$1" + error_message + "@rpc(call_local) func", true);
+		RegEx reg_second = RegEx("^mastersync func");
+		CRASH_COND(!reg_second.is_valid());
+		file_content = reg_second.sub(file_content, error_message + "@rpc(call_local) func", true);
+	}
 }
-;
 
 Vector<String> ProjectConverter3To4::check_for_rename_gdscript_keywords(Vector<String> &file_content) {
 	Vector<String> found_things;
@@ -3697,96 +3488,105 @@ Vector<String> ProjectConverter3To4::check_for_rename_gdscript_keywords(Vector<S
 		String old;
 		old = line;
 		{
-			RegEx reg_tool2 = RegEx("^tool");
-			CRASH_COND(!reg_tool2.is_valid());
-			line = reg_tool2.sub(line, "@tool", true);
+			RegEx reg_first = RegEx("^tool");
+			CRASH_COND(!reg_first.is_valid());
+			line = reg_first.sub(line, "@tool", true);
 		}
 		if (old != line) {
 			found_things.append(line_formatter(current_line, "tool", "@tool", line));
 		}
 		old = line;
 		{
-			RegEx reg_export = RegEx("([\t]+)export\\b");
-			CRASH_COND(!reg_export.is_valid());
-			line = reg_export.sub(line, "$1@export", true);
-			RegEx reg_export2 = RegEx("^export");
-			CRASH_COND(!reg_export2.is_valid());
-			line = reg_export2.sub(line, "@export", true);
+			RegEx reg_first = RegEx("([\t]+)export\\b");
+			CRASH_COND(!reg_first.is_valid());
+			line = reg_first.sub(line, "$1@export", true);
+			RegEx reg_second = RegEx("^export");
+			CRASH_COND(!reg_second.is_valid());
+			line = reg_second.sub(line, "@export", true);
 		}
 		if (old != line) {
 			found_things.append(line_formatter(current_line, "export", "@export", line));
 		}
 		old = line;
 		{
-			RegEx reg_onready2 = RegEx("^onready");
-			CRASH_COND(!reg_onready2.is_valid());
-			line = reg_onready2.sub(line, "@onready", true);
+			RegEx reg_first = RegEx("^onready");
+			CRASH_COND(!reg_first.is_valid());
+			line = reg_first.sub(line, "@onready", true);
 		}
 		if (old != line) {
 			found_things.append(line_formatter(current_line, "onready", "@onready", line));
 		}
 		old = line;
 		{
-			RegEx reg_master2 = RegEx("^master func");
-			CRASH_COND(!reg_master2.is_valid());
-			line = reg_master2.sub(line, "@rpc(any) func", true);
+			RegEx regex = RegEx("^remote func");
+			CRASH_COND(!regex.is_valid());
+			line = regex.sub(line, "@rpc(any_peer) func", true);
+		}
+		if (old != line) {
+			found_things.append(line_formatter(current_line, "remote func", "@rpc(any_peer) func", line));
+		}
+		old = line;
+		{
+			RegEx regex = RegEx("^remotesync func");
+			CRASH_COND(!regex.is_valid());
+			line = regex.sub(line, "@rpc(any_peer, call_local)) func", true);
 		}
 		if (old != line) {
-			found_things.append(line_formatter(current_line, "master func", "@rpc(any) func", line));
+			found_things.append(line_formatter(current_line, "remotesync func", "@rpc(any_peer, call_local)) func", line));
 		}
 		old = line;
 		{
-			RegEx reg_puppet2 = RegEx("^puppet func");
-			CRASH_COND(!reg_puppet2.is_valid());
-			line = reg_puppet2.sub(line, "@rpc(auth) func", true);
+			RegEx regex = RegEx("^sync func");
+			CRASH_COND(!regex.is_valid());
+			line = regex.sub(line, "@rpc(any_peer, call_local)) func", true);
 		}
 		if (old != line) {
-			found_things.append(line_formatter(current_line, "puppet func", "@rpc(auth) func", line));
+			found_things.append(line_formatter(current_line, "sync func", "@rpc(any_peer, call_local)) func", line));
 		}
 		old = line;
 		{
-			RegEx reg_remote2 = RegEx("^remote func");
-			CRASH_COND(!reg_remote2.is_valid());
-			line = reg_remote2.sub(line, "@rpc(any) func", true);
+			RegEx regex = RegEx("^slave func");
+			CRASH_COND(!regex.is_valid());
+			line = regex.sub(line, "@rpc func", true);
 		}
 		if (old != line) {
-			found_things.append(line_formatter(current_line, "remote func", "@rpc(any) func", line));
+			found_things.append(line_formatter(current_line, "slave func", "@rpc func", line));
 		}
 		old = line;
 		{
-			RegEx reg_remotesync2 = RegEx("^remotesync func");
-			CRASH_COND(!reg_remotesync2.is_valid());
-			line = reg_remotesync2.sub(line, "@rpc(any,sync) func", true);
+			RegEx regex = RegEx("^puppet func");
+			CRASH_COND(!regex.is_valid());
+			line = regex.sub(line, "@rpc func", true);
 		}
 		if (old != line) {
-			found_things.append(line_formatter(current_line, "remotesync func", "@rpc(any,sync) func", line));
+			found_things.append(line_formatter(current_line, "puppet func", "@rpc func", line));
 		}
 		old = line;
 		{
-			RegEx reg_sync2 = RegEx("^sync func");
-			CRASH_COND(!reg_sync2.is_valid());
-			line = reg_sync2.sub(line, "@rpc(any,sync) func", true);
+			RegEx regex = RegEx("^puppetsync func");
+			CRASH_COND(!regex.is_valid());
+			line = regex.sub(line, "@rpc(call_local) func", true);
 		}
 		if (old != line) {
-			found_things.append(line_formatter(current_line, "sync func", "@rpc(any,sync) func", line));
+			found_things.append(line_formatter(current_line, "puppetsync func", "@rpc(call_local) func", line));
 		}
 		old = line;
 		{
-			RegEx reg_puppetsync2 = RegEx("^puppetsync func");
-			CRASH_COND(!reg_puppetsync2.is_valid());
-			line = reg_puppetsync2.sub(line, "@rpc(auth,sync) func", true);
+			RegEx regex = RegEx("^master func");
+			CRASH_COND(!regex.is_valid());
+			line = regex.sub(line, "@rpc func", true);
 		}
 		if (old != line) {
-			found_things.append(line_formatter(current_line, "puppetsync func", "@rpc(any,sync) func", line));
+			found_things.append(line_formatter(current_line, "master func", "@rpc func", line));
 		}
 		old = line;
 		{
-			RegEx reg_mastersync2 = RegEx("^mastersync func");
-			CRASH_COND(!reg_mastersync2.is_valid());
-			line = reg_mastersync2.sub(line, "@rpc(any,sync) func", true);
+			RegEx regex = RegEx("^mastersync func");
+			CRASH_COND(!regex.is_valid());
+			line = regex.sub(line, "@rpc(call_local) func", true);
 		}
 		if (old != line) {
-			found_things.append(line_formatter(current_line, "mastersync", "@rpc(any,sync) func", line));
+			found_things.append(line_formatter(current_line, "mastersync func", "@rpc(call_local) func", line));
 		}
 		old = line;
 
diff --git a/editor/project_converter_3_to_4.h b/editor/project_converter_3_to_4.h
index 95239666e0..8526e2ceb9 100644
--- a/editor/project_converter_3_to_4.h
+++ b/editor/project_converter_3_to_4.h
@@ -37,17 +37,26 @@
 #include "core/string/ustring.h"
 
 class ProjectConverter3To4 {
+public:
+	class RegExContainer;
+
+private:
 	void rename_enums(String &file_content);
 	Vector<String> check_for_rename_enums(Vector<String> &file_content);
 
 	void rename_classes(String &file_content);
 	Vector<String> check_for_rename_classes(Vector<String> &file_content);
 
-	void rename_gdscript_functions(String &file_content);
-	Vector<String> check_for_rename_gdscript_functions(Vector<String> &file_content);
+	void rename_gdscript_functions(String &file_content, const RegExContainer &reg_container, bool builtin);
+	Vector<String> check_for_rename_gdscript_functions(Vector<String> &file_content, const RegExContainer &reg_container, bool builtin);
+	void process_gdscript_line(String &line, const RegExContainer &reg_container, bool builtin);
 
 	void rename_csharp_functions(String &file_content);
 	Vector<String> check_for_rename_csharp_functions(Vector<String> &file_content);
+	void process_csharp_line(String &line);
+
+	void rename_csharp_attributes(String &file_content);
+	Vector<String> check_for_rename_csharp_attributes(Vector<String> &file_content);
 
 	void rename_gdscript_keywords(String &file_content);
 	Vector<String> check_for_rename_gdscript_keywords(Vector<String> &file_content);
@@ -71,9 +80,10 @@ class ProjectConverter3To4 {
 
 	bool test_single_array(const char *array[][2], bool ignore_second_check = false);
 	bool test_conversion_single_additional(String name, String expected, void (ProjectConverter3To4::*func)(String &), String what);
+	bool test_conversion_single_additional_builtin(String name, String expected, void (ProjectConverter3To4::*func)(String &, const RegExContainer &, bool), String what, const RegExContainer &reg_container, bool builtin);
 	bool test_conversion_single_normal(String name, String expected, const char *array[][2], String what);
 	bool test_array_names();
-	bool test_conversion();
+	bool test_conversion(const RegExContainer &reg_container);
 
 public:
 	int validate_conversion();
diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp
index 8395fa996a..9d2dcd129c 100644
--- a/editor/project_manager.cpp
+++ b/editor/project_manager.cpp
@@ -42,6 +42,7 @@
 #include "core/string/translation.h"
 #include "core/version.h"
 #include "editor/editor_file_dialog.h"
+#include "editor/editor_paths.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_themes.h"
@@ -57,10 +58,6 @@
 #include "servers/navigation_server_3d.h"
 #include "servers/physics_server_2d.h"
 
-static inline String get_project_key_from_path(const String &dir) {
-	return dir.replace("/", "::");
-}
-
 class ProjectDialog : public ConfirmationDialog {
 	GDCLASS(ProjectDialog, ConfirmationDialog);
 
@@ -600,9 +597,6 @@ private:
 			if (dir.ends_with("/")) {
 				dir = dir.substr(0, dir.length() - 1);
 			}
-			String proj = get_project_key_from_path(dir);
-			EditorSettings::get_singleton()->set("projects/" + proj, dir);
-			EditorSettings::get_singleton()->save();
 
 			hide();
 			emit_signal(SNAME("project_created"), dir);
@@ -989,7 +983,6 @@ public:
 
 	// Can often be passed by copy
 	struct Item {
-		String project_key;
 		String project_name;
 		String description;
 		String path;
@@ -1006,8 +999,7 @@ public:
 
 		Item() {}
 
-		Item(const String &p_project,
-				const String &p_name,
+		Item(const String &p_name,
 				const String &p_description,
 				const String &p_path,
 				const String &p_icon,
@@ -1018,7 +1010,6 @@ public:
 				bool p_grayed,
 				bool p_missing,
 				int p_version) {
-			project_key = p_project;
 			project_name = p_name;
 			description = p_description;
 			path = p_path;
@@ -1034,7 +1025,7 @@ public:
 		}
 
 		_FORCE_INLINE_ bool operator==(const Item &l) const {
-			return project_key == l.project_key;
+			return path == l.path;
 		}
 	};
 
@@ -1047,6 +1038,7 @@ public:
 	void _global_menu_open_project(const Variant &p_tag);
 
 	void update_dock_menu();
+	void migrate_config();
 	void load_projects();
 	void set_search_term(String p_search_term);
 	void set_order_option(int p_option);
@@ -1062,6 +1054,8 @@ public:
 	bool is_any_project_missing() const;
 	void erase_missing_projects();
 	int refresh_project(const String &dir_path);
+	void add_project(const String &dir_path, bool favorite);
+	void save_config();
 
 private:
 	static void _bind_methods();
@@ -1082,12 +1076,15 @@ private:
 
 	String _search_term;
 	FilterOption _order_option;
-	HashSet<String> _selected_project_keys;
+	HashSet<String> _selected_project_paths;
 	String _last_clicked; // Project key
 	VBoxContainer *_scroll_children;
 	int _icon_load_index;
 
 	Vector<Item> _projects;
+
+	ConfigFile _config;
+	String _config_path;
 };
 
 struct ProjectListComparator {
@@ -1103,7 +1100,7 @@ struct ProjectListComparator {
 		}
 		switch (order_option) {
 			case PATH:
-				return a.project_key < b.project_key;
+				return a.path < b.path;
 			case EDIT_DATE:
 				return a.last_edited > b.last_edited;
 			default:
@@ -1120,6 +1117,7 @@ ProjectList::ProjectList() {
 
 	_icon_load_index = 0;
 	project_opening_initiated = false;
+	_config_path = EditorPaths::get_singleton()->get_data_dir().plus_file("projects.cfg");
 }
 
 ProjectList::~ProjectList() {
@@ -1166,14 +1164,19 @@ void ProjectList::load_project_icon(int p_index) {
 		icon = default_icon;
 	}
 
+	// The default project icon is 128×128 to look crisp on hiDPI displays,
+	// but we want the actual displayed size to be 64×64 on loDPI displays.
+	item.control->icon->set_ignore_texture_size(true);
+	item.control->icon->set_custom_minimum_size(Size2(64, 64) * EDSCALE);
+	item.control->icon->set_stretch_mode(TextureRect::STRETCH_KEEP_ASPECT_CENTERED);
+
 	item.control->icon->set_texture(icon);
 	item.control->icon_needs_reload = false;
 }
 
 // Load project data from p_property_key and return it in a ProjectList::Item. p_favorite is passed directly into the Item.
-ProjectList::Item ProjectList::load_project_data(const String &p_property_key, bool p_favorite) {
-	String path = EditorSettings::get_singleton()->get(p_property_key);
-	String conf = path.plus_file("project.godot");
+ProjectList::Item ProjectList::load_project_data(const String &p_path, bool p_favorite) {
+	String conf = p_path.plus_file("project.godot");
 	bool grayed = false;
 	bool missing = false;
 
@@ -1209,7 +1212,7 @@ ProjectList::Item ProjectList::load_project_data(const String &p_property_key, b
 		// when editing a project (but not when running it).
 		last_edited = FileAccess::get_modified_time(conf);
 
-		String fscache = path.plus_file(".fscache");
+		String fscache = p_path.plus_file(".fscache");
 		if (FileAccess::exists(fscache)) {
 			uint64_t cache_modified = FileAccess::get_modified_time(fscache);
 			if (cache_modified > last_edited) {
@@ -1222,9 +1225,38 @@ ProjectList::Item ProjectList::load_project_data(const String &p_property_key, b
 		print_line("Project is missing: " + conf);
 	}
 
-	const String project_key = p_property_key.get_slice("/", 1);
+	return Item(project_name, description, p_path, icon, main_scene, unsupported_features, last_edited, p_favorite, grayed, missing, config_version);
+}
+
+void ProjectList::migrate_config() {
+	// Proposal #1637 moved the project list from editor settings to a separate config file
+	// If the new config file doesn't exist, populate it from EditorSettings
+	if (FileAccess::exists(_config_path)) {
+		return;
+	}
+	print_line("Migrating legacy project list");
+
+	List<PropertyInfo> properties;
+	EditorSettings::get_singleton()->get_property_list(&properties);
+
+	for (const PropertyInfo &E : properties) {
+		// This is actually something like "projects/C:::Documents::Godot::Projects::MyGame"
+		String property_key = E.name;
+		if (!property_key.begins_with("projects/")) {
+			continue;
+		}
+
+		String path = EditorSettings::get_singleton()->get(property_key);
+		String favoriteKey = "favorite_projects/" + property_key.get_slice("/", 1);
+		bool favorite = EditorSettings::get_singleton()->has_setting(favoriteKey);
+		add_project(path, favorite);
+		if (favorite) {
+			EditorSettings::get_singleton()->erase(favoriteKey);
+		}
+		EditorSettings::get_singleton()->erase(property_key);
+	}
 
-	return Item(project_key, project_name, description, path, icon, main_scene, unsupported_features, last_edited, p_favorite, grayed, missing, config_version);
+	save_config();
 }
 
 void ProjectList::load_projects() {
@@ -1239,37 +1271,15 @@ void ProjectList::load_projects() {
 	}
 	_projects.clear();
 	_last_clicked = "";
-	_selected_project_keys.clear();
-
-	// Load data
-	// TODO Would be nice to change how projects and favourites are stored... it complicates things a bit.
-	// Use a dictionary associating project path to metadata (like is_favorite).
+	_selected_project_paths.clear();
 
-	List<PropertyInfo> properties;
-	EditorSettings::get_singleton()->get_property_list(&properties);
+	List<String> sections;
+	_config.load(_config_path);
+	_config.get_sections(&sections);
 
-	HashSet<String> favorites;
-	// Find favourites...
-	for (const PropertyInfo &E : properties) {
-		String property_key = E.name;
-		if (property_key.begins_with("favorite_projects/")) {
-			favorites.insert(property_key);
-		}
-	}
-
-	for (const PropertyInfo &E : properties) {
-		// This is actually something like "projects/C:::Documents::Godot::Projects::MyGame"
-		String property_key = E.name;
-		if (!property_key.begins_with("projects/")) {
-			continue;
-		}
-
-		String project_key = property_key.get_slice("/", 1);
-		bool favorite = favorites.has("favorite_projects/" + project_key);
-
-		Item item = load_project_data(property_key, favorite);
-
-		_projects.push_back(item);
+	for (const String &path : sections) {
+		bool favorite = _config.get_value(path, "favorite", false);
+		_projects.push_back(load_project_data(path, favorite));
 	}
 
 	// Create controls
@@ -1496,19 +1506,19 @@ void ProjectList::sort_projects() {
 
 const HashSet<String> &ProjectList::get_selected_project_keys() const {
 	// Faster if that's all you need
-	return _selected_project_keys;
+	return _selected_project_paths;
 }
 
 Vector<ProjectList::Item> ProjectList::get_selected_projects() const {
 	Vector<Item> items;
-	if (_selected_project_keys.size() == 0) {
+	if (_selected_project_paths.size() == 0) {
 		return items;
 	}
-	items.resize(_selected_project_keys.size());
+	items.resize(_selected_project_paths.size());
 	int j = 0;
 	for (int i = 0; i < _projects.size(); ++i) {
 		const Item &item = _projects[i];
-		if (_selected_project_keys.has(item.project_key)) {
+		if (_selected_project_paths.has(item.path)) {
 			items.write[j++] = item;
 		}
 	}
@@ -1522,41 +1532,40 @@ void ProjectList::ensure_project_visible(int p_index) {
 }
 
 int ProjectList::get_single_selected_index() const {
-	if (_selected_project_keys.size() == 0) {
+	if (_selected_project_paths.size() == 0) {
 		// Default selection
 		return 0;
 	}
 	String key;
-	if (_selected_project_keys.size() == 1) {
+	if (_selected_project_paths.size() == 1) {
 		// Only one selected
-		key = *_selected_project_keys.begin();
+		key = *_selected_project_paths.begin();
 	} else {
 		// Multiple selected, consider the last clicked one as "main"
 		key = _last_clicked;
 	}
 	for (int i = 0; i < _projects.size(); ++i) {
-		if (_projects[i].project_key == key) {
+		if (_projects[i].path == key) {
 			return i;
 		}
 	}
 	return 0;
 }
 
-void ProjectList::remove_project(int p_index, bool p_update_settings) {
+void ProjectList::remove_project(int p_index, bool p_update_config) {
 	const Item item = _projects[p_index]; // Take a copy
 
-	_selected_project_keys.erase(item.project_key);
+	_selected_project_paths.erase(item.path);
 
-	if (_last_clicked == item.project_key) {
+	if (_last_clicked == item.path) {
 		_last_clicked = "";
 	}
 
 	memdelete(item.control);
 	_projects.remove_at(p_index);
 
-	if (p_update_settings) {
-		EditorSettings::get_singleton()->erase("projects/" + item.project_key);
-		EditorSettings::get_singleton()->erase("favorite_projects/" + item.project_key);
+	if (p_update_config) {
+		_config.erase_section(item.path);
 		// Not actually saving the file, in case you are doing more changes to settings
 	}
 
@@ -1594,41 +1603,19 @@ void ProjectList::erase_missing_projects() {
 	}
 
 	print_line("Removed " + itos(deleted_count) + " projects from the list, remaining " + itos(remaining_count) + " projects");
-
-	EditorSettings::get_singleton()->save();
+	save_config();
 }
 
 int ProjectList::refresh_project(const String &dir_path) {
-	// Reads editor settings and reloads information about a specific project.
+	// Reloads information about a specific project.
 	// If it wasn't loaded and should be in the list, it is added (i.e new project).
 	// If it isn't in the list anymore, it is removed.
 	// If it is in the list but doesn't exist anymore, it is marked as missing.
 
-	String project_key = get_project_key_from_path(dir_path);
-
-	// Read project manager settings
-	bool is_favourite = false;
-	bool should_be_in_list = false;
-	String property_key = "projects/" + project_key;
-	{
-		List<PropertyInfo> properties;
-		EditorSettings::get_singleton()->get_property_list(&properties);
-		String favorite_property_key = "favorite_projects/" + project_key;
-
-		bool found = false;
-		for (const PropertyInfo &E : properties) {
-			String prop = E.name;
-			if (!found && prop == property_key) {
-				found = true;
-			} else if (!is_favourite && prop == favorite_property_key) {
-				is_favourite = true;
-			}
-		}
-
-		should_be_in_list = found;
-	}
+	bool should_be_in_list = _config.has_section(dir_path);
+	bool is_favourite = _config.get_value(dir_path, "favorite", false);
 
-	bool was_selected = _selected_project_keys.has(project_key);
+	bool was_selected = _selected_project_paths.has(dir_path);
 
 	// Remove item in any case
 	for (int i = 0; i < _projects.size(); ++i) {
@@ -1643,7 +1630,7 @@ int ProjectList::refresh_project(const String &dir_path) {
 	if (should_be_in_list) {
 		// Recreate it with updated info
 
-		Item item = load_project_data(property_key, is_favourite);
+		Item item = load_project_data(dir_path, is_favourite);
 
 		_projects.push_back(item);
 		create_project_item_control(_projects.size() - 1);
@@ -1651,7 +1638,7 @@ int ProjectList::refresh_project(const String &dir_path) {
 		sort_projects();
 
 		for (int i = 0; i < _projects.size(); ++i) {
-			if (_projects[i].project_key == project_key) {
+			if (_projects[i].path == dir_path) {
 				if (was_selected) {
 					select_project(i);
 					ensure_project_visible(i);
@@ -1667,13 +1654,23 @@ int ProjectList::refresh_project(const String &dir_path) {
 	return index;
 }
 
+void ProjectList::add_project(const String &dir_path, bool favorite) {
+	if (!_config.has_section(dir_path)) {
+		_config.set_value(dir_path, "favorite", favorite);
+	}
+}
+
+void ProjectList::save_config() {
+	_config.save(_config_path);
+}
+
 int ProjectList::get_project_count() const {
 	return _projects.size();
 }
 
 void ProjectList::select_project(int p_index) {
 	Vector<Item> previous_selected_items = get_selected_projects();
-	_selected_project_keys.clear();
+	_selected_project_paths.clear();
 
 	for (int i = 0; i < previous_selected_items.size(); ++i) {
 		previous_selected_items[i].control->update();
@@ -1695,7 +1692,7 @@ void ProjectList::select_first_visible_project() {
 
 	if (!found) {
 		// Deselect all projects if there are no visible projects in the list.
-		_selected_project_keys.clear();
+		_selected_project_paths.clear();
 	}
 }
 
@@ -1717,24 +1714,23 @@ void ProjectList::select_range(int p_begin, int p_end) {
 
 void ProjectList::toggle_select(int p_index) {
 	Item &item = _projects.write[p_index];
-	if (_selected_project_keys.has(item.project_key)) {
-		_selected_project_keys.erase(item.project_key);
+	if (_selected_project_paths.has(item.path)) {
+		_selected_project_paths.erase(item.path);
 	} else {
-		_selected_project_keys.insert(item.project_key);
+		_selected_project_paths.insert(item.path);
 	}
 	item.control->update();
 }
 
 void ProjectList::erase_selected_projects(bool p_delete_project_contents) {
-	if (_selected_project_keys.size() == 0) {
+	if (_selected_project_paths.size() == 0) {
 		return;
 	}
 
 	for (int i = 0; i < _projects.size(); ++i) {
 		Item &item = _projects.write[i];
-		if (_selected_project_keys.has(item.project_key) && item.control->is_visible()) {
-			EditorSettings::get_singleton()->erase("projects/" + item.project_key);
-			EditorSettings::get_singleton()->erase("favorite_projects/" + item.project_key);
+		if (_selected_project_paths.has(item.path) && item.control->is_visible()) {
+			_config.erase_section(item.path);
 
 			if (p_delete_project_contents) {
 				OS::get_singleton()->move_to_trash(item.path);
@@ -1746,9 +1742,8 @@ void ProjectList::erase_selected_projects(bool p_delete_project_contents) {
 		}
 	}
 
-	EditorSettings::get_singleton()->save();
-
-	_selected_project_keys.clear();
+	save_config();
+	_selected_project_paths.clear();
 	_last_clicked = "";
 
 	update_dock_menu();
@@ -1764,9 +1759,9 @@ void ProjectList::_panel_draw(Node *p_hb) {
 		hb->draw_line(Point2(0, hb->get_size().y + 1), Point2(hb->get_size().x, hb->get_size().y + 1), get_theme_color(SNAME("guide_color"), SNAME("Tree")));
 	}
 
-	String key = _projects[p_hb->get_index()].project_key;
+	String key = _projects[p_hb->get_index()].path;
 
-	if (_selected_project_keys.has(key)) {
+	if (_selected_project_paths.has(key)) {
 		hb->draw_style_box(get_theme_stylebox(SNAME("selected"), SNAME("Tree")), Rect2(Point2(), hb->get_size()));
 	}
 }
@@ -1778,11 +1773,11 @@ void ProjectList::_panel_input(const Ref<InputEvent> &p_ev, Node *p_hb) {
 	const Item &clicked_project = _projects[clicked_index];
 
 	if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == MouseButton::LEFT) {
-		if (mb->is_shift_pressed() && _selected_project_keys.size() > 0 && !_last_clicked.is_empty() && clicked_project.project_key != _last_clicked) {
+		if (mb->is_shift_pressed() && _selected_project_paths.size() > 0 && !_last_clicked.is_empty() && clicked_project.path != _last_clicked) {
 			int anchor_index = -1;
 			for (int i = 0; i < _projects.size(); ++i) {
 				const Item &p = _projects[i];
-				if (p.project_key == _last_clicked) {
+				if (p.path == _last_clicked) {
 					anchor_index = p.control->get_index();
 					break;
 				}
@@ -1794,7 +1789,7 @@ void ProjectList::_panel_input(const Ref<InputEvent> &p_ev, Node *p_hb) {
 			toggle_select(clicked_index);
 
 		} else {
-			_last_clicked = clicked_project.project_key;
+			_last_clicked = clicked_project.path;
 			select_project(clicked_index);
 		}
 
@@ -1816,12 +1811,8 @@ void ProjectList::_favorite_pressed(Node *p_hb) {
 
 	item.favorite = !item.favorite;
 
-	if (item.favorite) {
-		EditorSettings::get_singleton()->set("favorite_projects/" + item.project_key, item.path);
-	} else {
-		EditorSettings::get_singleton()->erase("favorite_projects/" + item.project_key);
-	}
-	EditorSettings::get_singleton()->save();
+	_config.set_value(item.path, "favorite", item.favorite);
+	save_config();
 
 	_projects.write[index] = item;
 
@@ -1831,7 +1822,7 @@ void ProjectList::_favorite_pressed(Node *p_hb) {
 
 	if (item.favorite) {
 		for (int i = 0; i < _projects.size(); ++i) {
-			if (_projects[i].project_key == item.project_key) {
+			if (_projects[i].path == item.path) {
 				ensure_project_visible(i);
 				break;
 			}
@@ -2089,6 +2080,8 @@ void ProjectManager::_on_projects_updated() {
 }
 
 void ProjectManager::_on_project_created(const String &dir) {
+	_project_list->add_project(dir, false);
+	_project_list->save_config();
 	search_box->clear();
 	int i = _project_list->refresh_project(dir);
 	_project_list->select_project(i);
@@ -2109,9 +2102,7 @@ void ProjectManager::_open_selected_projects() {
 
 	const HashSet<String> &selected_list = _project_list->get_selected_project_keys();
 
-	for (const String &E : selected_list) {
-		const String &selected = E;
-		String path = EditorSettings::get_singleton()->get("projects/" + selected);
+	for (const String &path : selected_list) {
 		String conf = path.plus_file("project.godot");
 
 		if (!FileAccess::exists(conf)) {
@@ -2120,7 +2111,7 @@ void ProjectManager::_open_selected_projects() {
 			return;
 		}
 
-		print_line("Editing project: " + path + " (" + selected + ")");
+		print_line("Editing project: " + path);
 
 		List<String> args;
 
@@ -2244,8 +2235,7 @@ void ProjectManager::_run_project_confirm() {
 			continue;
 		}
 
-		const String &selected = selected_list[i].project_key;
-		String path = EditorSettings::get_singleton()->get("projects/" + selected);
+		const String &path = selected_list[i].path;
 
 		// `.substr(6)` on `ProjectSettings::get_singleton()->get_imported_files_path()` strips away the leading "res://".
 		if (!DirAccess::exists(path.plus_file(ProjectSettings::get_singleton()->get_imported_files_path().substr(6)))) {
@@ -2254,7 +2244,7 @@ void ProjectManager::_run_project_confirm() {
 			continue;
 		}
 
-		print_line("Running project: " + path + " (" + selected + ")");
+		print_line("Running project: " + path);
 
 		List<String> args;
 
@@ -2285,7 +2275,7 @@ void ProjectManager::_run_project() {
 	}
 }
 
-void ProjectManager::_scan_dir(const String &path, List<String> *r_projects) {
+void ProjectManager::_scan_dir(const String &path) {
 	Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
 	Error error = da->change_dir(path);
 	ERR_FAIL_COND_MSG(error != OK, "Could not scan directory at: " + path);
@@ -2293,26 +2283,18 @@ void ProjectManager::_scan_dir(const String &path, List<String> *r_projects) {
 	String n = da->get_next();
 	while (!n.is_empty()) {
 		if (da->current_is_dir() && !n.begins_with(".")) {
-			_scan_dir(da->get_current_dir().plus_file(n), r_projects);
+			_scan_dir(da->get_current_dir().plus_file(n));
 		} else if (n == "project.godot") {
-			r_projects->push_back(da->get_current_dir());
+			_project_list->add_project(da->get_current_dir(), false);
 		}
 		n = da->get_next();
 	}
 	da->list_dir_end();
 }
-
 void ProjectManager::_scan_begin(const String &p_base) {
 	print_line("Scanning projects at: " + p_base);
-	List<String> projects;
-	_scan_dir(p_base, &projects);
-	print_line("Found " + itos(projects.size()) + " projects.");
-
-	for (const String &E : projects) {
-		String proj = get_project_key_from_path(E);
-		EditorSettings::get_singleton()->set("projects/" + proj, E);
-	}
-	EditorSettings::get_singleton()->save();
+	_scan_dir(p_base);
+	_project_list->save_config();
 	_load_recent_projects();
 }
 
@@ -2338,9 +2320,7 @@ void ProjectManager::_rename_project() {
 	}
 
 	for (const String &E : selected_list) {
-		const String &selected = E;
-		String path = EditorSettings::get_singleton()->get("projects/" + selected);
-		npdialog->set_project_path(path);
+		npdialog->set_project_path(E);
 		npdialog->set_mode(ProjectDialog::MODE_RENAME);
 		npdialog->show_dialog();
 	}
@@ -2871,6 +2851,7 @@ ProjectManager::ProjectManager() {
 		_build_icon_type_cache(get_theme());
 	}
 
+	_project_list->migrate_config();
 	_load_recent_projects();
 
 	Ref<DirAccess> dir_access = DirAccess::create(DirAccess::AccessType::ACCESS_FILESYSTEM);
diff --git a/editor/project_manager.h b/editor/project_manager.h
index 28383e4142..10bf25c048 100644
--- a/editor/project_manager.h
+++ b/editor/project_manager.h
@@ -125,7 +125,7 @@ class ProjectManager : public Control {
 	void _on_projects_updated();
 	void _scan_multiple_folders(PackedStringArray p_files);
 	void _scan_begin(const String &p_base);
-	void _scan_dir(const String &path, List<String> *r_projects);
+	void _scan_dir(const String &path);
 
 	void _install_project(const String &p_zip_path, const String &p_title);
 
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index d19a40599f..0f4f3dcfcf 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -2678,7 +2678,7 @@ void SceneTreeDock::_add_children_to_popup(Object *p_obj, int p_depth) {
 		}
 		int index = menu_subresources->get_item_count();
 		menu_subresources->add_icon_item(icon, E.name.capitalize(), EDIT_SUBRESOURCE_BASE + subresources.size());
-		menu_subresources->set_item_horizontal_offset(index, p_depth * 10 * EDSCALE);
+		menu_subresources->set_item_indent(index, p_depth);
 		subresources.push_back(obj->get_instance_id());
 
 		_add_children_to_popup(obj, p_depth + 1);
diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp
index a77687677b..ad83db9b60 100644
--- a/editor/scene_tree_editor.cpp
+++ b/editor/scene_tree_editor.cpp
@@ -268,7 +268,17 @@ void SceneTreeEditor::_add_nodes(Node *p_node, TreeItem *p_parent) {
 
 		String warning = p_node->get_configuration_warnings_as_string();
 		if (!warning.is_empty()) {
-			item->add_button(0, get_theme_icon(SNAME("NodeWarning"), SNAME("EditorIcons")), BUTTON_WARNING, false, TTR("Node configuration warning:") + "\n" + warning);
+			const int num_warnings = p_node->get_configuration_warnings().size();
+			String warning_icon;
+			if (num_warnings == 1) {
+				warning_icon = SNAME("NodeWarning");
+			} else if (num_warnings <= 3) {
+				warning_icon = vformat("NodeWarnings%d", num_warnings);
+			} else {
+				warning_icon = SNAME("NodeWarnings4Plus");
+			}
+
+			item->add_button(0, get_theme_icon(warning_icon, SNAME("EditorIcons")), BUTTON_WARNING, false, TTR("Node configuration warning:") + "\n" + warning);
 		}
 
 		if (p_node->is_unique_name_in_owner()) {
@@ -390,7 +400,7 @@ void SceneTreeEditor::_add_nodes(Node *p_node, TreeItem *p_parent) {
 			}
 
 			_update_visibility_color(p_node, item);
-		} else if (p_node->is_class("CanvasLayer")) {
+		} else if (p_node->is_class("CanvasLayer") || p_node->is_class("Window")) {
 			bool v = p_node->call("is_visible");
 			if (v) {
 				item->add_button(0, get_theme_icon(SNAME("GuiVisibilityVisible"), SNAME("EditorIcons")), BUTTON_VISIBILITY, false, TTR("Toggle Visibility"));
@@ -480,10 +490,7 @@ void SceneTreeEditor::_node_visibility_changed(Node *p_node) {
 
 	bool visible = false;
 
-	if (p_node->is_class("CanvasItem")) {
-		visible = p_node->call("is_visible");
-		CanvasItemEditor::get_singleton()->get_viewport_control()->update();
-	} else if (p_node->is_class("CanvasLayer")) {
+	if (p_node->is_class("CanvasItem") || p_node->is_class("CanvasLayer") || p_node->is_class("Window")) {
 		visible = p_node->call("is_visible");
 		CanvasItemEditor::get_singleton()->get_viewport_control()->update();
 	} else if (p_node->is_class("Node3D")) {
@@ -529,7 +536,7 @@ void SceneTreeEditor::_node_removed(Node *p_node) {
 		p_node->disconnect("script_changed", callable_mp(this, &SceneTreeEditor::_node_script_changed));
 	}
 
-	if (p_node->is_class("Node3D") || p_node->is_class("CanvasItem") || p_node->is_class("CanvasLayer")) {
+	if (p_node->is_class("Node3D") || p_node->is_class("CanvasItem") || p_node->is_class("CanvasLayer") || p_node->is_class("Window")) {
 		if (p_node->is_connected("visibility_changed", callable_mp(this, &SceneTreeEditor::_node_visibility_changed))) {
 			p_node->disconnect("visibility_changed", callable_mp(this, &SceneTreeEditor::_node_visibility_changed));
 		}
diff --git a/editor/shader_create_dialog.cpp b/editor/shader_create_dialog.cpp
index bd1f2529ca..8c4a231e8a 100644
--- a/editor/shader_create_dialog.cpp
+++ b/editor/shader_create_dialog.cpp
@@ -37,6 +37,13 @@
 #include "scene/resources/visual_shader.h"
 #include "servers/rendering/shader_types.h"
 
+enum ShaderType {
+	SHADER_TYPE_TEXT,
+	SHADER_TYPE_VISUAL,
+	SHADER_TYPE_INC,
+	SHADER_TYPE_MAX,
+};
+
 void ShaderCreateDialog::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
diff --git a/editor/shader_create_dialog.h b/editor/shader_create_dialog.h
index bf031c3601..9ba655369b 100644
--- a/editor/shader_create_dialog.h
+++ b/editor/shader_create_dialog.h
@@ -44,13 +44,6 @@ class EditorFileDialog;
 class ShaderCreateDialog : public ConfirmationDialog {
 	GDCLASS(ShaderCreateDialog, ConfirmationDialog);
 
-	enum ShaderType {
-		SHADER_TYPE_TEXT,
-		SHADER_TYPE_VISUAL,
-		SHADER_TYPE_INC,
-		SHADER_TYPE_MAX,
-	};
-
 	struct ShaderTypeData {
 		List<String> extensions;
 		String default_extension;
diff --git a/editor/translations/af.po b/editor/translations/af.po
index 55fe58e1b0..f2e389b6f5 100644
--- a/editor/translations/af.po
+++ b/editor/translations/af.po
@@ -2856,8 +2856,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "Verwyder Seleksie"
 
 #: editor/editor_export.cpp
 #, fuzzy
@@ -20423,15 +20424,15 @@ msgstr "Kon nie vouer skep nie."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Moet 'n geldige uitbreiding gebruik."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20455,15 +20456,15 @@ msgstr "Ongeldige naam."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Moet 'n geldige uitbreiding gebruik."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/ar.po b/editor/translations/ar.po
index 36e71f130e..cda76c44c8 100644
--- a/editor/translations/ar.po
+++ b/editor/translations/ar.po
@@ -2820,7 +2820,7 @@ msgstr "تصدير المشروع لمنصة:"
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "نسخ مسار الع�قدة"
 
 #: editor/editor_export.cpp
@@ -20570,15 +20570,15 @@ msgstr "لا يمكن العثور على Ù…Ù�تاح المتجر، لا يمكÙ
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "صيغة غير صالحة."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20602,15 +20602,15 @@ msgstr "اسم غير صالح."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "صيغة غير صالحة."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/az.po b/editor/translations/az.po
index 3a59e8aa41..af28a85240 100644
--- a/editor/translations/az.po
+++ b/editor/translations/az.po
@@ -5,49 +5,49 @@
 #
 # Jafar Tarverdiyev <cefertarverdiyevv@gmail.com>, 2021.
 # Lucifer25x <umudyt2006@gmail.com>, 2021.
+# Ãœmid Quliyev <lucifer25x@protonmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
-"PO-Revision-Date: 2021-09-16 14:36+0000\n"
-"Last-Translator: Lucifer25x <umudyt2006@gmail.com>\n"
+"PO-Revision-Date: 2022-08-05 01:04+0000\n"
+"Last-Translator: Ãœmid Quliyev <lucifer25x@protonmail.com>\n"
 "Language-Team: Azerbaijani <https://hosted.weblate.org/projects/godot-engine/"
 "godot/az/>\n"
 "Language: az\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.9-dev\n"
+"X-Generator: Weblate 4.14-dev\n"
 
 #: core/bind/core_bind.cpp main/main.cpp
+#, fuzzy
 msgid "Tablet Driver"
-msgstr ""
+msgstr "Planşet sürücü"
 
 #: core/bind/core_bind.cpp
-#, fuzzy
 msgid "Clipboard"
-msgstr "Pano boÅŸdur!"
+msgstr "Pano"
 
 #: core/bind/core_bind.cpp
-#, fuzzy
 msgid "Current Screen"
-msgstr "Animasiya xüsusiyyətləri."
+msgstr "Aktiv Ekran"
 
 #: core/bind/core_bind.cpp
 msgid "Exit Code"
-msgstr ""
+msgstr "Çıxış Kodu"
 
 #: core/bind/core_bind.cpp
 msgid "V-Sync Enabled"
-msgstr ""
+msgstr "V-Sync Aktivdir"
 
 #: core/bind/core_bind.cpp main/main.cpp
 msgid "V-Sync Via Compositor"
-msgstr ""
+msgstr "V-Sync Kompozitor Vasitəsilə"
 
 #: core/bind/core_bind.cpp main/main.cpp
 msgid "Delta Smoothing"
-msgstr ""
+msgstr "Delta hamarlanması"
 
 #: core/bind/core_bind.cpp
 msgid "Low Processor Usage Mode"
@@ -59,28 +59,28 @@ msgstr ""
 
 #: core/bind/core_bind.cpp main/main.cpp platform/uwp/os_uwp.cpp
 msgid "Keep Screen On"
-msgstr ""
+msgstr "Ekranı Açıq Tut"
 
 #: core/bind/core_bind.cpp
 msgid "Min Window Size"
-msgstr ""
+msgstr "Minimum Pəncərə Ölçüsü"
 
 #: core/bind/core_bind.cpp
 msgid "Max Window Size"
-msgstr ""
+msgstr "Maksimum Pəncərə Ölçüsü"
 
 #: core/bind/core_bind.cpp
 msgid "Screen Orientation"
-msgstr ""
+msgstr "Pəncərə Nisbəti"
 
 #: core/bind/core_bind.cpp core/project_settings.cpp main/main.cpp
 #: platform/uwp/os_uwp.cpp
 msgid "Window"
-msgstr ""
+msgstr "Pəncərə"
 
 #: core/bind/core_bind.cpp core/project_settings.cpp
 msgid "Borderless"
-msgstr ""
+msgstr "Kənarsız"
 
 #: core/bind/core_bind.cpp
 msgid "Per Pixel Transparency Enabled"
@@ -88,29 +88,28 @@ msgstr ""
 
 #: core/bind/core_bind.cpp core/project_settings.cpp
 msgid "Fullscreen"
-msgstr ""
+msgstr "Bütün Ekran"
 
 #: core/bind/core_bind.cpp
 msgid "Maximized"
-msgstr ""
+msgstr "Böyüdülmüş"
 
 #: core/bind/core_bind.cpp
 msgid "Minimized"
-msgstr ""
+msgstr "Kiçildilmiş"
 
 #: core/bind/core_bind.cpp core/project_settings.cpp scene/gui/dialogs.cpp
 #: scene/gui/graph_node.cpp
 msgid "Resizable"
-msgstr ""
+msgstr "Ölçüsü Dəyişdirilə Bilər"
 
 #: core/bind/core_bind.cpp core/os/input_event.cpp scene/2d/node_2d.cpp
 #: scene/2d/physics_body_2d.cpp scene/2d/remote_transform_2d.cpp
 #: scene/3d/physics_body.cpp scene/3d/remote_transform.cpp
 #: scene/gui/control.cpp scene/gui/line_edit.cpp
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Position"
-msgstr "Animasiyanı Təmizləmə"
+msgstr "Pozisiya"
 
 #: core/bind/core_bind.cpp core/project_settings.cpp editor/editor_settings.cpp
 #: main/main.cpp modules/gridmap/grid_map.cpp
@@ -122,7 +121,7 @@ msgstr "Animasiyanı Təmizləmə"
 #: scene/resources/style_box.cpp scene/resources/texture.cpp
 #: scene/resources/visual_shader.cpp servers/visual_server.cpp
 msgid "Size"
-msgstr ""
+msgstr "Ölçü"
 
 #: core/bind/core_bind.cpp
 msgid "Endian Swap"
@@ -131,25 +130,23 @@ msgstr ""
 #: core/bind/core_bind.cpp
 #, fuzzy
 msgid "Editor Hint"
-msgstr "RedaktÉ™ et"
+msgstr "Editor Ä°pucu"
 
 #: core/bind/core_bind.cpp
 msgid "Print Error Messages"
-msgstr ""
+msgstr "Xəta Mesajlarını Yazdır"
 
 #: core/bind/core_bind.cpp
-#, fuzzy
 msgid "Iterations Per Second"
-msgstr "Ä°nterpolasiya rejimi"
+msgstr "Hər Saniyədə İterasiya Sayı"
 
 #: core/bind/core_bind.cpp
 msgid "Target FPS"
-msgstr ""
+msgstr "Hədəf FPS"
 
 #: core/bind/core_bind.cpp
-#, fuzzy
 msgid "Time Scale"
-msgstr "Animasya Açarlarını Ölçülə"
+msgstr "Zaman Ölçəyi"
 
 #: core/bind/core_bind.cpp main/main.cpp
 msgid "Physics Jitter Fix"
@@ -157,25 +154,23 @@ msgstr ""
 
 #: core/bind/core_bind.cpp editor/plugins/version_control_editor_plugin.cpp
 msgid "Error"
-msgstr ""
+msgstr "Xəta"
 
 #: core/bind/core_bind.cpp
-#, fuzzy
 msgid "Error String"
-msgstr "Yükləmə xətası:"
+msgstr "Xəta Yazısı"
 
 #: core/bind/core_bind.cpp
-#, fuzzy
 msgid "Error Line"
-msgstr "Yükləmə xətası:"
+msgstr "Xəta Sətiri"
 
 #: core/bind/core_bind.cpp
 msgid "Result"
-msgstr ""
+msgstr "Nəticə"
 
 #: core/command_queue_mt.cpp core/message_queue.cpp main/main.cpp
 msgid "Memory"
-msgstr ""
+msgstr "YaddaÅŸ"
 
 #: core/command_queue_mt.cpp core/message_queue.cpp
 #: core/register_core_types.cpp drivers/gles2/rasterizer_canvas_base_gles2.cpp
@@ -186,11 +181,11 @@ msgstr ""
 #: modules/webrtc/webrtc_data_channel.h modules/websocket/websocket_macros.h
 #: servers/visual_server.cpp
 msgid "Limits"
-msgstr ""
+msgstr "Limitlər"
 
 #: core/command_queue_mt.cpp
 msgid "Command Queue"
-msgstr ""
+msgstr "�mr Növbəsi"
 
 #: core/command_queue_mt.cpp
 msgid "Multithreading Queue Size (KB)"
@@ -200,14 +195,13 @@ msgstr ""
 #: modules/visual_script/visual_script_func_nodes.cpp
 #: modules/visual_script/visual_script_nodes.cpp
 #: scene/resources/visual_shader_nodes.cpp
-#, fuzzy
 msgid "Function"
-msgstr "Funksiyalar:"
+msgstr "Funksiya"
 
 #: core/image.cpp core/packed_data_container.cpp scene/2d/polygon_2d.cpp
 #: scene/3d/baked_lightmap.cpp scene/3d/gi_probe.cpp
 msgid "Data"
-msgstr ""
+msgstr "Məlumat"
 
 #: core/io/file_access_network.cpp core/register_core_types.cpp
 #: editor/editor_file_dialog.cpp editor/editor_settings.cpp main/main.cpp
@@ -215,16 +209,15 @@ msgstr ""
 #: modules/webrtc/webrtc_data_channel.h modules/websocket/websocket_macros.h
 #: scene/gui/file_dialog.cpp
 msgid "Network"
-msgstr ""
+msgstr "Şəbəkə"
 
 #: core/io/file_access_network.cpp
-#, fuzzy
 msgid "Remote FS"
-msgstr "Sil"
+msgstr "Uzaqdan FS"
 
 #: core/io/file_access_network.cpp
 msgid "Page Size"
-msgstr ""
+msgstr "Səhifə Ölçüsü"
 
 #: core/io/file_access_network.cpp
 msgid "Page Read Ahead"
@@ -232,12 +225,11 @@ msgstr ""
 
 #: core/io/http_client.cpp
 msgid "Blocking Mode Enabled"
-msgstr ""
+msgstr "Bloklama Modu Aktivdir"
 
 #: core/io/http_client.cpp
-#, fuzzy
 msgid "Connection"
-msgstr "QoÅŸ"
+msgstr "�laqə"
 
 #: core/io/http_client.cpp
 msgid "Read Chunk Size"
@@ -245,15 +237,15 @@ msgstr ""
 
 #: core/io/marshalls.cpp
 msgid "Object ID"
-msgstr ""
+msgstr "Obyekt ID"
 
 #: core/io/multiplayer_api.cpp core/io/packet_peer.cpp
 msgid "Allow Object Decoding"
-msgstr ""
+msgstr "Obyekt Deşifrəsinə İzn Verin"
 
 #: core/io/multiplayer_api.cpp scene/main/scene_tree.cpp
 msgid "Refuse New Network Connections"
-msgstr ""
+msgstr "Yeni Şəbəkə �laqələrindən İmtina Et"
 
 #: core/io/multiplayer_api.cpp scene/main/scene_tree.cpp
 msgid "Network Peer"
@@ -261,16 +253,15 @@ msgstr ""
 
 #: core/io/multiplayer_api.cpp scene/animation/animation_player.cpp
 msgid "Root Node"
-msgstr ""
+msgstr "Kök Düyün"
 
 #: core/io/networked_multiplayer_peer.cpp
-#, fuzzy
 msgid "Refuse New Connections"
-msgstr "QoÅŸ"
+msgstr "Yeni �laqələrdən İmtina Et"
 
 #: core/io/networked_multiplayer_peer.cpp
 msgid "Transfer Mode"
-msgstr ""
+msgstr "Transfer Modu"
 
 #: core/io/packet_peer.cpp
 msgid "Encode Buffer Max Size"
@@ -294,16 +285,15 @@ msgstr ""
 
 #: core/io/stream_peer.cpp
 msgid "Data Array"
-msgstr ""
+msgstr "Məlumat Siyahısı"
 
 #: core/io/stream_peer_ssl.cpp
 msgid "Blocking Handshake"
-msgstr ""
+msgstr "�l Sıxmağın Qarşısının Alınması"
 
 #: core/io/udp_server.cpp
-#, fuzzy
 msgid "Max Pending Connections"
-msgstr "�laqəni redaktə edin:"
+msgstr "Gözlənilən Maksimum �laqələr"
 
 #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp
 #: modules/visual_script/visual_script_builtin_funcs.cpp
@@ -325,7 +315,6 @@ msgstr ""
 "format."
 
 #: core/math/expression.cpp
-#, fuzzy
 msgid "Invalid input %d (not passed) in expression"
 msgstr "İfadədə uyğunsuz giriş %d (ötürülmədi)"
 
@@ -2810,8 +2799,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "Animasiyanı Təmizləmə"
 
 #: editor/editor_export.cpp
 msgid "Completed successfully."
@@ -19641,14 +19631,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
+msgid "rcedit failed to modify executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
@@ -19670,14 +19659,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
+msgid "Signtool failed to sign executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
diff --git a/editor/translations/bg.po b/editor/translations/bg.po
index 877823c869..d2d7a56dc3 100644
--- a/editor/translations/bg.po
+++ b/editor/translations/bg.po
@@ -2814,8 +2814,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "Копиране на избраното"
 
 #: editor/editor_export.cpp
 msgid "Completed successfully."
@@ -20110,15 +20111,15 @@ msgstr "Ð�е е намерено хранилище за ключове. ИзнÐ
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "�еправилно разширение."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20142,15 +20143,15 @@ msgstr "�еправилно име."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "�еправилно разширение."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/bn.po b/editor/translations/bn.po
index 8379e2de5b..6f1e8f945d 100644
--- a/editor/translations/bn.po
+++ b/editor/translations/bn.po
@@ -2904,7 +2904,7 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "পথ প�রতিলিপি/কপি কর�ন"
 
 #: editor/editor_export.cpp
@@ -21539,15 +21539,15 @@ msgstr "ফোলà§�ডার তৈরী করা সমà§�ভব হয়নà¦
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "অগ�রহণযোগ�য �ক�সটেনশন"
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -21571,15 +21571,15 @@ msgstr "অগ�রহনযোগ�য নাম।"
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "অগ�রহণযোগ�য �ক�সটেনশন"
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/br.po b/editor/translations/br.po
index f86b01cc44..823490a280 100644
--- a/editor/translations/br.po
+++ b/editor/translations/br.po
@@ -2732,8 +2732,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "Tro Fiñvskeudenn"
 
 #: editor/editor_export.cpp
 msgid "Completed successfully."
@@ -19433,14 +19434,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
+msgid "rcedit failed to modify executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
@@ -19462,14 +19462,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
+msgid "Signtool failed to sign executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
diff --git a/editor/translations/ca.po b/editor/translations/ca.po
index b1ee6245f6..04c9b7761c 100644
--- a/editor/translations/ca.po
+++ b/editor/translations/ca.po
@@ -2790,7 +2790,8 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
+#, fuzzy
+msgid "Completed with warnings."
 msgstr "Completat amb errors."
 
 #: editor/editor_export.cpp
@@ -20973,15 +20974,15 @@ msgstr "No es pot obrir la plantilla per exportar."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "L'extensió no és vàlida."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -21005,15 +21006,15 @@ msgstr "Nom no vàlid."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "L'extensió no és vàlida."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/cs.po b/editor/translations/cs.po
index c27334b374..1e92a92ae7 100644
--- a/editor/translations/cs.po
+++ b/editor/translations/cs.po
@@ -2882,7 +2882,7 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "Kopírovat cestu k uzlu"
 
 #: editor/editor_export.cpp
@@ -20734,15 +20734,15 @@ msgstr "Nepodařilo se najít úložiště klí�ů, nelze exportovat."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Neplatná přípona."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20766,15 +20766,15 @@ msgstr "Neplatný název."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Neplatná přípona."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/da.po b/editor/translations/da.po
index 3dc6f52da1..1bb05be6f9 100644
--- a/editor/translations/da.po
+++ b/editor/translations/da.po
@@ -2895,8 +2895,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "Fjern Markering"
 
 #: editor/editor_export.cpp
 #, fuzzy
@@ -20911,15 +20912,15 @@ msgstr "Kan ikke åbne skabelon til eksport:\n"
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Du skal bruge en gyldig udvidelse."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20943,15 +20944,15 @@ msgstr "Ugyldigt navn."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Du skal bruge en gyldig udvidelse."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/de.po b/editor/translations/de.po
index 5035a7aa5d..aa92914ada 100644
--- a/editor/translations/de.po
+++ b/editor/translations/de.po
@@ -82,13 +82,14 @@
 # Christian Packenius <christian@packenius.com>, 2022.
 # Sajeg <jfx@posteo.de>, 2022.
 # Tobias Jacobs <tobi@jacobs.rocks>, 2022.
+# JeremyStarTM <jeremystartm@tuta.io>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2022-07-23 03:57+0000\n"
-"Last-Translator: So Wieso <sowieso@dukun.de>\n"
+"PO-Revision-Date: 2022-07-31 18:34+0000\n"
+"Last-Translator: JeremyStarTM <jeremystartm@tuta.io>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/godot-engine/"
 "godot/de/>\n"
 "Language: de\n"
@@ -1632,7 +1633,7 @@ msgstr "Methodenaufrufsspurschlüssel hinzufügen"
 
 #: editor/animation_track_editor.cpp
 msgid "Method not found in object:"
-msgstr "Methode nicht in Objekt gefunden:"
+msgstr "Methode im Objekt nicht gefunden:"
 
 #: editor/animation_track_editor.cpp
 msgid "Anim Move Keys"
@@ -2814,7 +2815,8 @@ msgid "Project export for platform:"
 msgstr "Projektexport für Plattform:"
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
+#, fuzzy
+msgid "Completed with warnings."
 msgstr "Fertiggestellt mit Fehlern."
 
 #: editor/editor_export.cpp
@@ -5569,7 +5571,7 @@ msgstr "Auswahl ziehen und fallen lassen"
 
 #: editor/editor_settings.cpp
 msgid "Stay In Script Editor On Node Selected"
-msgstr ""
+msgstr "Im Skript Editor bei ausgewähltem Node bleiben"
 
 #: editor/editor_settings.cpp
 msgid "Appearance"
@@ -11697,9 +11699,8 @@ msgid "New Animation"
 msgstr "Neue Animation"
 
 #: editor/plugins/sprite_frames_editor_plugin.cpp
-#, fuzzy
 msgid "Filter animations"
-msgstr "Methoden filtern"
+msgstr "Animationen filtern"
 
 #: editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Speed:"
@@ -18151,7 +18152,7 @@ msgstr "Ungültiges Argument vom Typ:"
 
 #: modules/visual_script/visual_script_nodes.cpp
 msgid "Invalid arguments:"
-msgstr "Ungültige Argumente:"
+msgstr "Ungültige Parameter:"
 
 #: modules/visual_script/visual_script_nodes.cpp
 msgid "a if cond, else b"
@@ -19652,8 +19653,8 @@ msgid ""
 "Could not start codesign executable, make sure Xcode command line tools are "
 "installed."
 msgstr ""
-"Codesign-Anwendung konnte nicht gestartet werden. Wurden die Xcode-"
-"Kommandozeilen-Hilfsprogramme installiert?"
+"Codesign-Anwendung konnte nicht gestartet werden, stelle sicher dass die "
+"Xcode-Kommandozeilen-Tools installiert sind."
 
 #: platform/osx/export/export.cpp platform/windows/export/export.cpp
 msgid "No identity found."
@@ -20145,17 +20146,18 @@ msgid "Could not find wine executable at \"%s\"."
 msgstr "Anwendung wine konnte nicht gefunden werden in „%s“."
 
 #: platform/windows/export/export.cpp
+#, fuzzy
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 "Anwendung rcedit konnte nicht gestartet werden. Bitte rcedit-Pfad in "
 "Editoreinstellungen festlegen (Export > Windows > Rcedit)."
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
 msgstr ""
 "Modifikation der Anwendung durch rcedit fehlgeschlagen:\n"
 "%s"
@@ -20177,17 +20179,18 @@ msgid "Invalid timestamp server."
 msgstr "Ungültiger Zeitstempelserver."
 
 #: platform/windows/export/export.cpp
+#, fuzzy
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 "Anwendung signtool konnte nicht gestartet werden. Bitte signtool-Pfad in "
 "Editoreinstellungen festlegen (Export > Windows > Signtool)."
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
 msgstr ""
 "Signieren der Anwendung durch Signtool ist fehlgeschlagen:\n"
 "%s"
diff --git a/editor/translations/editor.pot b/editor/translations/editor.pot
index c207124fcb..23c58c5ffb 100644
--- a/editor/translations/editor.pot
+++ b/editor/translations/editor.pot
@@ -2684,7 +2684,7 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr ""
 
 #: editor/editor_export.cpp
@@ -19258,14 +19258,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
+msgid "rcedit failed to modify executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
@@ -19286,14 +19285,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
+msgid "Signtool failed to sign executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
diff --git a/editor/translations/el.po b/editor/translations/el.po
index 85005d903a..4b71ed8528 100644
--- a/editor/translations/el.po
+++ b/editor/translations/el.po
@@ -2841,7 +2841,7 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "Αντιγ�αφή διαδ�ομής κόμβου"
 
 #: editor/editor_export.cpp
@@ -20907,15 +20907,15 @@ msgstr "Σφάλμα κατά το άνοιγμα π�οτ�που για εξα
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Άκυ�η επέκταση."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20939,15 +20939,15 @@ msgstr "Μη έγκυ�ο όνομα."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Άκυ�η επέκταση."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/en_Shaw.po b/editor/translations/en_Shaw.po
index 45d0549a81..361c10ce1a 100644
--- a/editor/translations/en_Shaw.po
+++ b/editor/translations/en_Shaw.po
@@ -2707,8 +2707,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "��������:"
 
 #: editor/editor_export.cpp
 msgid "Completed successfully."
@@ -19353,14 +19354,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
+msgid "rcedit failed to modify executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
@@ -19382,14 +19382,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
+msgid "Signtool failed to sign executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
diff --git a/editor/translations/eo.po b/editor/translations/eo.po
index 5a251ba489..0139382972 100644
--- a/editor/translations/eo.po
+++ b/editor/translations/eo.po
@@ -2852,8 +2852,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "Kopii elektaron"
 
 #: editor/editor_export.cpp
 #, fuzzy
@@ -20555,15 +20556,15 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Nevalida kromprogramo."
 
 #: platform/windows/export/export.cpp
 msgid "Could not find signtool executable at \"%s\"."
@@ -20585,15 +20586,15 @@ msgstr "Malvalida nomo."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Nevalida kromprogramo."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/es.po b/editor/translations/es.po
index 872fedfdac..173b195cc4 100644
--- a/editor/translations/es.po
+++ b/editor/translations/es.po
@@ -81,12 +81,16 @@
 # David Martínez <goddrinksjava@gmail.com>, 2022.
 # Nagamine-j <jimmy.kochi@unmsm.edu.pe>, 2022.
 # Esdras Caleb Oliveira Silva <acheicaleb@gmail.com>, 2022.
+# Luis Ortiz <luisortiz66@hotmail.com>, 2022.
+# Angel Andrade <aandradeb99@gmail.com>, 2022.
+# Juan Felipe Gómez López <juanfgomez0912@gmail.com>, 2022.
+# Pineappletooth <yochank003@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2022-07-27 13:26+0000\n"
+"PO-Revision-Date: 2022-08-05 01:04+0000\n"
 "Last-Translator: Javier Ocampos <xavier.ocampos@gmail.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/godot-engine/"
 "godot/es/>\n"
@@ -225,7 +229,7 @@ msgstr "Escala de Tiempo"
 
 #: core/bind/core_bind.cpp main/main.cpp
 msgid "Physics Jitter Fix"
-msgstr "Arreglo de las Fluctuaciones Físicas"
+msgstr "Corrección de Fluctuaciones de Física"
 
 #: core/bind/core_bind.cpp editor/plugins/version_control_editor_plugin.cpp
 msgid "Error"
@@ -2813,7 +2817,8 @@ msgid "Project export for platform:"
 msgstr "Exportar proyecto para la plataforma:"
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
+#, fuzzy
+msgid "Completed with warnings."
 msgstr "Completado con errores."
 
 #: editor/editor_export.cpp
@@ -5563,7 +5568,7 @@ msgstr "Arrastrar y Soltar la Selección"
 
 #: editor/editor_settings.cpp
 msgid "Stay In Script Editor On Node Selected"
-msgstr ""
+msgstr "Permanecer En Editor de Scripts En Nodo Seleccionado"
 
 #: editor/editor_settings.cpp
 msgid "Appearance"
@@ -5693,11 +5698,11 @@ msgstr "Espera de Completado de Código"
 
 #: editor/editor_settings.cpp
 msgid "Put Callhint Tooltip Below Current Line"
-msgstr "Colocar la Información Sobre la Llamada Debajo de la Línea Actual"
+msgstr "Colocar Tooltip de Llamada Debajo de la Línea Actual"
 
 #: editor/editor_settings.cpp
 msgid "Callhint Tooltip Offset"
-msgstr "Desplazamiento de la Información Sobre la Llamada"
+msgstr "Desplazamiento del Tooltip de Llamada"
 
 #: editor/editor_settings.cpp
 msgid "Complete File Paths"
@@ -6155,7 +6160,7 @@ msgstr "Color de Número de Línea Seguro"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
 msgid "Caret Color"
-msgstr ""
+msgstr "Color del Caret"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
 msgid "Caret Background Color"
@@ -6187,7 +6192,7 @@ msgstr "Color de la Palabra Resaltada"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
 msgid "Number Color"
-msgstr ""
+msgstr "Número del Color"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
 msgid "Function Color"
@@ -6211,7 +6216,7 @@ msgstr "Puntos de Interrupción"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
 msgid "Executing Line Color"
-msgstr ""
+msgstr "Color de la línea de ejecución"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
 msgid "Code Folding Color"
@@ -10144,7 +10149,7 @@ msgid ""
 "viewport."
 msgstr ""
 "El polígono 2D tiene vértices internos, por lo que ya no se puede editar en "
-"la ventanilla."
+"el viewport."
 
 #: editor/plugins/polygon_2d_editor_plugin.cpp
 msgid "Create Polygon & UV"
@@ -11410,27 +11415,27 @@ msgstr "Dialogo de Transformación..."
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "1 Viewport"
-msgstr "1 Ventana"
+msgstr "1 Viewport"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "2 Viewports"
-msgstr "2 Ventanas"
+msgstr "2 Viewports"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "2 Viewports (Alt)"
-msgstr "2 Ventanas (Alt)"
+msgstr "2 Viewports (Alt)"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "3 Viewports"
-msgstr "3 Ventanas"
+msgstr "3 Viewports"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "3 Viewports (Alt)"
-msgstr "3 Ventanas (Alt)"
+msgstr "3 Viewports (Alt)"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "4 Viewports"
-msgstr "4 Ventanas"
+msgstr "4 Viewports"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "Gizmos"
@@ -11475,7 +11480,7 @@ msgstr "Ajuste de Escala (%):"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "Viewport Settings"
-msgstr "Configuración de ventanilla"
+msgstr "Configuración del Viewport"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "Perspective FOV (deg.):"
@@ -11683,9 +11688,8 @@ msgid "New Animation"
 msgstr "Nueva Animación"
 
 #: editor/plugins/sprite_frames_editor_plugin.cpp
-#, fuzzy
 msgid "Filter animations"
-msgstr "Filtrar métodos"
+msgstr "Filtrar animaciones"
 
 #: editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Speed:"
@@ -16430,7 +16434,7 @@ msgstr ""
 
 #: main/main.cpp
 msgid "Tooltip Position Offset"
-msgstr "Offset de la Posición del Tooltip"
+msgstr "Desplazamiento de Posición del Tooltip"
 
 #: main/main.cpp modules/mono/mono_gd/gd_mono.cpp
 msgid "Debugger Agent"
@@ -20127,18 +20131,19 @@ msgid "Could not find wine executable at \"%s\"."
 msgstr "No se pudo encontrar el ejecutable de wine en \"%s\"."
 
 #: platform/windows/export/export.cpp
+#, fuzzy
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 "No se ha podido iniciar el ejecutable rcedit, configura la ruta de rcedit en "
 "la configuración del editor (Exportar > Windows > Rcedit)."
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Fallo al abrir el archivo ejecutable \"%s\"."
 
 #: platform/windows/export/export.cpp
 msgid "Could not find signtool executable at \"%s\"."
@@ -20157,18 +20162,19 @@ msgid "Invalid timestamp server."
 msgstr "Servidor de marcas de tiempo inválido."
 
 #: platform/windows/export/export.cpp
+#, fuzzy
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 "No se ha podido iniciar el ejecutable de signtool, configura la ruta de "
 "signtool en la configuración del editor (Exportar > Windows > Signtool)."
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Fallo al abrir el archivo ejecutable \"%s\"."
 
 #: platform/windows/export/export.cpp
 msgid "Failed to remove temporary file \"%s\"."
@@ -20382,7 +20388,7 @@ msgstr "Zoom"
 
 #: scene/2d/camera_2d.cpp scene/main/canvas_layer.cpp
 msgid "Custom Viewport"
-msgstr "Vista Personalizada"
+msgstr "Viewport Personalizado"
 
 #: scene/2d/camera_2d.cpp scene/3d/camera.cpp scene/3d/interpolated_camera.cpp
 #: scene/animation/animation_player.cpp scene/animation/animation_tree.cpp
@@ -22922,9 +22928,8 @@ msgid "Show Margins"
 msgstr "Mostrar Márgenes"
 
 #: scene/3d/room_manager.cpp
-#, fuzzy
 msgid "Debug Sprawl"
-msgstr "Depurar Desorden"
+msgstr "Depurar Extensión"
 
 #: scene/3d/room_manager.cpp
 msgid "Overlap Warning Threshold"
@@ -22939,14 +22944,12 @@ msgid "Portal Depth Limit"
 msgstr ""
 
 #: scene/3d/room_manager.cpp
-#, fuzzy
 msgid "Default Portal Margin"
-msgstr "Asignar Margen"
+msgstr "Margen del Portal por Defecto"
 
 #: scene/3d/room_manager.cpp
-#, fuzzy
 msgid "Roaming Expansion Margin"
-msgstr "Expandir Todo"
+msgstr "Margen de Expansión del Roaming"
 
 #: scene/3d/room_manager.cpp
 msgid ""
@@ -22999,43 +23002,36 @@ msgstr ""
 "Asegúrate de que todas las rooms contienen geometría o límites manuales."
 
 #: scene/3d/skeleton.cpp scene/resources/skin.cpp
-#, fuzzy
 msgid "Pose"
-msgstr "Copiar Pose"
+msgstr "Pose"
 
 #: scene/3d/skeleton.cpp
-#, fuzzy
 msgid "Bound Children"
-msgstr "Hijos Editables"
+msgstr "Hijos Vinculados"
 
 #: scene/3d/soft_body.cpp
-#, fuzzy
 msgid "Pinned Points"
-msgstr "Fijado %s"
+msgstr "Puntos de Anclaje"
 
 #: scene/3d/soft_body.cpp
-#, fuzzy
 msgid "Attachments"
-msgstr "Gizmos"
+msgstr "Adjuntos"
 
 #: scene/3d/soft_body.cpp
-#, fuzzy
 msgid "Point Index"
-msgstr "Obtener �ndice"
+msgstr "�ndice de Puntos"
 
 #: scene/3d/soft_body.cpp
 msgid "Spatial Attachment Path"
 msgstr ""
 
 #: scene/3d/soft_body.cpp
-#, fuzzy
 msgid "Physics Enabled"
-msgstr "Fotogramas de Física %"
+msgstr "Física Activada"
 
 #: scene/3d/soft_body.cpp
-#, fuzzy
 msgid "Parent Collision Ignore"
-msgstr "Crear Polígono de Colisión"
+msgstr "Ignorar Colisión de los Padres"
 
 #: scene/3d/soft_body.cpp
 msgid "Simulation Precision"
@@ -23100,9 +23096,8 @@ msgid "Gizmo"
 msgstr "Gizmo"
 
 #: scene/3d/spatial_velocity_tracker.cpp
-#, fuzzy
 msgid "Track Physics Step"
-msgstr "Fotogramas de Física %"
+msgstr "Paso de Física de Pistas"
 
 #: scene/3d/spring_arm.cpp
 msgid "Spring Length"
@@ -23113,9 +23108,8 @@ msgid "Opacity"
 msgstr ""
 
 #: scene/3d/sprite_3d.cpp scene/resources/material.cpp
-#, fuzzy
 msgid "Transparent"
-msgstr "Transponer"
+msgstr "Transparente"
 
 #: scene/3d/sprite_3d.cpp
 msgid ""
@@ -23134,14 +23128,12 @@ msgstr ""
 "Por favor, úselo como hijo de un VehicleBody."
 
 #: scene/3d/vehicle_body.cpp
-#, fuzzy
 msgid "Per-Wheel Motion"
-msgstr "Botón Bajar la Rueda"
+msgstr "Movimiento por Rueda"
 
 #: scene/3d/vehicle_body.cpp
-#, fuzzy
 msgid "Engine Force"
-msgstr "Documentación Online"
+msgstr "Fuerza del Motor"
 
 #: scene/3d/vehicle_body.cpp
 msgid "Brake"
@@ -23172,19 +23164,16 @@ msgid "Roll Influence"
 msgstr ""
 
 #: scene/3d/vehicle_body.cpp
-#, fuzzy
 msgid "Friction Slip"
-msgstr "Función"
+msgstr "Deslizamiento por Fricción"
 
 #: scene/3d/vehicle_body.cpp
-#, fuzzy
 msgid "Suspension"
-msgstr "Expresión"
+msgstr "Suspensión"
 
 #: scene/3d/vehicle_body.cpp
-#, fuzzy
 msgid "Max Force"
-msgstr "Error"
+msgstr "Fuerza Máxima"
 
 #: scene/3d/visibility_notifier.cpp
 msgid "AABB"
@@ -23211,14 +23200,12 @@ msgid "Extra Cull Margin"
 msgstr "Margen de Sacrificio Extra"
 
 #: scene/3d/visual_instance.cpp
-#, fuzzy
 msgid "Baked Light"
-msgstr "Calcular Lightmaps"
+msgstr "Bakear Luces"
 
 #: scene/3d/visual_instance.cpp
-#, fuzzy
 msgid "Generate Lightmap"
-msgstr "Generando Lightmaps"
+msgstr "Generar Lightmap"
 
 #: scene/3d/visual_instance.cpp
 msgid "Lightmap Scale"
@@ -23274,9 +23261,8 @@ msgid "Animation not found: '%s'"
 msgstr "No se encontró la animación: '%s'"
 
 #: scene/animation/animation_blend_tree.cpp
-#, fuzzy
 msgid "Mix Mode"
-msgstr "Nodo Mix"
+msgstr "Modo Mix"
 
 #: scene/animation/animation_blend_tree.cpp
 msgid "Fadein Time"
@@ -23303,24 +23289,20 @@ msgid "Random Delay"
 msgstr "Retraso Aleatorio"
 
 #: scene/animation/animation_blend_tree.cpp
-#, fuzzy
 msgid "Add Amount"
-msgstr "Cantidad"
+msgstr "Añadir Cantidad"
 
 #: scene/animation/animation_blend_tree.cpp
-#, fuzzy
 msgid "Blend Amount"
-msgstr "Cantidad de Escala"
+msgstr "Cantidad de Mezcla"
 
 #: scene/animation/animation_blend_tree.cpp
-#, fuzzy
 msgid "Seek Position"
-msgstr "Establecer Posición de Entrada de Curva"
+msgstr "Buscar Posición"
 
 #: scene/animation/animation_blend_tree.cpp
-#, fuzzy
 msgid "Input Count"
-msgstr "Añadir Puerto de Entrada"
+msgstr "Conteo de Entradas"
 
 #: scene/animation/animation_blend_tree.cpp
 #: scene/animation/animation_node_state_machine.cpp
@@ -23328,56 +23310,48 @@ msgid "Xfade Time"
 msgstr "Tiempo de Fundido Cruzado"
 
 #: scene/animation/animation_node_state_machine.cpp
-#, fuzzy
 msgid "Switch Mode"
-msgstr "Cambiar"
+msgstr "Modo de Conmutación"
 
 #: scene/animation/animation_node_state_machine.cpp
-#, fuzzy
 msgid "Auto Advance"
-msgstr "Establecer avance automático"
+msgstr "Auto Avance"
 
 #: scene/animation/animation_node_state_machine.cpp
-#, fuzzy
 msgid "Advance Condition"
-msgstr "Opciones Avanzadas"
+msgstr "Condición de Avance"
 
 #: scene/animation/animation_player.cpp
 msgid "Anim Apply Reset"
 msgstr "Aplicar Reset de la Animación"
 
 #: scene/animation/animation_player.cpp
-#, fuzzy
 msgid "Current Animation"
-msgstr "Establecer Animación"
+msgstr "Animación Actual"
 
 #: scene/animation/animation_player.cpp
-#, fuzzy
 msgid "Assigned Animation"
-msgstr "Añadir Animación"
+msgstr "Animación Asignada"
 
 #: scene/animation/animation_player.cpp
 msgid "Reset On Save"
 msgstr ""
 
 #: scene/animation/animation_player.cpp
-#, fuzzy
 msgid "Current Animation Length"
-msgstr "Cambiar Duración de la Animación"
+msgstr "Duración Actual de la Animación"
 
 #: scene/animation/animation_player.cpp
-#, fuzzy
 msgid "Current Animation Position"
-msgstr "Añadir Punto de Animación"
+msgstr "Posición Actual de la Animación"
 
 #: scene/animation/animation_player.cpp
 msgid "Playback Options"
 msgstr "Opciones de Reproducción"
 
 #: scene/animation/animation_player.cpp
-#, fuzzy
 msgid "Default Blend Time"
-msgstr "Theme Predeterminado"
+msgstr "Tiempo de Mezcla por Defecto"
 
 #: scene/animation/animation_player.cpp
 msgid "Method Call Mode"
@@ -23418,67 +23392,56 @@ msgid "Tree Root"
 msgstr "Raíz del �rbol"
 
 #: scene/animation/animation_tree.cpp
-#, fuzzy
 msgid "Anim Player"
-msgstr "Fijar AnimationPlayer"
+msgstr "Reproductor de Animación"
 
 #: scene/animation/animation_tree.cpp
 msgid "Root Motion"
 msgstr ""
 
 #: scene/animation/animation_tree.cpp
-#, fuzzy
 msgid "Track"
-msgstr "Agregar Pista"
+msgstr "Pista"
 
 #: scene/animation/animation_tree_player.cpp
 msgid "This node has been deprecated. Use AnimationTree instead."
 msgstr "Este nodo ha quedado obsoleto. Usa AnimationTree en su lugar."
 
 #: scene/animation/animation_tree_player.cpp
-#, fuzzy
 msgid "Playback"
 msgstr "Reproducir"
 
 #: scene/animation/animation_tree_player.cpp
-#, fuzzy
 msgid "Master Player"
-msgstr "Pegar Parámetros"
+msgstr "Reproductor Principal"
 
 #: scene/animation/animation_tree_player.cpp
-#, fuzzy
 msgid "Base Path"
-msgstr "Ruta de Exportación"
+msgstr "Ruta Base"
 
 #: scene/animation/root_motion_view.cpp
-#, fuzzy
 msgid "Animation Path"
-msgstr "Animación"
+msgstr "Ruta de la Animación"
 
 #: scene/animation/root_motion_view.cpp
-#, fuzzy
 msgid "Zero Y"
-msgstr "Cero"
+msgstr "Cero Y"
 
 #: scene/animation/skeleton_ik.cpp
-#, fuzzy
 msgid "Root Bone"
-msgstr "Nombre del nodo raíz"
+msgstr "Hueso Raíz"
 
 #: scene/animation/skeleton_ik.cpp
-#, fuzzy
 msgid "Tip Bone"
-msgstr "Huesos"
+msgstr "Punta del Hueso"
 
 #: scene/animation/skeleton_ik.cpp
-#, fuzzy
 msgid "Interpolation"
-msgstr "Modo de Interpolación"
+msgstr "Interpolación"
 
 #: scene/animation/skeleton_ik.cpp
-#, fuzzy
 msgid "Override Tip Basis"
-msgstr "Anulaciones"
+msgstr "Anular Base de la Punta"
 
 #: scene/animation/skeleton_ik.cpp
 msgid "Use Magnet"
@@ -23489,54 +23452,46 @@ msgid "Magnet"
 msgstr ""
 
 #: scene/animation/skeleton_ik.cpp
-#, fuzzy
 msgid "Target Node"
-msgstr "Reemparentar nodo"
+msgstr "Nodo Objetivo"
 
 #: scene/animation/skeleton_ik.cpp
-#, fuzzy
 msgid "Max Iterations"
-msgstr "Crear Función"
+msgstr "Iteraciones Máximas"
 
 #: scene/animation/tween.cpp
 msgid "Playback Process Mode"
 msgstr ""
 
 #: scene/animation/tween.cpp
-#, fuzzy
 msgid "Playback Speed"
-msgstr "Reproducir Escena"
+msgstr "Velocidad de Reproducción"
 
 #: scene/audio/audio_stream_player.cpp
-#, fuzzy
 msgid "Mix Target"
-msgstr "Objetivo"
+msgstr "Objetivo de la Mezcla"
 
 #: scene/gui/aspect_ratio_container.cpp scene/gui/range.cpp
 #: servers/audio/effects/audio_effect_compressor.cpp
-#, fuzzy
 msgid "Ratio"
-msgstr "Mantener Proporciones"
+msgstr "Proporción"
 
 #: scene/gui/aspect_ratio_container.cpp scene/gui/texture_button.cpp
 #: scene/gui/texture_rect.cpp
-#, fuzzy
 msgid "Stretch Mode"
-msgstr "Modo de Selección"
+msgstr "Modo de Estiramiento"
 
 #: scene/gui/aspect_ratio_container.cpp scene/gui/box_container.cpp
 msgid "Alignment"
 msgstr ""
 
 #: scene/gui/base_button.cpp
-#, fuzzy
 msgid "Shortcut In Tooltip"
-msgstr "Mostrar Origen"
+msgstr "Atajo en el Tooltip"
 
 #: scene/gui/base_button.cpp
-#, fuzzy
 msgid "Action Mode"
-msgstr "Modo de Icono"
+msgstr "Modo de Acción"
 
 #: scene/gui/base_button.cpp
 msgid "Enabled Focus Mode"
@@ -23547,38 +23502,33 @@ msgid "Keep Pressed Outside"
 msgstr ""
 
 #: scene/gui/base_button.cpp scene/gui/shortcut.cpp
-#, fuzzy
 msgid "Shortcut"
-msgstr "Atajos"
+msgstr "Atajo"
 
 #: scene/gui/base_button.cpp
-#, fuzzy
 msgid "Group"
-msgstr "Grupos"
+msgstr "Grupo"
 
 #: scene/gui/button.cpp scene/gui/label.cpp
-#, fuzzy
 msgid "Clip Text"
-msgstr "Copiar Texto"
+msgstr "Texto del Clip"
 
 #: scene/gui/button.cpp scene/gui/label.cpp scene/gui/line_edit.cpp
 #: scene/gui/spin_box.cpp
 msgid "Align"
-msgstr ""
+msgstr "Alinear"
 
 #: scene/gui/button.cpp
 msgid "Icon Align"
-msgstr ""
+msgstr "Alinear Icono"
 
 #: scene/gui/button.cpp
-#, fuzzy
 msgid "Expand Icon"
-msgstr "Expandir Todo"
+msgstr "Expandir Icono"
 
 #: scene/gui/center_container.cpp
-#, fuzzy
 msgid "Use Top Left"
-msgstr "Superior Izquierda"
+msgstr "Usar Superior Izquierda"
 
 #: scene/gui/color_picker.cpp
 msgid ""
@@ -23591,34 +23541,28 @@ msgstr ""
 "Clic der: Borrar configuración predeterminada"
 
 #: scene/gui/color_picker.cpp
-#, fuzzy
 msgid "Edit Alpha"
-msgstr "Editar Polígono"
+msgstr "Editar Alfa"
 
 #: scene/gui/color_picker.cpp
-#, fuzzy
 msgid "HSV Mode"
-msgstr "Modo de Selección"
+msgstr "Modo HSV"
 
 #: scene/gui/color_picker.cpp
-#, fuzzy
 msgid "Raw Mode"
-msgstr "Modo desplazamiento lateral"
+msgstr "Modo Raw"
 
 #: scene/gui/color_picker.cpp
-#, fuzzy
 msgid "Deferred Mode"
-msgstr "Diferido"
+msgstr "Modo Diferido"
 
 #: scene/gui/color_picker.cpp
-#, fuzzy
 msgid "Presets Enabled"
-msgstr "Ajustes preestablecidos"
+msgstr "Preajustes Activados"
 
 #: scene/gui/color_picker.cpp
-#, fuzzy
 msgid "Presets Visible"
-msgstr "Act./Desact. Visible"
+msgstr "Preajustes Visibles"
 
 #: scene/gui/color_picker.cpp
 msgid "Pick a color from the editor window."
@@ -23648,9 +23592,8 @@ msgstr ""
 "sencillo."
 
 #: scene/gui/control.cpp
-#, fuzzy
 msgid "Theme Overrides"
-msgstr "Anulaciones"
+msgstr "Anulación de Temas"
 
 #: scene/gui/control.cpp
 msgid ""
@@ -23662,14 +23605,12 @@ msgstr ""
 "Filtro del Ratón en \"Stop\" o \"Pass\"."
 
 #: scene/gui/control.cpp
-#, fuzzy
 msgid "Anchor"
-msgstr "Sólo anclado"
+msgstr "Anclaje"
 
 #: scene/gui/control.cpp
-#, fuzzy
 msgid "Grow Direction"
-msgstr "Direcciones"
+msgstr "Dirección de Crecimiento"
 
 #: scene/gui/control.cpp scene/resources/navigation_mesh.cpp
 msgid "Min Size"
@@ -23680,40 +23621,36 @@ msgid "Pivot Offset"
 msgstr "Pivote de Desplazamiento"
 
 #: scene/gui/control.cpp
-#, fuzzy
 msgid "Clip Content"
-msgstr "Constante de Clase"
+msgstr "Contenido del Clip"
 
 #: scene/gui/control.cpp scene/resources/visual_shader_nodes.cpp
 msgid "Hint"
 msgstr ""
 
 #: scene/gui/control.cpp
-#, fuzzy
 msgid "Tooltip"
-msgstr "Herramientas"
+msgstr "Tooltip"
 
 #: scene/gui/control.cpp scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Focus"
-msgstr "Foco en Ruta"
+msgstr "Foco"
 
 #: scene/gui/control.cpp
 msgid "Neighbour Left"
-msgstr ""
+msgstr "Vecino Izquierda"
 
 #: scene/gui/control.cpp
 msgid "Neighbour Top"
-msgstr ""
+msgstr "Vecino Superior"
 
 #: scene/gui/control.cpp
 msgid "Neighbour Right"
-msgstr ""
+msgstr "Vecino Derecha"
 
 #: scene/gui/control.cpp
-#, fuzzy
 msgid "Neighbour Bottom"
-msgstr "Centro Inferior"
+msgstr "Vecino Inferior"
 
 #: scene/gui/control.cpp
 msgid "Next"
@@ -23740,23 +23677,20 @@ msgid "Size Flags"
 msgstr "Tamaño de los Indicadores"
 
 #: scene/gui/control.cpp
-#, fuzzy
 msgid "Stretch Ratio"
-msgstr "Modo de Selección"
+msgstr "Relación de Estiramiento"
 
 #: scene/gui/control.cpp
-#, fuzzy
 msgid "Theme Type Variation"
-msgstr "Propiedades del Theme"
+msgstr "Propiedades del Tema"
 
 #: scene/gui/dialogs.cpp
 msgid "Window Title"
 msgstr ""
 
 #: scene/gui/dialogs.cpp
-#, fuzzy
 msgid "Dialog"
-msgstr "Diálogo XForm"
+msgstr "Diálogo"
 
 #: scene/gui/dialogs.cpp
 msgid "Hide On OK"
@@ -23771,18 +23705,16 @@ msgid "Please Confirm..."
 msgstr "Por favor, Confirma..."
 
 #: scene/gui/file_dialog.cpp
-#, fuzzy
 msgid "Mode Overrides Title"
-msgstr "Elemento de Anulación"
+msgstr "Sobreescritura"
 
 #: scene/gui/file_dialog.cpp
 msgid "Must use a valid extension."
 msgstr "Debe tener una extensión válida."
 
 #: scene/gui/graph_edit.cpp
-#, fuzzy
 msgid "Right Disconnects"
-msgstr "Desconectar"
+msgstr "Desconexión Correcta"
 
 #: scene/gui/graph_edit.cpp
 msgid "Scroll Offset"
@@ -23793,24 +23725,20 @@ msgid "Snap Distance"
 msgstr "Ajustar Distancia"
 
 #: scene/gui/graph_edit.cpp
-#, fuzzy
 msgid "Zoom Min"
-msgstr "Acercar Zoom"
+msgstr "Zoom Mínimo"
 
 #: scene/gui/graph_edit.cpp
-#, fuzzy
 msgid "Zoom Max"
-msgstr "Acercar Zoom"
+msgstr "Zoom Máximo"
 
 #: scene/gui/graph_edit.cpp
-#, fuzzy
 msgid "Zoom Step"
-msgstr "Alejar Zoom"
+msgstr "Paso Zoom"
 
 #: scene/gui/graph_edit.cpp
-#, fuzzy
 msgid "Show Zoom Label"
-msgstr "Mostrar Huesos"
+msgstr "Mostrar Etiqueta Zoom"
 
 #: scene/gui/graph_edit.cpp scene/gui/text_edit.cpp
 #: scene/resources/default_theme/default_theme.cpp
@@ -23822,58 +23750,50 @@ msgid "Enable grid minimap."
 msgstr "Activar minimapa de cuadrícula."
 
 #: scene/gui/graph_node.cpp
-#, fuzzy
 msgid "Show Close"
-msgstr "Mostrar Huesos"
+msgstr "Mostrar Cerrar"
 
 #: scene/gui/graph_node.cpp scene/gui/option_button.cpp
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Selected"
-msgstr "Seleccionar"
+msgstr "Seleccionado"
 
 #: scene/gui/graph_node.cpp scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Comment"
-msgstr "Confirmar"
+msgstr "Comentario"
 
 #: scene/gui/graph_node.cpp
 msgid "Overlay"
 msgstr ""
 
 #: scene/gui/grid_container.cpp scene/gui/item_list.cpp scene/gui/tree.cpp
-#, fuzzy
 msgid "Columns"
-msgstr "Volumen"
+msgstr "Columnas"
 
 #: scene/gui/item_list.cpp scene/gui/popup_menu.cpp scene/gui/text_edit.cpp
 #: scene/gui/tree.cpp scene/main/viewport.cpp
-#, fuzzy
 msgid "Timers"
-msgstr "Tiempo"
+msgstr "Temporizadores"
 
 #: scene/gui/item_list.cpp scene/gui/popup_menu.cpp scene/gui/tree.cpp
 msgid "Incremental Search Max Interval Msec"
 msgstr ""
 
 #: scene/gui/item_list.cpp scene/gui/tree.cpp
-#, fuzzy
 msgid "Allow Reselect"
-msgstr "Aplicar Restablecer"
+msgstr "Permitir Volver A Seleccionar"
 
 #: scene/gui/item_list.cpp scene/gui/tree.cpp
-#, fuzzy
 msgid "Allow RMB Select"
-msgstr "Rellenar Selección"
+msgstr "Permitir Selección Con Botón Derecho Del Ratón"
 
 #: scene/gui/item_list.cpp
 msgid "Max Text Lines"
 msgstr ""
 
 #: scene/gui/item_list.cpp
-#, fuzzy
 msgid "Auto Height"
-msgstr "Prueba"
+msgstr "Altura Automática"
 
 #: scene/gui/item_list.cpp
 msgid "Max Columns"
@@ -23892,23 +23812,20 @@ msgid "Icon Scale"
 msgstr "Escala de Icono"
 
 #: scene/gui/item_list.cpp
-#, fuzzy
 msgid "Fixed Icon Size"
-msgstr "Vista Frontal"
+msgstr "Tamaño Fijo de Icono"
 
 #: scene/gui/label.cpp
-#, fuzzy
 msgid "V Align"
-msgstr "Asignar"
+msgstr "Alineamiento V"
 
 #: scene/gui/label.cpp scene/gui/rich_text_label.cpp
 msgid "Visible Characters"
 msgstr "Caracteres Visibles"
 
 #: scene/gui/label.cpp scene/gui/rich_text_label.cpp
-#, fuzzy
 msgid "Percent Visible"
-msgstr "Act./Desact. Visible"
+msgstr "Porcentaje Visible"
 
 #: scene/gui/label.cpp
 msgid "Lines Skipped"
@@ -23935,34 +23852,28 @@ msgid "Expand To Text Length"
 msgstr ""
 
 #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp
-#, fuzzy
 msgid "Context Menu Enabled"
-msgstr "Ayuda Contextual"
+msgstr "Menú Contextual Activado"
 
 #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp
-#, fuzzy
 msgid "Virtual Keyboard Enabled"
-msgstr "Filtrar señales"
+msgstr "Teclado Virtual Activado"
 
 #: scene/gui/line_edit.cpp
-#, fuzzy
 msgid "Clear Button Enabled"
-msgstr "Filtrar señales"
+msgstr "Botón de Borrado Activado"
 
 #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp
-#, fuzzy
 msgid "Shortcut Keys Enabled"
-msgstr "Atajos"
+msgstr "Atajos Activados"
 
 #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp
-#, fuzzy
 msgid "Middle Mouse Paste Enabled"
-msgstr "Filtrar señales"
+msgstr "Pegar Con Botón Intermedio Ratón Activado"
 
 #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp
-#, fuzzy
 msgid "Selecting Enabled"
-msgstr "Sólo selección"
+msgstr "Selección Activada"
 
 #: scene/gui/line_edit.cpp scene/gui/rich_text_label.cpp
 #: scene/gui/text_edit.cpp
@@ -23970,14 +23881,12 @@ msgid "Deselect On Focus Loss Enabled"
 msgstr ""
 
 #: scene/gui/line_edit.cpp
-#, fuzzy
 msgid "Right Icon"
-msgstr "Botón Derecho"
+msgstr "Icono Derecho"
 
 #: scene/gui/line_edit.cpp
-#, fuzzy
 msgid "Placeholder"
-msgstr "Cargar Como Placeholder"
+msgstr "Marcador"
 
 #: scene/gui/line_edit.cpp
 msgid "Alpha"
@@ -24000,24 +23909,20 @@ msgid "Underline"
 msgstr ""
 
 #: scene/gui/menu_button.cpp
-#, fuzzy
 msgid "Switch On Hover"
-msgstr "Cambiar"
+msgstr "Cambiar Al Pasar Por Encima"
 
 #: scene/gui/nine_patch_rect.cpp scene/resources/style_box.cpp
-#, fuzzy
 msgid "Draw Center"
-msgstr "Centro"
+msgstr "Dibujar al Centro"
 
 #: scene/gui/nine_patch_rect.cpp scene/resources/style_box.cpp
-#, fuzzy
 msgid "Region Rect"
-msgstr "Establecer Region Rect"
+msgstr "Región Rectángulo"
 
 #: scene/gui/nine_patch_rect.cpp
-#, fuzzy
 msgid "Patch Margin"
-msgstr "Asignar Margen"
+msgstr "Parche de Margen"
 
 #: scene/gui/nine_patch_rect.cpp scene/resources/style_box.cpp
 msgid "Axis Stretch"
@@ -24036,14 +23941,12 @@ msgstr ""
 "como Stretch en su lugar."
 
 #: scene/gui/popup.cpp
-#, fuzzy
 msgid "Popup"
-msgstr "Rellenar"
+msgstr "Popup"
 
 #: scene/gui/popup.cpp
-#, fuzzy
 msgid "Exclusive"
-msgstr "Inclusivo"
+msgstr "Exclusivo"
 
 #: scene/gui/popup.cpp
 msgid ""
@@ -24056,28 +23959,24 @@ msgstr ""
 "edición, pero se esconderán al iniciar."
 
 #: scene/gui/popup_menu.cpp
-#, fuzzy
 msgid "Hide On Item Selection"
-msgstr "Centrar Selección"
+msgstr "Ocultar Al Seleccionar Elemento"
 
 #: scene/gui/popup_menu.cpp
-#, fuzzy
 msgid "Hide On Checkable Item Selection"
-msgstr "Eliminar Selección de GridMap"
+msgstr "Ocultar Al Seleccionar Elemento Activable"
 
 #: scene/gui/popup_menu.cpp
-#, fuzzy
 msgid "Hide On State Item Selection"
-msgstr "Eliminar Selección"
+msgstr "Ocultar Al Seleccionar Elemento de Estado"
 
 #: scene/gui/popup_menu.cpp
 msgid "Submenu Popup Delay"
 msgstr ""
 
 #: scene/gui/popup_menu.cpp
-#, fuzzy
 msgid "Allow Search"
-msgstr "Buscar"
+msgstr "Permitir Búsqueda"
 
 #: scene/gui/progress_bar.cpp
 msgid "Percent"
@@ -24088,28 +23987,24 @@ msgid "If \"Exp Edit\" is enabled, \"Min Value\" must be greater than 0."
 msgstr "Si \"Exp Edit\" está activado, \"Min Value\" debe ser mayor que 0."
 
 #: scene/gui/range.cpp scene/resources/curve.cpp
-#, fuzzy
 msgid "Min Value"
-msgstr "Fijar Valor"
+msgstr "Valor Mínimo"
 
 #: scene/gui/range.cpp scene/resources/curve.cpp
-#, fuzzy
 msgid "Max Value"
-msgstr "Valor"
+msgstr "Valor Máximo"
 
 #: scene/gui/range.cpp
 msgid "Page"
 msgstr "Página"
 
 #: scene/gui/range.cpp
-#, fuzzy
 msgid "Exp Edit"
-msgstr "Editar"
+msgstr "Editar Exp"
 
 #: scene/gui/range.cpp
-#, fuzzy
 msgid "Rounded"
-msgstr "Agrupado"
+msgstr "Redondeado"
 
 #: scene/gui/range.cpp
 msgid "Allow Greater"
@@ -24120,24 +24015,20 @@ msgid "Allow Lesser"
 msgstr ""
 
 #: scene/gui/reference_rect.cpp
-#, fuzzy
 msgid "Border Color"
-msgstr "Cambiar Nombre del Elemento Color"
+msgstr "Color Del Borde"
 
 #: scene/gui/reference_rect.cpp scene/resources/style_box.cpp
-#, fuzzy
 msgid "Border Width"
-msgstr "Píxeles del Borde"
+msgstr "Anchura Del Borde"
 
 #: scene/gui/rich_text_effect.cpp
-#, fuzzy
 msgid "Relative Index"
-msgstr "Obtener �ndice"
+msgstr "�ndice Relativo"
 
 #: scene/gui/rich_text_effect.cpp
-#, fuzzy
 msgid "Absolute Index"
-msgstr "Auto Sangría"
+msgstr "�ndice Absoluto"
 
 #: scene/gui/rich_text_effect.cpp
 msgid "Elapsed Time"
@@ -24146,7 +24037,7 @@ msgstr "Tiempo Transcurrido"
 #: scene/gui/rich_text_effect.cpp
 #, fuzzy
 msgid "Env"
-msgstr "Fin"
+msgstr "Env"
 
 #: scene/gui/rich_text_effect.cpp
 msgid "Character"
@@ -24165,9 +24056,8 @@ msgid "Tab Size"
 msgstr "Tamaño de Tabulación"
 
 #: scene/gui/rich_text_label.cpp
-#, fuzzy
 msgid "Fit Content Height"
-msgstr "Pintar Peso de Huesos"
+msgstr "Ajustar Altura Del Contenido"
 
 #: scene/gui/rich_text_label.cpp
 msgid "Scroll Active"
@@ -24178,23 +24068,20 @@ msgid "Scroll Following"
 msgstr ""
 
 #: scene/gui/rich_text_label.cpp
-#, fuzzy
 msgid "Selection Enabled"
-msgstr "Sólo selección"
+msgstr "Selección Activada"
 
 #: scene/gui/rich_text_label.cpp scene/gui/text_edit.cpp
 msgid "Override Selected Font Color"
 msgstr "Sobrescribir Color de Fuente Seleccionada"
 
 #: scene/gui/rich_text_label.cpp
-#, fuzzy
 msgid "Custom Effects"
-msgstr "Mover Efecto de Bus"
+msgstr "Efectos Personalizados"
 
 #: scene/gui/scroll_bar.cpp
-#, fuzzy
 msgid "Custom Step"
-msgstr "CustomNode"
+msgstr "Paso Personalizado"
 
 #: scene/gui/scroll_container.cpp
 msgid ""
@@ -24207,18 +24094,16 @@ msgstr ""
 "manualmente el tamaño mínimo personalizado."
 
 #: scene/gui/scroll_container.cpp
-#, fuzzy
 msgid "Follow Focus"
-msgstr "Llenar superficie"
+msgstr "Seguir Focus"
 
 #: scene/gui/scroll_container.cpp
 msgid "Horizontal Enabled"
 msgstr "Horizontal Activado"
 
 #: scene/gui/scroll_container.cpp
-#, fuzzy
 msgid "Vertical Enabled"
-msgstr "Filtrar señales"
+msgstr "Vertical Activada"
 
 #: scene/gui/scroll_container.cpp
 msgid "Default Scroll Deadzone"
@@ -24229,9 +24114,8 @@ msgid "Scrollable"
 msgstr ""
 
 #: scene/gui/slider.cpp
-#, fuzzy
 msgid "Tick Count"
-msgstr "Seleccionar Color"
+msgstr "Cantidad De Marcas"
 
 #: scene/gui/slider.cpp
 msgid "Ticks On Borders"
@@ -24250,14 +24134,12 @@ msgid "Split Offset"
 msgstr "Desplazamiento de División"
 
 #: scene/gui/split_container.cpp scene/gui/tree.cpp
-#, fuzzy
 msgid "Collapsed"
-msgstr "Colapsar Todo"
+msgstr "Colapsado"
 
 #: scene/gui/split_container.cpp
-#, fuzzy
 msgid "Dragger Visibility"
-msgstr "Cambiar Visibilidad"
+msgstr "Visibilidad de los Arrastradores"
 
 #: scene/gui/tab_container.cpp scene/gui/tabs.cpp
 msgid "Tab Align"
@@ -24268,9 +24150,8 @@ msgid "Current Tab"
 msgstr "Pestaña Actual"
 
 #: scene/gui/tab_container.cpp
-#, fuzzy
 msgid "Tabs Visible"
-msgstr "Act./Desact. Visible"
+msgstr "Pestañas Visibles"
 
 #: scene/gui/tab_container.cpp
 msgid "All Tabs In Front"
@@ -24297,18 +24178,16 @@ msgid "Readonly"
 msgstr ""
 
 #: scene/gui/text_edit.cpp
-#, fuzzy
 msgid "Bookmark Gutter"
-msgstr "Marcadores"
+msgstr "Canalón de Marcadores"
 
 #: scene/gui/text_edit.cpp
-#, fuzzy
 msgid "Breakpoint Gutter"
-msgstr "Saltar Breakpoints"
+msgstr "Canalón de Puntos de Ruptura"
 
 #: scene/gui/text_edit.cpp
 msgid "Fold Gutter"
-msgstr "Plegar Gutter"
+msgstr "Canalón Plegable"
 
 #: scene/gui/text_edit.cpp
 msgid "Drag And Drop Selection Enabled"
@@ -24335,9 +24214,8 @@ msgid "Draw"
 msgstr "Dibujar"
 
 #: scene/gui/text_edit.cpp
-#, fuzzy
 msgid "Block Mode"
-msgstr "Desbloquear Nodo"
+msgstr "Modo Bloque"
 
 #: scene/gui/text_edit.cpp
 msgid "Moving By Right Click"
@@ -24356,34 +24234,29 @@ msgid "Hover"
 msgstr ""
 
 #: scene/gui/texture_button.cpp
-#, fuzzy
 msgid "Focused"
-msgstr "Foco en Ruta"
+msgstr "Enfocado"
 
 #: scene/gui/texture_button.cpp
-#, fuzzy
 msgid "Click Mask"
-msgstr "Modo de Colisión"
+msgstr "Máscara de Clic"
 
 #: scene/gui/texture_button.cpp scene/gui/texture_rect.cpp
 #: scene/gui/video_player.cpp
-#, fuzzy
 msgid "Expand"
-msgstr "Expandir Todo"
+msgstr "Expandir"
 
 #: scene/gui/texture_progress.cpp
 msgid "Under"
 msgstr ""
 
 #: scene/gui/texture_progress.cpp
-#, fuzzy
 msgid "Over"
-msgstr "Sobreescribir"
+msgstr "Sobre"
 
 #: scene/gui/texture_progress.cpp
-#, fuzzy
 msgid "Progress"
-msgstr "Propiedades del Theme"
+msgstr "Progreso"
 
 #: scene/gui/texture_progress.cpp
 msgid "Progress Offset"
@@ -24402,43 +24275,36 @@ msgid "Radial Fill"
 msgstr ""
 
 #: scene/gui/texture_progress.cpp
-#, fuzzy
 msgid "Initial Angle"
-msgstr "Inicializar"
+msgstr "�ngulo Inicial"
 
 #: scene/gui/texture_progress.cpp
 msgid "Fill Degrees"
 msgstr "Completar Grados"
 
 #: scene/gui/texture_progress.cpp scene/resources/primitive_meshes.cpp
-#, fuzzy
 msgid "Center Offset"
-msgstr "Centro Izquierda"
+msgstr "Desplazamiento Central"
 
 #: scene/gui/texture_progress.cpp
-#, fuzzy
 msgid "Nine Patch Stretch"
-msgstr "Modo de Interpolación"
+msgstr "Estiramiento de Nine Patch"
 
 #: scene/gui/texture_progress.cpp
-#, fuzzy
 msgid "Stretch Margin Left"
-msgstr "Asignar Margen"
+msgstr "Estiramiento de Margen Izquierdo"
 
 #: scene/gui/texture_progress.cpp
-#, fuzzy
 msgid "Stretch Margin Top"
-msgstr "Asignar Margen"
+msgstr "Estiramiento de Margen Superior"
 
 #: scene/gui/texture_progress.cpp
-#, fuzzy
 msgid "Stretch Margin Right"
-msgstr "Asignar Margen"
+msgstr "Estiramiento de Margen Derecho"
 
 #: scene/gui/texture_progress.cpp
-#, fuzzy
 msgid "Stretch Margin Bottom"
-msgstr "Modo de Selección"
+msgstr "Estiramiento de Margen Inferior"
 
 #: scene/gui/tree.cpp
 msgid "Custom Minimum Height"
@@ -24449,14 +24315,12 @@ msgid "(Other)"
 msgstr "(Otros)"
 
 #: scene/gui/tree.cpp
-#, fuzzy
 msgid "Column Titles Visible"
-msgstr "Act./Desact. Visible"
+msgstr "Títulos de Columnas Visibles"
 
 #: scene/gui/tree.cpp
-#, fuzzy
 msgid "Hide Folding"
-msgstr "Botón Desactivado"
+msgstr "Plegado de Pieles"
 
 #: scene/gui/tree.cpp
 msgid "Hide Root"
@@ -24467,43 +24331,36 @@ msgid "Drop Mode Flags"
 msgstr ""
 
 #: scene/gui/video_player.cpp
-#, fuzzy
 msgid "Audio Track"
-msgstr "Agregar Pista"
+msgstr "Pista de Audio"
 
 #: scene/gui/video_player.cpp scene/main/scene_tree.cpp scene/main/timer.cpp
 msgid "Paused"
-msgstr ""
+msgstr "Pausado"
 
 #: scene/gui/video_player.cpp
-#, fuzzy
 msgid "Buffering Msec"
-msgstr "Vista Trasera"
+msgstr "Buffering Msec"
 
 #: scene/gui/video_player.cpp
-#, fuzzy
 msgid "Stream Position"
-msgstr "Establecer Posición de Entrada de Curva"
+msgstr "Posición del Stream"
 
 #: scene/gui/viewport_container.cpp
-#, fuzzy
 msgid "Stretch Shrink"
-msgstr "Buscar"
+msgstr "Encogimiento por Estiramiento"
 
 #: scene/main/canvas_layer.cpp
-#, fuzzy
 msgid "Follow Viewport"
-msgstr "Mostrar Viewport"
+msgstr "Seguir el Viewport"
 
 #: scene/main/http_request.cpp
-#, fuzzy
 msgid "Download File"
-msgstr "Descargar"
+msgstr "Descargar Archivo"
 
 #: scene/main/http_request.cpp
-#, fuzzy
 msgid "Download Chunk Size"
-msgstr "Descargando"
+msgstr "Descargar Tamaño del Fragmento"
 
 #: scene/main/http_request.cpp
 msgid "Body Size Limit"
@@ -24524,89 +24381,76 @@ msgid ""
 msgstr ""
 
 #: scene/main/node.cpp
-#, fuzzy
 msgid "Name Num Separator"
-msgstr "Separador con nombre"
+msgstr "Separador Numérico del Nombre"
 
 #: scene/main/node.cpp
 msgid "Name Casing"
 msgstr ""
 
 #: scene/main/node.cpp
-#, fuzzy
 msgid "Editor Description"
-msgstr "Descripción"
+msgstr "Descripción del Editor"
 
 #: scene/main/node.cpp
-#, fuzzy
 msgid "Pause Mode"
-msgstr "Modo desplazamiento lateral"
+msgstr "Modo Pausa"
 
 #: scene/main/node.cpp
-#, fuzzy
 msgid "Physics Interpolation Mode"
-msgstr "Modo de Interpolación"
+msgstr "Modo de Interpolación Física"
 
 #: scene/main/node.cpp
-#, fuzzy
 msgid "Display Folded"
-msgstr "Mostrar Sin Sombreado"
+msgstr "Vista Plegada"
 
 #: scene/main/node.cpp
-#, fuzzy
 msgid "Filename"
-msgstr "Renombrar"
+msgstr "Nombre del Archivo"
 
 #: scene/main/node.cpp
 msgid "Owner"
 msgstr "Propietario"
 
 #: scene/main/node.cpp scene/main/scene_tree.cpp
-#, fuzzy
 msgid "Multiplayer"
-msgstr "Multiplicar %s"
+msgstr "Multijugador"
 
 #: scene/main/node.cpp
 msgid "Custom Multiplayer"
 msgstr "Multijugador Personalizado"
 
 #: scene/main/node.cpp
-#, fuzzy
 msgid "Process Priority"
-msgstr "Activar Prioridad"
+msgstr "Prioridad del Proceso"
 
 #: scene/main/scene_tree.cpp scene/main/timer.cpp
-#, fuzzy
 msgid "Time Left"
-msgstr "Superior Izquierda"
+msgstr "Tiempo Restante"
 
 #: scene/main/scene_tree.cpp
-#, fuzzy
 msgid "Debug Collisions Hint"
-msgstr "Modo de Colisión"
+msgstr "Sugerencia de Depuración de Colisiones"
 
 #: scene/main/scene_tree.cpp
-#, fuzzy
 msgid "Debug Navigation Hint"
-msgstr "Modo de Navegación"
+msgstr "Sugerencia de Depuración de Navegación"
 
 #: scene/main/scene_tree.cpp
 msgid "Use Font Oversampling"
 msgstr ""
 
 #: scene/main/scene_tree.cpp
-#, fuzzy
 msgid "Edited Scene Root"
-msgstr "Nueva Raíz de Escena"
+msgstr "Escena Raíz Editada"
 
 #: scene/main/scene_tree.cpp
 msgid "Root"
 msgstr ""
 
 #: scene/main/scene_tree.cpp
-#, fuzzy
 msgid "Multiplayer Poll"
-msgstr "Multiplicar %s"
+msgstr "Encuesta Multijugador"
 
 #: scene/main/scene_tree.cpp scene/resources/mesh_library.cpp
 #: scene/resources/shape_2d.cpp
@@ -24618,32 +24462,28 @@ msgid "Shape Color"
 msgstr ""
 
 #: scene/main/scene_tree.cpp
-#, fuzzy
 msgid "Contact Color"
-msgstr "Seleccionar Color"
+msgstr "Color de Contacto"
 
 #: scene/main/scene_tree.cpp
 msgid "Geometry Color"
 msgstr ""
 
 #: scene/main/scene_tree.cpp
-#, fuzzy
 msgid "Disabled Geometry Color"
-msgstr "Desactivar Elemento"
+msgstr "Color de la Geometría Desactivada"
 
 #: scene/main/scene_tree.cpp
 msgid "Max Contacts Displayed"
 msgstr ""
 
 #: scene/main/scene_tree.cpp scene/resources/shape_2d.cpp
-#, fuzzy
 msgid "Draw 2D Outlines"
-msgstr "Crear Outline"
+msgstr "Dibujar Contornos 2D"
 
 #: scene/main/scene_tree.cpp servers/visual_server.cpp
-#, fuzzy
 msgid "Reflections"
-msgstr "Direcciones"
+msgstr "Reflexiones"
 
 #: scene/main/scene_tree.cpp
 msgid "Atlas Size"
@@ -24674,9 +24514,8 @@ msgid "Use 32 BPC Depth"
 msgstr ""
 
 #: scene/main/scene_tree.cpp
-#, fuzzy
 msgid "Default Environment"
-msgstr "Ver Entorno"
+msgstr "Entorno por Defecto"
 
 #: scene/main/scene_tree.cpp
 msgid ""
@@ -24687,9 +24526,8 @@ msgstr ""
 "(Rendering -> Environment -> Default Environment) no se ha podido cargar."
 
 #: scene/main/scene_tree.cpp
-#, fuzzy
 msgid "Enable Object Picking"
-msgstr "Activar Papel Cebolla"
+msgstr "Activar Selección de Objetos"
 
 #: scene/main/timer.cpp
 msgid ""
@@ -24709,9 +24547,8 @@ msgid "Autostart"
 msgstr "Inicio Automático"
 
 #: scene/main/viewport.cpp
-#, fuzzy
 msgid "Viewport Path"
-msgstr "Ruta de Exportación"
+msgstr "Ruta del Viewport"
 
 #: scene/main/viewport.cpp
 msgid ""
@@ -24785,9 +24622,8 @@ msgid "Render Direct To Screen"
 msgstr "Renderización Directa en Pantalla"
 
 #: scene/main/viewport.cpp
-#, fuzzy
 msgid "Debug Draw"
-msgstr "Depurar"
+msgstr "Depurar Dibujo"
 
 #: scene/main/viewport.cpp
 msgid "Render Target"
@@ -24798,34 +24634,28 @@ msgid "V Flip"
 msgstr ""
 
 #: scene/main/viewport.cpp
-#, fuzzy
 msgid "Clear Mode"
-msgstr "Modo de Regla"
+msgstr "Modo de Limpieza"
 
 #: scene/main/viewport.cpp
-#, fuzzy
 msgid "Enable 2D"
-msgstr "Activar"
+msgstr "Activar 2D"
 
 #: scene/main/viewport.cpp
-#, fuzzy
 msgid "Enable 3D"
-msgstr "Activar"
+msgstr "Activar 3D"
 
 #: scene/main/viewport.cpp
-#, fuzzy
 msgid "Object Picking"
-msgstr "Activar Papel Cebolla"
+msgstr "Selección de Objetos"
 
 #: scene/main/viewport.cpp
-#, fuzzy
 msgid "Disable Input"
-msgstr "Desactivar Elemento"
+msgstr "Desactivar Entrada"
 
 #: scene/main/viewport.cpp servers/visual_server.cpp
-#, fuzzy
 msgid "Shadow Atlas"
-msgstr "Nuevo Atlas"
+msgstr "Sombra del Atlas"
 
 #: scene/main/viewport.cpp
 msgid "Quad 0"
@@ -24844,78 +24674,66 @@ msgid "Quad 3"
 msgstr ""
 
 #: scene/main/viewport.cpp
-#, fuzzy
 msgid "Canvas Transform"
-msgstr "Reestablecer Transformación"
+msgstr "Transformación del Canvas"
 
 #: scene/main/viewport.cpp
-#, fuzzy
 msgid "Global Canvas Transform"
-msgstr "Mantener transformación global"
+msgstr "Transformación Global del Canvas"
 
 #: scene/main/viewport.cpp
 msgid "Tooltip Delay (sec)"
-msgstr ""
+msgstr "Retraso del Tooltip (sec)"
 
 #: scene/register_scene_types.cpp
 #, fuzzy
 msgid "Swap OK Cancel"
-msgstr "Cancelar UI"
+msgstr "Intercambio OK Cancelar"
 
 #: scene/register_scene_types.cpp
-#, fuzzy
 msgid "Layer Names"
-msgstr "Nombre"
+msgstr "Nombres de las Capas"
 
 #: scene/register_scene_types.cpp
-#, fuzzy
 msgid "2D Render"
-msgstr "Renderización"
+msgstr "Renderización 2D"
 
 #: scene/register_scene_types.cpp
-#, fuzzy
 msgid "3D Render"
-msgstr "Renderización"
+msgstr "Renderización 3D"
 
 #: scene/register_scene_types.cpp
-#, fuzzy
 msgid "2D Physics"
-msgstr "Física"
+msgstr "Física 2D"
 
 #: scene/register_scene_types.cpp
-#, fuzzy
 msgid "3D Physics"
-msgstr "Física"
+msgstr "Física 3D"
 
 #: scene/register_scene_types.cpp
-#, fuzzy
 msgid "2D Navigation"
-msgstr "Navegación"
+msgstr "Navegación 2D"
 
 #: scene/register_scene_types.cpp
-#, fuzzy
 msgid "3D Navigation"
-msgstr "Navegación"
+msgstr "Navegación 3D"
 
 #: scene/register_scene_types.cpp
 msgid "Use hiDPI"
 msgstr ""
 
 #: scene/register_scene_types.cpp
-#, fuzzy
 msgid "Custom"
-msgstr "CustomNode"
+msgstr "Personalizado"
 
 #: scene/register_scene_types.cpp
-#, fuzzy
 msgid "Custom Font"
-msgstr "CustomNode"
+msgstr "Fuente Personalizada"
 
 #: scene/resources/audio_stream_sample.cpp
 #: servers/audio/effects/audio_stream_generator.cpp servers/audio_server.cpp
-#, fuzzy
 msgid "Mix Rate"
-msgstr "Nodo Mix"
+msgstr "Tasa de Mezcla"
 
 #: scene/resources/audio_stream_sample.cpp
 msgid "Stereo"
@@ -24926,9 +24744,8 @@ msgid "Segments"
 msgstr "Segmentos"
 
 #: scene/resources/curve.cpp
-#, fuzzy
 msgid "Bake Resolution"
-msgstr "Media Resolución"
+msgstr "Bakear Resolución"
 
 #: scene/resources/curve.cpp
 msgid "Bake Interval"
@@ -24939,77 +24756,64 @@ msgid "Panel"
 msgstr ""
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Font Color"
-msgstr "Seleccionar Color"
+msgstr "Color de la Fuente"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Font Color Pressed"
-msgstr "Color Hueso 1"
+msgstr "Color de la Fuente Presionada"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Font Color Hover"
-msgstr "Color Hueso 1"
+msgstr "Color de la Fuente por Encima"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Font Color Focus"
-msgstr "Llenar superficie"
+msgstr "Color de la Fuente Enfocada"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Font Color Disabled"
-msgstr "Clip Deshabilitado"
+msgstr "Color de la Fuente Desactivada"
 
 #: scene/resources/default_theme/default_theme.cpp
 msgid "H Separation"
 msgstr "Separación en H"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Underline Spacing"
-msgstr "Espaciado de Línea"
+msgstr "Espaciado del Subrayado"
 
 #: scene/resources/default_theme/default_theme.cpp
 msgid "Arrow"
 msgstr ""
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Arrow Margin"
-msgstr "Asignar Margen"
+msgstr "Margen de la Flecha"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Hover Pressed"
-msgstr "Preset"
+msgstr "Presionado por Encima"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Checked Disabled"
-msgstr "Chequeable"
+msgstr "Marcado Desactivado"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Unchecked"
-msgstr "Chequeado"
+msgstr "Sin marcar"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Unchecked Disabled"
-msgstr "Desactivar Elemento"
+msgstr "Sin marcar Desactivado"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Radio Checked"
-msgstr "Chequeado"
+msgstr "Radio Marcado"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Radio Checked Disabled"
-msgstr "(Editor Desactivado)"
+msgstr "Radio Marcado Desactivado"
 
 #: scene/resources/default_theme/default_theme.cpp
 msgid "Radio Unchecked"
@@ -25030,27 +24834,23 @@ msgstr ""
 #: scene/resources/default_theme/default_theme.cpp
 #, fuzzy
 msgid "On Disabled"
-msgstr "Desactivar Elemento"
+msgstr "Desactivado"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Off"
-msgstr "Desplazamiento"
+msgstr "Apagado"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Off Disabled"
-msgstr "Desactivar Elemento"
+msgstr "Apagado Desactivado"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Font Color Shadow"
-msgstr "Color Hueso 1"
+msgstr "Color de la Sombra de la Fuente"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Font Outline Modulate"
-msgstr "Forzar Modulación en Blanco"
+msgstr "Modulación del Contorno de la Fuente"
 
 #: scene/resources/default_theme/default_theme.cpp
 msgid "Shadow Offset X"
@@ -25061,59 +24861,50 @@ msgid "Shadow Offset Y"
 msgstr "Desplazamiento de la Sombra en Y"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Shadow As Outline"
-msgstr "Mostrar Contorno Anterior"
+msgstr "Sombra como Contorno"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Font Color Selected"
-msgstr "Desbloquear Seleccionado"
+msgstr "Color de Fuente Seleccionada"
 
 #: scene/resources/default_theme/default_theme.cpp
 msgid "Font Color Uneditable"
 msgstr ""
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Cursor Color"
-msgstr "CustomNode"
+msgstr "Color del Cursor"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Clear Button Color"
-msgstr "Filtrar señales"
+msgstr "Limpiar Color del Botón"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Clear Button Color Pressed"
-msgstr "Filtrar señales"
+msgstr "Limpiar Color del Botón Presionado"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Minimum Spaces"
-msgstr "Escena Principal"
+msgstr "Espacios Mínimos"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "BG"
-msgstr "B"
+msgstr "BG"
 
 #: scene/resources/default_theme/default_theme.cpp
 msgid "FG"
 msgstr ""
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Tab"
-msgstr "Tab 1"
+msgstr "Tab"
 
 #: scene/resources/default_theme/default_theme.cpp
 #: scene/resources/dynamic_font.cpp scene/resources/world.cpp
 #: scene/resources/world_2d.cpp
-#, fuzzy
 msgid "Space"
-msgstr "Escena Principal"
+msgstr "Espacio"
 
 #: scene/resources/default_theme/default_theme.cpp
 msgid "Folded"
@@ -25128,9 +24919,8 @@ msgid "Font Color Readonly"
 msgstr ""
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Completion Lines"
-msgstr "Completar"
+msgstr "Finalización de Líneas"
 
 #: scene/resources/default_theme/default_theme.cpp
 #, fuzzy
@@ -26907,7 +26697,7 @@ msgstr "Margen de Conexión de Bordes"
 
 #: scene/resources/world_2d.cpp
 msgid "Canvas"
-msgstr ""
+msgstr "Lienzo"
 
 #: servers/arvr/arvr_interface.cpp
 msgid "Is Primary"
diff --git a/editor/translations/es_AR.po b/editor/translations/es_AR.po
index b37d9dcfd8..10a562d0b8 100644
--- a/editor/translations/es_AR.po
+++ b/editor/translations/es_AR.po
@@ -2800,7 +2800,7 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "Copiar Ruta del Nodo"
 
 #: editor/editor_export.cpp
@@ -20742,15 +20742,15 @@ msgstr "No se pudo encontrar la keystore, no se puedo exportar."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Archivo ejecutable no válido."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20774,15 +20774,15 @@ msgstr "Nombre inválido."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Archivo ejecutable no válido."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/et.po b/editor/translations/et.po
index 1f3fe075df..3976c9f0bd 100644
--- a/editor/translations/et.po
+++ b/editor/translations/et.po
@@ -2789,7 +2789,7 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "Kopeeri sõlme tee"
 
 #: editor/editor_export.cpp
@@ -20013,15 +20013,15 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Vigane nimi."
 
 #: platform/windows/export/export.cpp
 msgid "Could not find signtool executable at \"%s\"."
@@ -20043,15 +20043,15 @@ msgstr "Vigane nimi."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Vigane nimi."
 
 #: platform/windows/export/export.cpp
 msgid "Failed to remove temporary file \"%s\"."
diff --git a/editor/translations/eu.po b/editor/translations/eu.po
index 2555dfa8d3..3e69f3c4b9 100644
--- a/editor/translations/eu.po
+++ b/editor/translations/eu.po
@@ -2756,8 +2756,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "Kargatu animazioa"
 
 #: editor/editor_export.cpp
 #, fuzzy
@@ -19815,15 +19816,15 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Animazio izen baliogabea!"
 
 #: platform/windows/export/export.cpp
 msgid "Could not find signtool executable at \"%s\"."
@@ -19845,15 +19846,15 @@ msgstr "Animazio izen baliogabea!"
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Animazio izen baliogabea!"
 
 #: platform/windows/export/export.cpp
 msgid "Failed to remove temporary file \"%s\"."
diff --git a/editor/translations/fa.po b/editor/translations/fa.po
index a0202d3254..86b847e530 100644
--- a/editor/translations/fa.po
+++ b/editor/translations/fa.po
@@ -2840,7 +2840,7 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "کپی کردن مسیر node"
 
 #: editor/editor_export.cpp
@@ -20752,15 +20752,15 @@ msgstr "نمی‌تواند یک پوشه ایجاد شود."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "باید از یک پسوند معتبر است�اده شود."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20784,15 +20784,15 @@ msgstr "نام نامعتبر."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "باید از یک پسوند معتبر است�اده شود."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/fi.po b/editor/translations/fi.po
index 28b4581d60..db841ef48a 100644
--- a/editor/translations/fi.po
+++ b/editor/translations/fi.po
@@ -2864,7 +2864,7 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "Kopioi solmun polku"
 
 #: editor/editor_export.cpp
@@ -20756,17 +20756,17 @@ msgstr "Keystorea ei löytynyt, ei voida viedä."
 #: platform/windows/export/export.cpp
 #, fuzzy
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 "rcedit-työkalu täytyy olla konfiguroituna editorin asetuksissa (Export > "
 "Windows > Rcedit) ikonin tai sovelluksen tietojen muuttamiseksi."
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Virheellinen käynnistystiedosto."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20791,17 +20791,17 @@ msgstr "Virheellinen nimi."
 #: platform/windows/export/export.cpp
 #, fuzzy
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 "rcedit-työkalu täytyy olla konfiguroituna editorin asetuksissa (Export > "
 "Windows > Rcedit) ikonin tai sovelluksen tietojen muuttamiseksi."
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Virheellinen käynnistystiedosto."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/fil.po b/editor/translations/fil.po
index 4671a2aeaf..0a154fd6ae 100644
--- a/editor/translations/fil.po
+++ b/editor/translations/fil.po
@@ -2712,8 +2712,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "Pagulit ng Animation"
 
 #: editor/editor_export.cpp
 msgid "Completed successfully."
@@ -19501,14 +19502,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
+msgid "rcedit failed to modify executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
@@ -19530,14 +19530,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
+msgid "Signtool failed to sign executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
diff --git a/editor/translations/fr.po b/editor/translations/fr.po
index 85a3e54c1d..88c4966b54 100644
--- a/editor/translations/fr.po
+++ b/editor/translations/fr.po
@@ -101,13 +101,14 @@
 # Arnaud Lier <arnaud@ric-rac.org>, 2022.
 # Jérémie Guegain <mirejai@orange.fr>, 2022.
 # cwulveryck <cwulveryck@online.fr>, 2022.
+# Helix Sir <vincentbarkmann@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2022-07-16 06:20+0000\n"
-"Last-Translator: cwulveryck <cwulveryck@online.fr>\n"
+"PO-Revision-Date: 2022-08-05 01:04+0000\n"
+"Last-Translator: Helix Sir <vincentbarkmann@gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/godot-engine/"
 "godot/fr/>\n"
 "Language: fr\n"
@@ -147,11 +148,11 @@ msgstr "Lissage de Delta"
 
 #: core/bind/core_bind.cpp
 msgid "Low Processor Usage Mode"
-msgstr "Mode d'Utilisation Faible du Processeur"
+msgstr "Mode d'utilisation faible du processeur"
 
 #: core/bind/core_bind.cpp
 msgid "Low Processor Usage Mode Sleep (µsec)"
-msgstr "Mode d'Utilisation Faible du Processeur (µs)"
+msgstr "Mode d'utilisation faible du processeur Veille (µsec)"
 
 #: core/bind/core_bind.cpp main/main.cpp platform/uwp/os_uwp.cpp
 msgid "Keep Screen On"
@@ -244,9 +245,8 @@ msgid "Time Scale"
 msgstr "Echelle de temps"
 
 #: core/bind/core_bind.cpp main/main.cpp
-#, fuzzy
 msgid "Physics Jitter Fix"
-msgstr "Correction de la physique gigue"
+msgstr "Correction des sursauts de physique"
 
 #: core/bind/core_bind.cpp editor/plugins/version_control_editor_plugin.cpp
 msgid "Error"
@@ -316,9 +316,8 @@ msgid "Page Size"
 msgstr "Taille de page"
 
 #: core/io/file_access_network.cpp
-#, fuzzy
 msgid "Page Read Ahead"
-msgstr "Page lue devant"
+msgstr "Pré-lecture de page"
 
 #: core/io/http_client.cpp
 msgid "Blocking Mode Enabled"
@@ -329,9 +328,8 @@ msgid "Connection"
 msgstr "Connexion"
 
 #: core/io/http_client.cpp
-#, fuzzy
 msgid "Read Chunk Size"
-msgstr "Lire la taille du tronçon"
+msgstr "Taile des tronçons de lecture"
 
 #: core/io/marshalls.cpp
 msgid "Object ID"
@@ -375,7 +373,7 @@ msgstr "Taille maximale du tampon de sortie"
 
 #: core/io/packet_peer.cpp
 msgid "Stream Peer"
-msgstr ""
+msgstr "Pair de flux"
 
 #: core/io/stream_peer.cpp
 msgid "Big Endian"
@@ -488,9 +486,8 @@ msgid "Command"
 msgstr "Commande"
 
 #: core/os/input_event.cpp
-#, fuzzy
 msgid "Physical"
-msgstr " (physique)"
+msgstr "Physique"
 
 #: core/os/input_event.cpp scene/2d/touch_screen_button.cpp
 #: scene/gui/base_button.cpp scene/gui/texture_button.cpp
@@ -500,7 +497,7 @@ msgstr "Pressé"
 
 #: core/os/input_event.cpp
 msgid "Scancode"
-msgstr "Scancode"
+msgstr "Code de scan"
 
 #: core/os/input_event.cpp
 msgid "Physical Scancode"
@@ -543,9 +540,8 @@ msgid "Pressure"
 msgstr "Pression"
 
 #: core/os/input_event.cpp
-#, fuzzy
 msgid "Pen Inverted"
-msgstr "Inverser"
+msgstr "Stylo Inversé"
 
 #: core/os/input_event.cpp
 msgid "Relative"
@@ -624,7 +620,7 @@ msgstr "Application"
 
 #: core/project_settings.cpp main/main.cpp
 msgid "Config"
-msgstr "Config"
+msgstr "Configuration"
 
 #: core/project_settings.cpp
 msgid "Project Settings Override"
@@ -731,9 +727,8 @@ msgid "Editor"
 msgstr "Éditeur"
 
 #: core/project_settings.cpp
-#, fuzzy
 msgid "Main Run Args"
-msgstr "Arguments de la scène principale :"
+msgstr "Paramètres d'exécution du programme principal"
 
 #: core/project_settings.cpp
 msgid "Scene Naming"
@@ -797,9 +792,8 @@ msgid "UI Down"
 msgstr "Bas"
 
 #: core/project_settings.cpp
-#, fuzzy
 msgid "UI Page Up"
-msgstr "Page Haut"
+msgstr "Page Haut (Interface)"
 
 #: core/project_settings.cpp
 msgid "UI Page Down"
@@ -835,9 +829,8 @@ msgid "3D"
 msgstr "3D"
 
 #: core/project_settings.cpp
-#, fuzzy
 msgid "Smooth Trimesh Collision"
-msgstr "Collision Lisse Trimesh"
+msgstr "Lissage de Collision Trimesh"
 
 #: core/project_settings.cpp drivers/gles2/rasterizer_canvas_base_gles2.cpp
 #: drivers/gles2/rasterizer_scene_gles2.cpp
@@ -918,9 +911,8 @@ msgid "Compression Level"
 msgstr "Niveau de Compression"
 
 #: core/project_settings.cpp
-#, fuzzy
 msgid "Window Log Size"
-msgstr "Taille de la fenêtre du journal"
+msgstr "Taille du journal de la fenêtre"
 
 #: core/project_settings.cpp
 msgid "Zlib"
@@ -948,10 +940,9 @@ msgstr "Délai d'expiration de la connexion en secondes"
 
 #: core/register_core_types.cpp
 msgid "Packet Peer Stream"
-msgstr ""
+msgstr "Flux de pair de paquet"
 
 #: core/register_core_types.cpp
-#, fuzzy
 msgid "Max Buffer (Power of 2)"
 msgstr "Tampon Max (puissance de 2)"
 
@@ -993,7 +984,6 @@ msgid "Test"
 msgstr "Test"
 
 #: core/translation.cpp scene/resources/font.cpp
-#, fuzzy
 msgid "Fallback"
 msgstr "Repli"
 
@@ -1036,12 +1026,12 @@ msgstr "Tampons"
 #: drivers/gles2/rasterizer_canvas_base_gles2.cpp
 #: drivers/gles3/rasterizer_canvas_base_gles3.cpp
 msgid "Canvas Polygon Buffer Size (KB)"
-msgstr ""
+msgstr "Taille du tampon des polygones du canevas (Ko)"
 
 #: drivers/gles2/rasterizer_canvas_base_gles2.cpp
 #: drivers/gles3/rasterizer_canvas_base_gles3.cpp
 msgid "Canvas Polygon Index Buffer Size (KB)"
-msgstr ""
+msgstr "Taille de l'index des polygones du canevas (Ko)"
 
 #: drivers/gles2/rasterizer_canvas_base_gles2.cpp
 #: drivers/gles3/rasterizer_canvas_base_gles3.cpp editor/editor_settings.cpp
@@ -1057,15 +1047,13 @@ msgstr "2D"
 
 #: drivers/gles2/rasterizer_canvas_base_gles2.cpp
 #: drivers/gles3/rasterizer_canvas_base_gles3.cpp
-#, fuzzy
 msgid "Snapping"
-msgstr "Magnétisme intelligent"
+msgstr "Magnétisme"
 
 #: drivers/gles2/rasterizer_canvas_base_gles2.cpp
 #: drivers/gles3/rasterizer_canvas_base_gles3.cpp
-#, fuzzy
 msgid "Use GPU Pixel Snap"
-msgstr "Aligner au pixel près"
+msgstr "Arrondissement GPU au pixel le plus proche"
 
 #: drivers/gles2/rasterizer_scene_gles2.cpp
 #: drivers/gles3/rasterizer_scene_gles3.cpp
@@ -1074,9 +1062,8 @@ msgstr "Taille du tampon immédiat (Ko)"
 
 #: drivers/gles2/rasterizer_storage_gles2.cpp
 #: drivers/gles3/rasterizer_storage_gles3.cpp
-#, fuzzy
 msgid "Lightmapping"
-msgstr "Précalculer les lightmaps"
+msgstr "Cartographie des lumières"
 
 #: drivers/gles2/rasterizer_storage_gles2.cpp
 #: drivers/gles3/rasterizer_storage_gles3.cpp
@@ -1100,7 +1087,6 @@ msgid "Max Lights Per Object"
 msgstr "Maximum de lumières par objet"
 
 #: drivers/gles3/rasterizer_scene_gles3.cpp
-#, fuzzy
 msgid "Subsurface Scattering"
 msgstr "Transluminescence"
 
@@ -1122,13 +1108,12 @@ msgid "Follow Surface"
 msgstr "Suivre la surface"
 
 #: drivers/gles3/rasterizer_scene_gles3.cpp
-#, fuzzy
 msgid "Weight Samples"
 msgstr "Échantillons de poids"
 
 #: drivers/gles3/rasterizer_scene_gles3.cpp
 msgid "Voxel Cone Tracing"
-msgstr ""
+msgstr "Traçage de cone voxel"
 
 #: drivers/gles3/rasterizer_scene_gles3.cpp scene/resources/environment.cpp
 msgid "High Quality"
@@ -1136,7 +1121,7 @@ msgstr "Haute Qualité"
 
 #: drivers/gles3/rasterizer_storage_gles3.cpp
 msgid "Blend Shape Max Buffer Size (KB)"
-msgstr ""
+msgstr "Taille max du tampon de mélange de formes"
 
 #. TRANSLATORS: Adjective, refers to the mode for Bezier handles (Free, Balanced, Mirror).
 #: editor/animation_bezier_editor.cpp
@@ -1193,7 +1178,7 @@ msgstr "Modifier le temps de l’image-clé"
 
 #: editor/animation_track_editor.cpp
 msgid "Anim Change Transition"
-msgstr "Changer la transition de l’animation"
+msgstr "Transition de changement de l’animation"
 
 #: editor/animation_track_editor.cpp
 msgid "Anim Change Transform"
@@ -1253,14 +1238,12 @@ msgid "Type"
 msgstr "Type"
 
 #: editor/animation_track_editor.cpp
-#, fuzzy
 msgid "In Handle"
-msgstr "Définir la poignée"
+msgstr "Poignée d'entrée"
 
 #: editor/animation_track_editor.cpp
-#, fuzzy
 msgid "Out Handle"
-msgstr "Définir la poignée"
+msgstr "Poignée de sortie"
 
 #: editor/animation_track_editor.cpp
 #: editor/import/resource_importer_texture.cpp
@@ -1274,7 +1257,6 @@ msgid "Start Offset"
 msgstr "Décalage du Départ"
 
 #: editor/animation_track_editor.cpp
-#, fuzzy
 msgid "End Offset"
 msgstr "Décalage à la fin"
 
@@ -1289,9 +1271,8 @@ msgid "Animation"
 msgstr "Animation"
 
 #: editor/animation_track_editor.cpp
-#, fuzzy
 msgid "Easing"
-msgstr "Ease in-out"
+msgstr "Transition entrée-sortie"
 
 #: editor/animation_track_editor.cpp
 msgid "Anim Multi Change Keyframe Time"
@@ -1430,38 +1411,32 @@ msgid "(Invalid, expected type: %s)"
 msgstr "(Invalide, type attendu : %s)"
 
 #: editor/animation_track_editor.cpp
-#, fuzzy
 msgid "Easing:"
-msgstr "Ease in-out"
+msgstr "Transition entrée-sortie :"
 
 #: editor/animation_track_editor.cpp
-#, fuzzy
 msgid "In-Handle:"
-msgstr "Définir la poignée"
+msgstr "Poignée d'entrée :"
 
 #: editor/animation_track_editor.cpp
-#, fuzzy
 msgid "Out-Handle:"
-msgstr "Définir la poignée"
+msgstr "Poignée de sortie :"
 
 #: editor/animation_track_editor.cpp
 msgid "Stream:"
 msgstr "Flux :"
 
 #: editor/animation_track_editor.cpp
-#, fuzzy
 msgid "Start (s):"
-msgstr "Redémarrer (s) :"
+msgstr "Début (s) :"
 
 #: editor/animation_track_editor.cpp
-#, fuzzy
 msgid "End (s):"
-msgstr "Fondu entrant (s) :"
+msgstr "Fin (s) :"
 
 #: editor/animation_track_editor.cpp
-#, fuzzy
 msgid "Animation Clip:"
-msgstr "Animations :"
+msgstr "Clip d'animation :"
 
 #: editor/animation_track_editor.cpp
 msgid "Toggle Track Enabled"
@@ -1549,9 +1524,8 @@ msgid "Editors"
 msgstr "Éditeurs"
 
 #: editor/animation_track_editor.cpp editor/editor_settings.cpp
-#, fuzzy
 msgid "Confirm Insert Track"
-msgstr "Insérer une piste et clé d’animation"
+msgstr "Confirmer l'ajout de piste"
 
 #. TRANSLATORS: %s will be replaced by a phrase describing the target of track.
 #: editor/animation_track_editor.cpp
@@ -2867,8 +2841,8 @@ msgid "Project export for platform:"
 msgstr "Exportation du projet pour la plateforme :"
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr "Terminé avec des erreurs."
+msgid "Completed with warnings."
+msgstr "Terminé avec des avertissements."
 
 #: editor/editor_export.cpp
 msgid "Completed successfully."
@@ -2988,9 +2962,8 @@ msgid "64 Bits"
 msgstr "64 Bits"
 
 #: editor/editor_export.cpp
-#, fuzzy
 msgid "Embed PCK"
-msgstr "PCK Intégré"
+msgstr "Intégrer PCK"
 
 #: editor/editor_export.cpp platform/osx/export/export.cpp
 msgid "Texture Format"
@@ -3029,9 +3002,8 @@ msgid "Custom release template not found."
 msgstr "Modèle de version personnalisée introuvable."
 
 #: editor/editor_export.cpp
-#, fuzzy
 msgid "Prepare Template"
-msgstr "Gérer les modèles"
+msgstr "Préparer le modèle type"
 
 #: editor/editor_export.cpp platform/osx/export/export.cpp
 msgid "The given export path doesn't exist."
@@ -3047,9 +3019,8 @@ msgstr "La copie du modèle d'exportation a échoué."
 
 #: editor/editor_export.cpp platform/windows/export/export.cpp
 #: platform/x11/export/export.cpp
-#, fuzzy
 msgid "PCK Embedding"
-msgstr "Intégration du PCK"
+msgstr "Intégration PCK"
 
 #: editor/editor_export.cpp
 msgid "On 32-bit exports the embedded PCK cannot be bigger than 4 GiB."
@@ -3270,9 +3241,8 @@ msgid "Manage Editor Feature Profiles"
 msgstr "Gérer les profils de fonctionnalités de l'éditeur"
 
 #: editor/editor_feature_profile.cpp
-#, fuzzy
 msgid "Default Feature Profile"
-msgstr "Profil des fonctionnalités de Godot"
+msgstr "Profil de fonctionalités par défaut"
 
 #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp
 msgid "Select Current Folder"
@@ -3383,7 +3353,6 @@ msgid "Show Hidden Files"
 msgstr "Afficher les fichiers cachés"
 
 #: editor/editor_file_dialog.cpp
-#, fuzzy
 msgid "Disable Overwrite Warning"
 msgstr "Désactiver l'avertissement de réécriture"
 
@@ -3688,25 +3657,21 @@ msgid "Read Only"
 msgstr "Lecture Seule"
 
 #: editor/editor_inspector.cpp editor/plugins/item_list_editor_plugin.cpp
-#, fuzzy
 msgid "Checkable"
-msgstr "Item à cocher"
+msgstr "Cochable"
 
 #: editor/editor_inspector.cpp editor/plugins/item_list_editor_plugin.cpp
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Checked"
-msgstr "Item coché"
+msgstr "Coché"
 
 #: editor/editor_inspector.cpp
-#, fuzzy
 msgid "Draw Red"
-msgstr "Appels de dessin :"
+msgstr "Dessiner en rouge"
 
 #: editor/editor_inspector.cpp
-#, fuzzy
 msgid "Keying"
-msgstr "Jouer"
+msgstr "En train de taper"
 
 #: editor/editor_inspector.cpp
 msgid "Pin value"
@@ -4080,10 +4045,8 @@ msgid "Save & Reload"
 msgstr "Sauvegarder & Recharger"
 
 #: editor/editor_node.cpp
-#, fuzzy
 msgid "Save changes to '%s' before reloading?"
-msgstr ""
-"Sauvegarder les modifications effectuées dans « %s » avant de recharger ?"
+msgstr "Sauvegarder les modifications dans '%s' avant de recharger ?"
 
 #: editor/editor_node.cpp
 msgid "Save & Close"
@@ -4202,11 +4165,9 @@ msgid "Open Project Manager?"
 msgstr "Ouvrir le gestionnaire de projets ?"
 
 #: editor/editor_node.cpp
-#, fuzzy
 msgid "Save changes to the following scene(s) before reloading?"
 msgstr ""
-"Sauvegarder les modifications sur la (les) scène(s) suivante(s) avant de "
-"quitter ?"
+"Sauvegarder les modifications de scène(s) suivante(s) avant de recharger ?"
 
 #: editor/editor_node.cpp
 msgid "Save & Quit"
@@ -4411,9 +4372,8 @@ msgid "Interface"
 msgstr "Interface"
 
 #: editor/editor_node.cpp editor/editor_settings.cpp
-#, fuzzy
 msgid "Scene Tabs"
-msgstr "Basculer entre onglets de scène"
+msgstr "Onglets de scène"
 
 #: editor/editor_node.cpp
 msgid "Always Show Close Button"
@@ -4448,7 +4408,6 @@ msgid "Save On Focus Loss"
 msgstr "Enregistrer lorsque le focus est perdu"
 
 #: editor/editor_node.cpp editor/editor_settings.cpp
-#, fuzzy
 msgid "Save Each Scene On Quit"
 msgstr "Enregistrer toutes les scènes à la fermeture"
 
@@ -4470,12 +4429,10 @@ msgid "Update Vital Only"
 msgstr "Changements de matériau"
 
 #: editor/editor_node.cpp
-#, fuzzy
 msgid "Localize Settings"
-msgstr "Localisation"
+msgstr "Traduction des réglages"
 
 #: editor/editor_node.cpp
-#, fuzzy
 msgid "Restore Scenes On Load"
 msgstr "Restaurer les scènes au chargement"
 
@@ -4488,7 +4445,6 @@ msgid "Inspector"
 msgstr "Inspecteur"
 
 #: editor/editor_node.cpp
-#, fuzzy
 msgid "Default Property Name Style"
 msgstr "Style par défaut des noms de propriétés"
 
@@ -4497,12 +4453,10 @@ msgid "Default Float Step"
 msgstr "Pas par défaut des flottant"
 
 #: editor/editor_node.cpp scene/gui/tree.cpp
-#, fuzzy
 msgid "Disable Folding"
-msgstr "Bouton désactivé"
+msgstr "Désactiver le repliage"
 
 #: editor/editor_node.cpp
-#, fuzzy
 msgid "Auto Unfold Foreign Scenes"
 msgstr "Déplier automatiquement les scènes étrangères"
 
@@ -4511,7 +4465,6 @@ msgid "Horizontal Vector2 Editing"
 msgstr "Édition horizontale de Vector2"
 
 #: editor/editor_node.cpp
-#, fuzzy
 msgid "Horizontal Vector Types Editing"
 msgstr "Édition de Types de Vecteur Horizontal"
 
@@ -4520,12 +4473,10 @@ msgid "Open Resources In Current Inspector"
 msgstr "Ouvrir les ressources dans l'inspecteur actuel"
 
 #: editor/editor_node.cpp
-#, fuzzy
 msgid "Resources To Open In New Inspector"
 msgstr "Ressources à ouvrir dans un nouvel inspecteur"
 
 #: editor/editor_node.cpp
-#, fuzzy
 msgid "Default Color Picker Mode"
 msgstr "Mode par défaut du sélectionneur de couleur"
 
@@ -5187,14 +5138,12 @@ msgid "Debugger"
 msgstr "Débogueur"
 
 #: editor/editor_profiler.cpp
-#, fuzzy
 msgid "Profiler Frame History Size"
 msgstr "Taille de l'historique de la trame du profileur"
 
 #: editor/editor_profiler.cpp
-#, fuzzy
 msgid "Profiler Frame Max Functions"
-msgstr "Renommer la fonction"
+msgstr "Nombre maximum de fonctions par trame de profileur"
 
 #: editor/editor_properties.cpp
 msgid "Edit Text:"
@@ -5409,12 +5358,10 @@ msgid "Code Font Size"
 msgstr "Taille de la police du code"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Font Antialiased"
-msgstr "Anticrénelage appliqué sur la police"
+msgstr "Police anticrénelée"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Font Hinting"
 msgstr "Indication de police"
 
@@ -5435,18 +5382,16 @@ msgid "Dim Editor On Dialog Popup"
 msgstr "Assombrir l'éditeur à l'ouverture d'un dialogue"
 
 #: editor/editor_settings.cpp main/main.cpp
-#, fuzzy
 msgid "Low Processor Mode Sleep (µsec)"
-msgstr "Mode de faible latence Processeur"
+msgstr "Veille du Mode faible latence Processeur (µsec)"
 
 #: editor/editor_settings.cpp
 msgid "Unfocused Low Processor Mode Sleep (µsec)"
-msgstr ""
+msgstr "Veille du mode d'utilisation faible du processeur quand inactif (µsec)"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Separate Distraction Mode"
-msgstr "Mode Sans Distraction"
+msgstr "Mode distraction séparée"
 
 #: editor/editor_settings.cpp
 msgid "Automatically Open Screenshots"
@@ -5454,7 +5399,7 @@ msgstr "Ouvrir automatiquement les captures d'écran"
 
 #: editor/editor_settings.cpp
 msgid "Max Array Dictionary Items Per Page"
-msgstr ""
+msgstr "Nombre maximum d'articles tableau de dictionnaire par page"
 
 #: editor/editor_settings.cpp editor/plugins/script_editor_plugin.cpp
 #: editor/plugins/theme_editor_plugin.cpp scene/gui/control.cpp
@@ -5475,9 +5420,8 @@ msgid "Base Color"
 msgstr "Couleur de Base"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Accent Color"
-msgstr "Prélever une couleur"
+msgstr "Couleur d'accentuation"
 
 #: editor/editor_settings.cpp scene/resources/environment.cpp
 msgid "Contrast"
@@ -5485,69 +5429,59 @@ msgstr "Contraste"
 
 #: editor/editor_settings.cpp
 msgid "Relationship Line Opacity"
-msgstr ""
+msgstr "Opacité des lignes de relation"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Highlight Tabs"
-msgstr "Enregistrement des lightmaps"
+msgstr "Surligner les onglets"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Border Size"
-msgstr "Pixels de bordure"
+msgstr "Taille de bordure"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Use Graph Node Headers"
-msgstr "Utiliser les en-tête de noeud Graph"
+msgstr "Utiliser les en-têtes de graphes des nœuds"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Additional Spacing"
-msgstr "Bouclage de l’animation"
+msgstr "Espacement supplémentaire"
 
 #: editor/editor_settings.cpp
 msgid "Custom Theme"
 msgstr "Thème Personnalisé"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Show Script Button"
-msgstr "Molette bouton droit"
+msgstr "Afficher le bouton script"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Directories"
-msgstr "Directions"
+msgstr "Dossiers"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Autoscan Project Path"
-msgstr "Chemin du projet :"
+msgstr "Scan auto du chemin du projet"
 
 #: editor/editor_settings.cpp
 msgid "Default Project Path"
 msgstr "Chemin du Projet par Défaut"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "On Save"
-msgstr "Enregistrer"
+msgstr "À l'enregistrement"
 
 #: editor/editor_settings.cpp
 msgid "Compress Binary Resources"
 msgstr "Compresser les ressources binaires"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Safe Save On Backup Then Rename"
-msgstr "Sauvegarde sécurisée lors de l'archivage puis renommer"
+msgstr "Sauvegarde sécurisée lors de l'archivage avant de renommer"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "File Dialog"
-msgstr "Dialogue XForm"
+msgstr "Fenêtre de sélection de fichiers"
 
 #: editor/editor_settings.cpp
 msgid "Thumbnail Size"
@@ -5555,21 +5489,19 @@ msgstr "Taille de la vignette"
 
 #: editor/editor_settings.cpp
 msgid "Docks"
-msgstr ""
+msgstr "S'attache"
 
 #: editor/editor_settings.cpp
 msgid "Scene Tree"
 msgstr "une arborescence, arbre des scènes"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Start Create Dialog Fully Expanded"
-msgstr "Lancer le dialogue de Création totalement expandu"
+msgstr "Lancer le dialogue de création complètement déplié"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Always Show Folders"
-msgstr "Toujours afficher la grille"
+msgstr "Toujours afficher les dossiers"
 
 #: editor/editor_settings.cpp
 msgid "Property Editor"
@@ -5580,29 +5512,24 @@ msgid "Auto Refresh Interval"
 msgstr "Intervalle d’autorafraîchissement"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Subresource Hue Tint"
-msgstr "Ressources secondaires"
+msgstr "Teinte des sous-ressources"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Color Theme"
-msgstr "Thème de l'éditeur"
+msgstr "Thème de couleurs"
 
 #: editor/editor_settings.cpp scene/3d/label_3d.cpp
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Line Spacing"
 msgstr "Espace entre les lignes"
 
 #: editor/editor_settings.cpp editor/plugins/script_text_editor.cpp
 #: modules/gdscript/editor/gdscript_highlighter.cpp
-#, fuzzy
 msgid "Highlighting"
-msgstr "Éclairage direct"
+msgstr "Surlignage"
 
 #: editor/editor_settings.cpp scene/gui/text_edit.cpp
-#, fuzzy
 msgid "Syntax Highlighting"
 msgstr "Coloration syntaxique"
 
@@ -5615,32 +5542,28 @@ msgid "Highlight Current Line"
 msgstr "Mettre en évidence la ligne actuelle"
 
 #: editor/editor_settings.cpp editor/plugins/script_text_editor.cpp
-#, fuzzy
 msgid "Highlight Type Safe Lines"
-msgstr "Surligner les lignes Typées"
+msgstr "Surligner les lignes à types sûrs"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Indent"
-msgstr "Indenter vers la gauche"
+msgstr "Indenter"
 
 #: editor/editor_settings.cpp editor/plugins/script_text_editor.cpp
 msgid "Auto Indent"
 msgstr "Indentation automatique"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Convert Indent On Save"
-msgstr "Convertir indentations en espaces"
+msgstr "Convertir les indentations à l'enregistrement"
 
 #: editor/editor_settings.cpp scene/gui/text_edit.cpp
 msgid "Draw Tabs"
 msgstr "Montrer les tabulations"
 
 #: editor/editor_settings.cpp scene/gui/text_edit.cpp
-#, fuzzy
 msgid "Draw Spaces"
-msgstr "Appels de dessin :"
+msgstr "Afficher les espaces"
 
 #: editor/editor_settings.cpp editor/plugins/spatial_editor_plugin.cpp
 #: editor/plugins/tile_set_editor_plugin.cpp scene/2d/tile_map.cpp
@@ -5658,9 +5581,8 @@ msgid "V Scroll Speed"
 msgstr "Vitesse du défilement vertical"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Show Minimap"
-msgstr "Afficher l'origine"
+msgstr "Afficher la minimap"
 
 #: editor/editor_settings.cpp
 msgid "Minimap Width"
@@ -5668,16 +5590,15 @@ msgstr "Largeur de la mini-carte"
 
 #: editor/editor_settings.cpp
 msgid "Mouse Extra Buttons Navigate History"
-msgstr ""
+msgstr "Boutons additionnels de la souris déplacent dans l'historique"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Drag And Drop Selection"
-msgstr "Sélection de la GridMap"
+msgstr "Sélection glisser/déposer"
 
 #: editor/editor_settings.cpp
 msgid "Stay In Script Editor On Node Selected"
-msgstr ""
+msgstr "Rester sur l’éditeur de script en sélectionnant un nœud"
 
 #: editor/editor_settings.cpp
 msgid "Appearance"
@@ -5688,21 +5609,18 @@ msgid "Show Line Numbers"
 msgstr "Afficher les Numéros de Ligne"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Line Numbers Zero Padded"
-msgstr "Numéro de ligne :"
+msgstr "Numéros de lignes avec remplissage en zéros"
 
 #: editor/editor_settings.cpp
 msgid "Show Bookmark Gutter"
 msgstr "Montrer le bandeau de marque-page"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Show Breakpoint Gutter"
-msgstr "Passer les points d'arrêt"
+msgstr "Afficher le bandeau de points d’arrêt"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Show Info Gutter"
 msgstr "Montrer le bandeau d'information"
 
@@ -5712,26 +5630,25 @@ msgstr "Rétrécir le code"
 
 #: editor/editor_settings.cpp
 msgid "Word Wrap"
-msgstr ""
+msgstr "Retour à la ligne des mots"
 
 #: editor/editor_settings.cpp
 msgid "Show Line Length Guidelines"
-msgstr ""
+msgstr "Montrer les guides de longueur de ligne"
 
 #: editor/editor_settings.cpp
 msgid "Line Length Guideline Soft Column"
-msgstr ""
+msgstr "Colonne douce des guides de longueur de ligne"
 
 #: editor/editor_settings.cpp
 msgid "Line Length Guideline Hard Column"
-msgstr ""
+msgstr "Colonne dure des guides de longueur de ligne"
 
 #: editor/editor_settings.cpp editor/plugins/script_editor_plugin.cpp
 msgid "Script List"
 msgstr "Liste des Scripts"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Show Members Overview"
 msgstr "Montrer l'ensemble des Membres"
 
@@ -5740,19 +5657,16 @@ msgid "Files"
 msgstr "Fichiers"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Trim Trailing Whitespace On Save"
-msgstr "Supprimer les espaces de fin de ligne"
+msgstr "Retirer les espaces de fin de ligne à l'enregistrement"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Autosave Interval Secs"
-msgstr "Intervalle entre les auto-sauvegarde (en secondes)"
+msgstr "Intervalle entre les sauvegardes automatiques (en secondes)"
 
 #: editor/editor_settings.cpp editor/plugins/script_editor_plugin.cpp
-#, fuzzy
 msgid "Restore Scripts On Load"
-msgstr "Restaurer les scripts lors du chargement"
+msgstr "Restaurer les scripts au chargement"
 
 #: editor/editor_settings.cpp
 msgid "Auto Reload And Parse Scripts On Save"
@@ -5761,16 +5675,15 @@ msgstr ""
 
 #: editor/editor_settings.cpp
 msgid "Auto Reload Scripts On External Change"
-msgstr ""
+msgstr "Recharger automatiquement les scripts sur changement externe"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Create Signal Callbacks"
-msgstr "Forcer les replis du shader"
+msgstr "Créer des rappels de signaux"
 
 #: editor/editor_settings.cpp
 msgid "Sort Members Outline Alphabetically"
-msgstr ""
+msgstr "Trier le contour des membres alphabétiquement"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
 msgid "Cursor"
@@ -5793,9 +5706,8 @@ msgid "Caret Blink Speed"
 msgstr "Vitesse du clignotement du caret"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Right Click Moves Caret"
-msgstr "Clic droit pour ajouter un point"
+msgstr "Clic droit déplace le caret"
 
 #: editor/editor_settings.cpp modules/gdscript/gdscript.cpp
 #: modules/gdscript/gdscript_editor.cpp
@@ -5817,31 +5729,27 @@ msgstr "Délai d'auto-complétion du code"
 
 #: editor/editor_settings.cpp
 msgid "Put Callhint Tooltip Below Current Line"
-msgstr ""
+msgstr "Placer l'info-bulle d'appel sous la ligne actuelle"
 
 #: editor/editor_settings.cpp
 msgid "Callhint Tooltip Offset"
-msgstr ""
+msgstr "Décalage des info-bulles d'appel"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Complete File Paths"
-msgstr "Copier le chemin du nœud"
+msgstr "Compléter les chemins de fichiers"
 
 #: editor/editor_settings.cpp modules/gdscript/gdscript_editor.cpp
-#, fuzzy
 msgid "Add Type Hints"
-msgstr "Ajouter un type"
+msgstr "Ajouter des indices de type"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Use Single Quotes"
-msgstr "Nouvelle Simple Tuile"
+msgstr "Utiliser des simples guillemets"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Show Help Index"
-msgstr "Afficher les aides"
+msgstr "Afficher l'index d'aide"
 
 #: editor/editor_settings.cpp
 msgid "Help Font Size"
@@ -5852,7 +5760,6 @@ msgid "Help Source Font Size"
 msgstr "Taille de la police de l'aide de la source"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Help Title Font Size"
 msgstr "Taille de la police du titre Aide"
 
@@ -5861,9 +5768,8 @@ msgid "Grid Map"
 msgstr "Grille"
 
 #: editor/editor_settings.cpp modules/gridmap/grid_map_editor_plugin.cpp
-#, fuzzy
 msgid "Pick Distance"
-msgstr "Choisissez distance :"
+msgstr "Choisissez la distance"
 
 #: editor/editor_settings.cpp editor/plugins/tile_map_editor_plugin.cpp
 msgid "Preview Size"
@@ -5878,32 +5784,27 @@ msgid "Secondary Grid Color"
 msgstr "Couleur de la grille secondaire"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Selection Box Color"
-msgstr "Sélection uniquement"
+msgstr "Couleur de la boîte de sélection"
 
 #: editor/editor_settings.cpp editor/plugins/path_editor_plugin.cpp
 #: editor/spatial_editor_gizmos.cpp modules/csg/csg_gizmos.cpp
-#, fuzzy
 msgid "3D Gizmos"
-msgstr "Gadgets"
+msgstr "Manipulateurs 3D"
 
 #: editor/editor_settings.cpp editor/plugins/path_editor_plugin.cpp
 #: editor/spatial_editor_gizmos.cpp modules/csg/csg_gizmos.cpp
-#, fuzzy
 msgid "Gizmo Colors"
-msgstr "Couleurs d'émission"
+msgstr "Couleurs des manipulateurs"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Instanced"
-msgstr "Instance"
+msgstr "Instancié"
 
 #: editor/editor_settings.cpp modules/gltf/gltf_node.cpp
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Joint"
-msgstr "Point"
+msgstr "Jointure"
 
 #: editor/editor_settings.cpp scene/2d/collision_shape_2d.cpp
 #: scene/2d/cpu_particles_2d.cpp scene/2d/touch_screen_button.cpp
@@ -5915,9 +5816,8 @@ msgid "Shape"
 msgstr "Forme"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Primary Grid Steps"
-msgstr "Pas de la grille :"
+msgstr "Pas de la grille principale"
 
 #: editor/editor_settings.cpp
 msgid "Grid Size"
@@ -5933,55 +5833,47 @@ msgstr "Niveau minimal de division de la grille"
 
 #: editor/editor_settings.cpp
 msgid "Grid Division Level Bias"
-msgstr ""
+msgstr "Niveau de biais de la division de grille"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Grid XZ Plane"
-msgstr "Peinture GridMap"
+msgstr "Plan XZ de la grille"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Grid XY Plane"
-msgstr "Peinture GridMap"
+msgstr "Plan XY de la grille"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Grid YZ Plane"
-msgstr "Peinture GridMap"
+msgstr "Plan YZ de la grille"
 
 #: editor/editor_settings.cpp
 msgid "Default FOV"
 msgstr "FOV par défaut"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Default Z Near"
-msgstr "Thème par défaut"
+msgstr "Z proche par défaut"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Default Z Far"
-msgstr "Défaut"
+msgstr "Z distant par défaut"
 
 #: editor/editor_settings.cpp
 msgid "Lightmap Baking Number Of CPU Threads"
 msgstr "Nombre de fils CPU pour calculer les cartes de lumières"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Navigation Scheme"
-msgstr "Mode Navigation"
+msgstr "Schéma de navigation"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Invert Y Axis"
-msgstr "Modifier l'axe Y"
+msgstr "Inverser l'axe Y"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Invert X Axis"
-msgstr "Modifier l'axe X"
+msgstr "Inverser l'axe X"
 
 #: editor/editor_settings.cpp
 msgid "Zoom Style"
@@ -5996,14 +5888,12 @@ msgid "Emulate 3 Button Mouse"
 msgstr "Émuler souris à 3 boutons"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Orbit Modifier"
-msgstr "Trier par date de modification (moins récent au plus récent)"
+msgstr "Modificateur d'orbite"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Pan Modifier"
-msgstr "Mode navigation"
+msgstr "Modificateur panoramique"
 
 #: editor/editor_settings.cpp
 msgid "Zoom Modifier"
@@ -6020,11 +5910,11 @@ msgstr "Mode Navigation"
 
 #: editor/editor_settings.cpp
 msgid "Orbit Sensitivity"
-msgstr ""
+msgstr "Sensibilité de l'orbite"
 
 #: editor/editor_settings.cpp
 msgid "Orbit Inertia"
-msgstr ""
+msgstr "Inertie de l'orbite"
 
 #: editor/editor_settings.cpp
 msgid "Translation Inertia"
@@ -6035,152 +5925,128 @@ msgid "Zoom Inertia"
 msgstr "Inertie du Zoom"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Freelook"
-msgstr "Vue libre haut"
+msgstr "Vue libre"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Freelook Navigation Scheme"
-msgstr "Créer un maillage de navigation"
+msgstr "Schéma de navigation en vue libre"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Freelook Sensitivity"
-msgstr "Vue libre gauche"
+msgstr "Sensibilité de la vue libre"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Freelook Inertia"
-msgstr "Vue libre gauche"
+msgstr "Inertie de la vue libre"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Freelook Base Speed"
-msgstr "Modificateur de vitesse de la vue libre"
+msgstr "Vitesse de base de la vue libre"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Freelook Activation Modifier"
-msgstr "Ralentissement de la vue libre"
+msgstr "Modificateur d'activation de la vue libre"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Freelook Speed Zoom Link"
-msgstr "Modificateur de vitesse de la vue libre"
+msgstr "Lien de zoom rapide de la vue libre"
 
 #: editor/editor_settings.cpp editor/plugins/tile_map_editor_plugin.cpp
 msgid "Grid Color"
 msgstr "Couleur de la Grille"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Guides Color"
-msgstr "Prélever une couleur"
+msgstr "Couleur des guides"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Smart Snapping Line Color"
-msgstr "Magnétisme intelligent"
+msgstr "Couleur de ligne du magnétisme intelligent"
 
 #: editor/editor_settings.cpp
 msgid "Bone Width"
 msgstr "Largeur des os"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Bone Color 1"
-msgstr "Renommer l'item de couleur"
+msgstr "Couleur d'os 1"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Bone Color 2"
-msgstr "Renommer l'item de couleur"
+msgstr "Couleur d'os 2"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Bone Selected Color"
-msgstr "Configurer le profil sélectionné :"
+msgstr "Couleur de l'os sélectionnée"
 
 #: editor/editor_settings.cpp
 msgid "Bone IK Color"
-msgstr ""
+msgstr "Couleur de cinématique inverse d'os"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Bone Outline Color"
-msgstr "Couleur de bordure de l'Os"
+msgstr "Couleur de contour d'os"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Bone Outline Size"
-msgstr "Taille du contour :"
+msgstr "Taille du contour de l'os"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Viewport Border Color"
 msgstr "Couleur de bordure de la fenêtre d'affichage"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Constrain Editor View"
 msgstr "Restreindre la fenêtre d'Éditeur"
 
 #: editor/editor_settings.cpp
 msgid "Simple Panning"
-msgstr ""
+msgstr "Panoramique simple"
 
 #: editor/editor_settings.cpp
 msgid "Scroll To Pan"
-msgstr ""
+msgstr "Panoramique au défilement"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Pan Speed"
 msgstr "Vitesse Panoramique"
 
 #: editor/editor_settings.cpp editor/plugins/polygon_2d_editor_plugin.cpp
-#, fuzzy
 msgid "Poly Editor"
-msgstr "Éditeur UV de polygones 2D"
+msgstr "Éditeur de polygones"
 
 #: editor/editor_settings.cpp
 msgid "Point Grab Radius"
-msgstr ""
+msgstr "Rayon de saisie par point"
 
 #: editor/editor_settings.cpp editor/plugins/polygon_2d_editor_plugin.cpp
-#, fuzzy
 msgid "Show Previous Outline"
-msgstr "Plan précédent"
+msgstr "Montrer le contour précédent"
 
 #: editor/editor_settings.cpp editor/scene_tree_dock.cpp
-#, fuzzy
 msgid "Autorename Animation Tracks"
-msgstr "Renommer l'animation"
+msgstr "Renommer les pistes d'animation automatiquement"
 
 #: editor/editor_settings.cpp
 msgid "Default Create Bezier Tracks"
-msgstr ""
+msgstr "Créer pistes de Bézier par défaut"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Default Create Reset Tracks"
-msgstr "Créer des pistes RESET"
+msgstr "Créer pistes de réinitialisation par défaut"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Onion Layers Past Color"
-msgstr "Couleur de couche Oignon précedente"
+msgstr "Couleur des couches d'oignon précedentes"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Onion Layers Future Color"
-msgstr "Couleur de la couche d'Oignon suivante"
+msgstr "Couleur des couches d'oignon suivantes"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Visual Editors"
-msgstr "Editeur de groupe"
+msgstr "Éditeurs visuels"
 
 #: editor/editor_settings.cpp
 msgid "Minimap Opacity"
@@ -6197,18 +6063,16 @@ msgid "Rect"
 msgstr "Rect"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Rect Custom Position"
-msgstr "Définir la position de sortie de la courbe"
+msgstr "Position du Rect personnalisée"
 
 #: editor/editor_settings.cpp platform/android/export/export_plugin.cpp
 msgid "Screen"
 msgstr "Écran"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Auto Save"
-msgstr "Coupe automatique"
+msgstr "Sauvegarde auto"
 
 #: editor/editor_settings.cpp
 msgid "Save Before Running"
@@ -6225,14 +6089,12 @@ msgstr "Hôte distant"
 
 #: editor/editor_settings.cpp
 #: modules/gdscript/language_server/gdscript_language_server.cpp
-#, fuzzy
 msgid "Remote Port"
-msgstr "Supprimer un point"
+msgstr "Port distant"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Editor SSL Certificates"
-msgstr "Paramètres de l'éditeur"
+msgstr "Certificats SSL de l’éditeur"
 
 #: editor/editor_settings.cpp
 msgid "HTTP Proxy"
@@ -6260,7 +6122,7 @@ msgstr "Ordre de Tri"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
 msgid "Symbol Color"
-msgstr ""
+msgstr "Couleur de symbole"
 
 #: editor/editor_settings.cpp
 msgid "Keyword Color"
@@ -6268,29 +6130,27 @@ msgstr "Couleur des mots-clés"
 
 #: editor/editor_settings.cpp
 msgid "Control Flow Keyword Color"
-msgstr ""
+msgstr "Couleur de mot clé de contrôle de flux"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Base Type Color"
-msgstr "Changer le type de base"
+msgstr "Couleur de base des types"
 
 #: editor/editor_settings.cpp
 msgid "Engine Type Color"
-msgstr ""
+msgstr "Couleur de type du moteur"
 
 #: editor/editor_settings.cpp
 msgid "User Type Color"
-msgstr ""
+msgstr "Couleur de type utilisateur"
 
 #: editor/editor_settings.cpp
 msgid "Comment Color"
 msgstr "Couleur des commentaires"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "String Color"
-msgstr "Stockage du fichier :"
+msgstr "Couleur des chaînes de caractères"
 
 #: editor/editor_settings.cpp platform/javascript/export/export.cpp
 #: platform/uwp/export/export.cpp
@@ -6299,9 +6159,8 @@ msgid "Background Color"
 msgstr "Couleur d’Arrière-Plan"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Completion Background Color"
-msgstr "Couleur de fond invalide."
+msgstr "Couleur d'arrière-plan de complétion"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
 #, fuzzy
@@ -6329,23 +6188,20 @@ msgid "Line Number Color"
 msgstr "Couleur du Numéro de Ligne"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Safe Line Number Color"
-msgstr "Numéro de ligne :"
+msgstr "Couleur des nombres des lignes sûres"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
 msgid "Caret Color"
 msgstr "Couleur du caret"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Caret Background Color"
-msgstr "Couleur de fond invalide."
+msgstr "Couleur d'arrière-plan de caret"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Text Selected Color"
-msgstr "Supprimer la selection"
+msgstr "Couleur de texte sélectionné"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
 msgid "Selection Color"
@@ -6353,7 +6209,7 @@ msgstr "Couleur de la Sélection"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
 msgid "Brace Mismatch Color"
-msgstr ""
+msgstr "Couleur des erreur de fermeture d'accolades"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
 msgid "Current Line Color"
@@ -6361,26 +6217,23 @@ msgstr "Couleur de la Ligne Actuelle"
 
 #: editor/editor_settings.cpp
 msgid "Line Length Guideline Color"
-msgstr ""
+msgstr "Couleur du guide de longueur de ligne"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Word Highlighted Color"
-msgstr "Coloration syntaxique"
+msgstr "Couleur de surlignage des mots"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
 msgid "Number Color"
 msgstr "Couleur des nombres"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Function Color"
-msgstr "Fonction"
+msgstr "Couleur des fonctions"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Member Variable Color"
-msgstr "Renommer la variable"
+msgstr "Couleur des variables de membres"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
 #, fuzzy
@@ -6388,33 +6241,28 @@ msgid "Mark Color"
 msgstr "Prélever une couleur"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Bookmark Color"
-msgstr "Signets"
+msgstr "Couleur des signets"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Breakpoint Color"
-msgstr "Point d'arrêts"
+msgstr "Couleur des point d'arrêts"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Executing Line Color"
 msgstr "Couleur de la ligne d’exécution"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
 msgid "Code Folding Color"
-msgstr ""
+msgstr "Couleur du repliage de code"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Search Result Color"
-msgstr "Résultats de recherche"
+msgstr "Couleur des résultats de recherche"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Search Result Border Color"
-msgstr "Résultats de recherche"
+msgstr "Couleur de bordure des résultats de recherche"
 
 #: editor/editor_spin_slider.cpp
 msgid "Hold %s to round to integers. Hold Shift for more precise changes."
@@ -6427,9 +6275,8 @@ msgid "Flat"
 msgstr "Plat"
 
 #: editor/editor_spin_slider.cpp
-#, fuzzy
 msgid "Hide Slider"
-msgstr "Mode collision"
+msgstr "Cacher la barre de défilement"
 
 #: editor/editor_sub_scene.cpp
 msgid "Select Node(s) to Import"
@@ -6727,7 +6574,6 @@ msgstr ""
 "téléchargement est terminé."
 
 #: editor/fileserver/editor_file_server.cpp
-#, fuzzy
 msgid "File Server"
 msgstr "Serveur de fichiers"
 
@@ -7106,7 +6952,7 @@ msgstr "Collada"
 
 #: editor/import/editor_import_collada.cpp
 msgid "Use Ambient"
-msgstr ""
+msgstr "Utiliser ambiant"
 
 #: editor/import/resource_importer_bitmask.cpp
 msgid "Create From"
@@ -7115,7 +6961,7 @@ msgstr "Créer à Partir de"
 #: editor/import/resource_importer_bitmask.cpp
 #: servers/audio/effects/audio_effect_compressor.cpp
 msgid "Threshold"
-msgstr ""
+msgstr "Seuil"
 
 #: editor/import/resource_importer_csv_translation.cpp
 #: editor/import/resource_importer_layered_texture.cpp
@@ -7127,7 +6973,7 @@ msgstr "Compresser"
 
 #: editor/import/resource_importer_csv_translation.cpp
 msgid "Delimiter"
-msgstr ""
+msgstr "Délimiteur"
 
 #: editor/import/resource_importer_layered_texture.cpp
 #, fuzzy
@@ -7165,9 +7011,8 @@ msgstr "Mipmaps"
 
 #: editor/import/resource_importer_layered_texture.cpp
 #: editor/import/resource_importer_texture.cpp
-#, fuzzy
 msgid "Anisotropic"
-msgstr "Anisotropie"
+msgstr "Anisotrope"
 
 #: editor/import/resource_importer_layered_texture.cpp
 #: editor/import/resource_importer_texture.cpp
@@ -7175,9 +7020,8 @@ msgid "sRGB"
 msgstr "sRGB"
 
 #: editor/import/resource_importer_layered_texture.cpp
-#, fuzzy
 msgid "Slices"
-msgstr "Coupures"
+msgstr "Tranches"
 
 #: editor/import/resource_importer_layered_texture.cpp
 #: scene/gui/aspect_ratio_container.cpp scene/gui/control.cpp
@@ -7207,7 +7051,6 @@ msgstr "Décalage du maillage"
 
 #: editor/import/resource_importer_obj.cpp
 #: editor/import/resource_importer_scene.cpp
-#, fuzzy
 msgid "Octahedral Compression"
 msgstr "Compression Octaédrique"
 
@@ -7281,9 +7124,8 @@ msgid "Storage"
 msgstr "Stockage"
 
 #: editor/import/resource_importer_scene.cpp
-#, fuzzy
 msgid "Use Legacy Names"
-msgstr "Utiliser des noms classiques"
+msgstr "Utiliser les noms hérités"
 
 #: editor/import/resource_importer_scene.cpp modules/gltf/gltf_state.cpp
 msgid "Materials"
@@ -7303,9 +7145,8 @@ msgid "Ensure Tangents"
 msgstr "Modifier la tangente de courbes"
 
 #: editor/import/resource_importer_scene.cpp
-#, fuzzy
 msgid "Light Baking"
-msgstr "Pré-calculer les cartes de lumières"
+msgstr "Pré-calculer les lumières"
 
 #: editor/import/resource_importer_scene.cpp
 msgid "Lightmap Texel Size"
@@ -7313,24 +7154,21 @@ msgstr "Taille des Texels dans la carte de lumières"
 
 #: editor/import/resource_importer_scene.cpp modules/gltf/gltf_state.cpp
 msgid "Skins"
-msgstr ""
+msgstr "Enveloppes"
 
 #: editor/import/resource_importer_scene.cpp
-#, fuzzy
 msgid "Use Named Skins"
-msgstr "Utiliser le magnétisme d'échelle"
+msgstr "Utiliser les enveloppes nommées"
 
 #: editor/import/resource_importer_scene.cpp
 msgid "External Files"
 msgstr "Fichiers externes"
 
 #: editor/import/resource_importer_scene.cpp
-#, fuzzy
 msgid "Store In Subdir"
 msgstr "Stocker dans un sous-dossier"
 
 #: editor/import/resource_importer_scene.cpp
-#, fuzzy
 msgid "Filter Script"
 msgstr "Filtrer les scripts"
 
@@ -7366,17 +7204,14 @@ msgid "Max Angular Error"
 msgstr "Erreur Angulaire Max"
 
 #: editor/import/resource_importer_scene.cpp
-#, fuzzy
 msgid "Max Angle"
-msgstr "Valeur"
+msgstr "Angle maximal"
 
 #: editor/import/resource_importer_scene.cpp
-#, fuzzy
 msgid "Remove Unused Tracks"
-msgstr "Supprimer la piste d’animation"
+msgstr "Retirer les pistes inutilisées"
 
 #: editor/import/resource_importer_scene.cpp
-#, fuzzy
 msgid "Clips"
 msgstr "Clips d'animation"
 
@@ -7464,7 +7299,7 @@ msgstr "Mode HDR"
 
 #: editor/import/resource_importer_texture.cpp
 msgid "BPTC LDR"
-msgstr ""
+msgstr "BPTC LDR"
 
 #: editor/import/resource_importer_texture.cpp
 #: editor/plugins/tile_set_editor_plugin.cpp scene/2d/cpu_particles_2d.cpp
@@ -7482,9 +7317,8 @@ msgid "Fix Alpha Border"
 msgstr "Corriger la bordure alpha"
 
 #: editor/import/resource_importer_texture.cpp
-#, fuzzy
 msgid "Premult Alpha"
-msgstr "Modifier le polygone"
+msgstr "Alpha pré-multiplié"
 
 #: editor/import/resource_importer_texture.cpp
 msgid "Hdr As Srgb"
@@ -7528,13 +7362,12 @@ msgid "Import Mode"
 msgstr "Mode d'Importation"
 
 #: editor/import/resource_importer_texture_atlas.cpp
-#, fuzzy
 msgid "Crop To Region"
-msgstr "Définir la région de la tuile"
+msgstr "Rogner vers la région"
 
 #: editor/import/resource_importer_texture_atlas.cpp
 msgid "Trim Alpha Border From Region"
-msgstr ""
+msgstr "Rogner les bordures alpha de la région"
 
 #: editor/import/resource_importer_wav.cpp scene/2d/physics_body_2d.cpp
 msgid "Force"
@@ -7559,7 +7392,7 @@ msgstr "Taux maximal en Hz"
 
 #: editor/import/resource_importer_wav.cpp
 msgid "Trim"
-msgstr ""
+msgstr "Rogner"
 
 #: editor/import/resource_importer_wav.cpp
 msgid "Normalize"
@@ -7667,7 +7500,6 @@ msgid "Raw"
 msgstr "Brut"
 
 #: editor/inspector_dock.cpp
-#, fuzzy
 msgid "Capitalized"
 msgstr "Majuscule à chaque mot"
 
@@ -8481,7 +8313,7 @@ msgstr "Mélange 1 :"
 
 #: editor/plugins/animation_tree_player_editor_plugin.cpp
 msgid "X-Fade Time (s):"
-msgstr "Durée du fondu (s) :"
+msgstr "Durée du fondu croisé (s) :"
 
 #: editor/plugins/animation_tree_player_editor_plugin.cpp
 #: editor/plugins/visual_shader_editor_plugin.cpp
@@ -9722,7 +9554,6 @@ msgid "Swap GradientTexture2D Fill Points"
 msgstr "Échanger les points de remplissage du GradientTexture2D"
 
 #: editor/plugins/gradient_texture_2d_editor_plugin.cpp
-#, fuzzy
 msgid "Swap Gradient Fill Points"
 msgstr "Échanger les points de remplissage du dégradé"
 
@@ -10020,14 +9851,12 @@ msgid "Update from Scene"
 msgstr "Mettre à jour depuis la scène"
 
 #: editor/plugins/mesh_library_editor_plugin.cpp
-#, fuzzy
 msgid "Apply without Transforms"
-msgstr "Appliquer la transformation du MeshInstance"
+msgstr "Appliquer sans transformations"
 
 #: editor/plugins/mesh_library_editor_plugin.cpp
-#, fuzzy
 msgid "Apply with Transforms"
-msgstr "Appliquer la transformation du MeshInstance"
+msgstr "Appliquer avec transformations"
 
 #: editor/plugins/multimesh_editor_plugin.cpp
 msgid "No mesh source specified (and no MultiMesh set in node)."
@@ -10904,9 +10733,8 @@ msgid "Exec Path"
 msgstr "Chemin d'exécution"
 
 #: editor/plugins/script_editor_plugin.cpp
-#, fuzzy
 msgid "Script Temperature Enabled"
-msgstr "Sélectionner le fichier de modèles"
+msgstr "Température de script activée"
 
 #: editor/plugins/script_editor_plugin.cpp
 msgid "Highlight Current Script"
@@ -10914,16 +10742,15 @@ msgstr "Mettre en évidence le script actuel"
 
 #: editor/plugins/script_editor_plugin.cpp
 msgid "Script Temperature History Size"
-msgstr ""
+msgstr "Taille de l'historique des températures de script"
 
 #: editor/plugins/script_editor_plugin.cpp
 msgid "Current Script Background Color"
 msgstr "Couleur d'Arrière-Plan du Script Actuel"
 
 #: editor/plugins/script_editor_plugin.cpp
-#, fuzzy
 msgid "Group Help Pages"
-msgstr "Groupe sélectionné"
+msgstr "Pages d'aide de groupe"
 
 #: editor/plugins/script_editor_plugin.cpp
 msgid "Sort Scripts By"
@@ -11756,11 +11583,11 @@ msgstr "Post"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "Manipulator Gizmo Size"
-msgstr ""
+msgstr "Taille des manipulateurs"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "Manipulator Gizmo Opacity"
-msgstr ""
+msgstr "Opacité des manipulateurs"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "Show Viewport Rotation Gizmo"
@@ -11921,9 +11748,8 @@ msgid "New Animation"
 msgstr "Nouvelle animation"
 
 #: editor/plugins/sprite_frames_editor_plugin.cpp
-#, fuzzy
 msgid "Filter animations"
-msgstr "Filtrer les méthodes"
+msgstr "Filtrer les animations"
 
 #: editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Speed:"
@@ -12395,9 +12221,8 @@ msgid "Select Another Theme Resource:"
 msgstr "Sélectionnez une autre ressource Theme :"
 
 #: editor/plugins/theme_editor_plugin.cpp
-#, fuzzy
 msgid "Theme Resource"
-msgstr "Ressource de Thème"
+msgstr "Ressource de thème"
 
 #: editor/plugins/theme_editor_plugin.cpp
 msgid "Another Theme"
@@ -12453,9 +12278,8 @@ msgid "Add Item Type"
 msgstr "Ajouter un item de type"
 
 #: editor/plugins/theme_editor_plugin.cpp
-#, fuzzy
 msgid "Set Variation Base Type"
-msgstr "Définir type de variable"
+msgstr "Définir le type parent de la variation"
 
 #: editor/plugins/theme_editor_plugin.cpp
 msgid "Set Base Type"
@@ -12481,15 +12305,16 @@ msgstr "Surcharge tous les items de type par défaut."
 #: editor/plugins/theme_editor_plugin.cpp
 msgid "Select the variation base type from a list of available types."
 msgstr ""
+"Choisissez le type parent de la variation depuis la liste des types "
+"disponibles."
 
 #: editor/plugins/theme_editor_plugin.cpp
-#, fuzzy
 msgid ""
 "A type associated with a built-in class cannot be marked as a variation of "
 "another type."
 msgstr ""
-"Un type affilié à une classe intégré ne peut pas être marqué comme une "
-"variante d'un autre type."
+"Un type affilié à une classe intégrée ne peut pas être marqué comme variante "
+"d'un autre type."
 
 #: editor/plugins/theme_editor_plugin.cpp
 msgid "Theme:"
@@ -12756,9 +12581,8 @@ msgid "Sort Tiles By Name"
 msgstr "Trier les tuiles par nom"
 
 #: editor/plugins/tile_map_editor_plugin.cpp
-#, fuzzy
 msgid "Bucket Fill Preview"
-msgstr "Remplissage du seau"
+msgstr "Aperçu du remplissage"
 
 #: editor/plugins/tile_map_editor_plugin.cpp
 #: modules/gridmap/grid_map_editor_plugin.cpp
@@ -13152,9 +12976,8 @@ msgid "Texture"
 msgstr "Texture"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Tex Offset"
-msgstr "Décalage d’Octet"
+msgstr "Décalage de texture"
 
 #: editor/plugins/tile_set_editor_plugin.cpp modules/csg/csg_shape.cpp
 #: scene/2d/canvas_item.cpp scene/2d/particles_2d.cpp
@@ -13168,14 +12991,12 @@ msgid "Modulate"
 msgstr "Moduler"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Tile Mode"
-msgstr "Basculer le mode"
+msgstr "Mode de tuile"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Autotile Bitmask Mode"
-msgstr "Mode Bitmask"
+msgstr "Mode de masque d'octet de tuile auto"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
 msgid "Subtile Size"
@@ -13206,28 +13027,24 @@ msgid "Selected Collision"
 msgstr "Collision sélectionné"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Selected Collision One Way"
-msgstr "Sélection uniquement"
+msgstr "Collision à sens unique de la sélection"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Selected Collision One Way Margin"
-msgstr "Mode collision"
+msgstr "Marge de collision à sens unique de la sélection"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
 msgid "Selected Navigation"
 msgstr "Navigation sélectionnée"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Selected Occlusion"
-msgstr "Sélectionner"
+msgstr "Occultation de la sélection"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Tileset Script"
-msgstr "Filtrer les scripts"
+msgstr "Script de palette de tuiles"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
 msgid "TileSet"
@@ -14450,7 +14267,7 @@ msgstr "Plus d'informations..."
 
 #: editor/project_export.cpp
 msgid "Export PCK/Zip..."
-msgstr "Exporter le PCK/ZIP"
+msgstr "Exporter le PCK/ZIP..."
 
 #: editor/project_export.cpp
 msgid "Export Project..."
@@ -15516,7 +15333,7 @@ msgstr "Supprimer le nœud \"%s\" et ses enfants ?"
 
 #: editor/scene_tree_dock.cpp
 msgid "Delete node \"%s\"?"
-msgstr "Supprimer le noeud \"%s\" ?"
+msgstr "Supprimer le nœud \"%s\" ?"
 
 #: editor/scene_tree_dock.cpp
 msgid ""
@@ -15693,7 +15510,7 @@ msgstr "Ressources secondaires"
 
 #: editor/scene_tree_dock.cpp
 msgid "Access as Scene Unique Name"
-msgstr ""
+msgstr "Accéder en tant que nom unique de scène"
 
 #: editor/scene_tree_dock.cpp
 msgid "Clear Inheritance"
@@ -15793,18 +15610,16 @@ msgid "Clear Inheritance? (No Undo!)"
 msgstr "Effacer l'héritage ? (Pas de retour en arrière !)"
 
 #: editor/scene_tree_dock.cpp
-#, fuzzy
 msgid "Show Scene Tree Root Selection"
-msgstr "Afficher la sélection de la racine de l'arborescence"
+msgstr "Afficher la sélection de la racine de la hiérarchie de la scène"
 
 #: editor/scene_tree_dock.cpp
 msgid "Derive Script Globals By Name"
-msgstr ""
+msgstr "Dériver les Globals de scripts par nom"
 
 #: editor/scene_tree_dock.cpp
-#, fuzzy
 msgid "Use Favorites Root Selection"
-msgstr "Encadrer la sélection"
+msgstr "Utiliser la sélection racine des favoris"
 
 #: editor/scene_tree_editor.cpp
 msgid "Toggle Visible"
@@ -16126,7 +15941,7 @@ msgstr "Filtrer les variables de la pile"
 
 #: editor/script_editor_debugger.cpp
 msgid "Auto Switch To Remote Scene Tree"
-msgstr ""
+msgstr "Basculer automatiquement vers l'arborescence de scène distante"
 
 #: editor/script_editor_debugger.cpp
 msgid "Remote Scene Tree Refresh Interval"
@@ -16134,7 +15949,7 @@ msgstr "Intervalle de rafraîchissement de l'arborescence distante"
 
 #: editor/script_editor_debugger.cpp
 msgid "Remote Inspect Refresh Interval"
-msgstr ""
+msgstr "Intervalle de rafraîchissement d'inspection distante"
 
 #: editor/script_editor_debugger.cpp
 msgid "Network Profiler"
@@ -16232,9 +16047,8 @@ msgid "Change Light Radius"
 msgstr "Changer le rayon d'une lumière"
 
 #: editor/spatial_editor_gizmos.cpp
-#, fuzzy
 msgid "Stream Player 3D"
-msgstr "Émetteur de flux sonore 3D"
+msgstr "Émetteur de flux 3D"
 
 #: editor/spatial_editor_gizmos.cpp
 msgid "Change AudioStreamPlayer3D Emission Angle"
@@ -16279,9 +16093,8 @@ msgid "GI Probe"
 msgstr "Sonde GI"
 
 #: editor/spatial_editor_gizmos.cpp
-#, fuzzy
 msgid "Baked Indirect Light"
-msgstr "Éclairage indirect"
+msgstr "Éclairage indirect pré-calculé"
 
 #: editor/spatial_editor_gizmos.cpp modules/csg/csg_gizmos.cpp
 msgid "Change Sphere Shape Radius"
@@ -16320,22 +16133,20 @@ msgid "Navigation Edge Disabled"
 msgstr "Bord de la Navigation Désactivé"
 
 #: editor/spatial_editor_gizmos.cpp
-#, fuzzy
 msgid "Navigation Solid"
-msgstr "Mode Navigation"
+msgstr "Solide de navigation"
 
 #: editor/spatial_editor_gizmos.cpp
-#, fuzzy
 msgid "Navigation Solid Disabled"
-msgstr "Mode Navigation"
+msgstr "Solide de navigation désactivé"
 
 #: editor/spatial_editor_gizmos.cpp
 msgid "Joint Body A"
-msgstr ""
+msgstr "Jointure Corps A"
 
 #: editor/spatial_editor_gizmos.cpp
 msgid "Joint Body B"
-msgstr ""
+msgstr "Jointure Corps B"
 
 #: editor/spatial_editor_gizmos.cpp
 msgid "Room Edge"
@@ -16343,7 +16154,7 @@ msgstr "Bord de la pièce"
 
 #: editor/spatial_editor_gizmos.cpp
 msgid "Room Overlap"
-msgstr ""
+msgstr "Chevauchement de salle"
 
 #: editor/spatial_editor_gizmos.cpp
 msgid "Set Room Point Position"
@@ -16359,7 +16170,7 @@ msgstr "Bords du portail"
 
 #: editor/spatial_editor_gizmos.cpp
 msgid "Portal Arrow"
-msgstr ""
+msgstr "Flèche de portail"
 
 #: editor/spatial_editor_gizmos.cpp
 msgid "Set Portal Point Position"
@@ -16387,44 +16198,38 @@ msgid "Set Occluder Sphere Position"
 msgstr "Définir la position de la sphère de l'occulteur"
 
 #: editor/spatial_editor_gizmos.cpp
-#, fuzzy
 msgid "Set Occluder Polygon Point Position"
-msgstr "Définir la position du point du Portal"
+msgstr "Définir la position ponctuelle du polygone occulteur"
 
 #: editor/spatial_editor_gizmos.cpp
-#, fuzzy
 msgid "Set Occluder Hole Point Position"
-msgstr "Définir la position du point de la courbe"
+msgstr "Définir la position ponctuelle du trou occulteur"
 
 #: editor/spatial_editor_gizmos.cpp
-#, fuzzy
 msgid "Occluder Polygon Front"
-msgstr "Créer un polygone occulteur"
+msgstr "Avant du polygone occulteur"
 
 #: editor/spatial_editor_gizmos.cpp
-#, fuzzy
 msgid "Occluder Polygon Back"
-msgstr "Créer un polygone occulteur"
+msgstr "Arrière du polygone occulteur"
 
 #: editor/spatial_editor_gizmos.cpp
-#, fuzzy
 msgid "Occluder Hole"
-msgstr "Créer un polygone occulteur"
+msgstr "Trou occulteur"
 
 #: main/main.cpp
 msgid "Godot Physics"
-msgstr ""
+msgstr "Calculs de physique de Godot"
 
 #: main/main.cpp servers/physics_2d/physics_2d_server_sw.cpp
 #: servers/visual/visual_server_scene.cpp
 msgid "Use BVH"
-msgstr ""
+msgstr "Utiliser BVH"
 
 #: main/main.cpp servers/physics_2d/physics_2d_server_sw.cpp
 #: servers/visual/visual_server_scene.cpp
-#, fuzzy
 msgid "BVH Collision Margin"
-msgstr "Mode collision"
+msgstr "Marge de collision BVH"
 
 #: main/main.cpp
 msgid "Crash Handler"
@@ -16460,7 +16265,7 @@ msgstr "Maximum d'avertissements par secondes"
 
 #: main/main.cpp
 msgid "Flush stdout On Print"
-msgstr ""
+msgstr "Vider stdout à l'impression"
 
 #: main/main.cpp servers/visual_server.cpp
 msgid "Logging"
@@ -16500,11 +16305,11 @@ msgstr ""
 
 #: main/main.cpp
 msgid "DPI"
-msgstr ""
+msgstr "PPP"
 
 #: main/main.cpp
 msgid "Allow hiDPI"
-msgstr ""
+msgstr "Autoriser PPP élevé"
 
 #: main/main.cpp
 msgid "V-Sync"
@@ -16548,7 +16353,7 @@ msgstr ""
 
 #: main/main.cpp
 msgid "Handheld"
-msgstr ""
+msgstr "Portable"
 
 #: main/main.cpp platform/javascript/export/export.cpp
 #: platform/uwp/export/export.cpp
@@ -16588,7 +16393,7 @@ msgstr "Sortie Standard"
 
 #: main/main.cpp
 msgid "Print FPS"
-msgstr ""
+msgstr "Afficher les FPS"
 
 #: main/main.cpp
 msgid "Verbose stdout"
@@ -16632,7 +16437,7 @@ msgstr "Pointage"
 
 #: main/main.cpp
 msgid "Touch Delay"
-msgstr ""
+msgstr "Retard d'appui"
 
 #: main/main.cpp servers/visual_server.cpp
 msgid "GLES3"
@@ -16643,9 +16448,8 @@ msgid "Shaders"
 msgstr "Shaders"
 
 #: main/main.cpp
-#, fuzzy
 msgid "Debug Shader Fallbacks"
-msgstr "Forcer les replis du shader"
+msgstr "Valeurs de repli du shader de débogage"
 
 #: main/main.cpp scene/3d/baked_lightmap.cpp scene/3d/camera.cpp
 #: scene/3d/world_environment.cpp scene/main/scene_tree.cpp
@@ -16691,7 +16495,7 @@ msgstr "Icône native de Windows"
 
 #: main/main.cpp
 msgid "Buffering"
-msgstr ""
+msgstr "Mise en mémoire tampon"
 
 #: main/main.cpp
 msgid "Agile Event Flushing"
@@ -16722,9 +16526,8 @@ msgid "Tooltip Position Offset"
 msgstr "Décalage de la position des info-bulles"
 
 #: main/main.cpp modules/mono/mono_gd/gd_mono.cpp
-#, fuzzy
 msgid "Debugger Agent"
-msgstr "Débogueur"
+msgstr "Agent du débogueur"
 
 #: main/main.cpp modules/mono/mono_gd/gd_mono.cpp
 msgid "Wait For Debugger"
@@ -16736,11 +16539,11 @@ msgstr "Délai d'Attente"
 
 #: main/main.cpp
 msgid "Runtime"
-msgstr ""
+msgstr "Exécution"
 
 #: main/main.cpp
 msgid "Unhandled Exception Policy"
-msgstr ""
+msgstr "Politique d'exceptions non gérées"
 
 #: main/main.cpp
 msgid "Main Loop Type"
@@ -16764,14 +16567,12 @@ msgid "Auto Accept Quit"
 msgstr "Accepter automatiquement la fermeture"
 
 #: main/main.cpp scene/main/scene_tree.cpp
-#, fuzzy
 msgid "Quit On Go Back"
-msgstr "Retourner"
+msgstr "Quitter au retour"
 
 #: main/main.cpp scene/main/viewport.cpp
-#, fuzzy
 msgid "Snap Controls To Pixels"
-msgstr "Aimanter aux flancs du nœud"
+msgstr "Aimanter les contrôles aux pixels"
 
 #: main/main.cpp
 msgid "Dynamic Fonts"
@@ -16779,7 +16580,7 @@ msgstr "Polices Dynamiques"
 
 #: main/main.cpp
 msgid "Use Oversampling"
-msgstr ""
+msgstr "Utiliser le suréchantillonnage"
 
 #: modules/bullet/register_types.cpp modules/bullet/space_bullet.cpp
 msgid "Active Soft World"
@@ -16806,35 +16607,30 @@ msgid "Change Torus Outer Radius"
 msgstr "Changer le rayon extérieur de la tour"
 
 #: modules/csg/csg_shape.cpp
-#, fuzzy
 msgid "Operation"
-msgstr "Options"
+msgstr "Opération"
 
 #: modules/csg/csg_shape.cpp
 msgid "Calculate Tangents"
 msgstr "Calculer les Tangentes"
 
 #: modules/csg/csg_shape.cpp
-#, fuzzy
 msgid "Use Collision"
-msgstr "Collision"
+msgstr "Utiliser les collisions"
 
 #: modules/csg/csg_shape.cpp servers/physics_2d_server.cpp
-#, fuzzy
 msgid "Collision Layer"
-msgstr "Mode collision"
+msgstr "Couche des collisions"
 
 #: modules/csg/csg_shape.cpp scene/2d/ray_cast_2d.cpp scene/3d/camera.cpp
 #: scene/3d/ray_cast.cpp scene/3d/spring_arm.cpp
 #: scene/resources/navigation_mesh.cpp servers/physics_server.cpp
-#, fuzzy
 msgid "Collision Mask"
-msgstr "Mode collision"
+msgstr "Masque de collisions"
 
 #: modules/csg/csg_shape.cpp
-#, fuzzy
 msgid "Invert Faces"
-msgstr "Modifier la casse"
+msgstr "Inverses les faces"
 
 #: modules/csg/csg_shape.cpp scene/2d/navigation_agent_2d.cpp
 #: scene/2d/navigation_obstacle_2d.cpp scene/3d/navigation_agent.cpp
@@ -16852,57 +16648,50 @@ msgid "Radial Segments"
 msgstr "Segments radiaux"
 
 #: modules/csg/csg_shape.cpp scene/resources/primitive_meshes.cpp
-#, fuzzy
 msgid "Rings"
-msgstr "Avertissements"
+msgstr "Anneaux"
 
 #: modules/csg/csg_shape.cpp
-#, fuzzy
 msgid "Smooth Faces"
-msgstr "Progression douce"
+msgstr "Adoucir les faces"
 
 #: modules/csg/csg_shape.cpp
-#, fuzzy
 msgid "Sides"
-msgstr "Afficher les guides"
+msgstr "Côtés"
 
 #: modules/csg/csg_shape.cpp
 msgid "Cone"
-msgstr ""
+msgstr "Cone"
 
 #: modules/csg/csg_shape.cpp
-#, fuzzy
 msgid "Inner Radius"
-msgstr "Changer le rayon intérieur de la tour"
+msgstr "Rayon intérieur"
 
 #: modules/csg/csg_shape.cpp
-#, fuzzy
 msgid "Outer Radius"
-msgstr "Changer le rayon extérieur de la tour"
+msgstr "Rayon extérieur"
 
 #: modules/csg/csg_shape.cpp
 msgid "Ring Sides"
-msgstr ""
+msgstr "Côtés de l'anneau"
 
 #: modules/csg/csg_shape.cpp scene/2d/collision_polygon_2d.cpp
 #: scene/2d/light_occluder_2d.cpp scene/2d/polygon_2d.cpp
 #: scene/3d/collision_polygon.cpp
-#, fuzzy
 msgid "Polygon"
-msgstr "Polygones"
+msgstr "Polygone"
 
 #: modules/csg/csg_shape.cpp
 msgid "Spin Degrees"
-msgstr ""
+msgstr "Degrés de tour"
 
 #: modules/csg/csg_shape.cpp
 msgid "Spin Sides"
-msgstr ""
+msgstr "Côtés du tour"
 
 #: modules/csg/csg_shape.cpp
-#, fuzzy
 msgid "Path Node"
-msgstr "Coller les nœuds"
+msgstr "Noeud de chemin"
 
 #: modules/csg/csg_shape.cpp
 #, fuzzy
@@ -16911,35 +16700,31 @@ msgstr "Créer un vertex interne"
 
 #: modules/csg/csg_shape.cpp
 msgid "Path Interval"
-msgstr ""
+msgstr "Intervalle de chemin"
 
 #: modules/csg/csg_shape.cpp
 msgid "Path Simplify Angle"
-msgstr ""
+msgstr "Simplification d'angle de chemin"
 
 #: modules/csg/csg_shape.cpp
 msgid "Path Rotation"
 msgstr "Rotation du chemin"
 
 #: modules/csg/csg_shape.cpp
-#, fuzzy
 msgid "Path Local"
-msgstr "Rendre local"
+msgstr "Chemin local"
 
 #: modules/csg/csg_shape.cpp
-#, fuzzy
 msgid "Path Continuous U"
-msgstr "Continu"
+msgstr "Chemin Continu U"
 
 #: modules/csg/csg_shape.cpp
-#, fuzzy
 msgid "Path U Distance"
-msgstr "Choisissez distance :"
+msgstr "Distance du chemin U"
 
 #: modules/csg/csg_shape.cpp
-#, fuzzy
 msgid "Path Joined"
-msgstr "Rotation aléatoire :"
+msgstr "Chemin joint"
 
 #: modules/enet/networked_multiplayer_enet.cpp
 msgid "Compression Mode"
@@ -16959,7 +16744,7 @@ msgstr "Toujours ordonnée"
 
 #: modules/enet/networked_multiplayer_enet.cpp
 msgid "Server Relay"
-msgstr ""
+msgstr "Relais serveur"
 
 #: modules/enet/networked_multiplayer_enet.cpp
 msgid "DTLS Verify"
@@ -16986,9 +16771,8 @@ msgid "Config File"
 msgstr "Fichier de Configuration"
 
 #: modules/gdnative/gdnative.cpp
-#, fuzzy
 msgid "Load Once"
-msgstr "Charger une ressource"
+msgstr "Charger une fois"
 
 #: modules/gdnative/gdnative.cpp
 #: modules/visual_script/visual_script_func_nodes.cpp
@@ -17208,9 +16992,8 @@ msgid "Sparse Indices Byte Offset"
 msgstr ""
 
 #: modules/gltf/gltf_accessor.cpp
-#, fuzzy
 msgid "Sparse Indices Component Type"
-msgstr "Analyse de la géométrie..."
+msgstr "Type de composant d'indices épars"
 
 #: modules/gltf/gltf_accessor.cpp
 msgid "Sparse Values Buffer View"
@@ -17284,9 +17067,8 @@ msgid "Blend Weights"
 msgstr "Précalculer les lightmaps"
 
 #: modules/gltf/gltf_mesh.cpp
-#, fuzzy
 msgid "Instance Materials"
-msgstr "Changements de matériau :"
+msgstr "Matériaux d'instances"
 
 #: modules/gltf/gltf_node.cpp scene/3d/skeleton.cpp
 msgid "Parent"
@@ -17299,25 +17081,21 @@ msgstr "Plateforme"
 
 #: modules/gltf/gltf_node.cpp scene/3d/mesh_instance.cpp
 msgid "Skin"
-msgstr ""
+msgstr "Enveloppe"
 
 #: modules/gltf/gltf_node.cpp scene/3d/spatial.cpp
-#, fuzzy
 msgid "Translation"
-msgstr "Traductions"
+msgstr "Translation"
 
 #: modules/gltf/gltf_node.cpp
-#, fuzzy
 msgid "Children"
-msgstr "Enfants modifiables"
+msgstr "Enfants"
 
 #: modules/gltf/gltf_skeleton.cpp modules/gltf/gltf_skin.cpp
-#, fuzzy
 msgid "Joints"
-msgstr "Point"
+msgstr "Jointures"
 
 #: modules/gltf/gltf_skeleton.cpp modules/gltf/gltf_skin.cpp
-#, fuzzy
 msgid "Roots"
 msgstr "Racines"
 
@@ -17326,48 +17104,42 @@ msgid "Unique Names"
 msgstr "Noms Uniques"
 
 #: modules/gltf/gltf_skeleton.cpp
-#, fuzzy
 msgid "Godot Bone Node"
-msgstr "Le nœud de la scène"
+msgstr "NÅ“ud d'os de Godot"
 
 #: modules/gltf/gltf_skin.cpp
-#, fuzzy
 msgid "Skin Root"
-msgstr "Nouvelle racine de scène"
+msgstr "Racine de l'enveloppe"
 
 #: modules/gltf/gltf_skin.cpp
-#, fuzzy
 msgid "Joints Original"
-msgstr "Focaliser l'origine"
+msgstr "Jointure à l'original"
 
 #: modules/gltf/gltf_skin.cpp
 msgid "Inverse Binds"
-msgstr ""
+msgstr "Inverser les liens"
 
 #: modules/gltf/gltf_skin.cpp
-#, fuzzy
 msgid "Non Joints"
-msgstr "Déplacer la jointure"
+msgstr "Non jointures"
 
 #: modules/gltf/gltf_skin.cpp
 msgid "Joint I To Bone I"
-msgstr ""
+msgstr "Jointure I à os I"
 
 #: modules/gltf/gltf_skin.cpp
 msgid "Joint I To Name"
-msgstr ""
+msgstr "Jointure I à nom"
 
 #: modules/gltf/gltf_skin.cpp
 msgid "Godot Skin"
-msgstr ""
+msgstr "Enveloppe Godot"
 
 #: modules/gltf/gltf_spec_gloss.cpp
-#, fuzzy
 msgid "Diffuse Img"
 msgstr "Image Diffuse"
 
 #: modules/gltf/gltf_spec_gloss.cpp
-#, fuzzy
 msgid "Diffuse Factor"
 msgstr "Facteur de diffusion"
 
@@ -17385,50 +17157,44 @@ msgstr ""
 
 #: modules/gltf/gltf_state.cpp
 msgid "Json"
-msgstr ""
+msgstr "Json"
 
 #: modules/gltf/gltf_state.cpp
-#, fuzzy
 msgid "Major Version"
-msgstr "Version"
+msgstr "Version majeure"
 
 #: modules/gltf/gltf_state.cpp
-#, fuzzy
 msgid "Minor Version"
-msgstr "Version"
+msgstr "Version mineure"
 
 #: modules/gltf/gltf_state.cpp
-#, fuzzy
 msgid "GLB Data"
-msgstr "Avec données"
+msgstr "Données GLB"
 
 #: modules/gltf/gltf_state.cpp
 msgid "Use Named Skin Binds"
-msgstr ""
+msgstr "Utiliser les liens d'enveloppe par nom"
 
 #: modules/gltf/gltf_state.cpp
-#, fuzzy
 msgid "Buffer Views"
-msgstr "Vue de derrière"
+msgstr "Vues tampon"
 
 #: modules/gltf/gltf_state.cpp
 msgid "Accessors"
-msgstr ""
+msgstr "Accesseurs"
 
 #: modules/gltf/gltf_state.cpp
 msgid "Scene Name"
 msgstr "Nom de la Scène"
 
 #: modules/gltf/gltf_state.cpp
-#, fuzzy
 msgid "Root Nodes"
-msgstr "Nom de nœud racine"
+msgstr "NÅ“uds racines"
 
 #: modules/gltf/gltf_state.cpp scene/2d/particles_2d.cpp
 #: scene/gui/texture_button.cpp scene/gui/texture_progress.cpp
-#, fuzzy
 msgid "Textures"
-msgstr "Fonctionnalités"
+msgstr "Textures"
 
 #: modules/gltf/gltf_state.cpp platform/uwp/export/export.cpp
 msgid "Images"
@@ -17439,42 +17205,36 @@ msgid "Cameras"
 msgstr "Caméras"
 
 #: modules/gltf/gltf_state.cpp servers/visual_server.cpp
-#, fuzzy
 msgid "Lights"
-msgstr "Lumière"
+msgstr "Lumières"
 
 #: modules/gltf/gltf_state.cpp
-#, fuzzy
 msgid "Unique Animation Names"
-msgstr "Nom de la nouvelle animation :"
+msgstr "Noms d'animations uniques"
 
 #: modules/gltf/gltf_state.cpp
-#, fuzzy
 msgid "Skeletons"
-msgstr "Squelette"
+msgstr "Squelettes"
 
 #: modules/gltf/gltf_state.cpp
-#, fuzzy
 msgid "Skeleton To Node"
-msgstr "Sélectionner un nœud"
+msgstr "Squelette vers nœud"
 
 #: modules/gltf/gltf_state.cpp
 msgid "Animations"
 msgstr "Animations"
 
 #: modules/gltf/gltf_texture.cpp
-#, fuzzy
 msgid "Src Image"
-msgstr "Afficher les os"
+msgstr "Image source"
 
 #: modules/gridmap/grid_map.cpp
 msgid "Mesh Library"
 msgstr "Librairie de maillages"
 
 #: modules/gridmap/grid_map.cpp
-#, fuzzy
 msgid "Physics Material"
-msgstr "Image physique %"
+msgstr "Matériau physique"
 
 #: modules/gridmap/grid_map.cpp scene/3d/visual_instance.cpp
 #, fuzzy
@@ -17486,24 +17246,20 @@ msgid "Cell"
 msgstr "Cellule"
 
 #: modules/gridmap/grid_map.cpp
-#, fuzzy
 msgid "Octant Size"
-msgstr "Vue de devant"
+msgstr "Taille d'octant"
 
 #: modules/gridmap/grid_map.cpp
-#, fuzzy
 msgid "Center X"
-msgstr "Centre"
+msgstr "X du centre"
 
 #: modules/gridmap/grid_map.cpp
-#, fuzzy
 msgid "Center Y"
-msgstr "Centre"
+msgstr "Y du centre"
 
 #: modules/gridmap/grid_map.cpp
-#, fuzzy
 msgid "Center Z"
-msgstr "Centre"
+msgstr "Z du centre"
 
 #: modules/gridmap/grid_map.cpp scene/2d/collision_object_2d.cpp
 #: scene/2d/tile_map.cpp scene/3d/collision_object.cpp scene/3d/soft_body.cpp
@@ -17512,17 +17268,15 @@ msgid "Mask"
 msgstr "Masque"
 
 #: modules/gridmap/grid_map.cpp scene/2d/tile_map.cpp
-#, fuzzy
 msgid "Bake Navigation"
-msgstr "Navigation"
+msgstr "Pré-calculer la navigation"
 
 #: modules/gridmap/grid_map.cpp scene/2d/navigation_2d.cpp
 #: scene/2d/navigation_agent_2d.cpp scene/2d/navigation_polygon.cpp
 #: scene/2d/tile_map.cpp scene/3d/navigation.cpp scene/3d/navigation_agent.cpp
 #: scene/3d/navigation_mesh_instance.cpp
-#, fuzzy
 msgid "Navigation Layers"
-msgstr "Mode Navigation"
+msgstr "Calques de navigation"
 
 #: modules/gridmap/grid_map_editor_plugin.cpp
 msgid "Next Plane"
@@ -17710,7 +17464,6 @@ msgid "Loop Offset"
 msgstr "Décalage de Boucle"
 
 #: modules/mobile_vr/mobile_vr_interface.cpp
-#, fuzzy
 msgid "Eye Height"
 msgstr "Hauteur de l’œil"
 
@@ -17729,15 +17482,15 @@ msgstr "Afficher sans ombrage"
 
 #: modules/mobile_vr/mobile_vr_interface.cpp
 msgid "Oversample"
-msgstr ""
+msgstr "Suréchantillonner"
 
 #: modules/mobile_vr/mobile_vr_interface.cpp
 msgid "K1"
-msgstr ""
+msgstr "K1"
 
 #: modules/mobile_vr/mobile_vr_interface.cpp
 msgid "K2"
-msgstr ""
+msgstr "K2"
 
 #: modules/mono/csharp_script.cpp
 msgid "Class name can't be a reserved keyword"
@@ -17824,14 +17577,13 @@ msgstr "C'est fait !"
 
 #: modules/opensimplex/noise_texture.cpp
 msgid "Seamless"
-msgstr ""
+msgstr "Sans bord"
 
 #: modules/opensimplex/noise_texture.cpp
 msgid "As Normal Map"
 msgstr "En tant que carte de normales"
 
 #: modules/opensimplex/noise_texture.cpp
-#, fuzzy
 msgid "Bump Strength"
 msgstr "Force du bossage"
 
@@ -17840,12 +17592,10 @@ msgid "Noise"
 msgstr "Bruit"
 
 #: modules/opensimplex/noise_texture.cpp
-#, fuzzy
 msgid "Noise Offset"
-msgstr "Décalage de la grille :"
+msgstr "Décalage du bruit"
 
 #: modules/opensimplex/open_simplex_noise.cpp
-#, fuzzy
 msgid "Octaves"
 msgstr "Octaves"
 
@@ -17854,28 +17604,24 @@ msgid "Period"
 msgstr "Période"
 
 #: modules/opensimplex/open_simplex_noise.cpp
-#, fuzzy
 msgid "Persistence"
-msgstr "Perspective"
+msgstr "Persistance"
 
 #: modules/opensimplex/open_simplex_noise.cpp
 msgid "Lacunarity"
-msgstr ""
+msgstr "Lacunarité"
 
 #: modules/regex/regex.cpp
-#, fuzzy
 msgid "Subject"
 msgstr "Sujet"
 
 #: modules/regex/regex.cpp
-#, fuzzy
 msgid "Names"
-msgstr "Nom"
+msgstr "Noms"
 
 #: modules/regex/regex.cpp
-#, fuzzy
 msgid "Strings"
-msgstr "Paramètres :"
+msgstr "Paramètres"
 
 #: modules/upnp/upnp.cpp
 msgid "Discover Multicast If"
@@ -17883,39 +17629,35 @@ msgstr ""
 
 #: modules/upnp/upnp.cpp
 msgid "Discover Local Port"
-msgstr ""
+msgstr "Révéler le port local"
 
 #: modules/upnp/upnp.cpp
 msgid "Discover IPv6"
 msgstr "Découvrir IPv6"
 
 #: modules/upnp/upnp_device.cpp
-#, fuzzy
 msgid "Description URL"
-msgstr "Description"
+msgstr "URL de description"
 
 #: modules/upnp/upnp_device.cpp
-#, fuzzy
 msgid "Service Type"
-msgstr "Définir type de variable"
+msgstr "Type du service"
 
 #: modules/upnp/upnp_device.cpp
 msgid "IGD Control URL"
-msgstr ""
+msgstr "URL de contrôle IGD"
 
 #: modules/upnp/upnp_device.cpp
-#, fuzzy
 msgid "IGD Service Type"
-msgstr "Définir type de variable"
+msgstr "Type de service IGD"
 
 #: modules/upnp/upnp_device.cpp
 msgid "IGD Our Addr"
 msgstr ""
 
 #: modules/upnp/upnp_device.cpp
-#, fuzzy
 msgid "IGD Status"
-msgstr "État"
+msgstr "État IGD"
 
 #: modules/visual_script/visual_script.cpp
 msgid ""
@@ -17956,9 +17698,8 @@ msgid "Stack overflow with stack depth:"
 msgstr "Débordement de pile avec profondeur de pile :"
 
 #: modules/visual_script/visual_script.cpp
-#, fuzzy
 msgid "Visual Script"
-msgstr "Rechercher VisualScript"
+msgstr "Script graphique"
 
 #: modules/visual_script/visual_script_editor.cpp
 msgid "Change Signal Arguments"
@@ -18294,9 +18035,8 @@ msgid "Return Enabled"
 msgstr "Exécutable"
 
 #: modules/visual_script/visual_script_flow_control.cpp
-#, fuzzy
 msgid "Return Type"
-msgstr "Retour"
+msgstr "Type de retour"
 
 #: modules/visual_script/visual_script_flow_control.cpp
 #: scene/resources/visual_shader_nodes.cpp
@@ -18344,7 +18084,6 @@ msgid "in order:"
 msgstr "dans l'ordre :"
 
 #: modules/visual_script/visual_script_flow_control.cpp
-#, fuzzy
 msgid "Steps"
 msgstr "Pas"
 
@@ -18366,9 +18105,8 @@ msgstr "Est-ce %s ?"
 
 #: modules/visual_script/visual_script_flow_control.cpp
 #: modules/visual_script/visual_script_func_nodes.cpp
-#, fuzzy
 msgid "Base Script"
-msgstr "Nouveau script"
+msgstr "Script de base"
 
 #: modules/visual_script/visual_script_func_nodes.cpp
 msgid "On %s"
@@ -18380,36 +18118,31 @@ msgstr "On Self"
 
 #: modules/visual_script/visual_script_func_nodes.cpp
 #: modules/visual_script/visual_script_yield_nodes.cpp
-#, fuzzy
 msgid "Call Mode"
-msgstr "Mode mise à l'échelle"
+msgstr "Mode d'appel"
 
 #: modules/visual_script/visual_script_func_nodes.cpp
 #: modules/visual_script/visual_script_nodes.cpp
-#, fuzzy
 msgid "Basic Type"
-msgstr "Changer le type de base"
+msgstr "Type simple"
 
 #: modules/visual_script/visual_script_func_nodes.cpp
 #: modules/visual_script/visual_script_nodes.cpp
 #: modules/visual_script/visual_script_yield_nodes.cpp
-#, fuzzy
 msgid "Node Path"
-msgstr "Copier le chemin du nœud"
+msgstr "Chemin de nœud"
 
 #: modules/visual_script/visual_script_func_nodes.cpp
-#, fuzzy
 msgid "Use Default Args"
-msgstr "Réinitialiser"
+msgstr "Utiliser les valeurs d'arguments par défaut"
 
 #: modules/visual_script/visual_script_func_nodes.cpp
 msgid "Validate"
 msgstr "Valider"
 
 #: modules/visual_script/visual_script_func_nodes.cpp
-#, fuzzy
 msgid "RPC Call Mode"
-msgstr "Mode mise à l'échelle"
+msgstr "Mode d'appel RPC"
 
 #: modules/visual_script/visual_script_func_nodes.cpp
 msgid "Subtract %s"
@@ -18448,14 +18181,12 @@ msgid "BitXor %s"
 msgstr "Ou-exclusif par bit %s"
 
 #: modules/visual_script/visual_script_func_nodes.cpp
-#, fuzzy
 msgid "Set Mode"
-msgstr "Mode sélection"
+msgstr "Définir le mode"
 
 #: modules/visual_script/visual_script_func_nodes.cpp
-#, fuzzy
 msgid "Assign Op"
-msgstr "Assigner"
+msgstr "Opérateur d'assignation"
 
 #: modules/visual_script/visual_script_func_nodes.cpp
 #: modules/visual_script/visual_script_nodes.cpp
@@ -18472,9 +18203,8 @@ msgid "Base object is not a Node!"
 msgstr "L'objet de base n'est pas un nœud !"
 
 #: modules/visual_script/visual_script_func_nodes.cpp
-#, fuzzy
 msgid "Path does not lead to Node!"
-msgstr "Le chemin ne mène pas au nœud !"
+msgstr "Le chemin ne mène pas vers un nœud !"
 
 #: modules/visual_script/visual_script_func_nodes.cpp
 msgid "Invalid index property name '%s' in node %s."
@@ -18490,9 +18220,8 @@ msgstr "Composer le tableau"
 
 #: modules/visual_script/visual_script_nodes.cpp scene/resources/material.cpp
 #: scene/resources/visual_shader_nodes.cpp
-#, fuzzy
 msgid "Operator"
-msgstr "Itérateur"
+msgstr "Opérateur"
 
 #: modules/visual_script/visual_script_nodes.cpp
 msgid "Invalid argument of type:"
@@ -18507,9 +18236,8 @@ msgid "a if cond, else b"
 msgstr "a if cond, else b"
 
 #: modules/visual_script/visual_script_nodes.cpp
-#, fuzzy
 msgid "Var Name"
-msgstr "Nom"
+msgstr "Nom de variable"
 
 #: modules/visual_script/visual_script_nodes.cpp
 msgid "VariableGet not found in script:"
@@ -18634,9 +18362,8 @@ msgid "%s sec(s)"
 msgstr "%s seconde(s)"
 
 #: modules/visual_script/visual_script_yield_nodes.cpp scene/main/timer.cpp
-#, fuzzy
 msgid "Wait Time"
-msgstr "Peindre la tuile"
+msgstr "Temps d'attente"
 
 #: modules/visual_script/visual_script_yield_nodes.cpp
 msgid "WaitSignal"
@@ -18651,16 +18378,14 @@ msgid "WaitInstanceSignal"
 msgstr "WaitInstanceSignal"
 
 #: modules/webrtc/webrtc_data_channel.cpp
-#, fuzzy
 msgid "Write Mode"
-msgstr "Mode prioritaire"
+msgstr "Mode écriture"
 
 #: modules/webrtc/webrtc_data_channel.h
 msgid "WebRTC"
 msgstr "WebRTC"
 
 #: modules/webrtc/webrtc_data_channel.h
-#, fuzzy
 msgid "Max Channel In Buffer (KB)"
 msgstr "Maximum de canal dans le tampon (Ko)"
 
@@ -18673,61 +18398,52 @@ msgid "Trusted SSL Certificate"
 msgstr "Certificat SSL Fiable"
 
 #: modules/websocket/websocket_macros.h
-#, fuzzy
 msgid "WebSocket Client"
-msgstr "Profileur réseau"
+msgstr "Client WebSocket"
 
 #: modules/websocket/websocket_macros.h
-#, fuzzy
 msgid "Max In Buffer (KB)"
-msgstr "Taille Maximale (KB)"
+msgstr "Maximum tampon entrant (KB)"
 
 #: modules/websocket/websocket_macros.h
-#, fuzzy
 msgid "Max In Packets"
-msgstr "Maximum par paquet"
+msgstr "Maximum de paquets entrant"
 
 #: modules/websocket/websocket_macros.h
-#, fuzzy
 msgid "Max Out Buffer (KB)"
-msgstr "Taille Maximale (KB)"
+msgstr "Maximum tampon sortant (KB)"
 
 #: modules/websocket/websocket_macros.h
 msgid "Max Out Packets"
-msgstr ""
+msgstr "Maximum de paquets sortant"
 
 #: modules/websocket/websocket_macros.h
-#, fuzzy
 msgid "WebSocket Server"
-msgstr "Profileur réseau"
+msgstr "Server WebSocket"
 
 #: modules/websocket/websocket_server.cpp
 msgid "Bind IP"
-msgstr ""
+msgstr "Lier IP"
 
 #: modules/websocket/websocket_server.cpp
-#, fuzzy
 msgid "Private Key"
-msgstr "Chemin de la clé privée SSH"
+msgstr "Clé privée"
 
 #: modules/websocket/websocket_server.cpp platform/javascript/export/export.cpp
 msgid "SSL Certificate"
 msgstr "Certificat SSL"
 
 #: modules/websocket/websocket_server.cpp
-#, fuzzy
 msgid "CA Chain"
-msgstr "Effacer la chaîne IK"
+msgstr "Chaîne d’autorité de certificat (CA)"
 
 #: modules/websocket/websocket_server.cpp
-#, fuzzy
 msgid "Handshake Timeout"
-msgstr "Délai dépassé."
+msgstr "Délai de poignée de main expiré"
 
 #: modules/webxr/webxr_interface.cpp
-#, fuzzy
 msgid "Session Mode"
-msgstr "Mode Région"
+msgstr "Mode de session"
 
 #: modules/webxr/webxr_interface.cpp
 msgid "Required Features"
@@ -18742,18 +18458,17 @@ msgid "Requested Reference Space Types"
 msgstr ""
 
 #: modules/webxr/webxr_interface.cpp
+#, fuzzy
 msgid "Reference Space Type"
-msgstr ""
+msgstr "Type de référentiel spatial"
 
 #: modules/webxr/webxr_interface.cpp
-#, fuzzy
 msgid "Visibility State"
-msgstr "Basculer la visibilité"
+msgstr "État de la visibilité"
 
 #: modules/webxr/webxr_interface.cpp
-#, fuzzy
 msgid "Bounds Geometry"
-msgstr "Réessayer"
+msgstr "Géométrie des limites"
 
 #: modules/webxr/webxr_interface.cpp
 #, fuzzy
@@ -18779,14 +18494,13 @@ msgstr ""
 
 #: platform/android/export/export.cpp
 msgid "Force System User"
-msgstr ""
+msgstr "Forcer l'utilisateur système"
 
 #: platform/android/export/export.cpp
 msgid "Shutdown ADB On Exit"
-msgstr ""
+msgstr "Fermer ADB à la sortie"
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid "Launcher Icons"
 msgstr "Icônes du lanceur"
 
@@ -18861,27 +18575,22 @@ msgid "Keystore"
 msgstr "Débogueur"
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid "Debug User"
-msgstr "Débogueur"
+msgstr "Utilisateur de débogage"
 
 #: platform/android/export/export_plugin.cpp platform/uwp/export/export.cpp
-#, fuzzy
 msgid "Debug Password"
-msgstr "Mot de passe"
+msgstr "Mot de passe de débogage"
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid "Release User"
-msgstr "Publication (release)"
+msgstr "Utilisateur de publication (release)"
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid "Release Password"
-msgstr "Mot de passe"
+msgstr "Mot de passe de publication"
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid "One Click Deploy"
 msgstr "Déploiement en un clic"
 
@@ -18894,18 +18603,16 @@ msgid "Code"
 msgstr "Code"
 
 #: platform/android/export/export_plugin.cpp platform/uwp/export/export.cpp
-#, fuzzy
 msgid "Package"
-msgstr "Empaquetage"
+msgstr "Paquetage"
 
 #: platform/android/export/export_plugin.cpp platform/uwp/export/export.cpp
 msgid "Unique Name"
 msgstr "Nom unique"
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid "Signed"
-msgstr "Signaux"
+msgstr "Signé"
 
 #: platform/android/export/export_plugin.cpp
 msgid "Classify As Game"
@@ -18916,9 +18623,8 @@ msgid "Retain Data On Uninstall"
 msgstr "Conserver les données lors de la désinstallation"
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid "Exclude From Recents"
-msgstr "Supprimer des nœuds"
+msgstr "Exclure des récents"
 
 #: platform/android/export/export_plugin.cpp
 msgid "Graphics"
@@ -18937,17 +18643,16 @@ msgid "XR Mode"
 msgstr "Mode XR"
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid "Hand Tracking"
-msgstr "Empaquetage"
+msgstr "Suivi des mains"
 
 #: platform/android/export/export_plugin.cpp
 msgid "Hand Tracking Frequency"
-msgstr ""
+msgstr "Fréquence de suivi des mains"
 
 #: platform/android/export/export_plugin.cpp
 msgid "Passthrough"
-msgstr ""
+msgstr "Relais"
 
 #: platform/android/export/export_plugin.cpp
 msgid "Immersive Mode"
@@ -18974,9 +18679,8 @@ msgid "Support Xlarge"
 msgstr "Support"
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid "User Data Backup"
-msgstr "Interface utilisateur"
+msgstr "Sauvegarde(backup) des données utilisateur"
 
 #: platform/android/export/export_plugin.cpp
 msgid "Allow"
@@ -19209,20 +18913,17 @@ msgstr ""
 
 #: platform/android/export/export_plugin.cpp platform/osx/export/export.cpp
 #: platform/windows/export/export.cpp
-#, fuzzy
 msgid "Code Signing"
-msgstr "Signaux"
+msgstr "Signature du code"
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid ""
 "'apksigner' could not be found. Please check that the command is available "
 "in the Android SDK build-tools directory. The resulting %s is unsigned."
 msgstr ""
-"Impossible de trouver 'apksigner'.\n"
-"Veuillez vérifier que la commande est disponible dans le dossier build-tools "
-"du SDK Android.\n"
-"Le paquet sortant %s est non signé."
+"Impossible de trouver 'apksigner'. Veuillez vérifier que la commande est "
+"disponible dans le dossier build-tools du SDK Android. Le %s resultant n'est "
+"pas signé."
 
 #: platform/android/export/export_plugin.cpp
 msgid "Signing debug %s..."
@@ -19237,9 +18938,8 @@ msgid "Could not find keystore, unable to export."
 msgstr "Impossible de trouver le keystore, impossible d'exporter."
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid "Could not start apksigner executable."
-msgstr "Impossible de démarrer le sous-processus !"
+msgstr "Impossible de le programme apksigner."
 
 #: platform/android/export/export_plugin.cpp
 msgid "'apksigner' returned with error #%d"
@@ -19276,9 +18976,8 @@ msgstr ""
 "*.apk."
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid "Unsupported export format!"
-msgstr "Format d'export non supporté !\n"
+msgstr "Format d'export non supporté !"
 
 #: platform/android/export/export_plugin.cpp
 msgid ""
@@ -19290,28 +18989,24 @@ msgstr ""
 "menu 'Projet'."
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid ""
 "Android build version mismatch: Template installed: %s, Godot version: %s. "
 "Please reinstall Android build template from 'Project' menu."
 msgstr ""
-"La version d'Android ne correspond pas :\n"
-"    Modèle installé : %s\n"
-"    Version Godot : %s\n"
-"Veuillez réinstaller la version d'Android depuis le menu 'Projet'."
+"La version compilée d'Android ne correspond pas : Modèle type installé : %s, "
+"Version de Godot : %s. Veuillez réinstaller le modèle type de compilation "
+"d'Android depuis le menu 'Projet'."
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid ""
 "Unable to overwrite res://android/build/res/*.xml files with project name."
 msgstr ""
 "Impossible d'écraser les fichiers res://android/build/res/*.xml avec le nom "
-"du projet"
+"du projet."
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid "Could not export project files to gradle project."
-msgstr "Impossible d'exporter les fichiers du projet vers le projet gradle\n"
+msgstr "Impossible d'exporter les fichiers du projet vers le projet gradle."
 
 #: platform/android/export/export_plugin.cpp
 msgid "Could not write expansion package file!"
@@ -19322,15 +19017,13 @@ msgid "Building Android Project (gradle)"
 msgstr "Construire le Project Android (gradle)"
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid ""
 "Building of Android project failed, check output for the error. "
 "Alternatively visit docs.godotengine.org for Android build documentation."
 msgstr ""
 "La construction du projet Android a échoué, vérifiez la sortie pour "
-"l'erreur.\n"
-"Sinon, visitez docs.godotengine.org pour la documentation de construction "
-"Android."
+"l'erreur. Sinon, visitez docs.godotengine.org pour la documentation de "
+"construction Android."
 
 #: platform/android/export/export_plugin.cpp
 msgid "Moving output"
@@ -19345,41 +19038,38 @@ msgstr ""
 "du projet gradle pour les journaux."
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid "Package not found: \"%s\"."
-msgstr "Paquet non trouvé : %s"
+msgstr "Paquet non trouvé : \"%s\"."
 
 #: platform/android/export/export_plugin.cpp
 msgid "Creating APK..."
 msgstr "Création de l'APK..."
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid "Could not find template APK to export: \"%s\"."
 msgstr ""
-"Impossible de trouver le modèle de l'APK à exporter :\n"
-"%s"
+"La construction du projet Android a échoué, vérifiez la sortie pour "
+"l'erreur. Sinon, visitez docs.godotengine.org pour la documentation de "
+"construction Android."
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid ""
 "Missing libraries in the export template for the selected architectures: %s. "
 "Please build a template with all required libraries, or uncheck the missing "
 "architectures in the export preset."
 msgstr ""
 "Bibliothèques manquantes dans le modèle d'exportation pour les architectures "
-"sélectionnées : %s.\n"
-"Veuillez construire un modèle avec toutes les bibliothèques requises, ou "
-"désélectionner les architectures manquantes dans le préréglage d'exportation."
+"sélectionnées : %s. Veuillez construire un modèle avec toutes les "
+"bibliothèques requises, ou désélectionner les architectures manquantes dans "
+"le préréglage d'exportation."
 
 #: platform/android/export/export_plugin.cpp
 msgid "Adding files..."
 msgstr "Ajout de fichiers..."
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid "Could not export project files."
-msgstr "Impossible d'exporter les fichiers du projet"
+msgstr "Impossible d'exporter les fichiers du projet."
 
 #: platform/android/export/export_plugin.cpp
 msgid "Aligning APK..."
@@ -19419,7 +19109,7 @@ msgstr "iPad 2048 X 1536"
 
 #: platform/iphone/export/export.cpp
 msgid "Portrait Launch Screens"
-msgstr ""
+msgstr "Écrans de lancement en mode portrait"
 
 #: platform/iphone/export/export.cpp
 msgid "iPhone 640 X 960"
@@ -19451,38 +19141,35 @@ msgstr "iPhone 1242 X 2208"
 
 #: platform/iphone/export/export.cpp
 msgid "App Store Team ID"
-msgstr ""
+msgstr "ID de groupe de l'App Store"
 
 #: platform/iphone/export/export.cpp
 msgid "Provisioning Profile UUID Debug"
-msgstr ""
+msgstr "UUID de provisionnement de profils en débogage"
 
 #: platform/iphone/export/export.cpp
 msgid "Code Sign Identity Debug"
-msgstr ""
+msgstr "Identité de signature de code en débogage"
 
 #: platform/iphone/export/export.cpp
-#, fuzzy
 msgid "Export Method Debug"
-msgstr "Exporter avec debug"
+msgstr "Méthode d'exportation en débogage"
 
 #: platform/iphone/export/export.cpp
 msgid "Provisioning Profile UUID Release"
-msgstr ""
+msgstr "UUID de provisionnement de profils en publication"
 
 #: platform/iphone/export/export.cpp
 msgid "Code Sign Identity Release"
-msgstr ""
+msgstr "Identité de signature de code en publication"
 
 #: platform/iphone/export/export.cpp
-#, fuzzy
 msgid "Export Method Release"
-msgstr "Mode d'exportation :"
+msgstr "Méthode d'exportation en publication"
 
 #: platform/iphone/export/export.cpp
-#, fuzzy
 msgid "Targeted Device Family"
-msgstr "Famille de système cible"
+msgstr "Famille de système ciblée"
 
 #: platform/iphone/export/export.cpp platform/osx/export/export.cpp
 msgid "Info"
@@ -19514,9 +19201,8 @@ msgid "Access Wi-Fi"
 msgstr "Accès Wi-Fi"
 
 #: platform/iphone/export/export.cpp
-#, fuzzy
 msgid "Push Notifications"
-msgstr "Rotation aléatoire :"
+msgstr "Notifications Push"
 
 #: platform/iphone/export/export.cpp
 msgid "User Data"
@@ -19524,33 +19210,29 @@ msgstr "Données Utilisateur"
 
 #: platform/iphone/export/export.cpp
 msgid "Accessible From Files App"
-msgstr ""
+msgstr "Accessible depuis l'application Files"
 
 #: platform/iphone/export/export.cpp
 msgid "Accessible From iTunes Sharing"
-msgstr ""
+msgstr "Accessible depuis le partage iTunes"
 
 #: platform/iphone/export/export.cpp platform/osx/export/export.cpp
 msgid "Privacy"
 msgstr "Confidentialité"
 
 #: platform/iphone/export/export.cpp platform/osx/export/export.cpp
-#, fuzzy
 msgid "Camera Usage Description"
-msgstr "Description"
+msgstr "Description d'utilisation de la caméra"
 
 #: platform/iphone/export/export.cpp platform/osx/export/export.cpp
-#, fuzzy
 msgid "Microphone Usage Description"
-msgstr "Description des propriétés"
+msgstr "Description d'utilisation du microphone"
 
 #: platform/iphone/export/export.cpp
-#, fuzzy
 msgid "Photolibrary Usage Description"
-msgstr "Description des propriétés"
+msgstr "Description d'utilisation de la bibliothèque d'image"
 
 #: platform/iphone/export/export.cpp
-#, fuzzy
 msgid "iPhone 120 X 120"
 msgstr "iPhone 120 X 120"
 
@@ -19568,19 +19250,19 @@ msgstr "iPad 152 X 152"
 
 #: platform/iphone/export/export.cpp
 msgid "iPad 167 X 167"
-msgstr ""
+msgstr "iPad 167 X 167"
 
 #: platform/iphone/export/export.cpp
 msgid "App Store 1024 X 1024"
-msgstr ""
+msgstr "App Store 1024 X 1024"
 
 #: platform/iphone/export/export.cpp
 msgid "Spotlight 40 X 40"
-msgstr ""
+msgstr "Projecteur 40 X 40"
 
 #: platform/iphone/export/export.cpp
 msgid "Spotlight 80 X 80"
-msgstr ""
+msgstr "Projecteur 80 X 80"
 
 #: platform/iphone/export/export.cpp
 msgid "Storyboard"
@@ -19591,19 +19273,16 @@ msgid "Use Launch Screen Storyboard"
 msgstr ""
 
 #: platform/iphone/export/export.cpp
-#, fuzzy
 msgid "Image Scale Mode"
-msgstr "Mode mise à l'échelle"
+msgstr "Mode de mise à l'échelle d'image"
 
 #: platform/iphone/export/export.cpp
-#, fuzzy
 msgid "Custom Image @2x"
-msgstr "Nœud Personnalisé"
+msgstr "Image personnalisée @2x"
 
 #: platform/iphone/export/export.cpp
-#, fuzzy
 msgid "Custom Image @3x"
-msgstr "Nœud Personnalisé"
+msgstr "Image personnalisée @3x"
 
 #: platform/iphone/export/export.cpp
 msgid "Use Custom BG Color"
@@ -19704,7 +19383,7 @@ msgstr ""
 
 #: platform/javascript/export/export.cpp
 msgid "Canvas Resize Policy"
-msgstr ""
+msgstr "Politique de redimensionnement du canevas"
 
 #: platform/javascript/export/export.cpp
 msgid "Focus Canvas On Start"
@@ -19803,18 +19482,16 @@ msgid "Already signed!"
 msgstr "Déjà signé !"
 
 #: platform/osx/export/codesign.cpp
-#, fuzzy
 msgid "Failed to process nested resources."
-msgstr "Impossible de charger la ressource."
+msgstr "Le traitement des ressources imbriquées a échoué."
 
 #: platform/osx/export/codesign.cpp
 msgid "Failed to create _CodeSignature subfolder."
 msgstr "Échec lors de la création du sous-dossier _CodeSignature."
 
 #: platform/osx/export/codesign.cpp
-#, fuzzy
 msgid "Failed to get CodeResources hash."
-msgstr "Impossible de charger la ressource."
+msgstr "La récupération du hachage de CodeResources a échouée."
 
 #: platform/osx/export/codesign.cpp platform/osx/export/export.cpp
 #, fuzzy
@@ -19826,7 +19503,6 @@ msgid "Invalid executable file."
 msgstr "Fichier exécutable invalide."
 
 #: platform/osx/export/codesign.cpp
-#, fuzzy
 msgid "Can't resize signature load command."
 msgstr "Impossible de redimensionner la commande de chargement des signatures."
 
@@ -19847,75 +19523,65 @@ msgid "App Category"
 msgstr "Catégorie de l'application"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "High Res"
 msgstr "Haute Résolution"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Location Usage Description"
-msgstr "Description"
+msgstr "Description d'utilisation de la géolocalisation"
 
 #: platform/osx/export/export.cpp
 msgid "Address Book Usage Description"
-msgstr ""
+msgstr "Description d'utilisation du carnet d'adresse"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Calendar Usage Description"
-msgstr "Description"
+msgstr "Description d'utilisation du calendrier"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Photos Library Usage Description"
-msgstr "Description des propriétés"
+msgstr "Description d'utilisation de la bibliothèque photo"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Desktop Folder Usage Description"
-msgstr "Descriptions des méthodes"
+msgstr "Description d'utilisation du dossier Bureau"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Documents Folder Usage Description"
-msgstr "Descriptions des méthodes"
+msgstr "Description d'utilisation du dossier Documents"
 
 #: platform/osx/export/export.cpp
 msgid "Downloads Folder Usage Description"
-msgstr ""
+msgstr "Description d'utilisation du dossier Téléchargements"
 
 #: platform/osx/export/export.cpp
 msgid "Network Volumes Usage Description"
-msgstr ""
+msgstr "Description d'utilisation des disques réseau"
 
 #: platform/osx/export/export.cpp
 msgid "Removable Volumes Usage Description"
-msgstr ""
+msgstr "Description d'utilisation des disques amovibles"
 
 #: platform/osx/export/export.cpp platform/windows/export/export.cpp
-#, fuzzy
 msgid "Codesign"
-msgstr "NÅ“ud"
+msgstr "Signature du code"
 
 #: platform/osx/export/export.cpp platform/uwp/export/export.cpp
 #: platform/windows/export/export.cpp
-#, fuzzy
 msgid "Identity"
-msgstr "Indenter vers la gauche"
+msgstr "Identité"
 
 #: platform/osx/export/export.cpp platform/windows/export/export.cpp
-#, fuzzy
 msgid "Timestamp"
-msgstr "Temps"
+msgstr "Horodatage"
 
 #: platform/osx/export/export.cpp
 msgid "Hardened Runtime"
 msgstr ""
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Replace Existing Signature"
-msgstr "Remplacer dans les fichiers"
+msgstr "Remplacer la signature existante"
 
 #: platform/osx/export/export.cpp
 #, fuzzy
@@ -19923,9 +19589,8 @@ msgid "Entitlements"
 msgstr "Gadgets"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Custom File"
-msgstr "Nœud Personnalisé"
+msgstr "Fichier personnalisé"
 
 #: platform/osx/export/export.cpp
 msgid "Allow JIT Code Execution"
@@ -19960,43 +19625,37 @@ msgid "Photos Library"
 msgstr "Bibliothèque de photos"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Apple Events"
-msgstr "Ajouter évènement"
+msgstr "Événements Apple"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Debugging"
 msgstr "Débogage"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "App Sandbox"
 msgstr "Bac à sable de l'application"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Network Server"
-msgstr "Profileur réseau"
+msgstr "Serveur réseau"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Network Client"
-msgstr "Profileur réseau"
+msgstr "Client réseau"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Device USB"
-msgstr "Périphérique"
+msgstr "Périphérique USB"
 
 #: platform/osx/export/export.cpp
 msgid "Device Bluetooth"
-msgstr ""
+msgstr "Périphérique Bluetooth"
 
 #: platform/osx/export/export.cpp
 #, fuzzy
 msgid "Files Downloads"
-msgstr "Télécharger"
+msgstr "Téléchargement de fichiers"
 
 #: platform/osx/export/export.cpp
 #, fuzzy
@@ -20014,9 +19673,8 @@ msgid "Files Movies"
 msgstr "Filtrer les tuiles"
 
 #: platform/osx/export/export.cpp platform/windows/export/export.cpp
-#, fuzzy
 msgid "Custom Options"
-msgstr "Options de bus"
+msgstr "Options personnalisées"
 
 #: platform/osx/export/export.cpp
 #, fuzzy
@@ -20025,31 +19683,27 @@ msgstr "Localisation"
 
 #: platform/osx/export/export.cpp
 msgid "Apple ID Name"
-msgstr ""
+msgstr "Nom Apple ID"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Apple ID Password"
-msgstr "Mot de passe"
+msgstr "Mot de passe Apple ID"
 
 #: platform/osx/export/export.cpp
 msgid "Apple Team ID"
 msgstr "Apple Team ID"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Could not open icon file \"%s\"."
-msgstr "Impossible d'exporter les fichiers du projet"
+msgstr "Impossible d'ouvrir le fichier d'icône \"%s\"."
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Could not start xcrun executable."
-msgstr "Impossible de démarrer le sous-processus !"
+msgstr "Impossible de démarrer le sous-processus."
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Notarization failed."
-msgstr "Localisation"
+msgstr "Notarisation échouée."
 
 #: platform/osx/export/export.cpp
 msgid "Notarization request UUID: \"%s\""
@@ -20082,6 +19736,8 @@ msgstr ""
 #: platform/osx/export/export.cpp
 msgid "Timestamping is not compatible with ad-hoc signature, and was disabled!"
 msgstr ""
+"L'horodatage n'est pas compatible avec la signature ad-hoc et a été "
+"désactivé !"
 
 #: platform/osx/export/export.cpp
 msgid ""
@@ -20094,7 +19750,7 @@ msgstr ""
 
 #: platform/osx/export/export.cpp
 msgid "Built-in CodeSign require regex module."
-msgstr ""
+msgstr "CodeSign intégré nécessite le module regex."
 
 #: platform/osx/export/export.cpp
 msgid ""
@@ -20109,9 +19765,8 @@ msgid "No identity found."
 msgstr "Aucune identité trouvée."
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Cannot sign file %s."
-msgstr "Erreur lors de l'enregistrement du fichier : %s"
+msgstr "Impossible de signer le fichier %s."
 
 #: platform/osx/export/export.cpp
 msgid "Relative symlinks are not supported, exported \"%s\" might be broken!"
@@ -20120,17 +19775,14 @@ msgstr ""
 "cassé !"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "DMG Creation"
-msgstr "Directions"
+msgstr "Création du DMG"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Could not start hdiutil executable."
-msgstr "Impossible de démarrer le sous-processus !"
+msgstr "Impossible de démarrer le programme hdiutil."
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "`hdiutil create` failed - file exists."
 msgstr "`hdiutil create` a échoué - le fichier existe."
 
@@ -20139,19 +19791,16 @@ msgid "`hdiutil create` failed."
 msgstr "`hdiutil create` a échoué."
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Creating app bundle"
-msgstr "Création de l'aperçu"
+msgstr "Création du paquet d'application"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Could not find template app to export: \"%s\"."
-msgstr "Impossible de trouver le modèle de l'application à exporter :"
+msgstr "Impossible de trouver le modèle de l'application à exporter : \"%s\"."
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Invalid export format."
-msgstr "Modèle d'exportation non valide :"
+msgstr "Format d'export invalide."
 
 #: platform/osx/export/export.cpp
 msgid ""
@@ -20178,10 +19827,13 @@ msgid ""
 "Ad-hoc signed applications require the 'Disable Library Validation' "
 "entitlement to load dynamic libraries."
 msgstr ""
+"La signature d'applications ad-hoc nécessite la permission \"Désactiver la "
+"validation de bibliothèque\" pour pouvoir charger dynamiquement les "
+"bibliothèques."
 
 #: platform/osx/export/export.cpp
 msgid "Code signing bundle"
-msgstr ""
+msgstr "Paquet de signature du code"
 
 #: platform/osx/export/export.cpp
 msgid "Making DMG"
@@ -20189,7 +19841,7 @@ msgstr "Création du DMG"
 
 #: platform/osx/export/export.cpp
 msgid "Code signing DMG"
-msgstr ""
+msgstr "DMG de signature du code"
 
 #: platform/osx/export/export.cpp
 msgid "Making ZIP"
@@ -20208,14 +19860,12 @@ msgid "Sending archive for notarization"
 msgstr "Envoi de l'archive pour la certification"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "ZIP Creation"
-msgstr "Projet"
+msgstr "Création ZIP"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Could not open file to read from path \"%s\"."
-msgstr "Impossible d'exporter les fichiers du projet vers le projet gradle\n"
+msgstr "Impossible d'ouvrir le fichier à lire au chemin \"%s\"."
 
 #: platform/osx/export/export.cpp
 msgid "Invalid bundle identifier:"
@@ -20245,14 +19895,13 @@ msgstr ""
 "supporté."
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Notarization: Code signing is required for notarization."
-msgstr "Certification : signature du code requise."
+msgstr ""
+"Notarisation : La signature du code est nécessaire pour la notarisation."
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Notarization: Hardened runtime is required for notarization."
-msgstr "Certification : exécution renforcée requise."
+msgstr "Notarisation : exécution renforcée nécessaire pour la notarisation."
 
 #: platform/osx/export/export.cpp
 #, fuzzy
@@ -20294,6 +19943,8 @@ msgstr ""
 msgid ""
 "Timestamping is not compatible with ad-hoc signature, and will be disabled!"
 msgstr ""
+"L'horodatage n'est pas compatible avec la signature ad-hoc et a été "
+"désactivé !"
 
 #: platform/osx/export/export.cpp
 msgid ""
@@ -20356,17 +20007,15 @@ msgstr "macOS"
 
 #: platform/osx/export/export.cpp
 msgid "Force Builtin Codesign"
-msgstr ""
+msgstr "Forcer CodeSign intégré"
 
 #: platform/uwp/export/export.cpp
-#, fuzzy
 msgid "Architecture"
-msgstr "Ajouter une entrée architecture"
+msgstr "Architecture"
 
 #: platform/uwp/export/export.cpp
-#, fuzzy
 msgid "Display Name"
-msgstr "Tout afficher"
+msgstr "Afficher le nom"
 
 #: platform/uwp/export/export.cpp
 msgid "Short Name"
@@ -20374,36 +20023,31 @@ msgstr "Nom Abrégé"
 
 #: platform/uwp/export/export.cpp
 msgid "Publisher"
-msgstr ""
+msgstr "Publicateur"
 
 #: platform/uwp/export/export.cpp
-#, fuzzy
 msgid "Publisher Display Name"
-msgstr "Nom d'affichage d'éditeur du paquet invalide."
+msgstr "Nom d'affichage de l'éditeur du paquet"
 
 #: platform/uwp/export/export.cpp
-#, fuzzy
 msgid "Product GUID"
-msgstr "GUID produit invalide."
+msgstr "GUID du produit"
 
 #: platform/uwp/export/export.cpp
-#, fuzzy
 msgid "Publisher GUID"
-msgstr "Effacé Guides"
+msgstr "GUID du publicateur"
 
 #: platform/uwp/export/export.cpp
-#, fuzzy
 msgid "Signing"
-msgstr "Signaux"
+msgstr "Signature"
 
 #: platform/uwp/export/export.cpp
 msgid "Certificate"
 msgstr "Certificat"
 
 #: platform/uwp/export/export.cpp
-#, fuzzy
 msgid "Algorithm"
-msgstr "Débogueur"
+msgstr "Algorithme"
 
 #: platform/uwp/export/export.cpp
 msgid "Major"
@@ -20414,23 +20058,20 @@ msgid "Minor"
 msgstr "Mineur"
 
 #: platform/uwp/export/export.cpp
-#, fuzzy
 msgid "Build"
-msgstr "Mode Règle"
+msgstr "Build"
 
 #: platform/uwp/export/export.cpp
-#, fuzzy
 msgid "Revision"
-msgstr "Expression"
+msgstr "Révision"
 
 #: platform/uwp/export/export.cpp
 msgid "Landscape"
 msgstr "Paysage"
 
 #: platform/uwp/export/export.cpp
-#, fuzzy
 msgid "Portrait"
-msgstr "Retourner les Portals"
+msgstr "Portrait"
 
 #: platform/uwp/export/export.cpp
 msgid "Landscape Flipped"
@@ -20441,9 +20082,8 @@ msgid "Portrait Flipped"
 msgstr "Portrait Inversé"
 
 #: platform/uwp/export/export.cpp
-#, fuzzy
 msgid "Store Logo"
-msgstr "Mode mise à l'échelle"
+msgstr "Logo du magasin"
 
 #: platform/uwp/export/export.cpp
 msgid "Square 44 X 44 Logo"
@@ -20466,14 +20106,12 @@ msgid "Wide 310 X 150 Logo"
 msgstr "Logo 310 X 150 Large"
 
 #: platform/uwp/export/export.cpp
-#, fuzzy
 msgid "Splash Screen"
-msgstr "Appels de dessin :"
+msgstr "Écran de chargement"
 
 #: platform/uwp/export/export.cpp
-#, fuzzy
 msgid "Tiles"
-msgstr "Fichier"
+msgstr "Tuiles"
 
 #: platform/uwp/export/export.cpp
 msgid "Show Name On Square 150 X 150"
@@ -20557,32 +20195,28 @@ msgid "UWP"
 msgstr "UWP"
 
 #: platform/uwp/export/export.cpp platform/windows/export/export.cpp
-#, fuzzy
 msgid "Signtool"
-msgstr "Signaux"
+msgstr "Signtool"
 
 #: platform/uwp/export/export.cpp
 msgid "Debug Certificate"
 msgstr "Certificat de Débogage"
 
 #: platform/uwp/export/export.cpp
-#, fuzzy
 msgid "Debug Algorithm"
-msgstr "Débogueur"
+msgstr "Algorithme de débogage"
 
 #: platform/windows/export/export.cpp
-#, fuzzy
 msgid "Failed to rename temporary file \"%s\"."
-msgstr "Impossible de supprimer le fichier temporaire :"
+msgstr "Impossible de renommer le fichier temporaire \"%s\"."
 
 #: platform/windows/export/export.cpp
-#, fuzzy
 msgid "Identity Type"
 msgstr "Type d'identité"
 
 #: platform/windows/export/export.cpp
 msgid "Timestamp Server URL"
-msgstr ""
+msgstr "URL du serveur d'horodatage"
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20590,14 +20224,12 @@ msgid "Digest Algorithm"
 msgstr "Débogueur"
 
 #: platform/windows/export/export.cpp
-#, fuzzy
 msgid "Modify Resources"
-msgstr "Copier la ressource"
+msgstr "Modifier les ressources"
 
 #: platform/windows/export/export.cpp
-#, fuzzy
 msgid "File Version"
-msgstr "Version"
+msgstr "Version de fichier"
 
 #: platform/windows/export/export.cpp
 msgid "Product Version"
@@ -20612,18 +20244,16 @@ msgid "Product Name"
 msgstr "Nom du produit"
 
 #: platform/windows/export/export.cpp
-#, fuzzy
 msgid "File Description"
-msgstr "Description"
+msgstr "Description de fichier"
 
 #: platform/windows/export/export.cpp
 msgid "Trademarks"
 msgstr "Marques Déposées"
 
 #: platform/windows/export/export.cpp
-#, fuzzy
 msgid "Resources Modification"
-msgstr "Rotation aléatoire :"
+msgstr "Modification de ressources"
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20638,61 +20268,52 @@ msgstr "Impossible de trouver le keystore, impossible d'exporter."
 #: platform/windows/export/export.cpp
 #, fuzzy
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 "L'outil « rcedit » doit être configuré dans les préférences de l'éditeur "
 "(Exporter > Windows > Rcedit) for modifier l'icône ou les informations de "
 "l'application."
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
-"rcedit n'a pas réussi à modifier l'exécutable :\n"
-"%s"
+msgid "rcedit failed to modify executable: %s."
+msgstr "rcedit n'a pas réussi à modifier l'exécutable : %s."
 
 #: platform/windows/export/export.cpp
-#, fuzzy
 msgid "Could not find signtool executable at \"%s\"."
-msgstr "Impossible de trouver le keystore, impossible d'exporter."
+msgstr "Impossible de trouver l’exécutable signtool à \"%s\"."
 
 #: platform/windows/export/export.cpp
-#, fuzzy
 msgid "Could not find osslsigncode executable at \"%s\"."
-msgstr "Impossible de trouver le keystore, impossible d'exporter."
+msgstr "Impossible de trouver l’exécutable osslsigncode à \"%s\"."
 
 #: platform/windows/export/export.cpp
-#, fuzzy
 msgid "Invalid identity type."
-msgstr "Identifiant invalide :"
+msgstr "Type d'identité invalide."
 
 #: platform/windows/export/export.cpp
-#, fuzzy
 msgid "Invalid timestamp server."
-msgstr "Nom invalide."
+msgstr "Server d'horodatage invalide."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 "L'outil « rcedit » doit être configuré dans les préférences de l'éditeur "
 "(Exporter > Windows > Rcedit) for modifier l'icône ou les informations de "
 "l'application."
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+msgid "Signtool failed to sign executable: %s."
+msgstr "La signature de l’exécutable avec Signtool a échoué : %s."
 
 #: platform/windows/export/export.cpp
-#, fuzzy
 msgid "Failed to remove temporary file \"%s\"."
-msgstr "Impossible de supprimer le fichier temporaire :"
+msgstr "Impossible de supprimer le fichier temporaire \"%s\"."
 
 #: platform/windows/export/export.cpp
 msgid ""
@@ -20717,7 +20338,7 @@ msgstr "Version du produit invalide :"
 
 #: platform/windows/export/export.cpp
 msgid "Windows executables cannot be >= 4 GiB."
-msgstr ""
+msgstr "Les exécutables Windows ne peuvent pas peser >= 4Gio."
 
 #: platform/windows/export/export.cpp platform/x11/export/export.cpp
 #, fuzzy
@@ -20726,38 +20347,37 @@ msgstr "Fichier exécutable invalide."
 
 #: platform/windows/export/export.cpp platform/x11/export/export.cpp
 msgid "Executable file header corrupted."
-msgstr ""
+msgstr "Entête du fichier exécutable corrompue."
 
 #: platform/windows/export/export.cpp platform/x11/export/export.cpp
 msgid "Executable \"pck\" section not found."
-msgstr ""
+msgstr "Section \"pck\" de l’exécutable non trouvée."
 
 #: platform/windows/export/export.cpp
-#, fuzzy
 msgid "Windows"
-msgstr "Nouvelle Fenêtre"
+msgstr "Windows"
 
 #: platform/windows/export/export.cpp
 msgid "Rcedit"
-msgstr ""
+msgstr "Rcedit"
 
 #: platform/windows/export/export.cpp
 msgid "Osslsigncode"
-msgstr ""
+msgstr "Osslsigncode"
 
 #: platform/windows/export/export.cpp
 msgid "Wine"
-msgstr ""
+msgstr "Wine"
 
 #: platform/x11/export/export.cpp
 msgid "32-bit executables cannot have embedded data >= 4 GiB."
 msgstr ""
+"les exécutables 32 bits ne peuvent pas contenir de données pesant >= 4Gio."
 
 #: scene/2d/animated_sprite.cpp scene/3d/sprite_3d.cpp
 #: scene/resources/texture.cpp
-#, fuzzy
 msgid "Frames"
-msgstr "Image %"
+msgstr "Trames"
 
 #: scene/2d/animated_sprite.cpp
 msgid ""
@@ -20769,71 +20389,61 @@ msgstr ""
 
 #: scene/2d/animated_sprite.cpp scene/2d/cpu_particles_2d.cpp
 #: scene/2d/particles_2d.cpp scene/3d/cpu_particles.cpp scene/3d/particles.cpp
-#, fuzzy
 msgid "Speed Scale"
-msgstr "Mode mise à l'échelle"
+msgstr "Échelle de vitesse"
 
 #: scene/2d/animated_sprite.cpp scene/2d/audio_stream_player_2d.cpp
 #: scene/3d/audio_stream_player_3d.cpp scene/3d/sprite_3d.cpp
 #: scene/audio/audio_stream_player.cpp
-#, fuzzy
 msgid "Playing"
-msgstr "Jouer"
+msgstr "En train de jouer"
 
 #: scene/2d/animated_sprite.cpp scene/2d/sprite.cpp scene/3d/sprite_3d.cpp
-#, fuzzy
 msgid "Centered"
-msgstr "Centre"
+msgstr "Centré"
 
 #: scene/2d/animated_sprite.cpp scene/2d/sprite.cpp scene/3d/sprite_3d.cpp
 #: scene/gui/texture_button.cpp scene/gui/texture_rect.cpp
 msgid "Flip H"
-msgstr ""
+msgstr "Miroir H"
 
 #: scene/2d/animated_sprite.cpp scene/2d/sprite.cpp scene/3d/sprite_3d.cpp
 #: scene/gui/texture_button.cpp scene/gui/texture_rect.cpp
 msgid "Flip V"
-msgstr ""
+msgstr "Miroir V"
 
 #: scene/2d/area_2d.cpp scene/3d/area.cpp
-#, fuzzy
 msgid "Monitoring"
-msgstr "Moniteur"
+msgstr "Observation"
 
 #: scene/2d/area_2d.cpp scene/3d/area.cpp
-#, fuzzy
 msgid "Monitorable"
-msgstr "Moniteur"
+msgstr "Observable"
 
 #: scene/2d/area_2d.cpp scene/3d/area.cpp
-#, fuzzy
 msgid "Physics Overrides"
-msgstr "Redéfinition"
+msgstr "Redéfinitions de physique"
 
 #: scene/2d/area_2d.cpp scene/3d/area.cpp
-#, fuzzy
 msgid "Space Override"
-msgstr "Redéfinition"
+msgstr "Redéfinition d'espace"
 
 #: scene/2d/area_2d.cpp scene/3d/area.cpp
-#, fuzzy
 msgid "Gravity Point"
-msgstr "Générer des points"
+msgstr "Gravité ponctuelle"
 
 #: scene/2d/area_2d.cpp scene/3d/area.cpp
-#, fuzzy
 msgid "Gravity Distance Scale"
-msgstr "WaitInstanceSignal"
+msgstr "Échelle de distance de gravité"
 
 #: scene/2d/area_2d.cpp scene/3d/area.cpp
-#, fuzzy
 msgid "Gravity Vec"
-msgstr "Aperçu par défaut"
+msgstr "Vecteur de gravité"
 
 #: scene/2d/area_2d.cpp scene/2d/cpu_particles_2d.cpp scene/3d/area.cpp
 #: scene/3d/cpu_particles.cpp scene/resources/particles_material.cpp
 msgid "Gravity"
-msgstr ""
+msgstr "Gravité"
 
 #: scene/2d/area_2d.cpp scene/3d/area.cpp
 #, fuzzy
@@ -20845,38 +20455,33 @@ msgid "Angular Damp"
 msgstr ""
 
 #: scene/2d/area_2d.cpp scene/3d/area.cpp
-#, fuzzy
 msgid "Audio Bus"
-msgstr "Ajouter un bus audio"
+msgstr "Bus audio"
 
 #: scene/2d/area_2d.cpp scene/3d/area.cpp
-#, fuzzy
 msgid "Override"
 msgstr "Redéfinition"
 
 #: scene/2d/audio_stream_player_2d.cpp scene/audio/audio_stream_player.cpp
 #: scene/gui/video_player.cpp servers/audio/effects/audio_effect_amplify.cpp
-#, fuzzy
 msgid "Volume dB"
-msgstr "Volume"
+msgstr "Volume (dB)"
 
 #: scene/2d/audio_stream_player_2d.cpp scene/3d/audio_stream_player_3d.cpp
 #: scene/audio/audio_stream_player.cpp
 #: servers/audio/effects/audio_effect_pitch_shift.cpp
-#, fuzzy
 msgid "Pitch Scale"
-msgstr "Mode mise à l'échelle"
+msgstr "Échelle de pitch"
 
 #: scene/2d/audio_stream_player_2d.cpp scene/3d/audio_stream_player_3d.cpp
 #: scene/audio/audio_stream_player.cpp scene/gui/video_player.cpp
-#, fuzzy
 msgid "Autoplay"
-msgstr "Activer/désactiver la lecture automatique"
+msgstr "Lecture automatique"
 
 #: scene/2d/audio_stream_player_2d.cpp scene/3d/audio_stream_player_3d.cpp
 #: scene/audio/audio_stream_player.cpp
 msgid "Stream Paused"
-msgstr ""
+msgstr "Diffusion en pause"
 
 #: scene/2d/audio_stream_player_2d.cpp scene/3d/audio_stream_player_3d.cpp
 #: scene/3d/light.cpp scene/3d/reflection_probe.cpp
@@ -20886,34 +20491,29 @@ msgid "Max Distance"
 msgstr "Distance Maximale"
 
 #: scene/2d/audio_stream_player_2d.cpp scene/3d/light.cpp
-#, fuzzy
 msgid "Attenuation"
-msgstr "Animation"
+msgstr "Atténuation"
 
 #: scene/2d/audio_stream_player_2d.cpp scene/3d/audio_stream_player_3d.cpp
 #: scene/audio/audio_stream_player.cpp scene/gui/video_player.cpp
-#, fuzzy
 msgid "Bus"
-msgstr "Ajouter un bus"
+msgstr "Bus"
 
 #: scene/2d/audio_stream_player_2d.cpp scene/3d/audio_stream_player_3d.cpp
 msgid "Area Mask"
-msgstr ""
+msgstr "Masque de zone"
 
 #: scene/2d/back_buffer_copy.cpp
-#, fuzzy
 msgid "Copy Mode"
-msgstr "Copier les nœuds"
+msgstr "Mode copie"
 
 #: scene/2d/camera_2d.cpp
-#, fuzzy
 msgid "Anchor Mode"
-msgstr "Mode Icône"
+msgstr "Mode ancre"
 
 #: scene/2d/camera_2d.cpp
-#, fuzzy
 msgid "Rotating"
-msgstr "Pas de la rotation :"
+msgstr "En rotation"
 
 #: scene/2d/camera_2d.cpp scene/2d/listener_2d.cpp scene/3d/camera.cpp
 #: scene/3d/listener.cpp scene/animation/animation_blend_tree.cpp
@@ -20921,14 +20521,12 @@ msgid "Current"
 msgstr "Actuel"
 
 #: scene/2d/camera_2d.cpp scene/gui/graph_edit.cpp
-#, fuzzy
 msgid "Zoom"
 msgstr "Zoomer"
 
 #: scene/2d/camera_2d.cpp scene/main/canvas_layer.cpp
-#, fuzzy
 msgid "Custom Viewport"
-msgstr "1 vue"
+msgstr "Vue personnalisée"
 
 #: scene/2d/camera_2d.cpp scene/3d/camera.cpp scene/3d/interpolated_camera.cpp
 #: scene/animation/animation_player.cpp scene/animation/animation_tree.cpp
@@ -20939,26 +20537,23 @@ msgstr "Mode déplacement"
 
 #: scene/2d/camera_2d.cpp
 msgid "Limit"
-msgstr ""
+msgstr "Limite"
 
 #: scene/2d/camera_2d.cpp scene/gui/control.cpp scene/gui/nine_patch_rect.cpp
 #: scene/resources/style_box.cpp scene/resources/texture.cpp
-#, fuzzy
 msgid "Left"
-msgstr "En haut à gauche"
+msgstr "Gauche"
 
 #: scene/2d/camera_2d.cpp scene/gui/control.cpp scene/gui/nine_patch_rect.cpp
 #: scene/resources/style_box.cpp scene/resources/texture.cpp
-#, fuzzy
 msgid "Right"
-msgstr "Lumière"
+msgstr "Droite"
 
 #: scene/2d/camera_2d.cpp scene/gui/control.cpp scene/gui/nine_patch_rect.cpp
 #: scene/resources/dynamic_font.cpp scene/resources/style_box.cpp
 #: scene/resources/texture.cpp
-#, fuzzy
 msgid "Bottom"
-msgstr "En bas à gauche"
+msgstr "Bas"
 
 #: scene/2d/camera_2d.cpp
 #, fuzzy
@@ -20966,9 +20561,8 @@ msgid "Smoothed"
 msgstr "Progression douce"
 
 #: scene/2d/camera_2d.cpp
-#, fuzzy
 msgid "Draw Margin"
-msgstr "Définir la marge"
+msgstr "Afficher les marges"
 
 #: scene/2d/camera_2d.cpp
 #, fuzzy
@@ -20987,27 +20581,24 @@ msgstr "Progression douce"
 
 #: scene/2d/camera_2d.cpp
 msgid "H"
-msgstr ""
+msgstr "H"
 
 #: scene/2d/camera_2d.cpp
-#, fuzzy
 msgid "V"
-msgstr "UV"
+msgstr "V"
 
 #: scene/2d/camera_2d.cpp
 #, fuzzy
 msgid "Drag Margin"
-msgstr "Définir la marge"
+msgstr "Tirer la marge"
 
 #: scene/2d/camera_2d.cpp
-#, fuzzy
 msgid "Draw Screen"
-msgstr "Appels de dessin :"
+msgstr "Afficher l'écran"
 
 #: scene/2d/camera_2d.cpp
-#, fuzzy
 msgid "Draw Limits"
-msgstr "Appels de dessin :"
+msgstr "Afficher les limites"
 
 #: scene/2d/camera_2d.cpp
 #, fuzzy
@@ -21016,43 +20607,37 @@ msgstr "Définir la marge"
 
 #: scene/2d/canvas_item.cpp scene/resources/environment.cpp
 #: scene/resources/material.cpp
-#, fuzzy
 msgid "Blend Mode"
-msgstr "NÅ“ud Blend2"
+msgstr "Mode mélange"
 
 #: scene/2d/canvas_item.cpp
-#, fuzzy
 msgid "Light Mode"
-msgstr "Étendu à Droite"
+msgstr "Mode de lumière"
 
 #: scene/2d/canvas_item.cpp
-#, fuzzy
 msgid "Particles Animation"
-msgstr "Particules"
+msgstr "Animation de particules"
 
 #: scene/2d/canvas_item.cpp
 msgid "Particles Anim H Frames"
-msgstr ""
+msgstr "Trames d'animation H de particules"
 
 #: scene/2d/canvas_item.cpp
 msgid "Particles Anim V Frames"
-msgstr ""
+msgstr "Trames d'animation V de particules"
 
 #: scene/2d/canvas_item.cpp
-#, fuzzy
 msgid "Particles Anim Loop"
-msgstr "Particules"
+msgstr "Boucle d'animation de particules"
 
 #: scene/2d/canvas_item.cpp scene/3d/spatial.cpp
-#, fuzzy
 msgid "Visibility"
-msgstr "Basculer la visibilité"
+msgstr "Visibilité"
 
 #: scene/2d/canvas_item.cpp scene/3d/spatial.cpp scene/gui/progress_bar.cpp
 #: scene/gui/rich_text_effect.cpp scene/main/canvas_layer.cpp
-#, fuzzy
 msgid "Visible"
-msgstr "Basculer la visibilité"
+msgstr "Visible"
 
 #: scene/2d/canvas_item.cpp
 #, fuzzy
@@ -21061,22 +20646,20 @@ msgstr "Peupler"
 
 #: scene/2d/canvas_item.cpp
 msgid "Show Behind Parent"
-msgstr ""
+msgstr "Montrer derrière le parent"
 
 #: scene/2d/canvas_item.cpp
-#, fuzzy
 msgid "Show On Top"
-msgstr "Afficher l'origine"
+msgstr "Montrer au dessus"
 
 #: scene/2d/canvas_item.cpp scene/2d/light_occluder_2d.cpp
 #: scene/2d/tile_map.cpp
-#, fuzzy
 msgid "Light Mask"
-msgstr "LightMap Bake"
+msgstr "Masque de lumières"
 
 #: scene/2d/canvas_item.cpp
 msgid "Use Parent Material"
-msgstr ""
+msgstr "Utiliser le matériau du parent"
 
 #: scene/2d/canvas_modulate.cpp
 msgid ""
@@ -21098,9 +20681,8 @@ msgstr ""
 "qu'enfant pour définir sa forme."
 
 #: scene/2d/collision_object_2d.cpp
-#, fuzzy
 msgid "Pickable"
-msgstr "Sélectionner une tuile"
+msgstr "Déplaçable"
 
 #: scene/2d/collision_polygon_2d.cpp
 msgid ""
@@ -21132,29 +20714,27 @@ msgstr ""
 msgid ""
 "The One Way Collision property will be ignored when the parent is an Area2D."
 msgstr ""
+"La propriété Collision à sens unique est ignorée lorsque le parent est un "
+"Area2D."
 
 #: scene/2d/collision_polygon_2d.cpp
-#, fuzzy
 msgid "Build Mode"
-msgstr "Mode Règle"
+msgstr "Mode construction"
 
 #: scene/2d/collision_polygon_2d.cpp scene/2d/collision_shape_2d.cpp
 #: scene/3d/collision_polygon.cpp scene/3d/collision_shape.cpp
 #: scene/animation/animation_node_state_machine.cpp scene/gui/base_button.cpp
 #: scene/gui/texture_button.cpp scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Disabled"
-msgstr "Item désactivé"
+msgstr "Désactivé"
 
 #: scene/2d/collision_polygon_2d.cpp scene/2d/collision_shape_2d.cpp
-#, fuzzy
 msgid "One Way Collision"
-msgstr "Créer le polygone de collision"
+msgstr "Collision à sens unique"
 
 #: scene/2d/collision_polygon_2d.cpp scene/2d/collision_shape_2d.cpp
-#, fuzzy
 msgid "One Way Collision Margin"
-msgstr "Créer le polygone de collision"
+msgstr "marge de collision à sens unique"
 
 #: scene/2d/collision_shape_2d.cpp
 msgid ""
@@ -21193,31 +20773,28 @@ msgstr ""
 
 #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp
 #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp
-#, fuzzy
 msgid "Emitting"
-msgstr "Paramètres :"
+msgstr "Émet"
 
 #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp
 #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp
 msgid "Lifetime"
-msgstr ""
+msgstr "Durée de vie"
 
 #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp
 #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp scene/main/timer.cpp
-#, fuzzy
 msgid "One Shot"
-msgstr "NÅ“ud one-shot"
+msgstr "Jouer une fois"
 
 #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp
 #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp
-#, fuzzy
 msgid "Preprocess"
-msgstr "Post-traitement"
+msgstr "Pré-traitement"
 
 #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp
 #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp
 msgid "Explosiveness"
-msgstr ""
+msgstr "Explovisité"
 
 #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp
 #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp
@@ -21227,13 +20804,12 @@ msgstr "Aléatoire"
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
 msgid "Lifetime Randomness"
-msgstr ""
+msgstr "Aléatoire de durée de vie"
 
 #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp
 #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp
-#, fuzzy
 msgid "Fixed FPS"
-msgstr "Voir Images par secondes"
+msgstr "FPS fixes"
 
 #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp
 #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp
@@ -21247,20 +20823,18 @@ msgstr ""
 
 #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp
 #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp
-#, fuzzy
 msgid "Local Coords"
-msgstr "Projets locaux"
+msgstr "Coordonnées locales"
 
 #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp
 #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp
 msgid "Draw Order"
-msgstr ""
+msgstr "Ordre de rendu"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Emission Shape"
-msgstr "Masque d'émission"
+msgstr "Forme d'émission"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
@@ -21273,63 +20847,55 @@ msgid "Rect Extents"
 msgstr "Gadgets"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
-#, fuzzy
 msgid "Normals"
-msgstr "Format"
+msgstr "Normales"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Align Y"
-msgstr "Assigner"
+msgstr "Aligner axe Y"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Direction"
-msgstr "Directions"
+msgstr "Direction"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
 #: servers/audio/effects/audio_effect_reverb.cpp
 msgid "Spread"
-msgstr ""
+msgstr "Propagation"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Initial Velocity"
-msgstr "Initialiser"
+msgstr "Vélocité initiale"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Velocity Random"
-msgstr "Vue de l'orbite vers la droite"
+msgstr "Vélocité aléatoire"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp servers/physics_2d_server.cpp
 #: servers/physics_server.cpp
 msgid "Angular Velocity"
-msgstr ""
+msgstr "Vélocité angulaire"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Velocity Curve"
-msgstr "Vue de l'orbite vers la droite"
+msgstr "Courbe de vélocité"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Orbit Velocity"
-msgstr "Vue de l'orbite vers la droite"
+msgstr "Vélocité d'orbite"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Linear Accel"
-msgstr "Linéaire"
+msgstr "Accélération linéaire"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
@@ -21339,23 +20905,22 @@ msgstr "Accel"
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
 msgid "Accel Random"
-msgstr ""
+msgstr "Accélération aléatoire"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Accel Curve"
-msgstr "Scinder la courbe"
+msgstr "Courbe d’accélération"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
 msgid "Radial Accel"
-msgstr ""
+msgstr "Accélération radiale"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
 msgid "Tangential Accel"
-msgstr ""
+msgstr "Accélération tangentielle"
 
 #: scene/2d/cpu_particles_2d.cpp scene/2d/joints_2d.cpp
 #: scene/3d/cpu_particles.cpp scene/3d/physics_body.cpp
@@ -21363,39 +20928,37 @@ msgstr ""
 #: scene/resources/particles_material.cpp
 #: servers/audio/effects/audio_effect_reverb.cpp
 msgid "Damping"
-msgstr ""
+msgstr "Amortissement"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
 msgid "Damping Random"
-msgstr ""
+msgstr "Amortissement aléatoire"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Damping Curve"
-msgstr "Scinder la courbe"
+msgstr "Courbe d'amortissement"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp scene/3d/light.cpp
 #: scene/resources/particles_material.cpp
 msgid "Angle"
-msgstr ""
+msgstr "Angle"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
 msgid "Angle Random"
-msgstr ""
+msgstr "Angle aléatoire"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Angle Curve"
-msgstr "Fermer la courbe"
+msgstr "Courbe d'angle"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #, fuzzy
 msgid "Scale Amount"
-msgstr "Quantité :"
+msgstr "Valeur d'échelle"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 msgid "Scale Amount Random"
@@ -21408,14 +20971,13 @@ msgstr "Agrandir/Rétrécir à partir du curseur"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Color Ramp"
-msgstr "Couleurs"
+msgstr "Dégradé de couleurs"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
 msgid "Color Initial Ramp"
-msgstr ""
+msgstr "Dégradé de couleurs initial"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
@@ -21434,33 +20996,28 @@ msgstr "Variation aléatoire"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Variation Curve"
-msgstr "Séparation :"
+msgstr "Courbe de variation"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Speed Random"
-msgstr "Mode mise à l'échelle"
+msgstr "Vitesse aléatoire"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Speed Curve"
-msgstr "Scinder la courbe"
+msgstr "Courbe de vitesse"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Offset Random"
-msgstr "Décalage :"
+msgstr "Décalage de l'aléatoire"
 
 #: scene/2d/cpu_particles_2d.cpp scene/3d/cpu_particles.cpp
 #: scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Offset Curve"
-msgstr "Fermer la courbe"
+msgstr "Courbe de décalage"
 
 #: scene/2d/joints_2d.cpp
 msgid "Node A and Node B must be PhysicsBody2Ds"
@@ -21483,25 +21040,22 @@ msgid "Node A and Node B must be different PhysicsBody2Ds"
 msgstr "Node A et Node B doivent être des PhysicsBody2D différents"
 
 #: scene/2d/joints_2d.cpp scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Node A"
-msgstr "NÅ“ud"
+msgstr "NÅ“ud A"
 
 #: scene/2d/joints_2d.cpp scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Node B"
-msgstr "NÅ“ud"
+msgstr "NÅ“ud B"
 
 #: scene/2d/joints_2d.cpp scene/3d/baked_lightmap.cpp scene/3d/gi_probe.cpp
 #: scene/3d/light.cpp scene/3d/physics_body.cpp scene/3d/physics_joint.cpp
 #: scene/resources/environment.cpp
 msgid "Bias"
-msgstr ""
+msgstr "Biais"
 
 #: scene/2d/joints_2d.cpp
-#, fuzzy
 msgid "Disable Collision"
-msgstr "Bouton désactivé"
+msgstr "Désactiver les collisions"
 
 #: scene/2d/joints_2d.cpp scene/3d/physics_body.cpp scene/3d/physics_joint.cpp
 msgid "Softness"
@@ -21513,9 +21067,8 @@ msgid "Length"
 msgstr "Longueur"
 
 #: scene/2d/joints_2d.cpp
-#, fuzzy
 msgid "Initial Offset"
-msgstr "Initialiser"
+msgstr "Décalage initial"
 
 #: scene/2d/joints_2d.cpp scene/3d/vehicle_body.cpp
 msgid "Rest Length"
@@ -21534,14 +21087,12 @@ msgstr ""
 "« Texture »."
 
 #: scene/2d/light_2d.cpp scene/3d/light.cpp scene/gui/reference_rect.cpp
-#, fuzzy
 msgid "Editor Only"
-msgstr "Éditeur"
+msgstr "Éditeur seulement"
 
 #: scene/2d/light_2d.cpp
-#, fuzzy
 msgid "Texture Scale"
-msgstr "RegionDeTexture"
+msgstr "Échelle de texture"
 
 #: scene/2d/light_2d.cpp scene/3d/baked_lightmap.cpp scene/3d/gi_probe.cpp
 #: scene/3d/light.cpp scene/resources/environment.cpp
@@ -21558,33 +21109,28 @@ msgid "Z Max"
 msgstr "Maximum Z"
 
 #: scene/2d/light_2d.cpp
-#, fuzzy
 msgid "Layer Min"
-msgstr "Changer la taille d'une caméra"
+msgstr "Calque min"
 
 #: scene/2d/light_2d.cpp
-#, fuzzy
 msgid "Layer Max"
-msgstr "Calque"
+msgstr "Calque max"
 
 #: scene/2d/light_2d.cpp
 msgid "Item Cull Mask"
 msgstr ""
 
 #: scene/2d/light_2d.cpp scene/3d/light.cpp scene/resources/style_box.cpp
-#, fuzzy
 msgid "Shadow"
-msgstr "Ombrage"
+msgstr "Ombre"
 
 #: scene/2d/light_2d.cpp
-#, fuzzy
 msgid "Buffer Size"
-msgstr "Vue de derrière"
+msgstr "Taille de tampon"
 
 #: scene/2d/light_2d.cpp
-#, fuzzy
 msgid "Gradient Length"
-msgstr "Dégradé édité"
+msgstr "Longueur du dégradé"
 
 #: scene/2d/light_2d.cpp
 #, fuzzy
@@ -21592,9 +21138,8 @@ msgid "Filter Smooth"
 msgstr "Filtrer les méthodes"
 
 #: scene/2d/light_occluder_2d.cpp
-#, fuzzy
 msgid "Closed"
-msgstr "Fermer"
+msgstr "Fermé"
 
 #: scene/2d/light_occluder_2d.cpp scene/resources/material.cpp
 #, fuzzy
@@ -21615,38 +21160,32 @@ msgstr ""
 "polygone."
 
 #: scene/2d/line_2d.cpp
-#, fuzzy
 msgid "Width Curve"
-msgstr "Scinder la courbe"
+msgstr "Courbe de largeur"
 
 #: scene/2d/line_2d.cpp scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Default Color"
-msgstr "Défaut"
+msgstr "Couleur par défaut"
 
 #: scene/2d/line_2d.cpp scene/resources/texture.cpp
 msgid "Fill"
 msgstr "Remplissage"
 
 #: scene/2d/line_2d.cpp scene/resources/texture.cpp
-#, fuzzy
 msgid "Gradient"
-msgstr "Dégradé édité"
+msgstr "Dégradé"
 
 #: scene/2d/line_2d.cpp
-#, fuzzy
 msgid "Texture Mode"
-msgstr "RegionDeTexture"
+msgstr "Mode de texture"
 
 #: scene/2d/line_2d.cpp
-#, fuzzy
 msgid "Capping"
-msgstr "Recouvrement"
+msgstr "Capuchonnement"
 
 #: scene/2d/line_2d.cpp
-#, fuzzy
 msgid "Joint Mode"
-msgstr "Mode Icône"
+msgstr "Mode de jointure"
 
 #: scene/2d/line_2d.cpp
 #, fuzzy
@@ -21654,14 +21193,12 @@ msgid "Begin Cap Mode"
 msgstr "Mode Région"
 
 #: scene/2d/line_2d.cpp
-#, fuzzy
 msgid "End Cap Mode"
-msgstr "Mode d'aimantation :"
+msgstr "Mode du capuchon de fin"
 
 #: scene/2d/line_2d.cpp scene/2d/polygon_2d.cpp scene/resources/style_box.cpp
-#, fuzzy
 msgid "Border"
-msgstr "dans l'ordre :"
+msgstr "Bordure"
 
 #: scene/2d/line_2d.cpp
 msgid "Sharp Limit"
@@ -21673,9 +21210,8 @@ msgstr "Précision de l’arrondissement"
 
 #: scene/2d/line_2d.cpp scene/2d/polygon_2d.cpp
 #: scene/resources/dynamic_font.cpp
-#, fuzzy
 msgid "Antialiased"
-msgstr "Initialiser"
+msgstr "Anticrénelé"
 
 #: scene/2d/multimesh_instance_2d.cpp scene/3d/multimesh_instance.cpp
 #, fuzzy
@@ -21689,9 +21225,8 @@ msgid "Cell Size"
 msgstr "Taille des Cellules"
 
 #: scene/2d/navigation_2d.cpp scene/3d/navigation.cpp
-#, fuzzy
 msgid "Edge Connection Margin"
-msgstr "Modifier la connexion :"
+msgstr "Marge de connexion des bords"
 
 #: scene/2d/navigation_2d.cpp
 msgid ""
@@ -21706,31 +21241,27 @@ msgstr ""
 #: scene/2d/navigation_agent_2d.cpp scene/3d/navigation_agent.cpp
 #, fuzzy
 msgid "Pathfinding"
-msgstr "Liaison"
+msgstr "Pathfinding"
 
 #: scene/2d/navigation_agent_2d.cpp scene/3d/navigation_agent.cpp
-#, fuzzy
 msgid "Path Desired Distance"
-msgstr "Choisissez distance :"
+msgstr "Distance souhaitée du chemin"
 
 #: scene/2d/navigation_agent_2d.cpp scene/3d/navigation_agent.cpp
 msgid "Target Desired Distance"
 msgstr "Distance Désirée de la Cible"
 
 #: scene/2d/navigation_agent_2d.cpp scene/3d/navigation_agent.cpp
-#, fuzzy
 msgid "Path Max Distance"
-msgstr "Choisissez distance :"
+msgstr "Distance maximale du chemin"
 
 #: scene/2d/navigation_agent_2d.cpp scene/3d/navigation_agent.cpp
-#, fuzzy
 msgid "Avoidance"
-msgstr "Options avancées"
+msgstr "Évitement"
 
 #: scene/2d/navigation_agent_2d.cpp scene/3d/navigation_agent.cpp
-#, fuzzy
 msgid "Avoidance Enabled"
-msgstr "Activer"
+msgstr "Évitement activé"
 
 #: scene/2d/navigation_agent_2d.cpp scene/3d/navigation_agent.cpp
 msgid "Neighbor Dist"
@@ -21750,10 +21281,11 @@ msgid "Max Speed"
 msgstr "Vitesse Max"
 
 #: scene/2d/navigation_agent_2d.cpp
-#, fuzzy
 msgid ""
 "The NavigationAgent2D can be used only under a Node2D inheriting parent node."
-msgstr "Le NavigationAgent2D ne peut être utilisé que sous un nœud Node2D."
+msgstr ""
+"Le NavigationAgent2D ne peut être utilisé que sous un nœud dont le parent "
+"hérite de Node2D."
 
 #: scene/2d/navigation_obstacle_2d.cpp scene/3d/navigation_obstacle.cpp
 msgid "Estimate Radius"
@@ -21778,17 +21310,15 @@ msgstr ""
 
 #: scene/2d/navigation_polygon.cpp
 msgid "Navpoly"
-msgstr ""
+msgstr "Polygone de navigation"
 
 #: scene/2d/navigation_polygon.cpp scene/3d/navigation_mesh_instance.cpp
-#, fuzzy
 msgid "Enter Cost"
-msgstr "Centrée en bas"
+msgstr "Coût d’entrée"
 
 #: scene/2d/navigation_polygon.cpp scene/3d/navigation_mesh_instance.cpp
-#, fuzzy
 msgid "Travel Cost"
-msgstr "Se déplacer"
+msgstr "Coût de déplacement"
 
 #: scene/2d/node_2d.cpp scene/2d/polygon_2d.cpp scene/3d/spatial.cpp
 #: scene/main/canvas_layer.cpp
@@ -21854,9 +21384,8 @@ msgid "Motion"
 msgstr "Déplacement"
 
 #: scene/2d/parallax_layer.cpp
-#, fuzzy
 msgid "Mirroring"
-msgstr "Miroir"
+msgstr "Effet de miroir"
 
 #: scene/2d/particles_2d.cpp
 msgid ""
@@ -21919,9 +21448,8 @@ msgstr ""
 "d'un nœud de type Path2D."
 
 #: scene/2d/path_2d.cpp scene/3d/path.cpp
-#, fuzzy
 msgid "Unit Offset"
-msgstr "Décalage de la grille :"
+msgstr "Décalage d'unité"
 
 #: scene/2d/path_2d.cpp scene/3d/camera.cpp scene/3d/path.cpp
 msgid "H Offset"
@@ -21937,7 +21465,7 @@ msgstr "Interpolation Cubique"
 
 #: scene/2d/path_2d.cpp
 msgid "Lookahead"
-msgstr ""
+msgstr "Anticipation"
 
 #: scene/2d/physics_body_2d.cpp scene/3d/visual_instance.cpp
 msgid "Layers"
@@ -21997,14 +21525,12 @@ msgid "Gravity Scale"
 msgstr "Échelle de la Gravité"
 
 #: scene/2d/physics_body_2d.cpp scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Custom Integrator"
-msgstr "Nœud Personnalisé"
+msgstr "Intégrateur personnalisé"
 
 #: scene/2d/physics_body_2d.cpp scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Continuous CD"
-msgstr "Continu"
+msgstr "Détection de collision continue"
 
 #: scene/2d/physics_body_2d.cpp scene/3d/physics_body.cpp
 msgid "Contacts Reported"
@@ -22037,7 +21563,7 @@ msgstr "Forces Appliquées"
 
 #: scene/2d/physics_body_2d.cpp
 msgid "Torque"
-msgstr ""
+msgstr "Torque"
 
 #: scene/2d/physics_body_2d.cpp scene/3d/physics_body.cpp
 msgid "Safe Margin"
@@ -22048,9 +21574,8 @@ msgid "Sync To Physics"
 msgstr "Synchroniser Avec La Physique"
 
 #: scene/2d/physics_body_2d.cpp scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Moving Platform"
-msgstr "Déplacement du résultat"
+msgstr "Plateforme mobile"
 
 #: scene/2d/physics_body_2d.cpp scene/3d/physics_body.cpp
 msgid "Apply Velocity On Leave"
@@ -22064,9 +21589,8 @@ msgid "Normal"
 msgstr "Normale"
 
 #: scene/2d/physics_body_2d.cpp scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Remainder"
-msgstr "Moteur de rendu :"
+msgstr "Reste"
 
 #: scene/2d/physics_body_2d.cpp scene/3d/physics_body.cpp
 msgid "Local Shape"
@@ -22127,9 +21651,8 @@ msgid "Exclude Parent"
 msgstr "Exclure Le Parent"
 
 #: scene/2d/ray_cast_2d.cpp scene/3d/ray_cast.cpp
-#, fuzzy
 msgid "Cast To"
-msgstr "Créer un nœud Shader"
+msgstr "Lancer vers"
 
 #: scene/2d/ray_cast_2d.cpp scene/3d/ray_cast.cpp
 msgid "Collide With"
@@ -22137,7 +21660,7 @@ msgstr "Collisionne Avec"
 
 #: scene/2d/ray_cast_2d.cpp scene/3d/camera.cpp scene/3d/ray_cast.cpp
 msgid "Areas"
-msgstr ""
+msgstr "Zones"
 
 #: scene/2d/ray_cast_2d.cpp scene/3d/camera.cpp scene/3d/ray_cast.cpp
 msgid "Bodies"
@@ -22150,24 +21673,20 @@ msgstr ""
 "fonctionner."
 
 #: scene/2d/remote_transform_2d.cpp scene/3d/remote_transform.cpp
-#, fuzzy
 msgid "Remote Path"
-msgstr "Supprimer un point"
+msgstr "Chemin distant"
 
 #: scene/2d/remote_transform_2d.cpp scene/3d/remote_transform.cpp
-#, fuzzy
 msgid "Use Global Coordinates"
-msgstr "Coordonnée suivante"
+msgstr "Utiliser les coordonnées globales"
 
 #: scene/2d/skeleton_2d.cpp scene/3d/skeleton.cpp
-#, fuzzy
 msgid "Rest"
-msgstr "Redémarrer"
+msgstr "Repos"
 
 #: scene/2d/skeleton_2d.cpp
-#, fuzzy
 msgid "Default Length"
-msgstr "Thème par défaut"
+msgstr "Longueur par défaut"
 
 #: scene/2d/skeleton_2d.cpp
 msgid "This Bone2D chain should end at a Skeleton2D node."
@@ -22188,16 +21707,15 @@ msgstr ""
 
 #: scene/2d/sprite.cpp scene/3d/sprite_3d.cpp
 msgid "Hframes"
-msgstr ""
+msgstr "Trames H"
 
 #: scene/2d/sprite.cpp scene/3d/sprite_3d.cpp
 msgid "Vframes"
-msgstr ""
+msgstr "Trames V"
 
 #: scene/2d/sprite.cpp scene/3d/sprite_3d.cpp
-#, fuzzy
 msgid "Frame Coords"
-msgstr "Image %"
+msgstr "Coordonnées de trame"
 
 #: scene/2d/sprite.cpp scene/resources/texture.cpp
 #, fuzzy
@@ -22215,14 +21733,12 @@ msgstr ""
 "etc."
 
 #: scene/2d/tile_map.cpp
-#, fuzzy
 msgid "Tile Set"
-msgstr "TileSet"
+msgstr "Palette de tuiles"
 
 #: scene/2d/tile_map.cpp
-#, fuzzy
 msgid "Quadrant Size"
-msgstr "Changer la taille d'une caméra"
+msgstr "Taille de quadrant"
 
 #: scene/2d/tile_map.cpp
 #, fuzzy
@@ -22230,19 +21746,16 @@ msgid "Custom Transform"
 msgstr "Transformation"
 
 #: scene/2d/tile_map.cpp
-#, fuzzy
 msgid "Half Offset"
-msgstr "Initialiser"
+msgstr "Décalage de moitié"
 
 #: scene/2d/tile_map.cpp
-#, fuzzy
 msgid "Tile Origin"
-msgstr "Afficher l'origine"
+msgstr "Origine de la tuile"
 
 #: scene/2d/tile_map.cpp
-#, fuzzy
 msgid "Y Sort"
-msgstr "Trier"
+msgstr "Trier par Y"
 
 #: scene/2d/tile_map.cpp
 msgid "Show Collision"
@@ -22293,23 +21806,20 @@ msgstr ""
 "nœud racine de la scène éditée."
 
 #: scene/2d/visibility_notifier_2d.cpp scene/3d/visibility_notifier.cpp
-#, fuzzy
 msgid "Pause Animations"
-msgstr "Coller l'animation"
+msgstr "Mettre les animations en pause"
 
 #: scene/2d/visibility_notifier_2d.cpp scene/3d/visibility_notifier.cpp
 msgid "Freeze Bodies"
 msgstr "Geler les corps"
 
 #: scene/2d/visibility_notifier_2d.cpp
-#, fuzzy
 msgid "Pause Particles"
-msgstr "Particules"
+msgstr "Mettre les particules en pause"
 
 #: scene/2d/visibility_notifier_2d.cpp
-#, fuzzy
 msgid "Pause Animated Sprites"
-msgstr "Coller l'animation"
+msgstr "Mettre les Sprites animés en pause"
 
 #: scene/2d/visibility_notifier_2d.cpp
 msgid "Process Parent"
@@ -22337,7 +21847,7 @@ msgstr "ID Du Contrôleur"
 
 #: scene/3d/arvr_nodes.cpp servers/arvr/arvr_positional_tracker.cpp
 msgid "Rumble"
-msgstr ""
+msgstr "Vibration"
 
 #: scene/3d/arvr_nodes.cpp
 msgid "ARVRController must have an ARVROrigin node as its parent."
@@ -22377,43 +21887,40 @@ msgid "World Scale"
 msgstr "Échelle du Monde"
 
 #: scene/3d/audio_stream_player_3d.cpp
-#, fuzzy
 msgid "Attenuation Model"
-msgstr "NÅ“ud d'animation"
+msgstr "Modèle d’atténuation"
 
 #: scene/3d/audio_stream_player_3d.cpp
 msgid "Unit dB"
-msgstr ""
+msgstr "Unité (dB)"
 
 #: scene/3d/audio_stream_player_3d.cpp
 msgid "Unit Size"
-msgstr ""
+msgstr "Taille d’unité"
 
 #: scene/3d/audio_stream_player_3d.cpp
 msgid "Max dB"
-msgstr ""
+msgstr "Max (dB)"
 
 #: scene/3d/audio_stream_player_3d.cpp
 msgid "Out Of Range Mode"
 msgstr ""
 
 #: scene/3d/audio_stream_player_3d.cpp
-#, fuzzy
 msgid "Emission Angle"
-msgstr "Couleurs d'émission"
+msgstr "Angle d’émission"
 
 #: scene/3d/audio_stream_player_3d.cpp
 msgid "Degrees"
 msgstr "Degrés"
 
 #: scene/3d/audio_stream_player_3d.cpp
-#, fuzzy
 msgid "Filter Attenuation dB"
-msgstr "Animation"
+msgstr "Filtre d’atténuation (dB)"
 
 #: scene/3d/audio_stream_player_3d.cpp
 msgid "Attenuation Filter"
-msgstr ""
+msgstr "Filtre d’atténuation"
 
 #: scene/3d/audio_stream_player_3d.cpp
 #: servers/audio/effects/audio_effect_chorus.cpp
@@ -22423,14 +21930,12 @@ msgstr ""
 
 #: scene/3d/audio_stream_player_3d.cpp
 #: servers/audio/effects/audio_effect_filter.cpp
-#, fuzzy
 msgid "dB"
-msgstr "o"
+msgstr "dB"
 
 #: scene/3d/audio_stream_player_3d.cpp
-#, fuzzy
 msgid "Doppler"
-msgstr "Activer l'effet Doppler"
+msgstr "Doppler"
 
 #: scene/3d/audio_stream_player_3d.cpp
 #, fuzzy
@@ -22440,7 +21945,7 @@ msgstr "Empaquetage"
 #: scene/3d/baked_lightmap.cpp scene/3d/gi_probe.cpp
 #: scene/3d/reflection_probe.cpp
 msgid "Interior"
-msgstr ""
+msgstr "Intérieur"
 
 #: scene/3d/baked_lightmap.cpp
 msgid "Finding meshes and lights"
@@ -22475,69 +21980,59 @@ msgstr "Gadgets"
 
 #: scene/3d/baked_lightmap.cpp
 msgid "Tweaks"
-msgstr ""
+msgstr "Ajustements"
 
 #: scene/3d/baked_lightmap.cpp
 msgid "Bounces"
-msgstr ""
+msgstr "Rebonds"
 
 #: scene/3d/baked_lightmap.cpp
 msgid "Bounce Indirect Energy"
-msgstr ""
+msgstr "Énergie indirecte de rebond"
 
 #: scene/3d/baked_lightmap.cpp
-#, fuzzy
 msgid "Use Denoiser"
-msgstr "Filtre :"
+msgstr "Utiliser un filtre anti-bruit"
 
 #: scene/3d/baked_lightmap.cpp scene/resources/texture.cpp
 msgid "Use HDR"
-msgstr ""
+msgstr "Utiliser HDR"
 
 #: scene/3d/baked_lightmap.cpp
-#, fuzzy
 msgid "Use Color"
-msgstr "Couleurs"
+msgstr "Utiliser la couleur"
 
 #: scene/3d/baked_lightmap.cpp
-#, fuzzy
 msgid "Default Texels Per Unit"
-msgstr "Thème par défaut"
+msgstr "Texels par unité par défaut"
 
 #: scene/3d/baked_lightmap.cpp scene/resources/texture.cpp
-#, fuzzy
 msgid "Atlas"
-msgstr "Nouvel Atlas"
+msgstr "Atlas"
 
 #: scene/3d/baked_lightmap.cpp
-#, fuzzy
 msgid "Generate"
-msgstr "Général"
+msgstr "Générer"
 
 #: scene/3d/baked_lightmap.cpp
-#, fuzzy
 msgid "Max Size"
-msgstr "Taille :"
+msgstr "Taille maximale"
 
 #: scene/3d/baked_lightmap.cpp
-#, fuzzy
 msgid "Custom Sky"
-msgstr "Nœud Personnalisé"
+msgstr "Ciel personnalisé"
 
 #: scene/3d/baked_lightmap.cpp
-#, fuzzy
 msgid "Custom Sky Rotation Degrees"
-msgstr "Rotation de %s degrés."
+msgstr "Degrés de rotation du ciel personnalisé"
 
 #: scene/3d/baked_lightmap.cpp scene/3d/ray_cast.cpp
-#, fuzzy
 msgid "Custom Color"
-msgstr "Nœud Personnalisé"
+msgstr "Couleur personnalisée"
 
 #: scene/3d/baked_lightmap.cpp
-#, fuzzy
 msgid "Custom Energy"
-msgstr "Déplacer effet de transport"
+msgstr "Énergie personnalisée"
 
 #: scene/3d/baked_lightmap.cpp
 #, fuzzy
@@ -22545,27 +22040,24 @@ msgid "Min Light"
 msgstr "Indenter vers la droite"
 
 #: scene/3d/baked_lightmap.cpp scene/3d/gi_probe.cpp
-#, fuzzy
 msgid "Propagation"
-msgstr "Navigation"
+msgstr "Propagation"
 
 #: scene/3d/baked_lightmap.cpp
 msgid "Image Path"
-msgstr ""
+msgstr "Chemin de l'image"
 
 #: scene/3d/baked_lightmap.cpp
-#, fuzzy
 msgid "Light Data"
-msgstr "Avec données"
+msgstr "Données de lumière"
 
 #: scene/3d/bone_attachment.cpp scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Bone Name"
-msgstr "Nom de nœud :"
+msgstr "Nom de l'os"
 
 #: scene/3d/camera.cpp
 msgid "Keep Aspect"
-msgstr ""
+msgstr "Garder l'aspect"
 
 #: scene/3d/camera.cpp scene/3d/light.cpp scene/3d/reflection_probe.cpp
 msgid "Cull Mask"
@@ -22577,36 +22069,32 @@ msgid "Doppler Tracking"
 msgstr "Piste de propriété"
 
 #: scene/3d/camera.cpp
-#, fuzzy
 msgid "Projection"
-msgstr "Projet"
+msgstr "Projection"
 
 #: scene/3d/camera.cpp
 msgid "FOV"
-msgstr ""
+msgstr "Champ de vision"
 
 #: scene/3d/camera.cpp
-#, fuzzy
 msgid "Frustum Offset"
-msgstr "Décalage de la grille :"
+msgstr "Décalage du Tronc"
 
 #: scene/3d/camera.cpp
-#, fuzzy
 msgid "Near"
-msgstr "Au plus proche"
+msgstr "Plan proche"
 
 #: scene/3d/camera.cpp
 msgid "Far"
-msgstr ""
+msgstr "Plan éloigné"
 
 #: scene/3d/camera.cpp scene/3d/collision_polygon.cpp scene/3d/spring_arm.cpp
 #: scene/gui/control.cpp scene/resources/default_theme/default_theme.cpp
 #: scene/resources/shape.cpp scene/resources/style_box.cpp
 #: scene/resources/texture.cpp servers/physics_2d_server.cpp
 #: servers/physics_server.cpp
-#, fuzzy
 msgid "Margin"
-msgstr "Définir la marge"
+msgstr "Marge"
 
 #: scene/3d/camera.cpp
 #, fuzzy
@@ -22696,48 +22184,40 @@ msgid "Box Extents"
 msgstr "Gadgets"
 
 #: scene/3d/cpu_particles.cpp scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Ring Radius"
-msgstr "Masque d'émission"
+msgstr "Rayon de l'anneau"
 
 #: scene/3d/cpu_particles.cpp scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Ring Inner Radius"
-msgstr "Changer le rayon intérieur de la tour"
+msgstr "Rayon intérieur de l'anneau"
 
 #: scene/3d/cpu_particles.cpp scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Ring Height"
-msgstr "Rotation vers la droite"
+msgstr "Hauteur de l'anneau"
 
 #: scene/3d/cpu_particles.cpp scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Ring Axis"
-msgstr "Avertissements"
+msgstr "Axe de l'anneau"
 
 #: scene/3d/cpu_particles.cpp scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Rotate Y"
-msgstr "Rotation"
+msgstr "Rotation Y"
 
 #: scene/3d/cpu_particles.cpp scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Disable Z"
-msgstr "Item désactivé"
+msgstr "Désactiver axe Z"
 
 #: scene/3d/cpu_particles.cpp scene/resources/particles_material.cpp
 msgid "Flatness"
-msgstr ""
+msgstr "Platitude"
 
 #: scene/3d/cull_instance.cpp servers/visual_server.cpp
-#, fuzzy
 msgid "Portals"
-msgstr "Retourner les Portals"
+msgstr "Portails"
 
 #: scene/3d/cull_instance.cpp
-#, fuzzy
 msgid "Portal Mode"
-msgstr "Mode prioritaire"
+msgstr "Mode portail"
 
 #: scene/3d/cull_instance.cpp
 msgid "Include In Bound"
@@ -22748,9 +22228,8 @@ msgid "Allow Merging"
 msgstr ""
 
 #: scene/3d/cull_instance.cpp
-#, fuzzy
 msgid "Autoplace Priority"
-msgstr "Activer la priorité"
+msgstr "Priorité d’auto-placement"
 
 #: scene/3d/gi_probe.cpp
 msgid "Plotting Meshes"
@@ -22781,114 +22260,98 @@ msgstr ""
 
 #: scene/3d/gi_probe.cpp
 msgid "Subdiv"
-msgstr ""
+msgstr "Subdivision"
 
 #: scene/3d/gi_probe.cpp
-#, fuzzy
 msgid "Dynamic Range"
-msgstr "Bibliothèque dynamique"
+msgstr "Plage dynamique"
 
 #: scene/3d/gi_probe.cpp scene/3d/light.cpp
 msgid "Normal Bias"
-msgstr ""
+msgstr "Biais normal"
 
 #: scene/3d/label_3d.cpp scene/3d/sprite_3d.cpp
 #: scene/resources/primitive_meshes.cpp
-#, fuzzy
 msgid "Pixel Size"
-msgstr "Aimanter au pixel"
+msgstr "Taille de pixel"
 
 #: scene/3d/label_3d.cpp scene/3d/sprite_3d.cpp
 msgid "Billboard"
-msgstr "Billboard"
+msgstr "Panneau(Billboard)"
 
 #: scene/3d/label_3d.cpp scene/3d/sprite_3d.cpp
-#, fuzzy
 msgid "Shaded"
-msgstr "Ombrage"
+msgstr "Ombré"
 
 #: scene/3d/label_3d.cpp scene/3d/sprite_3d.cpp
 msgid "Double Sided"
-msgstr ""
+msgstr "Double face"
 
 #: scene/3d/label_3d.cpp scene/3d/sprite_3d.cpp scene/resources/material.cpp
 msgid "No Depth Test"
-msgstr ""
+msgstr "Pas de test de profondeur"
 
 #: scene/3d/label_3d.cpp scene/3d/sprite_3d.cpp scene/resources/material.cpp
-#, fuzzy
 msgid "Fixed Size"
-msgstr "Vue de devant"
+msgstr "Taille fixe"
 
 #: scene/3d/label_3d.cpp scene/3d/sprite_3d.cpp
 msgid "Alpha Cut"
-msgstr ""
+msgstr "Coupe alpha"
 
 #: scene/3d/label_3d.cpp scene/resources/material.cpp
 msgid "Alpha Scissor Threshold"
-msgstr ""
+msgstr "Seuil des ciseaux d'alpha"
 
 #: scene/3d/label_3d.cpp scene/3d/sprite_3d.cpp scene/resources/material.cpp
-#, fuzzy
 msgid "Render Priority"
-msgstr "Activer la priorité"
+msgstr "Priorité de rendu"
 
 #: scene/3d/label_3d.cpp
-#, fuzzy
 msgid "Outline Render Priority"
-msgstr "Activer la priorité"
+msgstr "Priorité de rendu du contour"
 
 #: scene/3d/label_3d.cpp
-#, fuzzy
 msgid "Outline Modulate"
-msgstr "Forcer la modulation blanche"
+msgstr "Moduler le contour"
 
 #: scene/3d/label_3d.cpp scene/resources/default_theme/default_theme.cpp
 #: scene/resources/dynamic_font.cpp scene/resources/primitive_meshes.cpp
-#, fuzzy
 msgid "Font"
-msgstr "Polices"
+msgstr "Police"
 
 #: scene/3d/label_3d.cpp scene/resources/primitive_meshes.cpp
-#, fuzzy
 msgid "Horizontal Alignment"
-msgstr "Horizontal Activé"
+msgstr "Alignement horizontal"
 
 #: scene/3d/label_3d.cpp
-#, fuzzy
 msgid "Vertical Alignment"
-msgstr "Filtrer les signaux"
+msgstr "Alignement vertical"
 
 #: scene/3d/label_3d.cpp scene/gui/dialogs.cpp scene/gui/label.cpp
-#, fuzzy
 msgid "Autowrap"
-msgstr "AutoLoad"
+msgstr "Retour à la ligne automatique"
 
 #: scene/3d/light.cpp
-#, fuzzy
 msgid "Indirect Energy"
-msgstr "Couleurs d'émission"
+msgstr "Énergie indirecte"
 
 #: scene/3d/light.cpp
-#, fuzzy
 msgid "Negative"
-msgstr "GDNative"
+msgstr "Négative"
 
 #: scene/3d/light.cpp scene/resources/material.cpp
 #: scene/resources/visual_shader.cpp
-#, fuzzy
 msgid "Specular"
-msgstr "Mode Règle"
+msgstr "Spéculaire"
 
 #: scene/3d/light.cpp
-#, fuzzy
 msgid "Bake Mode"
-msgstr "Mode Bitmask"
+msgstr "Mode de pré-calcul"
 
 #: scene/3d/light.cpp
-#, fuzzy
 msgid "Contact"
-msgstr "Prélever une couleur"
+msgstr "Contact"
 
 #: scene/3d/light.cpp
 #, fuzzy
@@ -22896,9 +22359,8 @@ msgid "Reverse Cull Face"
 msgstr "Réinitialiser le volume de bus"
 
 #: scene/3d/light.cpp servers/visual_server.cpp
-#, fuzzy
 msgid "Directional Shadow"
-msgstr "Directions"
+msgstr "Ombre directionnelle"
 
 #: scene/3d/light.cpp
 #, fuzzy
@@ -22916,9 +22378,8 @@ msgid "Split 3"
 msgstr "Divisé"
 
 #: scene/3d/light.cpp
-#, fuzzy
 msgid "Blend Splits"
-msgstr "Temps de mélange :"
+msgstr "Mélanger les écarts"
 
 #: scene/3d/light.cpp
 #, fuzzy
@@ -22926,23 +22387,20 @@ msgid "Bias Split Scale"
 msgstr "Utiliser le magnétisme d'échelle"
 
 #: scene/3d/light.cpp
-#, fuzzy
 msgid "Depth Range"
-msgstr "Profondeur"
+msgstr "Plage de profondeur"
 
 #: scene/3d/light.cpp
 msgid "Omni"
-msgstr ""
+msgstr "Omnidirectionnelle"
 
 #: scene/3d/light.cpp
-#, fuzzy
 msgid "Shadow Mode"
-msgstr "Ombrage"
+msgstr "Mode ombre"
 
 #: scene/3d/light.cpp
-#, fuzzy
 msgid "Shadow Detail"
-msgstr "Afficher par défaut"
+msgstr "Détails d'ombre"
 
 #: scene/3d/light.cpp
 msgid "A SpotLight with an angle wider than 90 degrees cannot cast shadows."
@@ -22952,21 +22410,19 @@ msgstr ""
 
 #: scene/3d/light.cpp
 msgid "Spot"
-msgstr ""
+msgstr "Spot"
 
 #: scene/3d/light.cpp
-#, fuzzy
 msgid "Angle Attenuation"
-msgstr "Animation"
+msgstr "Atténuation d'angle"
 
 #: scene/3d/mesh_instance.cpp
 msgid "Software Skinning"
 msgstr ""
 
 #: scene/3d/mesh_instance.cpp
-#, fuzzy
 msgid "Transform Normals"
-msgstr "Transformation annulée."
+msgstr "Transformer les normales"
 
 #: scene/3d/navigation.cpp
 msgid ""
@@ -22974,45 +22430,44 @@ msgid ""
 "be removed in a future version. Use 'NavigationServer.map_get_path()' "
 "instead."
 msgstr ""
+"Le nœud \"Navigation\" et \"Navigation.get_simple_path()\" sont obsolètes et "
+"seront retires dans une version ultérieure. Utilisez plutôt "
+"\"NavigationServer.map_get_path()\"."
 
 #: scene/3d/navigation.cpp scene/resources/curve.cpp
-#, fuzzy
 msgid "Up Vector"
-msgstr "Vecteur"
+msgstr "Vecteur Haut"
 
 #: scene/3d/navigation.cpp
-#, fuzzy
 msgid "Cell Height"
-msgstr "En période de test"
+msgstr "Hauteur de cellule"
 
 #: scene/3d/navigation_agent.cpp
 msgid "Agent Height Offset"
-msgstr ""
+msgstr "Décalage de hauteur de l'agent"
 
 #: scene/3d/navigation_agent.cpp
-#, fuzzy
 msgid "Ignore Y"
-msgstr "[Ignorer]"
+msgstr "Ignorer Y"
 
 #: scene/3d/navigation_agent.cpp
-#, fuzzy
 msgid ""
 "The NavigationAgent can be used only under a Spatial inheriting parent node."
-msgstr "Le NavigationAgent ne peut être utilisé que sous un nœud spatial."
+msgstr ""
+"Le NavigationAgent ne peut être utilisé que sous un nœud parent héritant de "
+"Spatial."
 
 #: scene/3d/navigation_mesh_instance.cpp scene/resources/mesh_library.cpp
-#, fuzzy
 msgid "NavMesh"
-msgstr "Calculer le NavMesh"
+msgstr "NavMesh"
 
 #: scene/3d/navigation_obstacle.cpp
-#, fuzzy
 msgid ""
 "The NavigationObstacle only serves to provide collision avoidance to a "
 "Spatial inheriting parent object."
 msgstr ""
-"Un NavigationObstacle ne peut éviter les collisions qu'avec les nœuds "
-"Spatial."
+"Le NavigationObstacle ne sert qu'à fournir l’évitement de collision qu'aux "
+"objets dont les parents héritent de Spatial."
 
 #: scene/3d/occluder.cpp
 msgid "No shape is set."
@@ -23063,19 +22518,16 @@ msgstr ""
 "Particles » activé."
 
 #: scene/3d/particles.cpp
-#, fuzzy
 msgid "Visibility AABB"
-msgstr "Basculer la visibilité"
+msgstr "Visibilité AABB"
 
 #: scene/3d/particles.cpp
-#, fuzzy
 msgid "Draw Passes"
-msgstr "Appels de dessin :"
+msgstr "Afficher les passes"
 
 #: scene/3d/particles.cpp
-#, fuzzy
 msgid "Passes"
-msgstr "Appels de dessin :"
+msgstr "Passes"
 
 #: scene/3d/path.cpp
 msgid "PathFollow only works when set as a child of a Path node."
@@ -23092,7 +22544,6 @@ msgstr ""
 "Vector » dans la ressource Curve de son parent Path."
 
 #: scene/3d/path.cpp
-#, fuzzy
 msgid "Rotation Mode"
 msgstr "Mode rotation"
 
@@ -23107,223 +22558,189 @@ msgstr ""
 "Modifiez la taille dans les formes de collision enfant à la place."
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Axis Lock"
-msgstr "Axe"
+msgstr "Verrouiller l'axe"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Linear X"
-msgstr "Linéaire"
+msgstr "X linéaire"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Linear Y"
-msgstr "Linéaire"
+msgstr "Y linéaire"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Linear Z"
-msgstr "Linéaire"
+msgstr "Z linéaire"
 
 #: scene/3d/physics_body.cpp
 msgid "Angular X"
-msgstr ""
+msgstr "X angulaire"
 
 #: scene/3d/physics_body.cpp
 msgid "Angular Y"
-msgstr ""
+msgstr "Y angulaire"
 
 #: scene/3d/physics_body.cpp
 msgid "Angular Z"
-msgstr ""
+msgstr "Z angulaire"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Motion X"
-msgstr "Action"
+msgstr "X mouvement"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Motion Y"
-msgstr "Action"
+msgstr "Y mouvement"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Motion Z"
-msgstr "Action"
+msgstr "Z mouvement"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Joint Constraints"
-msgstr "Constantes"
+msgstr "Restrictions de jointure"
 
 #: scene/3d/physics_body.cpp scene/3d/physics_joint.cpp
 msgid "Impulse Clamp"
-msgstr ""
+msgstr "Borner l'impulsion"
 
 #: scene/3d/physics_body.cpp scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Swing Span"
-msgstr "Enregistrement de la scène"
+msgstr "Ampleur de balancement"
 
 #: scene/3d/physics_body.cpp scene/3d/physics_joint.cpp
 msgid "Twist Span"
-msgstr ""
+msgstr "Ampleur de torsion"
 
 #: scene/3d/physics_body.cpp scene/3d/physics_joint.cpp
 #: scene/3d/vehicle_body.cpp
-#, fuzzy
 msgid "Relaxation"
-msgstr "Séparation :"
+msgstr "Relaxation"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Angular Limit Enabled"
-msgstr "Filtrer les signaux"
+msgstr "Limite angulaire activée"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Angular Limit Upper"
-msgstr "Linéaire"
+msgstr "Limite angulaire haute"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Angular Limit Lower"
-msgstr "Erreur angulaire max. :"
+msgstr "Limite angulaire basse"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Angular Limit Bias"
-msgstr "Linéaire"
+msgstr "Biais de limite angulaire"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Angular Limit Softness"
-msgstr "Animation"
+msgstr "Douceur de limite angulaire"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Angular Limit Relaxation"
-msgstr "Animation"
+msgstr "Relaxation de limite angulaire"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Linear Limit Upper"
-msgstr "Linéaire"
+msgstr "Limite linéaire haute"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Linear Limit Lower"
-msgstr "Linéaire"
+msgstr "Limite linéaire basse"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Linear Limit Softness"
-msgstr "Linéaire"
+msgstr "Douceur de limite linéaire"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Linear Limit Restitution"
-msgstr "Linéaire"
+msgstr "Restitution de limite linéaire"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Linear Limit Damping"
-msgstr "Linéaire"
+msgstr "Amortissement de limite linéaire"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Angular Limit Restitution"
-msgstr "Animation"
+msgstr "Restitution de limite angulaire"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Angular Limit Damping"
-msgstr "Animation"
+msgstr "Amortissement de limite angulaire"
 
 #: scene/3d/physics_body.cpp
 msgid "X"
-msgstr ""
+msgstr "X"
 
 #: scene/3d/physics_body.cpp
 msgid "Y"
-msgstr ""
+msgstr "Y"
 
 #: scene/3d/physics_body.cpp
 msgid "Z"
-msgstr ""
+msgstr "Z"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Linear Limit Enabled"
-msgstr "Linéaire"
+msgstr "Limite linéaire active"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Linear Spring Enabled"
-msgstr "Linéaire"
+msgstr "Ressort linéaire actif"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Linear Spring Stiffness"
-msgstr "Linéaire"
+msgstr "Raideur du ressort linéaire"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Linear Spring Damping"
-msgstr "Linéaire"
+msgstr "Amortissement de ressort linéaire"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Linear Equilibrium Point"
-msgstr "Linéaire"
+msgstr "Point d’équilibre linéaire"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Linear Restitution"
-msgstr "Description"
+msgstr "Restitution linéaire"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Linear Damping"
-msgstr "Linéaire"
+msgstr "Amortissement linéaire"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Angular Restitution"
-msgstr "Description"
+msgstr "Restitution angulaire"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Angular Damping"
-msgstr "Animation"
+msgstr "Amortissement angulaire"
 
 #: scene/3d/physics_body.cpp scene/3d/physics_joint.cpp
 msgid "ERP"
 msgstr ""
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Angular Spring Enabled"
-msgstr "Filtrer les signaux"
+msgstr "Ressort angulaire actif"
 
 #: scene/3d/physics_body.cpp
 msgid "Angular Spring Stiffness"
-msgstr ""
+msgstr "Raideur de ressort angulaire"
 
 #: scene/3d/physics_body.cpp
 msgid "Angular Spring Damping"
-msgstr ""
+msgstr "Amortissement de ressort angulaire"
 
 #: scene/3d/physics_body.cpp
 msgid "Angular Equilibrium Point"
-msgstr ""
+msgstr "Point d’équilibre angulaire"
 
 #: scene/3d/physics_body.cpp
-#, fuzzy
 msgid "Body Offset"
-msgstr "Décalage :"
+msgstr "Décalage du corps"
 
 #: scene/3d/physics_joint.cpp
 msgid "Node A and Node B must be PhysicsBodies"
@@ -23347,183 +22764,159 @@ msgstr "Node A et Node B doivent être des PhysicsBody différents"
 
 #: scene/3d/physics_joint.cpp
 msgid "Solver"
-msgstr ""
+msgstr "Résolveur"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Exclude Nodes"
-msgstr "Supprimer des nœuds"
+msgstr "Exclure les nœuds"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Params"
-msgstr "Paramètre modifié :"
+msgstr "Paramètres"
 
 #: scene/3d/physics_joint.cpp
 msgid "Angular Limit"
-msgstr ""
+msgstr "Limite angulaire"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Upper"
-msgstr "Tout en majuscule"
+msgstr "Haute"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Lower"
-msgstr "Tout en minuscule"
+msgstr "Basse"
 
 #: scene/3d/physics_joint.cpp
 msgid "Motor"
-msgstr ""
+msgstr "Moteur"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Target Velocity"
-msgstr "Vue de l'orbite vers la droite"
+msgstr "Vélocité cible"
 
 #: scene/3d/physics_joint.cpp
 msgid "Max Impulse"
 msgstr "Impulsion Maximale"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Linear Limit"
-msgstr "Linéaire"
+msgstr "Limite linéaire"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Upper Distance"
-msgstr "Choisissez distance :"
+msgstr "Distance haute"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Lower Distance"
-msgstr "Choisissez distance :"
+msgstr "Distance basse"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Restitution"
-msgstr "Description"
+msgstr "Restitution"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Linear Motion"
-msgstr "Initialiser"
+msgstr "Mouvement linéaire"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Linear Ortho"
-msgstr "Orthogonale arrière"
+msgstr "Ortho linéaire"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Upper Angle"
-msgstr "Tout en majuscule"
+msgstr "Angle supérieur"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Lower Angle"
-msgstr "Tout en minuscule"
+msgstr "Angle inférieur"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Angular Motion"
-msgstr "Animation"
+msgstr "Mouvement angulaire"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Angular Ortho"
-msgstr "Erreur angulaire max. :"
+msgstr "Ortho angulaire"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Linear Limit X"
-msgstr "Linéaire"
+msgstr "X de la limite linéaire"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Linear Motor X"
-msgstr "Initialiser"
+msgstr "X du moteur linéaire"
 
 #: scene/3d/physics_joint.cpp
 msgid "Force Limit"
 msgstr "Limite de Force"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Linear Spring X"
-msgstr "Linéaire"
+msgstr "X du ressort linéaire"
 
 #: scene/3d/physics_joint.cpp
 msgid "Equilibrium Point"
-msgstr ""
+msgstr "Point d’équilibre"
 
 #: scene/3d/physics_joint.cpp
 msgid "Angular Limit X"
-msgstr ""
+msgstr "X de la limite angulaire"
 
 #: scene/3d/physics_joint.cpp
 msgid "Angular Motor X"
-msgstr ""
+msgstr "X du moteur angulaire"
 
 #: scene/3d/physics_joint.cpp
 msgid "Angular Spring X"
-msgstr ""
+msgstr "X du ressort angulaire"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Linear Limit Y"
-msgstr "Linéaire"
+msgstr "Y de la limite linéaire"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Linear Motor Y"
-msgstr "Initialiser"
+msgstr "Y du moteur linéaire"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Linear Spring Y"
-msgstr "Linéaire"
+msgstr "Y du ressort linéaire"
 
 #: scene/3d/physics_joint.cpp
 msgid "Angular Limit Y"
-msgstr ""
+msgstr "Y de la limite angulaire"
 
 #: scene/3d/physics_joint.cpp
 msgid "Angular Motor Y"
-msgstr ""
+msgstr "Y du moteur angulaire"
 
 #: scene/3d/physics_joint.cpp
 msgid "Angular Spring Y"
-msgstr ""
+msgstr "Y du ressort angulaire"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Linear Limit Z"
-msgstr "Linéaire"
+msgstr "Z de la limite linéaire"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Linear Motor Z"
-msgstr "Initialiser"
+msgstr "Z du moteur linéaire"
 
 #: scene/3d/physics_joint.cpp
-#, fuzzy
 msgid "Linear Spring Z"
-msgstr "Linéaire"
+msgstr "Z du ressort linéaire"
 
 #: scene/3d/physics_joint.cpp
 msgid "Angular Limit Z"
-msgstr ""
+msgstr "Z de la limite angulaire"
 
 #: scene/3d/physics_joint.cpp
 msgid "Angular Motor Z"
-msgstr ""
+msgstr "Z du moteur angulaire"
 
 #: scene/3d/physics_joint.cpp
 msgid "Angular Spring Z"
-msgstr ""
+msgstr "Z du ressort angulaire"
 
 #: scene/3d/portal.cpp
 msgid "The RoomManager should not be a child or grandchild of a Portal."
@@ -23543,21 +22936,19 @@ msgstr "Portail actif"
 
 #: scene/3d/portal.cpp scene/resources/occluder_shape_polygon.cpp
 msgid "Two Way"
-msgstr ""
+msgstr "Double sens"
 
 #: scene/3d/portal.cpp
 msgid "Linked Room"
 msgstr "Salle liée"
 
 #: scene/3d/portal.cpp
-#, fuzzy
 msgid "Use Default Margin"
-msgstr "Défaut"
+msgstr "Utiliser les marges par défaut"
 
 #: scene/3d/proximity_group.cpp
-#, fuzzy
 msgid "Group Name"
-msgstr "Groupé"
+msgstr "Nom de groupe"
 
 #: scene/3d/proximity_group.cpp
 msgid "Dispatch Mode"
@@ -23568,42 +22959,36 @@ msgid "Grid Radius"
 msgstr "Rayon de la Grille"
 
 #: scene/3d/ray_cast.cpp
-#, fuzzy
 msgid "Debug Shape"
-msgstr "Débogueur"
+msgstr "Forme de débogage"
 
 #: scene/3d/ray_cast.cpp scene/resources/style_box.cpp
 msgid "Thickness"
-msgstr ""
+msgstr "Épaisseur"
 
 #: scene/3d/reflection_probe.cpp scene/main/viewport.cpp
-#, fuzzy
 msgid "Update Mode"
-msgstr "Mode rotation"
+msgstr "Mode de mise à jour"
 
 #: scene/3d/reflection_probe.cpp
 msgid "Origin Offset"
 msgstr "Décalage de la Grille"
 
 #: scene/3d/reflection_probe.cpp
-#, fuzzy
 msgid "Box Projection"
-msgstr "Projet"
+msgstr "Projection boîte"
 
 #: scene/3d/reflection_probe.cpp
-#, fuzzy
 msgid "Enable Shadows"
-msgstr "Activer l'alignement"
+msgstr "Activer les ombres"
 
 #: scene/3d/reflection_probe.cpp
-#, fuzzy
 msgid "Ambient Color"
-msgstr "Prélever une couleur"
+msgstr "Couleur ambiante"
 
 #: scene/3d/reflection_probe.cpp
-#, fuzzy
 msgid "Ambient Energy"
-msgstr "Couleurs d'émission"
+msgstr "Énergie ambiante"
 
 #: scene/3d/reflection_probe.cpp
 #, fuzzy
@@ -23984,9 +23369,8 @@ msgid "Use As Steering"
 msgstr ""
 
 #: scene/3d/vehicle_body.cpp
-#, fuzzy
 msgid "Wheel"
-msgstr "Molette vers le haut."
+msgstr "Molette"
 
 #: scene/3d/vehicle_body.cpp
 msgid "Roll Influence"
@@ -24022,9 +23406,8 @@ msgid "Material Override"
 msgstr "Redéfinition"
 
 #: scene/3d/visual_instance.cpp
-#, fuzzy
 msgid "Material Overlay"
-msgstr "Changements de matériau :"
+msgstr "Superposition de Matériau"
 
 #: scene/3d/visual_instance.cpp
 #, fuzzy
@@ -24032,9 +23415,8 @@ msgid "Cast Shadow"
 msgstr "Créer un nœud Shader"
 
 #: scene/3d/visual_instance.cpp
-#, fuzzy
 msgid "Extra Cull Margin"
-msgstr "Arguments supplémentaires :"
+msgstr "Marge supplémentaire de détermination des faces cachées"
 
 #: scene/3d/visual_instance.cpp
 #, fuzzy
@@ -24106,14 +23488,12 @@ msgid "Mix Mode"
 msgstr "Mélanger le nœud"
 
 #: scene/animation/animation_blend_tree.cpp
-#, fuzzy
 msgid "Fadein Time"
-msgstr "Durée du fondu (s) :"
+msgstr "Durée du fondu entrant"
 
 #: scene/animation/animation_blend_tree.cpp
-#, fuzzy
 msgid "Fadeout Time"
-msgstr "Durée du fondu (s) :"
+msgstr "Durée du fondu sortant"
 
 #: scene/animation/animation_blend_tree.cpp
 msgid "Auto Restart"
@@ -24128,9 +23508,8 @@ msgid "Delay"
 msgstr ""
 
 #: scene/animation/animation_blend_tree.cpp
-#, fuzzy
 msgid "Random Delay"
-msgstr "Inclinaison aléatoire :"
+msgstr "Retard aléatoire"
 
 #: scene/animation/animation_blend_tree.cpp
 #, fuzzy
@@ -24138,9 +23517,8 @@ msgid "Add Amount"
 msgstr "Quantité"
 
 #: scene/animation/animation_blend_tree.cpp
-#, fuzzy
 msgid "Blend Amount"
-msgstr "Quantité :"
+msgstr "Quantité de mélange"
 
 #: scene/animation/animation_blend_tree.cpp
 #, fuzzy
@@ -24154,9 +23532,8 @@ msgstr "Ajouter un port d'entrée"
 
 #: scene/animation/animation_blend_tree.cpp
 #: scene/animation/animation_node_state_machine.cpp
-#, fuzzy
 msgid "Xfade Time"
-msgstr "Durée du fondu (s) :"
+msgstr "Durée du fondu croisé"
 
 #: scene/animation/animation_node_state_machine.cpp
 #, fuzzy
@@ -24568,9 +23945,8 @@ msgid "Pass On Modal Close Click"
 msgstr ""
 
 #: scene/gui/control.cpp
-#, fuzzy
 msgid "Size Flags"
-msgstr "Taille :"
+msgstr "Drapeaux de Taille"
 
 #: scene/gui/control.cpp
 #, fuzzy
@@ -24622,9 +23998,8 @@ msgid "Scroll Offset"
 msgstr "Décalage du Défilement"
 
 #: scene/gui/graph_edit.cpp
-#, fuzzy
 msgid "Snap Distance"
-msgstr "Choisissez distance :"
+msgstr "Distance d'arrondissage"
 
 #: scene/gui/graph_edit.cpp
 #, fuzzy
@@ -24761,9 +24136,8 @@ msgid "Secret"
 msgstr ""
 
 #: scene/gui/line_edit.cpp
-#, fuzzy
 msgid "Secret Character"
-msgstr "Caractères valides :"
+msgstr "Caractère secret"
 
 #: scene/gui/line_edit.cpp
 msgid "Expand To Text Length"
@@ -24820,7 +24194,7 @@ msgstr ""
 
 #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp
 msgid "Caret"
-msgstr ""
+msgstr "Caret"
 
 #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp
 msgid "Blink"
@@ -24997,9 +24371,8 @@ msgid "Meta Underlined"
 msgstr ""
 
 #: scene/gui/rich_text_label.cpp
-#, fuzzy
 msgid "Tab Size"
-msgstr "Taille :"
+msgstr "Taille de tabulation"
 
 #: scene/gui/rich_text_label.cpp
 #, fuzzy
@@ -25020,9 +24393,8 @@ msgid "Selection Enabled"
 msgstr "Sélection uniquement"
 
 #: scene/gui/rich_text_label.cpp scene/gui/text_edit.cpp
-#, fuzzy
 msgid "Override Selected Font Color"
-msgstr "Configurer le profil sélectionné :"
+msgstr "Remplacer la couleur de police sélectionnée"
 
 #: scene/gui/rich_text_label.cpp
 #, fuzzy
@@ -25073,9 +24445,8 @@ msgid "Tick Count"
 msgstr "Prélever une couleur"
 
 #: scene/gui/slider.cpp
-#, fuzzy
 msgid "Ticks On Borders"
-msgstr "dans l'ordre :"
+msgstr "Encoches aux bordures"
 
 #: scene/gui/spin_box.cpp
 msgid "Prefix"
@@ -25086,9 +24457,8 @@ msgid "Suffix"
 msgstr "Suffixe"
 
 #: scene/gui/split_container.cpp
-#, fuzzy
 msgid "Split Offset"
-msgstr "Décalage de la grille :"
+msgstr "Décalage des écarts"
 
 #: scene/gui/split_container.cpp scene/gui/tree.cpp
 #, fuzzy
@@ -25105,9 +24475,8 @@ msgid "Tab Align"
 msgstr ""
 
 #: scene/gui/tab_container.cpp scene/gui/tabs.cpp
-#, fuzzy
 msgid "Current Tab"
-msgstr "Actuel :"
+msgstr "Onglet actuel"
 
 #: scene/gui/tab_container.cpp
 #, fuzzy
@@ -25149,9 +24518,8 @@ msgid "Breakpoint Gutter"
 msgstr "Passer les points d'arrêt"
 
 #: scene/gui/text_edit.cpp
-#, fuzzy
 msgid "Fold Gutter"
-msgstr "Dossier :"
+msgstr "Replier le bandeau"
 
 #: scene/gui/text_edit.cpp
 #, fuzzy
@@ -25253,9 +24621,8 @@ msgid "Initial Angle"
 msgstr "Initialiser"
 
 #: scene/gui/texture_progress.cpp
-#, fuzzy
 msgid "Fill Degrees"
-msgstr "Rotation de %s degrés."
+msgstr "Degrés remplis"
 
 #: scene/gui/texture_progress.cpp scene/resources/primitive_meshes.cpp
 #, fuzzy
@@ -25361,9 +24728,8 @@ msgid "Max Redirects"
 msgstr ""
 
 #: scene/main/http_request.cpp
-#, fuzzy
 msgid "Timeout"
-msgstr "Délai dépassé."
+msgstr "Délai dépassé"
 
 #: scene/main/node.cpp
 msgid ""
@@ -25636,9 +25002,8 @@ msgid "Debug Draw"
 msgstr "Débogage"
 
 #: scene/main/viewport.cpp
-#, fuzzy
 msgid "Render Target"
-msgstr "Moteur de rendu :"
+msgstr "Rendre la cible"
 
 #: scene/main/viewport.cpp
 msgid "V Flip"
@@ -25811,9 +25176,8 @@ msgid "Font Color Disabled"
 msgstr "Âgrafe désactivée"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "H Separation"
-msgstr "Séparation :"
+msgstr "Séparation H"
 
 #: scene/resources/default_theme/default_theme.cpp
 #, fuzzy
@@ -25901,14 +25265,12 @@ msgid "Font Outline Modulate"
 msgstr "Forcer la modulation blanche"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Shadow Offset X"
-msgstr "Décalage X de la grille :"
+msgstr "Décalage X de l'ombre"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Shadow Offset Y"
-msgstr "Décalage Y de la grille :"
+msgstr "Décalage Y de l'ombre"
 
 #: scene/resources/default_theme/default_theme.cpp
 #, fuzzy
@@ -25966,14 +25328,12 @@ msgid "Space"
 msgstr "Scène principale"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Folded"
-msgstr "Dossier :"
+msgstr "Replié"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Fold"
-msgstr "Dossier :"
+msgstr "Replier"
 
 #: scene/resources/default_theme/default_theme.cpp
 msgid "Font Color Readonly"
@@ -26092,14 +25452,12 @@ msgid "Close Highlight"
 msgstr "Éclairage direct"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Close H Offset"
-msgstr "Décalage de la grille :"
+msgstr "Fermer décalage H"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Close V Offset"
-msgstr "Décalage de la grille :"
+msgstr "Fermer décalage V"
 
 #: scene/resources/default_theme/default_theme.cpp
 #, fuzzy
@@ -26127,9 +25485,8 @@ msgid "Labeled Separator Right"
 msgstr "Séparateur nommé"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Font Separator"
-msgstr "Opérateur de couleur."
+msgstr "Séparateur de police"
 
 #: scene/resources/default_theme/default_theme.cpp
 #, fuzzy
@@ -26137,14 +25494,12 @@ msgid "Font Color Accel"
 msgstr "Renommer l'item de couleur"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Font Color Separator"
-msgstr "Opérateur de couleur."
+msgstr "Séparateur de couleur de police"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "V Separation"
-msgstr "Séparation :"
+msgstr "Séparation V"
 
 #: scene/resources/default_theme/default_theme.cpp
 #, fuzzy
@@ -26192,9 +25547,8 @@ msgid "Title Offset"
 msgstr "Décalage d’Octet"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Close Offset"
-msgstr "Décalage de la grille :"
+msgstr "Fermer de décalage"
 
 #: scene/resources/default_theme/default_theme.cpp
 #, fuzzy
@@ -26324,9 +25678,8 @@ msgid "Icon Margin"
 msgstr "Définir la marge"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Line Separation"
-msgstr "Séparation :"
+msgstr "Séparation de line"
 
 #: scene/resources/default_theme/default_theme.cpp
 #, fuzzy
@@ -26386,9 +25739,8 @@ msgid "Large"
 msgstr "Cible"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Folder"
-msgstr "Dossier :"
+msgstr "Dossier"
 
 #: scene/resources/default_theme/default_theme.cpp
 #, fuzzy
@@ -26426,9 +25778,8 @@ msgid "Label Width"
 msgstr "Étendu à Gauche"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Screen Picker"
-msgstr "Opérateur d'écran."
+msgstr "Sélecteur d'écran"
 
 #: scene/resources/default_theme/default_theme.cpp
 #, fuzzy
@@ -26489,14 +25840,12 @@ msgid "Mono Font"
 msgstr "Police Principale"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Table H Separation"
-msgstr "Séparation :"
+msgstr "Séparation H de table"
 
 #: scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Table V Separation"
-msgstr "Séparation :"
+msgstr "Séparation V de table"
 
 #: scene/resources/default_theme/default_theme.cpp
 #, fuzzy
@@ -26661,7 +26010,7 @@ msgstr "Condition"
 
 #: scene/resources/environment.cpp
 msgid "Fog"
-msgstr ""
+msgstr "Brouillard"
 
 #: scene/resources/environment.cpp
 msgid "Sun Color"
@@ -26757,14 +26106,12 @@ msgid "Max Steps"
 msgstr "Pas"
 
 #: scene/resources/environment.cpp
-#, fuzzy
 msgid "Fade In"
-msgstr "Fondu entrant (s) :"
+msgstr "Fondu entrant"
 
 #: scene/resources/environment.cpp
-#, fuzzy
 msgid "Fade Out"
-msgstr "Fondu sortant (s) :"
+msgstr "Fondu sortant"
 
 #: scene/resources/environment.cpp
 #, fuzzy
@@ -26843,54 +26190,52 @@ msgstr "2"
 #: scene/resources/environment.cpp
 #: servers/audio/effects/audio_effect_chorus.cpp
 msgid "3"
-msgstr ""
+msgstr "3"
 
 #: scene/resources/environment.cpp
 #: servers/audio/effects/audio_effect_chorus.cpp
 msgid "4"
-msgstr ""
+msgstr "4"
 
 #: scene/resources/environment.cpp
 msgid "5"
-msgstr ""
+msgstr "5"
 
 #: scene/resources/environment.cpp
 msgid "6"
-msgstr ""
+msgstr "6"
 
 #: scene/resources/environment.cpp
 msgid "7"
-msgstr ""
+msgstr "7"
 
 #: scene/resources/environment.cpp
 msgid "Bloom"
-msgstr ""
+msgstr "Flou lumineux"
 
 #: scene/resources/environment.cpp
 msgid "HDR Threshold"
-msgstr ""
+msgstr "Seuil HDR"
 
 #: scene/resources/environment.cpp
 msgid "HDR Luminance Cap"
-msgstr ""
+msgstr "Limite de luminance HDR"
 
 #: scene/resources/environment.cpp
-#, fuzzy
 msgid "HDR Scale"
-msgstr "Mode mise à l'échelle"
+msgstr "Échelle HDR"
 
 #: scene/resources/environment.cpp
 msgid "Bicubic Upscale"
-msgstr ""
+msgstr "Redimensionnement Bicubique"
 
 #: scene/resources/environment.cpp
 msgid "Adjustments"
-msgstr ""
+msgstr "Ajustements"
 
 #: scene/resources/environment.cpp
-#, fuzzy
 msgid "Brightness"
-msgstr "Lumière"
+msgstr "Luminosité"
 
 #: scene/resources/environment.cpp
 msgid "Saturation"
@@ -26898,22 +26243,19 @@ msgstr "Saturation"
 
 #: scene/resources/environment.cpp
 msgid "Color Correction"
-msgstr "Correction de Couleur"
+msgstr "Correction des couleurs"
 
 #: scene/resources/font.cpp
-#, fuzzy
 msgid "Ascent"
-msgstr "Récents :"
+msgstr "Inclinaison"
 
 #: scene/resources/font.cpp
-#, fuzzy
 msgid "Distance Field"
-msgstr "Mode Sans Distraction"
+msgstr "Champ de distance"
 
 #: scene/resources/gradient.cpp
-#, fuzzy
 msgid "Raw Data"
-msgstr "Profondeur"
+msgstr "Données brutes"
 
 #: scene/resources/gradient.cpp
 msgid "Offsets"
@@ -26921,62 +26263,55 @@ msgstr "Décalages"
 
 #: scene/resources/height_map_shape.cpp
 msgid "Map Width"
-msgstr ""
+msgstr "Largeur de la carte"
 
 #: scene/resources/height_map_shape.cpp
-#, fuzzy
 msgid "Map Depth"
-msgstr "Profondeur"
+msgstr "Profondeur de la carte"
 
 #: scene/resources/height_map_shape.cpp
-#, fuzzy
 msgid "Map Data"
-msgstr "Profondeur"
+msgstr "Données de la carte"
 
 #: scene/resources/line_shape_2d.cpp
 msgid "D"
-msgstr ""
+msgstr "D"
 
 #: scene/resources/material.cpp
-#, fuzzy
 msgid "Next Pass"
-msgstr "Plan suivant"
+msgstr "Passe suivante"
 
 #: scene/resources/material.cpp
 msgid "Use Shadow To Opacity"
 msgstr ""
 
 #: scene/resources/material.cpp
-#, fuzzy
 msgid "Unshaded"
-msgstr "Afficher sans ombrage"
+msgstr "Sans ombrage"
 
 #: scene/resources/material.cpp
-#, fuzzy
 msgid "Vertex Lighting"
-msgstr "Éclairage direct"
+msgstr "Éclairage de sommet"
 
 #: scene/resources/material.cpp
-#, fuzzy
 msgid "Use Point Size"
-msgstr "Vue de devant"
+msgstr "Utiliser la taille de point"
 
 #: scene/resources/material.cpp
 msgid "World Triplanar"
-msgstr ""
+msgstr "Monde Triplanaire"
 
 #: scene/resources/material.cpp
 msgid "Albedo Tex Force sRGB"
-msgstr ""
+msgstr "Forcer sRGB dans la texture d'albédo"
 
 #: scene/resources/material.cpp
 msgid "Do Not Receive Shadows"
-msgstr ""
+msgstr "Ne pas recevoir d'ombres"
 
 #: scene/resources/material.cpp
-#, fuzzy
 msgid "Disable Ambient Light"
-msgstr "Indenter vers la droite"
+msgstr "Désactiver la lumière ambiante"
 
 #: scene/resources/material.cpp
 msgid "Ensure Correct Normals"
@@ -26984,70 +26319,63 @@ msgstr "Assurer des Normales Correctes"
 
 #: scene/resources/material.cpp
 msgid "Albedo Tex MSDF"
-msgstr ""
+msgstr "Texture d'albédo MSDF"
 
 #: scene/resources/material.cpp
-#, fuzzy
 msgid "Vertex Color"
-msgstr "Vertex"
+msgstr "Couleur de sommet"
 
 #: scene/resources/material.cpp
 msgid "Use As Albedo"
-msgstr ""
+msgstr "Utiliser comme albédo"
 
 #: scene/resources/material.cpp
 msgid "Is sRGB"
-msgstr ""
+msgstr "Est sRGB"
 
 #: scene/resources/material.cpp servers/visual_server.cpp
 msgid "Parameters"
 msgstr "Paramètres"
 
 #: scene/resources/material.cpp
-#, fuzzy
 msgid "Diffuse Mode"
-msgstr "Mode navigation"
+msgstr "Mode diffus"
 
 #: scene/resources/material.cpp
-#, fuzzy
 msgid "Specular Mode"
-msgstr "Mode Règle"
+msgstr "Mode spéculaire"
 
 #: scene/resources/material.cpp
-#, fuzzy
 msgid "Depth Draw Mode"
-msgstr "Mode d’interpolation"
+msgstr "Mode de dessin en profondeur"
 
 #: scene/resources/material.cpp
-#, fuzzy
 msgid "Line Width"
-msgstr "Étendu à Gauche"
+msgstr "Largeur de ligne"
 
 #: scene/resources/material.cpp
-#, fuzzy
 msgid "Point Size"
-msgstr "Vue de devant"
+msgstr "Taille de point"
 
 #: scene/resources/material.cpp
 msgid "Billboard Mode"
-msgstr "Mode billboard"
+msgstr "Mode Billboard"
 
 #: scene/resources/material.cpp
 msgid "Billboard Keep Scale"
-msgstr "Garder l'échelle du billboard"
+msgstr "Garder l'échelle du Billboard"
 
 #: scene/resources/material.cpp
 msgid "Grow"
-msgstr ""
+msgstr "Croître"
 
 #: scene/resources/material.cpp
-#, fuzzy
 msgid "Grow Amount"
-msgstr "Quantité :"
+msgstr "Quantité de croissance"
 
 #: scene/resources/material.cpp
 msgid "Use Alpha Scissor"
-msgstr ""
+msgstr "Utiliser la découpe alpha"
 
 #: scene/resources/material.cpp
 #, fuzzy
@@ -27066,7 +26394,7 @@ msgstr "Image %"
 
 #: scene/resources/material.cpp
 msgid "Albedo"
-msgstr ""
+msgstr "Albédo"
 
 #: scene/resources/material.cpp
 msgid "Metallic"
@@ -27092,7 +26420,7 @@ msgstr ""
 
 #: scene/resources/material.cpp
 msgid "Rim"
-msgstr "Bordure"
+msgstr "Bord"
 
 #: scene/resources/material.cpp
 #, fuzzy
@@ -27216,9 +26544,8 @@ msgid "Color Format"
 msgstr "Format de Couleur"
 
 #: scene/resources/multimesh.cpp
-#, fuzzy
 msgid "Transform Format"
-msgstr "Transformation annulée."
+msgstr "Format de transformation"
 
 #: scene/resources/multimesh.cpp
 msgid "Custom Data Format"
@@ -27234,9 +26561,8 @@ msgid "Visible Instance Count"
 msgstr ""
 
 #: scene/resources/navigation_mesh.cpp
-#, fuzzy
 msgid "Sampling"
-msgstr "Mise à l'échelle :"
+msgstr "Échantillonnage"
 
 #: scene/resources/navigation_mesh.cpp
 #, fuzzy
@@ -27244,9 +26570,8 @@ msgid "Partition Type"
 msgstr "Définir type de variable"
 
 #: scene/resources/navigation_mesh.cpp
-#, fuzzy
 msgid "Parsed Geometry Type"
-msgstr "Analyse de la géométrie..."
+msgstr "Type de la géométrie analysée"
 
 #: scene/resources/navigation_mesh.cpp
 msgid "Source Geometry Mode"
@@ -27303,9 +26628,8 @@ msgid "Details"
 msgstr "Afficher par défaut"
 
 #: scene/resources/navigation_mesh.cpp
-#, fuzzy
 msgid "Sample Distance"
-msgstr "Choisissez distance :"
+msgstr "Échantillonner la distance"
 
 #: scene/resources/navigation_mesh.cpp
 #, fuzzy
@@ -27376,12 +26700,10 @@ msgid "Color Modifier"
 msgstr "Ralentissement de la vue libre"
 
 #: scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Point Texture"
-msgstr "Points d'Émission :"
+msgstr "Texture ponctuelle"
 
 #: scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Normal Texture"
 msgstr "Texture Normale"
 
@@ -27413,9 +26735,8 @@ msgid "Absorbent"
 msgstr ""
 
 #: scene/resources/plane_shape.cpp
-#, fuzzy
 msgid "Plane"
-msgstr "Plan :"
+msgstr "Plan"
 
 #: scene/resources/primitive_meshes.cpp
 #, fuzzy
@@ -27489,9 +26810,8 @@ msgid "Bone"
 msgstr "Os"
 
 #: scene/resources/sky.cpp
-#, fuzzy
 msgid "Radiance Size"
-msgstr "Taille du contour :"
+msgstr "Taille du rayonnement"
 
 #: scene/resources/sky.cpp
 msgid "Panorama"
@@ -27783,9 +27103,8 @@ msgid "Default Cell Height"
 msgstr "En période de test"
 
 #: scene/resources/world.cpp scene/resources/world_2d.cpp
-#, fuzzy
 msgid "Default Edge Connection Margin"
-msgstr "Modifier la connexion :"
+msgstr "Marge de connexion des bords par défaut"
 
 #: scene/resources/world_2d.cpp
 msgid "Canvas"
@@ -27939,11 +27258,11 @@ msgstr "Ressource"
 
 #: servers/audio/effects/audio_effect_limiter.cpp
 msgid "Ceiling dB"
-msgstr ""
+msgstr "Plafond de dB"
 
 #: servers/audio/effects/audio_effect_limiter.cpp
 msgid "Threshold dB"
-msgstr ""
+msgstr "Seuil de dB"
 
 #: servers/audio/effects/audio_effect_limiter.cpp
 msgid "Soft Clip dB"
@@ -27955,37 +27274,36 @@ msgstr ""
 
 #: servers/audio/effects/audio_effect_phaser.cpp
 msgid "Range Min Hz"
-msgstr ""
+msgstr "Borne inférieure de la plage (Hz)"
 
 #: servers/audio/effects/audio_effect_phaser.cpp
 msgid "Range Max Hz"
-msgstr ""
+msgstr "Borne supérieure de la plage (Hz)"
 
 #: servers/audio/effects/audio_effect_pitch_shift.cpp
 msgid "Oversampling"
-msgstr ""
+msgstr "Suréchantillonnage"
 
 #: servers/audio/effects/audio_effect_pitch_shift.cpp
 #: servers/audio/effects/audio_effect_spectrum_analyzer.cpp
 msgid "FFT Size"
-msgstr "Taille FFT"
+msgstr "Taille des FFTs"
 
 #: servers/audio/effects/audio_effect_reverb.cpp
 msgid "Predelay"
-msgstr ""
+msgstr "Pré-retarder"
 
 #: servers/audio/effects/audio_effect_reverb.cpp
 msgid "Msec"
-msgstr ""
+msgstr "Millisec"
 
 #: servers/audio/effects/audio_effect_reverb.cpp
 msgid "Room Size"
-msgstr ""
+msgstr "Taille de la salle"
 
 #: servers/audio/effects/audio_effect_reverb.cpp
-#, fuzzy
 msgid "High-pass"
-msgstr "Contourner"
+msgstr "Passe-haut"
 
 #: servers/audio/effects/audio_effect_spectrum_analyzer.cpp
 msgid "Tap Back Pos"
@@ -27996,27 +27314,24 @@ msgid "Pan Pullout"
 msgstr ""
 
 #: servers/audio/effects/audio_effect_stereo_enhance.cpp
-#, fuzzy
 msgid "Time Pullout (ms)"
-msgstr "Délai dépassé."
+msgstr "Temps de retrait (ms)"
 
 #: servers/audio/effects/audio_effect_stereo_enhance.cpp
 msgid "Surround"
-msgstr ""
+msgstr "Surround"
 
 #: servers/audio_server.cpp
-#, fuzzy
 msgid "Enable Audio Input"
-msgstr "Renommer le bus audio"
+msgstr "Activer l’entrée audio"
 
 #: servers/audio_server.cpp
-#, fuzzy
 msgid "Output Latency"
-msgstr "Sortie"
+msgstr "Latence de sortie"
 
 #: servers/audio_server.cpp
 msgid "Channel Disable Threshold dB"
-msgstr ""
+msgstr "Désactiver le seuil de dB du canal"
 
 #: servers/audio_server.cpp
 #, fuzzy
@@ -28025,43 +27340,39 @@ msgstr "Changer le temps de mélange"
 
 #: servers/audio_server.cpp
 msgid "Video Delay Compensation (ms)"
-msgstr ""
+msgstr "Compensation de retard vidéo (ms)"
 
 #: servers/audio_server.cpp
-#, fuzzy
 msgid "Bus Count"
-msgstr "Ajouter un port d'entrée"
+msgstr "Nombre de ports"
 
 #: servers/audio_server.cpp
-#, fuzzy
 msgid "Capture Device"
-msgstr "Capturer depuis Pixel"
+msgstr "Périphérique de capture"
 
 #: servers/audio_server.cpp
-#, fuzzy
 msgid "Global Rate Scale"
-msgstr "Variable globale"
+msgstr "Echelle de débit global"
 
 #: servers/camera/camera_feed.cpp
 msgid "Feed"
-msgstr ""
+msgstr "Flux"
 
 #: servers/camera/camera_feed.cpp
-#, fuzzy
 msgid "Is Active"
-msgstr "Perspective"
+msgstr "Est active"
 
 #: servers/physics/space_sw.cpp servers/physics_2d/space_2d_sw.cpp
 msgid "Sleep Threshold Linear"
-msgstr ""
+msgstr "Seuil linéaire de veille"
 
 #: servers/physics/space_sw.cpp servers/physics_2d/space_2d_sw.cpp
 msgid "Sleep Threshold Angular"
-msgstr ""
+msgstr "Seuil angulaire de veille"
 
 #: servers/physics/space_sw.cpp servers/physics_2d/space_2d_sw.cpp
 msgid "Time Before Sleep"
-msgstr ""
+msgstr "Temps avant veille"
 
 #: servers/physics_2d/physics_2d_server_sw.cpp
 msgid "BP Hash Table Size"
@@ -28073,48 +27384,43 @@ msgstr ""
 
 #: servers/physics_2d_server.cpp servers/physics_server.cpp
 msgid "Inverse Mass"
-msgstr ""
+msgstr "Masse inverse"
 
 #: servers/physics_2d_server.cpp servers/physics_server.cpp
-#, fuzzy
 msgid "Inverse Inertia"
-msgstr "Vue libre gauche"
+msgstr "Inertie inverse"
 
 #: servers/physics_2d_server.cpp servers/physics_server.cpp
 msgid "Total Angular Damp"
-msgstr ""
+msgstr "Amortissage angulaire total"
 
 #: servers/physics_2d_server.cpp servers/physics_server.cpp
-#, fuzzy
 msgid "Total Linear Damp"
-msgstr "Linéaire"
+msgstr "Amortissage linéaire total"
 
 #: servers/physics_2d_server.cpp servers/physics_server.cpp
-#, fuzzy
 msgid "Total Gravity"
-msgstr "Aperçu par défaut"
+msgstr "Gravité totale"
 
 #: servers/physics_2d_server.cpp servers/physics_server.cpp
-#, fuzzy
 msgid "Linear Velocity"
-msgstr "Initialiser"
+msgstr "Vélocité linéaire"
 
 #: servers/physics_2d_server.cpp servers/physics_server.cpp
 msgid "Exclude"
-msgstr ""
+msgstr "Exclure"
 
 #: servers/physics_2d_server.cpp servers/physics_server.cpp
 msgid "Shape RID"
-msgstr ""
+msgstr "RID de forme"
 
 #: servers/physics_2d_server.cpp servers/physics_server.cpp
-#, fuzzy
 msgid "Collide With Bodies"
-msgstr "Mode collision"
+msgstr "Collisions avec les corps"
 
 #: servers/physics_2d_server.cpp servers/physics_server.cpp
 msgid "Collide With Areas"
-msgstr ""
+msgstr "Collisions avec les zones"
 
 #: servers/physics_2d_server.cpp servers/physics_server.cpp
 msgid "Motion Remainder"
@@ -28356,14 +27662,12 @@ msgid "Use Software Skinning"
 msgstr ""
 
 #: servers/visual_server.cpp
-#, fuzzy
 msgid "Ninepatch Mode"
-msgstr "Mode d’interpolation"
+msgstr "Mode Ninepatch"
 
 #: servers/visual_server.cpp
-#, fuzzy
 msgid "OpenGL"
-msgstr "Ouvrir"
+msgstr "OpenGL"
 
 #: servers/visual_server.cpp
 msgid "Batching Send Null"
@@ -28388,12 +27692,11 @@ msgstr "Traitement en lot"
 
 #: servers/visual_server.cpp
 msgid "Use Batching"
-msgstr ""
+msgstr "Utiliser le traitement en lot"
 
 #: servers/visual_server.cpp
-#, fuzzy
 msgid "Use Batching In Editor"
-msgstr "Mise à jour de l'éditeur"
+msgstr "Utiliser le traitement en lot dans l'éditeur"
 
 #: servers/visual_server.cpp
 msgid "Single Rect Fallback"
@@ -28417,7 +27720,7 @@ msgstr "Nombre Maximal d'Éléments Joints"
 
 #: servers/visual_server.cpp
 msgid "Batch Buffer Size"
-msgstr ""
+msgstr "Taille de tampon des lots"
 
 #: servers/visual_server.cpp
 msgid "Item Reordering Lookahead"
@@ -28428,21 +27731,20 @@ msgid "Flash Batching"
 msgstr ""
 
 #: servers/visual_server.cpp
-#, fuzzy
 msgid "Diagnose Frame"
-msgstr "Coller une image"
+msgstr "Diagnostiquer la trame"
 
 #: servers/visual_server.cpp
 msgid "GLES2"
-msgstr ""
+msgstr "GLES2"
 
 #: servers/visual_server.cpp
 msgid "Compatibility"
-msgstr ""
+msgstr "Compatibilité"
 
 #: servers/visual_server.cpp
 msgid "Disable Half Float"
-msgstr ""
+msgstr "Désactiver les demi Float"
 
 #: servers/visual_server.cpp
 #, fuzzy
@@ -28450,31 +27752,28 @@ msgid "Enable High Float"
 msgstr "Activer la priorité"
 
 #: servers/visual_server.cpp
-#, fuzzy
 msgid "Precision"
-msgstr "Expression"
+msgstr "Précision"
 
 #: servers/visual_server.cpp
 msgid "UV Contract"
-msgstr ""
+msgstr "Contraction UV"
 
 #: servers/visual_server.cpp
 msgid "UV Contract Amount"
-msgstr ""
+msgstr "Quantité de contraction UV"
 
 #: servers/visual_server.cpp
-#, fuzzy
 msgid "Use Simple PVS"
-msgstr "Utiliser le magnétisme d'échelle"
+msgstr "Utiliser PVS simple"
 
 #: servers/visual_server.cpp
 msgid "PVS Logging"
-msgstr ""
+msgstr "Journal PVS"
 
 #: servers/visual_server.cpp
-#, fuzzy
 msgid "Use Signals"
-msgstr "Signaux"
+msgstr "Utiliser les signaux"
 
 #: servers/visual_server.cpp
 #, fuzzy
@@ -28493,27 +27792,24 @@ msgstr "Voir la suppression de l'occlusion"
 
 #: servers/visual_server.cpp
 msgid "Max Active Spheres"
-msgstr ""
+msgstr "Nombre maximum de sphères actives"
 
 #: servers/visual_server.cpp
-#, fuzzy
 msgid "Max Active Polygons"
-msgstr "Déplacer le polygone"
+msgstr "Nombre maximum de polygones actifs"
 
 #: servers/visual_server.cpp
-#, fuzzy
 msgid "Shader Compilation Mode"
-msgstr "Mode d’interpolation"
+msgstr "Mode de compilation des shaders"
 
 #: servers/visual_server.cpp
 msgid "Max Simultaneous Compiles"
-msgstr ""
+msgstr "Nombre de compilations simultanées"
 
 #: servers/visual_server.cpp
 msgid "Log Active Async Compiles Count"
 msgstr ""
 
 #: servers/visual_server.cpp
-#, fuzzy
 msgid "Shader Cache Size (MB)"
-msgstr "Changer la taille d'une caméra"
+msgstr "Taille du cache de shader (Mo)"
diff --git a/editor/translations/ga.po b/editor/translations/ga.po
index 17fc0b03fa..87e005f5f3 100644
--- a/editor/translations/ga.po
+++ b/editor/translations/ga.po
@@ -2720,8 +2720,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "CrannBeochan"
 
 #: editor/editor_export.cpp
 msgid "Completed successfully."
@@ -19452,14 +19453,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
+msgid "rcedit failed to modify executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
@@ -19480,14 +19480,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
+msgid "Signtool failed to sign executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
diff --git a/editor/translations/gl.po b/editor/translations/gl.po
index 191093a45d..29db0e8063 100644
--- a/editor/translations/gl.po
+++ b/editor/translations/gl.po
@@ -2851,7 +2851,7 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "Copiar Ruta do Nodo"
 
 #: editor/editor_export.cpp
@@ -20550,15 +20550,15 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Extensión inválida."
 
 #: platform/windows/export/export.cpp
 msgid "Could not find signtool executable at \"%s\"."
@@ -20580,15 +20580,15 @@ msgstr "Nome inválido."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Extensión inválida."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/he.po b/editor/translations/he.po
index 2003351f93..abaada7880 100644
--- a/editor/translations/he.po
+++ b/editor/translations/he.po
@@ -2807,7 +2807,7 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "העתקת נתיב המפרק"
 
 #: editor/editor_export.cpp
@@ -20707,15 +20707,15 @@ msgstr "ל� ניתן לפתוח תבנית לייצו�:"
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "סיומת ל� חוקית."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20739,15 +20739,15 @@ msgstr "ש� שגוי."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "סיומת ל� חוקית."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/hi.po b/editor/translations/hi.po
index 7faa61ab12..e5a41404d0 100644
--- a/editor/translations/hi.po
+++ b/editor/translations/hi.po
@@ -2804,8 +2804,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "खंड कौपी कीजिये"
 
 #: editor/editor_export.cpp
 #, fuzzy
@@ -20309,15 +20310,15 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "गलत फॉण�ट का आकार |"
 
 #: platform/windows/export/export.cpp
 msgid "Could not find signtool executable at \"%s\"."
@@ -20339,15 +20340,15 @@ msgstr "अमान�य नाम."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "गलत फॉण�ट का आकार |"
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/hr.po b/editor/translations/hr.po
index 6d2b3b07da..e473c6556c 100644
--- a/editor/translations/hr.po
+++ b/editor/translations/hr.po
@@ -2773,8 +2773,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "Animacija"
 
 #: editor/editor_export.cpp
 #, fuzzy
@@ -19817,15 +19818,15 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Nevažeće ime."
 
 #: platform/windows/export/export.cpp
 msgid "Could not find signtool executable at \"%s\"."
@@ -19847,15 +19848,15 @@ msgstr "Nevažeće ime."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Nevažeće ime."
 
 #: platform/windows/export/export.cpp
 msgid "Failed to remove temporary file \"%s\"."
diff --git a/editor/translations/hu.po b/editor/translations/hu.po
index cc7024a260..b35be76368 100644
--- a/editor/translations/hu.po
+++ b/editor/translations/hu.po
@@ -2872,7 +2872,7 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "Node Útvonal Másolása"
 
 #: editor/editor_export.cpp
@@ -20510,15 +20510,15 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Érvénytelen kiterjesztés."
 
 #: platform/windows/export/export.cpp
 msgid "Could not find signtool executable at \"%s\"."
@@ -20540,15 +20540,15 @@ msgstr "Érvénytelen név."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Érvénytelen kiterjesztés."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/id.po b/editor/translations/id.po
index 8c447326e3..7d839357cd 100644
--- a/editor/translations/id.po
+++ b/editor/translations/id.po
@@ -45,8 +45,8 @@ msgstr ""
 "Project-Id-Version: Godot Engine editor\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2022-07-23 03:57+0000\n"
-"Last-Translator: FellowMustard <rachmawanng33@gmail.com>\n"
+"PO-Revision-Date: 2022-07-31 18:34+0000\n"
+"Last-Translator: ProgrammerIndonesia 44 <elo.jhy@gmail.com>\n"
 "Language-Team: Indonesian <https://hosted.weblate.org/projects/godot-engine/"
 "godot/id/>\n"
 "Language: id\n"
@@ -427,9 +427,8 @@ msgid "Command"
 msgstr "Perintah"
 
 #: core/os/input_event.cpp
-#, fuzzy
 msgid "Physical"
-msgstr " (Secara fisik)"
+msgstr "(Secara fisik)"
 
 #: core/os/input_event.cpp scene/2d/touch_screen_button.cpp
 #: scene/gui/base_button.cpp scene/gui/texture_button.cpp
@@ -2805,13 +2804,12 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "Salin Lokasi Node"
 
 #: editor/editor_export.cpp
-#, fuzzy
 msgid "Completed successfully."
-msgstr "Paket Sukses Terpasang!"
+msgstr "Sukses."
 
 #: editor/editor_export.cpp
 #, fuzzy
@@ -3290,9 +3288,8 @@ msgid "Save a File"
 msgstr "Simpan sebuah File"
 
 #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp
-#, fuzzy
 msgid "Access"
-msgstr "Sukses!"
+msgstr "Akses"
 
 #: editor/editor_file_dialog.cpp editor/editor_settings.cpp
 #, fuzzy
@@ -12382,9 +12379,8 @@ msgid "Available Node-based types:"
 msgstr "Profil yang Tersedia:"
 
 #: editor/plugins/theme_editor_plugin.cpp
-#, fuzzy
 msgid "Type name is empty!"
-msgstr "Nama berkas kosong."
+msgstr "Nama tipe kosong!"
 
 #: editor/plugins/theme_editor_plugin.cpp
 #, fuzzy
@@ -19289,9 +19285,8 @@ msgid "Could not find keystore, unable to export."
 msgstr "Tidak dapat menemukan keystore, tidak bisa ekspor."
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid "Could not start apksigner executable."
-msgstr "Tidak dapat memulai subproses!"
+msgstr "Tidak dapat memulai apksigner."
 
 #: platform/android/export/export_plugin.cpp
 msgid "'apksigner' returned with error #%d"
@@ -19324,9 +19319,8 @@ msgid "Invalid filename! Android APK requires the *.apk extension."
 msgstr "Nama berkas tidak valid! APK Android memerlukan ekstensi *.apk ."
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid "Unsupported export format!"
-msgstr "Format ekspor tidak didukung!\n"
+msgstr "Format ekspor tidak didukung!"
 
 #: platform/android/export/export_plugin.cpp
 msgid ""
@@ -19337,15 +19331,12 @@ msgstr ""
 "versinya. Silakan pasang ulang dari menu 'Proyek'."
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid ""
 "Android build version mismatch: Template installed: %s, Godot version: %s. "
 "Please reinstall Android build template from 'Project' menu."
 msgstr ""
-"Versi build Android tidak cocok:\n"
-"   Templat terpasang: %s\n"
-"   Versi Godot: %s\n"
-"Silakan pasang ulang templat build Android dari menu 'Project'."
+"Versi build Android tidak cocok: Templat terpasang: %s, Versi Godot: %s. "
+"Silakan pasang ulang templat build Android dari menu 'Proyek'."
 
 #: platform/android/export/export_plugin.cpp
 msgid ""
@@ -19353,9 +19344,8 @@ msgid ""
 msgstr ""
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid "Could not export project files to gradle project."
-msgstr "Tidak dapat menyunting proyek gradle dalam lokasi proyek\n"
+msgstr "Tidak dapat mengekspor file proyek ke dalam lokasi proyek gradle."
 
 #: platform/android/export/export_plugin.cpp
 msgid "Could not write expansion package file!"
@@ -19366,13 +19356,12 @@ msgid "Building Android Project (gradle)"
 msgstr "Membangun Proyek Android (gradle)"
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid ""
 "Building of Android project failed, check output for the error. "
 "Alternatively visit docs.godotengine.org for Android build documentation."
 msgstr ""
-"Pembangunan proyek Android gagal, periksa output untuk galatnya.\n"
-"Atau kunjungi docs.godotengine.org untuk dokumentasi build Android."
+"Pembangunan proyek Android gagal, periksa output untuk galatnya. Atau "
+"kunjungi docs.godotengine.org untuk dokumentasi build Android."
 
 #: platform/android/export/export_plugin.cpp
 msgid "Moving output"
@@ -19397,11 +19386,8 @@ msgid "Creating APK..."
 msgstr "Membuat kontur..."
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid "Could not find template APK to export: \"%s\"."
-msgstr ""
-"Tidak dapat menemukan contoh APK untuk ekspor:\n"
-"%s"
+msgstr "Tidak dapat menemukan contoh APK untuk ekspor: \"%s\""
 
 #: platform/android/export/export_plugin.cpp
 msgid ""
@@ -19560,9 +19546,8 @@ msgid "Capabilities"
 msgstr "Kapabilitas"
 
 #: platform/iphone/export/export.cpp
-#, fuzzy
 msgid "Access Wi-Fi"
-msgstr "Sukses!"
+msgstr "Akses Wi-Fi"
 
 #: platform/iphone/export/export.cpp
 #, fuzzy
@@ -20110,9 +20095,8 @@ msgid "Could not open icon file \"%s\"."
 msgstr "Tidak dapat ekspor berkas proyek"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Could not start xcrun executable."
-msgstr "Tidak dapat memulai subproses!"
+msgstr "Tidak dapat memulai subproses xcrun."
 
 #: platform/osx/export/export.cpp
 #, fuzzy
@@ -20190,9 +20174,8 @@ msgid "DMG Creation"
 msgstr "Arah"
 
 #: platform/osx/export/export.cpp
-#, fuzzy
 msgid "Could not start hdiutil executable."
-msgstr "Tidak dapat memulai subproses!"
+msgstr "Tidak dapat memulai subproses hdiutil."
 
 #: platform/osx/export/export.cpp
 msgid "`hdiutil create` failed - file exists."
@@ -20274,7 +20257,7 @@ msgstr "Proyeksi"
 #: platform/osx/export/export.cpp
 #, fuzzy
 msgid "Could not open file to read from path \"%s\"."
-msgstr "Tidak dapat menyunting proyek gradle dalam lokasi proyek\n"
+msgstr "Tidak dapat membuka file untuk membaca dari jalur \"%s\"."
 
 #: platform/osx/export/export.cpp
 msgid "Invalid bundle identifier:"
@@ -20659,15 +20642,15 @@ msgstr "Tidak dapat menemukan keystore, tidak bisa ekspor."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Ekstensi tidak valid."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20691,15 +20674,15 @@ msgstr "Nama tidak sah."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Ekstensi tidak valid."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -25445,9 +25428,8 @@ msgid "Draw 2D Outlines"
 msgstr "Buat Garis Tepi"
 
 #: scene/main/scene_tree.cpp servers/visual_server.cpp
-#, fuzzy
 msgid "Reflections"
-msgstr "Arah"
+msgstr "Refleksi"
 
 #: scene/main/scene_tree.cpp
 #, fuzzy
@@ -26803,9 +26785,8 @@ msgstr ""
 
 #: scene/resources/environment.cpp
 #: servers/audio/effects/audio_effect_chorus.cpp
-#, fuzzy
 msgid "2"
-msgstr "2D"
+msgstr "2"
 
 #: scene/resources/environment.cpp
 #: servers/audio/effects/audio_effect_chorus.cpp
diff --git a/editor/translations/is.po b/editor/translations/is.po
index 7a990ebd6b..512c660eef 100644
--- a/editor/translations/is.po
+++ b/editor/translations/is.po
@@ -2767,8 +2767,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "Fjarlægja val"
 
 #: editor/editor_export.cpp
 msgid "Completed successfully."
@@ -19724,14 +19725,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
+msgid "rcedit failed to modify executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
@@ -19752,14 +19752,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
+msgid "Signtool failed to sign executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
diff --git a/editor/translations/it.po b/editor/translations/it.po
index 1d89d28a99..2c9f7eb6fe 100644
--- a/editor/translations/it.po
+++ b/editor/translations/it.po
@@ -76,8 +76,8 @@ msgstr ""
 "Project-Id-Version: Godot Engine editor\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2022-07-23 03:57+0000\n"
-"Last-Translator: ale piccia <picciatialessio2@gmail.com>\n"
+"PO-Revision-Date: 2022-07-31 18:34+0000\n"
+"Last-Translator: Mirko <miknsop@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/godot-engine/"
 "godot/it/>\n"
 "Language: it\n"
@@ -473,6 +473,7 @@ msgid "Physical Scancode"
 msgstr "Scancode Fisico"
 
 #: core/os/input_event.cpp
+#, fuzzy
 msgid "Unicode"
 msgstr "Unicode"
 
@@ -900,6 +901,7 @@ msgid "Modules"
 msgstr "Moduli"
 
 #: core/register_core_types.cpp
+#, fuzzy
 msgid "TCP"
 msgstr "TCP"
 
@@ -2113,6 +2115,7 @@ msgid "Are you sure you want to remove all connections from the \"%s\" signal?"
 msgstr "Sei sicuro di voler rimuovere tutte le connessioni dal segnale \"%s\"?"
 
 #: editor/connections_dialog.cpp editor/editor_help.cpp editor/node_dock.cpp
+#, fuzzy
 msgid "Signals"
 msgstr "Segnali"
 
@@ -2811,7 +2814,7 @@ msgstr "Esportazione del progetto per la piattaforma:"
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "Completato con errori."
 
 #: editor/editor_export.cpp
@@ -6995,6 +6998,7 @@ msgstr "Anisotropico"
 
 #: editor/import/resource_importer_layered_texture.cpp
 #: editor/import/resource_importer_texture.cpp
+#, fuzzy
 msgid "sRGB"
 msgstr "sRGB"
 
@@ -18020,7 +18024,6 @@ msgid "Expression"
 msgstr "Espressione"
 
 #: modules/visual_script/visual_script_flow_control.cpp
-#, fuzzy
 msgid "Return"
 msgstr "Ritorno"
 
@@ -18680,7 +18683,6 @@ msgid "Hand Tracking Frequency"
 msgstr ""
 
 #: platform/android/export/export_plugin.cpp
-#, fuzzy
 msgid "Passthrough"
 msgstr "Passthrough"
 
@@ -20336,15 +20338,15 @@ msgstr "Non è stato possibile trovare keystore, impossible esportare."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Estensione non valida."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20368,15 +20370,15 @@ msgstr "Nome non valido."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Estensione non valida."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20924,9 +20926,8 @@ msgstr ""
 
 #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp
 #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp
-#, fuzzy
 msgid "Fixed FPS"
-msgstr "Vedi FPS"
+msgstr "FPS fisso"
 
 #: scene/2d/cpu_particles_2d.cpp scene/2d/particles_2d.cpp
 #: scene/3d/cpu_particles.cpp scene/3d/particles.cpp
@@ -26411,7 +26412,6 @@ msgid "Sky Contribution"
 msgstr "Condizione"
 
 #: scene/resources/environment.cpp
-#, fuzzy
 msgid "Fog"
 msgstr "Nebbia"
 
@@ -26758,7 +26758,7 @@ msgstr ""
 
 #: scene/resources/material.cpp
 msgid "Is sRGB"
-msgstr ""
+msgstr "È sRGB"
 
 #: scene/resources/material.cpp servers/visual_server.cpp
 #, fuzzy
@@ -26876,9 +26876,8 @@ msgid "Flowmap"
 msgstr ""
 
 #: scene/resources/material.cpp
-#, fuzzy
 msgid "Ambient Occlusion"
-msgstr "Occlusione"
+msgstr "Occlusione ambientale"
 
 #: scene/resources/material.cpp
 msgid "Deep Parallax"
diff --git a/editor/translations/ja.po b/editor/translations/ja.po
index a40939f777..60458e89df 100644
--- a/editor/translations/ja.po
+++ b/editor/translations/ja.po
@@ -2822,7 +2822,7 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "ノード�パスをコピー"
 
 #: editor/editor_export.cpp
@@ -20462,15 +20462,15 @@ msgstr "キーストア�見��ら�����エクス�ート���
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "無効�実行�能ファイル��。"
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20494,15 +20494,15 @@ msgstr "無効�����。"
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "無効�実行�能ファイル��。"
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/ka.po b/editor/translations/ka.po
index ae98d76c31..2e6e0e70e7 100644
--- a/editor/translations/ka.po
+++ b/editor/translations/ka.po
@@ -2847,8 +2847,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "მ�ნიშვნის მ�შ�რებ�"
 
 #: editor/editor_export.cpp
 #, fuzzy
@@ -20194,15 +20195,15 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "�რ�სწ�რი ფ�ნტის ზ�მ�."
 
 #: platform/windows/export/export.cpp
 msgid "Could not find signtool executable at \"%s\"."
@@ -20224,15 +20225,15 @@ msgstr "�რ�სწ�რი ფ�ნტის ზ�მ�."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "�რ�სწ�რი ფ�ნტის ზ�მ�."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/km.po b/editor/translations/km.po
index 4141c021e2..522cb30363 100644
--- a/editor/translations/km.po
+++ b/editor/translations/km.po
@@ -2695,8 +2695,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "Anim ផ្លាស់ប្�ូរ Transform"
 
 #: editor/editor_export.cpp
 msgid "Completed successfully."
@@ -19318,14 +19319,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
+msgid "rcedit failed to modify executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
@@ -19347,14 +19347,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
+msgid "Signtool failed to sign executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
diff --git a/editor/translations/ko.po b/editor/translations/ko.po
index af0b7e99a5..a91450dd41 100644
--- a/editor/translations/ko.po
+++ b/editor/translations/ko.po
@@ -2761,7 +2761,7 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "파� 경로 완성"
 
 #: editor/editor_export.cpp
@@ -20420,15 +20420,15 @@ msgstr "keystore를 찾� 수 없어, 내보낼 수 없었습니다."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "잘못� 확장�."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20452,15 +20452,15 @@ msgstr "올바르지 않� �름입니다."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "잘못� 확장�."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/lt.po b/editor/translations/lt.po
index 3b1140192a..66891e3f0e 100644
--- a/editor/translations/lt.po
+++ b/editor/translations/lt.po
@@ -2806,8 +2806,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "Panaikinti pasirinkimÄ…"
 
 #: editor/editor_export.cpp
 msgid "Completed successfully."
@@ -20215,15 +20216,15 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Netinkamas Å¡rifto dydis."
 
 #: platform/windows/export/export.cpp
 msgid "Could not find signtool executable at \"%s\"."
@@ -20245,15 +20246,15 @@ msgstr "Netinkamas Å¡rifto dydis."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Netinkamas Å¡rifto dydis."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/lv.po b/editor/translations/lv.po
index f134fd5b48..c00e8d1a44 100644
--- a/editor/translations/lv.po
+++ b/editor/translations/lv.po
@@ -2819,7 +2819,7 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "Kopēt mezgla ceļu"
 
 #: editor/editor_export.cpp
@@ -20022,15 +20022,15 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Nederīgs paplašin�jums."
 
 #: platform/windows/export/export.cpp
 msgid "Could not find signtool executable at \"%s\"."
@@ -20052,15 +20052,15 @@ msgstr "Nederīgs nosaukums."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Nederīgs paplašin�jums."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/mk.po b/editor/translations/mk.po
index a3390bd895..2d183ec609 100644
--- a/editor/translations/mk.po
+++ b/editor/translations/mk.po
@@ -2704,7 +2704,7 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr ""
 
 #: editor/editor_export.cpp
@@ -19363,14 +19363,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
+msgid "rcedit failed to modify executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
@@ -19392,14 +19391,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
+msgid "Signtool failed to sign executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
diff --git a/editor/translations/ml.po b/editor/translations/ml.po
index 4cb867c040..7568bc881e 100644
--- a/editor/translations/ml.po
+++ b/editor/translations/ml.po
@@ -2715,8 +2715,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "ചലനം ച�റ�റൽ"
 
 #: editor/editor_export.cpp
 msgid "Completed successfully."
@@ -19402,14 +19403,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
+msgid "rcedit failed to modify executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
@@ -19431,14 +19431,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
+msgid "Signtool failed to sign executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
diff --git a/editor/translations/mr.po b/editor/translations/mr.po
index 47b8bd3f86..4bdf5ba4fb 100644
--- a/editor/translations/mr.po
+++ b/editor/translations/mr.po
@@ -2715,8 +2715,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "अ�ॅनिमेशन ट�री"
 
 #: editor/editor_export.cpp
 msgid "Completed successfully."
@@ -19403,14 +19404,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
+msgid "rcedit failed to modify executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
@@ -19432,14 +19432,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
+msgid "Signtool failed to sign executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
diff --git a/editor/translations/ms.po b/editor/translations/ms.po
index 055e18e0bc..61a60ad8fe 100644
--- a/editor/translations/ms.po
+++ b/editor/translations/ms.po
@@ -2745,8 +2745,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "Salin Pilihan"
 
 #: editor/editor_export.cpp
 #, fuzzy
@@ -20226,15 +20227,15 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Nama kumpulan tidak sah."
 
 #: platform/windows/export/export.cpp
 msgid "Could not find signtool executable at \"%s\"."
@@ -20256,15 +20257,15 @@ msgstr "Nama tidak sah."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Nama kumpulan tidak sah."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/nb.po b/editor/translations/nb.po
index dac373fdc7..542d5987ca 100644
--- a/editor/translations/nb.po
+++ b/editor/translations/nb.po
@@ -2876,7 +2876,7 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "Kopier Node-bane"
 
 #: editor/editor_export.cpp
@@ -21049,15 +21049,15 @@ msgstr "Kunne ikke opprette mappe."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "MÃ¥ ha en gyldig filutvidelse."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -21081,15 +21081,15 @@ msgstr "Ugyldig navn."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "MÃ¥ ha en gyldig filutvidelse."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/nl.po b/editor/translations/nl.po
index 40e0ddfb78..aaa0f38a1d 100644
--- a/editor/translations/nl.po
+++ b/editor/translations/nl.po
@@ -2916,7 +2916,7 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "Knooppad kopiëren"
 
 #: editor/editor_export.cpp
@@ -20936,15 +20936,15 @@ msgstr "Kon template niet openen voor export:"
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Ongeldige extentie."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20968,15 +20968,15 @@ msgstr "Ongeldige naam."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Ongeldige extentie."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/pl.po b/editor/translations/pl.po
index 180abba988..3e4664c317 100644
--- a/editor/translations/pl.po
+++ b/editor/translations/pl.po
@@ -62,13 +62,14 @@
 # Pixel Zone - Godot Engine Tutorials <karoltomaszewskimusic@gmail.com>, 2022.
 # DK0492 <doriankaczmarek28@gmail.com>, 2022.
 # Dawid Skubij <davidsd@tlen.pl>, 2022.
+# kingofsponges <q.patex.q@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2022-07-10 14:38+0000\n"
-"Last-Translator: Dawid Skubij <davidsd@tlen.pl>\n"
+"PO-Revision-Date: 2022-08-04 06:38+0000\n"
+"Last-Translator: kingofsponges <q.patex.q@gmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/godot-engine/"
 "godot/pl/>\n"
 "Language: pl\n"
@@ -77,7 +78,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.13.1-dev\n"
+"X-Generator: Weblate 4.14-dev\n"
 
 #: core/bind/core_bind.cpp main/main.cpp
 msgid "Tablet Driver"
@@ -338,7 +339,7 @@ msgstr "Członek transmisji"
 
 #: core/io/stream_peer.cpp
 msgid "Big Endian"
-msgstr ""
+msgstr "Big endian"
 
 #: core/io/stream_peer.cpp
 msgid "Data Array"
@@ -368,9 +369,8 @@ msgid "Not enough bytes for decoding bytes, or invalid format."
 msgstr "Niewystarczająca ilość bajtów dla bajtów dekodujących lub zły format."
 
 #: core/math/expression.cpp
-#, fuzzy
 msgid "Invalid input %d (not passed) in expression"
-msgstr "Niewłaściwe dane %i (nie przekazane) w wyrażeniu"
+msgstr "Niewłaściwe dane %d (nie przekazane) w wyrażeniu"
 
 #: core/math/expression.cpp
 msgid "self can't be used because instance is null (not passed)"
@@ -415,14 +415,12 @@ msgid "Max Size (KB)"
 msgstr "Maks. rozmiar (KB)"
 
 #: core/os/input.cpp
-#, fuzzy
 msgid "Mouse Mode"
-msgstr "Tryb przesuwania"
+msgstr "Tryb myszki"
 
 #: core/os/input.cpp
-#, fuzzy
 msgid "Use Accumulated Input"
-msgstr "Usuń Wejście"
+msgstr "Użyj skumulowanego wejścia"
 
 #: core/os/input_event.cpp editor/project_settings_editor.cpp
 #: servers/audio_server.cpp
@@ -501,15 +499,15 @@ msgstr "Pochylenie"
 
 #: core/os/input_event.cpp
 msgid "Pressure"
-msgstr "Ciśnienie"
+msgstr "Nacisk"
 
 #: core/os/input_event.cpp
 msgid "Pen Inverted"
-msgstr ""
+msgstr "Odwrócone pióro"
 
 #: core/os/input_event.cpp
 msgid "Relative"
-msgstr "Relatywny"
+msgstr "Względny"
 
 #: core/os/input_event.cpp scene/2d/camera_2d.cpp scene/2d/cpu_particles_2d.cpp
 #: scene/3d/cpu_particles.cpp scene/3d/interpolated_camera.cpp
@@ -644,9 +642,8 @@ msgstr "Własna nazwa katalogu użytkownika"
 #: core/project_settings.cpp main/main.cpp
 #: platform/javascript/export/export.cpp platform/osx/export/export.cpp
 #: platform/uwp/os_uwp.cpp
-#, fuzzy
 msgid "Display"
-msgstr "Pokaż wszystko"
+msgstr "Wyświetlanie"
 
 #: core/project_settings.cpp main/main.cpp modules/csg/csg_shape.cpp
 #: modules/opensimplex/noise_texture.cpp scene/2d/line_2d.cpp
@@ -660,23 +657,20 @@ msgstr "Szerokość"
 #: scene/resources/capsule_shape_2d.cpp scene/resources/cylinder_shape.cpp
 #: scene/resources/font.cpp scene/resources/navigation_mesh.cpp
 #: scene/resources/primitive_meshes.cpp scene/resources/texture.cpp
-#, fuzzy
 msgid "Height"
-msgstr "Światło"
+msgstr "Wysokość"
 
 #: core/project_settings.cpp
 msgid "Always On Top"
 msgstr "Zawsze na wierzchu"
 
 #: core/project_settings.cpp
-#, fuzzy
 msgid "Test Width"
-msgstr "RozciÄ…gnij po lewej"
+msgstr "Szerokość testowa"
 
 #: core/project_settings.cpp
-#, fuzzy
 msgid "Test Height"
-msgstr "Testowanie"
+msgstr "Wysokość testowa"
 
 #: core/project_settings.cpp editor/animation_track_editor.cpp
 #: editor/editor_audio_buses.cpp main/main.cpp servers/audio_server.cpp
@@ -699,9 +693,8 @@ msgid "Main Run Args"
 msgstr "Główne argumenty włączania"
 
 #: core/project_settings.cpp
-#, fuzzy
 msgid "Scene Naming"
-msgstr "Ścieżka sceny:"
+msgstr "Nazywanie scen"
 
 #: core/project_settings.cpp
 msgid "Search In File Extensions"
@@ -712,14 +705,12 @@ msgid "Script Templates Search Path"
 msgstr "Ścieżka wyszukiwania szablonów skryptów"
 
 #: core/project_settings.cpp
-#, fuzzy
 msgid "Version Control Autoload On Startup"
-msgstr "Automatyczne Å‚adowanie podczas uruchamiania"
+msgstr "Automatyczne Å‚adowanie kontroli wersji podczas uruchamiania"
 
 #: core/project_settings.cpp
-#, fuzzy
 msgid "Version Control Plugin Name"
-msgstr "Kontrola wersji"
+msgstr "Nazwa wtyczki kontroli wersji"
 
 #: core/project_settings.cpp scene/2d/collision_object_2d.cpp
 #: scene/3d/collision_object.cpp scene/gui/control.cpp
@@ -1204,7 +1195,7 @@ msgstr "Ilośc:"
 #: editor/animation_track_editor.cpp main/main.cpp
 #: modules/mono/mono_gd/gd_mono.cpp
 msgid "Args"
-msgstr ""
+msgstr "Argumenty"
 
 #: editor/animation_track_editor.cpp editor/editor_settings.cpp
 #: editor/script_editor_debugger.cpp modules/gltf/gltf_accessor.cpp
@@ -1228,7 +1219,7 @@ msgstr "Ustaw uchwyt"
 #: scene/2d/audio_stream_player_2d.cpp scene/3d/audio_stream_player_3d.cpp
 #: scene/audio/audio_stream_player.cpp scene/gui/video_player.cpp
 msgid "Stream"
-msgstr ""
+msgstr "Strumień"
 
 #: editor/animation_track_editor.cpp
 #, fuzzy
@@ -2254,7 +2245,7 @@ msgstr "Otwórz"
 
 #: editor/dependency_editor.cpp
 msgid "Owners of: %s (Total: %d)"
-msgstr ""
+msgstr "Właściciele: %s (Suma: %d)"
 
 #: editor/dependency_editor.cpp
 msgid ""
@@ -2814,11 +2805,11 @@ msgstr "Wybierz"
 
 #: editor/editor_export.cpp
 msgid "Project export for platform:"
-msgstr ""
+msgstr "Eksportowanie projektu dla platformy:"
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "Skopiuj ścieżkę węzła"
 
 #: editor/editor_export.cpp
@@ -2844,14 +2835,12 @@ msgid "Packing"
 msgstr "Pakowanie"
 
 #: editor/editor_export.cpp
-#, fuzzy
 msgid "Save PCK"
-msgstr "Zapisz jako"
+msgstr "Zapisz plik PCK"
 
 #: editor/editor_export.cpp
-#, fuzzy
 msgid "Cannot create file \"%s\"."
-msgstr "Nie można utworzyć katalogu."
+msgstr "Nie można utworzyć pliku \"%s\"."
 
 #: editor/editor_export.cpp
 #, fuzzy
@@ -20698,17 +20687,17 @@ msgstr "Nie udało się znaleźć keystore, nie można eksportować."
 #: platform/windows/export/export.cpp
 #, fuzzy
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 "Narzędzie rcedit musi być skonfigurowane w Ustawieniach edytora (Eksport > "
 "Windows > Rcedit), aby zmienić ikonę lub dane informacji o aplikacji."
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Niepoprawny plik wykonywalny."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20733,17 +20722,17 @@ msgstr "Niewłaściwa nazwa."
 #: platform/windows/export/export.cpp
 #, fuzzy
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 "Narzędzie rcedit musi być skonfigurowane w Ustawieniach edytora (Eksport > "
 "Windows > Rcedit), aby zmienić ikonę lub dane informacji o aplikacji."
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Niepoprawny plik wykonywalny."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/pr.po b/editor/translations/pr.po
index 337e5af5c0..4c073f8542 100644
--- a/editor/translations/pr.po
+++ b/editor/translations/pr.po
@@ -2799,7 +2799,7 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "Forge yer Node!"
 
 #: editor/editor_export.cpp
@@ -20263,15 +20263,15 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Yer Calligraphy be wrongly sized."
 
 #: platform/windows/export/export.cpp
 msgid "Could not find signtool executable at \"%s\"."
@@ -20293,15 +20293,15 @@ msgstr "Yer Calligraphy be wrongly sized."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Yer Calligraphy be wrongly sized."
 
 #: platform/windows/export/export.cpp
 msgid "Failed to remove temporary file \"%s\"."
diff --git a/editor/translations/pt.po b/editor/translations/pt.po
index db7171b3c6..f284e0ece8 100644
--- a/editor/translations/pt.po
+++ b/editor/translations/pt.po
@@ -2754,7 +2754,8 @@ msgid "Project export for platform:"
 msgstr "Exportação do projeto para plataforma:"
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
+#, fuzzy
+msgid "Completed with warnings."
 msgstr "Concluído com erros."
 
 #: editor/editor_export.cpp
@@ -20408,15 +20409,15 @@ msgstr "Incapaz de encontrar keystore e exportar."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Extensão inválida."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20440,15 +20441,15 @@ msgstr "Nome inválido."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Extensão inválida."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/pt_BR.po b/editor/translations/pt_BR.po
index 5d2b642352..84a5ac45c3 100644
--- a/editor/translations/pt_BR.po
+++ b/editor/translations/pt_BR.po
@@ -149,7 +149,7 @@ msgstr ""
 "Project-Id-Version: Godot Engine editor\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: 2016-05-30\n"
-"PO-Revision-Date: 2022-07-27 13:26+0000\n"
+"PO-Revision-Date: 2022-08-04 06:38+0000\n"
 "Last-Translator: Felipe Kinoshita <kinofhek@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
 "godot-engine/godot/pt_BR/>\n"
@@ -2868,7 +2868,8 @@ msgid "Project export for platform:"
 msgstr "Exportação do projeto para plataforma:"
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
+#, fuzzy
+msgid "Completed with warnings."
 msgstr "Concluído com erros."
 
 #: editor/editor_export.cpp
@@ -5495,7 +5496,7 @@ msgstr "Tamanho da Miniatura"
 
 #: editor/editor_settings.cpp
 msgid "Docks"
-msgstr "Docas"
+msgstr "Docks"
 
 #: editor/editor_settings.cpp
 msgid "Scene Tree"
@@ -16364,7 +16365,7 @@ msgstr "stdout"
 
 #: main/main.cpp
 msgid "Print FPS"
-msgstr ""
+msgstr "Mostrar FPS"
 
 #: main/main.cpp
 msgid "Verbose stdout"
@@ -20360,15 +20361,15 @@ msgstr "O keystore não foi encontrado, não foi possível exportar."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Extensão inválida."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20391,15 +20392,15 @@ msgstr "Nome Inválido."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Extensão inválida."
 
 #: platform/windows/export/export.cpp
 msgid "Failed to remove temporary file \"%s\"."
@@ -24458,7 +24459,7 @@ msgstr ""
 
 #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp
 msgid "Caret"
-msgstr ""
+msgstr "Circunflexo"
 
 #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp
 msgid "Blink"
diff --git a/editor/translations/ro.po b/editor/translations/ro.po
index aaa6e1cbcb..a78712c6ba 100644
--- a/editor/translations/ro.po
+++ b/editor/translations/ro.po
@@ -2836,8 +2836,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "Copiază Selecția"
 
 #: editor/editor_export.cpp
 #, fuzzy
@@ -20739,15 +20740,15 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Trebuie să utilizaţi o extensie valida."
 
 #: platform/windows/export/export.cpp
 msgid "Could not find signtool executable at \"%s\"."
@@ -20769,15 +20770,15 @@ msgstr "Nume nevalid."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Trebuie să utilizaţi o extensie valida."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/ru.po b/editor/translations/ru.po
index c50dce8e01..1df1d87308 100644
--- a/editor/translations/ru.po
+++ b/editor/translations/ru.po
@@ -2852,7 +2852,8 @@ msgid "Project export for platform:"
 msgstr "Эк�порт проекта дл� платформы:"
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
+#, fuzzy
+msgid "Completed with warnings."
 msgstr "Завершено � ошибками."
 
 #: editor/editor_export.cpp
@@ -20280,17 +20281,17 @@ msgstr "�е удало�ь найти хранилище ключей, нево
 #: platform/windows/export/export.cpp
 #, fuzzy
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 "Ин�трумент rcedit должен быть на�троен в �а�тройках редактора (Export > "
 "Windows > Rcedit) дл� изменени� значка или информационных данных приложени�."
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "�едопу�тимый и�полн�емый файл."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20315,17 +20316,17 @@ msgstr "�едопу�тимое им�."
 #: platform/windows/export/export.cpp
 #, fuzzy
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 "Ин�трумент rcedit должен быть на�троен в �а�тройках редактора (Export > "
 "Windows > Rcedit) дл� изменени� значка или информационных данных приложени�."
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "�едопу�тимый и�полн�емый файл."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/si.po b/editor/translations/si.po
index e30d6c27ab..8ce2d1d628 100644
--- a/editor/translations/si.po
+++ b/editor/translations/si.po
@@ -2745,8 +2745,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "�්�රිත:"
 
 #: editor/editor_export.cpp
 msgid "Completed successfully."
@@ -19620,14 +19621,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
+msgid "rcedit failed to modify executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
@@ -19649,14 +19649,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
+msgid "Signtool failed to sign executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
diff --git a/editor/translations/sk.po b/editor/translations/sk.po
index c3a64ecc2f..7cba3886ba 100644
--- a/editor/translations/sk.po
+++ b/editor/translations/sk.po
@@ -2854,8 +2854,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "Skopírovať Výber"
 
 #: editor/editor_export.cpp
 #, fuzzy
@@ -20662,15 +20663,15 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Nesprávna veľkosť písma."
 
 #: platform/windows/export/export.cpp
 msgid "Could not find signtool executable at \"%s\"."
@@ -20692,15 +20693,15 @@ msgstr "Neplatný Názov."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Nesprávna veľkosť písma."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/sl.po b/editor/translations/sl.po
index 4f7f11baa3..ceb21aa750 100644
--- a/editor/translations/sl.po
+++ b/editor/translations/sl.po
@@ -2887,8 +2887,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "Odstrani izbrano"
 
 #: editor/editor_export.cpp
 #, fuzzy
@@ -20961,15 +20962,15 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Uporabiti moraš valjavno razširitev."
 
 #: platform/windows/export/export.cpp
 msgid "Could not find signtool executable at \"%s\"."
@@ -20991,15 +20992,15 @@ msgstr "Neveljavno ime."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Uporabiti moraš valjavno razširitev."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/sq.po b/editor/translations/sq.po
index d011c34407..af72b686b9 100644
--- a/editor/translations/sq.po
+++ b/editor/translations/sq.po
@@ -2824,8 +2824,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "Animacionet:"
 
 #: editor/editor_export.cpp
 #, fuzzy
@@ -20432,15 +20433,15 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Duhet të perdorësh një shtesë të lejuar."
 
 #: platform/windows/export/export.cpp
 msgid "Could not find signtool executable at \"%s\"."
@@ -20462,15 +20463,15 @@ msgstr "Emër i palejuar."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Duhet të perdorësh një shtesë të lejuar."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/sr_Cyrl.po b/editor/translations/sr_Cyrl.po
index 4a9d933004..4231d62c6b 100644
--- a/editor/translations/sr_Cyrl.po
+++ b/editor/translations/sr_Cyrl.po
@@ -3003,7 +3003,7 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "Копирај Путању Чвора"
 
 #: editor/editor_export.cpp
@@ -22362,15 +22362,15 @@ msgstr "�еу�пешно отварање нацрта за извоз:"
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Мора �е кори�тити важећа ек�тензија."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -22394,15 +22394,15 @@ msgstr "�еважеће име."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Мора �е кори�тити важећа ек�тензија."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/sr_Latn.po b/editor/translations/sr_Latn.po
index 41b23339de..b898108402 100644
--- a/editor/translations/sr_Latn.po
+++ b/editor/translations/sr_Latn.po
@@ -2769,8 +2769,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "Kopiraj Ozna�eno"
 
 #: editor/editor_export.cpp
 msgid "Completed successfully."
@@ -19709,14 +19710,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
+msgid "rcedit failed to modify executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
@@ -19738,14 +19738,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
+msgid "Signtool failed to sign executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
diff --git a/editor/translations/sv.po b/editor/translations/sv.po
index 3baefa6356..9fd6b9bf67 100644
--- a/editor/translations/sv.po
+++ b/editor/translations/sv.po
@@ -2852,7 +2852,7 @@ msgstr "Projektexport för plattformen:"
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "Kopiera Nod-Sökväg"
 
 #: editor/editor_export.cpp
@@ -20723,15 +20723,15 @@ msgstr "Det gick inte att hitta nyckellager, det gick inte att exportera."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Måste använda en giltigt filändelse."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20755,15 +20755,15 @@ msgstr "Ogiltigt namn."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Måste använda en giltigt filändelse."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/te.po b/editor/translations/te.po
index 03919233f7..af4c65f062 100644
--- a/editor/translations/te.po
+++ b/editor/translations/te.po
@@ -2698,8 +2698,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "సంఘం"
 
 #: editor/editor_export.cpp
 msgid "Completed successfully."
@@ -19324,14 +19325,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
+msgid "rcedit failed to modify executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
@@ -19352,14 +19352,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
+msgid "Signtool failed to sign executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
diff --git a/editor/translations/th.po b/editor/translations/th.po
index 1690916a54..f1eb8b716f 100644
--- a/editor/translations/th.po
+++ b/editor/translations/th.po
@@ -2875,7 +2875,7 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "คัดลอ�ตำ�หน่งโหนด"
 
 #: editor/editor_export.cpp
@@ -20710,15 +20710,15 @@ msgstr "เปิดเทมเพลตเพื่อส่งออ�ไม
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "นามส�ุลไม่ถู�ต้อง"
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20742,15 +20742,15 @@ msgstr "ชื่อผิดพลาด"
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "นามส�ุลไม่ถู�ต้อง"
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/tl.po b/editor/translations/tl.po
index cc20958dd1..fec7766383 100644
--- a/editor/translations/tl.po
+++ b/editor/translations/tl.po
@@ -2814,8 +2814,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr "Kopyahin Ang Pinagpipilian"
 
 #: editor/editor_export.cpp
 msgid "Completed successfully."
@@ -19980,14 +19981,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
+msgid "rcedit failed to modify executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
@@ -20010,14 +20010,13 @@ msgstr "Di-wastong pangalan."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
+msgid "Signtool failed to sign executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
diff --git a/editor/translations/tr.po b/editor/translations/tr.po
index 4980240671..ab58a87c36 100644
--- a/editor/translations/tr.po
+++ b/editor/translations/tr.po
@@ -77,13 +77,14 @@
 # Deleted User <noreply+46833@weblate.org>, 2022.
 # Emre <mr.inkaya@gmail.com>, 2022.
 # Deleted User <noreply+46858@weblate.org>, 2022.
+# Ãœmid Quliyev <lucifer25x@protonmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2022-07-23 03:57+0000\n"
-"Last-Translator: Deleted User <noreply+46858@weblate.org>\n"
+"PO-Revision-Date: 2022-08-05 01:04+0000\n"
+"Last-Translator: Ãœmid Quliyev <lucifer25x@protonmail.com>\n"
 "Language-Team: Turkish <https://hosted.weblate.org/projects/godot-engine/"
 "godot/tr/>\n"
 "Language: tr\n"
@@ -360,7 +361,7 @@ msgstr "Veri Dizisi"
 
 #: core/io/stream_peer_ssl.cpp
 msgid "Blocking Handshake"
-msgstr ""
+msgstr "Tokalaşmayı blokla"
 
 #: core/io/udp_server.cpp
 msgid "Max Pending Connections"
@@ -411,7 +412,6 @@ msgstr "'%s' çağrıldığında:"
 
 #: core/math/random_number_generator.cpp
 #: modules/opensimplex/open_simplex_noise.cpp
-#, fuzzy
 msgid "Seed"
 msgstr "Tohum"
 
@@ -449,7 +449,6 @@ msgid "Shift"
 msgstr "Shift"
 
 #: core/os/input_event.cpp
-#, fuzzy
 msgid "Control"
 msgstr "Kontrol TuÅŸu"
 
@@ -2833,7 +2832,7 @@ msgstr "Platform için proje dışa aktarımı:"
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "Hatalarla tamamlandı."
 
 #: editor/editor_export.cpp
@@ -4459,8 +4458,9 @@ msgid "Restore Scenes On Load"
 msgstr "Sahne Düğümünü Al"
 
 #: editor/editor_node.cpp editor/editor_settings.cpp
+#, fuzzy
 msgid "Show Thumbnail On Hover"
-msgstr ""
+msgstr "Fareyle üzerine gelindiğinde  küçük resmi  göster"
 
 #: editor/editor_node.cpp editor/editor_settings.cpp
 msgid "Inspector"
@@ -4486,11 +4486,11 @@ msgstr ""
 
 #: editor/editor_node.cpp
 msgid "Horizontal Vector2 Editing"
-msgstr ""
+msgstr "Yatay Vector2 Düzenleme"
 
 #: editor/editor_node.cpp
 msgid "Horizontal Vector Types Editing"
-msgstr ""
+msgstr "Yatay Vector tipleri düzenleme"
 
 #: editor/editor_node.cpp
 #, fuzzy
@@ -4503,8 +4503,9 @@ msgid "Resources To Open In New Inspector"
 msgstr "Gözetmen Bölümünde Aç"
 
 #: editor/editor_node.cpp
+#, fuzzy
 msgid "Default Color Picker Mode"
-msgstr ""
+msgstr "Varsayılan renk seçme modu"
 
 #: editor/editor_node.cpp editor/plugins/version_control_editor_plugin.cpp
 msgid "Version Control"
@@ -5380,19 +5381,19 @@ msgstr "Hepsini Görüntüle"
 
 #: editor/editor_settings.cpp
 msgid "Custom Display Scale"
-msgstr ""
+msgstr "Özel Ekran Ölçeği"
 
 #: editor/editor_settings.cpp
 msgid "Main Font Size"
-msgstr ""
+msgstr "Ana font ölçüsü"
 
 #: editor/editor_settings.cpp
 msgid "Code Font Size"
-msgstr ""
+msgstr "Kod font'u ölçüsü"
 
 #: editor/editor_settings.cpp
 msgid "Font Antialiased"
-msgstr ""
+msgstr "Kenarı yumuşatılmış font"
 
 #: editor/editor_settings.cpp
 msgid "Font Hinting"
@@ -5405,7 +5406,7 @@ msgstr "Ana Sahne"
 
 #: editor/editor_settings.cpp
 msgid "Main Font Bold"
-msgstr ""
+msgstr "Ana font kalınlığı"
 
 #: editor/editor_settings.cpp
 #, fuzzy
@@ -5413,8 +5414,9 @@ msgid "Code Font"
 msgstr "Düğüm Noktası Ekle"
 
 #: editor/editor_settings.cpp
+#, fuzzy
 msgid "Dim Editor On Dialog Popup"
-msgstr ""
+msgstr "İletişim penceresinde Dim Editörü"
 
 #: editor/editor_settings.cpp main/main.cpp
 msgid "Low Processor Mode Sleep (µsec)"
@@ -5431,11 +5433,12 @@ msgstr "Dikkat Dağıtmayan Kip"
 
 #: editor/editor_settings.cpp
 msgid "Automatically Open Screenshots"
-msgstr ""
+msgstr "Otomatik olarak ekran görüntülerini aç"
 
 #: editor/editor_settings.cpp
+#, fuzzy
 msgid "Max Array Dictionary Items Per Page"
-msgstr ""
+msgstr "Her sayfada maks dizi sözlüğü öğesi"
 
 #: editor/editor_settings.cpp editor/plugins/script_editor_plugin.cpp
 #: editor/plugins/theme_editor_plugin.cpp scene/gui/control.cpp
@@ -5449,7 +5452,7 @@ msgstr "Ön ayar"
 
 #: editor/editor_settings.cpp
 msgid "Icon And Font Color"
-msgstr ""
+msgstr "Simge ve Font rengi"
 
 #: editor/editor_settings.cpp
 #, fuzzy
@@ -5463,7 +5466,7 @@ msgstr "Renk Seç"
 
 #: editor/editor_settings.cpp scene/resources/environment.cpp
 msgid "Contrast"
-msgstr ""
+msgstr "Kontrast"
 
 #: editor/editor_settings.cpp
 msgid "Relationship Line Opacity"
@@ -5561,8 +5564,9 @@ msgid "Property Editor"
 msgstr "Grup Düzenleyici"
 
 #: editor/editor_settings.cpp
+#, fuzzy
 msgid "Auto Refresh Interval"
-msgstr ""
+msgstr "Otomatik yenileme intervalı"
 
 #: editor/editor_settings.cpp
 #, fuzzy
@@ -5577,7 +5581,7 @@ msgstr "Editör Teması"
 #: editor/editor_settings.cpp scene/3d/label_3d.cpp
 #: scene/resources/default_theme/default_theme.cpp
 msgid "Line Spacing"
-msgstr ""
+msgstr "Satır aralığı"
 
 #: editor/editor_settings.cpp editor/plugins/script_text_editor.cpp
 #: modules/gdscript/editor/gdscript_highlighter.cpp
@@ -5596,7 +5600,7 @@ msgstr ""
 
 #: editor/editor_settings.cpp scene/gui/text_edit.cpp
 msgid "Highlight Current Line"
-msgstr ""
+msgstr "Geçerli satırı vurgula"
 
 #: editor/editor_settings.cpp editor/plugins/script_text_editor.cpp
 msgid "Highlight Type Safe Lines"
@@ -5635,11 +5639,11 @@ msgstr "Gezinim"
 
 #: editor/editor_settings.cpp scene/gui/text_edit.cpp
 msgid "Smooth Scrolling"
-msgstr ""
+msgstr "Pürüzsüz kaydırma"
 
 #: editor/editor_settings.cpp scene/gui/text_edit.cpp
 msgid "V Scroll Speed"
-msgstr ""
+msgstr "V kaydırma hızı"
 
 #: editor/editor_settings.cpp
 #, fuzzy
@@ -5648,7 +5652,7 @@ msgstr "Başlatımı Göster"
 
 #: editor/editor_settings.cpp
 msgid "Minimap Width"
-msgstr ""
+msgstr "Küçük Harita Genişliği"
 
 #: editor/editor_settings.cpp
 msgid "Mouse Extra Buttons Navigate History"
@@ -5660,12 +5664,13 @@ msgid "Drag And Drop Selection"
 msgstr "GridMap Seçimi"
 
 #: editor/editor_settings.cpp
+#, fuzzy
 msgid "Stay In Script Editor On Node Selected"
-msgstr ""
+msgstr "Seçilmiş Düğümde Script Editöründe Kal"
 
 #: editor/editor_settings.cpp
 msgid "Appearance"
-msgstr ""
+msgstr "Dış görünüş"
 
 #: editor/editor_settings.cpp scene/gui/text_edit.cpp
 #, fuzzy
@@ -5691,12 +5696,14 @@ msgid "Show Info Gutter"
 msgstr ""
 
 #: editor/editor_settings.cpp
+#, fuzzy
 msgid "Code Folding"
-msgstr ""
+msgstr "Kod katlama"
 
 #: editor/editor_settings.cpp
+#, fuzzy
 msgid "Word Wrap"
-msgstr ""
+msgstr "Kelime Paketle"
 
 #: editor/editor_settings.cpp
 msgid "Show Line Length Guidelines"
@@ -5717,7 +5724,7 @@ msgstr "Kod Düzenleyici"
 
 #: editor/editor_settings.cpp
 msgid "Show Members Overview"
-msgstr ""
+msgstr "Üyelerin Genel Bakışını Göster"
 
 #: editor/editor_settings.cpp editor/plugins/script_editor_plugin.cpp
 #, fuzzy
@@ -5734,16 +5741,19 @@ msgid "Autosave Interval Secs"
 msgstr ""
 
 #: editor/editor_settings.cpp editor/plugins/script_editor_plugin.cpp
+#, fuzzy
 msgid "Restore Scripts On Load"
-msgstr ""
+msgstr "Script'leri Yüklemede Eski Haline Getir"
 
 #: editor/editor_settings.cpp
+#, fuzzy
 msgid "Auto Reload And Parse Scripts On Save"
-msgstr ""
+msgstr "Kaydederken Script'leri Otomatik Tekrar yükle ve Ayrıştır"
 
 #: editor/editor_settings.cpp
+#, fuzzy
 msgid "Auto Reload Scripts On External Change"
-msgstr ""
+msgstr "Dış Değişiklikte Otomatik Olarak Script'i Geri Yükle"
 
 #: editor/editor_settings.cpp
 #, fuzzy
@@ -5756,11 +5766,11 @@ msgstr ""
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
 msgid "Cursor"
-msgstr ""
+msgstr "İmleç"
 
 #: editor/editor_settings.cpp
 msgid "Scroll Past End Of File"
-msgstr ""
+msgstr "Dosyanın Sonunu Kaydır"
 
 #: editor/editor_settings.cpp
 msgid "Block Caret"
@@ -5796,7 +5806,7 @@ msgstr ""
 
 #: editor/editor_settings.cpp
 msgid "Code Complete Delay"
-msgstr ""
+msgstr "Kod Tamamlama Gecikme Süresi"
 
 #: editor/editor_settings.cpp
 msgid "Put Callhint Tooltip Below Current Line"
@@ -5853,12 +5863,14 @@ msgid "Preview Size"
 msgstr "Önizleme"
 
 #: editor/editor_settings.cpp
+#, fuzzy
 msgid "Primary Grid Color"
-msgstr ""
+msgstr "Birincil Izgara Rengi"
 
 #: editor/editor_settings.cpp
+#, fuzzy
 msgid "Secondary Grid Color"
-msgstr ""
+msgstr "Ä°kincil Izgara Rengi"
 
 #: editor/editor_settings.cpp
 #, fuzzy
@@ -5895,7 +5907,7 @@ msgstr "Nokta"
 #: scene/resources/particles_material.cpp servers/physics_2d_server.cpp
 #: servers/physics_server.cpp
 msgid "Shape"
-msgstr ""
+msgstr "Åžekil"
 
 #: editor/editor_settings.cpp
 #, fuzzy
@@ -6007,7 +6019,7 @@ msgstr "Gezinim Kipi"
 
 #: editor/editor_settings.cpp
 msgid "Orbit Sensitivity"
-msgstr ""
+msgstr "Yörünge Hassasiyeti"
 
 #: editor/editor_settings.cpp
 msgid "Orbit Inertia"
@@ -20660,15 +20672,15 @@ msgstr "Anahtar deposu bulunamadı, dışa aktarılamadı."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Geçersiz uzantı."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20692,15 +20704,15 @@ msgstr "Geçersiz ad."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Geçersiz uzantı."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/uk.po b/editor/translations/uk.po
index 0feae1a849..d87aa168d7 100644
--- a/editor/translations/uk.po
+++ b/editor/translations/uk.po
@@ -2757,7 +2757,8 @@ msgid "Project export for platform:"
 msgstr "Ек�портуванн� проєкту дл� платформи:"
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
+#, fuzzy
+msgid "Completed with warnings."
 msgstr "Завершено з помилками."
 
 #: editor/editor_export.cpp
@@ -20123,18 +20124,18 @@ msgstr "�е вдало�� знайти �ховище ключів. �емож
 #: platform/windows/export/export.cpp
 #, fuzzy
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 "Щоб мати змогу змінювати піктограму або дані щодо програми, має бути "
 "налаштовано ін�трумент rcedit у параметрах редактора (Ек�порт > Windows > "
 "Rcedit)."
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "�екоректний виконуваний файл."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20159,18 +20160,18 @@ msgstr "�екоректна назва."
 #: platform/windows/export/export.cpp
 #, fuzzy
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 "Щоб мати змогу змінювати піктограму або дані щодо програми, має бути "
 "налаштовано ін�трумент rcedit у параметрах редактора (Ек�порт > Windows > "
 "Rcedit)."
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "�екоректний виконуваний файл."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/ur_PK.po b/editor/translations/ur_PK.po
index 9cb56f3c21..a428250cc7 100644
--- a/editor/translations/ur_PK.po
+++ b/editor/translations/ur_PK.po
@@ -2764,8 +2764,9 @@ msgid "Project export for platform:"
 msgstr ""
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
-msgstr ""
+#, fuzzy
+msgid "Completed with warnings."
+msgstr ".تمام کا انتخاب"
 
 #: editor/editor_export.cpp
 msgid "Completed successfully."
@@ -20062,14 +20063,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
+msgid "rcedit failed to modify executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
@@ -20091,14 +20091,13 @@ msgstr ""
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
+msgid "Signtool failed to sign executable: %s."
 msgstr ""
 
 #: platform/windows/export/export.cpp
diff --git a/editor/translations/vi.po b/editor/translations/vi.po
index 4a6164f7e1..0a6885872f 100644
--- a/editor/translations/vi.po
+++ b/editor/translations/vi.po
@@ -2797,7 +2797,7 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "Sao chép đư�ng dẫn nút"
 
 #: editor/editor_export.cpp
@@ -20574,15 +20574,15 @@ msgstr "Không thể mở bản mẫu để xuất:"
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "Tên đuôi không hợp lệ."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20606,15 +20606,15 @@ msgstr "Tên không hợp lệ."
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "Tên đuôi không hợp lệ."
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/zh_CN.po b/editor/translations/zh_CN.po
index bd012a4c76..f25a372128 100644
--- a/editor/translations/zh_CN.po
+++ b/editor/translations/zh_CN.po
@@ -89,7 +89,7 @@ msgstr ""
 "Project-Id-Version: Chinese (Simplified) (Godot Engine)\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: 2018-01-20 12:15+0200\n"
-"PO-Revision-Date: 2022-07-19 16:26+0000\n"
+"PO-Revision-Date: 2022-07-29 01:36+0000\n"
 "Last-Translator: Haoyu Qiu <timothyqiu32@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "godot-engine/godot/zh_Hans/>\n"
@@ -2791,7 +2791,8 @@ msgid "Project export for platform:"
 msgstr "针对平�导出项目："
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
+#, fuzzy
+msgid "Completed with warnings."
 msgstr "已完�，存在错误。"
 
 #: editor/editor_export.cpp
@@ -5445,7 +5446,7 @@ msgstr "拖放选中内容"
 
 #: editor/editor_settings.cpp
 msgid "Stay In Script Editor On Node Selected"
-msgstr ""
+msgstr "选中节点时��脚本编辑器"
 
 #: editor/editor_settings.cpp
 msgid "Appearance"
@@ -11470,9 +11471,8 @@ msgid "New Animation"
 msgstr "新建动画"
 
 #: editor/plugins/sprite_frames_editor_plugin.cpp
-#, fuzzy
 msgid "Filter animations"
-msgstr "筛选方法"
+msgstr "筛选动画"
 
 #: editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Speed:"
@@ -19681,17 +19681,18 @@ msgid "Could not find wine executable at \"%s\"."
 msgstr "无法在“%s�找到 wine �执行文件。"
 
 #: platform/windows/export/export.cpp
+#, fuzzy
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 "无法�动 rcedit �执行文件，请在编辑器设置中�置 rcedit 路径（导出 > Windows "
 "> Rcedit）。"
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
 msgstr ""
 "rcedit 修改�执行文件失败：\n"
 "%s"
@@ -19713,17 +19714,18 @@ msgid "Invalid timestamp server."
 msgstr "时间戳�务器无效。"
 
 #: platform/windows/export/export.cpp
+#, fuzzy
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 "无法�动 signtool �执行文件，请在编辑器设置中�置 signtool 路径（导出 > "
 "Windows > Signtool）。"
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
 msgstr ""
 "Signtool 签��执行文件失败：\n"
 "%s"
diff --git a/editor/translations/zh_HK.po b/editor/translations/zh_HK.po
index 424752a849..79760d0de7 100644
--- a/editor/translations/zh_HK.po
+++ b/editor/translations/zh_HK.po
@@ -2891,7 +2891,7 @@ msgstr ""
 
 #: editor/editor_export.cpp
 #, fuzzy
-msgid "Completed with errors."
+msgid "Completed with warnings."
 msgstr "複製路徑"
 
 #: editor/editor_export.cpp
@@ -20867,15 +20867,15 @@ msgstr "無法新增資料夾"
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "無效副檔�"
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20899,15 +20899,15 @@ msgstr "無效�稱。"
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "無效副檔�"
 
 #: platform/windows/export/export.cpp
 #, fuzzy
diff --git a/editor/translations/zh_TW.po b/editor/translations/zh_TW.po
index f5568c41b5..8ad86d4b2a 100644
--- a/editor/translations/zh_TW.po
+++ b/editor/translations/zh_TW.po
@@ -23,7 +23,7 @@
 # binotaliu <binota@protonmail.ch>, 2020.
 # Allen H. <w84miracle@gmail.com>, 2020.
 # BinotaLIU <binota@protonmail.ch>, 2020.
-# BinotaLIU <me@binota.org>, 2020, 2021.
+# BinotaLIU <me@binota.org>, 2020, 2021, 2022.
 # MintSoda <lionlxh@qq.com>, 2020.
 # meowmeowmeowcat <meowmeowcat1211@gmail.com>, 2021.
 # anthonychen <anton1554970211@126.com>, 2021.
@@ -41,8 +41,8 @@ msgstr ""
 "Project-Id-Version: Godot Engine editor\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2022-07-23 03:57+0000\n"
-"Last-Translator: �� <rrt467778@gmail.com>\n"
+"PO-Revision-Date: 2022-07-31 18:34+0000\n"
+"Last-Translator: BinotaLIU <me@binota.org>\n"
 "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
 "godot-engine/godot/zh_Hant/>\n"
 "Language: zh_TW\n"
@@ -474,7 +474,7 @@ msgstr "壓力"
 
 #: core/os/input_event.cpp
 msgid "Pen Inverted"
-msgstr ""
+msgstr "�轉筆觸"
 
 #: core/os/input_event.cpp
 msgid "Relative"
@@ -1171,14 +1171,12 @@ msgid "Type"
 msgstr "型別"
 
 #: editor/animation_track_editor.cpp
-#, fuzzy
 msgid "In Handle"
-msgstr "輸入把手"
+msgstr "進入控點"
 
 #: editor/animation_track_editor.cpp
-#, fuzzy
 msgid "Out Handle"
-msgstr "輸出把手"
+msgstr "離開控點"
 
 #: editor/animation_track_editor.cpp
 #: editor/import/resource_importer_texture.cpp
@@ -1350,14 +1348,12 @@ msgid "Easing:"
 msgstr "緩入緩出："
 
 #: editor/animation_track_editor.cpp
-#, fuzzy
 msgid "In-Handle:"
-msgstr "設定處�程�"
+msgstr "進入控點："
 
 #: editor/animation_track_editor.cpp
-#, fuzzy
 msgid "Out-Handle:"
-msgstr "設定處�程�"
+msgstr "離開控點："
 
 #: editor/animation_track_editor.cpp
 msgid "Stream:"
@@ -2747,7 +2743,8 @@ msgid "Project export for platform:"
 msgstr "專案匯出平�："
 
 #: editor/editor_export.cpp
-msgid "Completed with errors."
+#, fuzzy
+msgid "Completed with warnings."
 msgstr "已完�，存在錯誤。"
 
 #: editor/editor_export.cpp
@@ -5195,9 +5192,8 @@ msgid "Unfocused Low Processor Mode Sleep (µsec)"
 msgstr "未�焦低處�器�眠模�（微秒）"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Separate Distraction Mode"
-msgstr "專注模�"
+msgstr "�立專注模�"
 
 #: editor/editor_settings.cpp
 msgid "Automatically Open Screenshots"
@@ -5404,7 +5400,7 @@ msgstr "拖移�擇的檔案"
 
 #: editor/editor_settings.cpp
 msgid "Stay In Script Editor On Node Selected"
-msgstr ""
+msgstr "�擇節點時�留在腳本編輯器中"
 
 #: editor/editor_settings.cpp
 msgid "Appearance"
@@ -5423,9 +5419,8 @@ msgid "Show Bookmark Gutter"
 msgstr "顯示書籤欄"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Show Breakpoint Gutter"
-msgstr "跳�中斷點"
+msgstr "顯示中斷點欄"
 
 #: editor/editor_settings.cpp
 msgid "Show Info Gutter"
@@ -5464,9 +5459,8 @@ msgid "Files"
 msgstr "檔案"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Trim Trailing Whitespace On Save"
-msgstr "移除後方空白字元"
+msgstr "�存時移除後方空白字元"
 
 #: editor/editor_settings.cpp
 msgid "Autosave Interval Secs"
@@ -5513,9 +5507,8 @@ msgid "Caret Blink Speed"
 msgstr "�入符閃�速度"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Right Click Moves Caret"
-msgstr "��點擊以新增控制點"
+msgstr "按一下��來移動�標"
 
 #: editor/editor_settings.cpp modules/gdscript/gdscript.cpp
 #: modules/gdscript/gdscript_editor.cpp
@@ -5544,9 +5537,8 @@ msgid "Callhint Tooltip Offset"
 msgstr "呼��示工具�示框�移�"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Complete File Paths"
-msgstr "複製節點路徑"
+msgstr "補全檔案路徑"
 
 #: editor/editor_settings.cpp modules/gdscript/gdscript_editor.cpp
 msgid "Add Type Hints"
@@ -5713,9 +5705,8 @@ msgid "Warped Mouse Panning"
 msgstr "彎曲滑鼠平移"
 
 #: editor/editor_settings.cpp
-#, fuzzy
 msgid "Navigation Feel"
-msgstr "導航模�"
+msgstr "導航風格"
 
 #: editor/editor_settings.cpp
 msgid "Orbit Sensitivity"
@@ -5972,21 +5963,20 @@ msgid "Completion Background Color"
 msgstr "自動補全背景�色"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
-#, fuzzy
 msgid "Completion Selected Color"
-msgstr "匯入所�"
+msgstr "自動補全所��色"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
 msgid "Completion Existing Color"
-msgstr "完�存在中�色"
+msgstr "自動補全�有�色"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
 msgid "Completion Scroll Color"
-msgstr "完�滾動�色"
+msgstr "自動補全�軸�色"
 
 #: editor/editor_settings.cpp scene/resources/default_theme/default_theme.cpp
 msgid "Completion Font Color"
-msgstr "完�字型�色"
+msgstr "自動補全字型�色"
 
 #: editor/editor_settings.cpp
 msgid "Text Color"
@@ -6739,7 +6729,7 @@ msgstr "使用環境通�"
 
 #: editor/import/resource_importer_bitmask.cpp
 msgid "Create From"
-msgstr "從�處建立"
+msgstr "建立自"
 
 #: editor/import/resource_importer_bitmask.cpp
 #: servers/audio/effects/audio_effect_compressor.cpp
@@ -6751,9 +6741,8 @@ msgstr "臨界值"
 #: editor/import/resource_importer_scene.cpp
 #: editor/import/resource_importer_texture.cpp
 #: editor/import/resource_importer_wav.cpp scene/3d/gi_probe.cpp
-#, fuzzy
 msgid "Compress"
-msgstr "元件"
+msgstr "壓縮"
 
 #: editor/import/resource_importer_csv_translation.cpp
 msgid "Delimiter"
@@ -6803,9 +6792,8 @@ msgid "sRGB"
 msgstr "sRGB"
 
 #: editor/import/resource_importer_layered_texture.cpp
-#, fuzzy
 msgid "Slices"
-msgstr "自動剪�"
+msgstr "切片"
 
 #: editor/import/resource_importer_layered_texture.cpp
 #: scene/gui/aspect_ratio_container.cpp scene/gui/control.cpp
@@ -6822,9 +6810,8 @@ msgid "Vertical"
 msgstr "åž‚ç›´"
 
 #: editor/import/resource_importer_obj.cpp
-#, fuzzy
 msgid "Generate Tangents"
-msgstr "產生點"
+msgstr "產生切線"
 
 #: editor/import/resource_importer_obj.cpp
 msgid "Scale Mesh"
@@ -6836,9 +6823,8 @@ msgstr "Mesh �移"
 
 #: editor/import/resource_importer_obj.cpp
 #: editor/import/resource_importer_scene.cpp
-#, fuzzy
 msgid "Octahedral Compression"
-msgstr "設定表示�"
+msgstr "八�體壓縮"
 
 #: editor/import/resource_importer_obj.cpp
 msgid "Optimize Mesh Flags"
@@ -6926,27 +6912,24 @@ msgid "Meshes"
 msgstr "網格"
 
 #: editor/import/resource_importer_scene.cpp
-#, fuzzy
 msgid "Ensure Tangents"
-msgstr "修改曲線切線"
+msgstr "確�切線"
 
 #: editor/import/resource_importer_scene.cpp
 msgid "Light Baking"
 msgstr "光照烘焙"
 
 #: editor/import/resource_importer_scene.cpp
-#, fuzzy
 msgid "Lightmap Texel Size"
-msgstr "烘焙光照圖"
+msgstr "光照圖紋�元素大�"
 
 #: editor/import/resource_importer_scene.cpp modules/gltf/gltf_state.cpp
 msgid "Skins"
 msgstr "Skin"
 
 #: editor/import/resource_importer_scene.cpp
-#, fuzzy
 msgid "Use Named Skins"
-msgstr "使用縮放�附"
+msgstr "使用命� Skin"
 
 #: editor/import/resource_importer_scene.cpp
 msgid "External Files"
@@ -6961,9 +6944,8 @@ msgid "Filter Script"
 msgstr "篩�腳本"
 
 #: editor/import/resource_importer_scene.cpp
-#, fuzzy
 msgid "Keep Custom Tracks"
-msgstr "變�"
+msgstr "�留自定軌�"
 
 #: editor/import/resource_importer_scene.cpp
 msgid "Optimizer"
@@ -8769,7 +8751,7 @@ msgstr "縮放模�"
 
 #: editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Shift: Scale proportionally."
-msgstr ""
+msgstr "Shift：按比例縮放。"
 
 #: editor/plugins/canvas_item_editor_plugin.cpp
 #: editor/plugins/spatial_editor_plugin.cpp
@@ -9287,11 +9269,11 @@ msgstr "漸層編輯"
 
 #: editor/plugins/gradient_texture_2d_editor_plugin.cpp
 msgid "Swap GradientTexture2D Fill Points"
-msgstr ""
+msgstr "交� GradientTexture2D 的填充點"
 
 #: editor/plugins/gradient_texture_2d_editor_plugin.cpp
 msgid "Swap Gradient Fill Points"
-msgstr ""
+msgstr "交� Gradient 填充點"
 
 #: editor/plugins/gradient_texture_2d_editor_plugin.cpp
 msgid "Toggle Grid Snap"
@@ -10096,7 +10078,7 @@ msgstr "�步骨骼到多邊形"
 
 #: editor/plugins/ray_cast_2d_editor_plugin.cpp
 msgid "Set cast_to"
-msgstr ""
+msgstr "設定 cast_to"
 
 #: editor/plugins/resource_preloader_editor_plugin.cpp
 msgid "ERROR: Couldn't load resource!"
@@ -10425,7 +10407,7 @@ msgstr "�尋�果"
 
 #: editor/plugins/script_editor_plugin.cpp
 msgid "Open Dominant Script On Scene Change"
-msgstr ""
+msgstr "場景更改時開啟主腳本"
 
 #: editor/plugins/script_editor_plugin.cpp
 msgid "External"
@@ -10449,7 +10431,7 @@ msgstr "強調顯示目�的腳本"
 
 #: editor/plugins/script_editor_plugin.cpp
 msgid "Script Temperature History Size"
-msgstr ""
+msgstr "腳本溫度歷�大�"
 
 #: editor/plugins/script_editor_plugin.cpp
 msgid "Current Script Background Color"
@@ -10469,7 +10451,7 @@ msgstr "將腳本�稱列為"
 
 #: editor/plugins/script_editor_plugin.cpp
 msgid "Exec Flags"
-msgstr ""
+msgstr "執行旗標"
 
 #: editor/plugins/script_editor_plugin.cpp
 msgid "Clear Recent Scripts"
@@ -10986,43 +10968,43 @@ msgstr "(�在GLES2中)"
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid ""
 "Debug draw modes are only available when using the GLES3 renderer, not GLES2."
-msgstr "除錯繪製模�僅在使用 GLES3 算繪引擎時�用，GLES2 ��用。"
+msgstr "除錯繪製模�僅�在 GLES3 算繪引擎下使用，無法在 GLES2 下使用。"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "Freelook Left"
-msgstr "自由視圖 左"
+msgstr "自由觀看 左"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "Freelook Right"
-msgstr "自由視圖 �"
+msgstr "自由觀看 �"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "Freelook Forward"
-msgstr "自由視圖 �"
+msgstr "自由觀看 �"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "Freelook Backwards"
-msgstr "自由視圖 後"
+msgstr "自由觀看 後"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "Freelook Up"
-msgstr "自由視圖 上"
+msgstr "自由觀看 上"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "Freelook Down"
-msgstr "自由視圖 下"
+msgstr "自由觀看 下"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "Freelook Speed Modifier"
-msgstr "加速自由視圖速度"
+msgstr "自由觀看速度調整"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "Freelook Slow Modifier"
-msgstr "放慢自由視圖速度"
+msgstr "自由觀看減速調整"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "Toggle Camera Preview"
-msgstr "切�相機�覽開關"
+msgstr "開啟�關閉相機�覽"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "View Rotation Locked"
@@ -11031,7 +11013,7 @@ msgstr "視圖旋轉已鎖定"
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid ""
 "To zoom further, change the camera's clipping planes (View -> Settings...)"
-msgstr "若��繼續放大，請至 檢視 -> 設定... 修改�影機的剪�平�"
+msgstr "若��繼續放大，請至 [檢視] -> [設定...] 修改�影機的剪�平�"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid ""
@@ -11278,16 +11260,15 @@ msgstr "後置"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "Manipulator Gizmo Size"
-msgstr ""
+msgstr "�縱器控制項大�"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "Manipulator Gizmo Opacity"
-msgstr ""
+msgstr "�縱器控制項��明度"
 
 #: editor/plugins/spatial_editor_plugin.cpp
-#, fuzzy
 msgid "Show Viewport Rotation Gizmo"
-msgstr "鎖定視角旋轉"
+msgstr "顯示檢視�的旋轉控制器"
 
 #: editor/plugins/spatial_editor_plugin.cpp
 msgid "Unnamed Gizmo"
@@ -11338,9 +11319,8 @@ msgid "Invalid geometry, can't replace by mesh."
 msgstr "無效的幾何圖形，無法以網格�代。"
 
 #: editor/plugins/sprite_editor_plugin.cpp
-#, fuzzy
 msgid "Convert to MeshInstance2D"
-msgstr "轉�為 Mesh2D"
+msgstr "轉�為 MeshInstance2D"
 
 #: editor/plugins/sprite_editor_plugin.cpp
 msgid "Invalid geometry, can't create polygon."
@@ -11443,9 +11423,8 @@ msgid "New Animation"
 msgstr "新增動畫"
 
 #: editor/plugins/sprite_frames_editor_plugin.cpp
-#, fuzzy
 msgid "Filter animations"
-msgstr "篩�方法"
+msgstr "篩�動畫"
 
 #: editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Speed:"
@@ -11742,9 +11721,8 @@ msgstr ""
 "確定�關閉嗎？"
 
 #: editor/plugins/theme_editor_plugin.cpp
-#, fuzzy
 msgid "Remove Type"
-msgstr "移除圖塊"
+msgstr "移除型別"
 
 #: editor/plugins/theme_editor_plugin.cpp
 msgid ""
@@ -11787,14 +11765,12 @@ msgstr ""
 "手動加入更多項目於其中或從�一個主題匯入。"
 
 #: editor/plugins/theme_editor_plugin.cpp
-#, fuzzy
 msgid "Add Theme Type"
-msgstr "新增項目類型"
+msgstr "新增主題型別"
 
 #: editor/plugins/theme_editor_plugin.cpp
-#, fuzzy
 msgid "Remove Theme Type"
-msgstr "移除項目"
+msgstr "移除主題型別"
 
 #: editor/plugins/theme_editor_plugin.cpp
 msgid "Add Color Item"
@@ -11909,9 +11885,8 @@ msgid "Select Another Theme Resource:"
 msgstr "�擇其他主題資�："
 
 #: editor/plugins/theme_editor_plugin.cpp
-#, fuzzy
 msgid "Theme Resource"
-msgstr "�新命�資�"
+msgstr "主題資�"
 
 #: editor/plugins/theme_editor_plugin.cpp
 msgid "Another Theme"
@@ -11923,21 +11898,19 @@ msgstr "新增類別"
 
 #: editor/plugins/theme_editor_plugin.cpp
 msgid "Filter the list of types or create a new custom type:"
-msgstr ""
+msgstr "篩�型別列表，或是建立新的自定型別："
 
 #: editor/plugins/theme_editor_plugin.cpp
-#, fuzzy
 msgid "Available Node-based types:"
-msgstr "�用設定檔："
+msgstr "�用之基於節點的型別："
 
 #: editor/plugins/theme_editor_plugin.cpp
 msgid "Type name is empty!"
 msgstr "型別�稱為空�"
 
 #: editor/plugins/theme_editor_plugin.cpp
-#, fuzzy
 msgid "Are you sure you want to create an empty type?"
-msgstr "確定�打開多個專案嗎？"
+msgstr "確定�建立空型別嗎？"
 
 #: editor/plugins/theme_editor_plugin.cpp
 msgid "Confirm Item Rename"
@@ -11967,14 +11940,12 @@ msgid "Add Item Type"
 msgstr "新增項目類型"
 
 #: editor/plugins/theme_editor_plugin.cpp
-#, fuzzy
 msgid "Set Variation Base Type"
-msgstr "設定變數型別"
+msgstr "設定變化基礎型別"
 
 #: editor/plugins/theme_editor_plugin.cpp
-#, fuzzy
 msgid "Set Base Type"
-msgstr "更改基礎型別"
+msgstr "設定基礎型別"
 
 #: editor/plugins/theme_editor_plugin.cpp
 msgid "Show Default"
@@ -11994,13 +11965,13 @@ msgstr "複寫所有�設類別項目。"
 
 #: editor/plugins/theme_editor_plugin.cpp
 msgid "Select the variation base type from a list of available types."
-msgstr ""
+msgstr "從�用的型別列表中�擇基礎型別的變化。"
 
 #: editor/plugins/theme_editor_plugin.cpp
 msgid ""
 "A type associated with a built-in class cannot be marked as a variation of "
 "another type."
-msgstr ""
+msgstr "與內建型別相關�的型別無法被標記為�一個型別的變化。"
 
 #: editor/plugins/theme_editor_plugin.cpp
 msgid "Theme:"
@@ -12235,55 +12206,46 @@ msgid "Clear Transform"
 msgstr "清除變�"
 
 #: editor/plugins/tile_map_editor_plugin.cpp
-#, fuzzy
 msgid "Tile Map"
-msgstr "繪製圖塊地圖"
+msgstr "圖塊地圖"
 
 #: editor/plugins/tile_map_editor_plugin.cpp
 #: modules/gridmap/grid_map_editor_plugin.cpp
 msgid "Palette Min Width"
-msgstr ""
+msgstr "調色盤最�寬度"
 
 #: editor/plugins/tile_map_editor_plugin.cpp
-#, fuzzy
 msgid "Palette Item H Separation"
-msgstr "帶�稱的分隔線"
+msgstr "調色盤項目的水平分隔線"
 
 #: editor/plugins/tile_map_editor_plugin.cpp
-#, fuzzy
 msgid "Show Tile Names"
-msgstr "顯示所有地�"
+msgstr "顯示圖塊�稱"
 
 #: editor/plugins/tile_map_editor_plugin.cpp
-#, fuzzy
 msgid "Show Tile Ids"
-msgstr "顯示尺�"
+msgstr "顯示圖塊 ID"
 
 #: editor/plugins/tile_map_editor_plugin.cpp
-#, fuzzy
 msgid "Sort Tiles By Name"
-msgstr "檔案排�"
+msgstr "以�稱排�圖塊"
 
 #: editor/plugins/tile_map_editor_plugin.cpp
-#, fuzzy
 msgid "Bucket Fill Preview"
-msgstr "油漆桶填滿"
+msgstr "油漆桶填充�覽"
 
 #: editor/plugins/tile_map_editor_plugin.cpp
 #: modules/gridmap/grid_map_editor_plugin.cpp
-#, fuzzy
 msgid "Editor Side"
-msgstr "編輯器"
+msgstr "編輯器�欄"
 
 #: editor/plugins/tile_map_editor_plugin.cpp
-#, fuzzy
 msgid "Display Grid"
-msgstr "顯示�度繪圖"
+msgstr "顯示柵欄"
 
 #: editor/plugins/tile_map_editor_plugin.cpp
-#, fuzzy
 msgid "Axis Color"
-msgstr "�擇�色"
+msgstr "座標軸�色"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
 msgid "Add Texture(s) to TileSet."
@@ -12616,7 +12578,6 @@ msgid "This property can't be changed."
 msgstr "該屬性無法修改。"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Snap Options"
 msgstr "�附�項"
 
@@ -12645,9 +12606,8 @@ msgid "Separation"
 msgstr "é–“è·�"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Selected Tile"
-msgstr "�擇"
+msgstr "所�圖塊"
 
 #: editor/plugins/tile_set_editor_plugin.cpp scene/2d/cpu_particles_2d.cpp
 #: scene/2d/light_2d.cpp scene/2d/line_2d.cpp scene/2d/mesh_instance_2d.cpp
@@ -12656,9 +12616,8 @@ msgstr "�擇"
 #: scene/gui/nine_patch_rect.cpp scene/gui/texture_rect.cpp
 #: scene/resources/material.cpp scene/resources/sky.cpp
 #: scene/resources/style_box.cpp scene/resources/visual_shader_nodes.cpp
-#, fuzzy
 msgid "Texture"
-msgstr "純文字"
+msgstr "紋�貼圖"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
 msgid "Tex Offset"
@@ -12672,86 +12631,72 @@ msgstr "�質"
 
 #: editor/plugins/tile_set_editor_plugin.cpp scene/2d/canvas_item.cpp
 #: scene/3d/label_3d.cpp scene/3d/sprite_3d.cpp scene/resources/style_box.cpp
-#, fuzzy
 msgid "Modulate"
-msgstr "å¡«å……"
+msgstr "調變"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Tile Mode"
-msgstr "切�模�"
+msgstr "圖塊模�"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Autotile Bitmask Mode"
-msgstr "優先模�"
+msgstr "自動圖塊的�元�罩模�"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
 msgid "Subtile Size"
 msgstr "�圖塊大�"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Subtile Spacing"
-msgstr "行間�"
+msgstr "自圖塊間�"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Occluder Offset"
-msgstr "建立�光多邊形"
+msgstr "�光�移"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Navigation Offset"
-msgstr "導航模�"
+msgstr "導航�移"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
 msgid "Shape Offset"
 msgstr "形狀�移"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Shape Transform"
-msgstr "變�"
+msgstr "形狀變�"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Selected Collision"
-msgstr "碰撞"
+msgstr "所�碰撞"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Selected Collision One Way"
-msgstr "僅�尋所��域"
+msgstr "所�碰撞單�"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Selected Collision One Way Margin"
-msgstr "碰撞模�"
+msgstr "所�碰撞單�外邊�"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Selected Navigation"
-msgstr "顯示導航"
+msgstr "所�導航"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Selected Occlusion"
-msgstr "�擇"
+msgstr "所��擋"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
-#, fuzzy
 msgid "Tileset Script"
-msgstr "篩�腳本"
+msgstr "圖塊集腳本"
 
 #: editor/plugins/tile_set_editor_plugin.cpp
 msgid "TileSet"
 msgstr "圖塊集"
 
 #: editor/plugins/version_control_editor_plugin.cpp
-#, fuzzy
 msgid "No VCS plugins are available."
-msgstr "無�用的版本控制 (VCS) 擴充功能。"
+msgstr "無�用的版本控制 (VCS) 外掛。"
 
 #: editor/plugins/version_control_editor_plugin.cpp
 msgid ""
@@ -12759,9 +12704,8 @@ msgid ""
 msgstr "�端設定是空的。使用網路的VCS功能�無法�作。"
 
 #: editor/plugins/version_control_editor_plugin.cpp
-#, fuzzy
 msgid "No commit message was provided."
-msgstr "未�供�稱。"
+msgstr "未�供�� (Commit) 訊�。"
 
 #: editor/plugins/version_control_editor_plugin.cpp
 msgid "Commit"
@@ -12792,14 +12736,12 @@ msgid "Do you want to remove the %s branch?"
 msgstr "你確定�移除 %s 分支？"
 
 #: editor/plugins/version_control_editor_plugin.cpp
-#, fuzzy
 msgid "Do you want to remove the %s remote?"
-msgstr "確定�打開多個專案嗎？"
+msgstr "確定�移除�端「%s�？"
 
 #: editor/plugins/version_control_editor_plugin.cpp
-#, fuzzy
 msgid "Apply"
-msgstr "套用�設"
+msgstr "套用"
 
 #: editor/plugins/version_control_editor_plugin.cpp
 msgid "Version Control System"
@@ -12810,9 +12752,8 @@ msgid "Initialize"
 msgstr "�始化"
 
 #: editor/plugins/version_control_editor_plugin.cpp
-#, fuzzy
 msgid "Remote Login"
-msgstr "移除控制點"
+msgstr "�端登入"
 
 #: editor/plugins/version_control_editor_plugin.cpp
 msgid "Select SSH public key path"
@@ -12843,55 +12784,48 @@ msgid "Unstage all changes"
 msgstr "撤銷暫存所有變更"
 
 #: editor/plugins/version_control_editor_plugin.cpp
-#, fuzzy
 msgid "Commit Message"
-msgstr "�交改動"
+msgstr "�� (Commit) 訊�"
 
 #: editor/plugins/version_control_editor_plugin.cpp
 msgid "Commit Changes"
 msgstr "�交改動"
 
 #: editor/plugins/version_control_editor_plugin.cpp
-#, fuzzy
 msgid "Commit List"
-msgstr "�交"
+msgstr "��列表"
 
 #: editor/plugins/version_control_editor_plugin.cpp
 msgid "Commit list size"
-msgstr "簽入列表大�"
+msgstr "��列表大�"
 
 #: editor/plugins/version_control_editor_plugin.cpp
 msgid "Branches"
 msgstr "分支"
 
 #: editor/plugins/version_control_editor_plugin.cpp
-#, fuzzy
 msgid "Create New Branch"
-msgstr "建立新專案"
+msgstr "建立分支"
 
 #: editor/plugins/version_control_editor_plugin.cpp
-#, fuzzy
 msgid "Remove Branch"
-msgstr "刪除動畫軌"
+msgstr "移除分支"
 
 #: editor/plugins/version_control_editor_plugin.cpp
 msgid "Branch Name"
 msgstr "分支�稱"
 
 #: editor/plugins/version_control_editor_plugin.cpp
-#, fuzzy
 msgid "Remotes"
 msgstr "�端"
 
 #: editor/plugins/version_control_editor_plugin.cpp
-#, fuzzy
 msgid "Create New Remote"
-msgstr "建立新專案"
+msgstr "建立�端"
 
 #: editor/plugins/version_control_editor_plugin.cpp
-#, fuzzy
 msgid "Remove Remote"
-msgstr "移除項目"
+msgstr "移除�端"
 
 #: editor/plugins/version_control_editor_plugin.cpp
 msgid "Remote Name"
@@ -12903,15 +12837,15 @@ msgstr "�端網�"
 
 #: editor/plugins/version_control_editor_plugin.cpp
 msgid "Fetch"
-msgstr "��"
+msgstr "截� (Fetch)"
 
 #: editor/plugins/version_control_editor_plugin.cpp
 msgid "Pull"
-msgstr "拉�"
+msgstr "�� (Pull)"
 
 #: editor/plugins/version_control_editor_plugin.cpp
 msgid "Push"
-msgstr "推�"
+msgstr "推� (Push)"
 
 #: editor/plugins/version_control_editor_plugin.cpp
 msgid "Force Push"
@@ -12919,7 +12853,7 @@ msgstr "強制推�"
 
 #: editor/plugins/version_control_editor_plugin.cpp
 msgid "Modified"
-msgstr "已修改"
+msgstr "修改"
 
 #: editor/plugins/version_control_editor_plugin.cpp
 msgid "Renamed"
@@ -12927,11 +12861,11 @@ msgstr "�新命�"
 
 #: editor/plugins/version_control_editor_plugin.cpp
 msgid "Deleted"
-msgstr "已刪除"
+msgstr "刪除"
 
 #: editor/plugins/version_control_editor_plugin.cpp
 msgid "Typechange"
-msgstr "格�更改"
+msgstr "更改型別"
 
 #: editor/plugins/version_control_editor_plugin.cpp
 msgid "Unmerged"
@@ -12942,14 +12876,12 @@ msgid "View:"
 msgstr "檢視："
 
 #: editor/plugins/version_control_editor_plugin.cpp
-#, fuzzy
 msgid "Split"
-msgstr "拆分路徑"
+msgstr "分割"
 
 #: editor/plugins/version_control_editor_plugin.cpp
-#, fuzzy
 msgid "Unified"
-msgstr "已修改"
+msgstr "�併"
 
 #: editor/plugins/visual_shader_editor_plugin.cpp
 msgid "(GLES3 only)"
@@ -13806,11 +13738,11 @@ msgstr "�執行"
 
 #: editor/project_export.cpp
 msgid "Export the project for all the presets defined."
-msgstr ""
+msgstr "使用�個已定義的�設設定來匯出該專案。"
 
 #: editor/project_export.cpp
 msgid "All presets must have an export path defined for Export All to work."
-msgstr ""
+msgstr "所有�設設定都必須定義好匯出路徑，��使用 [匯出全部] 功能。"
 
 #: editor/project_export.cpp
 msgid "Delete preset '%s'?"
@@ -13921,11 +13853,12 @@ msgid ""
 "Note: Encryption key needs to be stored in the binary,\n"
 "you need to build the export templates from source."
 msgstr ""
+"注�：加密金鑰必須以二進�形��存，\n"
+"必須從原始碼來編譯匯出樣�。"
 
 #: editor/project_export.cpp
-#, fuzzy
 msgid "More Info..."
-msgstr "移動至..."
+msgstr "更多資訊..."
 
 #: editor/project_export.cpp
 msgid "Export PCK/Zip..."
@@ -13952,18 +13885,16 @@ msgid "ZIP File"
 msgstr "ZIP 檔案"
 
 #: editor/project_export.cpp
-#, fuzzy
 msgid "Godot Project Pack"
-msgstr "Godot �戲包"
+msgstr "Godot 專案包"
 
 #: editor/project_export.cpp
 msgid "Export templates for this platform are missing:"
 msgstr "缺少匯出該平�用的樣�："
 
 #: editor/project_export.cpp
-#, fuzzy
 msgid "Project Export"
-msgstr "專案發起人"
+msgstr "專案匯出"
 
 #: editor/project_export.cpp
 msgid "Manage Export Templates"
@@ -14263,7 +14194,6 @@ msgstr ""
 
 #. TRANSLATORS: This refers to the application where users manage their Godot projects.
 #: editor/project_manager.cpp
-#, fuzzy
 msgctxt "Application"
 msgid "Project Manager"
 msgstr "專案管�員"
@@ -15007,6 +14937,9 @@ msgid ""
 "To save this branch into its own scene, open the original scene, right click "
 "on this branch, and select \"Save Branch as Scene\"."
 msgstr ""
+"無法�存分支，該分支是已實體化場景的�項目。\n"
+"若�將該分支�存進�立的場景中，請開啟原始場景，並在該分支上點擊��，然後�"
+"擇 [將分支�存為場景]。"
 
 #: editor/scene_tree_dock.cpp
 msgid ""
@@ -15014,6 +14947,9 @@ msgid ""
 "To save this branch into its own scene, open the original scene, right click "
 "on this branch, and select \"Save Branch as Scene\"."
 msgstr ""
+"無法�存分支，該分支是繼承場景的一部分。\n"
+"若�將該分支�存為�立的場景，請開啟原始場景，並在該分支上點擊��，然後�擇 "
+"[將分支�存為場景]。"
 
 #: editor/scene_tree_dock.cpp
 msgid "Save New Scene As..."
@@ -15039,7 +14975,7 @@ msgstr "轉為本地"
 
 #: editor/scene_tree_dock.cpp editor/scene_tree_editor.cpp
 msgid "Another node already uses this unique name in the scene."
-msgstr ""
+msgstr "�一個節點已在該場景中使用了這個���複的�稱。"
 
 #: editor/scene_tree_dock.cpp
 msgid "Enable Scene Unique Name"
@@ -15121,7 +15057,7 @@ msgstr "�資�"
 
 #: editor/scene_tree_dock.cpp
 msgid "Access as Scene Unique Name"
-msgstr ""
+msgstr "以��複的場景�稱來存�"
 
 #: editor/scene_tree_dock.cpp
 msgid "Clear Inheritance"
@@ -15216,18 +15152,16 @@ msgid "Clear Inheritance? (No Undo!)"
 msgstr "確定�清除繼承嗎？（無法復原�）"
 
 #: editor/scene_tree_dock.cpp
-#, fuzzy
 msgid "Show Scene Tree Root Selection"
-msgstr "置中所�"
+msgstr "顯示場景樹的根�擇"
 
 #: editor/scene_tree_dock.cpp
 msgid "Derive Script Globals By Name"
-msgstr ""
+msgstr "�照�稱來推斷腳本的全域變數"
 
 #: editor/scene_tree_dock.cpp
-#, fuzzy
 msgid "Use Favorites Root Selection"
-msgstr "完整顯示所�"
+msgstr "使用我的最愛根�擇"
 
 #: editor/scene_tree_editor.cpp
 msgid "Toggle Visible"
@@ -15255,6 +15189,8 @@ msgid ""
 "with the '%s' prefix in a node path.\n"
 "Click to disable this."
 msgstr ""
+"該節點�在此場景中的任何地方通�在節點路徑�方加上「%s��置詞來存�。\n"
+"點擊以�用。"
 
 #: editor/scene_tree_editor.cpp
 msgid ""
@@ -15537,21 +15473,20 @@ msgid "Stack Frames"
 msgstr "堆疊框"
 
 #: editor/script_editor_debugger.cpp
-#, fuzzy
 msgid "Filter stack variables"
-msgstr "篩�圖塊"
+msgstr "篩�堆疊變數"
 
 #: editor/script_editor_debugger.cpp
 msgid "Auto Switch To Remote Scene Tree"
-msgstr ""
+msgstr "自動切�至�端場景樹"
 
 #: editor/script_editor_debugger.cpp
 msgid "Remote Scene Tree Refresh Interval"
-msgstr ""
+msgstr "�端場景樹�新整�間隔"
 
 #: editor/script_editor_debugger.cpp
 msgid "Remote Inspect Refresh Interval"
-msgstr ""
+msgstr "�端檢查�新整�間隔"
 
 #: editor/script_editor_debugger.cpp
 msgid "Network Profiler"
@@ -15649,7 +15584,7 @@ msgstr "更改光照�徑"
 
 #: editor/spatial_editor_gizmos.cpp
 msgid "Stream Player 3D"
-msgstr ""
+msgstr "StreamPlayer3D"
 
 #: editor/spatial_editor_gizmos.cpp
 msgid "Change AudioStreamPlayer3D Emission Angle"
@@ -15659,7 +15594,7 @@ msgstr "更改 AudioStreamPlayer3D 發射角"
 #: platform/osx/export/export.cpp
 #: scene/resources/default_theme/default_theme.cpp
 msgid "Camera"
-msgstr ""
+msgstr "相機"
 
 #: editor/spatial_editor_gizmos.cpp
 msgid "Change Camera FOV"
@@ -15671,7 +15606,7 @@ msgstr "更改相機尺寸"
 
 #: editor/spatial_editor_gizmos.cpp
 msgid "Visibility Notifier"
-msgstr ""
+msgstr "VisibilityNotifier"
 
 #: editor/spatial_editor_gizmos.cpp
 msgid "Change Notifier AABB"
@@ -15682,23 +15617,20 @@ msgid "Change Particles AABB"
 msgstr "更改粒� AABB"
 
 #: editor/spatial_editor_gizmos.cpp
-#, fuzzy
 msgid "Reflection Probe"
-msgstr "�擇屬性"
+msgstr "�射探查"
 
 #: editor/spatial_editor_gizmos.cpp
 msgid "Change Probe Extents"
 msgstr "更改探查範�"
 
 #: editor/spatial_editor_gizmos.cpp
-#, fuzzy
 msgid "GI Probe"
-msgstr "烘焙 GI 探查"
+msgstr "GI 探查"
 
 #: editor/spatial_editor_gizmos.cpp
-#, fuzzy
 msgid "Baked Indirect Light"
-msgstr "��性光照"
+msgstr "烘焙間接光照"
 
 #: editor/spatial_editor_gizmos.cpp modules/csg/csg_gizmos.cpp
 msgid "Change Sphere Shape Radius"
@@ -15729,14 +15661,12 @@ msgid "Change Ray Shape Length"
 msgstr "更改射線形長度"
 
 #: editor/spatial_editor_gizmos.cpp
-#, fuzzy
 msgid "Navigation Edge"
-msgstr "導航模�"
+msgstr "導航邊界"
 
 #: editor/spatial_editor_gizmos.cpp
-#, fuzzy
 msgid "Navigation Edge Disabled"
-msgstr "導航模�"
+msgstr "已�用導航邊界"
 
 #: editor/spatial_editor_gizmos.cpp
 #, fuzzy
@@ -19984,15 +19914,15 @@ msgstr "找�到金鑰儲存�，無法匯出。"
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start rcedit executable, configure rcedit path in the Editor "
-"Settings (Export > Windows > Rcedit)."
+"Could not start rcedit executable. Configure rcedit path in the Editor "
+"Settings (Export > Windows > Rcedit), or disable \"Application > Modify "
+"Resources\" in the export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"rcedit failed to modify executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "rcedit failed to modify executable: %s."
+msgstr "無效的副檔�。"
 
 #: platform/windows/export/export.cpp
 #, fuzzy
@@ -20015,15 +19945,15 @@ msgstr "無效的�稱。"
 
 #: platform/windows/export/export.cpp
 msgid ""
-"Could not start signtool executable, configure signtool path in the Editor "
-"Settings (Export > Windows > Signtool)."
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > Signtool), or disable \"Codesign\" in the "
+"export preset."
 msgstr ""
 
 #: platform/windows/export/export.cpp
-msgid ""
-"Signtool failed to sign executable:\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Signtool failed to sign executable: %s."
+msgstr "無效的副檔�。"
 
 #: platform/windows/export/export.cpp
 msgid "Failed to remove temporary file \"%s\"."
@@ -26646,9 +26576,8 @@ msgid "Normal Texture"
 msgstr "法線紋�貼圖"
 
 #: scene/resources/particles_material.cpp
-#, fuzzy
 msgid "Color Texture"
-msgstr "編輯器主題"
+msgstr "�色紋�貼圖"
 
 #: scene/resources/particles_material.cpp
 #, fuzzy
diff --git a/main/main.cpp b/main/main.cpp
index fe510d1c9c..6559b69f2e 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -161,7 +161,7 @@ static DisplayServer::WindowMode window_mode = DisplayServer::WINDOW_MODE_WINDOW
 static DisplayServer::ScreenOrientation window_orientation = DisplayServer::SCREEN_LANDSCAPE;
 static DisplayServer::VSyncMode window_vsync_mode = DisplayServer::VSYNC_ENABLED;
 static uint32_t window_flags = 0;
-static Size2i window_size = Size2i(1024, 600);
+static Size2i window_size = Size2i(1152, 648);
 
 static int init_screen = -1;
 static bool init_fullscreen = false;
@@ -431,6 +431,7 @@ Error Main::test_setup() {
 
 	/** INITIALIZE SERVERS **/
 	register_server_types();
+	XRServer::set_xr_mode(XRServer::XRMODE_OFF); // Skip in tests.
 	initialize_modules(MODULE_INITIALIZATION_LEVEL_SERVERS);
 	NativeExtensionManager::get_singleton()->initialize_extensions(NativeExtension::INITIALIZATION_LEVEL_SERVERS);
 
@@ -1480,7 +1481,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 		OS::get_singleton()->_allow_layered = false;
 	}
 
-	OS::get_singleton()->_keep_screen_on = GLOBAL_DEF("display/window/energy_saving/keep_screen_on", true);
 	if (rtm == -1) {
 		rtm = GLOBAL_DEF("rendering/driver/threads/thread_model", OS::RENDER_THREAD_SAFE);
 	}
@@ -1997,10 +1997,16 @@ Error Main::setup2(Thread::ID p_main_tid_override) {
 	GLOBAL_DEF_RST("internationalization/rendering/text_driver", "");
 	String text_driver_options;
 	for (int i = 0; i < TextServerManager::get_singleton()->get_interface_count(); i++) {
-		if (i > 0) {
+		const String driver_name = TextServerManager::get_singleton()->get_interface(i)->get_name();
+		if (driver_name == "Dummy") {
+			// Dummy text driver cannot draw any text, making the editor unusable if selected.
+			continue;
+		}
+		if (!text_driver_options.is_empty() && text_driver_options.find(",") == -1) {
+			// Not the first option; add a comma before it as a separator for the property hint.
 			text_driver_options += ",";
 		}
-		text_driver_options += TextServerManager::get_singleton()->get_interface(i)->get_name();
+		text_driver_options += driver_name;
 	}
 	ProjectSettings::get_singleton()->set_custom_property_info("internationalization/rendering/text_driver", PropertyInfo(Variant::STRING, "internationalization/rendering/text_driver", PROPERTY_HINT_ENUM, text_driver_options));
 
diff --git a/methods.py b/methods.py
index b719395ae0..ba7474ea02 100644
--- a/methods.py
+++ b/methods.py
@@ -1,5 +1,6 @@
 import os
 import re
+import sys
 import glob
 import subprocess
 from collections import OrderedDict
@@ -336,7 +337,20 @@ def disable_module(self):
     self.disabled_modules.append(self.current_module)
 
 
-def module_check_dependencies(self, module, dependencies, silent=False):
+def module_add_dependencies(self, module, dependencies, optional=False):
+    """
+    Adds dependencies for a given module.
+    Meant to be used in module `can_build` methods.
+    """
+    if module not in self.module_dependencies:
+        self.module_dependencies[module] = [[], []]
+    if optional:
+        self.module_dependencies[module][1].extend(dependencies)
+    else:
+        self.module_dependencies[module][0].extend(dependencies)
+
+
+def module_check_dependencies(self, module):
     """
     Checks if module dependencies are enabled for a given module,
     and prints a warning if they aren't.
@@ -344,23 +358,41 @@ def module_check_dependencies(self, module, dependencies, silent=False):
     Returns a boolean (True if dependencies are satisfied).
     """
     missing_deps = []
-    for dep in dependencies:
+    required_deps = self.module_dependencies[module][0] if module in self.module_dependencies else []
+    for dep in required_deps:
         opt = "module_{}_enabled".format(dep)
         if not opt in self or not self[opt]:
             missing_deps.append(dep)
 
     if missing_deps != []:
-        if not silent:
-            print(
-                "Disabling '{}' module as the following dependencies are not satisfied: {}".format(
-                    module, ", ".join(missing_deps)
-                )
+        print(
+            "Disabling '{}' module as the following dependencies are not satisfied: {}".format(
+                module, ", ".join(missing_deps)
             )
+        )
         return False
     else:
         return True
 
 
+def sort_module_list(env):
+    out = OrderedDict()
+    deps = {k: v[0] + list(filter(lambda x: x in env.module_list, v[1])) for k, v in env.module_dependencies.items()}
+
+    frontier = list(env.module_list.keys())
+    explored = []
+    while len(frontier):
+        cur = frontier.pop()
+        deps_list = deps[cur] if cur in deps else []
+        if len(deps_list) and any([d not in explored for d in deps_list]):
+            # Will explore later, after its dependencies
+            frontier.insert(0, cur)
+            continue
+        explored.append(cur)
+    for k in explored:
+        env.module_list.move_to_end(k)
+
+
 def use_windows_spawn_fix(self, platform=None):
 
     if os.name != "nt":
@@ -388,6 +420,7 @@ def use_windows_spawn_fix(self, platform=None):
             startupinfo=startupinfo,
             shell=False,
             env=env,
+            text=True,
         )
         _, err = proc.communicate()
         rv = proc.wait()
diff --git a/misc/dist/ios_xcode/godot_ios.xcodeproj/project.pbxproj b/misc/dist/ios_xcode/godot_ios.xcodeproj/project.pbxproj
index 69899cbe8d..467aa3ce83 100644
--- a/misc/dist/ios_xcode/godot_ios.xcodeproj/project.pbxproj
+++ b/misc/dist/ios_xcode/godot_ios.xcodeproj/project.pbxproj
@@ -10,6 +10,7 @@
 		1F1575721F582BE20003B888 /* dylibs in Resources */ = {isa = PBXBuildFile; fileRef = 1F1575711F582BE20003B888 /* dylibs */; };
 		DEADBEEF2F582BE20003B888 /* $binary.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEADBEEF1F582BE20003B888 /* $binary.xcframework */; };
 		$modules_buildfile
+		$swift_runtime_buildfile
 		1FF8DBB11FBA9DE1009DE660 /* dummy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FF8DBB01FBA9DE1009DE660 /* dummy.cpp */; };
 		D07CD44E1C5D589C00B7FB28 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D07CD44D1C5D589C00B7FB28 /* Images.xcassets */; };
 		9039D3BE24C093AC0020482C /* MoltenVK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9039D3BD24C093AC0020482C /* MoltenVK.xcframework */; };
@@ -37,6 +38,7 @@
 		1F1575711F582BE20003B888 /* dylibs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dylibs; path = "$binary/dylibs"; sourceTree = "<group>"; };
 		DEADBEEF1F582BE20003B888 /* $binary.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = godot; path = "$binary.xcframework"; sourceTree = "<group>"; };
 		$modules_fileref
+		$swift_runtime_fileref
 		1FF4C1881F584E6300A41E41 /* $binary.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "$binary.entitlements"; sourceTree = "<group>"; };
 		1FF8DBB01FBA9DE1009DE660 /* dummy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = dummy.cpp; sourceTree = "<group>"; };
 		9039D3BD24C093AC0020482C /* MoltenVK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = MoltenVK; path = MoltenVK.xcframework; sourceTree = "<group>"; };
@@ -107,6 +109,7 @@
 				D07CD44D1C5D589C00B7FB28 /* Images.xcassets */,
 				D0BCFE4218AEBDA2004A7AAE /* Supporting Files */,
 				1FF8DBB01FBA9DE1009DE660 /* dummy.cpp */,
+				$swift_runtime_binary_files
 			);
 			path = "$binary";
 			sourceTree = "<group>";
@@ -152,6 +155,7 @@
 				TargetAttributes = {
 					D0BCFE3318AEBDA2004A7AAE = {
 						DevelopmentTeam = $team_id;
+						$swift_runtime_migration
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 						};
@@ -198,6 +202,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				1FF8DBB11FBA9DE1009DE660 /* dummy.cpp in Sources */,
+				$swift_runtime_build_phase
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -329,6 +334,7 @@
 				TARGETED_DEVICE_FAMILY = "$targeted_device_family";
 				VALID_ARCHS = "arm64 x86_64";
 				WRAPPER_EXTENSION = app;
+				$swift_runtime_build_settings
 			};
 			name = Debug;
 		};
@@ -360,6 +366,7 @@
 				TARGETED_DEVICE_FAMILY = "$targeted_device_family";
 				VALID_ARCHS = "arm64 x86_64";
 				WRAPPER_EXTENSION = app;
+				$swift_runtime_build_settings
 			};
 			name = Release;
 		};
diff --git a/modules/websocket/emws_server.cpp b/misc/dist/ios_xcode/godot_ios/dummy.h
index 2033098cad..ea6c0f78e4 100644
--- a/modules/websocket/emws_server.cpp
+++ b/misc/dist/ios_xcode/godot_ios/dummy.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  emws_server.cpp                                                      */
+/*  dummy.h                                                              */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,65 +28,4 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifdef JAVASCRIPT_ENABLED
-
-#include "emws_server.h"
-#include "core/os/os.h"
-
-void EMWSServer::set_extra_headers(const Vector<String> &p_headers) {
-}
-
-Error EMWSServer::listen(int p_port, Vector<String> p_protocols, bool gd_mp_api) {
-	return FAILED;
-}
-
-bool EMWSServer::is_listening() const {
-	return false;
-}
-
-void EMWSServer::stop() {
-}
-
-bool EMWSServer::has_peer(int p_id) const {
-	return false;
-}
-
-Ref<WebSocketPeer> EMWSServer::get_peer(int p_id) const {
-	return nullptr;
-}
-
-Vector<String> EMWSServer::get_protocols() const {
-	Vector<String> out;
-
-	return out;
-}
-
-IPAddress EMWSServer::get_peer_address(int p_peer_id) const {
-	return IPAddress();
-}
-
-int EMWSServer::get_peer_port(int p_peer_id) const {
-	return 0;
-}
-
-void EMWSServer::disconnect_peer(int p_peer_id, int p_code, String p_reason) {
-}
-
-void EMWSServer::poll() {
-}
-
-int EMWSServer::get_max_packet_size() const {
-	return 0;
-}
-
-Error EMWSServer::set_buffers(int p_in_buffer, int p_in_packets, int p_out_buffer, int p_out_packets) {
-	return OK;
-}
-
-EMWSServer::EMWSServer() {
-}
-
-EMWSServer::~EMWSServer() {
-}
-
-#endif // JAVASCRIPT_ENABLED
+// #import <Foundation/Foundation.h>
diff --git a/misc/dist/ios_xcode/godot_ios/dummy.swift b/misc/dist/ios_xcode/godot_ios/dummy.swift
new file mode 100644
index 0000000000..86c76b64d3
--- /dev/null
+++ b/misc/dist/ios_xcode/godot_ios/dummy.swift
@@ -0,0 +1,31 @@
+/*************************************************************************/
+/*  dummy.swift                                                          */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+import Foundation
diff --git a/modules/bmp/SCsub b/modules/bmp/SCsub
index 4f3405ff28..9d317887c3 100644
--- a/modules/bmp/SCsub
+++ b/modules/bmp/SCsub
@@ -5,5 +5,5 @@ Import("env_modules")
 
 env_bmp = env_modules.Clone()
 
-# Godot's own source files
+# Godot source files
 env_bmp.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/csg/SCsub b/modules/csg/SCsub
index c7307ddefd..55f859db11 100644
--- a/modules/csg/SCsub
+++ b/modules/csg/SCsub
@@ -3,10 +3,9 @@
 Import("env")
 Import("env_modules")
 
-# Godot's own source files
 env_csg = env_modules.Clone()
 
-# Godot's own source files
+# Godot source files
 env_csg.add_source_files(env.modules_sources, "*.cpp")
 if env["tools"]:
     env_csg.add_source_files(env.modules_sources, "editor/*.cpp")
diff --git a/modules/csg/csg.cpp b/modules/csg/csg.cpp
index 93533e1690..6b05c146e6 100644
--- a/modules/csg/csg.cpp
+++ b/modules/csg/csg.cpp
@@ -729,7 +729,7 @@ void CSGBrushOperation::MeshMerge::mark_inside_faces() {
 	}
 }
 
-void CSGBrushOperation::MeshMerge::add_face(const Vector3 p_points[], const Vector2 p_uvs[], bool p_smooth, bool p_invert, const Ref<Material> &p_material, bool p_from_b) {
+void CSGBrushOperation::MeshMerge::add_face(const Vector3 p_points[3], const Vector2 p_uvs[3], bool p_smooth, bool p_invert, const Ref<Material> &p_material, bool p_from_b) {
 	int indices[3];
 	for (int i = 0; i < 3; i++) {
 		VertexKey vk;
diff --git a/modules/csg/doc_classes/CSGShape3D.xml b/modules/csg/doc_classes/CSGShape3D.xml
index f1cd28e00f..4fd4a12a1d 100644
--- a/modules/csg/doc_classes/CSGShape3D.xml
+++ b/modules/csg/doc_classes/CSGShape3D.xml
@@ -13,14 +13,14 @@
 	<methods>
 		<method name="get_collision_layer_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
 				Returns whether or not the specified layer of the [member collision_layer] is enabled, given a [code]layer_number[/code] between 1 and 32.
 			</description>
 		</method>
 		<method name="get_collision_mask_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
 				Returns whether or not the specified layer of the [member collision_mask] is enabled, given a [code]layer_number[/code] between 1 and 32.
 			</description>
@@ -39,16 +39,16 @@
 		</method>
 		<method name="set_collision_layer_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
 				Based on [code]value[/code], enables or disables the specified layer in the [member collision_layer], given a [code]layer_number[/code] between 1 and 32.
 			</description>
 		</method>
 		<method name="set_collision_mask_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
 				Based on [code]value[/code], enables or disables the specified layer in the [member collision_mask], given a [code]layer_number[/code] between 1 and 32.
 			</description>
diff --git a/modules/enet/doc_classes/ENetConnection.xml b/modules/enet/doc_classes/ENetConnection.xml
index 14aad0cb39..c9bf1c65e1 100644
--- a/modules/enet/doc_classes/ENetConnection.xml
+++ b/modules/enet/doc_classes/ENetConnection.xml
@@ -12,31 +12,31 @@
 	<methods>
 		<method name="bandwidth_limit">
 			<return type="void" />
-			<argument index="0" name="in_bandwidth" type="int" default="0" />
-			<argument index="1" name="out_bandwidth" type="int" default="0" />
+			<param index="0" name="in_bandwidth" type="int" default="0" />
+			<param index="1" name="out_bandwidth" type="int" default="0" />
 			<description>
 				Adjusts the bandwidth limits of a host.
 			</description>
 		</method>
 		<method name="broadcast">
 			<return type="void" />
-			<argument index="0" name="channel" type="int" />
-			<argument index="1" name="packet" type="PackedByteArray" />
-			<argument index="2" name="flags" type="int" />
+			<param index="0" name="channel" type="int" />
+			<param index="1" name="packet" type="PackedByteArray" />
+			<param index="2" name="flags" type="int" />
 			<description>
 				Queues a [code]packet[/code] to be sent to all peers associated with the host over the specified [code]channel[/code]. See [ENetPacketPeer] [code]FLAG_*[/code] constants for available packet flags.
 			</description>
 		</method>
 		<method name="channel_limit">
 			<return type="void" />
-			<argument index="0" name="limit" type="int" />
+			<param index="0" name="limit" type="int" />
 			<description>
 				Limits the maximum allowed channels of future incoming connections.
 			</description>
 		</method>
 		<method name="compress">
 			<return type="void" />
-			<argument index="0" name="mode" type="int" enum="ENetConnection.CompressionMode" />
+			<param index="0" name="mode" type="int" enum="ENetConnection.CompressionMode" />
 			<description>
 				Sets the compression method used for network packets. These have different tradeoffs of compression speed versus bandwidth, you may need to test which one works best for your use case if you use compression at all.
 				[b]Note:[/b] Most games' network design involve sending many small packets frequently (smaller than 4 KB each). If in doubt, it is recommended to keep the default compression algorithm as it works best on these small packets.
@@ -45,10 +45,10 @@
 		</method>
 		<method name="connect_to_host">
 			<return type="ENetPacketPeer" />
-			<argument index="0" name="address" type="String" />
-			<argument index="1" name="port" type="int" />
-			<argument index="2" name="channels" type="int" default="0" />
-			<argument index="3" name="data" type="int" default="0" />
+			<param index="0" name="address" type="String" />
+			<param index="1" name="port" type="int" />
+			<param index="2" name="channels" type="int" default="0" />
+			<param index="3" name="data" type="int" default="0" />
 			<description>
 				Initiates a connection to a foreign [code]address[/code] using the specified [code]port[/code] and allocating the requested [code]channels[/code]. Optional [code]data[/code] can be passed during connection in the form of a 32 bit integer.
 				[b]Note:[/b] You must call either [method create_host] or [method create_host_bound] before calling this method.
@@ -56,22 +56,22 @@
 		</method>
 		<method name="create_host">
 			<return type="int" enum="Error" />
-			<argument index="0" name="max_peers" type="int" default="32" />
-			<argument index="1" name="max_channels" type="int" default="0" />
-			<argument index="2" name="in_bandwidth" type="int" default="0" />
-			<argument index="3" name="out_bandwidth" type="int" default="0" />
+			<param index="0" name="max_peers" type="int" default="32" />
+			<param index="1" name="max_channels" type="int" default="0" />
+			<param index="2" name="in_bandwidth" type="int" default="0" />
+			<param index="3" name="out_bandwidth" type="int" default="0" />
 			<description>
 				Create an ENetHost that will allow up to [code]max_peers[/code] connected peers, each allocating up to [code]max_channels[/code] channels, optionally limiting bandwidth to [code]in_bandwidth[/code] and [code]out_bandwidth[/code].
 			</description>
 		</method>
 		<method name="create_host_bound">
 			<return type="int" enum="Error" />
-			<argument index="0" name="bind_address" type="String" />
-			<argument index="1" name="bind_port" type="int" />
-			<argument index="2" name="max_peers" type="int" default="32" />
-			<argument index="3" name="max_channels" type="int" default="0" />
-			<argument index="4" name="in_bandwidth" type="int" default="0" />
-			<argument index="5" name="out_bandwidth" type="int" default="0" />
+			<param index="0" name="bind_address" type="String" />
+			<param index="1" name="bind_port" type="int" />
+			<param index="2" name="max_peers" type="int" default="32" />
+			<param index="3" name="max_channels" type="int" default="0" />
+			<param index="4" name="in_bandwidth" type="int" default="0" />
+			<param index="5" name="out_bandwidth" type="int" default="0" />
 			<description>
 				Create an ENetHost like [method create_host] which is also bound to the given [code]bind_address[/code] and [code]bind_port[/code].
 			</description>
@@ -84,17 +84,17 @@
 		</method>
 		<method name="dtls_client_setup">
 			<return type="int" enum="Error" />
-			<argument index="0" name="certificate" type="X509Certificate" />
-			<argument index="1" name="hostname" type="String" />
-			<argument index="2" name="verify" type="bool" default="true" />
+			<param index="0" name="certificate" type="X509Certificate" />
+			<param index="1" name="hostname" type="String" />
+			<param index="2" name="verify" type="bool" default="true" />
 			<description>
 				Configure this ENetHost to use the custom Godot extension allowing DTLS encryption for ENet clients. Call this before [method connect_to_host] to have ENet connect using DTLS with [code]certificate[/code] and [code]hostname[/code] verification. Verification can be optionally turned off via the [code]verify[/code] parameter.
 			</description>
 		</method>
 		<method name="dtls_server_setup">
 			<return type="int" enum="Error" />
-			<argument index="0" name="key" type="CryptoKey" />
-			<argument index="1" name="certificate" type="X509Certificate" />
+			<param index="0" name="key" type="CryptoKey" />
+			<param index="1" name="certificate" type="X509Certificate" />
 			<description>
 				Configure this ENetHost to use the custom Godot extension allowing DTLS encryption for ENet servers. Call this right after [method create_host_bound] to have ENet expect peers to connect using DTLS.
 			</description>
@@ -126,14 +126,14 @@
 		</method>
 		<method name="pop_statistic">
 			<return type="float" />
-			<argument index="0" name="statistic" type="int" enum="ENetConnection.HostStatistic" />
+			<param index="0" name="statistic" type="int" enum="ENetConnection.HostStatistic" />
 			<description>
 				Returns and resets host statistics. See [enum HostStatistic] for more info.
 			</description>
 		</method>
 		<method name="refuse_new_connections">
 			<return type="void" />
-			<argument index="0" name="refuse" type="bool" />
+			<param index="0" name="refuse" type="bool" />
 			<description>
 				Configures the DTLS server to automatically drop new connections.
 				[b]Note:[/b] This method is only relevant after calling [method dtls_server_setup].
@@ -141,7 +141,7 @@
 		</method>
 		<method name="service">
 			<return type="Array" />
-			<argument index="0" name="timeout" type="int" default="0" />
+			<param index="0" name="timeout" type="int" default="0" />
 			<description>
 				Waits for events on the host specified and shuttles packets between the host and its peers. The returned [Array] will have 4 elements. An [enum EventType], the [ENetPacketPeer] which generated the event, the event associated data (if any), the event associated channel (if any). If the generated event is [constant EVENT_RECEIVE], the received packet will be queued to the associated [ENetPacketPeer].
 				Call this function regularly to handle connections, disconnections, and to receive new packets.
diff --git a/modules/enet/doc_classes/ENetMultiplayerPeer.xml b/modules/enet/doc_classes/ENetMultiplayerPeer.xml
index 2ecf6b4122..5181ae76ce 100644
--- a/modules/enet/doc_classes/ENetMultiplayerPeer.xml
+++ b/modules/enet/doc_classes/ENetMultiplayerPeer.xml
@@ -14,8 +14,8 @@
 	<methods>
 		<method name="add_mesh_peer">
 			<return type="int" enum="Error" />
-			<argument index="0" name="peer_id" type="int" />
-			<argument index="1" name="host" type="ENetConnection" />
+			<param index="0" name="peer_id" type="int" />
+			<param index="1" name="host" type="ENetConnection" />
 			<description>
 				Add a new remote peer with the given [code]peer_id[/code] connected to the given [code]host[/code].
 				[b]Note:[/b] The [code]host[/code] must have exactly one peer in the [constant ENetPacketPeer.STATE_CONNECTED] state.
@@ -23,51 +23,51 @@
 		</method>
 		<method name="close_connection">
 			<return type="void" />
-			<argument index="0" name="wait_usec" type="int" default="100" />
+			<param index="0" name="wait_usec" type="int" default="100" />
 			<description>
 				Closes the connection. Ignored if no connection is currently established. If this is a server it tries to notify all clients before forcibly disconnecting them. If this is a client it simply closes the connection to the server.
 			</description>
 		</method>
 		<method name="create_client">
 			<return type="int" enum="Error" />
-			<argument index="0" name="address" type="String" />
-			<argument index="1" name="port" type="int" />
-			<argument index="2" name="channel_count" type="int" default="0" />
-			<argument index="3" name="in_bandwidth" type="int" default="0" />
-			<argument index="4" name="out_bandwidth" type="int" default="0" />
-			<argument index="5" name="local_port" type="int" default="0" />
+			<param index="0" name="address" type="String" />
+			<param index="1" name="port" type="int" />
+			<param index="2" name="channel_count" type="int" default="0" />
+			<param index="3" name="in_bandwidth" type="int" default="0" />
+			<param index="4" name="out_bandwidth" type="int" default="0" />
+			<param index="5" name="local_port" type="int" default="0" />
 			<description>
 				Create client that connects to a server at [code]address[/code] using specified [code]port[/code]. The given address needs to be either a fully qualified domain name (e.g. [code]"www.example.com"[/code]) or an IP address in IPv4 or IPv6 format (e.g. [code]"192.168.1.1"[/code]). The [code]port[/code] is the port the server is listening on. The [code]channel_count[/code] parameter can be used to specify the number of ENet channels allocated for the connection. The [code]in_bandwidth[/code] and [code]out_bandwidth[/code] parameters can be used to limit the incoming and outgoing bandwidth to the given number of bytes per second. The default of 0 means unlimited bandwidth. Note that ENet will strategically drop packets on specific sides of a connection between peers to ensure the peer's bandwidth is not overwhelmed. The bandwidth parameters also determine the window size of a connection which limits the amount of reliable packets that may be in transit at any given time. Returns [constant OK] if a client was created, [constant ERR_ALREADY_IN_USE] if this ENetMultiplayerPeer instance already has an open connection (in which case you need to call [method close_connection] first) or [constant ERR_CANT_CREATE] if the client could not be created. If [code]local_port[/code] is specified, the client will also listen to the given port; this is useful for some NAT traversal techniques.
 			</description>
 		</method>
 		<method name="create_mesh">
 			<return type="int" enum="Error" />
-			<argument index="0" name="unique_id" type="int" />
+			<param index="0" name="unique_id" type="int" />
 			<description>
 				Initialize this [MultiplayerPeer] in mesh mode. The provided [code]unique_id[/code] will be used as the local peer network unique ID once assigned as the [member MultiplayerAPI.multiplayer_peer]. In the mesh configuration you will need to set up each new peer manually using [ENetConnection] before calling [method add_mesh_peer]. While this technique is more advanced, it allows for better control over the connection process (e.g. when dealing with NAT punch-through) and for better distribution of the network load (which would otherwise be more taxing on the server).
 			</description>
 		</method>
 		<method name="create_server">
 			<return type="int" enum="Error" />
-			<argument index="0" name="port" type="int" />
-			<argument index="1" name="max_clients" type="int" default="32" />
-			<argument index="2" name="max_channels" type="int" default="0" />
-			<argument index="3" name="in_bandwidth" type="int" default="0" />
-			<argument index="4" name="out_bandwidth" type="int" default="0" />
+			<param index="0" name="port" type="int" />
+			<param index="1" name="max_clients" type="int" default="32" />
+			<param index="2" name="max_channels" type="int" default="0" />
+			<param index="3" name="in_bandwidth" type="int" default="0" />
+			<param index="4" name="out_bandwidth" type="int" default="0" />
 			<description>
 				Create server that listens to connections via [code]port[/code]. The port needs to be an available, unused port between 0 and 65535. Note that ports below 1024 are privileged and may require elevated permissions depending on the platform. To change the interface the server listens on, use [method set_bind_ip]. The default IP is the wildcard [code]"*"[/code], which listens on all available interfaces. [code]max_clients[/code] is the maximum number of clients that are allowed at once, any number up to 4095 may be used, although the achievable number of simultaneous clients may be far lower and depends on the application. For additional details on the bandwidth parameters, see [method create_client]. Returns [constant OK] if a server was created, [constant ERR_ALREADY_IN_USE] if this ENetMultiplayerPeer instance already has an open connection (in which case you need to call [method close_connection] first) or [constant ERR_CANT_CREATE] if the server could not be created.
 			</description>
 		</method>
 		<method name="get_peer" qualifiers="const">
 			<return type="ENetPacketPeer" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns the [ENetPacketPeer] associated to the given [code]id[/code].
 			</description>
 		</method>
 		<method name="set_bind_ip">
 			<return type="void" />
-			<argument index="0" name="ip" type="String" />
+			<param index="0" name="ip" type="String" />
 			<description>
 				The IP used when creating a server. This is set to the wildcard [code]"*"[/code] by default, which binds to all available interfaces. The given IP needs to be in IPv4 or IPv6 address format, for example: [code]"192.168.1.1"[/code].
 			</description>
diff --git a/modules/enet/doc_classes/ENetPacketPeer.xml b/modules/enet/doc_classes/ENetPacketPeer.xml
index 5de5a60853..46008317a2 100644
--- a/modules/enet/doc_classes/ENetPacketPeer.xml
+++ b/modules/enet/doc_classes/ENetPacketPeer.xml
@@ -26,7 +26,7 @@
 		</method>
 		<method name="get_statistic">
 			<return type="float" />
-			<argument index="0" name="statistic" type="int" enum="ENetPacketPeer.PeerStatistic" />
+			<param index="0" name="statistic" type="int" enum="ENetPacketPeer.PeerStatistic" />
 			<description>
 				Returns the requested [code]statistic[/code] for this peer. See [enum PeerStatistic].
 			</description>
@@ -39,21 +39,21 @@
 		</method>
 		<method name="peer_disconnect">
 			<return type="void" />
-			<argument index="0" name="data" type="int" default="0" />
+			<param index="0" name="data" type="int" default="0" />
 			<description>
 				Request a disconnection from a peer. An [constant ENetConnection.EVENT_DISCONNECT] will be generated during [method ENetConnection.service] once the disconnection is complete.
 			</description>
 		</method>
 		<method name="peer_disconnect_later">
 			<return type="void" />
-			<argument index="0" name="data" type="int" default="0" />
+			<param index="0" name="data" type="int" default="0" />
 			<description>
 				Request a disconnection from a peer, but only after all queued outgoing packets are sent. An [constant ENetConnection.EVENT_DISCONNECT] will be generated during [method ENetConnection.service] once the disconnection is complete.
 			</description>
 		</method>
 		<method name="peer_disconnect_now">
 			<return type="void" />
-			<argument index="0" name="data" type="int" default="0" />
+			<param index="0" name="data" type="int" default="0" />
 			<description>
 				Force an immediate disconnection from a peer. No [constant ENetConnection.EVENT_DISCONNECT] will be generated. The foreign peer is not guaranteed to receive the disconnect notification, and is reset immediately upon return from this function.
 			</description>
@@ -66,7 +66,7 @@
 		</method>
 		<method name="ping_interval">
 			<return type="void" />
-			<argument index="0" name="ping_interval" type="int" />
+			<param index="0" name="ping_interval" type="int" />
 			<description>
 				Sets the [code]ping_interval[/code] in milliseconds at which pings will be sent to a peer. Pings are used both to monitor the liveness of the connection and also to dynamically adjust the throttle during periods of low traffic so that the throttle has reasonable responsiveness during traffic spikes.
 			</description>
@@ -79,18 +79,18 @@
 		</method>
 		<method name="send">
 			<return type="int" enum="Error" />
-			<argument index="0" name="channel" type="int" />
-			<argument index="1" name="packet" type="PackedByteArray" />
-			<argument index="2" name="flags" type="int" />
+			<param index="0" name="channel" type="int" />
+			<param index="1" name="packet" type="PackedByteArray" />
+			<param index="2" name="flags" type="int" />
 			<description>
 				Queues a [code]packet[/code] to be sent over the specified [code]channel[/code]. See [code]FLAG_*[/code] constants for available packet flags.
 			</description>
 		</method>
 		<method name="set_timeout">
 			<return type="void" />
-			<argument index="0" name="timeout" type="int" />
-			<argument index="1" name="timeout_min" type="int" />
-			<argument index="2" name="timeout_max" type="int" />
+			<param index="0" name="timeout" type="int" />
+			<param index="1" name="timeout_min" type="int" />
+			<param index="2" name="timeout_max" type="int" />
 			<description>
 				Sets the timeout parameters for a peer. The timeout parameters control how and when a peer will timeout from a failure to acknowledge reliable traffic. Timeout values are expressed in milliseconds.
 				The [code]timeout_limit[/code] is a factor that, multiplied by a value based on the average round trip time, will determine the timeout limit for a reliable packet. When that limit is reached, the timeout will be doubled, and the peer will be disconnected if that limit has reached [code]timeout_min[/code]. The [code]timeout_max[/code] parameter, on the other hand, defines a fixed timeout for which any packet must be acknowledged or the peer will be dropped.
@@ -98,9 +98,9 @@
 		</method>
 		<method name="throttle_configure">
 			<return type="void" />
-			<argument index="0" name="interval" type="int" />
-			<argument index="1" name="acceleration" type="int" />
-			<argument index="2" name="deceleration" type="int" />
+			<param index="0" name="interval" type="int" />
+			<param index="1" name="acceleration" type="int" />
+			<param index="2" name="deceleration" type="int" />
 			<description>
 				Configures throttle parameter for a peer.
 				Unreliable packets are dropped by ENet in response to the varying conditions of the Internet connection to the peer. The throttle represents a probability that an unreliable packet should not be dropped and thus sent by ENet to the peer. By measuring fluctuations in round trip times of reliable packets over the specified [code]interval[/code], ENet will either increase the probably by the amount specified in the [code]acceleration[/code] parameter, or decrease it by the amount specified in the [code]deceleration[/code] parameter (both are ratios to [constant PACKET_THROTTLE_SCALE]).
diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub
index 4b2ea6faa5..8efcd72fb6 100644
--- a/modules/freetype/SCsub
+++ b/modules/freetype/SCsub
@@ -58,22 +58,23 @@ if env["builtin_freetype"]:
     ]
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-    thirdparty_brotli_dir = "#thirdparty/brotli/"
-    thirdparty_brotli_sources = [
-        "common/constants.c",
-        "common/context.c",
-        "common/dictionary.c",
-        "common/platform.c",
-        "common/shared_dictionary.c",
-        "common/transform.c",
-        "dec/bit_reader.c",
-        "dec/decode.c",
-        "dec/huffman.c",
-        "dec/state.c",
-    ]
-    thirdparty_sources += [thirdparty_brotli_dir + file for file in thirdparty_brotli_sources]
-    env_freetype.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"])
-    env_freetype.Prepend(CPPPATH=[thirdparty_brotli_dir + "include"])
+    if env["brotli"]:
+        thirdparty_brotli_dir = "#thirdparty/brotli/"
+        thirdparty_brotli_sources = [
+            "common/constants.c",
+            "common/context.c",
+            "common/dictionary.c",
+            "common/platform.c",
+            "common/shared_dictionary.c",
+            "common/transform.c",
+            "dec/bit_reader.c",
+            "dec/decode.c",
+            "dec/huffman.c",
+            "dec/state.c",
+        ]
+        thirdparty_sources += [thirdparty_brotli_dir + file for file in thirdparty_brotli_sources]
+        env_freetype.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"])
+        env_freetype.Prepend(CPPPATH=[thirdparty_brotli_dir + "include"])
 
     if env.get("use_ubsan") or env.get("use_asan") or env.get("use_tsan") or env.get("use_lsan") or env.get("use_msan"):
         env_freetype.Append(CPPDEFINES=["BROTLI_BUILD_PORTABLE"])
diff --git a/modules/freetype/config.py b/modules/freetype/config.py
index d22f9454ed..c0586d5536 100644
--- a/modules/freetype/config.py
+++ b/modules/freetype/config.py
@@ -2,5 +2,13 @@ def can_build(env, platform):
     return True
 
 
+def get_opts(platform):
+    from SCons.Variables import BoolVariable
+
+    return [
+        BoolVariable("brotli", "Enable Brotli decompressor for WOFF2 fonts support", True),
+    ]
+
+
 def configure(env):
     pass
diff --git a/modules/gdscript/config.py b/modules/gdscript/config.py
index 61ce6185a5..a7d5c406e9 100644
--- a/modules/gdscript/config.py
+++ b/modules/gdscript/config.py
@@ -1,4 +1,5 @@
 def can_build(env, platform):
+    env.module_add_dependencies("gdscript", ["jsonrpc", "websocket"], True)
     return True
 
 
diff --git a/modules/gdscript/doc_classes/@GDScript.xml b/modules/gdscript/doc_classes/@GDScript.xml
index 10cf783e73..4fbf8c6936 100644
--- a/modules/gdscript/doc_classes/@GDScript.xml
+++ b/modules/gdscript/doc_classes/@GDScript.xml
@@ -12,10 +12,10 @@
 	<methods>
 		<method name="Color8">
 			<return type="Color" />
-			<argument index="0" name="r8" type="int" />
-			<argument index="1" name="g8" type="int" />
-			<argument index="2" name="b8" type="int" />
-			<argument index="3" name="a8" type="int" default="255" />
+			<param index="0" name="r8" type="int" />
+			<param index="1" name="g8" type="int" />
+			<param index="2" name="b8" type="int" />
+			<param index="3" name="a8" type="int" default="255" />
 			<description>
 				Returns a color constructed from integer red, green, blue, and alpha channels. Each channel should have 8 bits of information ranging from 0 to 255.
 				[code]r8[/code] red channel
@@ -29,8 +29,8 @@
 		</method>
 		<method name="assert">
 			<return type="void" />
-			<argument index="0" name="condition" type="bool" />
-			<argument index="1" name="message" type="String" default="&quot;&quot;" />
+			<param index="0" name="condition" type="bool" />
+			<param index="1" name="message" type="String" default="&quot;&quot;" />
 			<description>
 				Asserts that the [code]condition[/code] is [code]true[/code]. If the [code]condition[/code] is [code]false[/code], an error is generated. When running from the editor, the running project will also be paused until you resume it. This can be used as a stronger form of [method @GlobalScope.push_error] for reporting errors to project developers or add-on users.
 				[b]Note:[/b] For performance reasons, the code inside [method assert] is only executed in debug builds or when running the project from the editor. Don't include code that has side effects in an [method assert] call. Otherwise, the project will behave differently when exported in release mode.
@@ -47,7 +47,7 @@
 		</method>
 		<method name="char">
 			<return type="String" />
-			<argument index="0" name="char" type="int" />
+			<param index="0" name="char" type="int" />
 			<description>
 				Returns a character as a String of the given Unicode code point (which is compatible with ASCII code).
 				[codeblock]
@@ -59,8 +59,8 @@
 		</method>
 		<method name="convert">
 			<return type="Variant" />
-			<argument index="0" name="what" type="Variant" />
-			<argument index="1" name="type" type="int" />
+			<param index="0" name="what" type="Variant" />
+			<param index="1" name="type" type="int" />
 			<description>
 				Converts from a type to another in the best way possible. The [code]type[/code] parameter uses the [enum Variant.Type] values.
 				[codeblock]
@@ -75,7 +75,7 @@
 		</method>
 		<method name="dict2inst">
 			<return type="Object" />
-			<argument index="0" name="dictionary" type="Dictionary" />
+			<param index="0" name="dictionary" type="Dictionary" />
 			<description>
 				Converts a dictionary (previously created with [method inst2dict]) back to an instance. Useful for deserializing.
 			</description>
@@ -103,7 +103,7 @@
 		</method>
 		<method name="inst2dict">
 			<return type="Dictionary" />
-			<argument index="0" name="instance" type="Object" />
+			<param index="0" name="instance" type="Object" />
 			<description>
 				Returns the passed instance converted to a dictionary (useful for serializing).
 				[codeblock]
@@ -122,7 +122,7 @@
 		</method>
 		<method name="len">
 			<return type="int" />
-			<argument index="0" name="var" type="Variant" />
+			<param index="0" name="var" type="Variant" />
 			<description>
 				Returns length of Variant [code]var[/code]. Length is the character count of String, element count of Array, size of Dictionary, etc.
 				[b]Note:[/b] Generates a fatal error if Variant can not provide a length.
@@ -134,7 +134,7 @@
 		</method>
 		<method name="load">
 			<return type="Resource" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Loads a resource from the filesystem located at [code]path[/code]. The resource is loaded on the method call (unless it's referenced already elsewhere, e.g. in another script or in the scene), which might cause slight delay, especially when loading scenes. To avoid unnecessary delays when loading something multiple times, either store the resource in a variable or use [method preload].
 				[b]Note:[/b] Resource paths can be obtained by right-clicking on a resource in the FileSystem dock and choosing "Copy Path" or by dragging the file from the FileSystem dock into the script.
@@ -149,7 +149,7 @@
 		</method>
 		<method name="preload">
 			<return type="Resource" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Returns a [Resource] from the filesystem located at [code]path[/code]. The resource is loaded during script parsing, i.e. is loaded with the script and [method preload] effectively acts as a reference to that resource. Note that the method requires a constant path. If you want to load a resource from a dynamic/variable path, use [method load].
 				[b]Note:[/b] Resource paths can be obtained by right clicking on a resource in the Assets Panel and choosing "Copy Path" or by dragging the file from the FileSystem dock into the script.
@@ -237,8 +237,13 @@
 		</method>
 		<method name="type_exists">
 			<return type="bool" />
-			<argument index="0" name="type" type="StringName" />
+			<param index="0" name="type" type="StringName" />
 			<description>
+				Returns whether the given [Object]-derived class exists in [ClassDB]. Note that [Variant] data types are not registered in [ClassDB].
+				[codeblock]
+				type_exists("Sprite2D") # Returns true
+				type_exists("NonExistentClass") # Returns false
+				[/codeblock]
 			</description>
 		</method>
 	</methods>
@@ -266,7 +271,7 @@
 		</annotation>
 		<annotation name="@export_category">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 			</description>
 		</annotation>
@@ -282,25 +287,25 @@
 		</annotation>
 		<annotation name="@export_enum" qualifiers="vararg">
 			<return type="void" />
-			<argument index="0" name="names" type="String" />
+			<param index="0" name="names" type="String" />
 			<description>
 			</description>
 		</annotation>
 		<annotation name="@export_exp_easing" qualifiers="vararg">
 			<return type="void" />
-			<argument index="0" name="hints" type="String" default="&quot;&quot;" />
+			<param index="0" name="hints" type="String" default="&quot;&quot;" />
 			<description>
 			</description>
 		</annotation>
 		<annotation name="@export_file" qualifiers="vararg">
 			<return type="void" />
-			<argument index="0" name="filter" type="String" default="&quot;&quot;" />
+			<param index="0" name="filter" type="String" default="&quot;&quot;" />
 			<description>
 			</description>
 		</annotation>
 		<annotation name="@export_flags" qualifiers="vararg">
 			<return type="void" />
-			<argument index="0" name="names" type="String" />
+			<param index="0" name="names" type="String" />
 			<description>
 			</description>
 		</annotation>
@@ -341,14 +346,14 @@
 		</annotation>
 		<annotation name="@export_global_file" qualifiers="vararg">
 			<return type="void" />
-			<argument index="0" name="filter" type="String" default="&quot;&quot;" />
+			<param index="0" name="filter" type="String" default="&quot;&quot;" />
 			<description>
 			</description>
 		</annotation>
 		<annotation name="@export_group">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="prefix" type="String" default="&quot;&quot;" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="prefix" type="String" default="&quot;&quot;" />
 			<description>
 			</description>
 		</annotation>
@@ -359,7 +364,7 @@
 		</annotation>
 		<annotation name="@export_node_path" qualifiers="vararg">
 			<return type="void" />
-			<argument index="0" name="type" type="String" default="&quot;&quot;" />
+			<param index="0" name="type" type="String" default="&quot;&quot;" />
 			<description>
 			</description>
 		</annotation>
@@ -370,23 +375,23 @@
 		</annotation>
 		<annotation name="@export_range" qualifiers="vararg">
 			<return type="void" />
-			<argument index="0" name="min" type="float" />
-			<argument index="1" name="max" type="float" />
-			<argument index="2" name="step" type="float" default="1.0" />
-			<argument index="3" name="extra_hints" type="String" default="&quot;&quot;" />
+			<param index="0" name="min" type="float" />
+			<param index="1" name="max" type="float" />
+			<param index="2" name="step" type="float" default="1.0" />
+			<param index="3" name="extra_hints" type="String" default="&quot;&quot;" />
 			<description>
 			</description>
 		</annotation>
 		<annotation name="@export_subgroup">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="prefix" type="String" default="&quot;&quot;" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="prefix" type="String" default="&quot;&quot;" />
 			<description>
 			</description>
 		</annotation>
 		<annotation name="@icon">
 			<return type="void" />
-			<argument index="0" name="icon_path" type="String" />
+			<param index="0" name="icon_path" type="String" />
 			<description>
 			</description>
 		</annotation>
@@ -397,10 +402,10 @@
 		</annotation>
 		<annotation name="@rpc" qualifiers="vararg">
 			<return type="void" />
-			<argument index="0" name="mode" type="String" default="&quot;&quot;" />
-			<argument index="1" name="sync" type="String" default="&quot;&quot;" />
-			<argument index="2" name="transfer_mode" type="String" default="&quot;&quot;" />
-			<argument index="3" name="transfer_channel" type="int" default="0" />
+			<param index="0" name="mode" type="String" default="&quot;&quot;" />
+			<param index="1" name="sync" type="String" default="&quot;&quot;" />
+			<param index="2" name="transfer_mode" type="String" default="&quot;&quot;" />
+			<param index="3" name="transfer_channel" type="int" default="0" />
 			<description>
 			</description>
 		</annotation>
@@ -411,7 +416,7 @@
 		</annotation>
 		<annotation name="@warning_ignore" qualifiers="vararg">
 			<return type="void" />
-			<argument index="0" name="warning" type="String" />
+			<param index="0" name="warning" type="String" />
 			<description>
 			</description>
 		</annotation>
diff --git a/modules/gdscript/editor/gdscript_highlighter.cpp b/modules/gdscript/editor/gdscript_highlighter.cpp
index a23f19de85..e7299b4d3a 100644
--- a/modules/gdscript/editor/gdscript_highlighter.cpp
+++ b/modules/gdscript/editor/gdscript_highlighter.cpp
@@ -46,6 +46,7 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
 
 	bool prev_is_char = false;
 	bool prev_is_number = false;
+	bool prev_is_binary_op = false;
 	bool in_keyword = false;
 	bool in_word = false;
 	bool in_function_name = false;
@@ -84,16 +85,17 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
 	const int line_length = str.length();
 	Color prev_color;
 
-	if (in_region != -1 && str.length() == 0) {
+	if (in_region != -1 && line_length == 0) {
 		color_region_cache[p_line] = in_region;
 	}
-	for (int j = 0; j < str.length(); j++) {
+	for (int j = 0; j < line_length; j++) {
 		Dictionary highlighter_info;
 
 		color = font_color;
 		bool is_char = !is_symbol(str[j]);
 		bool is_a_symbol = is_symbol(str[j]);
 		bool is_number = is_digit(str[j]);
+		bool is_binary_op = false;
 
 		/* color regions */
 		if (is_a_symbol || in_region != -1) {
@@ -244,7 +246,7 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
 			is_hex_notation = false;
 		}
 
-		// disallow anything not a 0 or 1
+		// disallow anything not a 0 or 1 in binary notation
 		if (is_bin_notation && (is_binary_digit(str[j]))) {
 			is_number = true;
 		} else if (is_bin_notation) {
@@ -285,7 +287,7 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
 
 		if (!in_keyword && is_char && !prev_is_char) {
 			int to = j;
-			while (to < str.length() && !is_symbol(str[to])) {
+			while (to < line_length && !is_symbol(str[to])) {
 				to++;
 			}
 
@@ -318,12 +320,12 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
 				in_signal_declaration = true;
 			} else {
 				int k = j;
-				while (k < str.length() && !is_symbol(str[k]) && str[k] != '\t' && str[k] != ' ') {
+				while (k < line_length && !is_symbol(str[k]) && !is_whitespace(str[k])) {
 					k++;
 				}
 
 				// check for space between name and bracket
-				while (k < str.length() && (str[k] == '\t' || str[k] == ' ')) {
+				while (k < line_length && is_whitespace(str[k])) {
 					k++;
 				}
 
@@ -336,7 +338,7 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
 				// Check for lambda.
 				if (in_function_name && previous_text == GDScriptTokenizer::get_token_name(GDScriptTokenizer::Token::FUNC)) {
 					k = j - 1;
-					while (k > 0 && (str[k] == '\t' || str[k] == ' ')) {
+					while (k > 0 && is_whitespace(str[k])) {
 						k--;
 					}
 
@@ -349,7 +351,7 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
 
 		if (!in_function_name && !in_member_variable && !in_keyword && !is_number && in_word) {
 			int k = j;
-			while (k > 0 && !is_symbol(str[k]) && str[k] != '\t' && str[k] != ' ') {
+			while (k > 0 && !is_symbol(str[k]) && !is_whitespace(str[k])) {
 				k--;
 			}
 
@@ -378,7 +380,7 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
 			if (in_variable_declaration || in_function_args) {
 				int k = j;
 				// Skip space
-				while (k < str.length() && (str[k] == '\t' || str[k] == ' ')) {
+				while (k < line_length && is_whitespace(str[k])) {
 					k++;
 				}
 
@@ -395,13 +397,41 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
 			in_member_variable = false;
 		}
 
-		if (!in_node_path && in_region == -1 && (str[j] == '^')) {
+		if (j > 0 && (str[j] == '&' || str[j] == '^' || str[j] == '%' || str[j] == '+' || str[j] == '-' || str[j] == '~')) {
+			int k = j - 1;
+			while (k > 0 && is_whitespace(str[k])) {
+				k--;
+			}
+			if (!is_symbol(str[k]) || str[k] == '"' || str[k] == '\'' || str[k] == ')' || str[k] == ']' || str[k] == '}') {
+				is_binary_op = true;
+			}
+		}
+
+		// Highlight '+' and '-' like numbers when unary
+		if ((str[j] == '+' || str[j] == '-' || str[j] == '~') && !is_binary_op) {
+			is_number = true;
+			is_a_symbol = false;
+		}
+
+		// Keep symbol color for binary '&&'. In the case of '&&&' use StringName color for the last ampersand
+		if (!in_string_name && in_region == -1 && str[j] == '&' && !is_binary_op) {
+			if (j >= 2 && str[j - 1] == '&' && str[j - 2] != '&' && prev_is_binary_op) {
+				is_binary_op = true;
+			} else if (j == 0 || (j > 0 && str[j - 1] != '&') || prev_is_binary_op) {
+				in_string_name = true;
+			}
+		} else if (in_region != -1 || is_a_symbol) {
+			in_string_name = false;
+		}
+
+		// '^^' has no special meaning, so unlike StringName, when binary, use NodePath color for the last caret
+		if (!in_node_path && in_region == -1 && str[j] == '^' && !is_binary_op && (j == 0 || (j > 0 && str[j - 1] != '^') || prev_is_binary_op)) {
 			in_node_path = true;
-		} else if (in_region != -1 || (is_a_symbol && str[j] != '/' && str[j] != '%')) {
+		} else if (in_region != -1 || is_a_symbol) {
 			in_node_path = false;
 		}
 
-		if (!in_node_ref && in_region == -1 && (str[j] == '$' || str[j] == '%')) {
+		if (!in_node_ref && in_region == -1 && (str[j] == '$' || (str[j] == '%' && !is_binary_op))) {
 			in_node_ref = true;
 		} else if (in_region != -1 || (is_a_symbol && str[j] != '/' && str[j] != '%')) {
 			in_node_ref = false;
@@ -413,16 +443,7 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
 			in_annotation = false;
 		}
 
-		if (!in_string_name && in_region == -1 && str[j] == '&') {
-			in_string_name = true;
-		} else if (in_region != -1 || is_a_symbol) {
-			in_string_name = false;
-		}
-
-		if (in_node_path) {
-			next_type = NODE_PATH;
-			color = node_path_color;
-		} else if (in_node_ref) {
+		if (in_node_ref) {
 			next_type = NODE_REF;
 			color = node_ref_color;
 		} else if (in_annotation) {
@@ -431,6 +452,9 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
 		} else if (in_string_name) {
 			next_type = STRING_NAME;
 			color = string_name_color;
+		} else if (in_node_path) {
+			next_type = NODE_PATH;
+			color = node_path_color;
 		} else if (in_keyword) {
 			next_type = KEYWORD;
 			color = keyword_color;
@@ -487,6 +511,7 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
 
 		prev_is_char = is_char;
 		prev_is_number = is_number;
+		prev_is_binary_op = is_binary_op;
 
 		if (color != prev_color) {
 			prev_color = color;
diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp
index d752bef14f..cf2d6ae9f8 100644
--- a/modules/gdscript/gdscript.cpp
+++ b/modules/gdscript/gdscript.cpp
@@ -290,7 +290,9 @@ void GDScript::_get_script_method_list(List<MethodInfo> *r_list, bool p_include_
 #endif
 				mi.arguments.push_back(arginfo);
 			}
-
+#ifdef TOOLS_ENABLED
+			mi.default_arguments.append_array(func->get_default_arg_values());
+#endif
 			mi.return_val = func->get_return_type();
 			r_list->push_back(mi);
 		}
@@ -325,16 +327,23 @@ void GDScript::_get_script_property_list(List<PropertyInfo> *r_list, bool p_incl
 		for (int i = 0; i < msort.size(); i++) {
 			props.push_front(sptr->member_info[msort[i].name]);
 		}
+
+#ifdef TOOLS_ENABLED
+		r_list->push_back(sptr->get_class_category());
+#endif // TOOLS_ENABLED
+
+		for (const PropertyInfo &E : props) {
+			r_list->push_back(E);
+		}
+
+		props.clear();
+
 		if (!p_include_base) {
 			break;
 		}
 
 		sptr = sptr->_base;
 	}
-
-	for (const PropertyInfo &E : props) {
-		r_list->push_back(E);
-	}
 }
 
 void GDScript::get_script_property_list(List<PropertyInfo> *r_list) const {
@@ -434,10 +443,6 @@ void GDScript::set_source_code(const String &p_code) {
 
 #ifdef TOOLS_ENABLED
 void GDScript::_update_exports_values(HashMap<StringName, Variant> &values, List<PropertyInfo> &propnames) {
-	if (base_cache.is_valid()) {
-		base_cache->_update_exports_values(values, propnames);
-	}
-
 	for (const KeyValue<StringName, Variant> &E : member_default_values_cache) {
 		values[E.key] = E.value;
 	}
@@ -445,6 +450,10 @@ void GDScript::_update_exports_values(HashMap<StringName, Variant> &values, List
 	for (const PropertyInfo &E : members_cache) {
 		propnames.push_back(E);
 	}
+
+	if (base_cache.is_valid()) {
+		base_cache->_update_exports_values(values, propnames);
+	}
 }
 
 void GDScript::_add_doc(const DocData::ClassDoc &p_inner_class) {
@@ -703,6 +712,8 @@ bool GDScript::_update_exports(bool *r_err, bool p_recursive_call, PlaceHolderSc
 			member_default_values_cache.clear();
 			_signals.clear();
 
+			members_cache.push_back(get_class_category());
+
 			for (int i = 0; i < c->members.size(); i++) {
 				const GDScriptParser::ClassNode::Member &member = c->members[i];
 
@@ -728,6 +739,9 @@ bool GDScript::_update_exports(bool *r_err, bool p_recursive_call, PlaceHolderSc
 						}
 						_signals[member.signal->identifier->name] = parameters_names;
 					} break;
+					case GDScriptParser::ClassNode::Member::GROUP: {
+						members_cache.push_back(member.annotation->export_info);
+					} break;
 					default:
 						break; // Nothing.
 				}
@@ -1510,12 +1524,59 @@ void GDScriptInstance::get_property_list(List<PropertyInfo> *p_properties) const
 			props.push_front(sptr->member_info[msort[i].name]);
 		}
 
+#ifdef TOOLS_ENABLED
+		p_properties->push_back(sptr->get_class_category());
+#endif // TOOLS_ENABLED
+
+		for (const PropertyInfo &prop : props) {
+			p_properties->push_back(prop);
+		}
+
+		props.clear();
+
 		sptr = sptr->_base;
 	}
+}
 
-	for (const PropertyInfo &E : props) {
-		p_properties->push_back(E);
+bool GDScriptInstance::property_can_revert(const StringName &p_name) const {
+	Variant name = p_name;
+	const Variant *args[1] = { &name };
+
+	const GDScript *sptr = script.ptr();
+	while (sptr) {
+		HashMap<StringName, GDScriptFunction *>::ConstIterator E = sptr->member_functions.find(GDScriptLanguage::get_singleton()->strings._property_can_revert);
+		if (E) {
+			Callable::CallError err;
+			Variant ret = E->value->call(const_cast<GDScriptInstance *>(this), args, 1, err);
+			if (err.error == Callable::CallError::CALL_OK && ret.get_type() == Variant::BOOL && ret.operator bool()) {
+				return true;
+			}
+		}
+		sptr = sptr->_base;
+	}
+
+	return false;
+}
+
+bool GDScriptInstance::property_get_revert(const StringName &p_name, Variant &r_ret) const {
+	Variant name = p_name;
+	const Variant *args[1] = { &name };
+
+	const GDScript *sptr = script.ptr();
+	while (sptr) {
+		HashMap<StringName, GDScriptFunction *>::ConstIterator E = sptr->member_functions.find(GDScriptLanguage::get_singleton()->strings._property_get_revert);
+		if (E) {
+			Callable::CallError err;
+			Variant ret = E->value->call(const_cast<GDScriptInstance *>(this), args, 1, err);
+			if (err.error == Callable::CallError::CALL_OK && ret.get_type() != Variant::NIL) {
+				r_ret = ret;
+				return true;
+			}
+		}
+		sptr = sptr->_base;
 	}
+
+	return false;
 }
 
 void GDScriptInstance::get_method_list(List<MethodInfo> *p_list) const {
@@ -2228,6 +2289,8 @@ GDScriptLanguage::GDScriptLanguage() {
 	strings._set = StaticCString::create("_set");
 	strings._get = StaticCString::create("_get");
 	strings._get_property_list = StaticCString::create("_get_property_list");
+	strings._property_can_revert = StaticCString::create("_property_can_revert");
+	strings._property_get_revert = StaticCString::create("_property_get_revert");
 	strings._script_source = StaticCString::create("script/source");
 	_debug_parse_err_line = -1;
 	_debug_parse_err_file = "";
diff --git a/modules/gdscript/gdscript.h b/modules/gdscript/gdscript.h
index 5123cccddd..e4b12d4ddb 100644
--- a/modules/gdscript/gdscript.h
+++ b/modules/gdscript/gdscript.h
@@ -287,6 +287,9 @@ public:
 	virtual void get_property_list(List<PropertyInfo> *p_properties) const;
 	virtual Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid = nullptr) const;
 
+	virtual bool property_can_revert(const StringName &p_name) const;
+	virtual bool property_get_revert(const StringName &p_name, Variant &r_ret) const;
+
 	virtual void get_method_list(List<MethodInfo> *p_list) const;
 	virtual bool has_method(const StringName &p_method) const;
 	virtual Variant callp(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error);
@@ -423,6 +426,8 @@ public:
 		StringName _set;
 		StringName _get;
 		StringName _get_property_list;
+		StringName _property_can_revert;
+		StringName _property_get_revert;
 		StringName _script_source;
 
 	} strings;
diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp
index 7ed440929c..a07d4855f3 100644
--- a/modules/gdscript/gdscript_analyzer.cpp
+++ b/modules/gdscript/gdscript_analyzer.cpp
@@ -3238,12 +3238,12 @@ void GDScriptAnalyzer::reduce_subscript(GDScriptParser::SubscriptNode *p_subscri
 			Variant value = p_subscript->base->reduced_value.get_named(p_subscript->attribute->name, valid);
 			if (!valid) {
 				push_error(vformat(R"(Cannot get member "%s" from "%s".)", p_subscript->attribute->name, p_subscript->base->reduced_value), p_subscript->index);
+				result_type.kind = GDScriptParser::DataType::VARIANT;
 			} else {
 				p_subscript->is_constant = true;
 				p_subscript->reduced_value = value;
 				result_type = type_from_variant(value, p_subscript);
 			}
-			result_type.kind = GDScriptParser::DataType::VARIANT;
 		} else {
 			GDScriptParser::DataType base_type = p_subscript->base->get_datatype();
 
diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp
index d943974ce4..c18412bc63 100644
--- a/modules/gdscript/gdscript_editor.cpp
+++ b/modules/gdscript/gdscript_editor.cpp
@@ -660,7 +660,13 @@ static String _make_arguments_hint(const MethodInfo &p_info, int p_arg_idx, bool
 }
 
 static String _make_arguments_hint(const GDScriptParser::FunctionNode *p_function, int p_arg_idx) {
-	String arghint = p_function->get_datatype().to_string() + " " + p_function->identifier->name.operator String() + "(";
+	String arghint;
+
+	if (p_function->get_datatype().builtin_type == Variant::NIL) {
+		arghint = "void " + p_function->identifier->name.operator String() + "(";
+	} else {
+		arghint = p_function->get_datatype().to_string() + " " + p_function->identifier->name.operator String() + "(";
+	}
 
 	for (int i = 0; i < p_function->parameters.size(); i++) {
 		if (i > 0) {
@@ -671,7 +677,11 @@ static String _make_arguments_hint(const GDScriptParser::FunctionNode *p_functio
 			arghint += String::chr(0xFFFF);
 		}
 		const GDScriptParser::ParameterNode *par = p_function->parameters[i];
-		arghint += par->identifier->name.operator String() + ": " + par->get_datatype().to_string();
+		if (!par->get_datatype().is_hard_type()) {
+			arghint += par->identifier->name.operator String() + ": Variant";
+		} else {
+			arghint += par->identifier->name.operator String() + ": " + par->get_datatype().to_string();
+		}
 
 		if (par->default_value) {
 			String def_val = "<unknown>";
@@ -2517,39 +2527,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
 
 	GDScriptCompletionIdentifier connect_base;
 
-	if (Variant::has_utility_function(call->function_name)) {
-		MethodInfo info = Variant::get_utility_function_info(call->function_name);
-		r_arghint = _make_arguments_hint(info, p_argidx);
-		return;
-	} else if (GDScriptUtilityFunctions::function_exists(call->function_name)) {
-		MethodInfo info = GDScriptUtilityFunctions::get_function_info(call->function_name);
-		r_arghint = _make_arguments_hint(info, p_argidx);
-		return;
-	} else if (GDScriptParser::get_builtin_type(call->function_name) < Variant::VARIANT_MAX) {
-		// Complete constructor.
-		List<MethodInfo> constructors;
-		Variant::get_constructor_list(GDScriptParser::get_builtin_type(call->function_name), &constructors);
-
-		int i = 0;
-		for (const MethodInfo &E : constructors) {
-			if (p_argidx >= E.arguments.size()) {
-				continue;
-			}
-			if (i > 0) {
-				r_arghint += "\n";
-			}
-			r_arghint += _make_arguments_hint(E, p_argidx);
-			i++;
-		}
-		return;
-	} else if (call->is_super || callee_type == GDScriptParser::Node::IDENTIFIER) {
-		base = p_context.base;
-
-		if (p_context.current_class) {
-			base_type = p_context.current_class->get_datatype();
-			_static = !p_context.current_function || p_context.current_function->is_static;
-		}
-	} else if (callee_type == GDScriptParser::Node::SUBSCRIPT) {
+	if (callee_type == GDScriptParser::Node::SUBSCRIPT) {
 		const GDScriptParser::SubscriptNode *subscript = static_cast<const GDScriptParser::SubscriptNode *>(call->callee);
 
 		if (subscript->base != nullptr && subscript->base->type == GDScriptParser::Node::IDENTIFIER) {
@@ -2589,6 +2567,38 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
 
 			_static = base_type.is_meta_type;
 		}
+	} else if (Variant::has_utility_function(call->function_name)) {
+		MethodInfo info = Variant::get_utility_function_info(call->function_name);
+		r_arghint = _make_arguments_hint(info, p_argidx);
+		return;
+	} else if (GDScriptUtilityFunctions::function_exists(call->function_name)) {
+		MethodInfo info = GDScriptUtilityFunctions::get_function_info(call->function_name);
+		r_arghint = _make_arguments_hint(info, p_argidx);
+		return;
+	} else if (GDScriptParser::get_builtin_type(call->function_name) < Variant::VARIANT_MAX) {
+		// Complete constructor.
+		List<MethodInfo> constructors;
+		Variant::get_constructor_list(GDScriptParser::get_builtin_type(call->function_name), &constructors);
+
+		int i = 0;
+		for (const MethodInfo &E : constructors) {
+			if (p_argidx >= E.arguments.size()) {
+				continue;
+			}
+			if (i > 0) {
+				r_arghint += "\n";
+			}
+			r_arghint += _make_arguments_hint(E, p_argidx);
+			i++;
+		}
+		return;
+	} else if (call->is_super || callee_type == GDScriptParser::Node::IDENTIFIER) {
+		base = p_context.base;
+
+		if (p_context.current_class) {
+			base_type = p_context.current_class->get_datatype();
+			_static = !p_context.current_function || p_context.current_function->is_static;
+		}
 	} else {
 		return;
 	}
diff --git a/modules/gdscript/language_server/gdscript_language_protocol.cpp b/modules/gdscript/language_server/gdscript_language_protocol.cpp
index c0d5856be5..39f4c976a4 100644
--- a/modules/gdscript/language_server/gdscript_language_protocol.cpp
+++ b/modules/gdscript/language_server/gdscript_language_protocol.cpp
@@ -184,7 +184,9 @@ Dictionary GDScriptLanguageProtocol::initialize(const Dictionary &p_params) {
 	if (root_uri.length() && is_same_workspace) {
 		workspace->root_uri = root_uri;
 	} else {
-		workspace->root_uri = "file://" + workspace->root;
+		String r_root = workspace->root;
+		r_root = r_root.lstrip("/");
+		workspace->root_uri = "file:///" + r_root;
 
 		Dictionary params;
 		params["path"] = workspace->root;
diff --git a/modules/gdscript/language_server/gdscript_workspace.cpp b/modules/gdscript/language_server/gdscript_workspace.cpp
index ded2a7b4d4..44b60369ab 100644
--- a/modules/gdscript/language_server/gdscript_workspace.cpp
+++ b/modules/gdscript/language_server/gdscript_workspace.cpp
@@ -500,10 +500,8 @@ Error GDScriptWorkspace::parse_local_script(const String &p_path) {
 
 String GDScriptWorkspace::get_file_path(const String &p_uri) const {
 	String path = p_uri;
-	path = path.replace("///", "//");
-	path = path.replace("%3A", ":");
-	path = path.replacen(root_uri + "/", "res://");
 	path = path.uri_decode();
+	path = path.replacen(root_uri + "/", "res://");
 	return path;
 }
 
diff --git a/modules/gdscript/tests/gdscript_test_runner_suite.h b/modules/gdscript/tests/gdscript_test_runner_suite.h
index 0722fb800e..90f6d7f7e8 100644
--- a/modules/gdscript/tests/gdscript_test_runner_suite.h
+++ b/modules/gdscript/tests/gdscript_test_runner_suite.h
@@ -69,6 +69,40 @@ func _init():
 	CHECK_MESSAGE(int(ref_counted->get_meta("result")) == 42, "The script should assign object metadata successfully.");
 }
 
+TEST_CASE("[Modules][GDScript] Validate built-in API") {
+	GDScriptLanguage *lang = GDScriptLanguage::get_singleton();
+
+	// Validate methods.
+	List<MethodInfo> builtin_methods;
+	lang->get_public_functions(&builtin_methods);
+
+	SUBCASE("[Modules][GDScript] Validate built-in methods") {
+		for (const MethodInfo &mi : builtin_methods) {
+			for (int j = 0; j < mi.arguments.size(); j++) {
+				PropertyInfo arg = mi.arguments[j];
+
+				TEST_COND((arg.name.is_empty() || arg.name.begins_with("_unnamed_arg")),
+						vformat("Unnamed argument in position %d of built-in method '%s'.", j, mi.name));
+			}
+		}
+	}
+
+	// Validate annotations.
+	List<MethodInfo> builtin_annotations;
+	lang->get_public_annotations(&builtin_annotations);
+
+	SUBCASE("[Modules][GDScript] Validate built-in annotations") {
+		for (const MethodInfo &ai : builtin_annotations) {
+			for (int j = 0; j < ai.arguments.size(); j++) {
+				PropertyInfo arg = ai.arguments[j];
+
+				TEST_COND((arg.name.is_empty() || arg.name.begins_with("_unnamed_arg")),
+						vformat("Unnamed argument in position %d of built-in annotation '%s'.", j, ai.name));
+			}
+		}
+	}
+}
+
 } // namespace GDScriptTests
 
 #endif // GDSCRIPT_TEST_RUNNER_SUITE_H
diff --git a/modules/gdscript/tests/scripts/analyzer/features/gdscript_to_preload.gd b/modules/gdscript/tests/scripts/analyzer/features/gdscript_to_preload.gd
index fb0ace6a90..ea744e3027 100644
--- a/modules/gdscript/tests/scripts/analyzer/features/gdscript_to_preload.gd
+++ b/modules/gdscript/tests/scripts/analyzer/features/gdscript_to_preload.gd
@@ -1,3 +1,5 @@
+const A := 42
+
 func test():
 	pass
 
diff --git a/modules/gdscript/tests/scripts/analyzer/features/preload_constant_types_are_inferred.gd b/modules/gdscript/tests/scripts/analyzer/features/preload_constant_types_are_inferred.gd
new file mode 100644
index 0000000000..276875dd5a
--- /dev/null
+++ b/modules/gdscript/tests/scripts/analyzer/features/preload_constant_types_are_inferred.gd
@@ -0,0 +1,6 @@
+const Constants = preload("gdscript_to_preload.gd")
+
+func test():
+	var a := Constants.A
+	print(a)
+
diff --git a/modules/gdscript/tests/scripts/analyzer/features/preload_constant_types_are_inferred.out b/modules/gdscript/tests/scripts/analyzer/features/preload_constant_types_are_inferred.out
new file mode 100644
index 0000000000..0982f3718c
--- /dev/null
+++ b/modules/gdscript/tests/scripts/analyzer/features/preload_constant_types_are_inferred.out
@@ -0,0 +1,2 @@
+GDTEST_OK
+42
diff --git a/modules/gltf/SCsub b/modules/gltf/SCsub
index 6634d5df7b..71f3ba58d9 100644
--- a/modules/gltf/SCsub
+++ b/modules/gltf/SCsub
@@ -5,7 +5,7 @@ Import("env_modules")
 
 env_gltf = env_modules.Clone()
 
-# Godot's own source files
+# Godot source files
 env_gltf.add_source_files(env.modules_sources, "*.cpp")
 env_gltf.add_source_files(env.modules_sources, "extensions/*.cpp")
 env_gltf.add_source_files(env.modules_sources, "structures/*.cpp")
diff --git a/modules/gltf/doc_classes/GLTFDocument.xml b/modules/gltf/doc_classes/GLTFDocument.xml
index cb0e3b6754..3cd0f5c0f9 100644
--- a/modules/gltf/doc_classes/GLTFDocument.xml
+++ b/modules/gltf/doc_classes/GLTFDocument.xml
@@ -10,50 +10,50 @@
 	<methods>
 		<method name="append_from_buffer">
 			<return type="int" enum="Error" />
-			<argument index="0" name="bytes" type="PackedByteArray" />
-			<argument index="1" name="base_path" type="String" />
-			<argument index="2" name="state" type="GLTFState" />
-			<argument index="3" name="flags" type="int" default="0" />
-			<argument index="4" name="bake_fps" type="int" default="30" />
+			<param index="0" name="bytes" type="PackedByteArray" />
+			<param index="1" name="base_path" type="String" />
+			<param index="2" name="state" type="GLTFState" />
+			<param index="3" name="flags" type="int" default="0" />
+			<param index="4" name="bake_fps" type="int" default="30" />
 			<description>
 			</description>
 		</method>
 		<method name="append_from_file">
 			<return type="int" enum="Error" />
-			<argument index="0" name="path" type="String" />
-			<argument index="1" name="state" type="GLTFState" />
-			<argument index="2" name="flags" type="int" default="0" />
-			<argument index="3" name="bake_fps" type="int" default="30" />
-			<argument index="4" name="base_path" type="String" default="&quot;&quot;" />
+			<param index="0" name="path" type="String" />
+			<param index="1" name="state" type="GLTFState" />
+			<param index="2" name="flags" type="int" default="0" />
+			<param index="3" name="bake_fps" type="int" default="30" />
+			<param index="4" name="base_path" type="String" default="&quot;&quot;" />
 			<description>
 			</description>
 		</method>
 		<method name="append_from_scene">
 			<return type="int" enum="Error" />
-			<argument index="0" name="node" type="Node" />
-			<argument index="1" name="state" type="GLTFState" />
-			<argument index="2" name="flags" type="int" default="0" />
-			<argument index="3" name="bake_fps" type="int" default="30" />
+			<param index="0" name="node" type="Node" />
+			<param index="1" name="state" type="GLTFState" />
+			<param index="2" name="flags" type="int" default="0" />
+			<param index="3" name="bake_fps" type="int" default="30" />
 			<description>
 			</description>
 		</method>
 		<method name="generate_buffer">
 			<return type="PackedByteArray" />
-			<argument index="0" name="state" type="GLTFState" />
+			<param index="0" name="state" type="GLTFState" />
 			<description>
 			</description>
 		</method>
 		<method name="generate_scene">
 			<return type="Node" />
-			<argument index="0" name="state" type="GLTFState" />
-			<argument index="1" name="bake_fps" type="int" default="30" />
+			<param index="0" name="state" type="GLTFState" />
+			<param index="1" name="bake_fps" type="int" default="30" />
 			<description>
 			</description>
 		</method>
 		<method name="write_to_filesystem">
 			<return type="int" enum="Error" />
-			<argument index="0" name="state" type="GLTFState" />
-			<argument index="1" name="path" type="String" />
+			<param index="0" name="state" type="GLTFState" />
+			<param index="1" name="path" type="String" />
 			<description>
 			</description>
 		</method>
diff --git a/modules/gltf/doc_classes/GLTFDocumentExtension.xml b/modules/gltf/doc_classes/GLTFDocumentExtension.xml
index 3c28546ad7..d2a9022445 100644
--- a/modules/gltf/doc_classes/GLTFDocumentExtension.xml
+++ b/modules/gltf/doc_classes/GLTFDocumentExtension.xml
@@ -9,50 +9,50 @@
 	<methods>
 		<method name="_export_node" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="state" type="GLTFState" />
-			<argument index="1" name="gltf_node" type="GLTFNode" />
-			<argument index="2" name="json" type="Dictionary" />
-			<argument index="3" name="node" type="Node" />
+			<param index="0" name="state" type="GLTFState" />
+			<param index="1" name="gltf_node" type="GLTFNode" />
+			<param index="2" name="json" type="Dictionary" />
+			<param index="3" name="node" type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="_export_post" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="state" type="GLTFState" />
+			<param index="0" name="state" type="GLTFState" />
 			<description>
 			</description>
 		</method>
 		<method name="_export_preflight" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="root" type="Node" />
+			<param index="0" name="root" type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="_import_node" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="state" type="GLTFState" />
-			<argument index="1" name="gltf_node" type="GLTFNode" />
-			<argument index="2" name="json" type="Dictionary" />
-			<argument index="3" name="node" type="Node" />
+			<param index="0" name="state" type="GLTFState" />
+			<param index="1" name="gltf_node" type="GLTFNode" />
+			<param index="2" name="json" type="Dictionary" />
+			<param index="3" name="node" type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="_import_post" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="state" type="GLTFState" />
-			<argument index="1" name="root" type="Node" />
+			<param index="0" name="state" type="GLTFState" />
+			<param index="1" name="root" type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="_import_post_parse" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="state" type="GLTFState" />
+			<param index="0" name="state" type="GLTFState" />
 			<description>
 			</description>
 		</method>
 		<method name="_import_preflight" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="state" type="GLTFState" />
+			<param index="0" name="state" type="GLTFState" />
 			<description>
 			</description>
 		</method>
diff --git a/modules/gltf/doc_classes/GLTFLight.xml b/modules/gltf/doc_classes/GLTFLight.xml
index 354cd48a06..db2dfb487a 100644
--- a/modules/gltf/doc_classes/GLTFLight.xml
+++ b/modules/gltf/doc_classes/GLTFLight.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="GLTFLight" inherits="Resource" version="4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
+		Represents a GLTF light.
 	</brief_description>
 	<description>
+		Represents a light as defined by the [code]KHR_lights_punctual[/code] GLTF extension.
 	</description>
 	<tutorials>
+		<link title="KHR_lights_punctual GLTF extension spec">https://github.com/KhronosGroup/glTF/blob/main/extensions/2.0/Khronos/KHR_lights_punctual</link>
 	</tutorials>
 	<members>
 		<member name="color" type="Color" setter="set_color" getter="get_color" default="Color(1, 1, 1, 1)">
diff --git a/modules/gltf/doc_classes/GLTFSkeleton.xml b/modules/gltf/doc_classes/GLTFSkeleton.xml
index dad985e886..e1276d0e21 100644
--- a/modules/gltf/doc_classes/GLTFSkeleton.xml
+++ b/modules/gltf/doc_classes/GLTFSkeleton.xml
@@ -9,7 +9,7 @@
 	<methods>
 		<method name="get_bone_attachment">
 			<return type="BoneAttachment3D" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 			</description>
 		</method>
@@ -35,13 +35,13 @@
 		</method>
 		<method name="set_godot_bone_node">
 			<return type="void" />
-			<argument index="0" name="godot_bone_node" type="Dictionary" />
+			<param index="0" name="godot_bone_node" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="set_unique_names">
 			<return type="void" />
-			<argument index="0" name="unique_names" type="Array" />
+			<param index="0" name="unique_names" type="Array" />
 			<description>
 			</description>
 		</method>
diff --git a/modules/gltf/doc_classes/GLTFSkin.xml b/modules/gltf/doc_classes/GLTFSkin.xml
index b6a2bdb957..5abdf33360 100644
--- a/modules/gltf/doc_classes/GLTFSkin.xml
+++ b/modules/gltf/doc_classes/GLTFSkin.xml
@@ -24,19 +24,19 @@
 		</method>
 		<method name="set_inverse_binds">
 			<return type="void" />
-			<argument index="0" name="inverse_binds" type="Array" />
+			<param index="0" name="inverse_binds" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_joint_i_to_bone_i">
 			<return type="void" />
-			<argument index="0" name="joint_i_to_bone_i" type="Dictionary" />
+			<param index="0" name="joint_i_to_bone_i" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="set_joint_i_to_name">
 			<return type="void" />
-			<argument index="0" name="joint_i_to_name" type="Dictionary" />
+			<param index="0" name="joint_i_to_name" type="Dictionary" />
 			<description>
 			</description>
 		</method>
diff --git a/modules/gltf/doc_classes/GLTFSpecGloss.xml b/modules/gltf/doc_classes/GLTFSpecGloss.xml
index 8433cf8dd7..8882e48257 100644
--- a/modules/gltf/doc_classes/GLTFSpecGloss.xml
+++ b/modules/gltf/doc_classes/GLTFSpecGloss.xml
@@ -1,21 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="GLTFSpecGloss" inherits="Resource" version="4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
+		Archived GLTF extension for specular/glossy materials.
 	</brief_description>
 	<description>
+		KHR_materials_pbrSpecularGlossiness is an archived GLTF extension. This means that it is deprecated and not recommended for new files. However, it is still supported for loading old files.
 	</description>
 	<tutorials>
+		<link title="KHR_materials_pbrSpecularGlossiness GLTF extension spec">https://github.com/KhronosGroup/glTF/blob/main/extensions/2.0/Archived/KHR_materials_pbrSpecularGlossiness</link>
 	</tutorials>
 	<members>
 		<member name="diffuse_factor" type="Color" setter="set_diffuse_factor" getter="get_diffuse_factor" default="Color(1, 1, 1, 1)">
+			The reflected diffuse factor of the material.
 		</member>
 		<member name="diffuse_img" type="Image" setter="set_diffuse_img" getter="get_diffuse_img">
+			The diffuse texture.
 		</member>
 		<member name="gloss_factor" type="float" setter="set_gloss_factor" getter="get_gloss_factor" default="1.0">
+			The glossiness or smoothness of the material.
 		</member>
 		<member name="spec_gloss_img" type="Image" setter="set_spec_gloss_img" getter="get_spec_gloss_img">
+			The specular-glossiness texture.
 		</member>
 		<member name="specular_factor" type="Color" setter="set_specular_factor" getter="get_specular_factor" default="Color(1, 1, 1, 1)">
+			The specular RGB color of the material. The alpha channel is unused.
 		</member>
 	</members>
 </class>
diff --git a/modules/gltf/doc_classes/GLTFState.xml b/modules/gltf/doc_classes/GLTFState.xml
index 44a1723563..adf51ab59e 100644
--- a/modules/gltf/doc_classes/GLTFState.xml
+++ b/modules/gltf/doc_classes/GLTFState.xml
@@ -14,13 +14,13 @@
 		</method>
 		<method name="get_animation_player">
 			<return type="AnimationPlayer" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_animation_players_count">
 			<return type="int" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 			</description>
 		</method>
@@ -66,7 +66,7 @@
 		</method>
 		<method name="get_scene_node">
 			<return type="Node" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 			</description>
 		</method>
@@ -102,91 +102,91 @@
 		</method>
 		<method name="set_accessors">
 			<return type="void" />
-			<argument index="0" name="accessors" type="Array" />
+			<param index="0" name="accessors" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_animations">
 			<return type="void" />
-			<argument index="0" name="animations" type="Array" />
+			<param index="0" name="animations" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_buffer_views">
 			<return type="void" />
-			<argument index="0" name="buffer_views" type="Array" />
+			<param index="0" name="buffer_views" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_cameras">
 			<return type="void" />
-			<argument index="0" name="cameras" type="Array" />
+			<param index="0" name="cameras" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_images">
 			<return type="void" />
-			<argument index="0" name="images" type="Array" />
+			<param index="0" name="images" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_lights">
 			<return type="void" />
-			<argument index="0" name="lights" type="Array" />
+			<param index="0" name="lights" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_materials">
 			<return type="void" />
-			<argument index="0" name="materials" type="Array" />
+			<param index="0" name="materials" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_meshes">
 			<return type="void" />
-			<argument index="0" name="meshes" type="Array" />
+			<param index="0" name="meshes" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_nodes">
 			<return type="void" />
-			<argument index="0" name="nodes" type="Array" />
+			<param index="0" name="nodes" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_skeleton_to_node">
 			<return type="void" />
-			<argument index="0" name="skeleton_to_node" type="Dictionary" />
+			<param index="0" name="skeleton_to_node" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="set_skeletons">
 			<return type="void" />
-			<argument index="0" name="skeletons" type="Array" />
+			<param index="0" name="skeletons" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_skins">
 			<return type="void" />
-			<argument index="0" name="skins" type="Array" />
+			<param index="0" name="skins" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_textures">
 			<return type="void" />
-			<argument index="0" name="textures" type="Array" />
+			<param index="0" name="textures" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_unique_animation_names">
 			<return type="void" />
-			<argument index="0" name="unique_animation_names" type="Array" />
+			<param index="0" name="unique_animation_names" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_unique_names">
 			<return type="void" />
-			<argument index="0" name="unique_names" type="Array" />
+			<param index="0" name="unique_names" type="Array" />
 			<description>
 			</description>
 		</method>
@@ -196,6 +196,8 @@
 		</member>
 		<member name="buffers" type="Array" setter="set_buffers" getter="get_buffers" default="[]">
 		</member>
+		<member name="create_animations" type="bool" setter="set_create_animations" getter="get_create_animations" default="true">
+		</member>
 		<member name="glb_data" type="PackedByteArray" setter="set_glb_data" getter="get_glb_data" default="PackedByteArray()">
 		</member>
 		<member name="json" type="Dictionary" setter="set_json" getter="get_json" default="{}">
diff --git a/modules/gltf/editor/editor_scene_importer_gltf.cpp b/modules/gltf/editor/editor_scene_importer_gltf.cpp
index 3fadec5167..161808aade 100644
--- a/modules/gltf/editor/editor_scene_importer_gltf.cpp
+++ b/modules/gltf/editor/editor_scene_importer_gltf.cpp
@@ -60,6 +60,9 @@ Node *EditorSceneFormatImporterGLTF::import_scene(const String &p_path, uint32_t
 		}
 		return nullptr;
 	}
+	if (p_options.has("animation/import")) {
+		state->set_create_animations(bool(p_options["animation/import"]));
+	}
 	return doc->generate_scene(state, p_bake_fps);
 }
 
diff --git a/modules/gltf/extensions/gltf_light.h b/modules/gltf/extensions/gltf_light.h
index 58fa299dfd..f0765a1bbc 100644
--- a/modules/gltf/extensions/gltf_light.h
+++ b/modules/gltf/extensions/gltf_light.h
@@ -35,6 +35,8 @@
 #include "core/io/resource.h"
 #include "scene/3d/light_3d.h"
 
+// https://github.com/KhronosGroup/glTF/blob/main/extensions/2.0/Khronos/KHR_lights_punctual
+
 class GLTFLight : public Resource {
 	GDCLASS(GLTFLight, Resource)
 	friend class GLTFDocument;
diff --git a/modules/gltf/extensions/gltf_spec_gloss.h b/modules/gltf/extensions/gltf_spec_gloss.h
index a45fa4296c..2b4d3ee609 100644
--- a/modules/gltf/extensions/gltf_spec_gloss.h
+++ b/modules/gltf/extensions/gltf_spec_gloss.h
@@ -34,6 +34,11 @@
 #include "core/io/image.h"
 #include "core/io/resource.h"
 
+// KHR_materials_pbrSpecularGlossiness is an archived GLTF extension.
+// This means that it is deprecated and not recommended for new files.
+// However, it is still supported for loading old files.
+// https://github.com/KhronosGroup/glTF/blob/main/extensions/2.0/Archived/KHR_materials_pbrSpecularGlossiness
+
 class GLTFSpecGloss : public Resource {
 	GDCLASS(GLTFSpecGloss, Resource);
 	friend class GLTFDocument;
diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp
index 7e90f198f6..d102970932 100644
--- a/modules/gltf/gltf_document.cpp
+++ b/modules/gltf/gltf_document.cpp
@@ -6899,7 +6899,7 @@ Node *GLTFDocument::generate_scene(Ref<GLTFState> state, int32_t p_bake_fps) {
 	Node *root = gltf_root_node->get_parent();
 	ERR_FAIL_NULL_V(root, nullptr);
 	_process_mesh_instances(state, root);
-	if (state->animations.size()) {
+	if (state->get_create_animations() && state->animations.size()) {
 		AnimationPlayer *ap = memnew(AnimationPlayer);
 		root->add_child(ap, true);
 		ap->set_owner(root);
diff --git a/modules/gltf/gltf_state.cpp b/modules/gltf/gltf_state.cpp
index a5f7bcf9d6..8212e4c22f 100644
--- a/modules/gltf/gltf_state.cpp
+++ b/modules/gltf/gltf_state.cpp
@@ -79,6 +79,8 @@ void GLTFState::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_skeletons", "skeletons"), &GLTFState::set_skeletons);
 	ClassDB::bind_method(D_METHOD("get_skeleton_to_node"), &GLTFState::get_skeleton_to_node);
 	ClassDB::bind_method(D_METHOD("set_skeleton_to_node", "skeleton_to_node"), &GLTFState::set_skeleton_to_node);
+	ClassDB::bind_method(D_METHOD("get_create_animations"), &GLTFState::get_create_animations);
+	ClassDB::bind_method(D_METHOD("set_create_animations", "create_animations"), &GLTFState::set_create_animations);
 	ClassDB::bind_method(D_METHOD("get_animations"), &GLTFState::get_animations);
 	ClassDB::bind_method(D_METHOD("set_animations", "animations"), &GLTFState::set_animations);
 	ClassDB::bind_method(D_METHOD("get_scene_node", "idx"), &GLTFState::get_scene_node);
@@ -106,6 +108,7 @@ void GLTFState::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "unique_animation_names", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_INTERNAL | PROPERTY_USAGE_EDITOR), "set_unique_animation_names", "get_unique_animation_names"); // Set<String>
 	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "skeletons", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_INTERNAL | PROPERTY_USAGE_EDITOR), "set_skeletons", "get_skeletons"); // Vector<Ref<GLTFSkeleton>>
 	ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "skeleton_to_node", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_INTERNAL | PROPERTY_USAGE_EDITOR), "set_skeleton_to_node", "get_skeleton_to_node"); // RBMap<GLTFSkeletonIndex,
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "create_animations"), "set_create_animations", "get_create_animations"); // bool
 	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "animations", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_INTERNAL | PROPERTY_USAGE_EDITOR), "set_animations", "get_animations"); // Vector<Ref<GLTFAnimation>>
 }
 
@@ -285,6 +288,14 @@ void GLTFState::set_skeleton_to_node(Dictionary p_skeleton_to_node) {
 	GLTFTemplateConvert::set_from_dict(skeleton_to_node, p_skeleton_to_node);
 }
 
+bool GLTFState::get_create_animations() {
+	return create_animations;
+}
+
+void GLTFState::set_create_animations(bool p_create_animations) {
+	create_animations = p_create_animations;
+}
+
 Array GLTFState::get_animations() {
 	return GLTFTemplateConvert::to_array(animations);
 }
diff --git a/modules/gltf/gltf_state.h b/modules/gltf/gltf_state.h
index d2a4948f06..c08132f874 100644
--- a/modules/gltf/gltf_state.h
+++ b/modules/gltf/gltf_state.h
@@ -61,6 +61,7 @@ class GLTFState : public Resource {
 	bool use_named_skin_binds = false;
 	bool use_khr_texture_transform = false;
 	bool discard_meshes_and_materials = false;
+	bool create_animations = true;
 
 	Vector<Ref<GLTFNode>> nodes;
 	Vector<Vector<uint8_t>> buffers;
@@ -168,6 +169,9 @@ public:
 	Dictionary get_skeleton_to_node();
 	void set_skeleton_to_node(Dictionary p_skeleton_to_node);
 
+	bool get_create_animations();
+	void set_create_animations(bool p_create_animations);
+
 	Array get_animations();
 	void set_animations(Array p_animations);
 
diff --git a/modules/gridmap/SCsub b/modules/gridmap/SCsub
index 52777235b8..da3f7d4dd9 100644
--- a/modules/gridmap/SCsub
+++ b/modules/gridmap/SCsub
@@ -5,7 +5,7 @@ Import("env_modules")
 
 env_gridmap = env_modules.Clone()
 
-# Godot's own source files
+# Godot source files
 env_gridmap.add_source_files(env.modules_sources, "*.cpp")
 if env["tools"]:
     env_gridmap.add_source_files(env.modules_sources, "editor/*.cpp")
diff --git a/modules/gridmap/doc_classes/GridMap.xml b/modules/gridmap/doc_classes/GridMap.xml
index 499f54e3ba..5552b5b009 100644
--- a/modules/gridmap/doc_classes/GridMap.xml
+++ b/modules/gridmap/doc_classes/GridMap.xml
@@ -29,7 +29,7 @@
 		</method>
 		<method name="get_bake_mesh_instance">
 			<return type="RID" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 			</description>
 		</method>
@@ -41,28 +41,28 @@
 		</method>
 		<method name="get_cell_item" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="position" type="Vector3i" />
+			<param index="0" name="position" type="Vector3i" />
 			<description>
 				The [MeshLibrary] item index located at the given grid coordinates. If the cell is empty, [constant INVALID_CELL_ITEM] will be returned.
 			</description>
 		</method>
 		<method name="get_cell_item_orientation" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="position" type="Vector3i" />
+			<param index="0" name="position" type="Vector3i" />
 			<description>
 				The orientation of the cell at the given grid coordinates. [code]-1[/code] is returned if the cell is empty.
 			</description>
 		</method>
 		<method name="get_collision_layer_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
 				Returns whether or not the specified layer of the [member collision_layer] is enabled, given a [code]layer_number[/code] between 1 and 32.
 			</description>
 		</method>
 		<method name="get_collision_mask_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
 				Returns whether or not the specified layer of the [member collision_mask] is enabled, given a [code]layer_number[/code] between 1 and 32.
 			</description>
@@ -75,7 +75,7 @@
 		</method>
 		<method name="get_navigation_layer_value" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="layer_number" type="int" />
+			<param index="0" name="layer_number" type="int" />
 			<description>
 				Returns whether or not the specified layer of the [member navigation_layers] bitmask is enabled, given a [code]layer_number[/code] between 1 and 32.
 			</description>
@@ -88,36 +88,36 @@
 		</method>
 		<method name="get_used_cells_by_item" qualifiers="const">
 			<return type="Array" />
-			<argument index="0" name="item" type="int" />
+			<param index="0" name="item" type="int" />
 			<description>
 				Returns an array of all cells with the given item index specified in [code]item[/code].
 			</description>
 		</method>
 		<method name="make_baked_meshes">
 			<return type="void" />
-			<argument index="0" name="gen_lightmap_uv" type="bool" default="false" />
-			<argument index="1" name="lightmap_uv_texel_size" type="float" default="0.1" />
+			<param index="0" name="gen_lightmap_uv" type="bool" default="false" />
+			<param index="1" name="lightmap_uv_texel_size" type="float" default="0.1" />
 			<description>
 			</description>
 		</method>
 		<method name="map_to_world" qualifiers="const">
 			<return type="Vector3" />
-			<argument index="0" name="map_position" type="Vector3i" />
+			<param index="0" name="map_position" type="Vector3i" />
 			<description>
 				Returns the position of a grid cell in the GridMap's local coordinate space.
 			</description>
 		</method>
 		<method name="resource_changed">
 			<return type="void" />
-			<argument index="0" name="resource" type="Resource" />
+			<param index="0" name="resource" type="Resource" />
 			<description>
 			</description>
 		</method>
 		<method name="set_cell_item">
 			<return type="void" />
-			<argument index="0" name="position" type="Vector3i" />
-			<argument index="1" name="item" type="int" />
-			<argument index="2" name="orientation" type="int" default="0" />
+			<param index="0" name="position" type="Vector3i" />
+			<param index="1" name="item" type="int" />
+			<param index="2" name="orientation" type="int" default="0" />
 			<description>
 				Sets the mesh index for the cell referenced by its grid coordinates.
 				A negative item index such as [constant INVALID_CELL_ITEM] will clear the cell.
@@ -126,31 +126,31 @@
 		</method>
 		<method name="set_collision_layer_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
 				Based on [code]value[/code], enables or disables the specified layer in the [member collision_layer], given a [code]layer_number[/code] between 1 and 32.
 			</description>
 		</method>
 		<method name="set_collision_mask_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
 				Based on [code]value[/code], enables or disables the specified layer in the [member collision_mask], given a [code]layer_number[/code] between 1 and 32.
 			</description>
 		</method>
 		<method name="set_navigation_layer_value">
 			<return type="void" />
-			<argument index="0" name="layer_number" type="int" />
-			<argument index="1" name="value" type="bool" />
+			<param index="0" name="layer_number" type="int" />
+			<param index="1" name="value" type="bool" />
 			<description>
 				Based on [code]value[/code], enables or disables the specified layer in the [member navigation_layers] bitmask, given a [code]layer_number[/code] between 1 and 32.
 			</description>
 		</method>
 		<method name="world_to_map" qualifiers="const">
 			<return type="Vector3i" />
-			<argument index="0" name="world_position" type="Vector3" />
+			<param index="0" name="world_position" type="Vector3" />
 			<description>
 				Returns the coordinates of the grid cell containing the given point.
 				[code]pos[/code] should be in the GridMap's local coordinate space.
@@ -200,7 +200,7 @@
 	</members>
 	<signals>
 		<signal name="cell_size_changed">
-			<argument index="0" name="cell_size" type="Vector3" />
+			<param index="0" name="cell_size" type="Vector3" />
 			<description>
 				Emitted when [member cell_size] changes.
 			</description>
diff --git a/modules/gridmap/editor/grid_map_editor_plugin.cpp b/modules/gridmap/editor/grid_map_editor_plugin.cpp
index 09f0ff32f0..518e2cf97d 100644
--- a/modules/gridmap/editor/grid_map_editor_plugin.cpp
+++ b/modules/gridmap/editor/grid_map_editor_plugin.cpp
@@ -896,10 +896,12 @@ void GridMapEditor::update_palette() {
 	}
 
 	if (selected != -1 && mesh_library_palette->get_item_count() > 0) {
-		mesh_library_palette->select(selected);
+		// Make sure that this variable is set correctly.
+		selected_palette = MIN(selected, mesh_library_palette->get_item_count() - 1);
+		mesh_library_palette->select(selected_palette);
 	}
 
-	last_mesh_library = mesh_library.operator->();
+	last_mesh_library = *mesh_library;
 }
 
 void GridMapEditor::edit(GridMap *p_gridmap) {
diff --git a/modules/hdr/SCsub b/modules/hdr/SCsub
index a709397c9a..10629bda3c 100644
--- a/modules/hdr/SCsub
+++ b/modules/hdr/SCsub
@@ -5,5 +5,5 @@ Import("env_modules")
 
 env_hdr = env_modules.Clone()
 
-# Godot's own source files
+# Godot source files
 env_hdr.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/lightmapper_rd/lightmapper_rd.h b/modules/lightmapper_rd/lightmapper_rd.h
index 88860ad0d4..bf6b4399ca 100644
--- a/modules/lightmapper_rd/lightmapper_rd.h
+++ b/modules/lightmapper_rd/lightmapper_rd.h
@@ -183,7 +183,7 @@ class LightmapperRD : public Lightmapper {
 		}
 	};
 
-	void _plot_triangle_into_triangle_index_list(int p_size, const Vector3i &p_ofs, const AABB &p_bounds, const Vector3 p_points[], uint32_t p_triangle_index, LocalVector<TriangleSort> &triangles, uint32_t p_grid_size);
+	void _plot_triangle_into_triangle_index_list(int p_size, const Vector3i &p_ofs, const AABB &p_bounds, const Vector3 p_points[3], uint32_t p_triangle_index, LocalVector<TriangleSort> &triangles, uint32_t p_grid_size);
 
 	struct RasterPushConstant {
 		float atlas_size[2] = {};
diff --git a/modules/minimp3/SCsub b/modules/minimp3/SCsub
index f4d1605d55..20e3165f38 100644
--- a/modules/minimp3/SCsub
+++ b/modules/minimp3/SCsub
@@ -13,5 +13,5 @@ if not env.msvc:
 else:
     env_minimp3.Prepend(CPPPATH=[thirdparty_dir])
 
-# Godot's own source files
+# Godot source files
 env_minimp3.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/mono/config.py b/modules/mono/config.py
index 3e6584590c..d895d2d92d 100644
--- a/modules/mono/config.py
+++ b/modules/mono/config.py
@@ -5,52 +5,44 @@ def can_build(env, platform):
     return not env["arch"].startswith("rv")
 
 
-def configure(env):
-    platform = env["platform"]
-
-    if platform not in supported_platforms:
-        raise RuntimeError("This module does not currently support building for this platform")
-
-    env.add_module_version_string("mono")
-
-    from SCons.Script import BoolVariable, PathVariable, Variables, Help
+def get_opts(platform):
+    from SCons.Variables import BoolVariable, PathVariable
 
     default_mono_static = platform in ["ios", "javascript"]
     default_mono_bundles_zlib = platform in ["javascript"]
 
-    envvars = Variables()
-    envvars.Add(
+    return [
         PathVariable(
             "mono_prefix",
             "Path to the Mono installation directory for the target platform and architecture",
             "",
             PathVariable.PathAccept,
-        )
-    )
-    envvars.Add(
+        ),
         PathVariable(
             "mono_bcl",
             "Path to a custom Mono BCL (Base Class Library) directory for the target platform",
             "",
             PathVariable.PathAccept,
-        )
-    )
-    envvars.Add(BoolVariable("mono_static", "Statically link Mono", default_mono_static))
-    envvars.Add(BoolVariable("mono_glue", "Build with the Mono glue sources", True))
-    envvars.Add(BoolVariable("build_cil", "Build C# solutions", True))
-    envvars.Add(
-        BoolVariable("copy_mono_root", "Make a copy of the Mono installation directory to bundle with the editor", True)
-    )
-
-    # TODO: It would be great if this could be detected automatically instead
-    envvars.Add(
+        ),
+        BoolVariable("mono_static", "Statically link Mono", default_mono_static),
+        BoolVariable("mono_glue", "Build with the Mono glue sources", True),
+        BoolVariable("build_cil", "Build C# solutions", True),
+        BoolVariable(
+            "copy_mono_root", "Make a copy of the Mono installation directory to bundle with the editor", True
+        ),
         BoolVariable(
             "mono_bundles_zlib", "Specify if the Mono runtime was built with bundled zlib", default_mono_bundles_zlib
-        )
-    )
+        ),
+    ]
+
+
+def configure(env):
+    platform = env["platform"]
 
-    envvars.Update(env)
-    Help(envvars.GenerateHelpText(env))
+    if platform not in supported_platforms:
+        raise RuntimeError("This module does not currently support building for this platform")
+
+    env.add_module_version_string("mono")
 
     if env["mono_bundles_zlib"]:
         # Mono may come with zlib bundled for WASM or on newer version when built with MinGW.
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp
index c7279be97f..b95b63cf1f 100644
--- a/modules/mono/csharp_script.cpp
+++ b/modules/mono/csharp_script.cpp
@@ -1801,9 +1801,7 @@ void CSharpInstance::get_event_signals_state_for_reloading(List<Pair<StringName,
 
 void CSharpInstance::get_property_list(List<PropertyInfo> *p_properties) const {
 	List<PropertyInfo> props;
-	for (const KeyValue<StringName, PropertyInfo> &E : script->member_info) {
-		props.push_front(E.value);
-	}
+	script->get_script_property_list(&props);
 
 	// Call _get_property_list
 
@@ -1855,6 +1853,74 @@ Variant::Type CSharpInstance::get_property_type(const StringName &p_name, bool *
 	return Variant::NIL;
 }
 
+bool CSharpInstance::property_can_revert(const StringName &p_name) const {
+	ERR_FAIL_COND_V(!script.is_valid(), false);
+
+	GD_MONO_SCOPE_THREAD_ATTACH;
+
+	MonoObject *mono_object = get_mono_object();
+	ERR_FAIL_NULL_V(mono_object, false);
+
+	GDMonoClass *top = script->script_class;
+
+	while (top && top != script->native) {
+		GDMonoMethod *method = top->get_method(CACHED_STRING_NAME(_property_can_revert), 1);
+
+		if (method) {
+			Variant name = p_name;
+			const Variant *args[1] = { &name };
+
+			MonoObject *ret = method->invoke(mono_object, args);
+
+			if (ret) {
+				bool can_revert = GDMonoMarshal::mono_object_to_variant(ret);
+				if (can_revert) {
+					return true;
+				}
+			}
+
+			break;
+		}
+
+		top = top->get_parent_class();
+	}
+
+	return false;
+}
+
+bool CSharpInstance::property_get_revert(const StringName &p_name, Variant &r_ret) const {
+	ERR_FAIL_COND_V(!script.is_valid(), false);
+
+	GD_MONO_SCOPE_THREAD_ATTACH;
+
+	MonoObject *mono_object = get_mono_object();
+	ERR_FAIL_NULL_V(mono_object, false);
+
+	GDMonoClass *top = script->script_class;
+
+	while (top && top != script->native) {
+		GDMonoMethod *method = top->get_method(CACHED_STRING_NAME(_property_get_revert), 1);
+
+		if (method) {
+			Variant name = p_name;
+			const Variant *args[1] = { &name };
+
+			MonoObject *ret = method->invoke(mono_object, args);
+
+			if (ret) {
+				r_ret = GDMonoMarshal::mono_object_to_variant(ret);
+				return true;
+			}
+
+			break;
+		}
+
+		top = top->get_parent_class();
+	}
+
+	return false;
+}
+
 void CSharpInstance::get_method_list(List<MethodInfo> *p_list) const {
 	if (!script->is_valid() || !script->script_class) {
 		return;
@@ -2335,10 +2401,6 @@ void CSharpScript::_placeholder_erased(PlaceHolderScriptInstance *p_placeholder)
 
 #ifdef TOOLS_ENABLED
 void CSharpScript::_update_exports_values(HashMap<StringName, Variant> &values, List<PropertyInfo> &propnames) {
-	if (base_cache.is_valid()) {
-		base_cache->_update_exports_values(values, propnames);
-	}
-
 	for (const KeyValue<StringName, Variant> &E : exported_members_defval_cache) {
 		values[E.key] = E.value;
 	}
@@ -2346,6 +2408,10 @@ void CSharpScript::_update_exports_values(HashMap<StringName, Variant> &values,
 	for (const PropertyInfo &prop_info : exported_members_cache) {
 		propnames.push_back(prop_info);
 	}
+
+	if (base_cache.is_valid()) {
+		base_cache->_update_exports_values(values, propnames);
+	}
 }
 
 void CSharpScript::_update_member_info_no_exports() {
@@ -2357,6 +2423,7 @@ void CSharpScript::_update_member_info_no_exports() {
 		member_info.clear();
 
 		GDMonoClass *top = script_class;
+		List<PropertyInfo> props;
 
 		while (top && top != native) {
 			PropertyInfo prop_info;
@@ -2371,7 +2438,7 @@ void CSharpScript::_update_member_info_no_exports() {
 					StringName member_name = field->get_name();
 
 					member_info[member_name] = prop_info;
-					exported_members_cache.push_front(prop_info);
+					props.push_front(prop_info);
 					exported_members_defval_cache[member_name] = Variant();
 				}
 			}
@@ -2385,11 +2452,18 @@ void CSharpScript::_update_member_info_no_exports() {
 					StringName member_name = property->get_name();
 
 					member_info[member_name] = prop_info;
-					exported_members_cache.push_front(prop_info);
+					props.push_front(prop_info);
 					exported_members_defval_cache[member_name] = Variant();
 				}
 			}
 
+			exported_members_cache.push_back(PropertyInfo(Variant::NIL, top->get_name(), PROPERTY_HINT_NONE, get_path(), PROPERTY_USAGE_CATEGORY));
+			for (const PropertyInfo &E : props) {
+				exported_members_cache.push_back(E);
+			}
+
+			props.clear();
+
 			top = top->get_parent_class();
 		}
 	}
@@ -2464,6 +2538,7 @@ bool CSharpScript::_update_exports(PlaceHolderScriptInstance *p_instance_to_upda
 #endif
 
 		GDMonoClass *top = script_class;
+		List<PropertyInfo> props;
 
 		while (top && top != native) {
 			PropertyInfo prop_info;
@@ -2482,7 +2557,7 @@ bool CSharpScript::_update_exports(PlaceHolderScriptInstance *p_instance_to_upda
 					if (exported) {
 #ifdef TOOLS_ENABLED
 						if (is_editor) {
-							exported_members_cache.push_front(prop_info);
+							props.push_front(prop_info);
 
 							if (tmp_object) {
 								exported_members_defval_cache[member_name] = GDMonoMarshal::mono_object_to_variant(field->get_value(tmp_object));
@@ -2510,7 +2585,7 @@ bool CSharpScript::_update_exports(PlaceHolderScriptInstance *p_instance_to_upda
 					if (exported) {
 #ifdef TOOLS_ENABLED
 						if (is_editor) {
-							exported_members_cache.push_front(prop_info);
+							props.push_front(prop_info);
 							if (tmp_object) {
 								MonoException *exc = nullptr;
 								MonoObject *ret = property->get_value(tmp_object, &exc);
@@ -2531,6 +2606,16 @@ bool CSharpScript::_update_exports(PlaceHolderScriptInstance *p_instance_to_upda
 				}
 			}
 
+#ifdef TOOLS_ENABLED
+			exported_members_cache.push_back(PropertyInfo(Variant::NIL, top->get_name(), PROPERTY_HINT_NONE, get_path(), PROPERTY_USAGE_CATEGORY));
+
+			for (const PropertyInfo &E : props) {
+				exported_members_cache.push_back(E);
+			}
+
+			props.clear();
+#endif // TOOLS_ENABLED
+
 			top = top->get_parent_class();
 		}
 
@@ -3491,9 +3576,15 @@ Ref<Script> CSharpScript::get_base_script() const {
 void CSharpScript::get_script_property_list(List<PropertyInfo> *r_list) const {
 	List<PropertyInfo> props;
 
+#ifdef TOOLS_ENABLED
+	for (const PropertyInfo &E : exported_members_cache) {
+		props.push_back(E);
+	}
+#else
 	for (const KeyValue<StringName, PropertyInfo> &E : member_info) {
 		props.push_front(E.value);
 	}
+#endif // TOOLS_ENABLED
 
 	for (const PropertyInfo &prop : props) {
 		r_list->push_back(prop);
@@ -3682,6 +3773,8 @@ CSharpLanguage::StringNameCache::StringNameCache() {
 	_set = StaticCString::create("_set");
 	_get = StaticCString::create("_get");
 	_get_property_list = StaticCString::create("_get_property_list");
+	_property_can_revert = StaticCString::create("_property_can_revert");
+	_property_get_revert = StaticCString::create("_property_get_revert");
 	_notification = StaticCString::create("_notification");
 	_script_source = StaticCString::create("script/source");
 	on_before_serialize = StaticCString::create("OnBeforeSerialize");
diff --git a/modules/mono/csharp_script.h b/modules/mono/csharp_script.h
index 48129e69cb..823de91bf6 100644
--- a/modules/mono/csharp_script.h
+++ b/modules/mono/csharp_script.h
@@ -293,6 +293,9 @@ public:
 	void get_property_list(List<PropertyInfo> *p_properties) const override;
 	Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid) const override;
 
+	bool property_can_revert(const StringName &p_name) const override;
+	bool property_get_revert(const StringName &p_name, Variant &r_ret) const override;
+
 	void get_method_list(List<MethodInfo> *p_list) const override;
 	bool has_method(const StringName &p_method) const override;
 	Variant callp(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) override;
@@ -371,6 +374,8 @@ class CSharpLanguage : public ScriptLanguage {
 		StringName _set;
 		StringName _get;
 		StringName _get_property_list;
+		StringName _property_can_revert;
+		StringName _property_get_revert;
 		StringName _notification;
 		StringName _script_source;
 		StringName dotctor; // .ctor
diff --git a/modules/mono/doc_classes/GodotSharp.xml b/modules/mono/doc_classes/GodotSharp.xml
index 9de6b48e9e..b981542801 100644
--- a/modules/mono/doc_classes/GodotSharp.xml
+++ b/modules/mono/doc_classes/GodotSharp.xml
@@ -38,7 +38,7 @@
 		</method>
 		<method name="is_domain_finalizing_for_unload">
 			<return type="bool" />
-			<argument index="0" name="domain_id" type="int" />
+			<param index="0" name="domain_id" type="int" />
 			<description>
 				Returns [code]true[/code] if the domain is being finalized, [code]false[/code] otherwise.
 			</description>
diff --git a/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs b/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs
index ac29efb716..3440eb701c 100644
--- a/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs
@@ -66,6 +66,9 @@ namespace GodotTools.Ides.Rider
             if (string.IsNullOrEmpty(path))
                 return false;
 
+            if (path.IndexOfAny(Path.GetInvalidPathChars()) != -1)
+                return false;
+
             var fileInfo = new FileInfo(path);
             string filename = fileInfo.Name.ToLowerInvariant();
             return filename.StartsWith("rider", StringComparison.Ordinal);
diff --git a/modules/mono/editor/code_completion.cpp b/modules/mono/editor/code_completion.cpp
index a1789412f4..7bce6f2c21 100644
--- a/modules/mono/editor/code_completion.cpp
+++ b/modules/mono/editor/code_completion.cpp
@@ -172,7 +172,7 @@ PackedStringArray get_code_completion(CompletionKind p_kind, const String &p_scr
 			}
 		} break;
 		case CompletionKind::SHADER_PARAMS: {
-			print_verbose("Shared params completion for C# not implemented.");
+			print_verbose("Shader uniforms completion for C# is not implemented yet.");
 		} break;
 		case CompletionKind::SIGNALS: {
 			Ref<Script> script = ResourceLoader::load(p_script_file.simplify_path());
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Basis.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Basis.cs
index b1f1decd72..437878818c 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Basis.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Basis.cs
@@ -828,6 +828,22 @@ namespace Godot
         }
 
         /// <summary>
+        /// Constructs a pure scale basis matrix with no rotation or shearing.
+        /// The scale values are set as the main diagonal of the matrix,
+        /// and all of the other parts of the matrix are zero.
+        /// </summary>
+        /// <param name="scale">The scale Vector3.</param>
+        /// <returns>A pure scale Basis matrix.</returns>
+        public static Basis FromScale(Vector3 scale)
+        {
+            return new Basis(
+                scale.x, 0, 0,
+                0, scale.y, 0,
+                0, 0, scale.z
+            );
+        }
+
+        /// <summary>
         /// Composes these two basis matrices by multiplying them
         /// together. This has the effect of transforming the second basis
         /// (the child) by the first basis (the parent).
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Color.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Color.cs
index fc9d40ca48..a6324504fc 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Color.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Color.cs
@@ -916,7 +916,7 @@ namespace Godot
         /// <c>new Color(1 - c.r, 1 - c.g, 1 - c.b, 1 - c.a)</c>.
         /// </summary>
         /// <param name="color">The color to invert.</param>
-        /// <returns>The inverted color</returns>
+        /// <returns>The inverted color.</returns>
         public static Color operator -(Color color)
         {
             return Colors.White - color;
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/GD.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/GD.cs
index bb076a9633..236d0666bc 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/GD.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/GD.cs
@@ -239,11 +239,20 @@ namespace Godot
         }
 
         /// <summary>
-        /// Converts one or more arguments of any type to string in the best way possible and prints them to the console. The following BBCode tags are supported: b, i, u, s, indent, code, url, center, right, color, bgcolor, fgcolor. Color tags only support named colors such as [code]red[/code], [i]not[/i] hexadecimal color codes. Unsupported tags will be left as-is in standard output.
-        /// When printing to standard output, the supported subset of BBCode is converted to ANSI escape codes for the terminal emulator to display. Displaying ANSI escape codes is currently only supported on Linux and macOS. Support for ANSI escape codes may vary across terminal emulators, especially for italic and strikethrough.
+        /// Converts one or more arguments of any type to string in the best way possible
+        /// and prints them to the console.
+        /// The following BBCode tags are supported: b, i, u, s, indent, code, url, center,
+        /// right, color, bgcolor, fgcolor.
+        /// Color tags only support named colors such as <c>red</c>, not hexadecimal color codes.
+        /// Unsupported tags will be left as-is in standard output.
+        /// When printing to standard output, the supported subset of BBCode is converted to
+        /// ANSI escape codes for the terminal emulator to display. Displaying ANSI escape codes
+        /// is currently only supported on Linux and macOS. Support for ANSI escape codes may vary
+        /// across terminal emulators, especially for italic and strikethrough.
         ///
         /// Note: Consider using <see cref="PushError(string)"/> and <see cref="PushWarning(string)"/>
-        /// to print error and warning messages instead of <see cref="Print(object[])"/> or <see cref="PrintRich(object[])"/>.
+        /// to print error and warning messages instead of <see cref="Print(object[])"/> or
+        /// <see cref="PrintRich(object[])"/>.
         /// This distinguishes them from print messages used for debugging purposes,
         /// while also displaying a stack trace when an error or warning is printed.
         /// </summary>
@@ -253,7 +262,6 @@ namespace Godot
         /// </code>
         /// </example>
         /// <param name="what">Arguments that will be printed.</param>
-        /// </summary>
         public static void PrintRich(params object[] what)
         {
             godot_icall_GD_print_rich(GetPrintParams(what));
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/SignalInfo.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/SignalInfo.cs
index 5680c9d55a..da01300586 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/SignalInfo.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/SignalInfo.cs
@@ -18,7 +18,7 @@ namespace Godot
         public StringName Name => _signalName;
 
         /// <summary>
-        /// Creates a new <see cref="Signal"/> with the name <paramref name="name"/>
+        /// Creates a new <see cref="SignalInfo"/> with the name <paramref name="name"/>
         /// in the specified <paramref name="owner"/>.
         /// </summary>
         /// <param name="owner">Object that contains the signal.</param>
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform3D.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform3D.cs
index c00b9d8e9b..9eaf4f3252 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform3D.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform3D.cs
@@ -235,7 +235,7 @@ namespace Godot
         /// <returns>The scaled transformation matrix.</returns>
         public Transform3D ScaledLocal(Vector3 scale)
         {
-            Basis tmpBasis = new Basis(new Vector3(scale.x, 0, 0), new Vector3(0, scale.y, 0), new Vector3(0, 0, scale.z));
+            Basis tmpBasis = Basis.FromScale(scale);
             return new Transform3D(basis * tmpBasis, origin);
         }
 
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2.cs
index 9c80dd0217..67f70390dd 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2.cs
@@ -534,7 +534,7 @@ namespace Godot
         ///
         /// This method also handles interpolating the lengths if the input vectors
         /// have different lengths. For the special case of one or both input vectors
-        /// having zero length, this method behaves like <see cref="Lerp"/>.
+        /// having zero length, this method behaves like <see cref="Lerp(Vector2, real_t)"/>.
         /// </summary>
         /// <param name="to">The destination vector for interpolation.</param>
         /// <param name="weight">A value on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3.cs
index ec2e724b10..67a98efc2d 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3.cs
@@ -574,7 +574,7 @@ namespace Godot
         ///
         /// This method also handles interpolating the lengths if the input vectors
         /// have different lengths. For the special case of one or both input vectors
-        /// having zero length, this method behaves like <see cref="Lerp"/>.
+        /// having zero length, this method behaves like <see cref="Lerp(Vector3, real_t)"/>.
         /// </summary>
         /// <param name="to">The destination vector for interpolation.</param>
         /// <param name="weight">A value on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
@@ -620,22 +620,6 @@ namespace Godot
             );
         }
 
-        /// <summary>
-        /// Returns a diagonal matrix with the vector as main diagonal.
-        ///
-        /// This is equivalent to a <see cref="Basis"/> with no rotation or shearing and
-        /// this vector's components set as the scale.
-        /// </summary>
-        /// <returns>A <see cref="Basis"/> with the vector as its main diagonal.</returns>
-        public Basis ToDiagonalMatrix()
-        {
-            return new Basis(
-                x, 0, 0,
-                0, y, 0,
-                0, 0, z
-            );
-        }
-
         // Constants
         private static readonly Vector3 _zero = new Vector3(0, 0, 0);
         private static readonly Vector3 _one = new Vector3(1, 1, 1);
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector4.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector4.cs
index 72fe9cb16f..4af817455c 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector4.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector4.cs
@@ -140,7 +140,6 @@ namespace Godot
             }
         }
 
-
         /// <summary>
         /// Returns a new vector with all components in absolute values (i.e. positive).
         /// </summary>
@@ -178,16 +177,59 @@ namespace Godot
             );
         }
 
+        /// <summary>
+        /// Performs a cubic interpolation between vectors <paramref name="preA"/>, this vector,
+        /// <paramref name="b"/>, and <paramref name="postB"/>, by the given amount <paramref name="weight"/>.
+        /// </summary>
+        /// <param name="b">The destination vector.</param>
+        /// <param name="preA">A vector before this vector.</param>
+        /// <param name="postB">A vector after <paramref name="b"/>.</param>
+        /// <param name="weight">A value on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
+        /// <returns>The interpolated vector.</returns>
+        public Vector4 CubicInterpolate(Vector4 b, Vector4 preA, Vector4 postB, real_t weight)
+        {
+            return new Vector4
+            (
+                Mathf.CubicInterpolate(x, b.x, preA.x, postB.x, weight),
+                Mathf.CubicInterpolate(y, b.y, preA.y, postB.y, weight),
+                Mathf.CubicInterpolate(y, b.z, preA.z, postB.z, weight),
+                Mathf.CubicInterpolate(w, b.w, preA.w, postB.w, weight)
+            );
+        }
 
         /// <summary>
-        /// Returns a new vector with all components rounded down (towards negative infinity).
+        /// Returns the normalized vector pointing from this vector to <paramref name="to"/>.
         /// </summary>
-        /// <returns>A vector with <see cref="Mathf.Floor"/> called on each component.</returns>
-        public Vector4 Floor()
+        /// <param name="to">The other vector to point towards.</param>
+        /// <returns>The direction from this vector to <paramref name="to"/>.</returns>
+        public Vector4 DirectionTo(Vector4 to)
         {
-            return new Vector4(Mathf.Floor(x), Mathf.Floor(y), Mathf.Floor(z), Mathf.Floor(w));
+            Vector4 ret = new Vector4(to.x - x, to.y - y, to.z - z, to.w - w);
+            ret.Normalize();
+            return ret;
         }
 
+        /// <summary>
+        /// Returns the squared distance between this vector and <paramref name="to"/>.
+        /// This method runs faster than <see cref="DistanceTo"/>, so prefer it if
+        /// you need to compare vectors or need the squared distance for some formula.
+        /// </summary>
+        /// <param name="to">The other vector to use.</param>
+        /// <returns>The squared distance between the two vectors.</returns>
+        public real_t DistanceSquaredTo(Vector4 to)
+        {
+            return (to - this).LengthSquared();
+        }
+
+        /// <summary>
+        /// Returns the distance between this vector and <paramref name="to"/>.
+        /// </summary>
+        /// <param name="to">The other vector to use.</param>
+        /// <returns>The distance between the two vectors.</returns>
+        public real_t DistanceTo(Vector4 to)
+        {
+            return (to - this).Length();
+        }
 
         /// <summary>
         /// Returns the dot product of this vector and <paramref name="with"/>.
@@ -200,6 +242,15 @@ namespace Godot
         }
 
         /// <summary>
+        /// Returns a new vector with all components rounded down (towards negative infinity).
+        /// </summary>
+        /// <returns>A vector with <see cref="Mathf.Floor"/> called on each component.</returns>
+        public Vector4 Floor()
+        {
+            return new Vector4(Mathf.Floor(x), Mathf.Floor(y), Mathf.Floor(z), Mathf.Floor(w));
+        }
+
+        /// <summary>
         /// Returns the inverse of this vector. This is the same as <c>new Vector4(1 / v.x, 1 / v.y, 1 / v.z, 1 / v.w)</c>.
         /// </summary>
         /// <returns>The inverse of this vector.</returns>
@@ -318,6 +369,42 @@ namespace Godot
         }
 
         /// <summary>
+        /// Returns a vector composed of the <see cref="Mathf.PosMod(real_t, real_t)"/> of this vector's components
+        /// and <paramref name="mod"/>.
+        /// </summary>
+        /// <param name="mod">A value representing the divisor of the operation.</param>
+        /// <returns>
+        /// A vector with each component <see cref="Mathf.PosMod(real_t, real_t)"/> by <paramref name="mod"/>.
+        /// </returns>
+        public Vector4 PosMod(real_t mod)
+        {
+            return new Vector4(
+                Mathf.PosMod(x, mod),
+                Mathf.PosMod(y, mod),
+                Mathf.PosMod(z, mod),
+                Mathf.PosMod(w, mod)
+            );
+        }
+
+        /// <summary>
+        /// Returns a vector composed of the <see cref="Mathf.PosMod(real_t, real_t)"/> of this vector's components
+        /// and <paramref name="modv"/>'s components.
+        /// </summary>
+        /// <param name="modv">A vector representing the divisors of the operation.</param>
+        /// <returns>
+        /// A vector with each component <see cref="Mathf.PosMod(real_t, real_t)"/> by <paramref name="modv"/>'s components.
+        /// </returns>
+        public Vector4 PosMod(Vector4 modv)
+        {
+            return new Vector4(
+                Mathf.PosMod(x, modv.x),
+                Mathf.PosMod(y, modv.y),
+                Mathf.PosMod(z, modv.z),
+                Mathf.PosMod(w, modv.w)
+            );
+        }
+
+        /// <summary>
         /// Returns this vector with all components rounded to the nearest integer,
         /// with halfway cases rounded towards the nearest multiple of two.
         /// </summary>
@@ -343,6 +430,21 @@ namespace Godot
             return v;
         }
 
+        /// <summary>
+        /// Returns this vector with each component snapped to the nearest multiple of <paramref name="step"/>.
+        /// This can also be used to round to an arbitrary number of decimals.
+        /// </summary>
+        /// <param name="step">A vector value representing the step size to snap to.</param>
+        public Vector4 Snapped(Vector4 step)
+        {
+            return new Vector4(
+                Mathf.Snapped(x, step.x),
+                Mathf.Snapped(y, step.y),
+                Mathf.Snapped(z, step.z),
+                Mathf.Snapped(w, step.w)
+            );
+        }
+
         // Constants
         private static readonly Vector4 _zero = new Vector4(0, 0, 0, 0);
         private static readonly Vector4 _one = new Vector4(1, 1, 1, 1);
diff --git a/modules/msdfgen/config.py b/modules/msdfgen/config.py
index 653e466a74..631894400d 100644
--- a/modules/msdfgen/config.py
+++ b/modules/msdfgen/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
-    return env.module_check_dependencies("msdfgen", ["freetype"])
+    env.module_add_dependencies("msdfgen", ["freetype"])
+    return True
 
 
 def configure(env):
diff --git a/modules/multiplayer/doc_classes/MultiplayerSpawner.xml b/modules/multiplayer/doc_classes/MultiplayerSpawner.xml
index 881796ed26..c0265c9161 100644
--- a/modules/multiplayer/doc_classes/MultiplayerSpawner.xml
+++ b/modules/multiplayer/doc_classes/MultiplayerSpawner.xml
@@ -14,7 +14,7 @@
 	<methods>
 		<method name="_spawn_custom" qualifiers="virtual">
 			<return type="Node" />
-			<argument index="0" name="data" type="Variant" />
+			<param index="0" name="data" type="Variant" />
 			<description>
 				Method called on all peers when a custom spawn was requested by the authority using [method spawn]. Should return a [Node] that is not in the scene tree.
 
@@ -23,7 +23,7 @@
 		</method>
 		<method name="add_spawnable_scene">
 			<return type="void" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Adds a scene path to spawnable scenes, making it automatically replicated from the multiplayer authority to other peers when added as children of the node pointed by [member spawn_path].
 			</description>
@@ -36,7 +36,7 @@
 		</method>
 		<method name="get_spawnable_scene" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Returns the spawnable scene path by index.
 			</description>
@@ -49,7 +49,7 @@
 		</method>
 		<method name="spawn">
 			<return type="Node" />
-			<argument index="0" name="data" type="Variant" default="null" />
+			<param index="0" name="data" type="Variant" default="null" />
 			<description>
 				Requests a custom spawn, with [code]data[/code] passed to [method _spawn_custom] on all peers. Returns the locally spawned node instance already inside the scene tree, and added as a child of the node pointed by [member spawn_path].
 
@@ -69,13 +69,13 @@
 	</members>
 	<signals>
 		<signal name="despawned">
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
 				Emitted when a spawnable scene or custom spawn was despawned by the multiplayer authority. Only called on puppets.
 			</description>
 		</signal>
 		<signal name="spawned">
-			<argument index="0" name="node" type="Node" />
+			<param index="0" name="node" type="Node" />
 			<description>
 				Emitted when a spawnable scene or custom spawn was spawned by the multiplayer authority. Only called on puppets.
 			</description>
diff --git a/modules/multiplayer/doc_classes/MultiplayerSynchronizer.xml b/modules/multiplayer/doc_classes/MultiplayerSynchronizer.xml
index a2ea64061c..9a4d755d64 100644
--- a/modules/multiplayer/doc_classes/MultiplayerSynchronizer.xml
+++ b/modules/multiplayer/doc_classes/MultiplayerSynchronizer.xml
@@ -16,7 +16,7 @@
 	<methods>
 		<method name="add_visibility_filter">
 			<return type="void" />
-			<argument index="0" name="filter" type="Callable" />
+			<param index="0" name="filter" type="Callable" />
 			<description>
 				Adds a peer visibility filter for this synchronizer.
 
@@ -25,29 +25,29 @@
 		</method>
 		<method name="get_visibility_for" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="peer" type="int" />
+			<param index="0" name="peer" type="int" />
 			<description>
 				Queries the current visibility for peer [code]peer[/code].
 			</description>
 		</method>
 		<method name="remove_visibility_filter">
 			<return type="void" />
-			<argument index="0" name="filter" type="Callable" />
+			<param index="0" name="filter" type="Callable" />
 			<description>
 				Removes a peer visiblity filter from this synchronizer.
 			</description>
 		</method>
 		<method name="set_visibility_for">
 			<return type="void" />
-			<argument index="0" name="peer" type="int" />
-			<argument index="1" name="visible" type="bool" />
+			<param index="0" name="peer" type="int" />
+			<param index="1" name="visible" type="bool" />
 			<description>
 				Sets the visibility of [code]peer[/code] to [code]visible[/code]. If [code]peer[/code] is [code]0[/code], the value of [member public_visibility] will be updated instead.
 			</description>
 		</method>
 		<method name="update_visibility">
 			<return type="void" />
-			<argument index="0" name="for_peer" type="int" default="0" />
+			<param index="0" name="for_peer" type="int" default="0" />
 			<description>
 				Updates the visibility of [code]peer[/code] according to visibility filters. If [code]peer[/code] is [code]0[/code] (the default), all peers' visibilties are updated.
 			</description>
@@ -73,7 +73,7 @@
 	</members>
 	<signals>
 		<signal name="visibility_changed">
-			<argument index="0" name="for_peer" type="int" />
+			<param index="0" name="for_peer" type="int" />
 			<description>
 				Emitted when visibility of [code]for_peer[/code] is updated. See [method update_visibility].
 			</description>
diff --git a/modules/multiplayer/doc_classes/SceneMultiplayer.xml b/modules/multiplayer/doc_classes/SceneMultiplayer.xml
index 0c3ed2d784..62bb396d15 100644
--- a/modules/multiplayer/doc_classes/SceneMultiplayer.xml
+++ b/modules/multiplayer/doc_classes/SceneMultiplayer.xml
@@ -21,10 +21,10 @@
 		</method>
 		<method name="send_bytes">
 			<return type="int" enum="Error" />
-			<argument index="0" name="bytes" type="PackedByteArray" />
-			<argument index="1" name="id" type="int" default="0" />
-			<argument index="2" name="mode" type="int" enum="MultiplayerPeer.TransferMode" default="2" />
-			<argument index="3" name="channel" type="int" default="0" />
+			<param index="0" name="bytes" type="PackedByteArray" />
+			<param index="1" name="id" type="int" default="0" />
+			<param index="2" name="mode" type="int" enum="MultiplayerPeer.TransferMode" default="2" />
+			<param index="3" name="channel" type="int" default="0" />
 			<description>
 				Sends the given raw [code]bytes[/code] to a specific peer identified by [code]id[/code] (see [method MultiplayerPeer.set_target_peer]). Default ID is [code]0[/code], i.e. broadcast to all peers.
 			</description>
@@ -45,8 +45,8 @@
 	</members>
 	<signals>
 		<signal name="peer_packet">
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="packet" type="PackedByteArray" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="packet" type="PackedByteArray" />
 			<description>
 				Emitted when this MultiplayerAPI's [member MultiplayerAPI.multiplayer_peer] receives a [code]packet[/code] with custom data (see [method send_bytes]). ID is the peer ID of the peer that sent the packet.
 			</description>
diff --git a/modules/multiplayer/doc_classes/SceneReplicationConfig.xml b/modules/multiplayer/doc_classes/SceneReplicationConfig.xml
index fc91592c7a..fdc441e9c3 100644
--- a/modules/multiplayer/doc_classes/SceneReplicationConfig.xml
+++ b/modules/multiplayer/doc_classes/SceneReplicationConfig.xml
@@ -10,8 +10,8 @@
 	<methods>
 		<method name="add_property">
 			<return type="void" />
-			<argument index="0" name="path" type="NodePath" />
-			<argument index="1" name="index" type="int" default="-1" />
+			<param index="0" name="path" type="NodePath" />
+			<param index="1" name="index" type="int" default="-1" />
 			<description>
 				Adds the property identified by the given [code]path[/code] to the list of the properties being synchronized, optionally passing an [code]index[/code].
 			</description>
@@ -24,51 +24,51 @@
 		</method>
 		<method name="has_property" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="path" type="NodePath" />
+			<param index="0" name="path" type="NodePath" />
 			<description>
 				Returns whether the given [code]path[/code] is configured for synchronization.
 			</description>
 		</method>
 		<method name="property_get_index" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="path" type="NodePath" />
+			<param index="0" name="path" type="NodePath" />
 			<description>
 				Finds the index of the given [code]path[/code].
 			</description>
 		</method>
 		<method name="property_get_spawn">
 			<return type="bool" />
-			<argument index="0" name="path" type="NodePath" />
+			<param index="0" name="path" type="NodePath" />
 			<description>
 				Returns whether the property identified by the given [code]path[/code] is configured to be synchronized on spawn.
 			</description>
 		</method>
 		<method name="property_get_sync">
 			<return type="bool" />
-			<argument index="0" name="path" type="NodePath" />
+			<param index="0" name="path" type="NodePath" />
 			<description>
 				Returns whether the property identified by the given [code]path[/code] is configured to be synchronized on process.
 			</description>
 		</method>
 		<method name="property_set_spawn">
 			<return type="void" />
-			<argument index="0" name="path" type="NodePath" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="path" type="NodePath" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				Sets whether the property identified by the given [code]path[/code] is configured to be synchronized on spawn.
 			</description>
 		</method>
 		<method name="property_set_sync">
 			<return type="void" />
-			<argument index="0" name="path" type="NodePath" />
-			<argument index="1" name="enabled" type="bool" />
+			<param index="0" name="path" type="NodePath" />
+			<param index="1" name="enabled" type="bool" />
 			<description>
 				Sets whether the property identified by the given [code]path[/code] is configured to be synchronized on process.
 			</description>
 		</method>
 		<method name="remove_property">
 			<return type="void" />
-			<argument index="0" name="path" type="NodePath" />
+			<param index="0" name="path" type="NodePath" />
 			<description>
 				Removes the property identified by the given [code]path[/code] from the configuration.
 			</description>
diff --git a/modules/multiplayer/editor/replication_editor_plugin.cpp b/modules/multiplayer/editor/replication_editor_plugin.cpp
index 1f79b8c3e3..50f1434ad8 100644
--- a/modules/multiplayer/editor/replication_editor_plugin.cpp
+++ b/modules/multiplayer/editor/replication_editor_plugin.cpp
@@ -255,8 +255,6 @@ void ReplicationEditor::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_update_checked", "property", "column", "checked"), &ReplicationEditor::_update_checked);
 	ClassDB::bind_method("_can_drop_data_fw", &ReplicationEditor::_can_drop_data_fw);
 	ClassDB::bind_method("_drop_data_fw", &ReplicationEditor::_drop_data_fw);
-
-	ADD_SIGNAL(MethodInfo("keying_changed"));
 }
 
 bool ReplicationEditor::_can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const {
@@ -322,10 +320,6 @@ void ReplicationEditor::_notification(int p_what) {
 			add_pick_button->set_icon(get_theme_icon(SNAME("Add"), SNAME("EditorIcons")));
 			pin->set_icon(get_theme_icon(SNAME("Pin"), SNAME("EditorIcons")));
 		} break;
-
-		case NOTIFICATION_VISIBILITY_CHANGED: {
-			update_keying();
-		} break;
 	}
 }
 
@@ -341,28 +335,15 @@ void ReplicationEditor::_add_pressed() {
 		return;
 	}
 	String np_text = np_line_edit->get_text();
-	if (np_text.find(":") == -1) {
-		np_text = ":" + np_text;
-	}
-	NodePath prop = NodePath(np_text);
-	if (prop.is_empty()) {
-		return;
-	}
-	UndoRedo *undo_redo = EditorNode::get_singleton()->get_undo_redo();
-	undo_redo->create_action(TTR("Add property"));
-	config = current->get_replication_config();
-	if (config.is_null()) {
-		config.instantiate();
-		current->set_replication_config(config);
-		undo_redo->add_do_method(current, "set_replication_config", config);
-		undo_redo->add_undo_method(current, "set_replication_config", Ref<SceneReplicationConfig>());
-		_update_config();
+	int idx = np_text.find(":");
+	if (idx == -1) {
+		np_text = ".:" + np_text;
+	} else if (idx == 0) {
+		np_text = "." + np_text;
 	}
-	undo_redo->add_do_method(config.ptr(), "add_property", prop);
-	undo_redo->add_undo_method(config.ptr(), "remove_property", prop);
-	undo_redo->add_do_method(this, "_update_config");
-	undo_redo->add_undo_method(this, "_update_config");
-	undo_redo->commit_action();
+	NodePath path = NodePath(np_text);
+
+	_add_sync_property(path);
 }
 
 void ReplicationEditor::_tree_item_edited() {
@@ -440,32 +421,12 @@ void ReplicationEditor::_update_checked(const NodePath &p_prop, int p_column, bo
 	}
 }
 
-void ReplicationEditor::update_keying() {
-	/// TODO make keying usable.
-#if 0
-	bool keying_enabled = false;
-	EditorSelectionHistory *editor_history = EditorNode::get_singleton()->get_editor_selection_history();
-	if (is_visible_in_tree() && config.is_valid() && editor_history->get_path_size() > 0) {
-		Object *obj = ObjectDB::get_instance(editor_history->get_path_object(0));
-		keying_enabled = Object::cast_to<Node>(obj) != nullptr;
-	}
-
-	if (keying_enabled == keying) {
-		return;
-	}
-
-	keying = keying_enabled;
-	emit_signal(SNAME("keying_changed"));
-#endif
-}
-
 void ReplicationEditor::_update_config() {
 	deleting = NodePath();
 	tree->clear();
 	tree->create_item();
 	drop_label->set_visible(true);
 	if (!config.is_valid()) {
-		update_keying();
 		return;
 	}
 	TypedArray<NodePath> props = config->get_properties();
@@ -476,7 +437,6 @@ void ReplicationEditor::_update_config() {
 		const NodePath path = props[i];
 		_add_property(path, config->property_get_spawn(path), config->property_get_sync(path));
 	}
-	update_keying();
 }
 
 void ReplicationEditor::edit(MultiplayerSynchronizer *p_sync) {
@@ -532,43 +492,6 @@ void ReplicationEditor::_add_property(const NodePath &p_property, bool p_spawn,
 	item->set_editable(2, true);
 }
 
-void ReplicationEditor::property_keyed(const String &p_property) {
-	ERR_FAIL_COND(!current || config.is_null());
-	Node *root = current->get_node(current->get_root_path());
-	ERR_FAIL_COND(!root);
-	EditorSelectionHistory *history = EditorNode::get_singleton()->get_editor_selection_history();
-	ERR_FAIL_COND(history->get_path_size() == 0);
-	Node *node = Object::cast_to<Node>(ObjectDB::get_instance(history->get_path_object(0)));
-	ERR_FAIL_COND(!node);
-	if (node->is_class("MultiplayerSynchronizer")) {
-		error_dialog->set_text(TTR("Properties of 'MultiplayerSynchronizer' cannot be configured for replication."));
-		error_dialog->popup_centered();
-		return;
-	}
-	if (history->get_path_size() > 1 || p_property.get_slice_count(":") > 1) {
-		error_dialog->set_text(TTR("Subresources cannot yet be configured for replication."));
-		error_dialog->popup_centered();
-		return;
-	}
-
-	String path = root->get_path_to(node);
-	for (int i = 1; i < history->get_path_size(); i++) {
-		String prop = history->get_path_property(i);
-		ERR_FAIL_COND(prop == "");
-		path += ":" + prop;
-	}
-	path += ":" + p_property;
-
-	NodePath prop = path;
-	UndoRedo *undo_redo = EditorNode::get_singleton()->get_undo_redo();
-	undo_redo->create_action(TTR("Add property"));
-	undo_redo->add_do_method(config.ptr(), "add_property", prop);
-	undo_redo->add_undo_method(config.ptr(), "remove_property", prop);
-	undo_redo->add_do_method(this, "_update_config");
-	undo_redo->add_undo_method(this, "_update_config");
-	undo_redo->commit_action();
-}
-
 /// ReplicationEditorPlugin
 ReplicationEditorPlugin::ReplicationEditorPlugin() {
 	repl_editor = memnew(ReplicationEditor);
@@ -580,26 +503,9 @@ ReplicationEditorPlugin::ReplicationEditorPlugin() {
 ReplicationEditorPlugin::~ReplicationEditorPlugin() {
 }
 
-void ReplicationEditorPlugin::_keying_changed() {
-	// TODO make lock usable.
-	//InspectorDock::get_inspector_singleton()->set_keying(repl_editor->has_keying(), this);
-}
-
-void ReplicationEditorPlugin::_property_keyed(const String &p_keyed, const Variant &p_value, bool p_advance) {
-	if (!repl_editor->has_keying()) {
-		return;
-	}
-	repl_editor->property_keyed(p_keyed);
-}
-
 void ReplicationEditorPlugin::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
-			//Node3DEditor::get_singleton()->connect("transform_key_request", callable_mp(this, &AnimationPlayerEditorPlugin::_transform_key_request));
-			InspectorDock::get_inspector_singleton()->connect("property_keyed", callable_mp(this, &ReplicationEditorPlugin::_property_keyed));
-			repl_editor->connect("keying_changed", callable_mp(this, &ReplicationEditorPlugin::_keying_changed));
-			// TODO make lock usable.
-			//InspectorDock::get_inspector_singleton()->connect("object_inspected", callable_mp(repl_editor, &ReplicationEditor::update_keying));
 			get_tree()->connect("node_removed", callable_mp(this, &ReplicationEditorPlugin::_node_removed));
 		} break;
 	}
@@ -635,8 +541,6 @@ bool ReplicationEditorPlugin::handles(Object *p_object) const {
 
 void ReplicationEditorPlugin::make_visible(bool p_visible) {
 	if (p_visible) {
-		//editor->hide_animation_player_editors();
-		//editor->animation_panel_make_visible(true);
 		button->show();
 		EditorNode::get_singleton()->make_bottom_panel_item_visible(repl_editor);
 	} else if (!repl_editor->get_pin()->is_pressed()) {
diff --git a/modules/multiplayer/editor/replication_editor_plugin.h b/modules/multiplayer/editor/replication_editor_plugin.h
index 5cc2bbe937..e60e49cc25 100644
--- a/modules/multiplayer/editor/replication_editor_plugin.h
+++ b/modules/multiplayer/editor/replication_editor_plugin.h
@@ -61,7 +61,6 @@ private:
 	Ref<SceneReplicationConfig> config;
 	NodePath deleting;
 	Tree *tree = nullptr;
-	bool keying = false;
 
 	PropertySelector *prop_selector = nullptr;
 	SceneTreeDialog *pick_node = nullptr;
@@ -98,11 +97,8 @@ protected:
 	void _notification(int p_what);
 
 public:
-	void update_keying();
 	void edit(MultiplayerSynchronizer *p_object);
-	bool has_keying() const { return keying; }
 	MultiplayerSynchronizer *get_current() const { return current; }
-	void property_keyed(const String &p_property);
 
 	Button *get_pin() { return pin; }
 	ReplicationEditor();
@@ -117,8 +113,6 @@ private:
 	ReplicationEditor *repl_editor = nullptr;
 
 	void _node_removed(Node *p_node);
-	void _keying_changed();
-	void _property_keyed(const String &p_keyed, const Variant &p_value, bool p_advance);
 
 	void _pinned();
 
@@ -133,17 +127,5 @@ public:
 	ReplicationEditorPlugin();
 	~ReplicationEditorPlugin();
 };
-#else
-class ReplicationEditorPlugin : public EditorPlugin {
-	GDCLASS(ReplicationEditorPlugin, EditorPlugin);
-
-public:
-	virtual void edit(Object *p_object) override {}
-	virtual bool handles(Object *p_object) const override { return false; }
-	virtual void make_visible(bool p_visible) override {}
-
-	ReplicationEditorPlugin() {}
-	~ReplicationEditorPlugin() {}
-};
 
 #endif // REPLICATION_EDITOR_PLUGIN_H
diff --git a/modules/navigation/navigation_mesh_generator.cpp b/modules/navigation/navigation_mesh_generator.cpp
index 6e8ac77f79..848e554fb0 100644
--- a/modules/navigation/navigation_mesh_generator.cpp
+++ b/modules/navigation/navigation_mesh_generator.cpp
@@ -42,6 +42,7 @@
 #include "scene/resources/concave_polygon_shape_3d.h"
 #include "scene/resources/convex_polygon_shape_3d.h"
 #include "scene/resources/cylinder_shape_3d.h"
+#include "scene/resources/height_map_shape_3d.h"
 #include "scene/resources/primitive_meshes.h"
 #include "scene/resources/shape_3d.h"
 #include "scene/resources/sphere_shape_3d.h"
@@ -275,6 +276,50 @@ void NavigationMeshGenerator::_parse_geometry(const Transform3D &p_navmesh_trans
 							_add_faces(faces, transform, p_vertices, p_indices);
 						}
 					}
+
+					HeightMapShape3D *heightmap_shape = Object::cast_to<HeightMapShape3D>(*s);
+					if (heightmap_shape) {
+						int heightmap_depth = heightmap_shape->get_map_depth();
+						int heightmap_width = heightmap_shape->get_map_width();
+
+						if (heightmap_depth >= 2 && heightmap_width >= 2) {
+							const Vector<real_t> &map_data = heightmap_shape->get_map_data();
+
+							Vector2 heightmap_gridsize(heightmap_width - 1, heightmap_depth - 1);
+							Vector2 start = heightmap_gridsize * -0.5;
+
+							Vector<Vector3> vertex_array;
+							vertex_array.resize((heightmap_depth - 1) * (heightmap_width - 1) * 6);
+							int map_data_current_index = 0;
+
+							for (int d = 0; d < heightmap_depth - 1; d++) {
+								for (int w = 0; w < heightmap_width - 1; w++) {
+									if (map_data_current_index + 1 + heightmap_depth < map_data.size()) {
+										float top_left_height = map_data[map_data_current_index];
+										float top_right_height = map_data[map_data_current_index + 1];
+										float bottom_left_height = map_data[map_data_current_index + heightmap_depth];
+										float bottom_right_height = map_data[map_data_current_index + 1 + heightmap_depth];
+
+										Vector3 top_left = Vector3(start.x + w, top_left_height, start.y + d);
+										Vector3 top_right = Vector3(start.x + w + 1.0, top_right_height, start.y + d);
+										Vector3 bottom_left = Vector3(start.x + w, bottom_left_height, start.y + d + 1.0);
+										Vector3 bottom_right = Vector3(start.x + w + 1.0, bottom_right_height, start.y + d + 1.0);
+
+										vertex_array.push_back(top_right);
+										vertex_array.push_back(bottom_left);
+										vertex_array.push_back(top_left);
+										vertex_array.push_back(top_right);
+										vertex_array.push_back(bottom_right);
+										vertex_array.push_back(bottom_left);
+									}
+									map_data_current_index += 1;
+								}
+							}
+							if (vertex_array.size() > 0) {
+								_add_faces(vertex_array, transform, p_vertices, p_indices);
+							}
+						}
+					}
 				}
 			}
 		}
@@ -362,6 +407,50 @@ void NavigationMeshGenerator::_parse_geometry(const Transform3D &p_navmesh_trans
 						PackedVector3Array faces = Variant(dict["faces"]);
 						_add_faces(faces, shapes[i], p_vertices, p_indices);
 					} break;
+					case PhysicsServer3D::SHAPE_HEIGHTMAP: {
+						Dictionary dict = data;
+						///< dict( int:"width", int:"depth",float:"cell_size", float_array:"heights"
+						int heightmap_depth = dict["depth"];
+						int heightmap_width = dict["width"];
+
+						if (heightmap_depth >= 2 && heightmap_width >= 2) {
+							const Vector<real_t> &map_data = dict["heights"];
+
+							Vector2 heightmap_gridsize(heightmap_width - 1, heightmap_depth - 1);
+							Vector2 start = heightmap_gridsize * -0.5;
+
+							Vector<Vector3> vertex_array;
+							vertex_array.resize((heightmap_depth - 1) * (heightmap_width - 1) * 6);
+							int map_data_current_index = 0;
+
+							for (int d = 0; d < heightmap_depth - 1; d++) {
+								for (int w = 0; w < heightmap_width - 1; w++) {
+									if (map_data_current_index + 1 + heightmap_depth < map_data.size()) {
+										float top_left_height = map_data[map_data_current_index];
+										float top_right_height = map_data[map_data_current_index + 1];
+										float bottom_left_height = map_data[map_data_current_index + heightmap_depth];
+										float bottom_right_height = map_data[map_data_current_index + 1 + heightmap_depth];
+
+										Vector3 top_left = Vector3(start.x + w, top_left_height, start.y + d);
+										Vector3 top_right = Vector3(start.x + w + 1.0, top_right_height, start.y + d);
+										Vector3 bottom_left = Vector3(start.x + w, bottom_left_height, start.y + d + 1.0);
+										Vector3 bottom_right = Vector3(start.x + w + 1.0, bottom_right_height, start.y + d + 1.0);
+
+										vertex_array.push_back(top_right);
+										vertex_array.push_back(bottom_left);
+										vertex_array.push_back(top_left);
+										vertex_array.push_back(top_right);
+										vertex_array.push_back(bottom_right);
+										vertex_array.push_back(bottom_left);
+									}
+									map_data_current_index += 1;
+								}
+							}
+							if (vertex_array.size() > 0) {
+								_add_faces(vertex_array, shapes[i], p_vertices, p_indices);
+							}
+						}
+					} break;
 					default: {
 						WARN_PRINT("Unsupported collision shape type.");
 					} break;
diff --git a/modules/noise/doc_classes/Noise.xml b/modules/noise/doc_classes/Noise.xml
index 5af204575c..735ca388de 100644
--- a/modules/noise/doc_classes/Noise.xml
+++ b/modules/noise/doc_classes/Noise.xml
@@ -13,59 +13,59 @@
 	<methods>
 		<method name="get_image" qualifiers="const">
 			<return type="Image" />
-			<argument index="0" name="width" type="int" />
-			<argument index="1" name="height" type="int" />
-			<argument index="2" name="invert" type="bool" default="false" />
-			<argument index="3" name="in_3d_space" type="bool" default="false" />
+			<param index="0" name="width" type="int" />
+			<param index="1" name="height" type="int" />
+			<param index="2" name="invert" type="bool" default="false" />
+			<param index="3" name="in_3d_space" type="bool" default="false" />
 			<description>
 				Returns a 2D [Image] noise image.
 			</description>
 		</method>
 		<method name="get_noise_1d" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="x" type="float" />
+			<param index="0" name="x" type="float" />
 			<description>
 				Returns the 1D noise value at the given (x) coordinate.
 			</description>
 		</method>
 		<method name="get_noise_2d" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="x" type="float" />
-			<argument index="1" name="y" type="float" />
+			<param index="0" name="x" type="float" />
+			<param index="1" name="y" type="float" />
 			<description>
 				Returns the 2D noise value at the given position.
 			</description>
 		</method>
 		<method name="get_noise_2dv" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="v" type="Vector2" />
+			<param index="0" name="v" type="Vector2" />
 			<description>
 				Returns the 2D noise value at the given position.
 			</description>
 		</method>
 		<method name="get_noise_3d" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="x" type="float" />
-			<argument index="1" name="y" type="float" />
-			<argument index="2" name="z" type="float" />
+			<param index="0" name="x" type="float" />
+			<param index="1" name="y" type="float" />
+			<param index="2" name="z" type="float" />
 			<description>
 				Returns the 3D noise value at the given position.
 			</description>
 		</method>
 		<method name="get_noise_3dv" qualifiers="const">
 			<return type="float" />
-			<argument index="0" name="v" type="Vector3" />
+			<param index="0" name="v" type="Vector3" />
 			<description>
 				Returns the 3D noise value at the given position.
 			</description>
 		</method>
 		<method name="get_seamless_image" qualifiers="const">
 			<return type="Image" />
-			<argument index="0" name="width" type="int" />
-			<argument index="1" name="height" type="int" />
-			<argument index="2" name="invert" type="bool" default="false" />
-			<argument index="3" name="in_3d_space" type="bool" default="false" />
-			<argument index="4" name="skirt" type="float" default="0.1" />
+			<param index="0" name="width" type="int" />
+			<param index="1" name="height" type="int" />
+			<param index="2" name="invert" type="bool" default="false" />
+			<param index="3" name="in_3d_space" type="bool" default="false" />
+			<param index="4" name="skirt" type="float" default="0.1" />
 			<description>
 				Returns a seamless 2D [Image] noise image.
 			</description>
diff --git a/modules/openxr/doc_classes/OpenXRAction.xml b/modules/openxr/doc_classes/OpenXRAction.xml
index 6ff8c1ad26..d1a2ce2d2e 100644
--- a/modules/openxr/doc_classes/OpenXRAction.xml
+++ b/modules/openxr/doc_classes/OpenXRAction.xml
@@ -5,7 +5,7 @@
 	</brief_description>
 	<description>
 		This resource defines an OpenXR action. Actions can be used both for inputs (buttons/joystick/trigger/etc) and outputs (haptics).
-		OpenXR performs automatic conversion between action type and input type whenever possible. An analogue trigger bound to a boolean action will thus return [code]false[/core] if the trigger is depressed and [code]true[/code] if pressed fully.
+		OpenXR performs automatic conversion between action type and input type whenever possible. An analogue trigger bound to a boolean action will thus return [code]false[/code] if the trigger is depressed and [code]true[/code] if pressed fully.
 		Actions are not directly bound to specific devices, instead OpenXR recognises a limited number of top level paths that identify devices by usage. We can restrict which devices an action can be bound to by these top level paths. For instance an action that should only be used for hand held controllers can have the top level paths "/user/hand/left" and "/user/hand/right" associated with them. See the [url=https://www.khronos.org/registry/OpenXR/specs/1.0/html/xrspec.html#semantic-path-reserved]reserved path section in the OpenXR specification[/url] for more info on the top level paths.
 		Note that the name of the resource is used to register the action with.
 	</description>
diff --git a/modules/openxr/doc_classes/OpenXRActionMap.xml b/modules/openxr/doc_classes/OpenXRActionMap.xml
index a29d10be41..8a2f666e3f 100644
--- a/modules/openxr/doc_classes/OpenXRActionMap.xml
+++ b/modules/openxr/doc_classes/OpenXRActionMap.xml
@@ -13,14 +13,14 @@
 	<methods>
 		<method name="add_action_set">
 			<return type="void" />
-			<argument index="0" name="action_set" type="OpenXRActionSet" />
+			<param index="0" name="action_set" type="OpenXRActionSet" />
 			<description>
 				Add an action set.
 			</description>
 		</method>
 		<method name="add_interaction_profile">
 			<return type="void" />
-			<argument index="0" name="interaction_profile" type="OpenXRInteractionProfile" />
+			<param index="0" name="interaction_profile" type="OpenXRInteractionProfile" />
 			<description>
 				Add an interaction profile.
 			</description>
@@ -33,21 +33,21 @@
 		</method>
 		<method name="find_action_set" qualifiers="const">
 			<return type="OpenXRActionSet" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Retrieve an action set by name.
 			</description>
 		</method>
 		<method name="find_interaction_profile" qualifiers="const">
 			<return type="OpenXRInteractionProfile" />
-			<argument index="0" name="name" type="String" />
+			<param index="0" name="name" type="String" />
 			<description>
 				Find an interaction profile by its name (path).
 			</description>
 		</method>
 		<method name="get_action_set" qualifiers="const">
 			<return type="OpenXRActionSet" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Retrieve the action set at this index.
 			</description>
@@ -60,7 +60,7 @@
 		</method>
 		<method name="get_interaction_profile" qualifiers="const">
 			<return type="OpenXRInteractionProfile" />
-			<argument index="0" name="idx" type="int" />
+			<param index="0" name="idx" type="int" />
 			<description>
 				Get the interaction profile at this index.
 			</description>
@@ -73,14 +73,14 @@
 		</method>
 		<method name="remove_action_set">
 			<return type="void" />
-			<argument index="0" name="action_set" type="OpenXRActionSet" />
+			<param index="0" name="action_set" type="OpenXRActionSet" />
 			<description>
 				Remove an action set.
 			</description>
 		</method>
 		<method name="remove_interaction_profile">
 			<return type="void" />
-			<argument index="0" name="interaction_profile" type="OpenXRInteractionProfile" />
+			<param index="0" name="interaction_profile" type="OpenXRInteractionProfile" />
 			<description>
 				Remove an interaction profile.
 			</description>
diff --git a/modules/openxr/doc_classes/OpenXRActionSet.xml b/modules/openxr/doc_classes/OpenXRActionSet.xml
index 55cc0aaad4..db3259ec07 100644
--- a/modules/openxr/doc_classes/OpenXRActionSet.xml
+++ b/modules/openxr/doc_classes/OpenXRActionSet.xml
@@ -12,7 +12,7 @@
 	<methods>
 		<method name="add_action">
 			<return type="void" />
-			<argument index="0" name="action" type="OpenXRAction" />
+			<param index="0" name="action" type="OpenXRAction" />
 			<description>
 				Add an action to this action set.
 			</description>
@@ -25,7 +25,7 @@
 		</method>
 		<method name="remove_action">
 			<return type="void" />
-			<argument index="0" name="action" type="OpenXRAction" />
+			<param index="0" name="action" type="OpenXRAction" />
 			<description>
 				Remove an action from this action set.
 			</description>
diff --git a/modules/openxr/doc_classes/OpenXRIPBinding.xml b/modules/openxr/doc_classes/OpenXRIPBinding.xml
index f96637f2f5..00806bda06 100644
--- a/modules/openxr/doc_classes/OpenXRIPBinding.xml
+++ b/modules/openxr/doc_classes/OpenXRIPBinding.xml
@@ -11,7 +11,7 @@
 	<methods>
 		<method name="add_path">
 			<return type="void" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Add an input/output path to this binding.
 			</description>
@@ -24,14 +24,14 @@
 		</method>
 		<method name="has_path" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Returns [code]true[/code] if this input/output path is part of this binding.
 			</description>
 		</method>
 		<method name="remove_path">
 			<return type="void" />
-			<argument index="0" name="path" type="String" />
+			<param index="0" name="path" type="String" />
 			<description>
 				Removes this input/output path from this binding.
 			</description>
diff --git a/modules/openxr/doc_classes/OpenXRInteractionProfile.xml b/modules/openxr/doc_classes/OpenXRInteractionProfile.xml
index 71c0db44ed..950bde031f 100644
--- a/modules/openxr/doc_classes/OpenXRInteractionProfile.xml
+++ b/modules/openxr/doc_classes/OpenXRInteractionProfile.xml
@@ -12,7 +12,7 @@
 	<methods>
 		<method name="get_binding" qualifiers="const">
 			<return type="OpenXRIPBinding" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Retrieve the binding at this index.
 			</description>
diff --git a/modules/regex/doc_classes/RegEx.xml b/modules/regex/doc_classes/RegEx.xml
index 52a7fe492f..9adb6acd9c 100644
--- a/modules/regex/doc_classes/RegEx.xml
+++ b/modules/regex/doc_classes/RegEx.xml
@@ -57,14 +57,14 @@
 		</method>
 		<method name="compile">
 			<return type="int" enum="Error" />
-			<argument index="0" name="pattern" type="String" />
+			<param index="0" name="pattern" type="String" />
 			<description>
 				Compiles and assign the search pattern to use. Returns [constant OK] if the compilation is successful. If an error is encountered, details are printed to standard output and an error is returned.
 			</description>
 		</method>
 		<method name="create_from_string" qualifiers="static">
 			<return type="RegEx" />
-			<argument index="0" name="pattern" type="String" />
+			<param index="0" name="pattern" type="String" />
 			<description>
 				Creates and compiles a new [RegEx] object.
 			</description>
@@ -95,29 +95,29 @@
 		</method>
 		<method name="search" qualifiers="const">
 			<return type="RegExMatch" />
-			<argument index="0" name="subject" type="String" />
-			<argument index="1" name="offset" type="int" default="0" />
-			<argument index="2" name="end" type="int" default="-1" />
+			<param index="0" name="subject" type="String" />
+			<param index="1" name="offset" type="int" default="0" />
+			<param index="2" name="end" type="int" default="-1" />
 			<description>
 				Searches the text for the compiled pattern. Returns a [RegExMatch] container of the first matching result if found, otherwise [code]null[/code]. The region to search within can be specified without modifying where the start and end anchor would be.
 			</description>
 		</method>
 		<method name="search_all" qualifiers="const">
 			<return type="RegExMatch[]" />
-			<argument index="0" name="subject" type="String" />
-			<argument index="1" name="offset" type="int" default="0" />
-			<argument index="2" name="end" type="int" default="-1" />
+			<param index="0" name="subject" type="String" />
+			<param index="1" name="offset" type="int" default="0" />
+			<param index="2" name="end" type="int" default="-1" />
 			<description>
 				Searches the text for the compiled pattern. Returns an array of [RegExMatch] containers for each non-overlapping result. If no results were found, an empty array is returned instead. The region to search within can be specified without modifying where the start and end anchor would be.
 			</description>
 		</method>
 		<method name="sub" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="subject" type="String" />
-			<argument index="1" name="replacement" type="String" />
-			<argument index="2" name="all" type="bool" default="false" />
-			<argument index="3" name="offset" type="int" default="0" />
-			<argument index="4" name="end" type="int" default="-1" />
+			<param index="0" name="subject" type="String" />
+			<param index="1" name="replacement" type="String" />
+			<param index="2" name="all" type="bool" default="false" />
+			<param index="3" name="offset" type="int" default="0" />
+			<param index="4" name="end" type="int" default="-1" />
 			<description>
 				Searches the text for the compiled pattern and replaces it with the specified string. Escapes and backreferences such as [code]$1[/code] and [code]$name[/code] are expanded and resolved. By default, only the first instance is replaced, but it can be changed for all instances (global replacement). The region to search within can be specified without modifying where the start and end anchor would be.
 			</description>
diff --git a/modules/regex/doc_classes/RegExMatch.xml b/modules/regex/doc_classes/RegExMatch.xml
index 530a541ae8..5bcf070e82 100644
--- a/modules/regex/doc_classes/RegExMatch.xml
+++ b/modules/regex/doc_classes/RegExMatch.xml
@@ -11,7 +11,7 @@
 	<methods>
 		<method name="get_end" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="name" type="Variant" default="0" />
+			<param index="0" name="name" type="Variant" default="0" />
 			<description>
 				Returns the end position of the match within the source string. The end position of capturing groups can be retrieved by providing its group number as an integer or its string name (if it's a named group). The default value of 0 refers to the whole pattern.
 				Returns -1 if the group did not match or doesn't exist.
@@ -25,7 +25,7 @@
 		</method>
 		<method name="get_start" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="name" type="Variant" default="0" />
+			<param index="0" name="name" type="Variant" default="0" />
 			<description>
 				Returns the starting position of the match within the source string. The starting position of capturing groups can be retrieved by providing its group number as an integer or its string name (if it's a named group). The default value of 0 refers to the whole pattern.
 				Returns -1 if the group did not match or doesn't exist.
@@ -33,7 +33,7 @@
 		</method>
 		<method name="get_string" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="name" type="Variant" default="0" />
+			<param index="0" name="name" type="Variant" default="0" />
 			<description>
 				Returns the substring of the match from the source string. Capturing groups can be retrieved by providing its group number as an integer or its string name (if it's a named group). The default value of 0 refers to the whole pattern.
 				Returns an empty string if the group did not match or doesn't exist.
diff --git a/modules/text_server_adv/SCsub b/modules/text_server_adv/SCsub
index 73e5c2bf74..c6678307af 100644
--- a/modules/text_server_adv/SCsub
+++ b/modules/text_server_adv/SCsub
@@ -36,8 +36,8 @@ def make_icu_data(target, source, env):
 # Thirdparty source files
 
 thirdparty_obj = []
-freetype_enabled = env.module_check_dependencies("text_server_adv", ["freetype"], True)
-msdfgen_enabled = env.module_check_dependencies("text_server_adv", ["msdfgen"], True)
+freetype_enabled = "freetype" in env.module_list
+msdfgen_enabled = "msdfgen" in env.module_list
 
 if env["builtin_harfbuzz"]:
     env_harfbuzz = env_modules.Clone()
@@ -113,8 +113,11 @@ if env["builtin_harfbuzz"]:
     if freetype_enabled:
         thirdparty_sources += [
             "src/hb-ft.cc",
-            "src/hb-graphite2.cc",
         ]
+        if env["graphite"]:
+            thirdparty_sources += [
+                "src/hb-graphite2.cc",
+            ]
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
     env_harfbuzz.Prepend(CPPPATH=["#thirdparty/harfbuzz/src"])
@@ -133,7 +136,7 @@ if env["builtin_harfbuzz"]:
         )
         if env["builtin_freetype"]:
             env_harfbuzz.Prepend(CPPPATH=["#thirdparty/freetype/include"])
-        if env["builtin_graphite"]:
+        if env["builtin_graphite"] and env["graphite"]:
             env_harfbuzz.Prepend(CPPPATH=["#thirdparty/graphite/include"])
             env_harfbuzz.Append(CCFLAGS=["-DGRAPHITE2_STATIC"])
 
@@ -165,7 +168,7 @@ if env["builtin_harfbuzz"]:
         env.Append(LIBS=[lib])
 
 
-if env["builtin_graphite"] and freetype_enabled:
+if env["builtin_graphite"] and freetype_enabled and env["graphite"]:
     env_graphite = env_modules.Clone()
     env_graphite.disable_warnings()
 
@@ -512,9 +515,10 @@ if env["builtin_msdfgen"] and msdfgen_enabled:
     env_text_server_adv.Prepend(CPPPATH=["#thirdparty/msdfgen"])
 
 if env["builtin_freetype"] and freetype_enabled:
+    env_text_server_adv.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"])
     env_text_server_adv.Prepend(CPPPATH=["#thirdparty/freetype/include"])
 
-if env["builtin_graphite"] and freetype_enabled:
+if env["builtin_graphite"] and freetype_enabled and env["graphite"]:
     env_text_server_adv.Prepend(CPPPATH=["#thirdparty/graphite/include"])
 
 env_text_server_adv.add_source_files(module_obj, "*.cpp")
diff --git a/modules/text_server_adv/config.py b/modules/text_server_adv/config.py
index 8c8df9b05e..179a2ff378 100644
--- a/modules/text_server_adv/config.py
+++ b/modules/text_server_adv/config.py
@@ -2,6 +2,14 @@ def can_build(env, platform):
     return True
 
 
+def get_opts(platform):
+    from SCons.Variables import BoolVariable
+
+    return [
+        BoolVariable("graphite", "Enable SIL Graphite smart fonts support", True),
+    ]
+
+
 def configure(env):
     pass
 
diff --git a/modules/text_server_adv/text_server_adv.cpp b/modules/text_server_adv/text_server_adv.cpp
index bb49fb5248..c0cff08f13 100644
--- a/modules/text_server_adv/text_server_adv.cpp
+++ b/modules/text_server_adv/text_server_adv.cpp
@@ -1313,12 +1313,14 @@ _FORCE_INLINE_ bool TextServerAdvanced::_ensure_cache_for_size(FontAdvanced *p_f
 		fargs.stream = &fd->stream;
 
 		int max_index = 0;
-		FT_Face tmp_face;
+		FT_Face tmp_face = nullptr;
 		error = FT_Open_Face(ft_library, &fargs, -1, &tmp_face);
-		if (error == 0) {
+		if (tmp_face && error == 0) {
 			max_index = tmp_face->num_faces - 1;
 		}
-		FT_Done_Face(tmp_face);
+		if (tmp_face) {
+			FT_Done_Face(tmp_face);
+		}
 
 		error = FT_Open_Face(ft_library, &fargs, CLAMP(p_font_data->face_index, 0, max_index), &fd->face);
 		if (error) {
@@ -4245,7 +4247,7 @@ void TextServerAdvanced::shaped_text_overrun_trim_to_width(const RID &p_shaped_l
 
 	Glyph *sd_glyphs = sd->glyphs.ptrw();
 
-	if (p_trim_flags.has_flag(OVERRUN_TRIM) || sd_glyphs == nullptr || p_width <= 0 || !(sd->width > p_width || enforce_ellipsis)) {
+	if ((p_trim_flags & OVERRUN_TRIM) == OVERRUN_NO_TRIM || sd_glyphs == nullptr || p_width <= 0 || !(sd->width > p_width || enforce_ellipsis)) {
 		sd->overrun_trim_data.trim_pos = -1;
 		sd->overrun_trim_data.ellipsis_pos = -1;
 		return;
@@ -4706,7 +4708,7 @@ bool TextServerAdvanced::shaped_text_update_justification_ops(const RID &p_shape
 		for (int i = 0; i < sd_size; i++) {
 			if (sd_glyphs[i].count > 0) {
 				char32_t c = sd->text[sd_glyphs[i].start - sd->start];
-				if (c == 0x0640) {
+				if (c == 0x0640 && sd_glyphs[i].start == sd_glyphs[i].end - 1) {
 					sd_glyphs[i].flags |= GRAPHEME_IS_ELONGATION;
 				}
 				if (sd->jstops.has(sd_glyphs[i].start)) {
@@ -4718,6 +4720,11 @@ bool TextServerAdvanced::shaped_text_update_justification_ops(const RID &p_shape
 							if (sd_glyphs[i].font_rid != RID()) {
 								Glyph gl = _shape_single_glyph(sd, 0x0640, HB_SCRIPT_ARABIC, HB_DIRECTION_RTL, sd->glyphs[i].font_rid, sd->glyphs[i].font_size);
 								if ((sd_glyphs[i].flags & GRAPHEME_IS_VALID) == GRAPHEME_IS_VALID) {
+#if HB_VERSION_ATLEAST(5, 1, 0)
+									if ((i > 0) && ((sd_glyphs[i - 1].flags & GRAPHEME_IS_SAFE_TO_INSERT_TATWEEL) != GRAPHEME_IS_SAFE_TO_INSERT_TATWEEL)) {
+										continue;
+									}
+#endif
 									gl.start = sd_glyphs[i].start;
 									gl.end = sd_glyphs[i].end;
 									gl.repeat = 0;
@@ -4908,11 +4915,16 @@ void TextServerAdvanced::_shape_run(ShapedTextDataAdvanced *p_sd, int64_t p_star
 
 	hb_buffer_clear_contents(p_sd->hb_buffer);
 	hb_buffer_set_direction(p_sd->hb_buffer, p_direction);
+	int flags = (p_start == 0 ? HB_BUFFER_FLAG_BOT : 0) | (p_end == p_sd->text.length() ? HB_BUFFER_FLAG_EOT : 0);
 	if (p_sd->preserve_control) {
-		hb_buffer_set_flags(p_sd->hb_buffer, (hb_buffer_flags_t)(HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES | (p_start == 0 ? HB_BUFFER_FLAG_BOT : 0) | (p_end == p_sd->text.length() ? HB_BUFFER_FLAG_EOT : 0)));
+		flags |= HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES;
 	} else {
-		hb_buffer_set_flags(p_sd->hb_buffer, (hb_buffer_flags_t)(HB_BUFFER_FLAG_DEFAULT | (p_start == 0 ? HB_BUFFER_FLAG_BOT : 0) | (p_end == p_sd->text.length() ? HB_BUFFER_FLAG_EOT : 0)));
+		flags |= HB_BUFFER_FLAG_DEFAULT;
 	}
+#if HB_VERSION_ATLEAST(5, 1, 0)
+	flags |= HB_BUFFER_FLAG_PRODUCE_SAFE_TO_INSERT_TATWEEL;
+#endif
+	hb_buffer_set_flags(p_sd->hb_buffer, (hb_buffer_flags_t)flags);
 	hb_buffer_set_script(p_sd->hb_buffer, p_script);
 
 	if (p_sd->spans[p_span].language.is_empty()) {
@@ -4976,10 +4988,16 @@ void TextServerAdvanced::_shape_run(ShapedTextDataAdvanced *p_sd, int64_t p_star
 			gl.font_rid = p_fonts[p_fb_index];
 			gl.font_size = fs;
 
-			if (glyph_info[i].mask & HB_GLYPH_FLAG_DEFINED) {
+			if (glyph_info[i].mask & HB_GLYPH_FLAG_UNSAFE_TO_BREAK) {
 				gl.flags |= GRAPHEME_IS_CONNECTED;
 			}
 
+#if HB_VERSION_ATLEAST(5, 1, 0)
+			if (glyph_info[i].mask & HB_GLYPH_FLAG_SAFE_TO_INSERT_TATWEEL) {
+				gl.flags |= GRAPHEME_IS_SAFE_TO_INSERT_TATWEEL;
+			}
+#endif
+
 			gl.index = glyph_info[i].codepoint;
 			if (gl.index != 0) {
 				_ensure_glyph(fd, fss, gl.index);
diff --git a/modules/text_server_adv/text_server_adv.h b/modules/text_server_adv/text_server_adv.h
index b337abea7a..7ae329d616 100644
--- a/modules/text_server_adv/text_server_adv.h
+++ b/modules/text_server_adv/text_server_adv.h
@@ -113,7 +113,10 @@ using namespace godot;
 #include FT_ADVANCES_H
 #include FT_MULTIPLE_MASTERS_H
 #include FT_BBOX_H
-
+#include FT_CONFIG_OPTIONS_H
+#if !defined(FT_CONFIG_OPTION_USE_BROTLI) && !defined(_MSC_VER)
+#warning FreeType is configured without Brotli support, built-in fonts will not be available.
+#endif
 #include <hb-ft.h>
 #include <hb-ot.h>
 #endif
diff --git a/modules/text_server_fb/SCsub b/modules/text_server_fb/SCsub
index ca9322e450..429d2e1fdc 100644
--- a/modules/text_server_fb/SCsub
+++ b/modules/text_server_fb/SCsub
@@ -3,8 +3,8 @@
 Import("env")
 Import("env_modules")
 
-freetype_enabled = env.module_check_dependencies("text_server_fb", ["freetype"], True)
-msdfgen_enabled = env.module_check_dependencies("text_server_fb", ["msdfgen"], True)
+freetype_enabled = "freetype" in env.module_list
+msdfgen_enabled = "msdfgen" in env.module_list
 
 env_text_server_fb = env_modules.Clone()
 
@@ -12,6 +12,7 @@ if env["builtin_msdfgen"] and msdfgen_enabled:
     env_text_server_fb.Prepend(CPPPATH=["#thirdparty/msdfgen"])
 
 if env["builtin_freetype"] and freetype_enabled:
+    env_text_server_fb.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"])
     env_text_server_fb.Prepend(CPPPATH=["#thirdparty/freetype/include"])
 
 env_text_server_fb.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/text_server_fb/text_server_fb.cpp b/modules/text_server_fb/text_server_fb.cpp
index 50ea4677b1..3b91c6981e 100644
--- a/modules/text_server_fb/text_server_fb.cpp
+++ b/modules/text_server_fb/text_server_fb.cpp
@@ -733,12 +733,14 @@ _FORCE_INLINE_ bool TextServerFallback::_ensure_cache_for_size(FontFallback *p_f
 		fargs.stream = &fd->stream;
 
 		int max_index = 0;
-		FT_Face tmp_face;
+		FT_Face tmp_face = nullptr;
 		error = FT_Open_Face(ft_library, &fargs, -1, &tmp_face);
-		if (error == 0) {
+		if (tmp_face && error == 0) {
 			max_index = tmp_face->num_faces - 1;
 		}
-		FT_Done_Face(tmp_face);
+		if (tmp_face) {
+			FT_Done_Face(tmp_face);
+		}
 
 		error = FT_Open_Face(ft_library, &fargs, CLAMP(p_font_data->face_index, 0, max_index), &fd->face);
 		if (error) {
@@ -3204,7 +3206,7 @@ void TextServerFallback::shaped_text_overrun_trim_to_width(const RID &p_shaped_l
 
 	Glyph *sd_glyphs = sd->glyphs.ptrw();
 
-	if (p_trim_flags.has_flag(OVERRUN_TRIM) || sd_glyphs == nullptr || p_width <= 0 || !(sd->width > p_width || enforce_ellipsis)) {
+	if ((p_trim_flags & OVERRUN_TRIM) == OVERRUN_NO_TRIM || sd_glyphs == nullptr || p_width <= 0 || !(sd->width > p_width || enforce_ellipsis)) {
 		sd->overrun_trim_data.trim_pos = -1;
 		sd->overrun_trim_data.ellipsis_pos = -1;
 		return;
diff --git a/modules/text_server_fb/text_server_fb.h b/modules/text_server_fb/text_server_fb.h
index adb5cbb817..fef19d442b 100644
--- a/modules/text_server_fb/text_server_fb.h
+++ b/modules/text_server_fb/text_server_fb.h
@@ -98,6 +98,10 @@ using namespace godot;
 #include FT_ADVANCES_H
 #include FT_MULTIPLE_MASTERS_H
 #include FT_BBOX_H
+#include FT_CONFIG_OPTIONS_H
+#if !defined(FT_CONFIG_OPTION_USE_BROTLI) && !defined(_MSC_VER)
+#warning FreeType is configured without Brotli support, built-in fonts will not be available.
+#endif
 #endif
 
 /*************************************************************************/
diff --git a/modules/tga/SCsub b/modules/tga/SCsub
index 067caa6ea0..ccd7d2ee37 100644
--- a/modules/tga/SCsub
+++ b/modules/tga/SCsub
@@ -5,5 +5,5 @@ Import("env_modules")
 
 env_tga = env_modules.Clone()
 
-# Godot's own source files
+# Godot source files
 env_tga.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/theora/config.py b/modules/theora/config.py
index 7f354a8fda..9a27e8e132 100644
--- a/modules/theora/config.py
+++ b/modules/theora/config.py
@@ -1,7 +1,8 @@
 def can_build(env, platform):
     if env["arch"].startswith("rv"):
         return False
-    return env.module_check_dependencies("theora", ["ogg", "vorbis"])
+    env.module_add_dependencies("theora", ["ogg", "vorbis"])
+    return True
 
 
 def configure(env):
diff --git a/modules/theora/doc_classes/VideoStreamTheora.xml b/modules/theora/doc_classes/VideoStreamTheora.xml
index 0f2dece8e7..e07af8f169 100644
--- a/modules/theora/doc_classes/VideoStreamTheora.xml
+++ b/modules/theora/doc_classes/VideoStreamTheora.xml
@@ -18,7 +18,7 @@
 		</method>
 		<method name="set_file">
 			<return type="void" />
-			<argument index="0" name="file" type="String" />
+			<param index="0" name="file" type="String" />
 			<description>
 				Sets the Ogg Theora video file that this [VideoStreamTheora] resource handles. The [code]file[/code] name should have the [code].ogv[/code] extension.
 			</description>
diff --git a/modules/upnp/doc_classes/UPNP.xml b/modules/upnp/doc_classes/UPNP.xml
index 066506922c..847110abd4 100644
--- a/modules/upnp/doc_classes/UPNP.xml
+++ b/modules/upnp/doc_classes/UPNP.xml
@@ -54,18 +54,18 @@
 	<methods>
 		<method name="add_device">
 			<return type="void" />
-			<argument index="0" name="device" type="UPNPDevice" />
+			<param index="0" name="device" type="UPNPDevice" />
 			<description>
 				Adds the given [UPNPDevice] to the list of discovered devices.
 			</description>
 		</method>
 		<method name="add_port_mapping" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="port" type="int" />
-			<argument index="1" name="port_internal" type="int" default="0" />
-			<argument index="2" name="desc" type="String" default="&quot;&quot;" />
-			<argument index="3" name="proto" type="String" default="&quot;UDP&quot;" />
-			<argument index="4" name="duration" type="int" default="0" />
+			<param index="0" name="port" type="int" />
+			<param index="1" name="port_internal" type="int" default="0" />
+			<param index="2" name="desc" type="String" default="&quot;&quot;" />
+			<param index="3" name="proto" type="String" default="&quot;UDP&quot;" />
+			<param index="4" name="duration" type="int" default="0" />
 			<description>
 				Adds a mapping to forward the external [code]port[/code] (between 1 and 65535) on the default gateway (see [method get_gateway]) to the [code]internal_port[/code] on the local machine for the given protocol [code]proto[/code] (either [code]TCP[/code] or [code]UDP[/code], with UDP being the default). If a port mapping for the given port and protocol combination already exists on that gateway device, this method tries to overwrite it. If that is not desired, you can retrieve the gateway manually with [method get_gateway] and call [method add_port_mapping] on it, if any.
 				If [code]internal_port[/code] is [code]0[/code] (the default), the same port number is used for both the external and the internal port (the [code]port[/code] value).
@@ -81,17 +81,17 @@
 		</method>
 		<method name="delete_port_mapping" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="port" type="int" />
-			<argument index="1" name="proto" type="String" default="&quot;UDP&quot;" />
+			<param index="0" name="port" type="int" />
+			<param index="1" name="proto" type="String" default="&quot;UDP&quot;" />
 			<description>
 				Deletes the port mapping for the given port and protocol combination on the default gateway (see [method get_gateway]) if one exists. [code]port[/code] must be a valid port between 1 and 65535, [code]proto[/code] can be either [code]TCP[/code] or [code]UDP[/code]. See [enum UPNPResult] for possible return values.
 			</description>
 		</method>
 		<method name="discover">
 			<return type="int" />
-			<argument index="0" name="timeout" type="int" default="2000" />
-			<argument index="1" name="ttl" type="int" default="2" />
-			<argument index="2" name="device_filter" type="String" default="&quot;InternetGatewayDevice&quot;" />
+			<param index="0" name="timeout" type="int" default="2000" />
+			<param index="1" name="ttl" type="int" default="2" />
+			<param index="2" name="device_filter" type="String" default="&quot;InternetGatewayDevice&quot;" />
 			<description>
 				Discovers local [UPNPDevice]s. Clears the list of previously discovered devices.
 				Filters for IGD (InternetGatewayDevice) type devices by default, as those manage port forwarding. [code]timeout[/code] is the time to wait for responses in milliseconds. [code]ttl[/code] is the time-to-live; only touch this if you know what you're doing.
@@ -100,7 +100,7 @@
 		</method>
 		<method name="get_device" qualifiers="const">
 			<return type="UPNPDevice" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Returns the [UPNPDevice] at the given [code]index[/code].
 			</description>
@@ -125,15 +125,15 @@
 		</method>
 		<method name="remove_device">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Removes the device at [code]index[/code] from the list of discovered devices.
 			</description>
 		</method>
 		<method name="set_device">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="device" type="UPNPDevice" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="device" type="UPNPDevice" />
 			<description>
 				Sets the device at [code]index[/code] from the list of discovered devices to [code]device[/code].
 			</description>
diff --git a/modules/upnp/doc_classes/UPNPDevice.xml b/modules/upnp/doc_classes/UPNPDevice.xml
index 7749ac18ab..b599acaba2 100644
--- a/modules/upnp/doc_classes/UPNPDevice.xml
+++ b/modules/upnp/doc_classes/UPNPDevice.xml
@@ -11,19 +11,19 @@
 	<methods>
 		<method name="add_port_mapping" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="port" type="int" />
-			<argument index="1" name="port_internal" type="int" default="0" />
-			<argument index="2" name="desc" type="String" default="&quot;&quot;" />
-			<argument index="3" name="proto" type="String" default="&quot;UDP&quot;" />
-			<argument index="4" name="duration" type="int" default="0" />
+			<param index="0" name="port" type="int" />
+			<param index="1" name="port_internal" type="int" default="0" />
+			<param index="2" name="desc" type="String" default="&quot;&quot;" />
+			<param index="3" name="proto" type="String" default="&quot;UDP&quot;" />
+			<param index="4" name="duration" type="int" default="0" />
 			<description>
 				Adds a port mapping to forward the given external port on this [UPNPDevice] for the given protocol to the local machine. See [method UPNP.add_port_mapping].
 			</description>
 		</method>
 		<method name="delete_port_mapping" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="port" type="int" />
-			<argument index="1" name="proto" type="String" default="&quot;UDP&quot;" />
+			<param index="0" name="port" type="int" />
+			<param index="1" name="proto" type="String" default="&quot;UDP&quot;" />
 			<description>
 				Deletes the port mapping identified by the given port and protocol combination on this device. See [method UPNP.delete_port_mapping].
 			</description>
diff --git a/modules/visual_script/doc_classes/VisualScript.xml b/modules/visual_script/doc_classes/VisualScript.xml
index 5807c98d32..ff6b7a8b5f 100644
--- a/modules/visual_script/doc_classes/VisualScript.xml
+++ b/modules/visual_script/doc_classes/VisualScript.xml
@@ -14,142 +14,142 @@
 	<methods>
 		<method name="add_custom_signal">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Add a custom signal with the specified name to the VisualScript.
 			</description>
 		</method>
 		<method name="add_function">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="func_node_id" type="int" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="func_node_id" type="int" />
 			<description>
 				Add a function with the specified name to the VisualScript, and assign the root [VisualScriptFunction] node's id as [code]func_node_id[/code].
 			</description>
 		</method>
 		<method name="add_node">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="node" type="VisualScriptNode" />
-			<argument index="2" name="position" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="node" type="VisualScriptNode" />
+			<param index="2" name="position" type="Vector2" default="Vector2(0, 0)" />
 			<description>
 				Add a node to the VisualScript.
 			</description>
 		</method>
 		<method name="add_variable">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="default_value" type="Variant" default="null" />
-			<argument index="2" name="export" type="bool" default="false" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="default_value" type="Variant" default="null" />
+			<param index="2" name="export" type="bool" default="false" />
 			<description>
 				Add a variable to the VisualScript, optionally giving it a default value or marking it as exported.
 			</description>
 		</method>
 		<method name="custom_signal_add_argument">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="type" type="int" enum="Variant.Type" />
-			<argument index="2" name="argname" type="String" />
-			<argument index="3" name="index" type="int" default="-1" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="type" type="int" enum="Variant.Type" />
+			<param index="2" name="argname" type="String" />
+			<param index="3" name="index" type="int" default="-1" />
 			<description>
 				Add an argument to a custom signal added with [method add_custom_signal].
 			</description>
 		</method>
 		<method name="custom_signal_get_argument_count" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Get the count of a custom signal's arguments.
 			</description>
 		</method>
 		<method name="custom_signal_get_argument_name" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="argidx" type="int" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="argidx" type="int" />
 			<description>
 				Get the name of a custom signal's argument.
 			</description>
 		</method>
 		<method name="custom_signal_get_argument_type" qualifiers="const">
 			<return type="int" enum="Variant.Type" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="argidx" type="int" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="argidx" type="int" />
 			<description>
 				Get the type of a custom signal's argument.
 			</description>
 		</method>
 		<method name="custom_signal_remove_argument">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="argidx" type="int" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="argidx" type="int" />
 			<description>
 				Remove a specific custom signal's argument.
 			</description>
 		</method>
 		<method name="custom_signal_set_argument_name">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="argidx" type="int" />
-			<argument index="2" name="argname" type="String" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="argidx" type="int" />
+			<param index="2" name="argname" type="String" />
 			<description>
 				Rename a custom signal's argument.
 			</description>
 		</method>
 		<method name="custom_signal_set_argument_type">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="argidx" type="int" />
-			<argument index="2" name="type" type="int" enum="Variant.Type" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="argidx" type="int" />
+			<param index="2" name="type" type="int" enum="Variant.Type" />
 			<description>
 				Change the type of a custom signal's argument.
 			</description>
 		</method>
 		<method name="custom_signal_swap_argument">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="argidx" type="int" />
-			<argument index="2" name="withidx" type="int" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="argidx" type="int" />
+			<param index="2" name="withidx" type="int" />
 			<description>
 				Swap two of the arguments of a custom signal.
 			</description>
 		</method>
 		<method name="data_connect">
 			<return type="void" />
-			<argument index="0" name="from_node" type="int" />
-			<argument index="1" name="from_port" type="int" />
-			<argument index="2" name="to_node" type="int" />
-			<argument index="3" name="to_port" type="int" />
+			<param index="0" name="from_node" type="int" />
+			<param index="1" name="from_port" type="int" />
+			<param index="2" name="to_node" type="int" />
+			<param index="3" name="to_port" type="int" />
 			<description>
 				Connect two data ports. The value of [code]from_node[/code]'s [code]from_port[/code] would be fed into [code]to_node[/code]'s [code]to_port[/code].
 			</description>
 		</method>
 		<method name="data_disconnect">
 			<return type="void" />
-			<argument index="0" name="from_node" type="int" />
-			<argument index="1" name="from_port" type="int" />
-			<argument index="2" name="to_node" type="int" />
-			<argument index="3" name="to_port" type="int" />
+			<param index="0" name="from_node" type="int" />
+			<param index="1" name="from_port" type="int" />
+			<param index="2" name="to_node" type="int" />
+			<param index="3" name="to_port" type="int" />
 			<description>
 				Disconnect two data ports previously connected with [method data_connect].
 			</description>
 		</method>
 		<method name="get_function_node_id" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns the id of a function's entry point node.
 			</description>
 		</method>
 		<method name="get_node" qualifiers="const">
 			<return type="VisualScriptNode" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns a node given its id.
 			</description>
 		</method>
 		<method name="get_node_position" qualifiers="const">
 			<return type="Vector2" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns a node's position in pixels.
 			</description>
@@ -162,129 +162,129 @@
 		</method>
 		<method name="get_variable_default_value" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns the default (initial) value of a variable.
 			</description>
 		</method>
 		<method name="get_variable_export" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns whether a variable is exported.
 			</description>
 		</method>
 		<method name="get_variable_info" qualifiers="const">
 			<return type="Dictionary" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns the information for a given variable as a dictionary. The information includes its name, type, hint and usage.
 			</description>
 		</method>
 		<method name="has_custom_signal" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns whether a signal exists with the specified name.
 			</description>
 		</method>
 		<method name="has_data_connection" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="from_node" type="int" />
-			<argument index="1" name="from_port" type="int" />
-			<argument index="2" name="to_node" type="int" />
-			<argument index="3" name="to_port" type="int" />
+			<param index="0" name="from_node" type="int" />
+			<param index="1" name="from_port" type="int" />
+			<param index="2" name="to_node" type="int" />
+			<param index="3" name="to_port" type="int" />
 			<description>
 				Returns whether the specified data ports are connected.
 			</description>
 		</method>
 		<method name="has_function" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns whether a function exists with the specified name.
 			</description>
 		</method>
 		<method name="has_node" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns whether a node exists with the given id.
 			</description>
 		</method>
 		<method name="has_sequence_connection" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="from_node" type="int" />
-			<argument index="1" name="from_output" type="int" />
-			<argument index="2" name="to_node" type="int" />
+			<param index="0" name="from_node" type="int" />
+			<param index="1" name="from_output" type="int" />
+			<param index="2" name="to_node" type="int" />
 			<description>
 				Returns whether the specified sequence ports are connected.
 			</description>
 		</method>
 		<method name="has_variable" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns whether a variable exists with the specified name.
 			</description>
 		</method>
 		<method name="remove_custom_signal">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Remove a custom signal with the given name.
 			</description>
 		</method>
 		<method name="remove_function">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Remove a specific function and its nodes from the script.
 			</description>
 		</method>
 		<method name="remove_node">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Remove the node with the specified id.
 			</description>
 		</method>
 		<method name="remove_variable">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
 			<description>
 				Remove a variable with the given name.
 			</description>
 		</method>
 		<method name="rename_custom_signal">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="new_name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="new_name" type="StringName" />
 			<description>
 				Change the name of a custom signal.
 			</description>
 		</method>
 		<method name="rename_function">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="new_name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="new_name" type="StringName" />
 			<description>
 				Change the name of a function.
 			</description>
 		</method>
 		<method name="rename_variable">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="new_name" type="StringName" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="new_name" type="StringName" />
 			<description>
 				Change the name of a variable.
 			</description>
 		</method>
 		<method name="sequence_connect">
 			<return type="void" />
-			<argument index="0" name="from_node" type="int" />
-			<argument index="1" name="from_output" type="int" />
-			<argument index="2" name="to_node" type="int" />
+			<param index="0" name="from_node" type="int" />
+			<param index="1" name="from_output" type="int" />
+			<param index="2" name="to_node" type="int" />
 			<description>
 				Connect two sequence ports. The execution will flow from of [code]from_node[/code]'s [code]from_output[/code] into [code]to_node[/code].
 				Unlike [method data_connect], there isn't a [code]to_port[/code], since the target node can have only one sequence port.
@@ -292,55 +292,55 @@
 		</method>
 		<method name="sequence_disconnect">
 			<return type="void" />
-			<argument index="0" name="from_node" type="int" />
-			<argument index="1" name="from_output" type="int" />
-			<argument index="2" name="to_node" type="int" />
+			<param index="0" name="from_node" type="int" />
+			<param index="1" name="from_output" type="int" />
+			<param index="2" name="to_node" type="int" />
 			<description>
 				Disconnect two sequence ports previously connected with [method sequence_connect].
 			</description>
 		</method>
 		<method name="set_instance_base_type">
 			<return type="void" />
-			<argument index="0" name="type" type="StringName" />
+			<param index="0" name="type" type="StringName" />
 			<description>
 				Set the base type of the script.
 			</description>
 		</method>
 		<method name="set_node_position">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="position" type="Vector2" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="position" type="Vector2" />
 			<description>
 				Set the node position in the VisualScript graph.
 			</description>
 		</method>
 		<method name="set_scroll">
 			<return type="void" />
-			<argument index="0" name="offset" type="Vector2" />
+			<param index="0" name="offset" type="Vector2" />
 			<description>
 				Set the screen center to the given position.
 			</description>
 		</method>
 		<method name="set_variable_default_value">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="value" type="Variant" />
 			<description>
 				Change the default (initial) value of a variable.
 			</description>
 		</method>
 		<method name="set_variable_export">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="enable" type="bool" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="enable" type="bool" />
 			<description>
 				Change whether a variable is exported.
 			</description>
 		</method>
 		<method name="set_variable_info">
 			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<argument index="1" name="value" type="Dictionary" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="value" type="Dictionary" />
 			<description>
 				Set a variable's info, using the same format as [method get_variable_info].
 			</description>
@@ -348,7 +348,7 @@
 	</methods>
 	<signals>
 		<signal name="node_ports_changed">
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Emitted when the ports of a node are changed.
 			</description>
diff --git a/modules/visual_script/doc_classes/VisualScriptConstructor.xml b/modules/visual_script/doc_classes/VisualScriptConstructor.xml
index 5ec17350bd..a003f21ab9 100644
--- a/modules/visual_script/doc_classes/VisualScriptConstructor.xml
+++ b/modules/visual_script/doc_classes/VisualScriptConstructor.xml
@@ -21,13 +21,13 @@
 		</method>
 		<method name="set_constructor">
 			<return type="void" />
-			<argument index="0" name="constructor" type="Dictionary" />
+			<param index="0" name="constructor" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="set_constructor_type">
 			<return type="void" />
-			<argument index="0" name="type" type="int" enum="Variant.Type" />
+			<param index="0" name="type" type="int" enum="Variant.Type" />
 			<description>
 			</description>
 		</method>
diff --git a/modules/visual_script/doc_classes/VisualScriptCustomNode.xml b/modules/visual_script/doc_classes/VisualScriptCustomNode.xml
index 97b89fb987..6e522b2f84 100644
--- a/modules/visual_script/doc_classes/VisualScriptCustomNode.xml
+++ b/modules/visual_script/doc_classes/VisualScriptCustomNode.xml
@@ -29,28 +29,28 @@
 		</method>
 		<method name="_get_input_value_port_hint" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="input_idx" type="int" />
+			<param index="0" name="input_idx" type="int" />
 			<description>
 				Returns the specified input port's hint. See the [enum @GlobalScope.PropertyHint] hints.
 			</description>
 		</method>
 		<method name="_get_input_value_port_hint_string" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="input_idx" type="int" />
+			<param index="0" name="input_idx" type="int" />
 			<description>
 				Returns the specified input port's hint string.
 			</description>
 		</method>
 		<method name="_get_input_value_port_name" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="input_idx" type="int" />
+			<param index="0" name="input_idx" type="int" />
 			<description>
 				Returns the specified input port's name.
 			</description>
 		</method>
 		<method name="_get_input_value_port_type" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="input_idx" type="int" />
+			<param index="0" name="input_idx" type="int" />
 			<description>
 				Returns the specified input port's type. See the [enum Variant.Type] values.
 			</description>
@@ -63,7 +63,7 @@
 		</method>
 		<method name="_get_output_sequence_port_text" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="seq_idx" type="int" />
+			<param index="0" name="seq_idx" type="int" />
 			<description>
 				Returns the specified [b]sequence[/b] output's name.
 			</description>
@@ -76,28 +76,28 @@
 		</method>
 		<method name="_get_output_value_port_hint" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="output_idx" type="int" />
+			<param index="0" name="output_idx" type="int" />
 			<description>
 				Returns the specified output port's hint. See the [enum @GlobalScope.PropertyHint] hints.
 			</description>
 		</method>
 		<method name="_get_output_value_port_hint_string" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="output_idx" type="int" />
+			<param index="0" name="output_idx" type="int" />
 			<description>
 				Returns the specified output port's hint string.
 			</description>
 		</method>
 		<method name="_get_output_value_port_name" qualifiers="virtual const">
 			<return type="String" />
-			<argument index="0" name="output_idx" type="int" />
+			<param index="0" name="output_idx" type="int" />
 			<description>
 				Returns the specified output port's name.
 			</description>
 		</method>
 		<method name="_get_output_value_port_type" qualifiers="virtual const">
 			<return type="int" />
-			<argument index="0" name="output_idx" type="int" />
+			<param index="0" name="output_idx" type="int" />
 			<description>
 				Returns the specified output port's type. See the [enum Variant.Type] values.
 			</description>
@@ -122,10 +122,10 @@
 		</method>
 		<method name="_step" qualifiers="virtual const">
 			<return type="Variant" />
-			<argument index="0" name="inputs" type="Array" />
-			<argument index="1" name="outputs" type="Array" />
-			<argument index="2" name="start_mode" type="int" />
-			<argument index="3" name="working_mem" type="Array" />
+			<param index="0" name="inputs" type="Array" />
+			<param index="1" name="outputs" type="Array" />
+			<param index="2" name="start_mode" type="int" />
+			<param index="3" name="working_mem" type="Array" />
 			<description>
 				Execute the custom node's logic, returning the index of the output sequence port to use or a [String] when there is an error.
 				The [code]inputs[/code] array contains the values of the input ports.
diff --git a/modules/visual_script/doc_classes/VisualScriptCustomNodes.xml b/modules/visual_script/doc_classes/VisualScriptCustomNodes.xml
index f04c862174..48d7975051 100644
--- a/modules/visual_script/doc_classes/VisualScriptCustomNodes.xml
+++ b/modules/visual_script/doc_classes/VisualScriptCustomNodes.xml
@@ -11,17 +11,17 @@
 	<methods>
 		<method name="add_custom_node">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="category" type="String" />
-			<argument index="2" name="script" type="Script" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="category" type="String" />
+			<param index="2" name="script" type="Script" />
 			<description>
 				Add a custom Visual Script node to the editor. It'll be placed under "Custom Nodes" with the [code]category[/code] as the parameter.
 			</description>
 		</method>
 		<method name="remove_custom_node">
 			<return type="void" />
-			<argument index="0" name="name" type="String" />
-			<argument index="1" name="category" type="String" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="category" type="String" />
 			<description>
 				Remove a custom Visual Script node from the editor. Custom nodes already placed on scripts won't be removed.
 			</description>
diff --git a/modules/visual_script/doc_classes/VisualScriptFunctionState.xml b/modules/visual_script/doc_classes/VisualScriptFunctionState.xml
index ef09c9d4a0..03fef9c13b 100644
--- a/modules/visual_script/doc_classes/VisualScriptFunctionState.xml
+++ b/modules/visual_script/doc_classes/VisualScriptFunctionState.xml
@@ -11,9 +11,9 @@
 	<methods>
 		<method name="connect_to_signal">
 			<return type="void" />
-			<argument index="0" name="obj" type="Object" />
-			<argument index="1" name="signals" type="String" />
-			<argument index="2" name="args" type="Array" />
+			<param index="0" name="obj" type="Object" />
+			<param index="1" name="signals" type="String" />
+			<param index="2" name="args" type="Array" />
 			<description>
 				Connects this [VisualScriptFunctionState] to a signal in the given object to automatically resume when it's emitted.
 			</description>
@@ -26,7 +26,7 @@
 		</method>
 		<method name="resume">
 			<return type="Variant" />
-			<argument index="0" name="args" type="Array" default="[]" />
+			<param index="0" name="args" type="Array" default="[]" />
 			<description>
 				Resumes the function to run from the point it was yielded.
 			</description>
diff --git a/modules/visual_script/doc_classes/VisualScriptLists.xml b/modules/visual_script/doc_classes/VisualScriptLists.xml
index 27a81fce2f..607965bf71 100644
--- a/modules/visual_script/doc_classes/VisualScriptLists.xml
+++ b/modules/visual_script/doc_classes/VisualScriptLists.xml
@@ -11,64 +11,64 @@
 	<methods>
 		<method name="add_input_data_port">
 			<return type="void" />
-			<argument index="0" name="type" type="int" enum="Variant.Type" />
-			<argument index="1" name="name" type="String" />
-			<argument index="2" name="index" type="int" />
+			<param index="0" name="type" type="int" enum="Variant.Type" />
+			<param index="1" name="name" type="String" />
+			<param index="2" name="index" type="int" />
 			<description>
 				Adds an input port to the Visual Script node.
 			</description>
 		</method>
 		<method name="add_output_data_port">
 			<return type="void" />
-			<argument index="0" name="type" type="int" enum="Variant.Type" />
-			<argument index="1" name="name" type="String" />
-			<argument index="2" name="index" type="int" />
+			<param index="0" name="type" type="int" enum="Variant.Type" />
+			<param index="1" name="name" type="String" />
+			<param index="2" name="index" type="int" />
 			<description>
 				Adds an output port to the Visual Script node.
 			</description>
 		</method>
 		<method name="remove_input_data_port">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Removes an input port from the Visual Script node.
 			</description>
 		</method>
 		<method name="remove_output_data_port">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
+			<param index="0" name="index" type="int" />
 			<description>
 				Removes an output port from the Visual Script node.
 			</description>
 		</method>
 		<method name="set_input_data_port_name">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="name" type="String" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="name" type="String" />
 			<description>
 				Sets the name of an input port.
 			</description>
 		</method>
 		<method name="set_input_data_port_type">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="type" type="int" enum="Variant.Type" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="type" type="int" enum="Variant.Type" />
 			<description>
 				Sets the type of an input port.
 			</description>
 		</method>
 		<method name="set_output_data_port_name">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="name" type="String" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="name" type="String" />
 			<description>
 				Sets the name of an output port.
 			</description>
 		</method>
 		<method name="set_output_data_port_type">
 			<return type="void" />
-			<argument index="0" name="index" type="int" />
-			<argument index="1" name="type" type="int" enum="Variant.Type" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="type" type="int" enum="Variant.Type" />
 			<description>
 				Sets the type of an output port.
 			</description>
diff --git a/modules/visual_script/doc_classes/VisualScriptNode.xml b/modules/visual_script/doc_classes/VisualScriptNode.xml
index 2eb99dc25f..97c4f8ce76 100644
--- a/modules/visual_script/doc_classes/VisualScriptNode.xml
+++ b/modules/visual_script/doc_classes/VisualScriptNode.xml
@@ -11,7 +11,7 @@
 	<methods>
 		<method name="get_default_input_value" qualifiers="const">
 			<return type="Variant" />
-			<argument index="0" name="port_idx" type="int" />
+			<param index="0" name="port_idx" type="int" />
 			<description>
 				Returns the default value of a given port. The default value is used when nothing is connected to the port.
 			</description>
@@ -30,8 +30,8 @@
 		</method>
 		<method name="set_default_input_value">
 			<return type="void" />
-			<argument index="0" name="port_idx" type="int" />
-			<argument index="1" name="value" type="Variant" />
+			<param index="0" name="port_idx" type="int" />
+			<param index="1" name="value" type="Variant" />
 			<description>
 				Change the default value of a given port.
 			</description>
diff --git a/modules/visual_script/visual_script.cpp b/modules/visual_script/visual_script.cpp
index 4215a979e0..73249371cd 100644
--- a/modules/visual_script/visual_script.cpp
+++ b/modules/visual_script/visual_script.cpp
@@ -1206,6 +1206,10 @@ bool VisualScriptInstance::get(const StringName &p_name, Variant &r_ret) const {
 }
 
 void VisualScriptInstance::get_property_list(List<PropertyInfo> *p_properties) const {
+#ifdef TOOLS_ENABLED
+	p_properties->push_back(script->get_class_category());
+#endif // TOOLS_ENABLED
+
 	for (const KeyValue<StringName, VisualScript::Variable> &E : script->variables) {
 		if (!E.value._export) {
 			continue;
diff --git a/modules/visual_script/visual_script.h b/modules/visual_script/visual_script.h
index 14cb14e8d9..d3a90d53fb 100644
--- a/modules/visual_script/visual_script.h
+++ b/modules/visual_script/visual_script.h
@@ -409,6 +409,9 @@ public:
 	virtual void get_property_list(List<PropertyInfo> *p_properties) const;
 	virtual Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid = nullptr) const;
 
+	virtual bool property_can_revert(const StringName &p_name) const { return false; };
+	virtual bool property_get_revert(const StringName &p_name, Variant &r_ret) const { return false; };
+
 	virtual void get_method_list(List<MethodInfo> *p_list) const;
 	virtual bool has_method(const StringName &p_method) const;
 	virtual Variant callp(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error);
diff --git a/modules/vorbis/config.py b/modules/vorbis/config.py
index 7ce885a37a..a231ef179d 100644
--- a/modules/vorbis/config.py
+++ b/modules/vorbis/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
-    return env.module_check_dependencies("vorbis", ["ogg"])
+    env.module_add_dependencies("vorbis", ["ogg"])
+    return True
 
 
 def configure(env):
diff --git a/modules/webrtc/doc_classes/WebRTCDataChannelExtension.xml b/modules/webrtc/doc_classes/WebRTCDataChannelExtension.xml
index f937fba9d6..5387deaa47 100644
--- a/modules/webrtc/doc_classes/WebRTCDataChannelExtension.xml
+++ b/modules/webrtc/doc_classes/WebRTCDataChannelExtension.xml
@@ -49,8 +49,8 @@
 		</method>
 		<method name="_get_packet" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="r_buffer" type="const uint8_t **" />
-			<argument index="1" name="r_buffer_size" type="int32_t*" />
+			<param index="0" name="r_buffer" type="const uint8_t **" />
+			<param index="1" name="r_buffer_size" type="int32_t*" />
 			<description>
 			</description>
 		</method>
@@ -86,14 +86,14 @@
 		</method>
 		<method name="_put_packet" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="p_buffer" type="const uint8_t*" />
-			<argument index="1" name="p_buffer_size" type="int" />
+			<param index="0" name="p_buffer" type="const uint8_t*" />
+			<param index="1" name="p_buffer_size" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_set_write_mode" qualifiers="virtual">
 			<return type="void" />
-			<argument index="0" name="p_write_mode" type="int" />
+			<param index="0" name="p_write_mode" type="int" />
 			<description>
 			</description>
 		</method>
diff --git a/modules/webrtc/doc_classes/WebRTCMultiplayerPeer.xml b/modules/webrtc/doc_classes/WebRTCMultiplayerPeer.xml
index df92097135..927888fe21 100644
--- a/modules/webrtc/doc_classes/WebRTCMultiplayerPeer.xml
+++ b/modules/webrtc/doc_classes/WebRTCMultiplayerPeer.xml
@@ -14,9 +14,9 @@
 	<methods>
 		<method name="add_peer">
 			<return type="int" enum="Error" />
-			<argument index="0" name="peer" type="WebRTCPeerConnection" />
-			<argument index="1" name="peer_id" type="int" />
-			<argument index="2" name="unreliable_lifetime" type="int" default="1" />
+			<param index="0" name="peer" type="WebRTCPeerConnection" />
+			<param index="1" name="peer_id" type="int" />
+			<param index="2" name="unreliable_lifetime" type="int" default="1" />
 			<description>
 				Add a new peer to the mesh with the given [code]peer_id[/code]. The [WebRTCPeerConnection] must be in state [constant WebRTCPeerConnection.STATE_NEW].
 				Three channels will be created for reliable, unreliable, and ordered transport. The value of [code]unreliable_lifetime[/code] will be passed to the [code]maxPacketLifetime[/code] option when creating unreliable and ordered channels (see [method WebRTCPeerConnection.create_data_channel]).
@@ -30,7 +30,7 @@
 		</method>
 		<method name="get_peer">
 			<return type="Dictionary" />
-			<argument index="0" name="peer_id" type="int" />
+			<param index="0" name="peer_id" type="int" />
 			<description>
 				Returns a dictionary representation of the peer with given [code]peer_id[/code] with three keys. [code]connection[/code] containing the [WebRTCPeerConnection] to this peer, [code]channels[/code] an array of three [WebRTCDataChannel], and [code]connected[/code] a boolean representing if the peer connection is currently connected (all three channels are open).
 			</description>
@@ -43,16 +43,16 @@
 		</method>
 		<method name="has_peer">
 			<return type="bool" />
-			<argument index="0" name="peer_id" type="int" />
+			<param index="0" name="peer_id" type="int" />
 			<description>
 				Returns [code]true[/code] if the given [code]peer_id[/code] is in the peers map (it might not be connected though).
 			</description>
 		</method>
 		<method name="initialize">
 			<return type="int" enum="Error" />
-			<argument index="0" name="peer_id" type="int" />
-			<argument index="1" name="server_compatibility" type="bool" default="false" />
-			<argument index="2" name="channels_config" type="Array" default="[]" />
+			<param index="0" name="peer_id" type="int" />
+			<param index="1" name="server_compatibility" type="bool" default="false" />
+			<param index="2" name="channels_config" type="Array" default="[]" />
 			<description>
 				Initialize the multiplayer peer with the given [code]peer_id[/code] (must be between 1 and 2147483647).
 				If [code]server_compatibilty[/code] is [code]false[/code] (default), the multiplayer peer will be immediately in state [constant MultiplayerPeer.CONNECTION_CONNECTED] and [signal MultiplayerPeer.connection_succeeded] will not be emitted.
@@ -62,7 +62,7 @@
 		</method>
 		<method name="remove_peer">
 			<return type="void" />
-			<argument index="0" name="peer_id" type="int" />
+			<param index="0" name="peer_id" type="int" />
 			<description>
 				Remove the peer with given [code]peer_id[/code] from the mesh. If the peer was connected, and [signal MultiplayerPeer.peer_connected] was emitted for it, then [signal MultiplayerPeer.peer_disconnected] will be emitted.
 			</description>
diff --git a/modules/webrtc/doc_classes/WebRTCPeerConnection.xml b/modules/webrtc/doc_classes/WebRTCPeerConnection.xml
index fed67397d1..e99aeb4f51 100644
--- a/modules/webrtc/doc_classes/WebRTCPeerConnection.xml
+++ b/modules/webrtc/doc_classes/WebRTCPeerConnection.xml
@@ -16,9 +16,9 @@
 	<methods>
 		<method name="add_ice_candidate">
 			<return type="int" enum="Error" />
-			<argument index="0" name="media" type="String" />
-			<argument index="1" name="index" type="int" />
-			<argument index="2" name="name" type="String" />
+			<param index="0" name="media" type="String" />
+			<param index="1" name="index" type="int" />
+			<param index="2" name="name" type="String" />
 			<description>
 				Add an ice candidate generated by a remote peer (and received over the signaling server). See [signal ice_candidate_created].
 			</description>
@@ -32,8 +32,8 @@
 		</method>
 		<method name="create_data_channel">
 			<return type="WebRTCDataChannel" />
-			<argument index="0" name="label" type="String" />
-			<argument index="1" name="options" type="Dictionary" default="{}" />
+			<param index="0" name="label" type="String" />
+			<param index="1" name="options" type="Dictionary" default="{}" />
 			<description>
 				Returns a new [WebRTCDataChannel] (or [code]null[/code] on failure) with given [code]label[/code] and optionally configured via the [code]options[/code] dictionary. This method can only be called when the connection is in state [constant STATE_NEW].
 				There are two ways to create a working data channel: either call [method create_data_channel] on only one of the peer and listen to [signal data_channel_received] on the other, or call [method create_data_channel] on both peers, with the same values, and the [code]negotiated[/code] option set to [code]true[/code].
@@ -69,7 +69,7 @@
 		</method>
 		<method name="initialize">
 			<return type="int" enum="Error" />
-			<argument index="0" name="configuration" type="Dictionary" default="{}" />
+			<param index="0" name="configuration" type="Dictionary" default="{}" />
 			<description>
 				Re-initialize this peer connection, closing any previously active connection, and going back to state [constant STATE_NEW]. A dictionary of [code]options[/code] can be passed to configure the peer connection.
 				Valid [code]options[/code] are:
@@ -97,15 +97,15 @@
 		</method>
 		<method name="set_default_extension" qualifiers="static">
 			<return type="void" />
-			<argument index="0" name="extension_class" type="StringName" />
+			<param index="0" name="extension_class" type="StringName" />
 			<description>
 				Sets the [code]extension_class[/code] as the default [WebRTCPeerConnectionExtension] returned when creating a new [WebRTCPeerConnection].
 			</description>
 		</method>
 		<method name="set_local_description">
 			<return type="int" enum="Error" />
-			<argument index="0" name="type" type="String" />
-			<argument index="1" name="sdp" type="String" />
+			<param index="0" name="type" type="String" />
+			<param index="1" name="sdp" type="String" />
 			<description>
 				Sets the SDP description of the local peer. This should be called in response to [signal session_description_created].
 				After calling this function the peer will start emitting [signal ice_candidate_created] (unless an [enum Error] different from [constant OK] is returned).
@@ -113,8 +113,8 @@
 		</method>
 		<method name="set_remote_description">
 			<return type="int" enum="Error" />
-			<argument index="0" name="type" type="String" />
-			<argument index="1" name="sdp" type="String" />
+			<param index="0" name="type" type="String" />
+			<param index="1" name="sdp" type="String" />
 			<description>
 				Sets the SDP description of the remote peer. This should be called with the values generated by a remote peer and received over the signaling server.
 				If [code]type[/code] is [code]offer[/code] the peer will emit [signal session_description_created] with the appropriate answer.
@@ -124,23 +124,23 @@
 	</methods>
 	<signals>
 		<signal name="data_channel_received">
-			<argument index="0" name="channel" type="WebRTCDataChannel" />
+			<param index="0" name="channel" type="WebRTCDataChannel" />
 			<description>
 				Emitted when a new in-band channel is received, i.e. when the channel was created with [code]negotiated: false[/code] (default).
 				The object will be an instance of [WebRTCDataChannel]. You must keep a reference of it or it will be closed automatically. See [method create_data_channel].
 			</description>
 		</signal>
 		<signal name="ice_candidate_created">
-			<argument index="0" name="media" type="String" />
-			<argument index="1" name="index" type="int" />
-			<argument index="2" name="name" type="String" />
+			<param index="0" name="media" type="String" />
+			<param index="1" name="index" type="int" />
+			<param index="2" name="name" type="String" />
 			<description>
 				Emitted when a new ICE candidate has been created. The three parameters are meant to be passed to the remote peer over the signaling server.
 			</description>
 		</signal>
 		<signal name="session_description_created">
-			<argument index="0" name="type" type="String" />
-			<argument index="1" name="sdp" type="String" />
+			<param index="0" name="type" type="String" />
+			<param index="1" name="sdp" type="String" />
 			<description>
 				Emitted after a successful call to [method create_offer] or [method set_remote_description] (when it generates an answer). The parameters are meant to be passed to [method set_local_description] on this object, and sent to the remote peer over the signaling server.
 			</description>
diff --git a/modules/webrtc/doc_classes/WebRTCPeerConnectionExtension.xml b/modules/webrtc/doc_classes/WebRTCPeerConnectionExtension.xml
index 163d939ac1..e22e939a66 100644
--- a/modules/webrtc/doc_classes/WebRTCPeerConnectionExtension.xml
+++ b/modules/webrtc/doc_classes/WebRTCPeerConnectionExtension.xml
@@ -9,9 +9,9 @@
 	<methods>
 		<method name="_add_ice_candidate" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="p_sdp_mid_name" type="String" />
-			<argument index="1" name="p_sdp_mline_index" type="int" />
-			<argument index="2" name="p_sdp_name" type="String" />
+			<param index="0" name="p_sdp_mid_name" type="String" />
+			<param index="1" name="p_sdp_mline_index" type="int" />
+			<param index="2" name="p_sdp_name" type="String" />
 			<description>
 			</description>
 		</method>
@@ -22,8 +22,8 @@
 		</method>
 		<method name="_create_data_channel" qualifiers="virtual">
 			<return type="Object" />
-			<argument index="0" name="p_label" type="String" />
-			<argument index="1" name="p_config" type="Dictionary" />
+			<param index="0" name="p_label" type="String" />
+			<param index="1" name="p_config" type="Dictionary" />
 			<description>
 			</description>
 		</method>
@@ -39,7 +39,7 @@
 		</method>
 		<method name="_initialize" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="p_config" type="Dictionary" />
+			<param index="0" name="p_config" type="Dictionary" />
 			<description>
 			</description>
 		</method>
@@ -50,15 +50,15 @@
 		</method>
 		<method name="_set_local_description" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="p_type" type="String" />
-			<argument index="1" name="p_sdp" type="String" />
+			<param index="0" name="p_type" type="String" />
+			<param index="1" name="p_sdp" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="_set_remote_description" qualifiers="virtual">
 			<return type="int" />
-			<argument index="0" name="p_type" type="String" />
-			<argument index="1" name="p_sdp" type="String" />
+			<param index="0" name="p_type" type="String" />
+			<param index="1" name="p_sdp" type="String" />
 			<description>
 			</description>
 		</method>
diff --git a/modules/websocket/doc_classes/WebSocketClient.xml b/modules/websocket/doc_classes/WebSocketClient.xml
index ad2acf8a21..f586c58302 100644
--- a/modules/websocket/doc_classes/WebSocketClient.xml
+++ b/modules/websocket/doc_classes/WebSocketClient.xml
@@ -15,10 +15,10 @@
 	<methods>
 		<method name="connect_to_url">
 			<return type="int" enum="Error" />
-			<argument index="0" name="url" type="String" />
-			<argument index="1" name="protocols" type="PackedStringArray" default="PackedStringArray()" />
-			<argument index="2" name="gd_mp_api" type="bool" default="false" />
-			<argument index="3" name="custom_headers" type="PackedStringArray" default="PackedStringArray()" />
+			<param index="0" name="url" type="String" />
+			<param index="1" name="protocols" type="PackedStringArray" default="PackedStringArray()" />
+			<param index="2" name="gd_mp_api" type="bool" default="false" />
+			<param index="3" name="custom_headers" type="PackedStringArray" default="PackedStringArray()" />
 			<description>
 				Connects to the given URL requesting one of the given [code]protocols[/code] as sub-protocol. If the list empty (default), no sub-protocol will be requested.
 				If [code]true[/code] is passed as [code]gd_mp_api[/code], the client will behave like a multiplayer peer for the [MultiplayerAPI], connections to non-Godot servers will not work, and [signal data_received] will not be emitted.
@@ -30,8 +30,8 @@
 		</method>
 		<method name="disconnect_from_host">
 			<return type="void" />
-			<argument index="0" name="code" type="int" default="1000" />
-			<argument index="1" name="reason" type="String" default="&quot;&quot;" />
+			<param index="0" name="code" type="int" default="1000" />
+			<param index="1" name="reason" type="String" default="&quot;&quot;" />
 			<description>
 				Disconnects this client from the connected host. See [method WebSocketPeer.close] for more information.
 			</description>
@@ -61,7 +61,7 @@
 	</members>
 	<signals>
 		<signal name="connection_closed">
-			<argument index="0" name="was_clean_close" type="bool" />
+			<param index="0" name="was_clean_close" type="bool" />
 			<description>
 				Emitted when the connection to the server is closed. [code]was_clean_close[/code] will be [code]true[/code] if the connection was shutdown cleanly.
 			</description>
@@ -72,7 +72,7 @@
 			</description>
 		</signal>
 		<signal name="connection_established">
-			<argument index="0" name="protocol" type="String" />
+			<param index="0" name="protocol" type="String" />
 			<description>
 				Emitted when a connection with the server is established, [code]protocol[/code] will contain the sub-protocol agreed with the server.
 			</description>
@@ -84,8 +84,8 @@
 			</description>
 		</signal>
 		<signal name="server_close_request">
-			<argument index="0" name="code" type="int" />
-			<argument index="1" name="reason" type="String" />
+			<param index="0" name="code" type="int" />
+			<param index="1" name="reason" type="String" />
 			<description>
 				Emitted when the server requests a clean close. You should keep polling until you get a [signal connection_closed] signal to achieve the clean close. See [method WebSocketPeer.close] for more details.
 			</description>
diff --git a/modules/websocket/doc_classes/WebSocketMultiplayerPeer.xml b/modules/websocket/doc_classes/WebSocketMultiplayerPeer.xml
index 4a617f4c82..23aa6ba3db 100644
--- a/modules/websocket/doc_classes/WebSocketMultiplayerPeer.xml
+++ b/modules/websocket/doc_classes/WebSocketMultiplayerPeer.xml
@@ -12,17 +12,17 @@
 	<methods>
 		<method name="get_peer" qualifiers="const">
 			<return type="WebSocketPeer" />
-			<argument index="0" name="peer_id" type="int" />
+			<param index="0" name="peer_id" type="int" />
 			<description>
 				Returns the [WebSocketPeer] associated to the given [code]peer_id[/code].
 			</description>
 		</method>
 		<method name="set_buffers">
 			<return type="int" enum="Error" />
-			<argument index="0" name="input_buffer_size_kb" type="int" />
-			<argument index="1" name="input_max_packets" type="int" />
-			<argument index="2" name="output_buffer_size_kb" type="int" />
-			<argument index="3" name="output_max_packets" type="int" />
+			<param index="0" name="input_buffer_size_kb" type="int" />
+			<param index="1" name="input_max_packets" type="int" />
+			<param index="2" name="output_buffer_size_kb" type="int" />
+			<param index="3" name="output_max_packets" type="int" />
 			<description>
 				Configures the buffer sizes for this WebSocket peer. Default values can be specified in the Project Settings under [code]network/limits[/code]. For server, values are meant per connected peer.
 				The first two parameters define the size and queued packets limits of the input buffer, the last two of the output buffer.
@@ -33,7 +33,7 @@
 	</methods>
 	<signals>
 		<signal name="peer_packet">
-			<argument index="0" name="peer_source" type="int" />
+			<param index="0" name="peer_source" type="int" />
 			<description>
 				Emitted when a packet is received from a peer.
 				[b]Note:[/b] This signal is only emitted when the client or server is configured to use Godot multiplayer API.
diff --git a/modules/websocket/doc_classes/WebSocketPeer.xml b/modules/websocket/doc_classes/WebSocketPeer.xml
index 6466654517..43b765d2fe 100644
--- a/modules/websocket/doc_classes/WebSocketPeer.xml
+++ b/modules/websocket/doc_classes/WebSocketPeer.xml
@@ -12,8 +12,8 @@
 	<methods>
 		<method name="close">
 			<return type="void" />
-			<argument index="0" name="code" type="int" default="1000" />
-			<argument index="1" name="reason" type="String" default="&quot;&quot;" />
+			<param index="0" name="code" type="int" default="1000" />
+			<param index="1" name="reason" type="String" default="&quot;&quot;" />
 			<description>
 				Closes this WebSocket connection. [code]code[/code] is the status code for the closure (see RFC 6455 section 7.4 for a list of valid status codes). [code]reason[/code] is the human readable reason for closing the connection (can be any UTF-8 string that's smaller than 123 bytes).
 				[b]Note:[/b] To achieve a clean close, you will need to keep polling until either [signal WebSocketClient.connection_closed] or [signal WebSocketServer.client_disconnected] is received.
@@ -54,7 +54,7 @@
 		</method>
 		<method name="set_no_delay">
 			<return type="void" />
-			<argument index="0" name="enabled" type="bool" />
+			<param index="0" name="enabled" type="bool" />
 			<description>
 				Disable Nagle's algorithm on the underling TCP socket (default). See [method StreamPeerTCP.set_no_delay] for more information.
 				[b]Note:[/b] Not available in the HTML5 export.
@@ -62,7 +62,7 @@
 		</method>
 		<method name="set_write_mode">
 			<return type="void" />
-			<argument index="0" name="mode" type="int" enum="WebSocketPeer.WriteMode" />
+			<param index="0" name="mode" type="int" enum="WebSocketPeer.WriteMode" />
 			<description>
 				Sets the socket to use the given [enum WriteMode].
 			</description>
diff --git a/modules/websocket/doc_classes/WebSocketServer.xml b/modules/websocket/doc_classes/WebSocketServer.xml
index 46b0274de3..6a7bf8075c 100644
--- a/modules/websocket/doc_classes/WebSocketServer.xml
+++ b/modules/websocket/doc_classes/WebSocketServer.xml
@@ -14,30 +14,30 @@
 	<methods>
 		<method name="disconnect_peer">
 			<return type="void" />
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="code" type="int" default="1000" />
-			<argument index="2" name="reason" type="String" default="&quot;&quot;" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="code" type="int" default="1000" />
+			<param index="2" name="reason" type="String" default="&quot;&quot;" />
 			<description>
 				Disconnects the peer identified by [code]id[/code] from the server. See [method WebSocketPeer.close] for more information.
 			</description>
 		</method>
 		<method name="get_peer_address" qualifiers="const">
 			<return type="String" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns the IP address of the given peer.
 			</description>
 		</method>
 		<method name="get_peer_port" qualifiers="const">
 			<return type="int" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns the remote port of the given peer.
 			</description>
 		</method>
 		<method name="has_peer" qualifiers="const">
 			<return type="bool" />
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Returns [code]true[/code] if a peer with the given ID is connected.
 			</description>
@@ -50,9 +50,9 @@
 		</method>
 		<method name="listen">
 			<return type="int" enum="Error" />
-			<argument index="0" name="port" type="int" />
-			<argument index="1" name="protocols" type="PackedStringArray" default="PackedStringArray()" />
-			<argument index="2" name="gd_mp_api" type="bool" default="false" />
+			<param index="0" name="port" type="int" />
+			<param index="1" name="protocols" type="PackedStringArray" default="PackedStringArray()" />
+			<param index="2" name="gd_mp_api" type="bool" default="false" />
 			<description>
 				Starts listening on the given port.
 				You can specify the desired subprotocols via the "protocols" array. If the list empty (default), no sub-protocol will be requested.
@@ -62,7 +62,7 @@
 		</method>
 		<method name="set_extra_headers">
 			<return type="void" />
-			<argument index="0" name="headers" type="PackedStringArray" default="PackedStringArray()" />
+			<param index="0" name="headers" type="PackedStringArray" default="PackedStringArray()" />
 			<description>
 				Sets additional headers to be sent to clients during the HTTP handshake.
 			</description>
@@ -93,31 +93,31 @@
 	</members>
 	<signals>
 		<signal name="client_close_request">
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="code" type="int" />
-			<argument index="2" name="reason" type="String" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="code" type="int" />
+			<param index="2" name="reason" type="String" />
 			<description>
 				Emitted when a client requests a clean close. You should keep polling until you get a [signal client_disconnected] signal with the same [code]id[/code] to achieve the clean close. See [method WebSocketPeer.close] for more details.
 			</description>
 		</signal>
 		<signal name="client_connected">
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="protocol" type="String" />
-			<argument index="2" name="resource_name" type="String" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="protocol" type="String" />
+			<param index="2" name="resource_name" type="String" />
 			<description>
 				Emitted when a new client connects. "protocol" will be the sub-protocol agreed with the client, and "resource_name" will be the resource name of the URI the peer used.
 				"resource_name" is a path (at the very least a single forward slash) and potentially a query string.
 			</description>
 		</signal>
 		<signal name="client_disconnected">
-			<argument index="0" name="id" type="int" />
-			<argument index="1" name="was_clean_close" type="bool" />
+			<param index="0" name="id" type="int" />
+			<param index="1" name="was_clean_close" type="bool" />
 			<description>
 				Emitted when a client disconnects. [code]was_clean_close[/code] will be [code]true[/code] if the connection was shutdown cleanly.
 			</description>
 		</signal>
 		<signal name="data_received">
-			<argument index="0" name="id" type="int" />
+			<param index="0" name="id" type="int" />
 			<description>
 				Emitted when a new message is received.
 				[b]Note:[/b] This signal is [i]not[/i] emitted when used as high-level multiplayer peer.
diff --git a/modules/websocket/register_types.cpp b/modules/websocket/register_types.cpp
index f562de111f..056111ec92 100644
--- a/modules/websocket/register_types.cpp
+++ b/modules/websocket/register_types.cpp
@@ -33,11 +33,13 @@
 #include "core/config/project_settings.h"
 #include "core/error/error_macros.h"
 
+#include "websocket_client.h"
+#include "websocket_server.h"
+
 #ifdef JAVASCRIPT_ENABLED
 #include "emscripten.h"
 #include "emws_client.h"
 #include "emws_peer.h"
-#include "emws_server.h"
 #else
 #include "wsl_client.h"
 #include "wsl_server.h"
@@ -60,7 +62,6 @@ void initialize_websocket_module(ModuleInitializationLevel p_level) {
 #ifdef JAVASCRIPT_ENABLED
 		EMWSPeer::make_default();
 		EMWSClient::make_default();
-		EMWSServer::make_default();
 #else
 		WSLPeer::make_default();
 		WSLClient::make_default();
diff --git a/modules/webxr/doc_classes/WebXRInterface.xml b/modules/webxr/doc_classes/WebXRInterface.xml
index 48447eb074..01ad962b20 100644
--- a/modules/webxr/doc_classes/WebXRInterface.xml
+++ b/modules/webxr/doc_classes/WebXRInterface.xml
@@ -96,7 +96,7 @@
 	<methods>
 		<method name="get_controller" qualifiers="const">
 			<return type="XRPositionalTracker" />
-			<argument index="0" name="controller_id" type="int" />
+			<param index="0" name="controller_id" type="int" />
 			<description>
 				Gets an [XRPositionalTracker] for the given [code]controller_id[/code].
 				In the context of WebXR, a "controller" can be an advanced VR controller like the Oculus Touch or Index controllers, or even a tap on the screen, a spoken voice command or a button press on the device itself. When a non-traditional controller is used, interpret the position and orientation of the [XRPositionalTracker] as a ray pointing at the object the user wishes to interact with.
@@ -111,7 +111,7 @@
 		</method>
 		<method name="is_session_supported">
 			<return type="void" />
-			<argument index="0" name="session_mode" type="String" />
+			<param index="0" name="session_mode" type="String" />
 			<description>
 				Checks if the given [code]session_mode[/code] is supported by the user's browser.
 				Possible values come from [url=https://developer.mozilla.org/en-US/docs/Web/API/XRSessionMode]WebXR's XRSessionMode[/url], including: [code]"immersive-vr"[/code], [code]"immersive-ar"[/code], and [code]"inline"[/code].
@@ -166,21 +166,21 @@
 			</description>
 		</signal>
 		<signal name="select">
-			<argument index="0" name="controller_id" type="int" />
+			<param index="0" name="controller_id" type="int" />
 			<description>
 				Emitted after one of the "controllers" has finished its "primary action".
 				Use [method get_controller] to get more information about the controller.
 			</description>
 		</signal>
 		<signal name="selectend">
-			<argument index="0" name="controller_id" type="int" />
+			<param index="0" name="controller_id" type="int" />
 			<description>
 				Emitted when one of the "controllers" has finished its "primary action".
 				Use [method get_controller] to get more information about the controller.
 			</description>
 		</signal>
 		<signal name="selectstart">
-			<argument index="0" name="controller_id" type="int" />
+			<param index="0" name="controller_id" type="int" />
 			<description>
 				Emitted when one of the "controllers" has started its "primary action".
 				Use [method get_controller] to get more information about the controller.
@@ -193,7 +193,7 @@
 			</description>
 		</signal>
 		<signal name="session_failed">
-			<argument index="0" name="message" type="String" />
+			<param index="0" name="message" type="String" />
 			<description>
 				Emitted by [method XRInterface.initialize] if the session fails to start.
 				[code]message[/code] may optionally contain an error message from WebXR, or an empty string if no message is available.
@@ -206,28 +206,28 @@
 			</description>
 		</signal>
 		<signal name="session_supported">
-			<argument index="0" name="session_mode" type="String" />
-			<argument index="1" name="supported" type="bool" />
+			<param index="0" name="session_mode" type="String" />
+			<param index="1" name="supported" type="bool" />
 			<description>
 				Emitted by [method is_session_supported] to indicate if the given [code]session_mode[/code] is supported or not.
 			</description>
 		</signal>
 		<signal name="squeeze">
-			<argument index="0" name="controller_id" type="int" />
+			<param index="0" name="controller_id" type="int" />
 			<description>
 				Emitted after one of the "controllers" has finished its "primary squeeze action".
 				Use [method get_controller] to get more information about the controller.
 			</description>
 		</signal>
 		<signal name="squeezeend">
-			<argument index="0" name="controller_id" type="int" />
+			<param index="0" name="controller_id" type="int" />
 			<description>
 				Emitted when one of the "controllers" has finished its "primary squeeze action".
 				Use [method get_controller] to get more information about the controller.
 			</description>
 		</signal>
 		<signal name="squeezestart">
-			<argument index="0" name="controller_id" type="int" />
+			<param index="0" name="controller_id" type="int" />
 			<description>
 				Emitted when one of the "controllers" has started its "primary squeeze action".
 				Use [method get_controller] to get more information about the controller.
diff --git a/platform/android/android_input_handler.cpp b/platform/android/android_input_handler.cpp
index 81802298d9..6427346365 100644
--- a/platform/android/android_input_handler.cpp
+++ b/platform/android/android_input_handler.cpp
@@ -56,10 +56,10 @@ void AndroidInputHandler::_set_key_modifier_state(Ref<InputEventWithModifiers> e
 	ev->set_ctrl_pressed(control_mem);
 }
 
-void AndroidInputHandler::process_key_event(int p_keycode, int p_scancode, int p_unicode_char, bool p_pressed) {
+void AndroidInputHandler::process_key_event(int p_keycode, int p_physical_keycode, int p_unicode, bool p_pressed) {
 	static char32_t prev_wc = 0;
-	char32_t unicode = p_unicode_char;
-	if ((p_unicode_char & 0xfffffc00) == 0xd800) {
+	char32_t unicode = p_unicode;
+	if ((p_unicode & 0xfffffc00) == 0xd800) {
 		if (prev_wc != 0) {
 			ERR_PRINT("invalid utf16 surrogate input");
 		}
@@ -78,39 +78,38 @@ void AndroidInputHandler::process_key_event(int p_keycode, int p_scancode, int p
 
 	Ref<InputEventKey> ev;
 	ev.instantiate();
-	int val = unicode;
-	Key keycode = android_get_keysym(p_keycode);
-	Key phy_keycode = android_get_keysym(p_scancode);
 
-	if (keycode == Key::SHIFT) {
-		shift_mem = p_pressed;
+	Key physical_keycode = godot_code_from_android_code(p_physical_keycode);
+	Key keycode = physical_keycode;
+	if (p_keycode != 0) {
+		keycode = godot_code_from_unicode(p_keycode);
 	}
-	if (keycode == Key::ALT) {
-		alt_mem = p_pressed;
-	}
-	if (keycode == Key::CTRL) {
-		control_mem = p_pressed;
-	}
-	if (keycode == Key::META) {
-		meta_mem = p_pressed;
+
+	switch (physical_keycode) {
+		case Key::SHIFT: {
+			shift_mem = p_pressed;
+		} break;
+		case Key::ALT: {
+			alt_mem = p_pressed;
+		} break;
+		case Key::CTRL: {
+			control_mem = p_pressed;
+		} break;
+		case Key::META: {
+			meta_mem = p_pressed;
+		} break;
+		default:
+			break;
 	}
 
 	ev->set_keycode(keycode);
-	ev->set_physical_keycode(phy_keycode);
-	ev->set_unicode(val);
+	ev->set_physical_keycode(physical_keycode);
+	ev->set_unicode(unicode);
 	ev->set_pressed(p_pressed);
 
 	_set_key_modifier_state(ev);
 
-	if (val == '\n') {
-		ev->set_keycode(Key::ENTER);
-	} else if (val == 61448) {
-		ev->set_keycode(Key::BACKSPACE);
-		ev->set_unicode((char32_t)Key::BACKSPACE);
-	} else if (val == 61453) {
-		ev->set_keycode(Key::ENTER);
-		ev->set_unicode((char32_t)Key::ENTER);
-	} else if (p_keycode == 4) {
+	if (p_physical_keycode == AKEYCODE_BACK) {
 		if (DisplayServerAndroid *dsa = Object::cast_to<DisplayServerAndroid>(DisplayServer::get_singleton())) {
 			dsa->send_window_event(DisplayServer::WINDOW_EVENT_GO_BACK_REQUEST, true);
 		}
diff --git a/platform/android/android_input_handler.h b/platform/android/android_input_handler.h
index 1397ca59e4..6dfab7def8 100644
--- a/platform/android/android_input_handler.h
+++ b/platform/android/android_input_handler.h
@@ -83,7 +83,7 @@ public:
 	void process_mouse_event(int input_device, int event_action, int event_android_buttons_mask, Point2 event_pos, float event_vertical_factor = 0, float event_horizontal_factor = 0);
 	void process_double_tap(int event_android_button_mask, Point2 p_pos);
 	void process_joy_event(JoypadEvent p_event);
-	void process_key_event(int p_keycode, int p_scancode, int p_unicode_char, bool p_pressed);
+	void process_key_event(int p_keycode, int p_physical_keycode, int p_unicode, bool p_pressed);
 };
 
 #endif // ANDROID_INPUT_HANDLER_H
diff --git a/platform/android/android_keys_utils.cpp b/platform/android/android_keys_utils.cpp
index 885e4ff145..d2c5fdfd6c 100644
--- a/platform/android/android_keys_utils.cpp
+++ b/platform/android/android_keys_utils.cpp
@@ -30,12 +30,49 @@
 
 #include "android_keys_utils.h"
 
-Key android_get_keysym(unsigned int p_code) {
-	for (int i = 0; _ak_to_keycode[i].keysym != Key::UNKNOWN; i++) {
-		if (_ak_to_keycode[i].keycode == p_code) {
-			return _ak_to_keycode[i].keysym;
+Key godot_code_from_android_code(unsigned int p_code) {
+	for (int i = 0; android_godot_code_pairs[i].android_code != AKEYCODE_MAX; i++) {
+		if (android_godot_code_pairs[i].android_code == p_code) {
+			return android_godot_code_pairs[i].godot_code;
 		}
 	}
-
 	return Key::UNKNOWN;
 }
+
+Key godot_code_from_unicode(unsigned int p_code) {
+	unsigned int code = p_code;
+	if (code > 0xFF) {
+		return Key::UNKNOWN;
+	}
+	// Known control codes.
+	if (code == '\b') { // 0x08
+		return Key::BACKSPACE;
+	}
+	if (code == '\t') { // 0x09
+		return Key::TAB;
+	}
+	if (code == '\n') { // 0x0A
+		return Key::ENTER;
+	}
+	if (code == 0x1B) {
+		return Key::ESCAPE;
+	}
+	if (code == 0x1F) {
+		return Key::KEY_DELETE;
+	}
+	// Unknown control codes.
+	if (code <= 0x1F || (code >= 0x80 && code <= 0x9F)) {
+		return Key::UNKNOWN;
+	}
+	// Convert to uppercase.
+	if (code >= 'a' && code <= 'z') { // 0x61 - 0x7A
+		code -= ('a' - 'A');
+	}
+	if (code >= u'à' && code <= u'ö') { // 0xE0 - 0xF6
+		code -= (u'à' - u'À'); // 0xE0 - 0xC0
+	}
+	if (code >= u'ø' && code <= u'þ') { // 0xF8 - 0xFF
+		code -= (u'ø' - u'Ø'); // 0xF8 - 0xD8
+	}
+	return Key(code);
+}
diff --git a/platform/android/android_keys_utils.h b/platform/android/android_keys_utils.h
index 24a6589fba..5ec3ee17aa 100644
--- a/platform/android/android_keys_utils.h
+++ b/platform/android/android_keys_utils.h
@@ -34,129 +34,140 @@
 #include <android/input.h>
 #include <core/os/keyboard.h>
 
-struct _WinTranslatePair {
-	Key keysym = Key::NONE;
-	unsigned int keycode = 0;
+#define AKEYCODE_MAX 0xFFFF
+
+struct AndroidGodotCodePair {
+	unsigned int android_code = 0;
+	Key godot_code = Key::NONE;
 };
 
-static _WinTranslatePair _ak_to_keycode[] = {
-	{ Key::TAB, AKEYCODE_TAB },
-	{ Key::ENTER, AKEYCODE_ENTER },
-	{ Key::SHIFT, AKEYCODE_SHIFT_LEFT },
-	{ Key::SHIFT, AKEYCODE_SHIFT_RIGHT },
-	{ Key::ALT, AKEYCODE_ALT_LEFT },
-	{ Key::ALT, AKEYCODE_ALT_RIGHT },
-	{ Key::MENU, AKEYCODE_MENU },
-	{ Key::PAUSE, AKEYCODE_MEDIA_PLAY_PAUSE },
-	{ Key::ESCAPE, AKEYCODE_BACK },
-	{ Key::SPACE, AKEYCODE_SPACE },
-	{ Key::PAGEUP, AKEYCODE_PAGE_UP },
-	{ Key::PAGEDOWN, AKEYCODE_PAGE_DOWN },
-	{ Key::HOME, AKEYCODE_HOME }, //(0x24)
-	{ Key::LEFT, AKEYCODE_DPAD_LEFT },
-	{ Key::UP, AKEYCODE_DPAD_UP },
-	{ Key::RIGHT, AKEYCODE_DPAD_RIGHT },
-	{ Key::DOWN, AKEYCODE_DPAD_DOWN },
-	{ Key::PERIODCENTERED, AKEYCODE_DPAD_CENTER },
-	{ Key::BACKSPACE, AKEYCODE_DEL },
-	{ Key::KEY_0, AKEYCODE_0 },
-	{ Key::KEY_1, AKEYCODE_1 },
-	{ Key::KEY_2, AKEYCODE_2 },
-	{ Key::KEY_3, AKEYCODE_3 },
-	{ Key::KEY_4, AKEYCODE_4 },
-	{ Key::KEY_5, AKEYCODE_5 },
-	{ Key::KEY_6, AKEYCODE_6 },
-	{ Key::KEY_7, AKEYCODE_7 },
-	{ Key::KEY_8, AKEYCODE_8 },
-	{ Key::KEY_9, AKEYCODE_9 },
-	{ Key::A, AKEYCODE_A },
-	{ Key::B, AKEYCODE_B },
-	{ Key::C, AKEYCODE_C },
-	{ Key::D, AKEYCODE_D },
-	{ Key::E, AKEYCODE_E },
-	{ Key::F, AKEYCODE_F },
-	{ Key::G, AKEYCODE_G },
-	{ Key::H, AKEYCODE_H },
-	{ Key::I, AKEYCODE_I },
-	{ Key::J, AKEYCODE_J },
-	{ Key::K, AKEYCODE_K },
-	{ Key::L, AKEYCODE_L },
-	{ Key::M, AKEYCODE_M },
-	{ Key::N, AKEYCODE_N },
-	{ Key::O, AKEYCODE_O },
-	{ Key::P, AKEYCODE_P },
-	{ Key::Q, AKEYCODE_Q },
-	{ Key::R, AKEYCODE_R },
-	{ Key::S, AKEYCODE_S },
-	{ Key::T, AKEYCODE_T },
-	{ Key::U, AKEYCODE_U },
-	{ Key::V, AKEYCODE_V },
-	{ Key::W, AKEYCODE_W },
-	{ Key::X, AKEYCODE_X },
-	{ Key::Y, AKEYCODE_Y },
-	{ Key::Z, AKEYCODE_Z },
-	{ Key::HOMEPAGE, AKEYCODE_EXPLORER },
-	{ Key::LAUNCH0, AKEYCODE_BUTTON_A },
-	{ Key::LAUNCH1, AKEYCODE_BUTTON_B },
-	{ Key::LAUNCH2, AKEYCODE_BUTTON_C },
-	{ Key::LAUNCH3, AKEYCODE_BUTTON_X },
-	{ Key::LAUNCH4, AKEYCODE_BUTTON_Y },
-	{ Key::LAUNCH5, AKEYCODE_BUTTON_Z },
-	{ Key::LAUNCH6, AKEYCODE_BUTTON_L1 },
-	{ Key::LAUNCH7, AKEYCODE_BUTTON_R1 },
-	{ Key::LAUNCH8, AKEYCODE_BUTTON_L2 },
-	{ Key::LAUNCH9, AKEYCODE_BUTTON_R2 },
-	{ Key::LAUNCHA, AKEYCODE_BUTTON_THUMBL },
-	{ Key::LAUNCHB, AKEYCODE_BUTTON_THUMBR },
-	{ Key::LAUNCHC, AKEYCODE_BUTTON_START },
-	{ Key::LAUNCHD, AKEYCODE_BUTTON_SELECT },
-	{ Key::LAUNCHE, AKEYCODE_BUTTON_MODE },
-	{ Key::VOLUMEMUTE, AKEYCODE_MUTE },
-	{ Key::VOLUMEDOWN, AKEYCODE_VOLUME_DOWN },
-	{ Key::VOLUMEUP, AKEYCODE_VOLUME_UP },
-	{ Key::BACK, AKEYCODE_MEDIA_REWIND },
-	{ Key::FORWARD, AKEYCODE_MEDIA_FAST_FORWARD },
-	{ Key::MEDIANEXT, AKEYCODE_MEDIA_NEXT },
-	{ Key::MEDIAPREVIOUS, AKEYCODE_MEDIA_PREVIOUS },
-	{ Key::MEDIASTOP, AKEYCODE_MEDIA_STOP },
-	{ Key::PLUS, AKEYCODE_PLUS },
-	{ Key::EQUAL, AKEYCODE_EQUALS }, // the '+' key
-	{ Key::COMMA, AKEYCODE_COMMA }, // the ',' key
-	{ Key::MINUS, AKEYCODE_MINUS }, // the '-' key
-	{ Key::SLASH, AKEYCODE_SLASH }, // the '/?' key
-	{ Key::BACKSLASH, AKEYCODE_BACKSLASH },
-	{ Key::BRACKETLEFT, AKEYCODE_LEFT_BRACKET },
-	{ Key::BRACKETRIGHT, AKEYCODE_RIGHT_BRACKET },
-	{ Key::CTRL, AKEYCODE_CTRL_LEFT },
-	{ Key::CTRL, AKEYCODE_CTRL_RIGHT },
-	{ Key::UNKNOWN, 0 }
+static AndroidGodotCodePair android_godot_code_pairs[] = {
+	{ AKEYCODE_UNKNOWN, Key::UNKNOWN }, // (0) Unknown key code.
+	{ AKEYCODE_HOME, Key::HOME }, // (3) Home key.
+	{ AKEYCODE_BACK, Key::BACK }, // (4) Back key.
+	{ AKEYCODE_0, Key::KEY_0 }, // (7) '0' key.
+	{ AKEYCODE_1, Key::KEY_1 }, // (8) '1' key.
+	{ AKEYCODE_2, Key::KEY_2 }, // (9) '2' key.
+	{ AKEYCODE_3, Key::KEY_3 }, // (10) '3' key.
+	{ AKEYCODE_4, Key::KEY_4 }, // (11) '4' key.
+	{ AKEYCODE_5, Key::KEY_5 }, // (12) '5' key.
+	{ AKEYCODE_6, Key::KEY_6 }, // (13) '6' key.
+	{ AKEYCODE_7, Key::KEY_7 }, // (14) '7' key.
+	{ AKEYCODE_8, Key::KEY_8 }, // (15) '8' key.
+	{ AKEYCODE_9, Key::KEY_9 }, // (16) '9' key.
+	{ AKEYCODE_STAR, Key::ASTERISK }, // (17) '*' key.
+	{ AKEYCODE_POUND, Key::NUMBERSIGN }, // (18) '#' key.
+	{ AKEYCODE_DPAD_UP, Key::UP }, // (19) Directional Pad Up key.
+	{ AKEYCODE_DPAD_DOWN, Key::DOWN }, // (20) Directional Pad Down key.
+	{ AKEYCODE_DPAD_LEFT, Key::LEFT }, // (21) Directional Pad Left key.
+	{ AKEYCODE_DPAD_RIGHT, Key::RIGHT }, // (22) Directional Pad Right key.
+	{ AKEYCODE_VOLUME_UP, Key::VOLUMEUP }, // (24) Volume Up key.
+	{ AKEYCODE_VOLUME_DOWN, Key::VOLUMEDOWN }, // (25) Volume Down key.
+	{ AKEYCODE_CLEAR, Key::CLEAR }, // (28) Clear key.
+	{ AKEYCODE_A, Key::A }, // (29) 'A' key.
+	{ AKEYCODE_B, Key::B }, // (30) 'B' key.
+	{ AKEYCODE_C, Key::C }, // (31) 'C' key.
+	{ AKEYCODE_D, Key::D }, // (32) 'D' key.
+	{ AKEYCODE_E, Key::E }, // (33) 'E' key.
+	{ AKEYCODE_F, Key::F }, // (34) 'F' key.
+	{ AKEYCODE_G, Key::G }, // (35) 'G' key.
+	{ AKEYCODE_H, Key::H }, // (36) 'H' key.
+	{ AKEYCODE_I, Key::I }, // (37) 'I' key.
+	{ AKEYCODE_J, Key::J }, // (38) 'J' key.
+	{ AKEYCODE_K, Key::K }, // (39) 'K' key.
+	{ AKEYCODE_L, Key::L }, // (40) 'L' key.
+	{ AKEYCODE_M, Key::M }, // (41) 'M' key.
+	{ AKEYCODE_N, Key::N }, // (42) 'N' key.
+	{ AKEYCODE_O, Key::O }, // (43) 'O' key.
+	{ AKEYCODE_P, Key::P }, // (44) 'P' key.
+	{ AKEYCODE_Q, Key::Q }, // (45) 'Q' key.
+	{ AKEYCODE_R, Key::R }, // (46) 'R' key.
+	{ AKEYCODE_S, Key::S }, // (47) 'S' key.
+	{ AKEYCODE_T, Key::T }, // (48) 'T' key.
+	{ AKEYCODE_U, Key::U }, // (49) 'U' key.
+	{ AKEYCODE_V, Key::V }, // (50) 'V' key.
+	{ AKEYCODE_W, Key::W }, // (51) 'W' key.
+	{ AKEYCODE_X, Key::X }, // (52) 'X' key.
+	{ AKEYCODE_Y, Key::Y }, // (53) 'Y' key.
+	{ AKEYCODE_Z, Key::Z }, // (54) 'Z' key.
+	{ AKEYCODE_COMMA, Key::COMMA }, // (55) ',’ key.
+	{ AKEYCODE_PERIOD, Key::PERIOD }, // (56) '.' key.
+	{ AKEYCODE_ALT_LEFT, Key::ALT }, // (57) Left Alt modifier key.
+	{ AKEYCODE_ALT_RIGHT, Key::ALT }, // (58) Right Alt modifier key.
+	{ AKEYCODE_SHIFT_LEFT, Key::SHIFT }, // (59) Left Shift modifier key.
+	{ AKEYCODE_SHIFT_RIGHT, Key::SHIFT }, // (60) Right Shift modifier key.
+	{ AKEYCODE_TAB, Key::TAB }, // (61) Tab key.
+	{ AKEYCODE_SPACE, Key::SPACE }, // (62) Space key.
+	{ AKEYCODE_ENTER, Key::ENTER }, // (66) Enter key.
+	{ AKEYCODE_DEL, Key::BACKSPACE }, // (67) Backspace key.
+	{ AKEYCODE_GRAVE, Key::QUOTELEFT }, // (68) '`' (backtick) key.
+	{ AKEYCODE_MINUS, Key::MINUS }, // (69) '-'.
+	{ AKEYCODE_EQUALS, Key::EQUAL }, // (70) '=' key.
+	{ AKEYCODE_LEFT_BRACKET, Key::BRACKETLEFT }, // (71) '[' key.
+	{ AKEYCODE_RIGHT_BRACKET, Key::BRACKETRIGHT }, // (72) ']' key.
+	{ AKEYCODE_BACKSLASH, Key::BACKSLASH }, // (73) '\' key.
+	{ AKEYCODE_SEMICOLON, Key::SEMICOLON }, // (74) ';' key.
+	{ AKEYCODE_APOSTROPHE, Key::APOSTROPHE }, // (75) ''' (apostrophe) key.
+	{ AKEYCODE_SLASH, Key::SLASH }, // (76) '/' key.
+	{ AKEYCODE_AT, Key::AT }, // (77) '@' key.
+	{ AKEYCODE_PLUS, Key::PLUS }, // (81) '+' key.
+	{ AKEYCODE_MENU, Key::MENU }, // (82) Menu key.
+	{ AKEYCODE_SEARCH, Key::SEARCH }, // (84) Search key.
+	{ AKEYCODE_MEDIA_STOP, Key::MEDIASTOP }, // (86) Stop media key.
+	{ AKEYCODE_MEDIA_PREVIOUS, Key::MEDIAPREVIOUS }, // (88) Play Previous media key.
+	{ AKEYCODE_PAGE_UP, Key::PAGEUP }, // (92) Page Up key.
+	{ AKEYCODE_PAGE_DOWN, Key::PAGEDOWN }, // (93) Page Down key.
+	{ AKEYCODE_ESCAPE, Key::ESCAPE }, // (111) Escape key.
+	{ AKEYCODE_FORWARD_DEL, Key::KEY_DELETE }, // (112) Forward Delete key.
+	{ AKEYCODE_CTRL_LEFT, Key::CTRL }, // (113) Left Control modifier key.
+	{ AKEYCODE_CTRL_RIGHT, Key::CTRL }, // (114) Right Control modifier key.
+	{ AKEYCODE_CAPS_LOCK, Key::CAPSLOCK }, // (115) Caps Lock key.
+	{ AKEYCODE_SCROLL_LOCK, Key::SCROLLLOCK }, // (116) Scroll Lock key.
+	{ AKEYCODE_META_LEFT, Key::META }, // (117) Left Meta modifier key.
+	{ AKEYCODE_META_RIGHT, Key::META }, // (118) Right Meta modifier key.
+	{ AKEYCODE_SYSRQ, Key::PRINT }, // (120) System Request / Print Screen key.
+	{ AKEYCODE_BREAK, Key::PAUSE }, // (121) Break / Pause key.
+	{ AKEYCODE_INSERT, Key::INSERT }, // (124) Insert key.
+	{ AKEYCODE_FORWARD, Key::FORWARD }, // (125) Forward key.
+	{ AKEYCODE_MEDIA_PLAY, Key::MEDIAPLAY }, // (126) Play media key.
+	{ AKEYCODE_MEDIA_RECORD, Key::MEDIARECORD }, // (130) Record media key.
+	{ AKEYCODE_F1, Key::F1 }, // (131) F1 key.
+	{ AKEYCODE_F2, Key::F2 }, // (132) F2 key.
+	{ AKEYCODE_F3, Key::F3 }, // (133) F3 key.
+	{ AKEYCODE_F4, Key::F4 }, // (134) F4 key.
+	{ AKEYCODE_F5, Key::F5 }, // (135) F5 key.
+	{ AKEYCODE_F6, Key::F6 }, // (136) F6 key.
+	{ AKEYCODE_F7, Key::F7 }, // (137) F7 key.
+	{ AKEYCODE_F8, Key::F8 }, // (138) F8 key.
+	{ AKEYCODE_F9, Key::F9 }, // (139) F9 key.
+	{ AKEYCODE_F10, Key::F10 }, // (140) F10 key.
+	{ AKEYCODE_F11, Key::F11 }, // (141) F11 key.
+	{ AKEYCODE_F12, Key::F12 }, // (142) F12 key.
+	{ AKEYCODE_NUM_LOCK, Key::NUMLOCK }, // (143) Num Lock key.
+	{ AKEYCODE_NUMPAD_0, Key::KP_0 }, // (144) Numeric keypad '0' key.
+	{ AKEYCODE_NUMPAD_1, Key::KP_1 }, // (145) Numeric keypad '1' key.
+	{ AKEYCODE_NUMPAD_2, Key::KP_2 }, // (146) Numeric keypad '2' key.
+	{ AKEYCODE_NUMPAD_3, Key::KP_3 }, // (147) Numeric keypad '3' key.
+	{ AKEYCODE_NUMPAD_4, Key::KP_4 }, // (148) Numeric keypad '4' key.
+	{ AKEYCODE_NUMPAD_5, Key::KP_5 }, // (149) Numeric keypad '5' key.
+	{ AKEYCODE_NUMPAD_6, Key::KP_6 }, // (150) Numeric keypad '6' key.
+	{ AKEYCODE_NUMPAD_7, Key::KP_7 }, // (151) Numeric keypad '7' key.
+	{ AKEYCODE_NUMPAD_8, Key::KP_8 }, // (152) Numeric keypad '8' key.
+	{ AKEYCODE_NUMPAD_9, Key::KP_9 }, // (153) Numeric keypad '9' key.
+	{ AKEYCODE_NUMPAD_DIVIDE, Key::KP_DIVIDE }, // (154) Numeric keypad '/' key (for division).
+	{ AKEYCODE_NUMPAD_MULTIPLY, Key::KP_MULTIPLY }, // (155) Numeric keypad '*' key (for multiplication).
+	{ AKEYCODE_NUMPAD_SUBTRACT, Key::KP_SUBTRACT }, // (156) Numeric keypad '-' key (for subtraction).
+	{ AKEYCODE_NUMPAD_ADD, Key::KP_ADD }, // (157) Numeric keypad '+' key (for addition).
+	{ AKEYCODE_NUMPAD_DOT, Key::KP_PERIOD }, // (158) Numeric keypad '.' key (for decimals or digit grouping).
+	{ AKEYCODE_NUMPAD_ENTER, Key::KP_ENTER }, // (160) Numeric keypad Enter key.
+	{ AKEYCODE_VOLUME_MUTE, Key::VOLUMEMUTE }, // (164) Volume Mute key.
+	{ AKEYCODE_YEN, Key::YEN }, // (216) Japanese Yen key.
+	{ AKEYCODE_HELP, Key::HELP }, // (259) Help key.
+	{ AKEYCODE_REFRESH, Key::REFRESH }, // (285) Refresh key.
+	{ AKEYCODE_MAX, Key::UNKNOWN }
 };
-/*
-TODO: map these android key:
-	AKEYCODE_SOFT_LEFT       = 1,
-	AKEYCODE_SOFT_RIGHT      = 2,
-	AKEYCODE_CALL            = 5,
-	AKEYCODE_ENDCALL         = 6,
-	AKEYCODE_STAR            = 17,
-	AKEYCODE_POUND           = 18,
-	AKEYCODE_POWER           = 26,
-	AKEYCODE_CAMERA          = 27,
-	AKEYCODE_CLEAR           = 28,
-	AKEYCODE_SYM             = 63,
-	AKEYCODE_ENVELOPE        = 65,
-	AKEYCODE_GRAVE           = 68,
-	AKEYCODE_SEMICOLON       = 74,
-	AKEYCODE_APOSTROPHE      = 75,
-	AKEYCODE_AT              = 77,
-	AKEYCODE_NUM             = 78,
-	AKEYCODE_HEADSETHOOK     = 79,
-	AKEYCODE_FOCUS           = 80,   // *Camera* focus
-	AKEYCODE_NOTIFICATION    = 83,
-	AKEYCODE_SEARCH          = 84,
-	AKEYCODE_PICTSYMBOLS     = 94,
-	AKEYCODE_SWITCH_CHARSET  = 95,
-*/
 
-Key android_get_keysym(unsigned int p_code);
+Key godot_code_from_android_code(unsigned int p_code);
+Key godot_code_from_unicode(unsigned int p_code);
 
 #endif // ANDROID_KEYS_UTILS_H
diff --git a/platform/android/display_server_android.cpp b/platform/android/display_server_android.cpp
index 86f933d4bc..b51dd18af6 100644
--- a/platform/android/display_server_android.cpp
+++ b/platform/android/display_server_android.cpp
@@ -221,12 +221,12 @@ bool DisplayServerAndroid::screen_is_touchscreen(int p_screen) const {
 	return true;
 }
 
-void DisplayServerAndroid::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, bool p_multiline, int p_max_length, int p_cursor_start, int p_cursor_end) {
+void DisplayServerAndroid::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, VirtualKeyboardType p_type, int p_max_length, int p_cursor_start, int p_cursor_end) {
 	GodotIOJavaWrapper *godot_io_java = OS_Android::get_singleton()->get_godot_io_java();
 	ERR_FAIL_NULL(godot_io_java);
 
 	if (godot_io_java->has_vk()) {
-		godot_io_java->show_vk(p_existing_text, p_multiline, p_max_length, p_cursor_start, p_cursor_end);
+		godot_io_java->show_vk(p_existing_text, (int)p_type, p_max_length, p_cursor_start, p_cursor_end);
 	} else {
 		ERR_PRINT("Virtual keyboard not available");
 	}
diff --git a/platform/android/display_server_android.h b/platform/android/display_server_android.h
index 65bf2ec1a8..2f30642319 100644
--- a/platform/android/display_server_android.h
+++ b/platform/android/display_server_android.h
@@ -122,7 +122,7 @@ public:
 	virtual float screen_get_refresh_rate(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
 	virtual bool screen_is_touchscreen(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
 
-	virtual void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2(), bool p_multiline = false, int p_max_length = -1, int p_cursor_start = -1, int p_cursor_end = -1) override;
+	virtual void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2(), VirtualKeyboardType p_type = KEYBOARD_TYPE_DEFAULT, int p_max_length = -1, int p_cursor_start = -1, int p_cursor_end = -1) override;
 	virtual void virtual_keyboard_hide() override;
 	virtual int virtual_keyboard_get_height() const override;
 
diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp
index 6f1b4bde40..685b1f01af 100644
--- a/platform/android/export/export_plugin.cpp
+++ b/platform/android/export/export_plugin.cpp
@@ -248,6 +248,7 @@ static const char *AAB_ASSETS_DIRECTORY = "res://android/build/assetPacks/instal
 static const int DEFAULT_MIN_SDK_VERSION = 19; // Should match the value in 'platform/android/java/app/config.gradle#minSdk'
 static const int DEFAULT_TARGET_SDK_VERSION = 32; // Should match the value in 'platform/android/java/app/config.gradle#targetSdk'
 
+#ifndef ANDROID_ENABLED
 void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
 	EditorExportPlatformAndroid *ea = static_cast<EditorExportPlatformAndroid *>(ud);
 
@@ -277,7 +278,6 @@ void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
 			}
 		}
 
-#ifndef ANDROID_ENABLED
 		// Check for devices updates
 		String adb = get_adb_path();
 		if (FileAccess::exists(adb)) {
@@ -389,7 +389,6 @@ void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
 				ea->devices_changed.set();
 			}
 		}
-#endif
 
 		uint64_t sleep = 200;
 		uint64_t wait = 3000000;
@@ -402,7 +401,6 @@ void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
 		}
 	}
 
-#ifndef ANDROID_ENABLED
 	if (EditorSettings::get_singleton()->get("export/android/shutdown_adb_on_exit")) {
 		String adb = get_adb_path();
 		if (!FileAccess::exists(adb)) {
@@ -413,8 +411,8 @@ void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
 		args.push_back("kill-server");
 		OS::get_singleton()->execute(adb, args);
 	}
-#endif
 }
+#endif
 
 String EditorExportPlatformAndroid::get_project_name(const String &p_name) const {
 	String aname;
@@ -2049,7 +2047,7 @@ String EditorExportPlatformAndroid::get_apksigner_path() {
 	return apksigner_path;
 }
 
-bool EditorExportPlatformAndroid::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
+bool EditorExportPlatformAndroid::has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
 	String err;
 	bool valid = false;
 	const bool custom_build_enabled = p_preset->get("custom_build/use_custom_build");
@@ -2097,7 +2095,7 @@ bool EditorExportPlatformAndroid::can_export(const Ref<EditorExportPreset> &p_pr
 		valid = installed_android_build_template && !r_missing_templates;
 	}
 
-	// Validate the rest of the configuration.
+	// Validate the rest of the export configuration.
 
 	String dk = p_preset->get("keystore/debug");
 	String dk_user = p_preset->get("keystore/debug_user");
@@ -2173,6 +2171,19 @@ bool EditorExportPlatformAndroid::can_export(const Ref<EditorExportPreset> &p_pr
 		}
 	}
 
+	if (!err.is_empty()) {
+		r_error = err;
+	}
+
+	return valid;
+}
+
+bool EditorExportPlatformAndroid::has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const {
+	String err;
+	bool valid = true;
+	const bool custom_build_enabled = p_preset->get("custom_build/use_custom_build");
+
+	// Validate the project configuration.
 	bool apk_expansion = p_preset->get("apk_expansion/enable");
 
 	if (apk_expansion) {
@@ -3125,10 +3136,14 @@ EditorExportPlatformAndroid::EditorExportPlatformAndroid() {
 
 	devices_changed.set();
 	plugins_changed.set();
+#ifndef ANDROID_ENABLED
 	check_for_changes_thread.start(_check_for_changes_poll_thread, this);
+#endif
 }
 
 EditorExportPlatformAndroid::~EditorExportPlatformAndroid() {
+#ifndef ANDROID_ENABLED
 	quit_request.set();
 	check_for_changes_thread.wait_to_finish();
+#endif
 }
diff --git a/platform/android/export/export_plugin.h b/platform/android/export/export_plugin.h
index 1da3f68f9a..46012bd46c 100644
--- a/platform/android/export/export_plugin.h
+++ b/platform/android/export/export_plugin.h
@@ -80,10 +80,12 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
 	Vector<Device> devices;
 	SafeFlag devices_changed;
 	Mutex device_lock;
+#ifndef ANDROID_ENABLED
 	Thread check_for_changes_thread;
 	SafeFlag quit_request;
 
 	static void _check_for_changes_poll_thread(void *ud);
+#endif
 
 	String get_project_name(const String &p_name) const;
 
@@ -186,7 +188,8 @@ public:
 
 	static String get_apksigner_path();
 
-	virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
+	virtual bool has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
+	virtual bool has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const override;
 
 	virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const override;
 
diff --git a/platform/android/file_access_filesystem_jandroid.cpp b/platform/android/file_access_filesystem_jandroid.cpp
index 6b21c18d59..56561cb616 100644
--- a/platform/android/file_access_filesystem_jandroid.cpp
+++ b/platform/android/file_access_filesystem_jandroid.cpp
@@ -46,6 +46,7 @@ jmethodID FileAccessFilesystemJAndroid::_file_seek_end = nullptr;
 jmethodID FileAccessFilesystemJAndroid::_file_read = nullptr;
 jmethodID FileAccessFilesystemJAndroid::_file_tell = nullptr;
 jmethodID FileAccessFilesystemJAndroid::_file_eof = nullptr;
+jmethodID FileAccessFilesystemJAndroid::_file_set_eof = nullptr;
 jmethodID FileAccessFilesystemJAndroid::_file_close = nullptr;
 jmethodID FileAccessFilesystemJAndroid::_file_write = nullptr;
 jmethodID FileAccessFilesystemJAndroid::_file_flush = nullptr;
@@ -162,6 +163,16 @@ bool FileAccessFilesystemJAndroid::eof_reached() const {
 	}
 }
 
+void FileAccessFilesystemJAndroid::_set_eof(bool eof) {
+	if (_file_set_eof) {
+		ERR_FAIL_COND_MSG(!is_open(), "File must be opened before use.");
+
+		JNIEnv *env = get_jni_env();
+		ERR_FAIL_COND(env == nullptr);
+		env->CallVoidMethod(file_access_handler, _file_set_eof, id, eof);
+	}
+}
+
 uint8_t FileAccessFilesystemJAndroid::get_8() const {
 	ERR_FAIL_COND_V_MSG(!is_open(), 0, "File must be opened before use.");
 	uint8_t byte;
@@ -184,6 +195,7 @@ String FileAccessFilesystemJAndroid::get_line() const {
 	while (true) {
 		size_t line_buffer_size = MIN(buffer_size_limit, file_size - get_position());
 		if (line_buffer_size <= 0) {
+			const_cast<FileAccessFilesystemJAndroid *>(this)->_set_eof(true);
 			break;
 		}
 
@@ -310,6 +322,7 @@ void FileAccessFilesystemJAndroid::setup(jobject p_file_access_handler) {
 	_file_get_size = env->GetMethodID(cls, "fileGetSize", "(I)J");
 	_file_tell = env->GetMethodID(cls, "fileGetPosition", "(I)J");
 	_file_eof = env->GetMethodID(cls, "isFileEof", "(I)Z");
+	_file_set_eof = env->GetMethodID(cls, "setFileEof", "(IZ)V");
 	_file_seek = env->GetMethodID(cls, "fileSeek", "(IJ)V");
 	_file_seek_end = env->GetMethodID(cls, "fileSeekFromEnd", "(IJ)V");
 	_file_read = env->GetMethodID(cls, "fileRead", "(ILjava/nio/ByteBuffer;)I");
diff --git a/platform/android/file_access_filesystem_jandroid.h b/platform/android/file_access_filesystem_jandroid.h
index 7deb8de37b..76d7db6e3a 100644
--- a/platform/android/file_access_filesystem_jandroid.h
+++ b/platform/android/file_access_filesystem_jandroid.h
@@ -44,6 +44,7 @@ class FileAccessFilesystemJAndroid : public FileAccess {
 	static jmethodID _file_seek_end;
 	static jmethodID _file_tell;
 	static jmethodID _file_eof;
+	static jmethodID _file_set_eof;
 	static jmethodID _file_read;
 	static jmethodID _file_write;
 	static jmethodID _file_flush;
@@ -56,6 +57,7 @@ class FileAccessFilesystemJAndroid : public FileAccess {
 	String path_src;
 
 	void _close(); ///< close a file
+	void _set_eof(bool eof);
 
 public:
 	virtual Error _open(const String &p_path, int p_mode_flags) override; ///< open a file
diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotIO.java b/platform/android/java/lib/src/org/godotengine/godot/GodotIO.java
index 0434efdf4c..d283de8ce8 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/GodotIO.java
+++ b/platform/android/java/lib/src/org/godotengine/godot/GodotIO.java
@@ -203,9 +203,10 @@ public class GodotIO {
 		return result;
 	}
 
-	public void showKeyboard(String p_existing_text, boolean p_multiline, int p_max_input_length, int p_cursor_start, int p_cursor_end) {
-		if (edit != null)
-			edit.showKeyboard(p_existing_text, p_multiline, p_max_input_length, p_cursor_start, p_cursor_end);
+	public void showKeyboard(String p_existing_text, int p_type, int p_max_input_length, int p_cursor_start, int p_cursor_end) {
+		if (edit != null) {
+			edit.showKeyboard(p_existing_text, GodotEditText.VirtualKeyboardType.values()[p_type], p_max_input_length, p_cursor_start, p_cursor_end);
+		}
 
 		//InputMethodManager inputMgr = (InputMethodManager)activity.getSystemService(Context.INPUT_METHOD_SERVICE);
 		//inputMgr.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java b/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java
index e2ae62d9cf..f855fc6cf6 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java
+++ b/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java
@@ -151,7 +151,7 @@ public class GodotLib {
 	/**
 	 * Forward regular key events from the main thread to the GL thread.
 	 */
-	public static native void key(int p_keycode, int p_scancode, int p_unicode_char, boolean p_pressed);
+	public static native void key(int p_keycode, int p_physical_keycode, int p_unicode, boolean p_pressed);
 
 	/**
 	 * Forward game device's key events from the main thread to the GL thread.
diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotEditText.java b/platform/android/java/lib/src/org/godotengine/godot/input/GodotEditText.java
index ecb2af0a7b..7925b54fc4 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotEditText.java
+++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotEditText.java
@@ -52,6 +52,18 @@ public class GodotEditText extends EditText {
 	private final static int HANDLER_OPEN_IME_KEYBOARD = 2;
 	private final static int HANDLER_CLOSE_IME_KEYBOARD = 3;
 
+	// Enum must be kept up-to-date with DisplayServer::VirtualKeyboardType
+	public enum VirtualKeyboardType {
+		KEYBOARD_TYPE_DEFAULT,
+		KEYBOARD_TYPE_MULTILINE,
+		KEYBOARD_TYPE_NUMBER,
+		KEYBOARD_TYPE_NUMBER_DECIMAL,
+		KEYBOARD_TYPE_PHONE,
+		KEYBOARD_TYPE_EMAIL_ADDRESS,
+		KEYBOARD_TYPE_PASSWORD,
+		KEYBOARD_TYPE_URL
+	}
+
 	// ===========================================================
 	// Fields
 	// ===========================================================
@@ -60,7 +72,7 @@ public class GodotEditText extends EditText {
 	private EditHandler sHandler = new EditHandler(this);
 	private String mOriginText;
 	private int mMaxInputLength = Integer.MAX_VALUE;
-	private boolean mMultiline = false;
+	private VirtualKeyboardType mKeyboardType = VirtualKeyboardType.KEYBOARD_TYPE_DEFAULT;
 
 	private static class EditHandler extends Handler {
 		private final WeakReference<GodotEditText> mEdit;
@@ -100,8 +112,8 @@ public class GodotEditText extends EditText {
 		setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI | EditorInfo.IME_ACTION_DONE);
 	}
 
-	public boolean isMultiline() {
-		return mMultiline;
+	public VirtualKeyboardType getKeyboardType() {
+		return mKeyboardType;
 	}
 
 	private void handleMessage(final Message msg) {
@@ -122,8 +134,31 @@ public class GodotEditText extends EditText {
 					}
 
 					int inputType = InputType.TYPE_CLASS_TEXT;
-					if (edit.isMultiline()) {
-						inputType |= InputType.TYPE_TEXT_FLAG_MULTI_LINE;
+					switch (edit.getKeyboardType()) {
+						case KEYBOARD_TYPE_DEFAULT:
+							inputType = InputType.TYPE_CLASS_TEXT;
+							break;
+						case KEYBOARD_TYPE_MULTILINE:
+							inputType = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_MULTI_LINE;
+							break;
+						case KEYBOARD_TYPE_NUMBER:
+							inputType = InputType.TYPE_CLASS_NUMBER;
+							break;
+						case KEYBOARD_TYPE_NUMBER_DECIMAL:
+							inputType = InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED;
+							break;
+						case KEYBOARD_TYPE_PHONE:
+							inputType = InputType.TYPE_CLASS_PHONE;
+							break;
+						case KEYBOARD_TYPE_EMAIL_ADDRESS:
+							inputType = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS;
+							break;
+						case KEYBOARD_TYPE_PASSWORD:
+							inputType = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD;
+							break;
+						case KEYBOARD_TYPE_URL:
+							inputType = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI;
+							break;
 					}
 					edit.setInputType(inputType);
 
@@ -201,7 +236,7 @@ public class GodotEditText extends EditText {
 	// ===========================================================
 	// Methods
 	// ===========================================================
-	public void showKeyboard(String p_existing_text, boolean p_multiline, int p_max_input_length, int p_cursor_start, int p_cursor_end) {
+	public void showKeyboard(String p_existing_text, VirtualKeyboardType p_type, int p_max_input_length, int p_cursor_start, int p_cursor_end) {
 		int maxInputLength = (p_max_input_length <= 0) ? Integer.MAX_VALUE : p_max_input_length;
 		if (p_cursor_start == -1) { // cursor position not given
 			this.mOriginText = p_existing_text;
@@ -214,7 +249,7 @@ public class GodotEditText extends EditText {
 			this.mMaxInputLength = maxInputLength - (p_existing_text.length() - p_cursor_end);
 		}
 
-		this.mMultiline = p_multiline;
+		this.mKeyboardType = p_type;
 
 		final Message msg = new Message();
 		msg.what = HANDLER_OPEN_IME_KEYBOARD;
diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java b/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java
index ccfb865b1a..da15b2490c 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java
+++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java
@@ -96,10 +96,14 @@ public class GodotInputHandler implements InputManager.InputDeviceListener {
 				GodotLib.joybutton(godotJoyId, button, false);
 			}
 		} else {
-			final int scanCode = event.getScanCode();
-			final int chr = event.getUnicodeChar(0);
-			GodotLib.key(keyCode, scanCode, chr, false);
-		}
+			// getKeyCode(): The physical key that was pressed.
+			// Godot's keycodes match the ASCII codes, so for single byte unicode characters,
+			// we can use the unmodified unicode character to determine Godot's keycode.
+			final int keycode = event.getUnicodeChar(0);
+			final int physical_keycode = event.getKeyCode();
+			final int unicode = event.getUnicodeChar();
+			GodotLib.key(keycode, physical_keycode, unicode, false);
+		};
 
 		return true;
 	}
@@ -131,9 +135,10 @@ public class GodotInputHandler implements InputManager.InputDeviceListener {
 				GodotLib.joybutton(godotJoyId, button, true);
 			}
 		} else {
-			final int scanCode = event.getScanCode();
-			final int chr = event.getUnicodeChar(0);
-			GodotLib.key(keyCode, scanCode, chr, true);
+			final int keycode = event.getUnicodeChar(0);
+			final int physical_keycode = event.getKeyCode();
+			final int unicode = event.getUnicodeChar();
+			GodotLib.key(keycode, physical_keycode, unicode, true);
 		}
 
 		return true;
diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotTextInputWrapper.java b/platform/android/java/lib/src/org/godotengine/godot/input/GodotTextInputWrapper.java
index e940aafa9e..c959b5f28c 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotTextInputWrapper.java
+++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotTextInputWrapper.java
@@ -92,11 +92,9 @@ public class GodotTextInputWrapper implements TextWatcher, OnEditorActionListene
 
 	@Override
 	public void beforeTextChanged(final CharSequence pCharSequence, final int start, final int count, final int after) {
-		//Log.d(TAG, "beforeTextChanged(" + pCharSequence + ")start: " + start + ",count: " + count + ",after: " + after);
-
 		for (int i = 0; i < count; ++i) {
-			GodotLib.key(KeyEvent.KEYCODE_DEL, KeyEvent.KEYCODE_DEL, 0, true);
-			GodotLib.key(KeyEvent.KEYCODE_DEL, KeyEvent.KEYCODE_DEL, 0, false);
+			GodotLib.key(0, KeyEvent.KEYCODE_DEL, 0, true);
+			GodotLib.key(0, KeyEvent.KEYCODE_DEL, 0, false);
 
 			if (mHasSelection) {
 				mHasSelection = false;
@@ -107,20 +105,18 @@ public class GodotTextInputWrapper implements TextWatcher, OnEditorActionListene
 
 	@Override
 	public void onTextChanged(final CharSequence pCharSequence, final int start, final int before, final int count) {
-		//Log.d(TAG, "onTextChanged(" + pCharSequence + ")start: " + start + ",count: " + count + ",before: " + before);
-
 		final int[] newChars = new int[count];
 		for (int i = start; i < start + count; ++i) {
 			newChars[i - start] = pCharSequence.charAt(i);
 		}
 		for (int i = 0; i < count; ++i) {
 			int key = newChars[i];
-			if ((key == '\n') && !mEdit.isMultiline()) {
+			if ((key == '\n') && !(mEdit.getKeyboardType() == GodotEditText.VirtualKeyboardType.KEYBOARD_TYPE_MULTILINE)) {
 				// Return keys are handled through action events
 				continue;
 			}
-			GodotLib.key(0, 0, key, true);
-			GodotLib.key(0, 0, key, false);
+			GodotLib.key(key, 0, key, true);
+			GodotLib.key(key, 0, key, false);
 		}
 	}
 
@@ -131,16 +127,16 @@ public class GodotTextInputWrapper implements TextWatcher, OnEditorActionListene
 
 			for (int i = 0; i < characters.length(); i++) {
 				final int ch = characters.codePointAt(i);
-				GodotLib.key(0, 0, ch, true);
-				GodotLib.key(0, 0, ch, false);
+				GodotLib.key(ch, 0, ch, true);
+				GodotLib.key(ch, 0, ch, false);
 			}
 		}
 
 		if (pActionID == EditorInfo.IME_ACTION_DONE) {
 			// Enter key has been pressed
 			mRenderView.queueOnRenderThread(() -> {
-				GodotLib.key(KeyEvent.KEYCODE_ENTER, KeyEvent.KEYCODE_ENTER, 0, true);
-				GodotLib.key(KeyEvent.KEYCODE_ENTER, KeyEvent.KEYCODE_ENTER, 0, false);
+				GodotLib.key(0, KeyEvent.KEYCODE_ENTER, 0, true);
+				GodotLib.key(0, KeyEvent.KEYCODE_ENTER, 0, false);
 			});
 			mRenderView.getView().requestFocus();
 			return true;
diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/file/DataAccess.kt b/platform/android/java/lib/src/org/godotengine/godot/io/file/DataAccess.kt
index 463dabfb23..f23537a29e 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/io/file/DataAccess.kt
+++ b/platform/android/java/lib/src/org/godotengine/godot/io/file/DataAccess.kt
@@ -104,7 +104,6 @@ internal abstract class DataAccess(private val filePath: String) {
 
 	protected abstract val fileChannel: FileChannel
 	internal var endOfFile = false
-		private set
 
 	fun close() {
 		try {
@@ -125,9 +124,7 @@ internal abstract class DataAccess(private val filePath: String) {
 	fun seek(position: Long) {
 		try {
 			fileChannel.position(position)
-			if (position <= size()) {
-				endOfFile = false
-			}
+			endOfFile = position >= fileChannel.size()
 		} catch (e: Exception) {
 			Log.w(TAG, "Exception when seeking file $filePath.", e)
 		}
@@ -161,8 +158,7 @@ internal abstract class DataAccess(private val filePath: String) {
 	fun read(buffer: ByteBuffer): Int {
 		return try {
 			val readBytes = fileChannel.read(buffer)
-			endOfFile = readBytes == -1
-					|| (fileChannel.position() >= fileChannel.size() && fileChannel.size() > 0)
+			endOfFile = readBytes == -1 || (fileChannel.position() >= fileChannel.size())
 			if (readBytes == -1) {
 				0
 			} else {
diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessHandler.kt b/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessHandler.kt
index 04b6772c45..83da3a24b3 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessHandler.kt
+++ b/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessHandler.kt
@@ -194,6 +194,11 @@ class FileAccessHandler(val context: Context) {
 		return files[fileId].endOfFile
 	}
 
+	fun setFileEof(fileId: Int, eof: Boolean) {
+		val file = files[fileId] ?: return
+		file.endOfFile = eof
+	}
+
 	fun fileClose(fileId: Int) {
 		if (hasFileId(fileId)) {
 			files[fileId].close()
diff --git a/platform/android/java_godot_io_wrapper.cpp b/platform/android/java_godot_io_wrapper.cpp
index b71c6ef1e6..5877c15114 100644
--- a/platform/android/java_godot_io_wrapper.cpp
+++ b/platform/android/java_godot_io_wrapper.cpp
@@ -61,7 +61,7 @@ GodotIOJavaWrapper::GodotIOJavaWrapper(JNIEnv *p_env, jobject p_godot_io_instanc
 		_get_scaled_density = p_env->GetMethodID(cls, "getScaledDensity", "()F");
 		_get_screen_refresh_rate = p_env->GetMethodID(cls, "getScreenRefreshRate", "(D)D");
 		_get_unique_id = p_env->GetMethodID(cls, "getUniqueID", "()Ljava/lang/String;");
-		_show_keyboard = p_env->GetMethodID(cls, "showKeyboard", "(Ljava/lang/String;ZIII)V");
+		_show_keyboard = p_env->GetMethodID(cls, "showKeyboard", "(Ljava/lang/String;IIII)V");
 		_hide_keyboard = p_env->GetMethodID(cls, "hideKeyboard", "()V");
 		_set_screen_orientation = p_env->GetMethodID(cls, "setScreenOrientation", "(I)V");
 		_get_screen_orientation = p_env->GetMethodID(cls, "getScreenOrientation", "()I");
@@ -214,12 +214,12 @@ bool GodotIOJavaWrapper::has_vk() {
 	return (_show_keyboard != nullptr) && (_hide_keyboard != nullptr);
 }
 
-void GodotIOJavaWrapper::show_vk(const String &p_existing, bool p_multiline, int p_max_input_length, int p_cursor_start, int p_cursor_end) {
+void GodotIOJavaWrapper::show_vk(const String &p_existing, int p_type, int p_max_input_length, int p_cursor_start, int p_cursor_end) {
 	if (_show_keyboard) {
 		JNIEnv *env = get_jni_env();
 		ERR_FAIL_NULL(env);
 		jstring jStr = env->NewStringUTF(p_existing.utf8().get_data());
-		env->CallVoidMethod(godot_io_instance, _show_keyboard, jStr, p_multiline, p_max_input_length, p_cursor_start, p_cursor_end);
+		env->CallVoidMethod(godot_io_instance, _show_keyboard, jStr, p_type, p_max_input_length, p_cursor_start, p_cursor_end);
 	}
 }
 
diff --git a/platform/android/java_godot_io_wrapper.h b/platform/android/java_godot_io_wrapper.h
index aec7d1db97..dc68f4d90d 100644
--- a/platform/android/java_godot_io_wrapper.h
+++ b/platform/android/java_godot_io_wrapper.h
@@ -82,7 +82,7 @@ public:
 	Rect2i get_display_safe_area();
 	String get_unique_id();
 	bool has_vk();
-	void show_vk(const String &p_existing, bool p_multiline, int p_max_input_length, int p_cursor_start, int p_cursor_end);
+	void show_vk(const String &p_existing, int p_type, int p_max_input_length, int p_cursor_start, int p_cursor_end);
 	void hide_vk();
 	int get_vk_height();
 	void set_vk_height(int p_height);
diff --git a/platform/android/java_godot_lib_jni.cpp b/platform/android/java_godot_lib_jni.cpp
index f4de4acfad..422c05e5ce 100644
--- a/platform/android/java_godot_lib_jni.cpp
+++ b/platform/android/java_godot_lib_jni.cpp
@@ -376,12 +376,11 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyconnectionchanged(
 }
 
 // Called on the UI thread
-JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_key(JNIEnv *env, jclass clazz, jint p_keycode, jint p_scancode, jint p_unicode_char, jboolean p_pressed) {
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_key(JNIEnv *env, jclass clazz, jint p_keycode, jint p_physical_keycode, jint p_unicode, jboolean p_pressed) {
 	if (step.get() <= 0) {
 		return;
 	}
-
-	input_handler->process_key_event(p_keycode, p_scancode, p_unicode_char, p_pressed);
+	input_handler->process_key_event(p_keycode, p_physical_keycode, p_unicode, p_pressed);
 }
 
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_accelerometer(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z) {
diff --git a/platform/android/java_godot_lib_jni.h b/platform/android/java_godot_lib_jni.h
index de16f197b8..3c48ca0459 100644
--- a/platform/android/java_godot_lib_jni.h
+++ b/platform/android/java_godot_lib_jni.h
@@ -51,7 +51,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_touch__IIII_3FI(JNIEn
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_touch__IIII_3FIFF(JNIEnv *env, jclass clazz, jint input_device, jint ev, jint pointer, jint pointer_count, jfloatArray positions, jint buttons_mask, jfloat vertical_factor, jfloat horizontal_factor);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_hover(JNIEnv *env, jclass clazz, jint p_type, jfloat p_x, jfloat p_y);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_doubleTap(JNIEnv *env, jclass clazz, jint p_button_mask, jint p_x, jint p_y);
-JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_key(JNIEnv *env, jclass clazz, jint p_keycode, jint p_scancode, jint p_unicode_char, jboolean p_pressed);
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_key(JNIEnv *env, jclass clazz, jint p_keycode, jint p_physical_keycode, jint p_unicode, jboolean p_pressed);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joybutton(JNIEnv *env, jclass clazz, jint p_device, jint p_button, jboolean p_pressed);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyaxis(JNIEnv *env, jclass clazz, jint p_device, jint p_axis, jfloat p_value);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyhat(JNIEnv *env, jclass clazz, jint p_device, jint p_hat_x, jint p_hat_y);
diff --git a/platform/ios/display_server_ios.h b/platform/ios/display_server_ios.h
index 5dd4d177ea..bbb2dd3ab3 100644
--- a/platform/ios/display_server_ios.h
+++ b/platform/ios/display_server_ios.h
@@ -199,7 +199,7 @@ public:
 
 	virtual bool screen_is_touchscreen(int p_screen) const override;
 
-	virtual void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, bool p_multiline, int p_max_length, int p_cursor_start, int p_cursor_end) override;
+	virtual void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, VirtualKeyboardType p_type, int p_max_length, int p_cursor_start, int p_cursor_end) override;
 	virtual void virtual_keyboard_hide() override;
 
 	void virtual_keyboard_set_height(int height);
diff --git a/platform/ios/display_server_ios.mm b/platform/ios/display_server_ios.mm
index 6172940572..6ce7e676a2 100644
--- a/platform/ios/display_server_ios.mm
+++ b/platform/ios/display_server_ios.mm
@@ -128,7 +128,7 @@ DisplayServerIOS::DisplayServerIOS(const String &p_rendering_driver, WindowMode
 	}
 #endif
 
-	bool keep_screen_on = bool(GLOBAL_DEF("display/window/energy_saving/keep_screen_on", true));
+	bool keep_screen_on = bool(GLOBAL_GET("display/window/energy_saving/keep_screen_on"));
 	screen_set_keep_on(keep_screen_on);
 
 	Input::get_singleton()->set_event_dispatch_function(_dispatch_input_events);
@@ -585,12 +585,44 @@ bool DisplayServerIOS::screen_is_touchscreen(int p_screen) const {
 	return true;
 }
 
-void DisplayServerIOS::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, bool p_multiline, int p_max_length, int p_cursor_start, int p_cursor_end) {
+void DisplayServerIOS::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, VirtualKeyboardType p_type, int p_max_length, int p_cursor_start, int p_cursor_end) {
 	NSString *existingString = [[NSString alloc] initWithUTF8String:p_existing_text.utf8().get_data()];
 
+	AppDelegate.viewController.keyboardView.keyboardType = UIKeyboardTypeDefault;
+	AppDelegate.viewController.keyboardView.textContentType = nil;
+	switch (p_type) {
+		case KEYBOARD_TYPE_DEFAULT: {
+			AppDelegate.viewController.keyboardView.keyboardType = UIKeyboardTypeDefault;
+		} break;
+		case KEYBOARD_TYPE_MULTILINE: {
+			AppDelegate.viewController.keyboardView.keyboardType = UIKeyboardTypeDefault;
+		} break;
+		case KEYBOARD_TYPE_NUMBER: {
+			AppDelegate.viewController.keyboardView.keyboardType = UIKeyboardTypeNumberPad;
+		} break;
+		case KEYBOARD_TYPE_NUMBER_DECIMAL: {
+			AppDelegate.viewController.keyboardView.keyboardType = UIKeyboardTypeDecimalPad;
+		} break;
+		case KEYBOARD_TYPE_PHONE: {
+			AppDelegate.viewController.keyboardView.keyboardType = UIKeyboardTypePhonePad;
+			AppDelegate.viewController.keyboardView.textContentType = UITextContentTypeTelephoneNumber;
+		} break;
+		case KEYBOARD_TYPE_EMAIL_ADDRESS: {
+			AppDelegate.viewController.keyboardView.keyboardType = UIKeyboardTypeEmailAddress;
+			AppDelegate.viewController.keyboardView.textContentType = UITextContentTypeEmailAddress;
+		} break;
+		case KEYBOARD_TYPE_PASSWORD: {
+			AppDelegate.viewController.keyboardView.keyboardType = UIKeyboardTypeDefault;
+			AppDelegate.viewController.keyboardView.textContentType = UITextContentTypePassword;
+		} break;
+		case KEYBOARD_TYPE_URL: {
+			AppDelegate.viewController.keyboardView.keyboardType = UIKeyboardTypeWebSearch;
+			AppDelegate.viewController.keyboardView.textContentType = UITextContentTypeURL;
+		} break;
+	}
+
 	[AppDelegate.viewController.keyboardView
 			becomeFirstResponderWithString:existingString
-								 multiline:p_multiline
 							   cursorStart:p_cursor_start
 								 cursorEnd:p_cursor_end];
 }
diff --git a/platform/ios/export/export_plugin.cpp b/platform/ios/export/export_plugin.cpp
index 9ca2948542..425a977569 100644
--- a/platform/ios/export/export_plugin.cpp
+++ b/platform/ios/export/export_plugin.cpp
@@ -413,6 +413,35 @@ void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_
 				}
 			}
 			strnew += lines[i].replace("$pbx_locale_build_reference", locale_files);
+		} else if (lines[i].find("$swift_runtime_migration") != -1) {
+			String value = !p_config.use_swift_runtime ? "" : "LastSwiftMigration = 1250;";
+			strnew += lines[i].replace("$swift_runtime_migration", value) + "\n";
+		} else if (lines[i].find("$swift_runtime_build_settings") != -1) {
+			String value = !p_config.use_swift_runtime ? "" : R"(
+                     CLANG_ENABLE_MODULES = YES;
+                     SWIFT_OBJC_BRIDGING_HEADER = "$binary/dummy.h";
+                     SWIFT_VERSION = 5.0;
+                     )";
+			value = value.replace("$binary", p_config.binary_name);
+			strnew += lines[i].replace("$swift_runtime_build_settings", value) + "\n";
+		} else if (lines[i].find("$swift_runtime_fileref") != -1) {
+			String value = !p_config.use_swift_runtime ? "" : R"(
+                     90B4C2AA2680BC560039117A /* dummy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "dummy.h"; sourceTree = "<group>"; };
+                     90B4C2B52680C7E90039117A /* dummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "dummy.swift"; sourceTree = "<group>"; };
+                     )";
+			strnew += lines[i].replace("$swift_runtime_fileref", value) + "\n";
+		} else if (lines[i].find("$swift_runtime_binary_files") != -1) {
+			String value = !p_config.use_swift_runtime ? "" : R"(
+                     90B4C2AA2680BC560039117A /* dummy.h */,
+                     90B4C2B52680C7E90039117A /* dummy.swift */,
+                     )";
+			strnew += lines[i].replace("$swift_runtime_binary_files", value) + "\n";
+		} else if (lines[i].find("$swift_runtime_buildfile") != -1) {
+			String value = !p_config.use_swift_runtime ? "" : "90B4C2B62680C7E90039117A /* dummy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90B4C2B52680C7E90039117A /* dummy.swift */; };";
+			strnew += lines[i].replace("$swift_runtime_buildfile", value) + "\n";
+		} else if (lines[i].find("$swift_runtime_build_phase") != -1) {
+			String value = !p_config.use_swift_runtime ? "" : "90B4C2B62680C7E90039117A /* dummy.swift */,";
+			strnew += lines[i].replace("$swift_runtime_build_phase", value) + "\n";
 		} else {
 			strnew += lines[i] + "\n";
 		}
@@ -1298,6 +1327,10 @@ Error EditorExportPlatformIOS::_export_ios_plugins(const Ref<EditorExportPreset>
 
 		plugin_initialization_cpp_code += "\t" + initialization_method;
 		plugin_deinitialization_cpp_code += "\t" + deinitialization_method;
+
+		if (plugin.use_swift_runtime) {
+			p_config_data.use_swift_runtime = true;
+		}
 	}
 
 	// Updating `Info.plist`
@@ -1479,7 +1512,8 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
 		"",
 		"",
 		"",
-		Vector<String>()
+		Vector<String>(),
+		false
 	};
 
 	Vector<IOSExportAsset> assets;
@@ -1528,8 +1562,6 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
 
 		//write
 
-		file = file.replace_first("ios/", "");
-
 		if (files_to_parse.has(file)) {
 			_fix_config_file(p_preset, data, config_data, p_debug);
 		} else if (file.begins_with("libgodot.ios")) {
@@ -1785,7 +1817,7 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
 	return OK;
 }
 
-bool EditorExportPlatformIOS::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
+bool EditorExportPlatformIOS::has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
 	String err;
 	bool valid = false;
 
@@ -1810,7 +1842,18 @@ bool EditorExportPlatformIOS::can_export(const Ref<EditorExportPreset> &p_preset
 	valid = dvalid || rvalid;
 	r_missing_templates = !valid;
 
-	// Validate the rest of the configuration.
+	if (!err.is_empty()) {
+		r_error = err;
+	}
+
+	return valid;
+}
+
+bool EditorExportPlatformIOS::has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const {
+	String err;
+	bool valid = true;
+
+	// Validate the project configuration.
 
 	String team_id = p_preset->get("application/app_store_team_id");
 	if (team_id.length() == 0) {
@@ -1841,10 +1884,14 @@ bool EditorExportPlatformIOS::can_export(const Ref<EditorExportPreset> &p_preset
 EditorExportPlatformIOS::EditorExportPlatformIOS() {
 	logo = ImageTexture::create_from_image(memnew(Image(_ios_logo)));
 	plugins_changed.set();
+#ifndef ANDROID_ENABLED
 	check_for_changes_thread.start(_check_for_changes_poll_thread, this);
+#endif
 }
 
 EditorExportPlatformIOS::~EditorExportPlatformIOS() {
+#ifndef ANDROID_ENABLED
 	quit_request.set();
 	check_for_changes_thread.wait_to_finish();
+#endif
 }
diff --git a/platform/ios/export/export_plugin.h b/platform/ios/export/export_plugin.h
index 07e30c1d00..abda8e218a 100644
--- a/platform/ios/export/export_plugin.h
+++ b/platform/ios/export/export_plugin.h
@@ -57,8 +57,10 @@ class EditorExportPlatformIOS : public EditorExportPlatform {
 
 	// Plugins
 	SafeFlag plugins_changed;
+#ifndef ANDROID_ENABLED
 	Thread check_for_changes_thread;
 	SafeFlag quit_request;
+#endif
 	Mutex plugins_lock;
 	Vector<PluginConfigIOS> plugins;
 
@@ -79,6 +81,7 @@ class EditorExportPlatformIOS : public EditorExportPlatform {
 		String modules_buildphase;
 		String modules_buildgrp;
 		Vector<String> capabilities;
+		bool use_swift_runtime;
 	};
 	struct ExportArchitecture {
 		String name;
@@ -138,6 +141,7 @@ class EditorExportPlatformIOS : public EditorExportPlatform {
 		return true;
 	}
 
+#ifndef ANDROID_ENABLED
 	static void _check_for_changes_poll_thread(void *ud) {
 		EditorExportPlatformIOS *ea = static_cast<EditorExportPlatformIOS *>(ud);
 
@@ -171,6 +175,7 @@ class EditorExportPlatformIOS : public EditorExportPlatform {
 			}
 		}
 	}
+#endif
 
 protected:
 	virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) const override;
@@ -197,7 +202,8 @@ public:
 	}
 	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0) override;
 
-	virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
+	virtual bool has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
+	virtual bool has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const override;
 
 	virtual void get_platform_features(List<String> *r_features) const override {
 		r_features->push_back("mobile");
diff --git a/platform/ios/export/godot_plugin_config.cpp b/platform/ios/export/godot_plugin_config.cpp
index 9118b95337..24a95a11a4 100644
--- a/platform/ios/export/godot_plugin_config.cpp
+++ b/platform/ios/export/godot_plugin_config.cpp
@@ -184,6 +184,7 @@ PluginConfigIOS PluginConfigIOS::load_plugin_config(Ref<ConfigFile> config_file,
 	String config_base_dir = path.get_base_dir();
 
 	plugin_config.name = config_file->get_value(PluginConfigIOS::CONFIG_SECTION, PluginConfigIOS::CONFIG_NAME_KEY, String());
+	plugin_config.use_swift_runtime = config_file->get_value(PluginConfigIOS::CONFIG_SECTION, PluginConfigIOS::CONFIG_USE_SWIFT_KEY, false);
 	plugin_config.initialization_method = config_file->get_value(PluginConfigIOS::CONFIG_SECTION, PluginConfigIOS::CONFIG_INITIALIZE_KEY, String());
 	plugin_config.deinitialization_method = config_file->get_value(PluginConfigIOS::CONFIG_SECTION, PluginConfigIOS::CONFIG_DEINITIALIZE_KEY, String());
 
diff --git a/platform/ios/export/godot_plugin_config.h b/platform/ios/export/godot_plugin_config.h
index 5ca8b05b42..98e8456ed5 100644
--- a/platform/ios/export/godot_plugin_config.h
+++ b/platform/ios/export/godot_plugin_config.h
@@ -39,6 +39,7 @@
  The `config` section and fields are required and defined as follow:
 - **name**: name of the plugin
 - **binary**: path to static `.a` library
+- **use_swift_runtime**: optional boolean field used to determine if Swift runtime is used
 
 The `dependencies` and fields are optional.
 - **linked**: dependencies that should only be linked.
@@ -57,6 +58,7 @@ struct PluginConfigIOS {
 	inline static const char *CONFIG_SECTION = "config";
 	inline static const char *CONFIG_NAME_KEY = "name";
 	inline static const char *CONFIG_BINARY_KEY = "binary";
+	inline static const char *CONFIG_USE_SWIFT_KEY = "use_swift_runtime";
 	inline static const char *CONFIG_INITIALIZE_KEY = "initialization";
 	inline static const char *CONFIG_DEINITIALIZE_KEY = "deinitialization";
 
@@ -93,6 +95,7 @@ struct PluginConfigIOS {
 	// Required config section
 	String name;
 	String binary;
+	bool use_swift_runtime;
 	String initialization_method;
 	String deinitialization_method;
 
diff --git a/platform/ios/keyboard_input_view.h b/platform/ios/keyboard_input_view.h
index 33fa5d571a..fc34e6a11b 100644
--- a/platform/ios/keyboard_input_view.h
+++ b/platform/ios/keyboard_input_view.h
@@ -32,6 +32,6 @@
 
 @interface GodotKeyboardInputView : UITextView
 
-- (BOOL)becomeFirstResponderWithString:(NSString *)existingString multiline:(BOOL)flag cursorStart:(NSInteger)start cursorEnd:(NSInteger)end;
+- (BOOL)becomeFirstResponderWithString:(NSString *)existingString cursorStart:(NSInteger)start cursorEnd:(NSInteger)end;
 
 @end
diff --git a/platform/ios/keyboard_input_view.mm b/platform/ios/keyboard_input_view.mm
index 76e3f23c9d..f031a1de22 100644
--- a/platform/ios/keyboard_input_view.mm
+++ b/platform/ios/keyboard_input_view.mm
@@ -84,7 +84,7 @@
 	return YES;
 }
 
-- (BOOL)becomeFirstResponderWithString:(NSString *)existingString multiline:(BOOL)flag cursorStart:(NSInteger)start cursorEnd:(NSInteger)end {
+- (BOOL)becomeFirstResponderWithString:(NSString *)existingString cursorStart:(NSInteger)start cursorEnd:(NSInteger)end {
 	self.text = existingString;
 	self.previousText = existingString;
 
diff --git a/platform/ios/platform_config.h b/platform/ios/platform_config.h
index fed77d8932..3af08b0d65 100644
--- a/platform/ios/platform_config.h
+++ b/platform/ios/platform_config.h
@@ -32,8 +32,6 @@
 
 #define OPENGL_INCLUDE_H <ES3/gl.h>
 
-#define PLATFORM_REFCOUNT
-
 #define PTHREAD_RENAME_SELF
 
 #define _weakify(var) __weak typeof(var) GDWeak_##var = var;
diff --git a/platform/javascript/display_server_javascript.cpp b/platform/javascript/display_server_javascript.cpp
index bcff3306d5..48f637fcfe 100644
--- a/platform/javascript/display_server_javascript.cpp
+++ b/platform/javascript/display_server_javascript.cpp
@@ -604,8 +604,8 @@ void DisplayServerJavaScript::vk_input_text_callback(const char *p_text, int p_c
 	}
 }
 
-void DisplayServerJavaScript::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, bool p_multiline, int p_max_input_length, int p_cursor_start, int p_cursor_end) {
-	godot_js_display_vk_show(p_existing_text.utf8().get_data(), p_multiline, p_cursor_start, p_cursor_end);
+void DisplayServerJavaScript::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, VirtualKeyboardType p_type, int p_max_input_length, int p_cursor_start, int p_cursor_end) {
+	godot_js_display_vk_show(p_existing_text.utf8().get_data(), p_type, p_cursor_start, p_cursor_end);
 }
 
 void DisplayServerJavaScript::virtual_keyboard_hide() {
diff --git a/platform/javascript/display_server_javascript.h b/platform/javascript/display_server_javascript.h
index 79b0fbb652..fb7f5d02a8 100644
--- a/platform/javascript/display_server_javascript.h
+++ b/platform/javascript/display_server_javascript.h
@@ -157,7 +157,7 @@ public:
 	virtual float screen_get_scale(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
 	virtual float screen_get_refresh_rate(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
 
-	virtual void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2(), bool p_multiline = false, int p_max_input_length = -1, int p_cursor_start = -1, int p_cursor_end = -1) override;
+	virtual void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2(), VirtualKeyboardType p_type = KEYBOARD_TYPE_DEFAULT, int p_max_input_length = -1, int p_cursor_start = -1, int p_cursor_end = -1) override;
 	virtual void virtual_keyboard_hide() override;
 
 	// windows
diff --git a/platform/javascript/export/export_plugin.cpp b/platform/javascript/export/export_plugin.cpp
index b99f88d067..0bdee11018 100644
--- a/platform/javascript/export/export_plugin.cpp
+++ b/platform/javascript/export/export_plugin.cpp
@@ -362,7 +362,7 @@ Ref<Texture2D> EditorExportPlatformJavaScript::get_logo() const {
 	return logo;
 }
 
-bool EditorExportPlatformJavaScript::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
+bool EditorExportPlatformJavaScript::has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
 #ifndef DEV_ENABLED
 	// We don't provide export templates for the HTML5 platform currently as there
 	// is no suitable renderer to use with them. So we forbid exporting and tell
@@ -396,7 +396,27 @@ bool EditorExportPlatformJavaScript::can_export(const Ref<EditorExportPreset> &p
 	valid = dvalid || rvalid;
 	r_missing_templates = !valid;
 
-	// Validate the rest of the configuration.
+	if (!err.is_empty()) {
+		r_error = err;
+	}
+
+	return valid;
+}
+
+bool EditorExportPlatformJavaScript::has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const {
+#ifndef DEV_ENABLED
+	// We don't provide export templates for the HTML5 platform currently as there
+	// is no suitable renderer to use with them. So we forbid exporting and tell
+	// users why. This is skipped in DEV_ENABLED so that contributors can still test
+	// the pipeline once we start having WebGL or WebGPU support.
+	r_error = "The HTML5 platform is currently not supported in Godot 4.0, as there is no suitable renderer for it.\n";
+	return false;
+#endif
+
+	String err;
+	bool valid = true;
+
+	// Validate the project configuration.
 
 	if (p_preset->get("vram_texture_compression/for_mobile")) {
 		String etc_error = test_etc2();
diff --git a/platform/javascript/export/export_plugin.h b/platform/javascript/export/export_plugin.h
index fbaa3615cb..16bab02d54 100644
--- a/platform/javascript/export/export_plugin.h
+++ b/platform/javascript/export/export_plugin.h
@@ -118,7 +118,8 @@ public:
 	virtual String get_os_name() const override;
 	virtual Ref<Texture2D> get_logo() const override;
 
-	virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
+	virtual bool has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
+	virtual bool has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const override;
 	virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const override;
 	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0) override;
 
diff --git a/platform/javascript/godot_js.h b/platform/javascript/godot_js.h
index 1dce8035a6..a323f2d157 100644
--- a/platform/javascript/godot_js.h
+++ b/platform/javascript/godot_js.h
@@ -121,7 +121,7 @@ extern void godot_js_display_notification_cb(void (*p_callback)(int p_notificati
 extern int godot_js_display_vk_available();
 extern int godot_js_display_tts_available();
 extern void godot_js_display_vk_cb(void (*p_input)(const char *p_text, int p_cursor));
-extern void godot_js_display_vk_show(const char *p_text, int p_multiline, int p_start, int p_end);
+extern void godot_js_display_vk_show(const char *p_text, int p_type, int p_start, int p_end);
 extern void godot_js_display_vk_hide();
 
 #ifdef __cplusplus
diff --git a/platform/javascript/js/libs/library_godot_display.js b/platform/javascript/js/libs/library_godot_display.js
index 5997631bf8..c7729a8c5b 100644
--- a/platform/javascript/js/libs/library_godot_display.js
+++ b/platform/javascript/js/libs/library_godot_display.js
@@ -73,7 +73,7 @@ const GodotDisplayVK = {
 			GodotDisplayVK.textarea = create('textarea');
 			GodotDisplayVK.updateSize();
 		},
-		show: function (text, multiline, start, end) {
+		show: function (text, type, start, end) {
 			if (!GodotDisplayVK.textinput || !GodotDisplayVK.textarea) {
 				return;
 			}
@@ -81,7 +81,46 @@ const GodotDisplayVK = {
 				GodotDisplayVK.hide();
 			}
 			GodotDisplayVK.updateSize();
-			const elem = multiline ? GodotDisplayVK.textarea : GodotDisplayVK.textinput;
+
+			let elem = GodotDisplayVK.textinput;
+			switch (type) {
+			case 0: // KEYBOARD_TYPE_DEFAULT
+				elem.type = 'text';
+				elem.inputmode = '';
+				break;
+			case 1: // KEYBOARD_TYPE_MULTILINE
+				elem = GodotDisplayVK.textarea;
+				break;
+			case 2: // KEYBOARD_TYPE_NUMBER
+				elem.type = 'text';
+				elem.inputmode = 'numeric';
+				break;
+			case 3: // KEYBOARD_TYPE_NUMBER_DECIMAL
+				elem.type = 'text';
+				elem.inputmode = 'decimal';
+				break;
+			case 4: // KEYBOARD_TYPE_PHONE
+				elem.type = 'tel';
+				elem.inputmode = '';
+				break;
+			case 5: // KEYBOARD_TYPE_EMAIL_ADDRESS
+				elem.type = 'email';
+				elem.inputmode = '';
+				break;
+			case 6: // KEYBOARD_TYPE_PASSWORD
+				elem.type = 'password';
+				elem.inputmode = '';
+				break;
+			case 7: // KEYBOARD_TYPE_URL
+				elem.type = 'url';
+				elem.inputmode = '';
+				break;
+			default:
+				elem.type = 'text';
+				elem.inputmode = '';
+				break;
+			}
+
 			elem.readonly = false;
 			elem.disabled = false;
 			elem.value = text;
@@ -694,11 +733,11 @@ const GodotDisplay = {
 	 * Virtual Keyboard
 	 */
 	godot_js_display_vk_show__sig: 'viiii',
-	godot_js_display_vk_show: function (p_text, p_multiline, p_start, p_end) {
+	godot_js_display_vk_show: function (p_text, p_type, p_start, p_end) {
 		const text = GodotRuntime.parseString(p_text);
 		const start = p_start > 0 ? p_start : 0;
 		const end = p_end > 0 ? p_end : start;
-		GodotDisplayVK.show(text, p_multiline, start, end);
+		GodotDisplayVK.show(text, p_type, start, end);
 	},
 
 	godot_js_display_vk_hide__sig: 'v',
diff --git a/platform/linuxbsd/display_server_x11.cpp b/platform/linuxbsd/display_server_x11.cpp
index 3409e43ba5..8efbd2e3c5 100644
--- a/platform/linuxbsd/display_server_x11.cpp
+++ b/platform/linuxbsd/display_server_x11.cpp
@@ -4991,7 +4991,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode
 
 #ifdef DBUS_ENABLED
 	screensaver = memnew(FreeDesktopScreenSaver);
-	screen_set_keep_on(GLOBAL_DEF("display/window/energy_saving/keep_screen_on", true));
+	screen_set_keep_on(GLOBAL_GET("display/window/energy_saving/keep_screen_on"));
 #endif
 
 	r_error = OK;
diff --git a/platform/linuxbsd/os_linuxbsd.cpp b/platform/linuxbsd/os_linuxbsd.cpp
index e306c1054b..197d31dc81 100644
--- a/platform/linuxbsd/os_linuxbsd.cpp
+++ b/platform/linuxbsd/os_linuxbsd.cpp
@@ -368,6 +368,7 @@ Vector<String> OS_LinuxBSD::get_system_fonts() const {
 		FcPatternDestroy(pattern);
 	}
 	FcObjectSetDestroy(object_set);
+	FcConfigDestroy(config);
 
 	for (const String &E : font_names) {
 		ret.push_back(E);
@@ -417,6 +418,8 @@ String OS_LinuxBSD::get_system_font_path(const String &p_font_name, bool p_bold,
 		FcPatternDestroy(pattern);
 	}
 	FcObjectSetDestroy(object_set);
+	FcConfigDestroy(config);
+
 	return ret;
 #else
 	ERR_FAIL_V_MSG(String(), "Godot was compiled without fontconfig, system font support is disabled.");
diff --git a/platform/macos/display_server_macos.h b/platform/macos/display_server_macos.h
index 41031ec81b..5fda5dd974 100644
--- a/platform/macos/display_server_macos.h
+++ b/platform/macos/display_server_macos.h
@@ -50,6 +50,7 @@
 #import <ApplicationServices/ApplicationServices.h>
 #import <CoreVideo/CoreVideo.h>
 #import <Foundation/Foundation.h>
+#import <IOKit/pwr_mgt/IOPMLib.h>
 
 #undef BitMap
 #undef CursorShape
@@ -171,6 +172,8 @@ private:
 
 	HashMap<WindowID, WindowData> windows;
 
+	IOPMAssertionID screen_keep_on_assertion = kIOPMNullAssertionID;
+
 	const NSMenu *_get_menu_root(const String &p_menu_root) const;
 	NSMenu *_get_menu_root(const String &p_menu_root);
 
@@ -193,6 +196,9 @@ private:
 
 	static NSCursor *_cursor_from_selector(SEL p_selector, SEL p_fallback = nil);
 
+	bool _has_help_menu() const;
+	NSMenuItem *_menu_add_item(const String &p_menu_root, const String &p_label, Key p_accel, int p_index, int *r_out);
+
 public:
 	NSMenu *get_dock_menu() const;
 	void menu_callback(id p_sender);
@@ -221,15 +227,15 @@ public:
 	virtual bool has_feature(Feature p_feature) const override;
 	virtual String get_name() const override;
 
-	virtual void global_menu_add_item(const String &p_menu_root, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1) override;
-	virtual void global_menu_add_check_item(const String &p_menu_root, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1) override;
-	virtual void global_menu_add_icon_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1) override;
-	virtual void global_menu_add_icon_check_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1) override;
-	virtual void global_menu_add_radio_check_item(const String &p_menu_root, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1) override;
-	virtual void global_menu_add_icon_radio_check_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1) override;
-	virtual void global_menu_add_multistate_item(const String &p_menu_root, const String &p_label, int p_max_states, int p_default_state, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1) override;
-	virtual void global_menu_add_submenu_item(const String &p_menu_root, const String &p_label, const String &p_submenu, int p_index = -1) override;
-	virtual void global_menu_add_separator(const String &p_menu_root, int p_index = -1) override;
+	virtual int global_menu_add_item(const String &p_menu_root, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1) override;
+	virtual int global_menu_add_check_item(const String &p_menu_root, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1) override;
+	virtual int global_menu_add_icon_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1) override;
+	virtual int global_menu_add_icon_check_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1) override;
+	virtual int global_menu_add_radio_check_item(const String &p_menu_root, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1) override;
+	virtual int global_menu_add_icon_radio_check_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1) override;
+	virtual int global_menu_add_multistate_item(const String &p_menu_root, const String &p_label, int p_max_states, int p_default_state, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1) override;
+	virtual int global_menu_add_submenu_item(const String &p_menu_root, const String &p_label, const String &p_submenu, int p_index = -1) override;
+	virtual int global_menu_add_separator(const String &p_menu_root, int p_index = -1) override;
 
 	virtual int global_menu_get_item_index_from_text(const String &p_menu_root, const String &p_text) const override;
 	virtual int global_menu_get_item_index_from_tag(const String &p_menu_root, const Variant &p_tag) const override;
@@ -247,6 +253,7 @@ public:
 	virtual int global_menu_get_item_state(const String &p_menu_root, int p_idx) const override;
 	virtual int global_menu_get_item_max_states(const String &p_menu_root, int p_idx) const override;
 	virtual Ref<Texture2D> global_menu_get_item_icon(const String &p_menu_root, int p_idx) const override;
+	virtual int global_menu_get_item_indentation_level(const String &p_menu_root, int p_idx) const override;
 
 	virtual void global_menu_set_item_checked(const String &p_menu_root, int p_idx, bool p_checked) override;
 	virtual void global_menu_set_item_checkable(const String &p_menu_root, int p_idx, bool p_checkable) override;
@@ -261,6 +268,7 @@ public:
 	virtual void global_menu_set_item_state(const String &p_menu_root, int p_idx, int p_state) override;
 	virtual void global_menu_set_item_max_states(const String &p_menu_root, int p_idx, int p_max_states) override;
 	virtual void global_menu_set_item_icon(const String &p_menu_root, int p_idx, const Ref<Texture2D> &p_icon) override;
+	virtual void global_menu_set_item_indentation_level(const String &p_menu_root, int p_idx, int p_level) override;
 
 	virtual int global_menu_get_item_count(const String &p_menu_root) const override;
 
@@ -299,6 +307,8 @@ public:
 	virtual float screen_get_max_scale() const override;
 	virtual Rect2i screen_get_usable_rect(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
 	virtual float screen_get_refresh_rate(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual void screen_set_keep_on(bool p_enable) override;
+	virtual bool screen_is_kept_on() const override;
 
 	virtual Vector<int> get_window_list() const override;
 
diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm
index b9bc182dde..8142f44bb0 100644
--- a/platform/macos/display_server_macos.mm
+++ b/platform/macos/display_server_macos.mm
@@ -39,6 +39,7 @@
 
 #include "tts_macos.h"
 
+#include "core/config/project_settings.h"
 #include "core/io/marshalls.h"
 #include "core/math/geometry_2d.h"
 #include "core/os/keyboard.h"
@@ -62,7 +63,7 @@
 
 const NSMenu *DisplayServerMacOS::_get_menu_root(const String &p_menu_root) const {
 	const NSMenu *menu = nullptr;
-	if (p_menu_root == "") {
+	if (p_menu_root == "" || p_menu_root.to_lower() == "_main") {
 		// Main menu.
 		menu = [NSApp mainMenu];
 	} else if (p_menu_root.to_lower() == "_dock") {
@@ -83,7 +84,7 @@ const NSMenu *DisplayServerMacOS::_get_menu_root(const String &p_menu_root) cons
 
 NSMenu *DisplayServerMacOS::_get_menu_root(const String &p_menu_root) {
 	NSMenu *menu = nullptr;
-	if (p_menu_root == "") {
+	if (p_menu_root == "" || p_menu_root.to_lower() == "_main") {
 		// Main menu.
 		menu = [NSApp mainMenu];
 	} else if (p_menu_root.to_lower() == "_dock") {
@@ -713,18 +714,51 @@ String DisplayServerMacOS::get_name() const {
 	return "macOS";
 }
 
-void DisplayServerMacOS::global_menu_add_item(const String &p_menu_root, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
-	_THREAD_SAFE_METHOD_
+bool DisplayServerMacOS::_has_help_menu() const {
+	if ([NSApp helpMenu]) {
+		return true;
+	} else {
+		NSMenu *menu = [NSApp mainMenu];
+		const NSMenuItem *menu_item = [menu itemAtIndex:[menu numberOfItems] - 1];
+		if (menu_item) {
+			String menu_name = String::utf8([[menu_item title] UTF8String]);
+			if (menu_name == "Help" || menu_name == RTR("Help")) {
+				return true;
+			}
+		}
+		return false;
+	}
+}
 
+NSMenuItem *DisplayServerMacOS::_menu_add_item(const String &p_menu_root, const String &p_label, Key p_accel, int p_index, int *r_out) {
 	NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
 		String keycode = KeyMappingMacOS::keycode_get_native_string(p_accel & KeyModifierMask::CODE_MASK);
 		NSMenuItem *menu_item;
-		if (p_index != -1) {
-			menu_item = [menu insertItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:@selector(globalMenuCallback:) keyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()] atIndex:p_index];
+		int item_count = ((menu == [NSApp mainMenu]) && _has_help_menu()) ? [menu numberOfItems] - 1 : [menu numberOfItems];
+		if ((menu == [NSApp mainMenu]) && (p_label == "Help" || p_label == RTR("Help"))) {
+			p_index = [menu numberOfItems];
+		} else if (p_index < 0) {
+			p_index = item_count;
 		} else {
-			menu_item = [menu addItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:@selector(globalMenuCallback:) keyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()]];
+			if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+				p_index++;
+			}
+			p_index = CLAMP(p_index, 0, item_count);
 		}
+		menu_item = [menu insertItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:@selector(globalMenuCallback:) keyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()] atIndex:p_index];
+		*r_out = (menu == [NSApp mainMenu]) ? p_index - 1 : p_index;
+		return menu_item;
+	}
+	return nullptr;
+}
+
+int DisplayServerMacOS::global_menu_add_item(const String &p_menu_root, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
+	_THREAD_SAFE_METHOD_
+
+	int out = -1;
+	NSMenuItem *menu_item = _menu_add_item(p_menu_root, p_label, p_accel, p_index, &out);
+	if (menu_item) {
 		GodotMenuItem *obj = [[GodotMenuItem alloc] init];
 		obj->callback = p_callback;
 		obj->meta = p_tag;
@@ -734,20 +768,15 @@ void DisplayServerMacOS::global_menu_add_item(const String &p_menu_root, const S
 		[menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_accel)];
 		[menu_item setRepresentedObject:obj];
 	}
+	return out;
 }
 
-void DisplayServerMacOS::global_menu_add_check_item(const String &p_menu_root, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
+int DisplayServerMacOS::global_menu_add_check_item(const String &p_menu_root, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
 	_THREAD_SAFE_METHOD_
 
-	NSMenu *menu = _get_menu_root(p_menu_root);
-	if (menu) {
-		String keycode = KeyMappingMacOS::keycode_get_native_string(p_accel & KeyModifierMask::CODE_MASK);
-		NSMenuItem *menu_item;
-		if (p_index != -1) {
-			menu_item = [menu insertItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:@selector(globalMenuCallback:) keyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()] atIndex:p_index];
-		} else {
-			menu_item = [menu addItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:@selector(globalMenuCallback:) keyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()]];
-		}
+	int out = -1;
+	NSMenuItem *menu_item = _menu_add_item(p_menu_root, p_label, p_accel, p_index, &out);
+	if (menu_item) {
 		GodotMenuItem *obj = [[GodotMenuItem alloc] init];
 		obj->callback = p_callback;
 		obj->meta = p_tag;
@@ -757,20 +786,15 @@ void DisplayServerMacOS::global_menu_add_check_item(const String &p_menu_root, c
 		[menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_accel)];
 		[menu_item setRepresentedObject:obj];
 	}
+	return out;
 }
 
-void DisplayServerMacOS::global_menu_add_icon_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
+int DisplayServerMacOS::global_menu_add_icon_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
 	_THREAD_SAFE_METHOD_
 
-	NSMenu *menu = _get_menu_root(p_menu_root);
-	if (menu) {
-		String keycode = KeyMappingMacOS::keycode_get_native_string(p_accel & KeyModifierMask::CODE_MASK);
-		NSMenuItem *menu_item;
-		if (p_index != -1) {
-			menu_item = [menu insertItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:@selector(globalMenuCallback:) keyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()] atIndex:p_index];
-		} else {
-			menu_item = [menu addItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:@selector(globalMenuCallback:) keyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()]];
-		}
+	int out = -1;
+	NSMenuItem *menu_item = _menu_add_item(p_menu_root, p_label, p_accel, p_index, &out);
+	if (menu_item) {
 		GodotMenuItem *obj = [[GodotMenuItem alloc] init];
 		obj->callback = p_callback;
 		obj->meta = p_tag;
@@ -789,20 +813,15 @@ void DisplayServerMacOS::global_menu_add_icon_item(const String &p_menu_root, co
 		[menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_accel)];
 		[menu_item setRepresentedObject:obj];
 	}
+	return out;
 }
 
-void DisplayServerMacOS::global_menu_add_icon_check_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
+int DisplayServerMacOS::global_menu_add_icon_check_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
 	_THREAD_SAFE_METHOD_
 
-	NSMenu *menu = _get_menu_root(p_menu_root);
-	if (menu) {
-		String keycode = KeyMappingMacOS::keycode_get_native_string(p_accel & KeyModifierMask::CODE_MASK);
-		NSMenuItem *menu_item;
-		if (p_index != -1) {
-			menu_item = [menu insertItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:@selector(globalMenuCallback:) keyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()] atIndex:p_index];
-		} else {
-			menu_item = [menu addItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:@selector(globalMenuCallback:) keyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()]];
-		}
+	int out = -1;
+	NSMenuItem *menu_item = _menu_add_item(p_menu_root, p_label, p_accel, p_index, &out);
+	if (menu_item) {
 		GodotMenuItem *obj = [[GodotMenuItem alloc] init];
 		obj->callback = p_callback;
 		obj->meta = p_tag;
@@ -821,20 +840,15 @@ void DisplayServerMacOS::global_menu_add_icon_check_item(const String &p_menu_ro
 		[menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_accel)];
 		[menu_item setRepresentedObject:obj];
 	}
+	return out;
 }
 
-void DisplayServerMacOS::global_menu_add_radio_check_item(const String &p_menu_root, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
+int DisplayServerMacOS::global_menu_add_radio_check_item(const String &p_menu_root, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
 	_THREAD_SAFE_METHOD_
 
-	NSMenu *menu = _get_menu_root(p_menu_root);
-	if (menu) {
-		String keycode = KeyMappingMacOS::keycode_get_native_string(p_accel & KeyModifierMask::CODE_MASK);
-		NSMenuItem *menu_item;
-		if (p_index != -1) {
-			menu_item = [menu insertItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:@selector(globalMenuCallback:) keyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()] atIndex:p_index];
-		} else {
-			menu_item = [menu addItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:@selector(globalMenuCallback:) keyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()]];
-		}
+	int out = -1;
+	NSMenuItem *menu_item = _menu_add_item(p_menu_root, p_label, p_accel, p_index, &out);
+	if (menu_item) {
 		GodotMenuItem *obj = [[GodotMenuItem alloc] init];
 		obj->callback = p_callback;
 		obj->meta = p_tag;
@@ -844,20 +858,15 @@ void DisplayServerMacOS::global_menu_add_radio_check_item(const String &p_menu_r
 		[menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_accel)];
 		[menu_item setRepresentedObject:obj];
 	}
+	return out;
 }
 
-void DisplayServerMacOS::global_menu_add_icon_radio_check_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
+int DisplayServerMacOS::global_menu_add_icon_radio_check_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
 	_THREAD_SAFE_METHOD_
 
-	NSMenu *menu = _get_menu_root(p_menu_root);
-	if (menu) {
-		String keycode = KeyMappingMacOS::keycode_get_native_string(p_accel & KeyModifierMask::CODE_MASK);
-		NSMenuItem *menu_item;
-		if (p_index != -1) {
-			menu_item = [menu insertItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:@selector(globalMenuCallback:) keyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()] atIndex:p_index];
-		} else {
-			menu_item = [menu addItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:@selector(globalMenuCallback:) keyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()]];
-		}
+	int out = -1;
+	NSMenuItem *menu_item = _menu_add_item(p_menu_root, p_label, p_accel, p_index, &out);
+	if (menu_item) {
 		GodotMenuItem *obj = [[GodotMenuItem alloc] init];
 		obj->callback = p_callback;
 		obj->meta = p_tag;
@@ -876,20 +885,31 @@ void DisplayServerMacOS::global_menu_add_icon_radio_check_item(const String &p_m
 		[menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_accel)];
 		[menu_item setRepresentedObject:obj];
 	}
+	return out;
 }
 
-void DisplayServerMacOS::global_menu_add_multistate_item(const String &p_menu_root, const String &p_label, int p_max_states, int p_default_state, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
+int DisplayServerMacOS::global_menu_add_multistate_item(const String &p_menu_root, const String &p_label, int p_max_states, int p_default_state, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
 	_THREAD_SAFE_METHOD_
 
 	NSMenu *menu = _get_menu_root(p_menu_root);
+	int out = -1;
 	if (menu) {
 		String keycode = KeyMappingMacOS::keycode_get_native_string(p_accel & KeyModifierMask::CODE_MASK);
 		NSMenuItem *menu_item;
-		if (p_index != -1) {
-			menu_item = [menu insertItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:@selector(globalMenuCallback:) keyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()] atIndex:p_index];
+		int item_count = ((menu == [NSApp mainMenu]) && _has_help_menu()) ? [menu numberOfItems] - 1 : [menu numberOfItems];
+		if ((menu == [NSApp mainMenu]) && (p_label == "Help" || p_label == RTR("Help"))) {
+			p_index = [menu numberOfItems];
+		} else if (p_index < 0) {
+			p_index = item_count;
 		} else {
-			menu_item = [menu addItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:@selector(globalMenuCallback:) keyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()]];
+			if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+				p_index++;
+			}
+			p_index = CLAMP(p_index, 0, item_count);
 		}
+		menu_item = [menu insertItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:@selector(globalMenuCallback:) keyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()] atIndex:p_index];
+		out = (menu == [NSApp mainMenu]) ? p_index - 1 : p_index;
+
 		GodotMenuItem *obj = [[GodotMenuItem alloc] init];
 		obj->callback = p_callback;
 		obj->meta = p_tag;
@@ -899,44 +919,69 @@ void DisplayServerMacOS::global_menu_add_multistate_item(const String &p_menu_ro
 		[menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_accel)];
 		[menu_item setRepresentedObject:obj];
 	}
+	return out;
 }
 
-void DisplayServerMacOS::global_menu_add_submenu_item(const String &p_menu_root, const String &p_label, const String &p_submenu, int p_index) {
+int DisplayServerMacOS::global_menu_add_submenu_item(const String &p_menu_root, const String &p_label, const String &p_submenu, int p_index) {
 	_THREAD_SAFE_METHOD_
 
 	NSMenu *menu = _get_menu_root(p_menu_root);
 	NSMenu *sub_menu = _get_menu_root(p_submenu);
+	int out = -1;
 	if (menu && sub_menu) {
 		if (sub_menu == menu) {
 			ERR_PRINT("Can't set submenu to self!");
-			return;
+			return -1;
 		}
 		if ([sub_menu supermenu]) {
 			ERR_PRINT("Can't set submenu to menu that is already a submenu of some other menu!");
-			return;
+			return -1;
 		}
 		NSMenuItem *menu_item;
-		if (p_index != -1) {
-			menu_item = [menu insertItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:nil keyEquivalent:@"" atIndex:p_index];
+		int item_count = ((menu == [NSApp mainMenu]) && _has_help_menu()) ? [menu numberOfItems] - 1 : [menu numberOfItems];
+		if ((menu == [NSApp mainMenu]) && (p_label == "Help" || p_label == RTR("Help"))) {
+			p_index = [menu numberOfItems];
+		} else if (p_index < 0) {
+			p_index = item_count;
 		} else {
-			menu_item = [menu addItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:nil keyEquivalent:@""];
+			if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+				p_index++;
+			}
+			p_index = CLAMP(p_index, 0, item_count);
 		}
+		menu_item = [menu insertItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:nil keyEquivalent:@"" atIndex:p_index];
+		out = (menu == [NSApp mainMenu]) ? p_index - 1 : p_index;
+
+		GodotMenuItem *obj = [[GodotMenuItem alloc] init];
+		obj->callback = Callable();
+		obj->checkable_type = CHECKABLE_TYPE_NONE;
+		obj->max_states = 0;
+		obj->state = 0;
+		[menu_item setRepresentedObject:obj];
+
 		[sub_menu setTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()]];
 		[menu setSubmenu:sub_menu forItem:menu_item];
 	}
+	return out;
 }
 
-void DisplayServerMacOS::global_menu_add_separator(const String &p_menu_root, int p_index) {
+int DisplayServerMacOS::global_menu_add_separator(const String &p_menu_root, int p_index) {
 	_THREAD_SAFE_METHOD_
 
 	NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
-		if (p_index != -1) {
-			[menu insertItem:[NSMenuItem separatorItem] atIndex:p_index];
+		if (menu == [NSApp mainMenu]) { // Do not add separators into main menu.
+			return -1;
+		}
+		if (p_index < 0) {
+			p_index = [menu numberOfItems];
 		} else {
-			[menu addItem:[NSMenuItem separatorItem]];
+			p_index = CLAMP(p_index, 0, [menu numberOfItems]);
 		}
+		[menu insertItem:[NSMenuItem separatorItem] atIndex:p_index];
+		return p_index;
 	}
+	return -1;
 }
 
 int DisplayServerMacOS::global_menu_get_item_index_from_text(const String &p_menu_root, const String &p_text) const {
@@ -944,7 +989,11 @@ int DisplayServerMacOS::global_menu_get_item_index_from_text(const String &p_men
 
 	const NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
-		return [menu indexOfItemWithTitle:[NSString stringWithUTF8String:p_text.utf8().get_data()]];
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			return [menu indexOfItemWithTitle:[NSString stringWithUTF8String:p_text.utf8().get_data()]] - 1;
+		} else {
+			return [menu indexOfItemWithTitle:[NSString stringWithUTF8String:p_text.utf8().get_data()]];
+		}
 	}
 
 	return -1;
@@ -955,12 +1004,16 @@ int DisplayServerMacOS::global_menu_get_item_index_from_tag(const String &p_menu
 
 	const NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
-		for (NSInteger i = 0; i < [menu numberOfItems]; i++) {
+		for (NSInteger i = (menu == [NSApp mainMenu]) ? 1 : 0; i < [menu numberOfItems]; i++) {
 			const NSMenuItem *menu_item = [menu itemAtIndex:i];
 			if (menu_item) {
 				const GodotMenuItem *obj = [menu_item representedObject];
 				if (obj && obj->meta == p_tag) {
-					return i;
+					if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+						return i - 1;
+					} else {
+						return i;
+					}
 				}
 			}
 		}
@@ -974,6 +1027,11 @@ bool DisplayServerMacOS::global_menu_is_item_checked(const String &p_menu_root,
 
 	const NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
+		ERR_FAIL_COND_V(p_idx < 0, false);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
+		}
+		ERR_FAIL_COND_V(p_idx >= [menu numberOfItems], false);
 		const NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			return ([menu_item state] == NSControlStateValueOn);
@@ -987,6 +1045,11 @@ bool DisplayServerMacOS::global_menu_is_item_checkable(const String &p_menu_root
 
 	const NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
+		ERR_FAIL_COND_V(p_idx < 0, false);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
+		}
+		ERR_FAIL_COND_V(p_idx >= [menu numberOfItems], false);
 		const NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			GodotMenuItem *obj = [menu_item representedObject];
@@ -1003,6 +1066,11 @@ bool DisplayServerMacOS::global_menu_is_item_radio_checkable(const String &p_men
 
 	const NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
+		ERR_FAIL_COND_V(p_idx < 0, false);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
+		}
+		ERR_FAIL_COND_V(p_idx >= [menu numberOfItems], false);
 		const NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			GodotMenuItem *obj = [menu_item representedObject];
@@ -1019,6 +1087,11 @@ Callable DisplayServerMacOS::global_menu_get_item_callback(const String &p_menu_
 
 	const NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
+		ERR_FAIL_COND_V(p_idx < 0, Callable());
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
+		}
+		ERR_FAIL_COND_V(p_idx >= [menu numberOfItems], Callable());
 		const NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			GodotMenuItem *obj = [menu_item representedObject];
@@ -1035,6 +1108,11 @@ Variant DisplayServerMacOS::global_menu_get_item_tag(const String &p_menu_root,
 
 	const NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
+		ERR_FAIL_COND_V(p_idx < 0, Variant());
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
+		}
+		ERR_FAIL_COND_V(p_idx >= [menu numberOfItems], Variant());
 		const NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			GodotMenuItem *obj = [menu_item representedObject];
@@ -1051,6 +1129,11 @@ String DisplayServerMacOS::global_menu_get_item_text(const String &p_menu_root,
 
 	const NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
+		ERR_FAIL_COND_V(p_idx < 0, String());
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
+		}
+		ERR_FAIL_COND_V(p_idx >= [menu numberOfItems], String());
 		const NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			return String::utf8([[menu_item title] UTF8String]);
@@ -1064,6 +1147,11 @@ String DisplayServerMacOS::global_menu_get_item_submenu(const String &p_menu_roo
 
 	const NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
+		ERR_FAIL_COND_V(p_idx < 0, String());
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
+		}
+		ERR_FAIL_COND_V(p_idx >= [menu numberOfItems], String());
 		const NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			const NSMenu *sub_menu = [menu_item submenu];
@@ -1084,6 +1172,11 @@ Key DisplayServerMacOS::global_menu_get_item_accelerator(const String &p_menu_ro
 
 	const NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
+		ERR_FAIL_COND_V(p_idx < 0, Key::NONE);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
+		}
+		ERR_FAIL_COND_V(p_idx >= [menu numberOfItems], Key::NONE);
 		const NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			String ret = String::utf8([[menu_item keyEquivalent] UTF8String]);
@@ -1115,6 +1208,11 @@ bool DisplayServerMacOS::global_menu_is_item_disabled(const String &p_menu_root,
 
 	const NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
+		ERR_FAIL_COND_V(p_idx < 0, false);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
+		}
+		ERR_FAIL_COND_V(p_idx >= [menu numberOfItems], false);
 		const NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			return ![menu_item isEnabled];
@@ -1128,6 +1226,11 @@ String DisplayServerMacOS::global_menu_get_item_tooltip(const String &p_menu_roo
 
 	const NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
+		ERR_FAIL_COND_V(p_idx < 0, String());
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
+		}
+		ERR_FAIL_COND_V(p_idx >= [menu numberOfItems], String());
 		const NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			return String::utf8([[menu_item toolTip] UTF8String]);
@@ -1141,6 +1244,11 @@ int DisplayServerMacOS::global_menu_get_item_state(const String &p_menu_root, in
 
 	const NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
+		ERR_FAIL_COND_V(p_idx < 0, 0);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
+		}
+		ERR_FAIL_COND_V(p_idx >= [menu numberOfItems], 0);
 		const NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			GodotMenuItem *obj = [menu_item representedObject];
@@ -1157,6 +1265,11 @@ int DisplayServerMacOS::global_menu_get_item_max_states(const String &p_menu_roo
 
 	const NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
+		ERR_FAIL_COND_V(p_idx < 0, 0);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
+		}
+		ERR_FAIL_COND_V(p_idx >= [menu numberOfItems], 0);
 		const NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			GodotMenuItem *obj = [menu_item representedObject];
@@ -1173,6 +1286,11 @@ Ref<Texture2D> DisplayServerMacOS::global_menu_get_item_icon(const String &p_men
 
 	const NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
+		ERR_FAIL_COND_V(p_idx < 0, Ref<Texture2D>());
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
+		}
+		ERR_FAIL_COND_V(p_idx >= [menu numberOfItems], Ref<Texture2D>());
 		const NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			GodotMenuItem *obj = [menu_item representedObject];
@@ -1186,14 +1304,34 @@ Ref<Texture2D> DisplayServerMacOS::global_menu_get_item_icon(const String &p_men
 	return Ref<Texture2D>();
 }
 
+int DisplayServerMacOS::global_menu_get_item_indentation_level(const String &p_menu_root, int p_idx) const {
+	_THREAD_SAFE_METHOD_
+
+	const NSMenu *menu = _get_menu_root(p_menu_root);
+	if (menu) {
+		ERR_FAIL_COND_V(p_idx < 0, 0);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
+		}
+		ERR_FAIL_COND_V(p_idx >= [menu numberOfItems], 0);
+		const NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
+		if (menu_item) {
+			return [menu_item indentationLevel];
+		}
+	}
+	return 0;
+}
+
 void DisplayServerMacOS::global_menu_set_item_checked(const String &p_menu_root, int p_idx, bool p_checked) {
 	_THREAD_SAFE_METHOD_
 
 	NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
-		if ((menu == [NSApp mainMenu]) && (p_idx == 0)) { // Do not edit Apple menu.
-			return;
+		ERR_FAIL_COND(p_idx < 0);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
 		}
+		ERR_FAIL_COND(p_idx >= [menu numberOfItems]);
 		NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			if (p_checked) {
@@ -1210,12 +1348,15 @@ void DisplayServerMacOS::global_menu_set_item_checkable(const String &p_menu_roo
 
 	NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
-		if ((menu == [NSApp mainMenu]) && (p_idx == 0)) { // Do not edit Apple menu.
-			return;
+		ERR_FAIL_COND(p_idx < 0);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
 		}
+		ERR_FAIL_COND(p_idx >= [menu numberOfItems]);
 		NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			GodotMenuItem *obj = [menu_item representedObject];
+			ERR_FAIL_COND(!obj);
 			obj->checkable_type = (p_checkable) ? CHECKABLE_TYPE_CHECK_BOX : CHECKABLE_TYPE_NONE;
 		}
 	}
@@ -1226,12 +1367,15 @@ void DisplayServerMacOS::global_menu_set_item_radio_checkable(const String &p_me
 
 	NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
-		if ((menu == [NSApp mainMenu]) && (p_idx == 0)) { // Do not edit Apple menu.
-			return;
+		ERR_FAIL_COND(p_idx < 0);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
 		}
+		ERR_FAIL_COND(p_idx >= [menu numberOfItems]);
 		NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			GodotMenuItem *obj = [menu_item representedObject];
+			ERR_FAIL_COND(!obj);
 			obj->checkable_type = (p_checkable) ? CHECKABLE_TYPE_RADIO_BUTTON : CHECKABLE_TYPE_NONE;
 		}
 	}
@@ -1242,12 +1386,15 @@ void DisplayServerMacOS::global_menu_set_item_callback(const String &p_menu_root
 
 	NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
-		if ((menu == [NSApp mainMenu]) && (p_idx == 0)) { // Do not edit Apple menu.
-			return;
+		ERR_FAIL_COND(p_idx < 0);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
 		}
+		ERR_FAIL_COND(p_idx >= [menu numberOfItems]);
 		NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			GodotMenuItem *obj = [menu_item representedObject];
+			ERR_FAIL_COND(!obj);
 			obj->callback = p_callback;
 		}
 	}
@@ -1258,12 +1405,15 @@ void DisplayServerMacOS::global_menu_set_item_tag(const String &p_menu_root, int
 
 	NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
-		if ((menu == [NSApp mainMenu]) && (p_idx == 0)) { // Do not edit Apple menu.
-			return;
+		ERR_FAIL_COND(p_idx < 0);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
 		}
+		ERR_FAIL_COND(p_idx >= [menu numberOfItems]);
 		NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			GodotMenuItem *obj = [menu_item representedObject];
+			ERR_FAIL_COND(!obj);
 			obj->meta = p_tag;
 		}
 	}
@@ -1274,9 +1424,11 @@ void DisplayServerMacOS::global_menu_set_item_text(const String &p_menu_root, in
 
 	NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
-		if ((menu == [NSApp mainMenu]) && (p_idx == 0)) { // Do not edit Apple menu.
-			return;
+		ERR_FAIL_COND(p_idx < 0);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
 		}
+		ERR_FAIL_COND(p_idx >= [menu numberOfItems]);
 		NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			[menu_item setTitle:[NSString stringWithUTF8String:p_text.utf8().get_data()]];
@@ -1298,9 +1450,11 @@ void DisplayServerMacOS::global_menu_set_item_submenu(const String &p_menu_root,
 			ERR_PRINT("Can't set submenu to menu that is already a submenu of some other menu!");
 			return;
 		}
-		if ((menu == [NSApp mainMenu]) && (p_idx == 0)) { // Do not edit Apple menu.
-			return;
+		ERR_FAIL_COND(p_idx < 0);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
 		}
+		ERR_FAIL_COND(p_idx >= [menu numberOfItems]);
 		NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			[menu setSubmenu:sub_menu forItem:menu_item];
@@ -1313,9 +1467,11 @@ void DisplayServerMacOS::global_menu_set_item_accelerator(const String &p_menu_r
 
 	NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
-		if ((menu == [NSApp mainMenu]) && (p_idx == 0)) { // Do not edit Apple menu.
-			return;
+		ERR_FAIL_COND(p_idx < 0);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
 		}
+		ERR_FAIL_COND(p_idx >= [menu numberOfItems]);
 		NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			[menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_keycode)];
@@ -1330,9 +1486,11 @@ void DisplayServerMacOS::global_menu_set_item_disabled(const String &p_menu_root
 
 	NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
-		if ((menu == [NSApp mainMenu]) && (p_idx == 0)) { // Do not edit Apple menu.
-			return;
+		ERR_FAIL_COND(p_idx < 0);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
 		}
+		ERR_FAIL_COND(p_idx >= [menu numberOfItems]);
 		NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			[menu_item setEnabled:(!p_disabled)];
@@ -1345,9 +1503,11 @@ void DisplayServerMacOS::global_menu_set_item_tooltip(const String &p_menu_root,
 
 	NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
-		if ((menu == [NSApp mainMenu]) && (p_idx == 0)) { // Do not edit Apple menu.
-			return;
+		ERR_FAIL_COND(p_idx < 0);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
 		}
+		ERR_FAIL_COND(p_idx >= [menu numberOfItems]);
 		NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			[menu_item setToolTip:[NSString stringWithUTF8String:p_tooltip.utf8().get_data()]];
@@ -1360,15 +1520,16 @@ void DisplayServerMacOS::global_menu_set_item_state(const String &p_menu_root, i
 
 	NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
-		if ((menu == [NSApp mainMenu]) && (p_idx == 0)) { // Do not edit Apple menu.
-			return;
+		ERR_FAIL_COND(p_idx < 0);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
 		}
+		ERR_FAIL_COND(p_idx >= [menu numberOfItems]);
 		NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			GodotMenuItem *obj = [menu_item representedObject];
-			if (obj) {
-				obj->state = p_state;
-			}
+			ERR_FAIL_COND(!obj);
+			obj->state = p_state;
 		}
 	}
 }
@@ -1378,15 +1539,16 @@ void DisplayServerMacOS::global_menu_set_item_max_states(const String &p_menu_ro
 
 	NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
-		if ((menu == [NSApp mainMenu]) && (p_idx == 0)) { // Do not edit Apple menu.
-			return;
+		ERR_FAIL_COND(p_idx < 0);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
 		}
+		ERR_FAIL_COND(p_idx >= [menu numberOfItems]);
 		NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			GodotMenuItem *obj = [menu_item representedObject];
-			if (obj) {
-				obj->max_states = p_max_states;
-			}
+			ERR_FAIL_COND(!obj);
+			obj->max_states = p_max_states;
 		}
 	}
 }
@@ -1396,12 +1558,15 @@ void DisplayServerMacOS::global_menu_set_item_icon(const String &p_menu_root, in
 
 	NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
-		if ((menu == [NSApp mainMenu]) && (p_idx == 0)) { // Do not edit Apple menu.
-			return;
+		ERR_FAIL_COND(p_idx < 0);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
 		}
+		ERR_FAIL_COND(p_idx >= [menu numberOfItems]);
 		NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
 			GodotMenuItem *obj = [menu_item representedObject];
+			ERR_FAIL_COND(!obj);
 			if (p_icon.is_valid()) {
 				obj->img = p_icon->get_image();
 				obj->img = obj->img->duplicate();
@@ -1418,12 +1583,33 @@ void DisplayServerMacOS::global_menu_set_item_icon(const String &p_menu_root, in
 	}
 }
 
+void DisplayServerMacOS::global_menu_set_item_indentation_level(const String &p_menu_root, int p_idx, int p_level) {
+	_THREAD_SAFE_METHOD_
+
+	NSMenu *menu = _get_menu_root(p_menu_root);
+	if (menu) {
+		ERR_FAIL_COND(p_idx < 0);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
+		}
+		ERR_FAIL_COND(p_idx >= [menu numberOfItems]);
+		NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
+		if (menu_item) {
+			[menu_item setIndentationLevel:p_level];
+		}
+	}
+}
+
 int DisplayServerMacOS::global_menu_get_item_count(const String &p_menu_root) const {
 	_THREAD_SAFE_METHOD_
 
 	const NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
-		return [menu numberOfItems];
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			return [menu numberOfItems] - 1;
+		} else {
+			return [menu numberOfItems];
+		}
 	} else {
 		return 0;
 	}
@@ -1434,9 +1620,11 @@ void DisplayServerMacOS::global_menu_remove_item(const String &p_menu_root, int
 
 	NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
-		if ((menu == [NSApp mainMenu]) && (p_idx == 0)) { // Do not delete Apple menu.
-			return;
+		ERR_FAIL_COND(p_idx < 0);
+		if (menu == [NSApp mainMenu]) { // Skip Apple menu.
+			p_idx++;
 		}
+		ERR_FAIL_COND(p_idx >= [menu numberOfItems]);
 		[menu removeItemAtIndex:p_idx];
 	}
 }
@@ -1452,6 +1640,9 @@ void DisplayServerMacOS::global_menu_clear(const String &p_menu_root) {
 			NSMenuItem *menu_item = [menu addItemWithTitle:@"" action:nil keyEquivalent:@""];
 			[menu setSubmenu:apple_menu forItem:menu_item];
 		}
+		if (submenu.has(p_menu_root)) {
+			submenu.erase(p_menu_root);
+		}
 	}
 }
 
@@ -1891,6 +2082,24 @@ float DisplayServerMacOS::screen_get_refresh_rate(int p_screen) const {
 	return SCREEN_REFRESH_RATE_FALLBACK;
 }
 
+bool DisplayServerMacOS::screen_is_kept_on() const {
+	return (screen_keep_on_assertion);
+}
+
+void DisplayServerMacOS::screen_set_keep_on(bool p_enable) {
+	if (screen_keep_on_assertion) {
+		IOPMAssertionRelease(screen_keep_on_assertion);
+		screen_keep_on_assertion = kIOPMNullAssertionID;
+	}
+
+	if (p_enable) {
+		String app_name_string = ProjectSettings::get_singleton()->get("application/config/name");
+		NSString *name = [NSString stringWithUTF8String:(app_name_string.is_empty() ? "Godot Engine" : app_name_string.utf8().get_data())];
+		NSString *reason = @"Godot Engine running with display/window/energy_saving/keep_screen_on = true";
+		IOPMAssertionCreateWithDescription(kIOPMAssertPreventUserIdleDisplaySleep, (__bridge CFStringRef)name, (__bridge CFStringRef)reason, (__bridge CFStringRef)reason, nullptr, 0, nullptr, &screen_keep_on_assertion);
+	}
+}
+
 Vector<DisplayServer::WindowID> DisplayServerMacOS::get_window_list() const {
 	_THREAD_SAFE_METHOD_
 
@@ -3203,7 +3412,7 @@ DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, WindowM
 
 	[apple_menu addItem:[NSMenuItem separatorItem]];
 
-	title = [NSString stringWithFormat:NSLocalizedString(@"Quit %@", nil), nsappname];
+	title = [NSString stringWithFormat:NSLocalizedString(@"\t\tQuit %@", nil), nsappname];
 	[apple_menu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"];
 
 	// Add items to the menu bar.
@@ -3266,9 +3475,16 @@ DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, WindowM
 		RendererCompositorRD::make_current();
 	}
 #endif
+
+	screen_set_keep_on(GLOBAL_GET("display/window/energy_saving/keep_screen_on"));
 }
 
 DisplayServerMacOS::~DisplayServerMacOS() {
+	if (screen_keep_on_assertion) {
+		IOPMAssertionRelease(screen_keep_on_assertion);
+		screen_keep_on_assertion = kIOPMNullAssertionID;
+	}
+
 	// Destroy all windows.
 	for (HashMap<WindowID, WindowData>::Iterator E = windows.begin(); E;) {
 		HashMap<WindowID, WindowData>::Iterator F = E;
diff --git a/platform/macos/export/export_plugin.cpp b/platform/macos/export/export_plugin.cpp
index bcc2636c07..edce9c0380 100644
--- a/platform/macos/export/export_plugin.cpp
+++ b/platform/macos/export/export_plugin.cpp
@@ -1550,7 +1550,7 @@ void EditorExportPlatformMacOS::_zip_folder_recursive(zipFile &p_zip, const Stri
 	da->list_dir_end();
 }
 
-bool EditorExportPlatformMacOS::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
+bool EditorExportPlatformMacOS::has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
 	String err;
 	bool valid = false;
 
@@ -1580,6 +1580,17 @@ bool EditorExportPlatformMacOS::can_export(const Ref<EditorExportPreset> &p_pres
 	valid = dvalid || rvalid;
 	r_missing_templates = !valid;
 
+	if (!err.is_empty()) {
+		r_error = err;
+	}
+
+	return valid;
+}
+
+bool EditorExportPlatformMacOS::has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const {
+	String err;
+	bool valid = true;
+
 	String identifier = p_preset->get("application/bundle_identifier");
 	String pn_err;
 	if (!is_package_name_valid(identifier, &pn_err)) {
diff --git a/platform/macos/export/export_plugin.h b/platform/macos/export/export_plugin.h
index 21bc380d55..4603c61a28 100644
--- a/platform/macos/export/export_plugin.h
+++ b/platform/macos/export/export_plugin.h
@@ -119,7 +119,8 @@ public:
 	}
 	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0) override;
 
-	virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
+	virtual bool has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
+	virtual bool has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const override;
 
 	virtual void get_platform_features(List<String> *r_features) const override {
 		r_features->push_back("pc");
diff --git a/platform/macos/godot_menu_item.h b/platform/macos/godot_menu_item.h
index 2c12897f10..e0b9f41632 100644
--- a/platform/macos/godot_menu_item.h
+++ b/platform/macos/godot_menu_item.h
@@ -46,7 +46,6 @@ enum GlobalMenuCheckType {
 @public
 	Callable callback;
 	Variant meta;
-	int id;
 	GlobalMenuCheckType checkable_type;
 	int max_states;
 	int state;
diff --git a/platform/uwp/export/export_plugin.cpp b/platform/uwp/export/export_plugin.cpp
index 070c46242f..4e4afb9704 100644
--- a/platform/uwp/export/export_plugin.cpp
+++ b/platform/uwp/export/export_plugin.cpp
@@ -121,7 +121,7 @@ void EditorExportPlatformUWP::get_export_options(List<ExportOption> *r_options)
 	}
 }
 
-bool EditorExportPlatformUWP::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
+bool EditorExportPlatformUWP::has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
 #ifndef DEV_ENABLED
 	// We don't provide export templates for the UWP platform currently as it
 	// has not been ported for Godot 4.0. This is skipped in DEV_ENABLED so that
@@ -163,7 +163,26 @@ bool EditorExportPlatformUWP::can_export(const Ref<EditorExportPreset> &p_preset
 	valid = dvalid || rvalid;
 	r_missing_templates = !valid;
 
-	// Validate the rest of the configuration.
+	if (!err.is_empty()) {
+		r_error = err;
+	}
+
+	return valid;
+}
+
+bool EditorExportPlatformUWP::has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const {
+#ifndef DEV_ENABLED
+	// We don't provide export templates for the UWP platform currently as it
+	// has not been ported for Godot 4.0. This is skipped in DEV_ENABLED so that
+	// contributors can still test the pipeline if/when we can build it again.
+	r_error = "The UWP platform is currently not supported in Godot 4.0.\n";
+	return false;
+#endif
+
+	String err;
+	bool valid = true;
+
+	// Validate the project configuration.
 
 	if (!_valid_resource_name(p_preset->get("package/short_name"))) {
 		valid = false;
diff --git a/platform/uwp/export/export_plugin.h b/platform/uwp/export/export_plugin.h
index 4a3c5db377..71d0479543 100644
--- a/platform/uwp/export/export_plugin.h
+++ b/platform/uwp/export/export_plugin.h
@@ -429,7 +429,8 @@ public:
 
 	virtual void get_export_options(List<ExportOption> *r_options) override;
 
-	virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
+	virtual bool has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
+	virtual bool has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const override;
 
 	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0) override;
 
diff --git a/platform/uwp/os_uwp.cpp b/platform/uwp/os_uwp.cpp
index f37759c66f..40f93bb18b 100644
--- a/platform/uwp/os_uwp.cpp
+++ b/platform/uwp/os_uwp.cpp
@@ -275,7 +275,7 @@ Error OS_UWP::initialize(const VideoMode &p_desired, int p_video_driver, int p_a
 		display_request->RequestActive();
 	}
 
-	set_keep_screen_on(GLOBAL_DEF("display/window/energy_saving/keep_screen_on", true));
+	set_keep_screen_on(GLOBAL_GET("display/window/energy_saving/keep_screen_on"));
 
 	return OK;
 }
@@ -716,7 +716,7 @@ bool OS_UWP::has_virtual_keyboard() const {
 	return UIViewSettings::GetForCurrentView()->UserInteractionMode == UserInteractionMode::Touch;
 }
 
-void OS_UWP::show_virtual_keyboard(const String &p_existing_text, const Rect2 &p_screen_rect, bool p_multiline, int p_max_input_length, int p_cursor_start, int p_cursor_end) {
+void OS_UWP::show_virtual_keyboard(const String &p_existing_text, const Rect2 &p_screen_rect, VirtualKeyboardType p_type, int p_max_input_length, int p_cursor_start, int p_cursor_end) {
 	InputPane ^ pane = InputPane::GetForCurrentView();
 	pane->TryShow();
 }
diff --git a/platform/uwp/os_uwp.h b/platform/uwp/os_uwp.h
index b9d035ff41..fe61f60548 100644
--- a/platform/uwp/os_uwp.h
+++ b/platform/uwp/os_uwp.h
@@ -231,7 +231,7 @@ public:
 	virtual bool has_touchscreen_ui_hint() const;
 
 	virtual bool has_virtual_keyboard() const;
-	virtual void show_virtual_keyboard(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2(), bool p_multiline = false, int p_max_input_length = -1, int p_cursor_start = -1, int p_cursor_end = -1);
+	virtual void show_virtual_keyboard(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2(), VirtualKeyboardType p_type = KEYBOARD_TYPE_DEFAULT, int p_max_input_length = -1, int p_cursor_start = -1, int p_cursor_end = -1);
 	virtual void hide_virtual_keyboard();
 
 	virtual Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false, String *r_resolved_path = nullptr);
diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp
index f6baab1644..8c8dbef8a4 100644
--- a/platform/windows/display_server_windows.cpp
+++ b/platform/windows/display_server_windows.cpp
@@ -531,10 +531,43 @@ DisplayServer::ScreenOrientation DisplayServerWindows::screen_get_orientation(in
 }
 
 void DisplayServerWindows::screen_set_keep_on(bool p_enable) {
+	if (keep_screen_on == p_enable) {
+		return;
+	}
+
+	if (p_enable) {
+		const String reason = "Godot Engine running with display/window/energy_saving/keep_screen_on = true";
+		Char16String reason_utf16 = reason.utf16();
+
+		REASON_CONTEXT context;
+		context.Version = POWER_REQUEST_CONTEXT_VERSION;
+		context.Flags = POWER_REQUEST_CONTEXT_SIMPLE_STRING;
+		context.Reason.SimpleReasonString = (LPWSTR)(reason_utf16.ptrw());
+		power_request = PowerCreateRequest(&context);
+		if (power_request == INVALID_HANDLE_VALUE) {
+			print_error("Failed to enable screen_keep_on.");
+			return;
+		}
+		if (PowerSetRequest(power_request, POWER_REQUEST_TYPE::PowerRequestSystemRequired) == 0) {
+			print_error("Failed to request system sleep override.");
+			return;
+		}
+		if (PowerSetRequest(power_request, POWER_REQUEST_TYPE::PowerRequestDisplayRequired) == 0) {
+			print_error("Failed to request display timeout override.");
+			return;
+		}
+	} else {
+		PowerClearRequest(power_request, POWER_REQUEST_TYPE::PowerRequestSystemRequired);
+		PowerClearRequest(power_request, POWER_REQUEST_TYPE::PowerRequestDisplayRequired);
+		CloseHandle(power_request);
+		power_request = nullptr;
+	}
+
+	keep_screen_on = p_enable;
 }
 
 bool DisplayServerWindows::screen_is_kept_on() const {
-	return false;
+	return keep_screen_on;
 }
 
 Vector<DisplayServer::WindowID> DisplayServerWindows::get_window_list() const {
@@ -3619,6 +3652,9 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win
 	// Init TTS
 	tts = memnew(TTS_Windows);
 
+	// Enforce default keep screen on value.
+	screen_set_keep_on(GLOBAL_GET("display/window/energy_saving/keep_screen_on"));
+
 	// Note: Wacom WinTab driver API for pen input, for devices incompatible with Windows Ink.
 	HMODULE wintab_lib = LoadLibraryW(L"wintab32.dll");
 	if (wintab_lib) {
@@ -3822,6 +3858,9 @@ DisplayServerWindows::~DisplayServerWindows() {
 		SetWindowLongPtr(windows[MAIN_WINDOW_ID].hWnd, GWLP_WNDPROC, (LONG_PTR)user_proc);
 	}
 
+	// Close power request handle.
+	screen_set_keep_on(false);
+
 #ifdef GLES3_ENABLED
 	// destroy windows .. NYI?
 	// FIXME wglDeleteContext is never called
diff --git a/platform/windows/display_server_windows.h b/platform/windows/display_server_windows.h
index ddbf674c64..db9b589304 100644
--- a/platform/windows/display_server_windows.h
+++ b/platform/windows/display_server_windows.h
@@ -331,6 +331,8 @@ class DisplayServerWindows : public DisplayServer {
 	HINSTANCE hInstance; // Holds The Instance Of The Application
 	String rendering_driver;
 	bool app_focused = false;
+	bool keep_screen_on = false;
+	HANDLE power_request;
 
 	TTS_Windows *tts = nullptr;
 
diff --git a/platform/windows/export/export_plugin.cpp b/platform/windows/export/export_plugin.cpp
index febef5ad12..9d3ec31f73 100644
--- a/platform/windows/export/export_plugin.cpp
+++ b/platform/windows/export/export_plugin.cpp
@@ -412,15 +412,26 @@ Error EditorExportPlatformWindows::_code_sign(const Ref<EditorExportPreset> &p_p
 	return OK;
 }
 
-bool EditorExportPlatformWindows::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
+bool EditorExportPlatformWindows::has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
 	String err = "";
-	bool valid = EditorExportPlatformPC::can_export(p_preset, err, r_missing_templates);
+	bool valid = EditorExportPlatformPC::has_valid_export_configuration(p_preset, err, r_missing_templates);
 
 	String rcedit_path = EditorSettings::get_singleton()->get("export/windows/rcedit");
 	if (p_preset->get("application/modify_resources") && rcedit_path.is_empty()) {
 		err += TTR("The rcedit tool must be configured in the Editor Settings (Export > Windows > Rcedit) to change the icon or app information data.") + "\n";
 	}
 
+	if (!err.is_empty()) {
+		r_error = err;
+	}
+
+	return valid;
+}
+
+bool EditorExportPlatformWindows::has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const {
+	String err = "";
+	bool valid = true;
+
 	String icon_path = ProjectSettings::get_singleton()->globalize_path(p_preset->get("application/icon"));
 	if (!icon_path.is_empty() && !FileAccess::exists(icon_path)) {
 		err += TTR("Invalid icon path:") + " " + icon_path + "\n";
diff --git a/platform/windows/export/export_plugin.h b/platform/windows/export/export_plugin.h
index b9e59829a0..3ea8ff3dc9 100644
--- a/platform/windows/export/export_plugin.h
+++ b/platform/windows/export/export_plugin.h
@@ -49,7 +49,8 @@ public:
 	virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const override;
 	virtual void get_export_options(List<ExportOption> *r_options) override;
 	virtual bool get_export_option_visibility(const String &p_option, const HashMap<StringName, Variant> &p_options) const override;
-	virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
+	virtual bool has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
+	virtual bool has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const override;
 	virtual String get_template_file_name(const String &p_target, const String &p_arch) const override;
 	virtual Error fixup_embedded_pck(const String &p_path, int64_t p_embedded_start, int64_t p_embedded_size) override;
 };
diff --git a/scene/2d/line_2d.cpp b/scene/2d/line_2d.cpp
index 06e5cbc97e..837f3061f1 100644
--- a/scene/2d/line_2d.cpp
+++ b/scene/2d/line_2d.cpp
@@ -346,13 +346,13 @@ void Line2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_points", "points"), &Line2D::set_points);
 	ClassDB::bind_method(D_METHOD("get_points"), &Line2D::get_points);
 
-	ClassDB::bind_method(D_METHOD("set_point_position", "i", "position"), &Line2D::set_point_position);
-	ClassDB::bind_method(D_METHOD("get_point_position", "i"), &Line2D::get_point_position);
+	ClassDB::bind_method(D_METHOD("set_point_position", "index", "position"), &Line2D::set_point_position);
+	ClassDB::bind_method(D_METHOD("get_point_position", "index"), &Line2D::get_point_position);
 
 	ClassDB::bind_method(D_METHOD("get_point_count"), &Line2D::get_point_count);
 
-	ClassDB::bind_method(D_METHOD("add_point", "position", "at_position"), &Line2D::add_point, DEFVAL(-1));
-	ClassDB::bind_method(D_METHOD("remove_point", "i"), &Line2D::remove_point);
+	ClassDB::bind_method(D_METHOD("add_point", "position", "index"), &Line2D::add_point, DEFVAL(-1));
+	ClassDB::bind_method(D_METHOD("remove_point", "index"), &Line2D::remove_point);
 
 	ClassDB::bind_method(D_METHOD("clear_points"), &Line2D::clear_points);
 
diff --git a/scene/2d/navigation_region_2d.cpp b/scene/2d/navigation_region_2d.cpp
index 6f189a57e8..00aa4b0b59 100644
--- a/scene/2d/navigation_region_2d.cpp
+++ b/scene/2d/navigation_region_2d.cpp
@@ -422,7 +422,7 @@ real_t NavigationRegion2D::get_enter_cost() const {
 void NavigationRegion2D::set_travel_cost(real_t p_travel_cost) {
 	ERR_FAIL_COND_MSG(p_travel_cost < 0.0, "The travel_cost must be positive.");
 	travel_cost = MAX(p_travel_cost, 0.0);
-	NavigationServer2D::get_singleton()->region_set_enter_cost(region, travel_cost);
+	NavigationServer2D::get_singleton()->region_set_travel_cost(region, travel_cost);
 }
 
 real_t NavigationRegion2D::get_travel_cost() const {
@@ -494,7 +494,7 @@ void NavigationRegion2D::_notification(int p_what) {
 
 					// Generate the polygon color, slightly randomly modified from the settings one.
 					Color random_variation_color;
-					random_variation_color.set_hsv(color.get_h() + rand.random(-1.0, 1.0) * 0.05, color.get_s(), color.get_v() + rand.random(-1.0, 1.0) * 0.1);
+					random_variation_color.set_hsv(color.get_h() + rand.random(-1.0, 1.0) * 0.1, color.get_s(), color.get_v() + rand.random(-1.0, 1.0) * 0.2);
 					random_variation_color.a = color.a;
 					Vector<Color> colors;
 					colors.push_back(random_variation_color);
diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp
index ce22f32b01..2ead48c889 100644
--- a/scene/2d/physics_body_2d.cpp
+++ b/scene/2d/physics_body_2d.cpp
@@ -1823,6 +1823,10 @@ real_t KinematicCollision2D::get_angle(const Vector2 &p_up_direction) const {
 	return result.get_angle(p_up_direction);
 }
 
+real_t KinematicCollision2D::get_depth() const {
+	return result.collision_depth;
+}
+
 Object *KinematicCollision2D::get_local_shape() const {
 	if (!owner) {
 		return nullptr;
@@ -1874,6 +1878,7 @@ void KinematicCollision2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_travel"), &KinematicCollision2D::get_travel);
 	ClassDB::bind_method(D_METHOD("get_remainder"), &KinematicCollision2D::get_remainder);
 	ClassDB::bind_method(D_METHOD("get_angle", "up_direction"), &KinematicCollision2D::get_angle, DEFVAL(Vector2(0.0, -1.0)));
+	ClassDB::bind_method(D_METHOD("get_depth"), &KinematicCollision2D::get_depth);
 	ClassDB::bind_method(D_METHOD("get_local_shape"), &KinematicCollision2D::get_local_shape);
 	ClassDB::bind_method(D_METHOD("get_collider"), &KinematicCollision2D::get_collider);
 	ClassDB::bind_method(D_METHOD("get_collider_id"), &KinematicCollision2D::get_collider_id);
diff --git a/scene/2d/physics_body_2d.h b/scene/2d/physics_body_2d.h
index 7401fc7578..c762a832c4 100644
--- a/scene/2d/physics_body_2d.h
+++ b/scene/2d/physics_body_2d.h
@@ -473,6 +473,7 @@ public:
 	Vector2 get_travel() const;
 	Vector2 get_remainder() const;
 	real_t get_angle(const Vector2 &p_up_direction = Vector2(0.0, -1.0)) const;
+	real_t get_depth() const;
 	Object *get_local_shape() const;
 	Object *get_collider() const;
 	ObjectID get_collider_id() const;
diff --git a/scene/2d/shape_cast_2d.cpp b/scene/2d/shape_cast_2d.cpp
index 7589af0924..316988d298 100644
--- a/scene/2d/shape_cast_2d.cpp
+++ b/scene/2d/shape_cast_2d.cpp
@@ -217,7 +217,7 @@ void ShapeCast2D::_notification(int p_what) {
 			if (shape.is_null()) {
 				break;
 			}
-			Color draw_col = get_tree()->get_debug_collisions_color();
+			Color draw_col = collided ? Color(1.0, 0.01, 0) : get_tree()->get_debug_collisions_color();
 			if (!enabled) {
 				float g = draw_col.get_v();
 				draw_col.r = g;
@@ -235,18 +235,25 @@ void ShapeCast2D::_notification(int p_what) {
 
 			// Draw an arrow indicating where the ShapeCast is pointing to.
 			if (target_position != Vector2()) {
-				Transform2D xf;
-				xf.rotate(target_position.angle());
-				xf.translate_local(Vector2(target_position.length(), 0));
+				const real_t max_arrow_size = 6;
+				const real_t line_width = 1.4;
+				bool no_line = target_position.length() < line_width;
+				real_t arrow_size = CLAMP(target_position.length() * 2 / 3, line_width, max_arrow_size);
 
-				draw_line(Vector2(), target_position, draw_col, 2);
+				if (no_line) {
+					arrow_size = target_position.length();
+				} else {
+					draw_line(Vector2(), target_position - target_position.normalized() * arrow_size, draw_col, line_width);
+				}
 
-				float tsize = 8;
+				Transform2D xf;
+				xf.rotate(target_position.angle());
+				xf.translate_local(Vector2(no_line ? 0 : target_position.length() - arrow_size, 0));
 
 				Vector<Vector2> pts = {
-					xf.xform(Vector2(tsize, 0)),
-					xf.xform(Vector2(0, Math_SQRT12 * tsize)),
-					xf.xform(Vector2(0, -Math_SQRT12 * tsize))
+					xf.xform(Vector2(arrow_size, 0)),
+					xf.xform(Vector2(0, 0.5 * arrow_size)),
+					xf.xform(Vector2(0, -0.5 * arrow_size))
 				};
 
 				Vector<Color> cols = { draw_col, draw_col, draw_col };
@@ -291,6 +298,8 @@ void ShapeCast2D::_update_shapecast_state() {
 	collision_safe_fraction = 0.0;
 	collision_unsafe_fraction = 0.0;
 
+	bool prev_collision_state = collided;
+
 	if (target_position != Vector2()) {
 		dss->cast_motion(params, collision_safe_fraction, collision_unsafe_fraction);
 		if (collision_unsafe_fraction < 1.0) {
@@ -314,6 +323,10 @@ void ShapeCast2D::_update_shapecast_state() {
 		}
 	}
 	collided = !result.is_empty();
+
+	if (prev_collision_state != collided) {
+		update();
+	}
 }
 
 void ShapeCast2D::force_shapecast_update() {
diff --git a/scene/3d/camera_3d.cpp b/scene/3d/camera_3d.cpp
index da4a14394d..f654373ee5 100644
--- a/scene/3d/camera_3d.cpp
+++ b/scene/3d/camera_3d.cpp
@@ -507,7 +507,7 @@ void Camera3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "projection", PROPERTY_HINT_ENUM, "Perspective,Orthogonal,Frustum"), "set_projection", "get_projection");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "current"), "set_current", "is_current");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fov", PROPERTY_HINT_RANGE, "1,179,0.1,degrees"), "set_fov", "get_fov");
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "size", PROPERTY_HINT_RANGE, "0.001,16384,0.01,suffix:m"), "set_size", "get_size");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "size", PROPERTY_HINT_RANGE, "0.001,16384,0.001,suffix:m"), "set_size", "get_size");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "frustum_offset", PROPERTY_HINT_NONE, "suffix:m"), "set_frustum_offset", "get_frustum_offset");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "near", PROPERTY_HINT_RANGE, "0.001,10,0.001,or_greater,exp,suffix:m"), "set_near", "get_near");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "far", PROPERTY_HINT_RANGE, "0.01,4000,0.01,or_greater,exp,suffix:m"), "set_far", "get_far");
diff --git a/scene/3d/gpu_particles_collision_3d.cpp b/scene/3d/gpu_particles_collision_3d.cpp
index 1fcd5160f6..1cfd889272 100644
--- a/scene/3d/gpu_particles_collision_3d.cpp
+++ b/scene/3d/gpu_particles_collision_3d.cpp
@@ -127,6 +127,10 @@ GPUParticlesCollisionBox3D::~GPUParticlesCollisionBox3D() {
 void GPUParticlesCollisionSDF3D::_find_meshes(const AABB &p_aabb, Node *p_at_node, List<PlotMesh> &plot_meshes) {
 	MeshInstance3D *mi = Object::cast_to<MeshInstance3D>(p_at_node);
 	if (mi && mi->is_visible_in_tree()) {
+		if ((mi->get_layer_mask() & bake_mask) == 0) {
+			return;
+		}
+
 		Ref<Mesh> mesh = mi->get_mesh();
 		if (mesh.is_valid()) {
 			AABB aabb = mesh->get_aabb();
@@ -445,7 +449,7 @@ Ref<Image> GPUParticlesCollisionSDF3D::bake() {
 
 	//compute bvh
 
-	ERR_FAIL_COND_V(faces.size() <= 1, Ref<Image>());
+	ERR_FAIL_COND_V_MSG(faces.size() <= 1, Ref<Image>(), "No faces detected during GPUParticlesCollisionSDF3D bake. Check whether there are visible meshes matching the bake mask within its extents.");
 
 	LocalVector<FacePos> face_pos;
 
@@ -499,6 +503,16 @@ Ref<Image> GPUParticlesCollisionSDF3D::bake() {
 	return ret;
 }
 
+TypedArray<String> GPUParticlesCollisionSDF3D::get_configuration_warnings() const {
+	TypedArray<String> warnings = Node::get_configuration_warnings();
+
+	if (bake_mask == 0) {
+		warnings.push_back(RTR("The Bake Mask has no bits enabled, which means baking will not produce any collision for this GPUParticlesCollisionSDF3D.\nTo resolve this, enable at least one bit in the Bake Mask property."));
+	}
+
+	return warnings;
+}
+
 void GPUParticlesCollisionSDF3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_extents", "extents"), &GPUParticlesCollisionSDF3D::set_extents);
 	ClassDB::bind_method(D_METHOD("get_extents"), &GPUParticlesCollisionSDF3D::get_extents);
@@ -512,9 +526,15 @@ void GPUParticlesCollisionSDF3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_thickness", "thickness"), &GPUParticlesCollisionSDF3D::set_thickness);
 	ClassDB::bind_method(D_METHOD("get_thickness"), &GPUParticlesCollisionSDF3D::get_thickness);
 
+	ClassDB::bind_method(D_METHOD("set_bake_mask", "mask"), &GPUParticlesCollisionSDF3D::set_bake_mask);
+	ClassDB::bind_method(D_METHOD("get_bake_mask"), &GPUParticlesCollisionSDF3D::get_bake_mask);
+	ClassDB::bind_method(D_METHOD("set_bake_mask_value", "layer_number", "value"), &GPUParticlesCollisionSDF3D::set_bake_mask_value);
+	ClassDB::bind_method(D_METHOD("get_bake_mask_value", "layer_number"), &GPUParticlesCollisionSDF3D::get_bake_mask_value);
+
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "extents", PROPERTY_HINT_RANGE, "0.01,1024,0.01,or_greater,suffix:m"), "set_extents", "get_extents");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "resolution", PROPERTY_HINT_ENUM, "16,32,64,128,256,512,suffix:px"), "set_resolution", "get_resolution");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "thickness", PROPERTY_HINT_RANGE, "0.0,2.0,0.01,suffix:m"), "set_thickness", "get_thickness");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "bake_mask", PROPERTY_HINT_LAYERS_3D_RENDER), "set_bake_mask", "get_bake_mask");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture3D"), "set_texture", "get_texture");
 
 	BIND_ENUM_CONSTANT(RESOLUTION_16);
@@ -553,6 +573,31 @@ GPUParticlesCollisionSDF3D::Resolution GPUParticlesCollisionSDF3D::get_resolutio
 	return resolution;
 }
 
+void GPUParticlesCollisionSDF3D::set_bake_mask(uint32_t p_mask) {
+	bake_mask = p_mask;
+	update_configuration_warnings();
+}
+
+uint32_t GPUParticlesCollisionSDF3D::get_bake_mask() const {
+	return bake_mask;
+}
+
+void GPUParticlesCollisionSDF3D::set_bake_mask_value(int p_layer_number, bool p_value) {
+	ERR_FAIL_COND_MSG(p_layer_number < 1 || p_layer_number > 20, vformat("The render layer number (%d) must be between 1 and 20 (inclusive).", p_layer_number));
+	uint32_t mask = get_bake_mask();
+	if (p_value) {
+		mask |= 1 << (p_layer_number - 1);
+	} else {
+		mask &= ~(1 << (p_layer_number - 1));
+	}
+	set_bake_mask(mask);
+}
+
+bool GPUParticlesCollisionSDF3D::get_bake_mask_value(int p_layer_number) const {
+	ERR_FAIL_COND_V_MSG(p_layer_number < 1 || p_layer_number > 20, false, vformat("The render layer number (%d) must be between 1 and 20 (inclusive).", p_layer_number));
+	return bake_mask & (1 << (p_layer_number - 1));
+}
+
 void GPUParticlesCollisionSDF3D::set_texture(const Ref<Texture3D> &p_texture) {
 	texture = p_texture;
 	RID tex = texture.is_valid() ? texture->get_rid() : RID();
diff --git a/scene/3d/gpu_particles_collision_3d.h b/scene/3d/gpu_particles_collision_3d.h
index 4b2cb930fa..712bd015ff 100644
--- a/scene/3d/gpu_particles_collision_3d.h
+++ b/scene/3d/gpu_particles_collision_3d.h
@@ -110,6 +110,7 @@ public:
 private:
 	Vector3 extents = Vector3(1, 1, 1);
 	Resolution resolution = RESOLUTION_64;
+	uint32_t bake_mask = 0xFFFFFFFF;
 	Ref<Texture3D> texture;
 	float thickness = 1.0;
 
@@ -161,6 +162,8 @@ protected:
 	static void _bind_methods();
 
 public:
+	virtual TypedArray<String> get_configuration_warnings() const override;
+
 	void set_thickness(float p_thickness);
 	float get_thickness() const;
 
@@ -170,6 +173,12 @@ public:
 	void set_resolution(Resolution p_resolution);
 	Resolution get_resolution() const;
 
+	void set_bake_mask(uint32_t p_mask);
+	uint32_t get_bake_mask() const;
+
+	void set_bake_mask_value(int p_layer_number, bool p_enable);
+	bool get_bake_mask_value(int p_layer_number) const;
+
 	void set_texture(const Ref<Texture3D> &p_texture);
 	Ref<Texture3D> get_texture() const;
 
diff --git a/scene/3d/label_3d.cpp b/scene/3d/label_3d.cpp
index 712a37e745..ed2bce253a 100644
--- a/scene/3d/label_3d.cpp
+++ b/scene/3d/label_3d.cpp
@@ -163,7 +163,17 @@ void Label3D::_bind_methods() {
 }
 
 void Label3D::_validate_property(PropertyInfo &property) const {
-	if (property.name == "material_override" || property.name == "material_overlay") {
+	if (
+			property.name == "material_override" ||
+			property.name == "material_overlay" ||
+			property.name == "lod_bias" ||
+			property.name == "gi_mode" ||
+			property.name == "gi_lightmap_scale") {
+		property.usage = PROPERTY_USAGE_NO_EDITOR;
+	}
+
+	if (property.name == "cast_shadow" && alpha_cut == ALPHA_CUT_DISABLED) {
+		// Alpha-blended materials can't cast shadows.
 		property.usage = PROPERTY_USAGE_NO_EDITOR;
 	}
 }
@@ -889,6 +899,7 @@ void Label3D::set_alpha_cut_mode(AlphaCutMode p_mode) {
 	if (alpha_cut != p_mode) {
 		alpha_cut = p_mode;
 		_queue_update();
+		notify_property_list_changed();
 	}
 }
 
@@ -927,7 +938,12 @@ Label3D::Label3D() {
 
 	mesh = RenderingServer::get_singleton()->mesh_create();
 
+	// Disable shadow casting by default to improve performance and avoid unintended visual artifacts.
 	set_cast_shadows_setting(SHADOW_CASTING_SETTING_OFF);
+
+	// Label3D can't contribute to GI in any way, so disable it to improve performance.
+	set_gi_mode(GI_MODE_DISABLED);
+
 	set_base(mesh);
 }
 
diff --git a/scene/3d/label_3d.h b/scene/3d/label_3d.h
index 4498e89517..d4bfe743a6 100644
--- a/scene/3d/label_3d.h
+++ b/scene/3d/label_3d.h
@@ -55,7 +55,7 @@ public:
 	};
 
 private:
-	real_t pixel_size = 0.01;
+	real_t pixel_size = 0.005;
 	bool flags[FLAG_MAX] = {};
 	AlphaCutMode alpha_cut = ALPHA_CUT_DISABLED;
 	float alpha_scissor_threshold = 0.5;
@@ -109,7 +109,7 @@ private:
 	TextServer::AutowrapMode autowrap_mode = TextServer::AUTOWRAP_OFF;
 	float width = 500.0;
 
-	int font_size = 16;
+	int font_size = 32;
 	Ref<Font> font_override;
 	mutable Ref<Font> theme_font;
 	Color modulate = Color(1, 1, 1, 1);
@@ -117,7 +117,7 @@ private:
 	int outline_render_priority = -1;
 	int render_priority = 0;
 
-	int outline_size = 0;
+	int outline_size = 12;
 	Color outline_modulate = Color(0, 0, 0, 1);
 
 	float line_spacing = 0.f;
diff --git a/scene/3d/light_3d.cpp b/scene/3d/light_3d.cpp
index 678c217676..53c072c318 100644
--- a/scene/3d/light_3d.cpp
+++ b/scene/3d/light_3d.cpp
@@ -224,7 +224,7 @@ bool Light3D::is_editor_only() const {
 }
 
 void Light3D::_validate_property(PropertyInfo &property) const {
-	if (!shadow && (property.name == "shadow_bias" || property.name == "shadow_normal_bias" || property.name == "shadow_reverse_cull_face" || property.name == "shadow_transmittance_bias" || property.name == "shadow_fog_fade" || property.name == "shadow_blur" || property.name == "distance_fade_shadow")) {
+	if (!shadow && (property.name == "shadow_bias" || property.name == "shadow_normal_bias" || property.name == "shadow_reverse_cull_face" || property.name == "shadow_transmittance_bias" || property.name == "shadow_fog_fade" || property.name == "shadow_opacity" || property.name == "shadow_blur" || property.name == "distance_fade_shadow")) {
 		property.usage = PROPERTY_USAGE_NO_EDITOR;
 	}
 
@@ -299,6 +299,7 @@ void Light3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "shadow_reverse_cull_face"), "set_shadow_reverse_cull_face", "get_shadow_reverse_cull_face");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "shadow_transmittance_bias", PROPERTY_HINT_RANGE, "-16,16,0.001"), "set_param", "get_param", PARAM_TRANSMITTANCE_BIAS);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "shadow_fog_fade", PROPERTY_HINT_RANGE, "0.001,10,0.001"), "set_param", "get_param", PARAM_SHADOW_VOLUMETRIC_FOG_FADE);
+	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "shadow_opacity", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_param", "get_param", PARAM_SHADOW_OPACITY);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "shadow_blur", PROPERTY_HINT_RANGE, "0,10,0.001"), "set_param", "get_param", PARAM_SHADOW_BLUR);
 
 	ADD_GROUP("Distance Fade", "distance_fade_");
@@ -328,6 +329,7 @@ void Light3D::_bind_methods() {
 	BIND_ENUM_CONSTANT(PARAM_SHADOW_NORMAL_BIAS);
 	BIND_ENUM_CONSTANT(PARAM_SHADOW_BIAS);
 	BIND_ENUM_CONSTANT(PARAM_SHADOW_PANCAKE_SIZE);
+	BIND_ENUM_CONSTANT(PARAM_SHADOW_OPACITY);
 	BIND_ENUM_CONSTANT(PARAM_SHADOW_BLUR);
 	BIND_ENUM_CONSTANT(PARAM_SHADOW_VOLUMETRIC_FOG_FADE);
 	BIND_ENUM_CONSTANT(PARAM_TRANSMITTANCE_BIAS);
@@ -375,6 +377,7 @@ Light3D::Light3D(RenderingServer::LightType p_type) {
 	set_param(PARAM_SHADOW_SPLIT_3_OFFSET, 0.5);
 	set_param(PARAM_SHADOW_FADE_START, 0.8);
 	set_param(PARAM_SHADOW_PANCAKE_SIZE, 20.0);
+	set_param(PARAM_SHADOW_OPACITY, 1.0);
 	set_param(PARAM_SHADOW_BLUR, 1.0);
 	set_param(PARAM_SHADOW_BIAS, 0.03);
 	set_param(PARAM_SHADOW_NORMAL_BIAS, 1.0);
diff --git a/scene/3d/light_3d.h b/scene/3d/light_3d.h
index 6ff332df5a..ef003e133d 100644
--- a/scene/3d/light_3d.h
+++ b/scene/3d/light_3d.h
@@ -54,6 +54,7 @@ public:
 		PARAM_SHADOW_NORMAL_BIAS = RS::LIGHT_PARAM_SHADOW_NORMAL_BIAS,
 		PARAM_SHADOW_BIAS = RS::LIGHT_PARAM_SHADOW_BIAS,
 		PARAM_SHADOW_PANCAKE_SIZE = RS::LIGHT_PARAM_SHADOW_PANCAKE_SIZE,
+		PARAM_SHADOW_OPACITY = RS::LIGHT_PARAM_SHADOW_OPACITY,
 		PARAM_SHADOW_BLUR = RS::LIGHT_PARAM_SHADOW_BLUR,
 		PARAM_SHADOW_VOLUMETRIC_FOG_FADE = RS::LIGHT_PARAM_SHADOW_VOLUMETRIC_FOG_FADE,
 		PARAM_TRANSMITTANCE_BIAS = RS::LIGHT_PARAM_TRANSMITTANCE_BIAS,
diff --git a/scene/3d/navigation_region_3d.cpp b/scene/3d/navigation_region_3d.cpp
index 0abb0e8dea..29ad1ba93d 100644
--- a/scene/3d/navigation_region_3d.cpp
+++ b/scene/3d/navigation_region_3d.cpp
@@ -119,7 +119,7 @@ real_t NavigationRegion3D::get_enter_cost() const {
 void NavigationRegion3D::set_travel_cost(real_t p_travel_cost) {
 	ERR_FAIL_COND_MSG(p_travel_cost < 0.0, "The travel_cost must be positive.");
 	travel_cost = MAX(p_travel_cost, 0.0);
-	NavigationServer3D::get_singleton()->region_set_enter_cost(region, travel_cost);
+	NavigationServer3D::get_singleton()->region_set_travel_cost(region, travel_cost);
 }
 
 real_t NavigationRegion3D::get_travel_cost() const {
@@ -363,6 +363,12 @@ NavigationRegion3D::~NavigationRegion3D() {
 
 #ifdef DEBUG_ENABLED
 void NavigationRegion3D::_update_debug_mesh() {
+	if (Engine::get_singleton()->is_editor_hint()) {
+		// don't update inside Editor as node 3d gizmo takes care of this
+		// as collisions and selections for Editor Viewport need to be updated
+		return;
+	}
+
 	if (!NavigationServer3D::get_singleton()->get_debug_enabled()) {
 		if (debug_instance.is_valid()) {
 			RS::get_singleton()->instance_set_visible(debug_instance, false);
@@ -418,11 +424,14 @@ void NavigationRegion3D::_update_debug_mesh() {
 	Ref<StandardMaterial3D> face_material = NavigationServer3D::get_singleton_mut()->get_debug_navigation_geometry_face_material();
 	Ref<StandardMaterial3D> line_material = NavigationServer3D::get_singleton_mut()->get_debug_navigation_geometry_edge_material();
 
+	RandomPCG rand;
 	Color polygon_color = debug_navigation_geometry_face_color;
 
 	for (int i = 0; i < polygon_count; i++) {
 		if (enabled_geometry_face_random_color) {
-			polygon_color = debug_navigation_geometry_face_color * (Color(Math::randf(), Math::randf(), Math::randf()));
+			// Generate the polygon color, slightly randomly modified from the settings one.
+			polygon_color.set_hsv(debug_navigation_geometry_face_color.get_h() + rand.random(-1.0, 1.0) * 0.1, debug_navigation_geometry_face_color.get_s(), debug_navigation_geometry_face_color.get_v() + rand.random(-1.0, 1.0) * 0.2);
+			polygon_color.a = debug_navigation_geometry_face_color.a;
 		}
 
 		Vector<int> polygon = navmesh->get_polygon(i);
diff --git a/scene/3d/node_3d.cpp b/scene/3d/node_3d.cpp
index 1de85d57a3..4ae834cf7a 100644
--- a/scene/3d/node_3d.cpp
+++ b/scene/3d/node_3d.cpp
@@ -897,7 +897,7 @@ void Node3D::_validate_property(PropertyInfo &property) const {
 	}
 }
 
-bool Node3D::property_can_revert(const String &p_name) {
+bool Node3D::_property_can_revert(const StringName &p_name) const {
 	if (p_name == "basis") {
 		return true;
 	} else if (p_name == "scale") {
@@ -912,47 +912,48 @@ bool Node3D::property_can_revert(const String &p_name) {
 	return false;
 }
 
-Variant Node3D::property_get_revert(const String &p_name) {
-	Variant r_ret;
+bool Node3D::_property_get_revert(const StringName &p_name, Variant &r_property) const {
 	bool valid = false;
 
 	if (p_name == "basis") {
 		Variant variant = PropertyUtils::get_property_default_value(this, "transform", &valid);
 		if (valid && variant.get_type() == Variant::Type::TRANSFORM3D) {
-			r_ret = Transform3D(variant).get_basis();
+			r_property = Transform3D(variant).get_basis();
 		} else {
-			r_ret = Basis();
+			r_property = Basis();
 		}
 	} else if (p_name == "scale") {
 		Variant variant = PropertyUtils::get_property_default_value(this, "transform", &valid);
 		if (valid && variant.get_type() == Variant::Type::TRANSFORM3D) {
-			r_ret = Transform3D(variant).get_basis().get_scale();
+			r_property = Transform3D(variant).get_basis().get_scale();
 		} else {
-			return Vector3(1.0, 1.0, 1.0);
+			r_property = Vector3(1.0, 1.0, 1.0);
 		}
 	} else if (p_name == "quaternion") {
 		Variant variant = PropertyUtils::get_property_default_value(this, "transform", &valid);
 		if (valid && variant.get_type() == Variant::Type::TRANSFORM3D) {
-			r_ret = Quaternion(Transform3D(variant).get_basis().get_rotation_quaternion());
+			r_property = Quaternion(Transform3D(variant).get_basis().get_rotation_quaternion());
 		} else {
-			return Quaternion();
+			r_property = Quaternion();
 		}
 	} else if (p_name == "rotation") {
 		Variant variant = PropertyUtils::get_property_default_value(this, "transform", &valid);
 		if (valid && variant.get_type() == Variant::Type::TRANSFORM3D) {
-			r_ret = Transform3D(variant).get_basis().get_euler_normalized(data.euler_rotation_order);
+			r_property = Transform3D(variant).get_basis().get_euler_normalized(data.euler_rotation_order);
 		} else {
-			return Vector3();
+			r_property = Vector3();
 		}
 	} else if (p_name == "position") {
 		Variant variant = PropertyUtils::get_property_default_value(this, "transform", &valid);
 		if (valid) {
-			r_ret = Transform3D(variant).get_origin();
+			r_property = Transform3D(variant).get_origin();
 		} else {
-			return Vector3();
+			r_property = Vector3();
 		}
+	} else {
+		return false;
 	}
-	return r_ret;
+	return true;
 }
 
 void Node3D::_bind_methods() {
@@ -1032,9 +1033,6 @@ void Node3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("to_local", "global_point"), &Node3D::to_local);
 	ClassDB::bind_method(D_METHOD("to_global", "local_point"), &Node3D::to_global);
 
-	ClassDB::bind_method(D_METHOD("property_can_revert", "name"), &Node3D::property_can_revert);
-	ClassDB::bind_method(D_METHOD("property_get_revert", "name"), &Node3D::property_get_revert);
-
 	BIND_CONSTANT(NOTIFICATION_TRANSFORM_CHANGED);
 	BIND_CONSTANT(NOTIFICATION_ENTER_WORLD);
 	BIND_CONSTANT(NOTIFICATION_EXIT_WORLD);
diff --git a/scene/3d/node_3d.h b/scene/3d/node_3d.h
index b1e129798d..3d1c59445b 100644
--- a/scene/3d/node_3d.h
+++ b/scene/3d/node_3d.h
@@ -157,8 +157,8 @@ protected:
 
 	virtual void _validate_property(PropertyInfo &property) const override;
 
-	bool property_can_revert(const String &p_name);
-	Variant property_get_revert(const String &p_name);
+	bool _property_can_revert(const StringName &p_name) const;
+	bool _property_get_revert(const StringName &p_name, Variant &r_property) const;
 
 public:
 	enum {
diff --git a/scene/3d/physics_body_3d.cpp b/scene/3d/physics_body_3d.cpp
index 993608c306..cbdef02826 100644
--- a/scene/3d/physics_body_3d.cpp
+++ b/scene/3d/physics_body_3d.cpp
@@ -2057,6 +2057,10 @@ int KinematicCollision3D::get_collision_count() const {
 	return result.collision_count;
 }
 
+real_t KinematicCollision3D::get_depth() const {
+	return result.collision_depth;
+}
+
 Vector3 KinematicCollision3D::get_position(int p_collision_index) const {
 	ERR_FAIL_INDEX_V(p_collision_index, result.collision_count, Vector3());
 	return result.collisions[p_collision_index].position;
@@ -2127,6 +2131,7 @@ Vector3 KinematicCollision3D::get_collider_velocity(int p_collision_index) const
 void KinematicCollision3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_travel"), &KinematicCollision3D::get_travel);
 	ClassDB::bind_method(D_METHOD("get_remainder"), &KinematicCollision3D::get_remainder);
+	ClassDB::bind_method(D_METHOD("get_depth"), &KinematicCollision3D::get_depth);
 	ClassDB::bind_method(D_METHOD("get_collision_count"), &KinematicCollision3D::get_collision_count);
 	ClassDB::bind_method(D_METHOD("get_position", "collision_index"), &KinematicCollision3D::get_position, DEFVAL(0));
 	ClassDB::bind_method(D_METHOD("get_normal", "collision_index"), &KinematicCollision3D::get_normal, DEFVAL(0));
diff --git a/scene/3d/physics_body_3d.h b/scene/3d/physics_body_3d.h
index e4a41be6c0..b9baba4d96 100644
--- a/scene/3d/physics_body_3d.h
+++ b/scene/3d/physics_body_3d.h
@@ -504,6 +504,7 @@ public:
 	Vector3 get_travel() const;
 	Vector3 get_remainder() const;
 	int get_collision_count() const;
+	real_t get_depth() const;
 	Vector3 get_position(int p_collision_index = 0) const;
 	Vector3 get_normal(int p_collision_index = 0) const;
 	real_t get_angle(int p_collision_index = 0, const Vector3 &p_up_direction = Vector3(0.0, 1.0, 0.0)) const;
diff --git a/scene/3d/soft_dynamic_body_3d.cpp b/scene/3d/soft_dynamic_body_3d.cpp
index d68e7fd527..15f050defb 100644
--- a/scene/3d/soft_dynamic_body_3d.cpp
+++ b/scene/3d/soft_dynamic_body_3d.cpp
@@ -83,7 +83,16 @@ void SoftDynamicBodyRenderingServerHandler::set_vertex(int p_vertex_id, const vo
 }
 
 void SoftDynamicBodyRenderingServerHandler::set_normal(int p_vertex_id, const void *p_vector3) {
-	memcpy(&write_buffer[p_vertex_id * stride + offset_normal], p_vector3, sizeof(float) * 3);
+	// Store normal vector in A2B10G10R10 format.
+	Vector3 n;
+	memcpy(&n, p_vector3, sizeof(Vector3));
+	n *= Vector3(0.5, 0.5, 0.5);
+	n += Vector3(0.5, 0.5, 0.5);
+	uint32_t value = 0;
+	value |= CLAMP(int(n.x * 1023.0), 0, 1023);
+	value |= CLAMP(int(n.y * 1023.0), 0, 1023) << 10;
+	value |= CLAMP(int(n.z * 1023.0), 0, 1023) << 20;
+	memcpy(&write_buffer[p_vertex_id * stride + offset_normal], &value, sizeof(uint32_t));
 }
 
 void SoftDynamicBodyRenderingServerHandler::set_aabb(const AABB &p_aabb) {
diff --git a/scene/3d/velocity_tracker_3d.h b/scene/3d/velocity_tracker_3d.h
index 6b27cdffc2..d3b92ab766 100644
--- a/scene/3d/velocity_tracker_3d.h
+++ b/scene/3d/velocity_tracker_3d.h
@@ -34,8 +34,6 @@
 #include "scene/3d/node_3d.h"
 
 class VelocityTracker3D : public RefCounted {
-	GDCLASS(VelocityTracker3D, RefCounted);
-
 	struct PositionHistory {
 		uint64_t frame = 0;
 		Vector3 position;
diff --git a/scene/3d/visual_instance_3d.cpp b/scene/3d/visual_instance_3d.cpp
index e76e85cfef..5af06cff29 100644
--- a/scene/3d/visual_instance_3d.cpp
+++ b/scene/3d/visual_instance_3d.cpp
@@ -227,8 +227,8 @@ const StringName *GeometryInstance3D::_instance_uniform_get_remap(const StringNa
 	StringName *r = instance_uniform_property_remap.getptr(p_name);
 	if (!r) {
 		String s = p_name;
-		if (s.begins_with("shader_params/")) {
-			StringName name = s.replace("shader_params/", "");
+		if (s.begins_with("shader_uniforms/")) {
+			StringName name = s.replace("shader_uniforms/", "");
 			instance_uniform_property_remap[p_name] = name;
 			return instance_uniform_property_remap.getptr(p_name);
 		}
@@ -242,7 +242,7 @@ const StringName *GeometryInstance3D::_instance_uniform_get_remap(const StringNa
 bool GeometryInstance3D::_set(const StringName &p_name, const Variant &p_value) {
 	const StringName *r = _instance_uniform_get_remap(p_name);
 	if (r) {
-		set_shader_instance_uniform(*r, p_value);
+		set_instance_shader_uniform(*r, p_value);
 		return true;
 	}
 #ifndef DISABLE_DEPRECATED
@@ -262,7 +262,7 @@ bool GeometryInstance3D::_set(const StringName &p_name, const Variant &p_value)
 bool GeometryInstance3D::_get(const StringName &p_name, Variant &r_ret) const {
 	const StringName *r = _instance_uniform_get_remap(p_name);
 	if (r) {
-		r_ret = get_shader_instance_uniform(*r);
+		r_ret = get_instance_shader_uniform(*r);
 		return true;
 	}
 
@@ -271,10 +271,10 @@ bool GeometryInstance3D::_get(const StringName &p_name, Variant &r_ret) const {
 
 void GeometryInstance3D::_get_property_list(List<PropertyInfo> *p_list) const {
 	List<PropertyInfo> pinfo;
-	RS::get_singleton()->instance_geometry_get_shader_parameter_list(get_instance(), &pinfo);
+	RS::get_singleton()->instance_geometry_get_shader_uniform_list(get_instance(), &pinfo);
 	for (PropertyInfo &pi : pinfo) {
 		bool has_def_value = false;
-		Variant def_value = RS::get_singleton()->instance_geometry_get_shader_parameter_default_value(get_instance(), pi.name);
+		Variant def_value = RS::get_singleton()->instance_geometry_get_shader_uniform_default_value(get_instance(), pi.name);
 		if (def_value.get_type() != Variant::NIL) {
 			has_def_value = true;
 		}
@@ -284,7 +284,7 @@ void GeometryInstance3D::_get_property_list(List<PropertyInfo> *p_list) const {
 			pi.usage = PROPERTY_USAGE_EDITOR | (has_def_value ? PROPERTY_USAGE_CHECKABLE : PROPERTY_USAGE_NONE); //do not save if not changed
 		}
 
-		pi.name = "shader_params/" + pi.name;
+		pi.name = "shader_uniforms/" + pi.name;
 		p_list->push_back(pi);
 	}
 }
@@ -319,24 +319,24 @@ float GeometryInstance3D::get_lod_bias() const {
 	return lod_bias;
 }
 
-void GeometryInstance3D::set_shader_instance_uniform(const StringName &p_uniform, const Variant &p_value) {
+void GeometryInstance3D::set_instance_shader_uniform(const StringName &p_uniform, const Variant &p_value) {
 	if (p_value.get_type() == Variant::NIL) {
-		Variant def_value = RS::get_singleton()->instance_geometry_get_shader_parameter_default_value(get_instance(), p_uniform);
-		RS::get_singleton()->instance_geometry_set_shader_parameter(get_instance(), p_uniform, def_value);
+		Variant def_value = RS::get_singleton()->instance_geometry_get_shader_uniform_default_value(get_instance(), p_uniform);
+		RS::get_singleton()->instance_geometry_set_shader_uniform(get_instance(), p_uniform, def_value);
 		instance_uniforms.erase(p_value);
 	} else {
 		instance_uniforms[p_uniform] = p_value;
 		if (p_value.get_type() == Variant::OBJECT) {
 			RID tex_id = p_value;
-			RS::get_singleton()->instance_geometry_set_shader_parameter(get_instance(), p_uniform, tex_id);
+			RS::get_singleton()->instance_geometry_set_shader_uniform(get_instance(), p_uniform, tex_id);
 		} else {
-			RS::get_singleton()->instance_geometry_set_shader_parameter(get_instance(), p_uniform, p_value);
+			RS::get_singleton()->instance_geometry_set_shader_uniform(get_instance(), p_uniform, p_value);
 		}
 	}
 }
 
-Variant GeometryInstance3D::get_shader_instance_uniform(const StringName &p_uniform) const {
-	return RS::get_singleton()->instance_geometry_get_shader_parameter(get_instance(), p_uniform);
+Variant GeometryInstance3D::get_instance_shader_uniform(const StringName &p_uniform) const {
+	return RS::get_singleton()->instance_geometry_get_shader_uniform(get_instance(), p_uniform);
 }
 
 void GeometryInstance3D::set_custom_aabb(AABB aabb) {
@@ -434,8 +434,8 @@ void GeometryInstance3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_visibility_range_fade_mode", "mode"), &GeometryInstance3D::set_visibility_range_fade_mode);
 	ClassDB::bind_method(D_METHOD("get_visibility_range_fade_mode"), &GeometryInstance3D::get_visibility_range_fade_mode);
 
-	ClassDB::bind_method(D_METHOD("set_shader_instance_uniform", "uniform", "value"), &GeometryInstance3D::set_shader_instance_uniform);
-	ClassDB::bind_method(D_METHOD("get_shader_instance_uniform", "uniform"), &GeometryInstance3D::get_shader_instance_uniform);
+	ClassDB::bind_method(D_METHOD("set_instance_shader_uniform", "uniform", "value"), &GeometryInstance3D::set_instance_shader_uniform);
+	ClassDB::bind_method(D_METHOD("get_instance_shader_uniform", "uniform"), &GeometryInstance3D::get_instance_shader_uniform);
 
 	ClassDB::bind_method(D_METHOD("set_extra_cull_margin", "margin"), &GeometryInstance3D::set_extra_cull_margin);
 	ClassDB::bind_method(D_METHOD("get_extra_cull_margin"), &GeometryInstance3D::get_extra_cull_margin);
diff --git a/scene/3d/visual_instance_3d.h b/scene/3d/visual_instance_3d.h
index 159b14613c..f7cdcbf411 100644
--- a/scene/3d/visual_instance_3d.h
+++ b/scene/3d/visual_instance_3d.h
@@ -178,8 +178,8 @@ public:
 	void set_lightmap_scale(LightmapScale p_scale);
 	LightmapScale get_lightmap_scale() const;
 
-	void set_shader_instance_uniform(const StringName &p_uniform, const Variant &p_value);
-	Variant get_shader_instance_uniform(const StringName &p_uniform) const;
+	void set_instance_shader_uniform(const StringName &p_uniform, const Variant &p_value);
+	Variant get_instance_shader_uniform(const StringName &p_uniform) const;
 
 	void set_custom_aabb(AABB aabb);
 
diff --git a/scene/3d/voxelizer.cpp b/scene/3d/voxelizer.cpp
index 42a2a68e2d..9380d1cf32 100644
--- a/scene/3d/voxelizer.cpp
+++ b/scene/3d/voxelizer.cpp
@@ -323,8 +323,8 @@ Vector<Color> Voxelizer::_get_bake_texture(Ref<Image> p_image, const Color &p_co
 }
 
 Voxelizer::MaterialCache Voxelizer::_get_material_cache(Ref<Material> p_material) {
-	//this way of obtaining materials is inaccurate and also does not support some compressed formats very well
-	Ref<StandardMaterial3D> mat = p_material;
+	// This way of obtaining materials is inaccurate and also does not support some compressed formats very well.
+	Ref<BaseMaterial3D> mat = p_material;
 
 	Ref<Material> material = mat; //hack for now
 
@@ -335,7 +335,7 @@ Voxelizer::MaterialCache Voxelizer::_get_material_cache(Ref<Material> p_material
 	MaterialCache mc;
 
 	if (mat.is_valid()) {
-		Ref<Texture2D> albedo_tex = mat->get_texture(StandardMaterial3D::TEXTURE_ALBEDO);
+		Ref<Texture2D> albedo_tex = mat->get_texture(BaseMaterial3D::TEXTURE_ALBEDO);
 
 		Ref<Image> img_albedo;
 		if (albedo_tex.is_valid()) {
@@ -345,7 +345,7 @@ Voxelizer::MaterialCache Voxelizer::_get_material_cache(Ref<Material> p_material
 			mc.albedo = _get_bake_texture(img_albedo, Color(1, 1, 1), mat->get_albedo()); // no albedo texture, color is additive
 		}
 
-		Ref<Texture2D> emission_tex = mat->get_texture(StandardMaterial3D::TEXTURE_EMISSION);
+		Ref<Texture2D> emission_tex = mat->get_texture(BaseMaterial3D::TEXTURE_EMISSION);
 
 		Color emission_col = mat->get_emission();
 		float emission_energy = mat->get_emission_energy();
@@ -356,7 +356,7 @@ Voxelizer::MaterialCache Voxelizer::_get_material_cache(Ref<Material> p_material
 			img_emission = emission_tex->get_image();
 		}
 
-		if (mat->get_emission_operator() == StandardMaterial3D::EMISSION_OP_ADD) {
+		if (mat->get_emission_operator() == BaseMaterial3D::EMISSION_OP_ADD) {
 			mc.emission = _get_bake_texture(img_emission, Color(1, 1, 1) * emission_energy, emission_col * emission_energy);
 		} else {
 			mc.emission = _get_bake_texture(img_emission, emission_col * emission_energy, Color(0, 0, 0));
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp
index 636c9e26a5..09ec086564 100644
--- a/scene/animation/animation_player.cpp
+++ b/scene/animation/animation_player.cpp
@@ -2124,7 +2124,7 @@ void AnimationPlayer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_method_call_mode", "mode"), &AnimationPlayer::set_method_call_mode);
 	ClassDB::bind_method(D_METHOD("get_method_call_mode"), &AnimationPlayer::get_method_call_mode);
 
-	ClassDB::bind_method(D_METHOD("set_movie_quit_on_finish_enabled"), &AnimationPlayer::set_movie_quit_on_finish_enabled);
+	ClassDB::bind_method(D_METHOD("set_movie_quit_on_finish_enabled", "enabled"), &AnimationPlayer::set_movie_quit_on_finish_enabled);
 	ClassDB::bind_method(D_METHOD("is_movie_quit_on_finish_enabled"), &AnimationPlayer::is_movie_quit_on_finish_enabled);
 
 	ClassDB::bind_method(D_METHOD("get_current_animation_position"), &AnimationPlayer::get_current_animation_position);
diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp
index 9bcb061526..0a163b65ff 100644
--- a/scene/gui/button.cpp
+++ b/scene/gui/button.cpp
@@ -258,7 +258,8 @@ void Button::_notification(int p_what) {
 				}
 
 				if (icon_region.size.width > 0) {
-					draw_texture_rect_region(_icon, icon_region, Rect2(Point2(), _icon->get_size()), color_icon);
+					Rect2 icon_region_rounded = Rect2(icon_region.position.round(), icon_region.size.round());
+					draw_texture_rect(_icon, icon_region_rounded, false, color_icon);
 				}
 			}
 
diff --git a/scene/gui/color_mode.cpp b/scene/gui/color_mode.cpp
index af78d67e5a..ebd86e0937 100644
--- a/scene/gui/color_mode.cpp
+++ b/scene/gui/color_mode.cpp
@@ -159,7 +159,7 @@ void ColorModeHSV::slider_draw(int p_which) {
 	} else if (p_which == 0) {
 		Ref<Texture2D> hue = color_picker->get_theme_icon(SNAME("color_hue"), SNAME("ColorPicker"));
 		slider->draw_set_transform(Point2(), -Math_PI / 2, Size2(1.0, 1.0));
-		slider->draw_texture_rect(hue, Rect2(Vector2(margin * -2, 0), Vector2(slider->get_size().x, margin)), false, Color(1, 1, 1), true);
+		slider->draw_texture_rect(hue, Rect2(Vector2(margin * -2, 0), Vector2(margin, size.x)), false);
 		return;
 	} else {
 		Color s_col;
@@ -306,7 +306,7 @@ void ColorModeOKHSL::slider_draw(int p_which) {
 	} else if (p_which == 0) {
 		Ref<Texture2D> hue = color_picker->get_theme_icon(SNAME("color_hue"), SNAME("ColorPicker"));
 		slider->draw_set_transform(Point2(), -Math_PI / 2, Size2(1.0, 1.0));
-		slider->draw_texture_rect(hue, Rect2(Vector2(margin * -2, 0), Vector2(slider->get_size().x, margin)), false, Color(1, 1, 1), true);
+		slider->draw_texture_rect(hue, Rect2(Vector2(margin * -2, 0), Vector2(margin, size.x)), false);
 		return;
 	} else {
 		Color s_col;
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index 8f63d76347..8cbe14c492 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -847,7 +847,7 @@ void ColorPicker::_hsv_draw(int p_which, Control *c) {
 	} else if (p_which == 2) {
 		c->draw_rect(Rect2(Point2(), c->get_size()), Color(1, 1, 1));
 		if (actual_shape == SHAPE_VHS_CIRCLE || actual_shape == SHAPE_OKHSL_CIRCLE) {
-			circle_mat->set_shader_param("v", v);
+			circle_mat->set_shader_uniform("v", v);
 		}
 	}
 }
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index 06aa913eb1..6d0380c898 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -2262,6 +2262,15 @@ void Control::_notify_theme_changed() {
 	}
 }
 
+void Control::_invalidate_theme_cache() {
+	data.theme_icon_cache.clear();
+	data.theme_style_cache.clear();
+	data.theme_font_cache.clear();
+	data.theme_font_size_cache.clear();
+	data.theme_color_cache.clear();
+	data.theme_constant_cache.clear();
+}
+
 void Control::set_theme(const Ref<Theme> &p_theme) {
 	if (data.theme == p_theme) {
 		return;
@@ -2443,9 +2452,15 @@ Ref<Texture2D> Control::get_theme_icon(const StringName &p_name, const StringNam
 		}
 	}
 
+	if (data.theme_icon_cache.has(p_theme_type) && data.theme_icon_cache[p_theme_type].has(p_name)) {
+		return data.theme_icon_cache[p_theme_type][p_name];
+	}
+
 	List<StringName> theme_types;
 	_get_theme_type_dependencies(p_theme_type, &theme_types);
-	return get_theme_item_in_types<Ref<Texture2D>>(data.theme_owner, data.theme_owner_window, Theme::DATA_TYPE_ICON, p_name, theme_types);
+	Ref<Texture2D> icon = get_theme_item_in_types<Ref<Texture2D>>(data.theme_owner, data.theme_owner_window, Theme::DATA_TYPE_ICON, p_name, theme_types);
+	data.theme_icon_cache[p_theme_type][p_name] = icon;
+	return icon;
 }
 
 Ref<StyleBox> Control::get_theme_stylebox(const StringName &p_name, const StringName &p_theme_type) const {
@@ -2456,9 +2471,15 @@ Ref<StyleBox> Control::get_theme_stylebox(const StringName &p_name, const String
 		}
 	}
 
+	if (data.theme_style_cache.has(p_theme_type) && data.theme_style_cache[p_theme_type].has(p_name)) {
+		return data.theme_style_cache[p_theme_type][p_name];
+	}
+
 	List<StringName> theme_types;
 	_get_theme_type_dependencies(p_theme_type, &theme_types);
-	return get_theme_item_in_types<Ref<StyleBox>>(data.theme_owner, data.theme_owner_window, Theme::DATA_TYPE_STYLEBOX, p_name, theme_types);
+	Ref<StyleBox> style = get_theme_item_in_types<Ref<StyleBox>>(data.theme_owner, data.theme_owner_window, Theme::DATA_TYPE_STYLEBOX, p_name, theme_types);
+	data.theme_style_cache[p_theme_type][p_name] = style;
+	return style;
 }
 
 Ref<Font> Control::get_theme_font(const StringName &p_name, const StringName &p_theme_type) const {
@@ -2469,9 +2490,15 @@ Ref<Font> Control::get_theme_font(const StringName &p_name, const StringName &p_
 		}
 	}
 
+	if (data.theme_font_cache.has(p_theme_type) && data.theme_font_cache[p_theme_type].has(p_name)) {
+		return data.theme_font_cache[p_theme_type][p_name];
+	}
+
 	List<StringName> theme_types;
 	_get_theme_type_dependencies(p_theme_type, &theme_types);
-	return get_theme_item_in_types<Ref<Font>>(data.theme_owner, data.theme_owner_window, Theme::DATA_TYPE_FONT, p_name, theme_types);
+	Ref<Font> font = get_theme_item_in_types<Ref<Font>>(data.theme_owner, data.theme_owner_window, Theme::DATA_TYPE_FONT, p_name, theme_types);
+	data.theme_font_cache[p_theme_type][p_name] = font;
+	return font;
 }
 
 int Control::get_theme_font_size(const StringName &p_name, const StringName &p_theme_type) const {
@@ -2482,9 +2509,15 @@ int Control::get_theme_font_size(const StringName &p_name, const StringName &p_t
 		}
 	}
 
+	if (data.theme_font_size_cache.has(p_theme_type) && data.theme_font_size_cache[p_theme_type].has(p_name)) {
+		return data.theme_font_size_cache[p_theme_type][p_name];
+	}
+
 	List<StringName> theme_types;
 	_get_theme_type_dependencies(p_theme_type, &theme_types);
-	return get_theme_item_in_types<int>(data.theme_owner, data.theme_owner_window, Theme::DATA_TYPE_FONT_SIZE, p_name, theme_types);
+	int font_size = get_theme_item_in_types<int>(data.theme_owner, data.theme_owner_window, Theme::DATA_TYPE_FONT_SIZE, p_name, theme_types);
+	data.theme_font_size_cache[p_theme_type][p_name] = font_size;
+	return font_size;
 }
 
 Color Control::get_theme_color(const StringName &p_name, const StringName &p_theme_type) const {
@@ -2495,9 +2528,15 @@ Color Control::get_theme_color(const StringName &p_name, const StringName &p_the
 		}
 	}
 
+	if (data.theme_color_cache.has(p_theme_type) && data.theme_color_cache[p_theme_type].has(p_name)) {
+		return data.theme_color_cache[p_theme_type][p_name];
+	}
+
 	List<StringName> theme_types;
 	_get_theme_type_dependencies(p_theme_type, &theme_types);
-	return get_theme_item_in_types<Color>(data.theme_owner, data.theme_owner_window, Theme::DATA_TYPE_COLOR, p_name, theme_types);
+	Color color = get_theme_item_in_types<Color>(data.theme_owner, data.theme_owner_window, Theme::DATA_TYPE_COLOR, p_name, theme_types);
+	data.theme_color_cache[p_theme_type][p_name] = color;
+	return color;
 }
 
 int Control::get_theme_constant(const StringName &p_name, const StringName &p_theme_type) const {
@@ -2508,9 +2547,15 @@ int Control::get_theme_constant(const StringName &p_name, const StringName &p_th
 		}
 	}
 
+	if (data.theme_constant_cache.has(p_theme_type) && data.theme_constant_cache[p_theme_type].has(p_name)) {
+		return data.theme_constant_cache[p_theme_type][p_name];
+	}
+
 	List<StringName> theme_types;
 	_get_theme_type_dependencies(p_theme_type, &theme_types);
-	return get_theme_item_in_types<int>(data.theme_owner, data.theme_owner_window, Theme::DATA_TYPE_CONSTANT, p_name, theme_types);
+	int constant = get_theme_item_in_types<int>(data.theme_owner, data.theme_owner_window, Theme::DATA_TYPE_CONSTANT, p_name, theme_types);
+	data.theme_constant_cache[p_theme_type][p_name] = constant;
+	return constant;
 }
 
 bool Control::has_theme_icon(const StringName &p_name, const StringName &p_theme_type) const {
@@ -3007,6 +3052,10 @@ void Control::remove_child_notify(Node *p_child) {
 
 void Control::_notification(int p_notification) {
 	switch (p_notification) {
+		case NOTIFICATION_ENTER_TREE: {
+			_invalidate_theme_cache();
+		} break;
+
 		case NOTIFICATION_POST_ENTER_TREE: {
 			data.minimum_size_valid = false;
 			data.is_rtl_dirty = true;
@@ -3144,6 +3193,7 @@ void Control::_notification(int p_notification) {
 		} break;
 
 		case NOTIFICATION_THEME_CHANGED: {
+			_invalidate_theme_cache();
 			update_minimum_size();
 			update();
 		} break;
@@ -3164,6 +3214,7 @@ void Control::_notification(int p_notification) {
 		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED: {
 			if (is_inside_tree()) {
 				data.is_rtl_dirty = true;
+				_invalidate_theme_cache();
 				_size_changed();
 			}
 		} break;
diff --git a/scene/gui/control.h b/scene/gui/control.h
index 9f17eccc3b..db19d09b11 100644
--- a/scene/gui/control.h
+++ b/scene/gui/control.h
@@ -229,6 +229,13 @@ private:
 		Theme::ThemeColorMap color_override;
 		Theme::ThemeConstantMap constant_override;
 
+		mutable HashMap<StringName, Theme::ThemeIconMap> theme_icon_cache;
+		mutable HashMap<StringName, Theme::ThemeStyleMap> theme_style_cache;
+		mutable HashMap<StringName, Theme::ThemeFontMap> theme_font_cache;
+		mutable HashMap<StringName, Theme::ThemeFontSizeMap> theme_font_size_cache;
+		mutable HashMap<StringName, Theme::ThemeColorMap> theme_color_cache;
+		mutable HashMap<StringName, Theme::ThemeConstantMap> theme_constant_cache;
+
 		// Internationalization.
 
 		LayoutDirection layout_dir = LAYOUT_DIRECTION_INHERITED;
@@ -291,6 +298,7 @@ private:
 	void _theme_changed();
 	void _theme_property_override_changed();
 	void _notify_theme_changed();
+	void _invalidate_theme_cache();
 
 	static void _propagate_theme_changed(Node *p_at, Control *p_owner, Window *p_owner_window, bool p_assign = true);
 
diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp
index 942b7d0bf9..f075510aa4 100644
--- a/scene/gui/dialogs.cpp
+++ b/scene/gui/dialogs.cpp
@@ -387,7 +387,7 @@ String ConfirmationDialog::get_cancel_button_text() const {
 
 void ConfirmationDialog::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_cancel_button"), &ConfirmationDialog::get_cancel_button);
-	ClassDB::bind_method(D_METHOD("set_cancel_button_text"), &ConfirmationDialog::set_cancel_button_text);
+	ClassDB::bind_method(D_METHOD("set_cancel_button_text", "text"), &ConfirmationDialog::set_cancel_button_text);
 	ClassDB::bind_method(D_METHOD("get_cancel_button_text"), &ConfirmationDialog::get_cancel_button_text);
 
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "cancel_button_text"), "set_cancel_button_text", "get_cancel_button_text");
diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp
index 42f434f0ac..8d3a61b52e 100644
--- a/scene/gui/graph_edit.cpp
+++ b/scene/gui/graph_edit.cpp
@@ -1823,7 +1823,20 @@ HashMap<int, Vector<StringName>> GraphEdit::_layering(const HashSet<StringName>
 		}
 		if (!selected) {
 			current_layer++;
+			uint32_t previous_size_z = z.size();
 			_set_operations(GraphEdit::UNION, z, u);
+			if (z.size() == previous_size_z) {
+				WARN_PRINT("Graph contains cycle(s). The cycle(s) will not be rearranged accurately.");
+				Vector<StringName> t;
+				if (l.has(0)) {
+					t.append_array(l[0]);
+				}
+				for (const StringName &E : p) {
+					t.push_back(E);
+				}
+				l.insert(0, t);
+				break;
+			}
 		}
 		selected = false;
 	}
@@ -2138,7 +2151,7 @@ void GraphEdit::arrange_nodes() {
 			HashSet<StringName> s;
 			for (List<Connection>::Element *E = connections.front(); E; E = E->next()) {
 				GraphNode *p_from = Object::cast_to<GraphNode>(node_names[E->get().from]);
-				if (E->get().to == gn->get_name() && p_from->is_selected()) {
+				if (E->get().to == gn->get_name() && p_from->is_selected() && E->get().to != E->get().from) {
 					if (!s.has(p_from->get_name())) {
 						s.insert(p_from->get_name());
 					}
@@ -2368,7 +2381,7 @@ void GraphEdit::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("begin_node_move"));
 	ADD_SIGNAL(MethodInfo("end_node_move"));
 	ADD_SIGNAL(MethodInfo("scroll_offset_changed", PropertyInfo(Variant::VECTOR2, "offset")));
-	ADD_SIGNAL(MethodInfo("connection_drag_started", PropertyInfo(Variant::STRING, "from"), PropertyInfo(Variant::STRING, "slot"), PropertyInfo(Variant::BOOL, "is_output")));
+	ADD_SIGNAL(MethodInfo("connection_drag_started", PropertyInfo(Variant::STRING, "from"), PropertyInfo(Variant::INT, "slot"), PropertyInfo(Variant::BOOL, "is_output")));
 	ADD_SIGNAL(MethodInfo("connection_drag_ended"));
 
 	BIND_ENUM_CONSTANT(SCROLL_ZOOMS);
diff --git a/scene/gui/graph_node.cpp b/scene/gui/graph_node.cpp
index c5054525a7..112b8c74af 100644
--- a/scene/gui/graph_node.cpp
+++ b/scene/gui/graph_node.cpp
@@ -450,7 +450,7 @@ void GraphNode::_validate_property(PropertyInfo &property) const {
 	Control::_validate_property(property);
 	GraphEdit *graph = Object::cast_to<GraphEdit>(get_parent());
 	if (graph) {
-		if (property.name == "rect_position") {
+		if (property.name == "position") {
 			property.usage |= PROPERTY_USAGE_READ_ONLY;
 		}
 	}
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index 39f8f23cd8..f315b2bbf1 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -1513,9 +1513,9 @@ void LineEdit::clear() {
 void LineEdit::show_virtual_keyboard() {
 	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_VIRTUAL_KEYBOARD) && virtual_keyboard_enabled) {
 		if (selection.enabled) {
-			DisplayServer::get_singleton()->virtual_keyboard_show(text, get_global_rect(), false, max_length, selection.begin, selection.end);
+			DisplayServer::get_singleton()->virtual_keyboard_show(text, get_global_rect(), DisplayServer::VirtualKeyboardType(virtual_keyboard_type), max_length, selection.begin, selection.end);
 		} else {
-			DisplayServer::get_singleton()->virtual_keyboard_show(text, get_global_rect(), false, max_length, caret_column);
+			DisplayServer::get_singleton()->virtual_keyboard_show(text, get_global_rect(), DisplayServer::VirtualKeyboardType(virtual_keyboard_type), max_length, caret_column);
 		}
 	}
 }
@@ -2040,6 +2040,14 @@ bool LineEdit::is_virtual_keyboard_enabled() const {
 	return virtual_keyboard_enabled;
 }
 
+void LineEdit::set_virtual_keyboard_type(VirtualKeyboardType p_type) {
+	virtual_keyboard_type = p_type;
+}
+
+LineEdit::VirtualKeyboardType LineEdit::get_virtual_keyboard_type() const {
+	return virtual_keyboard_type;
+}
+
 void LineEdit::set_middle_mouse_paste_enabled(bool p_enabled) {
 	middle_mouse_paste_enabled = p_enabled;
 }
@@ -2280,6 +2288,8 @@ void LineEdit::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_context_menu_enabled"), &LineEdit::is_context_menu_enabled);
 	ClassDB::bind_method(D_METHOD("set_virtual_keyboard_enabled", "enable"), &LineEdit::set_virtual_keyboard_enabled);
 	ClassDB::bind_method(D_METHOD("is_virtual_keyboard_enabled"), &LineEdit::is_virtual_keyboard_enabled);
+	ClassDB::bind_method(D_METHOD("set_virtual_keyboard_type", "type"), &LineEdit::set_virtual_keyboard_type);
+	ClassDB::bind_method(D_METHOD("get_virtual_keyboard_type"), &LineEdit::get_virtual_keyboard_type);
 	ClassDB::bind_method(D_METHOD("set_clear_button_enabled", "enable"), &LineEdit::set_clear_button_enabled);
 	ClassDB::bind_method(D_METHOD("is_clear_button_enabled"), &LineEdit::is_clear_button_enabled);
 	ClassDB::bind_method(D_METHOD("set_shortcut_keys_enabled", "enable"), &LineEdit::set_shortcut_keys_enabled);
@@ -2329,6 +2339,15 @@ void LineEdit::_bind_methods() {
 	BIND_ENUM_CONSTANT(MENU_INSERT_SHY);
 	BIND_ENUM_CONSTANT(MENU_MAX);
 
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_DEFAULT);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_MULTILINE);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_NUMBER);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_NUMBER_DECIMAL);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_PHONE);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_EMAIL_ADDRESS);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_PASSWORD);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_URL);
+
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text"), "set_text", "get_text");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "placeholder_text"), "set_placeholder", "get_placeholder");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "alignment", PROPERTY_HINT_ENUM, "Left,Center,Right,Fill"), "set_horizontal_alignment", "get_horizontal_alignment");
@@ -2339,6 +2358,7 @@ void LineEdit::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "expand_to_text_length"), "set_expand_to_text_length_enabled", "is_expand_to_text_length_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "context_menu_enabled"), "set_context_menu_enabled", "is_context_menu_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "virtual_keyboard_enabled"), "set_virtual_keyboard_enabled", "is_virtual_keyboard_enabled");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "virtual_keyboard_type", PROPERTY_HINT_ENUM, "Default,Multiline,Number,Decimal,Phone,Email,Password,URL"), "set_virtual_keyboard_type", "get_virtual_keyboard_type");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "clear_button_enabled"), "set_clear_button_enabled", "is_clear_button_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "shortcut_keys_enabled"), "set_shortcut_keys_enabled", "is_shortcut_keys_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "middle_mouse_paste_enabled"), "set_middle_mouse_paste_enabled", "is_middle_mouse_paste_enabled");
diff --git a/scene/gui/line_edit.h b/scene/gui/line_edit.h
index 6aa1694f1f..4d5ebf441c 100644
--- a/scene/gui/line_edit.h
+++ b/scene/gui/line_edit.h
@@ -70,6 +70,17 @@ public:
 		MENU_MAX
 	};
 
+	enum VirtualKeyboardType {
+		KEYBOARD_TYPE_DEFAULT,
+		KEYBOARD_TYPE_MULTILINE,
+		KEYBOARD_TYPE_NUMBER,
+		KEYBOARD_TYPE_NUMBER_DECIMAL,
+		KEYBOARD_TYPE_PHONE,
+		KEYBOARD_TYPE_EMAIL_ADDRESS,
+		KEYBOARD_TYPE_PASSWORD,
+		KEYBOARD_TYPE_URL
+	};
+
 private:
 	HorizontalAlignment alignment = HORIZONTAL_ALIGNMENT_LEFT;
 
@@ -84,7 +95,7 @@ private:
 	String text;
 	String placeholder;
 	String placeholder_translated;
-	String secret_character = "*";
+	String secret_character = U"•";
 	String ime_text;
 	Point2 ime_selection;
 
@@ -120,6 +131,7 @@ private:
 	bool shortcut_keys_enabled = true;
 
 	bool virtual_keyboard_enabled = true;
+	VirtualKeyboardType virtual_keyboard_type = KEYBOARD_TYPE_DEFAULT;
 
 	bool middle_mouse_paste_enabled = true;
 
@@ -311,6 +323,9 @@ public:
 	void set_virtual_keyboard_enabled(bool p_enable);
 	bool is_virtual_keyboard_enabled() const;
 
+	void set_virtual_keyboard_type(VirtualKeyboardType p_type);
+	VirtualKeyboardType get_virtual_keyboard_type() const;
+
 	void set_middle_mouse_paste_enabled(bool p_enabled);
 	bool is_middle_mouse_paste_enabled() const;
 
@@ -335,5 +350,6 @@ public:
 };
 
 VARIANT_ENUM_CAST(LineEdit::MenuItems);
+VARIANT_ENUM_CAST(LineEdit::VirtualKeyboardType);
 
 #endif // LINE_EDIT_H
diff --git a/scene/gui/menu_bar.cpp b/scene/gui/menu_bar.cpp
new file mode 100644
index 0000000000..ebe833c6e0
--- /dev/null
+++ b/scene/gui/menu_bar.cpp
@@ -0,0 +1,866 @@
+/*************************************************************************/
+/*  menu_bar.cpp                                                         */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "menu_bar.h"
+
+#include "core/os/keyboard.h"
+#include "scene/main/window.h"
+
+void MenuBar::gui_input(const Ref<InputEvent> &p_event) {
+	ERR_FAIL_COND(p_event.is_null());
+	if (is_native_menu()) {
+		// Handled by OS.
+		return;
+	}
+
+	MutexLock lock(mutex);
+	if (p_event->is_action("ui_left") && p_event->is_pressed()) {
+		int new_sel = selected_menu;
+		int old_sel = (selected_menu < 0) ? 0 : selected_menu;
+		do {
+			new_sel--;
+			if (new_sel < 0) {
+				new_sel = menu_cache.size() - 1;
+			}
+			if (old_sel == new_sel) {
+				return;
+			}
+		} while (menu_cache[new_sel].hidden || menu_cache[new_sel].disabled);
+
+		if (selected_menu != new_sel) {
+			selected_menu = new_sel;
+			focused_menu = selected_menu;
+			if (active_menu >= 0) {
+				get_menu_popup(active_menu)->hide();
+			}
+			_open_popup(selected_menu);
+		}
+		return;
+	} else if (p_event->is_action("ui_right") && p_event->is_pressed()) {
+		int new_sel = selected_menu;
+		int old_sel = (selected_menu < 0) ? menu_cache.size() - 1 : selected_menu;
+		do {
+			new_sel++;
+			if (new_sel >= menu_cache.size()) {
+				new_sel = 0;
+			}
+			if (old_sel == new_sel) {
+				return;
+			}
+		} while (menu_cache[new_sel].hidden || menu_cache[new_sel].disabled);
+
+		if (selected_menu != new_sel) {
+			selected_menu = new_sel;
+			focused_menu = selected_menu;
+			if (active_menu >= 0) {
+				get_menu_popup(active_menu)->hide();
+			}
+			_open_popup(selected_menu);
+		}
+		return;
+	}
+
+	Ref<InputEventMouseMotion> mm = p_event;
+	if (mm.is_valid()) {
+		int old_sel = selected_menu;
+		focused_menu = _get_index_at_point(mm->get_position());
+		if (focused_menu >= 0) {
+			selected_menu = focused_menu;
+		}
+		if (selected_menu != old_sel) {
+			update();
+		}
+	}
+
+	Ref<InputEventMouseButton> mb = p_event;
+	if (mb.is_valid()) {
+		if (mb->is_pressed() && (mb->get_button_index() == MouseButton::LEFT || mb->get_button_index() == MouseButton::RIGHT)) {
+			int index = _get_index_at_point(mb->get_position());
+			if (index >= 0) {
+				_open_popup(index);
+			}
+		}
+	}
+}
+
+void MenuBar::_open_popup(int p_index) {
+	ERR_FAIL_INDEX(p_index, menu_cache.size());
+
+	PopupMenu *pm = get_menu_popup(p_index);
+	if (pm->is_visible()) {
+		pm->hide();
+		return;
+	}
+
+	Rect2 item_rect = _get_menu_item_rect(p_index);
+	Point2 screen_pos = get_screen_position() + item_rect.position * get_viewport()->get_canvas_transform().get_scale();
+	Size2 screen_size = item_rect.size * get_viewport()->get_canvas_transform().get_scale();
+
+	active_menu = p_index;
+
+	pm->set_size(Size2(screen_size.x, 0));
+	screen_pos.y += screen_size.y;
+	if (is_layout_rtl()) {
+		screen_pos.x += screen_size.x - pm->get_size().width;
+	}
+	pm->set_position(screen_pos);
+	pm->set_parent_rect(Rect2(Point2(screen_pos - pm->get_position()), Size2(screen_size.x, screen_pos.y)));
+	pm->popup();
+
+	update();
+}
+
+void MenuBar::shortcut_input(const Ref<InputEvent> &p_event) {
+	ERR_FAIL_COND(p_event.is_null());
+
+	if (is_native_menu()) {
+		return;
+	}
+
+	if (!_is_focus_owner_in_shortcut_context()) {
+		return;
+	}
+
+	if (disable_shortcuts) {
+		return;
+	}
+
+	if (p_event->is_pressed() && !p_event->is_echo() && (Object::cast_to<InputEventKey>(p_event.ptr()) || Object::cast_to<InputEventJoypadButton>(p_event.ptr()) || Object::cast_to<InputEventAction>(*p_event) || Object::cast_to<InputEventShortcut>(*p_event))) {
+		if (!get_parent() || !is_visible_in_tree()) {
+			return;
+		}
+
+		Vector<PopupMenu *> popups = _get_popups();
+		for (int i = 0; i < popups.size(); i++) {
+			if (menu_cache[i].hidden || menu_cache[i].disabled) {
+				continue;
+			}
+			if (popups[i]->activate_item_by_event(p_event, false)) {
+				accept_event();
+				return;
+			}
+		}
+	}
+}
+
+void MenuBar::set_shortcut_context(Node *p_node) {
+	if (p_node != nullptr) {
+		shortcut_context = p_node->get_instance_id();
+	} else {
+		shortcut_context = ObjectID();
+	}
+}
+
+Node *MenuBar::get_shortcut_context() const {
+	Object *ctx_obj = ObjectDB::get_instance(shortcut_context);
+	Node *ctx_node = Object::cast_to<Node>(ctx_obj);
+
+	return ctx_node;
+}
+
+bool MenuBar::_is_focus_owner_in_shortcut_context() const {
+	if (shortcut_context == ObjectID()) {
+		// No context, therefore global - always "in" context.
+		return true;
+	}
+
+	Node *ctx_node = get_shortcut_context();
+	Control *vp_focus = get_viewport() ? get_viewport()->gui_get_focus_owner() : nullptr;
+
+	// If the context is valid and the viewport focus is valid, check if the context is the focus or is a parent of it.
+	return ctx_node && vp_focus && (ctx_node == vp_focus || ctx_node->is_ancestor_of(vp_focus));
+}
+
+void MenuBar::_popup_visibility_changed(bool p_visible) {
+	if (!p_visible) {
+		active_menu = -1;
+		focused_menu = -1;
+		set_process_internal(false);
+		update();
+		return;
+	}
+
+	if (switch_on_hover) {
+		Window *window = Object::cast_to<Window>(get_viewport());
+		if (window) {
+			mouse_pos_adjusted = window->get_position();
+
+			if (window->is_embedded()) {
+				Window *window_parent = Object::cast_to<Window>(window->get_parent()->get_viewport());
+				while (window_parent) {
+					if (!window_parent->is_embedded()) {
+						mouse_pos_adjusted += window_parent->get_position();
+						break;
+					}
+
+					window_parent = Object::cast_to<Window>(window_parent->get_parent()->get_viewport());
+				}
+			}
+
+			set_process_internal(true);
+		}
+	}
+}
+
+void MenuBar::_update_submenu(const String &p_menu_name, PopupMenu *p_child) {
+	int count = p_child->get_item_count();
+	global_menus.insert(p_menu_name);
+	for (int i = 0; i < count; i++) {
+		if (p_child->is_item_separator(i)) {
+			DisplayServer::get_singleton()->global_menu_add_separator(p_menu_name);
+		} else if (!p_child->get_item_submenu(i).is_empty()) {
+			Node *n = p_child->get_node(p_child->get_item_submenu(i));
+			ERR_FAIL_COND_MSG(!n, "Item subnode does not exist: " + p_child->get_item_submenu(i) + ".");
+			PopupMenu *pm = Object::cast_to<PopupMenu>(n);
+			ERR_FAIL_COND_MSG(!pm, "Item subnode is not a PopupMenu: " + p_child->get_item_submenu(i) + ".");
+
+			DisplayServer::get_singleton()->global_menu_add_submenu_item(p_menu_name, p_child->get_item_text(i), p_menu_name + "/" + itos(i));
+			_update_submenu(p_menu_name + "/" + itos(i), pm);
+		} else {
+			int index = DisplayServer::get_singleton()->global_menu_add_item(p_menu_name, p_child->get_item_text(i), callable_mp(p_child, &PopupMenu::activate_item), i);
+
+			if (p_child->is_item_checkable(i)) {
+				DisplayServer::get_singleton()->global_menu_set_item_checkable(p_menu_name, index, true);
+			}
+			if (p_child->is_item_radio_checkable(i)) {
+				DisplayServer::get_singleton()->global_menu_set_item_radio_checkable(p_menu_name, index, true);
+			}
+			DisplayServer::get_singleton()->global_menu_set_item_checked(p_menu_name, index, p_child->is_item_checked(i));
+			DisplayServer::get_singleton()->global_menu_set_item_disabled(p_menu_name, index, p_child->is_item_disabled(i));
+			DisplayServer::get_singleton()->global_menu_set_item_max_states(p_menu_name, index, p_child->get_item_max_states(i));
+			DisplayServer::get_singleton()->global_menu_set_item_icon(p_menu_name, index, p_child->get_item_icon(i));
+			DisplayServer::get_singleton()->global_menu_set_item_state(p_menu_name, index, p_child->get_item_state(i));
+			DisplayServer::get_singleton()->global_menu_set_item_indentation_level(p_menu_name, index, p_child->get_item_indent(i));
+			DisplayServer::get_singleton()->global_menu_set_item_tooltip(p_menu_name, index, p_child->get_item_tooltip(i));
+			if (!p_child->is_item_shortcut_disabled(i) && p_child->get_item_shortcut(i).is_valid() && p_child->get_item_shortcut(i)->has_valid_event()) {
+				Array events = p_child->get_item_shortcut(i)->get_events();
+				for (int j = 0; j < events.size(); j++) {
+					Ref<InputEventKey> ie = events[j];
+					if (ie.is_valid()) {
+						DisplayServer::get_singleton()->global_menu_set_item_accelerator(p_menu_name, index, ie->get_keycode_with_modifiers());
+						break;
+					}
+				}
+			} else if (p_child->get_item_accelerator(i) != Key::NONE) {
+				DisplayServer::get_singleton()->global_menu_set_item_accelerator(p_menu_name, i, p_child->get_item_accelerator(i));
+			}
+		}
+	}
+}
+
+bool MenuBar::is_native_menu() const {
+	if (!is_visible_in_tree()) {
+		return false;
+	}
+	if (Engine::get_singleton()->is_editor_hint() && get_tree()->get_edited_scene_root() && (get_tree()->get_edited_scene_root()->is_ancestor_of(this) || get_tree()->get_edited_scene_root() == this)) {
+		return false;
+	}
+
+	return (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_GLOBAL_MENU) && is_native);
+}
+
+void MenuBar::_clear_menu() {
+	if (!DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_GLOBAL_MENU)) {
+		return;
+	}
+
+	// Remove root menu items.
+	int count = DisplayServer::get_singleton()->global_menu_get_item_count("_main");
+	for (int i = count - 1; i >= 0; i--) {
+		if (global_menus.has(DisplayServer::get_singleton()->global_menu_get_item_submenu("_main", i))) {
+			DisplayServer::get_singleton()->global_menu_remove_item("_main", i);
+		}
+	}
+	// Erase submenu contents.
+	for (const String &E : global_menus) {
+		DisplayServer::get_singleton()->global_menu_clear(E);
+	}
+	global_menus.clear();
+}
+
+void MenuBar::_update_menu() {
+	_clear_menu();
+
+	if (!is_inside_tree()) {
+		return;
+	}
+
+	int index = start_index;
+	if (is_native_menu()) {
+		Vector<PopupMenu *> popups = _get_popups();
+		String root_name = "MenuBar<" + String::num_int64((uint64_t)this, 16) + ">";
+		for (int i = 0; i < popups.size(); i++) {
+			if (menu_cache[i].hidden) {
+				continue;
+			}
+			String menu_name = String(popups[i]->get_meta("_menu_name", popups[i]->get_name()));
+
+			index = DisplayServer::get_singleton()->global_menu_add_submenu_item("_main", menu_name, root_name + "/" + itos(i), index);
+			if (menu_cache[i].disabled) {
+				DisplayServer::get_singleton()->global_menu_set_item_disabled("_main", index, true);
+			}
+			_update_submenu(root_name + "/" + itos(i), popups[i]);
+			index++;
+		}
+	}
+	update_minimum_size();
+	update();
+}
+
+void MenuBar::_notification(int p_what) {
+	switch (p_what) {
+		case NOTIFICATION_ENTER_TREE: {
+			if (get_menu_count() > 0) {
+				_refresh_menu_names();
+			}
+		} break;
+		case NOTIFICATION_EXIT_TREE: {
+			_clear_menu();
+		} break;
+		case NOTIFICATION_MOUSE_EXIT: {
+			focused_menu = -1;
+			update();
+		} break;
+		case NOTIFICATION_TRANSLATION_CHANGED:
+		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
+		case NOTIFICATION_THEME_CHANGED: {
+			for (int i = 0; i < menu_cache.size(); i++) {
+				shape(menu_cache.write[i]);
+			}
+			_update_menu();
+		} break;
+		case NOTIFICATION_VISIBILITY_CHANGED: {
+			_update_menu();
+		} break;
+		case NOTIFICATION_DRAW: {
+			if (is_native_menu()) {
+				return;
+			}
+			for (int i = 0; i < menu_cache.size(); i++) {
+				_draw_menu_item(i);
+			}
+		} break;
+		case NOTIFICATION_INTERNAL_PROCESS: {
+			MutexLock lock(mutex);
+
+			Vector2 pos = DisplayServer::get_singleton()->mouse_get_position() - mouse_pos_adjusted - get_global_position();
+			int index = _get_index_at_point(pos);
+			if (index >= 0 && index != active_menu) {
+				selected_menu = index;
+				focused_menu = selected_menu;
+				get_menu_popup(active_menu)->hide();
+				_open_popup(index);
+			}
+		} break;
+	}
+}
+
+int MenuBar::_get_index_at_point(const Point2 &p_point) const {
+	Ref<StyleBox> style = get_theme_stylebox(SNAME("normal"));
+	int hsep = get_theme_constant(SNAME("h_separation"));
+	int offset = 0;
+	for (int i = 0; i < menu_cache.size(); i++) {
+		if (menu_cache[i].hidden) {
+			continue;
+		}
+		Size2 size = menu_cache[i].text_buf->get_size() + style->get_minimum_size();
+		if (p_point.x > offset && p_point.x < offset + size.x) {
+			if (p_point.y > 0 && p_point.y < size.y) {
+				return i;
+			}
+		}
+		offset += size.x + hsep;
+	}
+	return -1;
+}
+
+Rect2 MenuBar::_get_menu_item_rect(int p_index) const {
+	ERR_FAIL_INDEX_V(p_index, menu_cache.size(), Rect2());
+
+	Ref<StyleBox> style = get_theme_stylebox(SNAME("normal"));
+	int hsep = get_theme_constant(SNAME("h_separation"));
+
+	int offset = 0;
+	for (int i = 0; i < p_index; i++) {
+		if (menu_cache[i].hidden) {
+			continue;
+		}
+		Size2 size = menu_cache[i].text_buf->get_size() + style->get_minimum_size();
+		offset += size.x + hsep;
+	}
+
+	return Rect2(Point2(offset, 0), menu_cache[p_index].text_buf->get_size() + style->get_minimum_size());
+}
+
+void MenuBar::_draw_menu_item(int p_index) {
+	ERR_FAIL_INDEX(p_index, menu_cache.size());
+
+	RID ci = get_canvas_item();
+	bool hovered = (focused_menu == p_index);
+	bool pressed = (active_menu == p_index);
+	bool rtl = is_layout_rtl();
+
+	if (menu_cache[p_index].hidden) {
+		return;
+	}
+
+	Color color;
+	Ref<StyleBox> style = get_theme_stylebox(SNAME("normal"));
+	Rect2 item_rect = _get_menu_item_rect(p_index);
+
+	if (menu_cache[p_index].disabled) {
+		if (rtl && has_theme_stylebox(SNAME("disabled_mirrored"))) {
+			style = get_theme_stylebox(SNAME("disabled_mirrored"));
+		} else {
+			style = get_theme_stylebox(SNAME("disabled"));
+		}
+		if (!flat) {
+			style->draw(ci, item_rect);
+		}
+		color = get_theme_color(SNAME("font_disabled_color"));
+	} else if (hovered && pressed && has_theme_stylebox("hover_pressed")) {
+		if (rtl && has_theme_stylebox(SNAME("hover_pressed_mirrored"))) {
+			style = get_theme_stylebox(SNAME("hover_pressed_mirrored"));
+		} else {
+			style = get_theme_stylebox(SNAME("hover_pressed"));
+		}
+		if (!flat) {
+			style->draw(ci, item_rect);
+		}
+		if (has_theme_color(SNAME("font_hover_pressed_color"))) {
+			color = get_theme_color(SNAME("font_hover_pressed_color"));
+		}
+	} else if (pressed) {
+		if (rtl && has_theme_stylebox(SNAME("pressed_mirrored"))) {
+			style = get_theme_stylebox(SNAME("pressed_mirrored"));
+		} else {
+			style = get_theme_stylebox(SNAME("pressed"));
+		}
+		if (!flat) {
+			style->draw(ci, item_rect);
+		}
+		if (has_theme_color(SNAME("font_pressed_color"))) {
+			color = get_theme_color(SNAME("font_pressed_color"));
+		} else {
+			color = get_theme_color(SNAME("font_color"));
+		}
+	} else if (hovered) {
+		if (rtl && has_theme_stylebox(SNAME("hover_mirrored"))) {
+			style = get_theme_stylebox(SNAME("hover_mirrored"));
+		} else {
+			style = get_theme_stylebox(SNAME("hover"));
+		}
+		if (!flat) {
+			style->draw(ci, item_rect);
+		}
+		color = get_theme_color(SNAME("font_hover_color"));
+	} else {
+		if (rtl && has_theme_stylebox(SNAME("normal_mirrored"))) {
+			style = get_theme_stylebox(SNAME("normal_mirrored"));
+		} else {
+			style = get_theme_stylebox(SNAME("normal"));
+		}
+		if (!flat) {
+			style->draw(ci, item_rect);
+		}
+		// Focus colors only take precedence over normal state.
+		if (has_focus()) {
+			color = get_theme_color(SNAME("font_focus_color"));
+		} else {
+			color = get_theme_color(SNAME("font_color"));
+		}
+	}
+
+	Point2 text_ofs = item_rect.position + Point2(style->get_margin(SIDE_LEFT), style->get_margin(SIDE_TOP));
+
+	Color font_outline_color = get_theme_color(SNAME("font_outline_color"));
+	int outline_size = get_theme_constant(SNAME("outline_size"));
+	if (outline_size > 0 && font_outline_color.a > 0) {
+		menu_cache[p_index].text_buf->draw_outline(ci, text_ofs, outline_size, font_outline_color);
+	}
+	menu_cache[p_index].text_buf->draw(ci, text_ofs, color);
+}
+
+void MenuBar::shape(Menu &p_menu) {
+	Ref<Font> font = get_theme_font(SNAME("font"));
+	int font_size = get_theme_font_size(SNAME("font_size"));
+
+	p_menu.text_buf->clear();
+	if (text_direction == Control::TEXT_DIRECTION_INHERITED) {
+		p_menu.text_buf->set_direction(is_layout_rtl() ? TextServer::DIRECTION_RTL : TextServer::DIRECTION_LTR);
+	} else {
+		p_menu.text_buf->set_direction((TextServer::Direction)text_direction);
+	}
+	p_menu.text_buf->add_string(p_menu.name, font, font_size, language);
+}
+
+void MenuBar::_refresh_menu_names() {
+	Vector<PopupMenu *> popups = _get_popups();
+	for (int i = 0; i < popups.size(); i++) {
+		if (!popups[i]->has_meta("_menu_name") && String(popups[i]->get_name()) != get_menu_title(i)) {
+			menu_cache.write[i].name = popups[i]->get_name();
+			shape(menu_cache.write[i]);
+		}
+	}
+	_update_menu();
+}
+
+Vector<PopupMenu *> MenuBar::_get_popups() const {
+	Vector<PopupMenu *> popups;
+	for (int i = 0; i < get_child_count(); i++) {
+		PopupMenu *pm = Object::cast_to<PopupMenu>(get_child(i));
+		if (!pm) {
+			continue;
+		}
+		popups.push_back(pm);
+	}
+	return popups;
+}
+
+int MenuBar::get_menu_idx_from_control(PopupMenu *p_child) const {
+	ERR_FAIL_NULL_V(p_child, -1);
+	ERR_FAIL_COND_V(p_child->get_parent() != this, -1);
+
+	Vector<PopupMenu *> popups = _get_popups();
+	for (int i = 0; i < popups.size(); i++) {
+		if (popups[i] == p_child) {
+			return i;
+		}
+	}
+
+	return -1;
+}
+
+void MenuBar::add_child_notify(Node *p_child) {
+	Control::add_child_notify(p_child);
+
+	PopupMenu *pm = Object::cast_to<PopupMenu>(p_child);
+	if (!pm) {
+		return;
+	}
+	Menu menu = Menu(p_child->get_name());
+	shape(menu);
+
+	menu_cache.push_back(menu);
+	p_child->connect("renamed", callable_mp(this, &MenuBar::_refresh_menu_names));
+	p_child->connect("menu_changed", callable_mp(this, &MenuBar::_update_menu));
+	p_child->connect("about_to_popup", callable_mp(this, &MenuBar::_popup_visibility_changed).bind(true));
+	p_child->connect("popup_hide", callable_mp(this, &MenuBar::_popup_visibility_changed).bind(false));
+
+	_update_menu();
+}
+
+void MenuBar::move_child_notify(Node *p_child) {
+	Control::move_child_notify(p_child);
+
+	PopupMenu *pm = Object::cast_to<PopupMenu>(p_child);
+	if (!pm) {
+		return;
+	}
+
+	int old_idx = -1;
+	String menu_name = String(pm->get_meta("_menu_name", pm->get_name()));
+	// Find the previous menu index of the control.
+	for (int i = 0; i < get_menu_count(); i++) {
+		if (get_menu_title(i) == menu_name) {
+			old_idx = i;
+			break;
+		}
+	}
+	Menu menu = menu_cache[old_idx];
+	menu_cache.remove_at(old_idx);
+	menu_cache.insert(get_menu_idx_from_control(pm), menu);
+
+	_update_menu();
+}
+
+void MenuBar::remove_child_notify(Node *p_child) {
+	Control::remove_child_notify(p_child);
+
+	PopupMenu *pm = Object::cast_to<PopupMenu>(p_child);
+	if (!pm) {
+		return;
+	}
+
+	int idx = get_menu_idx_from_control(pm);
+
+	menu_cache.remove_at(idx);
+
+	p_child->remove_meta("_menu_name");
+	p_child->remove_meta("_menu_tooltip");
+
+	p_child->disconnect("renamed", callable_mp(this, &MenuBar::_refresh_menu_names));
+	p_child->disconnect("menu_changed", callable_mp(this, &MenuBar::_update_menu));
+	p_child->disconnect("about_to_popup", callable_mp(this, &MenuBar::_popup_visibility_changed));
+	p_child->disconnect("popup_hide", callable_mp(this, &MenuBar::_popup_visibility_changed));
+
+	_update_menu();
+}
+
+void MenuBar::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("set_switch_on_hover", "enable"), &MenuBar::set_switch_on_hover);
+	ClassDB::bind_method(D_METHOD("is_switch_on_hover"), &MenuBar::is_switch_on_hover);
+	ClassDB::bind_method(D_METHOD("set_disable_shortcuts", "disabled"), &MenuBar::set_disable_shortcuts);
+
+	ClassDB::bind_method(D_METHOD("set_prefer_global_menu", "enabled"), &MenuBar::set_prefer_global_menu);
+	ClassDB::bind_method(D_METHOD("is_prefer_global_menu"), &MenuBar::is_prefer_global_menu);
+	ClassDB::bind_method(D_METHOD("is_native_menu"), &MenuBar::is_native_menu);
+
+	ClassDB::bind_method(D_METHOD("get_menu_count"), &MenuBar::get_menu_count);
+
+	ClassDB::bind_method(D_METHOD("set_text_direction", "direction"), &MenuBar::set_text_direction);
+	ClassDB::bind_method(D_METHOD("get_text_direction"), &MenuBar::get_text_direction);
+	ClassDB::bind_method(D_METHOD("set_language", "language"), &MenuBar::set_language);
+	ClassDB::bind_method(D_METHOD("get_language"), &MenuBar::get_language);
+	ClassDB::bind_method(D_METHOD("set_flat", "enabled"), &MenuBar::set_flat);
+	ClassDB::bind_method(D_METHOD("is_flat"), &MenuBar::is_flat);
+	ClassDB::bind_method(D_METHOD("set_start_index", "enabled"), &MenuBar::set_start_index);
+	ClassDB::bind_method(D_METHOD("get_start_index"), &MenuBar::get_start_index);
+
+	ClassDB::bind_method(D_METHOD("set_menu_title", "menu", "title"), &MenuBar::set_menu_title);
+	ClassDB::bind_method(D_METHOD("get_menu_title", "menu"), &MenuBar::get_menu_title);
+
+	ClassDB::bind_method(D_METHOD("set_menu_tooltip", "menu", "tooltip"), &MenuBar::set_menu_tooltip);
+	ClassDB::bind_method(D_METHOD("get_menu_tooltip", "menu"), &MenuBar::get_menu_tooltip);
+
+	ClassDB::bind_method(D_METHOD("set_menu_disabled", "menu", "disabled"), &MenuBar::set_menu_disabled);
+	ClassDB::bind_method(D_METHOD("is_menu_disabled", "menu"), &MenuBar::is_menu_disabled);
+
+	ClassDB::bind_method(D_METHOD("set_menu_hidden", "menu", "hidden"), &MenuBar::set_menu_hidden);
+	ClassDB::bind_method(D_METHOD("is_menu_hidden", "menu"), &MenuBar::is_menu_hidden);
+
+	ClassDB::bind_method(D_METHOD("set_shortcut_context", "node"), &MenuBar::set_shortcut_context);
+	ClassDB::bind_method(D_METHOD("get_shortcut_context"), &MenuBar::get_shortcut_context);
+
+	ClassDB::bind_method(D_METHOD("get_menu_popup", "menu"), &MenuBar::get_menu_popup);
+
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "flat"), "set_flat", "is_flat");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "start_index"), "set_start_index", "get_start_index");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "switch_on_hover"), "set_switch_on_hover", "is_switch_on_hover");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "prefer_global_menu"), "set_prefer_global_menu", "is_prefer_global_menu");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shortcut_context", PROPERTY_HINT_RESOURCE_TYPE, "Node"), "set_shortcut_context", "get_shortcut_context");
+
+	ADD_GROUP("BiDi", "");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "text_direction", PROPERTY_HINT_ENUM, "Auto,Left-to-Right,Right-to-Left,Inherited"), "set_text_direction", "get_text_direction");
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "language", PROPERTY_HINT_LOCALE_ID, ""), "set_language", "get_language");
+}
+
+void MenuBar::set_switch_on_hover(bool p_enabled) {
+	switch_on_hover = p_enabled;
+}
+
+bool MenuBar::is_switch_on_hover() {
+	return switch_on_hover;
+}
+
+void MenuBar::set_disable_shortcuts(bool p_disabled) {
+	disable_shortcuts = p_disabled;
+}
+
+void MenuBar::set_text_direction(Control::TextDirection p_text_direction) {
+	ERR_FAIL_COND((int)p_text_direction < -1 || (int)p_text_direction > 3);
+	if (text_direction != p_text_direction) {
+		text_direction = p_text_direction;
+		_update_menu();
+	}
+}
+
+Control::TextDirection MenuBar::get_text_direction() const {
+	return text_direction;
+}
+
+void MenuBar::set_language(const String &p_language) {
+	if (language != p_language) {
+		language = p_language;
+		_update_menu();
+	}
+}
+
+String MenuBar::get_language() const {
+	return language;
+}
+
+void MenuBar::set_flat(bool p_enabled) {
+	if (flat != p_enabled) {
+		flat = p_enabled;
+		update();
+	}
+}
+
+bool MenuBar::is_flat() const {
+	return flat;
+}
+
+void MenuBar::set_start_index(int p_index) {
+	if (start_index != p_index) {
+		start_index = p_index;
+		_update_menu();
+	}
+}
+
+int MenuBar::get_start_index() const {
+	return start_index;
+}
+
+void MenuBar::set_prefer_global_menu(bool p_enabled) {
+	if (is_native != p_enabled) {
+		if (is_native) {
+			_clear_menu();
+		}
+		is_native = p_enabled;
+		_update_menu();
+	}
+}
+
+bool MenuBar::is_prefer_global_menu() const {
+	return is_native;
+}
+
+Size2 MenuBar::get_minimum_size() const {
+	if (is_native_menu()) {
+		return Size2();
+	}
+
+	Ref<StyleBox> style = get_theme_stylebox(SNAME("normal"));
+	int hsep = get_theme_constant(SNAME("h_separation"));
+
+	Vector2 size;
+	for (int i = 0; i < menu_cache.size(); i++) {
+		if (menu_cache[i].hidden) {
+			continue;
+		}
+		Size2 sz = menu_cache[i].text_buf->get_size() + style->get_minimum_size();
+		size.y = MAX(size.y, sz.y);
+		size.x += sz.x + hsep;
+	}
+	return size;
+}
+
+int MenuBar::get_menu_count() const {
+	return menu_cache.size();
+}
+
+void MenuBar::set_menu_title(int p_menu, const String &p_title) {
+	ERR_FAIL_INDEX(p_menu, menu_cache.size());
+	PopupMenu *pm = get_menu_popup(p_menu);
+	if (p_title == pm->get_name()) {
+		pm->remove_meta("_menu_name");
+	} else {
+		pm->set_meta("_menu_name", p_title);
+	}
+	menu_cache.write[p_menu].name = p_title;
+	shape(menu_cache.write[p_menu]);
+	_update_menu();
+}
+
+String MenuBar::get_menu_title(int p_menu) const {
+	ERR_FAIL_INDEX_V(p_menu, menu_cache.size(), String());
+	return menu_cache[p_menu].name;
+}
+
+void MenuBar::set_menu_tooltip(int p_menu, const String &p_tooltip) {
+	ERR_FAIL_INDEX(p_menu, menu_cache.size());
+	PopupMenu *pm = get_menu_popup(p_menu);
+	pm->set_meta("_menu_tooltip", p_tooltip);
+	menu_cache.write[p_menu].name = p_tooltip;
+}
+
+String MenuBar::get_menu_tooltip(int p_menu) const {
+	ERR_FAIL_INDEX_V(p_menu, menu_cache.size(), String());
+	return menu_cache[p_menu].tooltip;
+}
+
+void MenuBar::set_menu_disabled(int p_menu, bool p_disabled) {
+	ERR_FAIL_INDEX(p_menu, menu_cache.size());
+	menu_cache.write[p_menu].disabled = p_disabled;
+	_update_menu();
+}
+
+bool MenuBar::is_menu_disabled(int p_menu) const {
+	ERR_FAIL_INDEX_V(p_menu, menu_cache.size(), false);
+	return menu_cache[p_menu].disabled;
+}
+
+void MenuBar::set_menu_hidden(int p_menu, bool p_hidden) {
+	ERR_FAIL_INDEX(p_menu, menu_cache.size());
+	menu_cache.write[p_menu].hidden = p_hidden;
+	_update_menu();
+}
+
+bool MenuBar::is_menu_hidden(int p_menu) const {
+	ERR_FAIL_INDEX_V(p_menu, menu_cache.size(), false);
+	return menu_cache[p_menu].hidden;
+}
+
+PopupMenu *MenuBar::get_menu_popup(int p_idx) const {
+	Vector<PopupMenu *> controls = _get_popups();
+	if (p_idx >= 0 && p_idx < controls.size()) {
+		return controls[p_idx];
+	} else {
+		return nullptr;
+	}
+}
+
+String MenuBar::get_tooltip(const Point2 &p_pos) const {
+	int index = _get_index_at_point(p_pos);
+	if (index >= 0 && index < menu_cache.size()) {
+		return menu_cache[index].tooltip;
+	} else {
+		return String();
+	}
+}
+
+void MenuBar::get_translatable_strings(List<String> *p_strings) const {
+	Vector<PopupMenu *> popups = _get_popups();
+	for (int i = 0; i < popups.size(); i++) {
+		PopupMenu *pm = popups[i];
+
+		if (!pm->has_meta("_menu_name") && !pm->has_meta("_menu_tooltip")) {
+			continue;
+		}
+
+		String name = pm->get_meta("_menu_name");
+		if (!name.is_empty()) {
+			p_strings->push_back(name);
+		}
+
+		String tooltip = pm->get_meta("_menu_tooltip");
+		if (!tooltip.is_empty()) {
+			p_strings->push_back(tooltip);
+		}
+	}
+}
+
+MenuBar::MenuBar() {
+	set_process_shortcut_input(true);
+}
+
+MenuBar::~MenuBar() {
+}
diff --git a/scene/gui/menu_bar.h b/scene/gui/menu_bar.h
new file mode 100644
index 0000000000..3c4a25fd06
--- /dev/null
+++ b/scene/gui/menu_bar.h
@@ -0,0 +1,156 @@
+/*************************************************************************/
+/*  menu_bar.h                                                           */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef MENU_BAR_H
+#define MENU_BAR_H
+
+#include "scene/gui/button.h"
+#include "scene/gui/popup_menu.h"
+
+class MenuBar : public Control {
+	GDCLASS(MenuBar, Control);
+
+	Mutex mutex;
+
+	bool switch_on_hover = true;
+	bool disable_shortcuts = false;
+	bool is_native = true;
+	bool flat = false;
+	int start_index = -1;
+
+	String language;
+	TextDirection text_direction = TEXT_DIRECTION_AUTO;
+
+	struct Menu {
+		String name;
+		String tooltip;
+
+		Ref<TextLine> text_buf;
+		bool hidden = false;
+		bool disabled = false;
+
+		Menu(const String &p_name) {
+			name = p_name;
+			text_buf.instantiate();
+		}
+
+		Menu() {
+			text_buf.instantiate();
+		}
+	};
+	Vector<Menu> menu_cache;
+	HashSet<String> global_menus;
+
+	int focused_menu = -1;
+	int selected_menu = -1;
+	int active_menu = -1;
+
+	Vector2i mouse_pos_adjusted;
+	ObjectID shortcut_context;
+
+	int _get_index_at_point(const Point2 &p_point) const;
+	Rect2 _get_menu_item_rect(int p_index) const;
+	void _draw_menu_item(int p_index);
+
+	void shape(Menu &p_menu);
+	void _refresh_menu_names();
+	Vector<PopupMenu *> _get_popups() const;
+	int get_menu_idx_from_control(PopupMenu *p_child) const;
+
+	void _open_popup(int p_index);
+	void _popup_visibility_changed(bool p_visible);
+	void _update_submenu(const String &p_menu_name, PopupMenu *p_child);
+	void _clear_menu();
+	void _update_menu();
+
+	bool _is_focus_owner_in_shortcut_context() const;
+
+protected:
+	virtual void shortcut_input(const Ref<InputEvent> &p_event) override;
+
+	void _notification(int p_what);
+	virtual void add_child_notify(Node *p_child) override;
+	virtual void move_child_notify(Node *p_child) override;
+	virtual void remove_child_notify(Node *p_child) override;
+	static void _bind_methods();
+
+public:
+	virtual void gui_input(const Ref<InputEvent> &p_event) override;
+
+	void set_switch_on_hover(bool p_enabled);
+	bool is_switch_on_hover();
+	void set_disable_shortcuts(bool p_disabled);
+
+	void set_prefer_global_menu(bool p_enabled);
+	bool is_prefer_global_menu() const;
+
+	bool is_native_menu() const;
+
+	virtual Size2 get_minimum_size() const override;
+
+	int get_menu_count() const;
+
+	void set_text_direction(TextDirection p_text_direction);
+	TextDirection get_text_direction() const;
+
+	void set_language(const String &p_language);
+	String get_language() const;
+
+	void set_start_index(int p_index);
+	int get_start_index() const;
+
+	void set_flat(bool p_enabled);
+	bool is_flat() const;
+
+	void set_menu_title(int p_menu, const String &p_title);
+	String get_menu_title(int p_menu) const;
+
+	void set_menu_tooltip(int p_menu, const String &p_tooltip);
+	String get_menu_tooltip(int p_menu) const;
+
+	void set_menu_disabled(int p_menu, bool p_disabled);
+	bool is_menu_disabled(int p_menu) const;
+
+	void set_menu_hidden(int p_menu, bool p_hidden);
+	bool is_menu_hidden(int p_menu) const;
+
+	void set_shortcut_context(Node *p_node);
+	Node *get_shortcut_context() const;
+
+	PopupMenu *get_menu_popup(int p_menu) const;
+
+	virtual void get_translatable_strings(List<String> *p_strings) const override;
+	virtual String get_tooltip(const Point2 &p_pos) const override;
+
+	MenuBar();
+	~MenuBar();
+};
+
+#endif // MENU_BAR_H
diff --git a/scene/gui/menu_button.cpp b/scene/gui/menu_button.cpp
index 069a31d9d2..0252f25888 100644
--- a/scene/gui/menu_button.cpp
+++ b/scene/gui/menu_button.cpp
@@ -105,7 +105,11 @@ void MenuButton::pressed() {
 		popup->set_current_index(0);
 	}
 
-	popup->popup();
+	if (popup->is_visible()) {
+		popup->hide();
+	} else {
+		popup->popup();
+	}
 }
 
 void MenuButton::gui_input(const Ref<InputEvent> &p_event) {
diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp
index c58513df17..b26410e318 100644
--- a/scene/gui/option_button.cpp
+++ b/scene/gui/option_button.cpp
@@ -74,6 +74,9 @@ void OptionButton::_notification(int p_what) {
 					case DRAW_HOVER:
 						clr = get_theme_color(SNAME("font_hover_color"));
 						break;
+					case DRAW_HOVER_PRESSED:
+						clr = get_theme_color(SNAME("font_hover_pressed_color"));
+						break;
 					case DRAW_DISABLED:
 						clr = get_theme_color(SNAME("font_disabled_color"));
 						break;
@@ -498,7 +501,7 @@ void OptionButton::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_selected_id"), &OptionButton::get_selected_id);
 	ClassDB::bind_method(D_METHOD("get_selected_metadata"), &OptionButton::get_selected_metadata);
 	ClassDB::bind_method(D_METHOD("remove_item", "idx"), &OptionButton::remove_item);
-	ClassDB::bind_method(D_METHOD("_select_int"), &OptionButton::_select_int);
+	ClassDB::bind_method(D_METHOD("_select_int", "idx"), &OptionButton::_select_int);
 
 	ClassDB::bind_method(D_METHOD("get_popup"), &OptionButton::get_popup);
 
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp
index 928bab8842..6ef8158302 100644
--- a/scene/gui/popup_menu.cpp
+++ b/scene/gui/popup_menu.cpp
@@ -36,6 +36,7 @@
 #include "core/os/os.h"
 #include "core/string/print_string.h"
 #include "core/string/translation.h"
+#include "scene/gui/menu_bar.h"
 
 String PopupMenu::_get_accel_text(const Item &p_item) const {
 	if (p_item.shortcut.is_valid()) {
@@ -66,7 +67,7 @@ Size2 PopupMenu::_get_contents_minimum_size() const {
 		size.height = _get_item_height(i);
 		icon_w = MAX(icon_size.width, icon_w);
 
-		size.width += items[i].h_ofs;
+		size.width += items[i].indent * get_theme_constant(SNAME("indent"));
 
 		if (items[i].checkable_type && !items[i].separator) {
 			has_check = true;
@@ -343,14 +344,27 @@ void PopupMenu::gui_input(const Ref<InputEvent> &p_event) {
 		}
 	} else if (p_event->is_action("ui_left") && p_event->is_pressed()) {
 		Node *n = get_parent();
-		if (n && Object::cast_to<PopupMenu>(n)) {
-			hide();
-			set_input_as_handled();
+		if (n) {
+			if (Object::cast_to<PopupMenu>(n)) {
+				hide();
+				set_input_as_handled();
+			} else if (Object::cast_to<MenuBar>(n)) {
+				Object::cast_to<MenuBar>(n)->gui_input(p_event);
+				set_input_as_handled();
+				return;
+			}
 		}
 	} else if (p_event->is_action("ui_right") && p_event->is_pressed()) {
 		if (mouse_over >= 0 && mouse_over < items.size() && !items[mouse_over].separator && !items[mouse_over].submenu.is_empty() && submenu_over != mouse_over) {
 			_activate_submenu(mouse_over, true);
 			set_input_as_handled();
+		} else {
+			Node *n = get_parent();
+			if (n && Object::cast_to<MenuBar>(n)) {
+				Object::cast_to<MenuBar>(n)->gui_input(p_event);
+				set_input_as_handled();
+				return;
+			}
 		}
 	} else if (p_event->is_action("ui_accept") && p_event->is_pressed()) {
 		if (mouse_over >= 0 && mouse_over < items.size() && !items[mouse_over].separator) {
@@ -513,9 +527,9 @@ void PopupMenu::_draw_items() {
 	bool rtl = control->is_layout_rtl();
 	Ref<StyleBox> style = get_theme_stylebox(SNAME("panel"));
 	Ref<StyleBox> hover = get_theme_stylebox(SNAME("hover"));
-	// In Item::checkable_type enum order (less the non-checkable member).
-	Ref<Texture2D> check[] = { get_theme_icon(SNAME("checked")), get_theme_icon(SNAME("radio_checked")) };
-	Ref<Texture2D> uncheck[] = { get_theme_icon(SNAME("unchecked")), get_theme_icon(SNAME("radio_unchecked")) };
+	// In Item::checkable_type enum order (less the non-checkable member), with disabled repeated at the end.
+	Ref<Texture2D> check[] = { get_theme_icon(SNAME("checked")), get_theme_icon(SNAME("radio_checked")), get_theme_icon(SNAME("checked_disabled")), get_theme_icon(SNAME("radio_checked_disabled")) };
+	Ref<Texture2D> uncheck[] = { get_theme_icon(SNAME("unchecked")), get_theme_icon(SNAME("radio_unchecked")), get_theme_icon(SNAME("unchecked_disabled")), get_theme_icon(SNAME("radio_unchecked_disabled")) };
 	Ref<Texture2D> submenu;
 	if (rtl) {
 		submenu = get_theme_icon(SNAME("submenu_mirrored"));
@@ -558,7 +572,11 @@ void PopupMenu::_draw_items() {
 
 	float check_ofs = 0.0;
 	if (has_check) {
-		check_ofs = MAX(get_theme_icon(SNAME("checked"))->get_width(), get_theme_icon(SNAME("radio_checked"))->get_width()) + hseparation;
+		for (int i = 0; i < 4; i++) {
+			check_ofs = MAX(check_ofs, check[i]->get_width());
+			check_ofs = MAX(check_ofs, uncheck[i]->get_width());
+		}
+		check_ofs += hseparation;
 	}
 
 	Point2 ofs = Point2();
@@ -585,7 +603,7 @@ void PopupMenu::_draw_items() {
 		String text = items[i].xl_text;
 
 		// Separator
-		item_ofs.x += items[i].h_ofs;
+		item_ofs.x += items[i].indent * get_theme_constant(SNAME("indent"));
 		if (items[i].separator) {
 			if (!text.is_empty() || !items[i].icon.is_null()) {
 				int content_size = items[i].text_buf->get_size().width + hseparation * 2;
@@ -620,7 +638,8 @@ void PopupMenu::_draw_items() {
 
 		// Checkboxes
 		if (items[i].checkable_type && !items[i].separator) {
-			Texture2D *icon = (items[i].checked ? check[items[i].checkable_type - 1] : uncheck[items[i].checkable_type - 1]).ptr();
+			int disabled = int(items[i].disabled) * 2;
+			Texture2D *icon = (items[i].checked ? check[items[i].checkable_type - 1 + disabled] : uncheck[items[i].checkable_type - 1 + disabled]).ptr();
 			if (rtl) {
 				icon->draw(ci, Size2(control->get_size().width - item_ofs.x - icon->get_width(), item_ofs.y) + Point2(0, Math::floor((h - icon->get_height()) / 2.0)), icon_color);
 			} else {
@@ -769,6 +788,32 @@ void PopupMenu::_shape_item(int p_item) {
 	}
 }
 
+void PopupMenu::_menu_changed() {
+	emit_signal(SNAME("menu_changed"));
+}
+
+void PopupMenu::add_child_notify(Node *p_child) {
+	Window::add_child_notify(p_child);
+
+	PopupMenu *pm = Object::cast_to<PopupMenu>(p_child);
+	if (!pm) {
+		return;
+	}
+	p_child->connect("menu_changed", callable_mp(this, &PopupMenu::_menu_changed));
+	_menu_changed();
+}
+
+void PopupMenu::remove_child_notify(Node *p_child) {
+	Window::remove_child_notify(p_child);
+
+	PopupMenu *pm = Object::cast_to<PopupMenu>(p_child);
+	if (!pm) {
+		return;
+	}
+	p_child->disconnect("menu_changed", callable_mp(this, &PopupMenu::_menu_changed));
+	_menu_changed();
+}
+
 void PopupMenu::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
@@ -790,6 +835,7 @@ void PopupMenu::_notification(int p_what) {
 			}
 
 			child_controls_changed();
+			_menu_changed();
 			control->update();
 		} break;
 
@@ -884,6 +930,7 @@ void PopupMenu::add_item(const String &p_label, int p_id, Key p_accel) {
 	control->update();
 	child_controls_changed();
 	notify_property_list_changed();
+	_menu_changed();
 }
 
 void PopupMenu::add_icon_item(const Ref<Texture2D> &p_icon, const String &p_label, int p_id, Key p_accel) {
@@ -895,6 +942,7 @@ void PopupMenu::add_icon_item(const Ref<Texture2D> &p_icon, const String &p_labe
 	control->update();
 	child_controls_changed();
 	notify_property_list_changed();
+	_menu_changed();
 }
 
 void PopupMenu::add_check_item(const String &p_label, int p_id, Key p_accel) {
@@ -905,6 +953,7 @@ void PopupMenu::add_check_item(const String &p_label, int p_id, Key p_accel) {
 	_shape_item(items.size() - 1);
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 void PopupMenu::add_icon_check_item(const Ref<Texture2D> &p_icon, const String &p_label, int p_id, Key p_accel) {
@@ -926,6 +975,7 @@ void PopupMenu::add_radio_check_item(const String &p_label, int p_id, Key p_acce
 	_shape_item(items.size() - 1);
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 void PopupMenu::add_icon_radio_check_item(const Ref<Texture2D> &p_icon, const String &p_label, int p_id, Key p_accel) {
@@ -937,6 +987,7 @@ void PopupMenu::add_icon_radio_check_item(const Ref<Texture2D> &p_icon, const St
 	_shape_item(items.size() - 1);
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 void PopupMenu::add_multistate_item(const String &p_label, int p_max_states, int p_default_state, int p_id, Key p_accel) {
@@ -948,6 +999,7 @@ void PopupMenu::add_multistate_item(const String &p_label, int p_max_states, int
 	_shape_item(items.size() - 1);
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 #define ITEM_SETUP_WITH_SHORTCUT(p_shortcut, p_id, p_global)                           \
@@ -966,6 +1018,7 @@ void PopupMenu::add_shortcut(const Ref<Shortcut> &p_shortcut, int p_id, bool p_g
 	_shape_item(items.size() - 1);
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 void PopupMenu::add_icon_shortcut(const Ref<Texture2D> &p_icon, const Ref<Shortcut> &p_shortcut, int p_id, bool p_global) {
@@ -976,6 +1029,7 @@ void PopupMenu::add_icon_shortcut(const Ref<Texture2D> &p_icon, const Ref<Shortc
 	_shape_item(items.size() - 1);
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 void PopupMenu::add_check_shortcut(const Ref<Shortcut> &p_shortcut, int p_id, bool p_global) {
@@ -986,6 +1040,7 @@ void PopupMenu::add_check_shortcut(const Ref<Shortcut> &p_shortcut, int p_id, bo
 	_shape_item(items.size() - 1);
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 void PopupMenu::add_icon_check_shortcut(const Ref<Texture2D> &p_icon, const Ref<Shortcut> &p_shortcut, int p_id, bool p_global) {
@@ -997,6 +1052,7 @@ void PopupMenu::add_icon_check_shortcut(const Ref<Texture2D> &p_icon, const Ref<
 	_shape_item(items.size() - 1);
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 void PopupMenu::add_radio_check_shortcut(const Ref<Shortcut> &p_shortcut, int p_id, bool p_global) {
@@ -1007,6 +1063,7 @@ void PopupMenu::add_radio_check_shortcut(const Ref<Shortcut> &p_shortcut, int p_
 	_shape_item(items.size() - 1);
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 void PopupMenu::add_icon_radio_check_shortcut(const Ref<Texture2D> &p_icon, const Ref<Shortcut> &p_shortcut, int p_id, bool p_global) {
@@ -1018,6 +1075,7 @@ void PopupMenu::add_icon_radio_check_shortcut(const Ref<Texture2D> &p_icon, cons
 	_shape_item(items.size() - 1);
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 void PopupMenu::add_submenu_item(const String &p_label, const String &p_submenu, int p_id) {
@@ -1030,6 +1088,7 @@ void PopupMenu::add_submenu_item(const String &p_label, const String &p_submenu,
 	_shape_item(items.size() - 1);
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 #undef ITEM_SETUP_WITH_ACCEL
@@ -1052,6 +1111,7 @@ void PopupMenu::set_item_text(int p_idx, const String &p_text) {
 
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 void PopupMenu::set_item_text_direction(int p_item, Control::TextDirection p_text_direction) {
@@ -1088,6 +1148,7 @@ void PopupMenu::set_item_icon(int p_idx, const Ref<Texture2D> &p_icon) {
 
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 void PopupMenu::set_item_checked(int p_idx, bool p_checked) {
@@ -1100,6 +1161,7 @@ void PopupMenu::set_item_checked(int p_idx, bool p_checked) {
 
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 void PopupMenu::set_item_id(int p_idx, int p_id) {
@@ -1111,6 +1173,7 @@ void PopupMenu::set_item_id(int p_idx, int p_id) {
 
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 void PopupMenu::set_item_accelerator(int p_idx, Key p_accel) {
@@ -1123,6 +1186,7 @@ void PopupMenu::set_item_accelerator(int p_idx, Key p_accel) {
 
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 void PopupMenu::set_item_metadata(int p_idx, const Variant &p_meta) {
@@ -1133,6 +1197,7 @@ void PopupMenu::set_item_metadata(int p_idx, const Variant &p_meta) {
 	items.write[p_idx].metadata = p_meta;
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 void PopupMenu::set_item_disabled(int p_idx, bool p_disabled) {
@@ -1143,6 +1208,7 @@ void PopupMenu::set_item_disabled(int p_idx, bool p_disabled) {
 	items.write[p_idx].disabled = p_disabled;
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 void PopupMenu::set_item_submenu(int p_idx, const String &p_submenu) {
@@ -1153,6 +1219,7 @@ void PopupMenu::set_item_submenu(int p_idx, const String &p_submenu) {
 	items.write[p_idx].submenu = p_submenu;
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 void PopupMenu::toggle_item_checked(int p_idx) {
@@ -1160,6 +1227,7 @@ void PopupMenu::toggle_item_checked(int p_idx) {
 	items.write[p_idx].checked = !items[p_idx].checked;
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 String PopupMenu::get_item_text(int p_idx) const {
@@ -1242,9 +1310,14 @@ Ref<Shortcut> PopupMenu::get_item_shortcut(int p_idx) const {
 	return items[p_idx].shortcut;
 }
 
-int PopupMenu::get_item_horizontal_offset(int p_idx) const {
+int PopupMenu::get_item_indent(int p_idx) const {
 	ERR_FAIL_INDEX_V(p_idx, items.size(), 0);
-	return items[p_idx].h_ofs;
+	return items[p_idx].indent;
+}
+
+int PopupMenu::get_item_max_states(int p_idx) const {
+	ERR_FAIL_INDEX_V(p_idx, items.size(), -1);
+	return items[p_idx].max_states;
 }
 
 int PopupMenu::get_item_state(int p_idx) const {
@@ -1273,6 +1346,7 @@ void PopupMenu::set_item_as_checkable(int p_idx, bool p_checkable) {
 	ERR_FAIL_INDEX(p_idx, items.size());
 	items.write[p_idx].checkable_type = p_checkable ? Item::CHECKABLE_TYPE_CHECK_BOX : Item::CHECKABLE_TYPE_NONE;
 	control->update();
+	_menu_changed();
 }
 
 void PopupMenu::set_item_as_radio_checkable(int p_idx, bool p_radio_checkable) {
@@ -1282,6 +1356,7 @@ void PopupMenu::set_item_as_radio_checkable(int p_idx, bool p_radio_checkable) {
 	ERR_FAIL_INDEX(p_idx, items.size());
 	items.write[p_idx].checkable_type = p_radio_checkable ? Item::CHECKABLE_TYPE_RADIO_BUTTON : Item::CHECKABLE_TYPE_NONE;
 	control->update();
+	_menu_changed();
 }
 
 void PopupMenu::set_item_tooltip(int p_idx, const String &p_tooltip) {
@@ -1291,6 +1366,7 @@ void PopupMenu::set_item_tooltip(int p_idx, const String &p_tooltip) {
 	ERR_FAIL_INDEX(p_idx, items.size());
 	items.write[p_idx].tooltip = p_tooltip;
 	control->update();
+	_menu_changed();
 }
 
 void PopupMenu::set_item_shortcut(int p_idx, const Ref<Shortcut> &p_shortcut, bool p_global) {
@@ -1310,16 +1386,18 @@ void PopupMenu::set_item_shortcut(int p_idx, const Ref<Shortcut> &p_shortcut, bo
 	}
 
 	control->update();
+	_menu_changed();
 }
 
-void PopupMenu::set_item_horizontal_offset(int p_idx, int p_offset) {
+void PopupMenu::set_item_indent(int p_idx, int p_indent) {
 	if (p_idx < 0) {
 		p_idx += get_item_count();
 	}
 	ERR_FAIL_INDEX(p_idx, items.size());
-	items.write[p_idx].h_ofs = p_offset;
+	items.write[p_idx].indent = p_indent;
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 void PopupMenu::set_item_multistate(int p_idx, int p_state) {
@@ -1329,6 +1407,7 @@ void PopupMenu::set_item_multistate(int p_idx, int p_state) {
 	ERR_FAIL_INDEX(p_idx, items.size());
 	items.write[p_idx].state = p_state;
 	control->update();
+	_menu_changed();
 }
 
 void PopupMenu::set_item_shortcut_disabled(int p_idx, bool p_disabled) {
@@ -1338,6 +1417,7 @@ void PopupMenu::set_item_shortcut_disabled(int p_idx, bool p_disabled) {
 	ERR_FAIL_INDEX(p_idx, items.size());
 	items.write[p_idx].shortcut_is_disabled = p_disabled;
 	control->update();
+	_menu_changed();
 }
 
 void PopupMenu::toggle_item_multistate(int p_idx) {
@@ -1352,6 +1432,7 @@ void PopupMenu::toggle_item_multistate(int p_idx) {
 	}
 
 	control->update();
+	_menu_changed();
 }
 
 bool PopupMenu::is_item_checkable(int p_idx) const {
@@ -1364,6 +1445,11 @@ bool PopupMenu::is_item_radio_checkable(int p_idx) const {
 	return items[p_idx].checkable_type == Item::CHECKABLE_TYPE_RADIO_BUTTON;
 }
 
+bool PopupMenu::is_item_shortcut_global(int p_idx) const {
+	ERR_FAIL_INDEX_V(p_idx, items.size(), false);
+	return items[p_idx].shortcut_is_global;
+}
+
 bool PopupMenu::is_item_shortcut_disabled(int p_idx) const {
 	ERR_FAIL_INDEX_V(p_idx, items.size(), false);
 	return items[p_idx].shortcut_is_disabled;
@@ -1394,6 +1480,7 @@ void PopupMenu::set_item_count(int p_count) {
 	control->update();
 	child_controls_changed();
 	notify_property_list_changed();
+	_menu_changed();
 }
 
 int PopupMenu::get_item_count() const {
@@ -1535,6 +1622,7 @@ void PopupMenu::remove_item(int p_idx) {
 	items.remove_at(p_idx);
 	control->update();
 	child_controls_changed();
+	_menu_changed();
 }
 
 void PopupMenu::add_separator(const String &p_text, int p_id) {
@@ -1547,6 +1635,7 @@ void PopupMenu::add_separator(const String &p_text, int p_id) {
 	}
 	items.push_back(sep);
 	control->update();
+	_menu_changed();
 }
 
 void PopupMenu::clear() {
@@ -1560,6 +1649,7 @@ void PopupMenu::clear() {
 	control->update();
 	child_controls_changed();
 	notify_property_list_changed();
+	_menu_changed();
 }
 
 void PopupMenu::_ref_shortcut(Ref<Shortcut> p_sc) {
@@ -1834,7 +1924,7 @@ void PopupMenu::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_item_as_radio_checkable", "index", "enable"), &PopupMenu::set_item_as_radio_checkable);
 	ClassDB::bind_method(D_METHOD("set_item_tooltip", "index", "tooltip"), &PopupMenu::set_item_tooltip);
 	ClassDB::bind_method(D_METHOD("set_item_shortcut", "index", "shortcut", "global"), &PopupMenu::set_item_shortcut, DEFVAL(false));
-	ClassDB::bind_method(D_METHOD("set_item_horizontal_offset", "index", "offset"), &PopupMenu::set_item_horizontal_offset);
+	ClassDB::bind_method(D_METHOD("set_item_indent", "index", "indent"), &PopupMenu::set_item_indent);
 	ClassDB::bind_method(D_METHOD("set_item_multistate", "index", "state"), &PopupMenu::set_item_multistate);
 	ClassDB::bind_method(D_METHOD("set_item_shortcut_disabled", "index", "disabled"), &PopupMenu::set_item_shortcut_disabled);
 
@@ -1858,7 +1948,7 @@ void PopupMenu::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_item_shortcut_disabled", "index"), &PopupMenu::is_item_shortcut_disabled);
 	ClassDB::bind_method(D_METHOD("get_item_tooltip", "index"), &PopupMenu::get_item_tooltip);
 	ClassDB::bind_method(D_METHOD("get_item_shortcut", "index"), &PopupMenu::get_item_shortcut);
-	ClassDB::bind_method(D_METHOD("get_item_horizontal_offset", "index"), &PopupMenu::get_item_horizontal_offset);
+	ClassDB::bind_method(D_METHOD("get_item_indent", "index"), &PopupMenu::get_item_indent);
 
 	ClassDB::bind_method(D_METHOD("set_current_index", "index"), &PopupMenu::set_current_index);
 	ClassDB::bind_method(D_METHOD("get_current_index"), &PopupMenu::get_current_index);
@@ -1898,6 +1988,7 @@ void PopupMenu::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("id_pressed", PropertyInfo(Variant::INT, "id")));
 	ADD_SIGNAL(MethodInfo("id_focused", PropertyInfo(Variant::INT, "id")));
 	ADD_SIGNAL(MethodInfo("index_pressed", PropertyInfo(Variant::INT, "index")));
+	ADD_SIGNAL(MethodInfo("menu_changed"));
 }
 
 void PopupMenu::popup(const Rect2 &p_bounds) {
diff --git a/scene/gui/popup_menu.h b/scene/gui/popup_menu.h
index e203793c2e..d3ad0762e4 100644
--- a/scene/gui/popup_menu.h
+++ b/scene/gui/popup_menu.h
@@ -68,7 +68,7 @@ class PopupMenu : public Popup {
 		Key accel = Key::NONE;
 		int _ofs_cache = 0;
 		int _height_cache = 0;
-		int h_ofs = 0;
+		int indent = 0;
 		Ref<Shortcut> shortcut;
 		bool shortcut_is_global = false;
 		bool shortcut_is_disabled = false;
@@ -134,8 +134,11 @@ class PopupMenu : public Popup {
 
 	void _minimum_lifetime_timeout();
 	void _close_pressed();
+	void _menu_changed();
 
 protected:
+	virtual void add_child_notify(Node *p_child) override;
+	virtual void remove_child_notify(Node *p_child) override;
 	void _notification(int p_what);
 	bool _set(const StringName &p_name, const Variant &p_value);
 	bool _get(const StringName &p_name, Variant &r_ret) const;
@@ -183,7 +186,7 @@ public:
 	void set_item_as_radio_checkable(int p_idx, bool p_radio_checkable);
 	void set_item_tooltip(int p_idx, const String &p_tooltip);
 	void set_item_shortcut(int p_idx, const Ref<Shortcut> &p_shortcut, bool p_global = false);
-	void set_item_horizontal_offset(int p_idx, int p_offset);
+	void set_item_indent(int p_idx, int p_indent);
 	void set_item_multistate(int p_idx, int p_state);
 	void toggle_item_multistate(int p_idx);
 	void set_item_shortcut_disabled(int p_idx, bool p_disabled);
@@ -206,9 +209,11 @@ public:
 	bool is_item_checkable(int p_idx) const;
 	bool is_item_radio_checkable(int p_idx) const;
 	bool is_item_shortcut_disabled(int p_idx) const;
+	bool is_item_shortcut_global(int p_idx) const;
 	String get_item_tooltip(int p_idx) const;
 	Ref<Shortcut> get_item_shortcut(int p_idx) const;
-	int get_item_horizontal_offset(int p_idx) const;
+	int get_item_indent(int p_idx) const;
+	int get_item_max_states(int p_idx) const;
 	int get_item_state(int p_idx) const;
 
 	void set_current_index(int p_idx);
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
index 8e424977c4..984f20ee58 100644
--- a/scene/gui/rich_text_label.cpp
+++ b/scene/gui/rich_text_label.cpp
@@ -821,17 +821,18 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
 			off.y += line_spacing;
 		}
 
-		RID rid = l.text_buf->get_line_rid(line);
 		if (p_ofs.y + off.y >= ctrl_size.height) {
 			break;
 		}
-		if (p_ofs.y + off.y + TS->shaped_text_get_size(rid).y <= 0) {
-			off.y += TS->shaped_text_get_size(rid).y;
+
+		const Size2 line_size = l.text_buf->get_line_size(line);
+		if (p_ofs.y + off.y + line_size.y <= 0) {
+			off.y += line_size.y;
 			continue;
 		}
 
 		float width = l.text_buf->get_width();
-		float length = TS->shaped_text_get_width(rid);
+		float length = line_size.x;
 
 		// Draw line.
 		line_count++;
@@ -874,6 +875,7 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
 			}
 		}
 
+		RID rid = l.text_buf->get_line_rid(line);
 		//draw_rect(Rect2(p_ofs + off, TS->shaped_text_get_size(rid)), Color(1,0,0), false, 2); //DEBUG_RECTS
 
 		off.y += TS->shaped_text_get_ascent(rid);
diff --git a/scene/gui/spin_box.cpp b/scene/gui/spin_box.cpp
index b7bef37e17..8a7f52b0d9 100644
--- a/scene/gui/spin_box.cpp
+++ b/scene/gui/spin_box.cpp
@@ -88,7 +88,8 @@ void SpinBox::_line_edit_input(const Ref<InputEvent> &p_event) {
 void SpinBox::_range_click_timeout() {
 	if (!drag.enabled && Input::get_singleton()->is_mouse_button_pressed(MouseButton::LEFT)) {
 		bool up = get_local_mouse_position().y < (get_size().height / 2);
-		set_value(get_value() + (up ? get_step() : -get_step()));
+		double step = get_custom_arrow_step() != 0.0 ? get_custom_arrow_step() : get_step();
+		set_value(get_value() + (up ? step : -step));
 
 		if (range_click_timer->is_one_shot()) {
 			range_click_timer->set_wait_time(0.075);
@@ -118,6 +119,8 @@ void SpinBox::gui_input(const Ref<InputEvent> &p_event) {
 
 	Ref<InputEventMouseButton> mb = p_event;
 
+	double step = get_custom_arrow_step() != 0.0 ? get_custom_arrow_step() : get_step();
+
 	if (mb.is_valid() && mb->is_pressed()) {
 		bool up = mb->get_position().y < (get_size().height / 2);
 
@@ -125,7 +128,7 @@ void SpinBox::gui_input(const Ref<InputEvent> &p_event) {
 			case MouseButton::LEFT: {
 				line_edit->grab_focus();
 
-				set_value(get_value() + (up ? get_step() : -get_step()));
+				set_value(get_value() + (up ? step : -step));
 
 				range_click_timer->set_wait_time(0.6);
 				range_click_timer->set_one_shot(true);
@@ -140,13 +143,13 @@ void SpinBox::gui_input(const Ref<InputEvent> &p_event) {
 			} break;
 			case MouseButton::WHEEL_UP: {
 				if (line_edit->has_focus()) {
-					set_value(get_value() + get_step() * mb->get_factor());
+					set_value(get_value() + step * mb->get_factor());
 					accept_event();
 				}
 			} break;
 			case MouseButton::WHEEL_DOWN: {
 				if (line_edit->has_focus()) {
-					set_value(get_value() - get_step() * mb->get_factor());
+					set_value(get_value() - step * mb->get_factor());
 					accept_event();
 				}
 			} break;
@@ -168,7 +171,7 @@ void SpinBox::gui_input(const Ref<InputEvent> &p_event) {
 		if (drag.enabled) {
 			drag.diff_y += mm->get_relative().y;
 			double diff_y = -0.01 * Math::pow(ABS(drag.diff_y), 1.8) * SIGN(drag.diff_y);
-			set_value(CLAMP(drag.base_val + get_step() * diff_y, get_min(), get_max()));
+			set_value(CLAMP(drag.base_val + step * diff_y, get_min(), get_max()));
 		} else if (drag.allowed && drag.capture_pos.distance_to(mm->get_position()) > 2) {
 			Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);
 			drag.enabled = true;
@@ -294,6 +297,14 @@ void SpinBox::apply() {
 	_text_submitted(line_edit->get_text());
 }
 
+void SpinBox::set_custom_arrow_step(double p_custom_arrow_step) {
+	custom_arrow_step = p_custom_arrow_step;
+}
+
+double SpinBox::get_custom_arrow_step() const {
+	return custom_arrow_step;
+}
+
 void SpinBox::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_horizontal_alignment", "alignment"), &SpinBox::set_horizontal_alignment);
 	ClassDB::bind_method(D_METHOD("get_horizontal_alignment"), &SpinBox::get_horizontal_alignment);
@@ -302,6 +313,8 @@ void SpinBox::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_prefix", "prefix"), &SpinBox::set_prefix);
 	ClassDB::bind_method(D_METHOD("get_prefix"), &SpinBox::get_prefix);
 	ClassDB::bind_method(D_METHOD("set_editable", "enabled"), &SpinBox::set_editable);
+	ClassDB::bind_method(D_METHOD("set_custom_arrow_step", "arrow_step"), &SpinBox::set_custom_arrow_step);
+	ClassDB::bind_method(D_METHOD("get_custom_arrow_step"), &SpinBox::get_custom_arrow_step);
 	ClassDB::bind_method(D_METHOD("is_editable"), &SpinBox::is_editable);
 	ClassDB::bind_method(D_METHOD("set_update_on_text_changed", "enabled"), &SpinBox::set_update_on_text_changed);
 	ClassDB::bind_method(D_METHOD("get_update_on_text_changed"), &SpinBox::get_update_on_text_changed);
@@ -313,6 +326,7 @@ void SpinBox::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "update_on_text_changed"), "set_update_on_text_changed", "get_update_on_text_changed");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "prefix"), "set_prefix", "get_prefix");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "suffix"), "set_suffix", "get_suffix");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "custom_arrow_step"), "set_custom_arrow_step", "get_custom_arrow_step");
 }
 
 SpinBox::SpinBox() {
diff --git a/scene/gui/spin_box.h b/scene/gui/spin_box.h
index 1b1abbcf8e..0aae9efe78 100644
--- a/scene/gui/spin_box.h
+++ b/scene/gui/spin_box.h
@@ -52,6 +52,7 @@ class SpinBox : public Range {
 
 	String prefix;
 	String suffix;
+	double custom_arrow_step = 0.0;
 
 	void _line_edit_input(const Ref<InputEvent> &p_event);
 
@@ -95,6 +96,8 @@ public:
 	bool get_update_on_text_changed() const;
 
 	void apply();
+	void set_custom_arrow_step(const double p_custom_arrow_step);
+	double get_custom_arrow_step() const;
 
 	SpinBox();
 };
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 4bc8b8e197..3755a8fa34 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -1466,7 +1466,7 @@ void TextEdit::_notification(int p_what) {
 					caret_end = caret_start + post_text.length();
 				}
 
-				DisplayServer::get_singleton()->virtual_keyboard_show(get_text(), get_global_rect(), true, -1, caret_start, caret_end);
+				DisplayServer::get_singleton()->virtual_keyboard_show(get_text(), get_global_rect(), DisplayServer::KEYBOARD_TYPE_MULTILINE, -1, caret_start, caret_end);
 			}
 		} break;
 
@@ -5294,7 +5294,7 @@ void TextEdit::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_v_scroll_speed", "speed"), &TextEdit::set_v_scroll_speed);
 	ClassDB::bind_method(D_METHOD("get_v_scroll_speed"), &TextEdit::get_v_scroll_speed);
 
-	ClassDB::bind_method(D_METHOD("set_fit_content_height_enabled"), &TextEdit::set_fit_content_height_enabled);
+	ClassDB::bind_method(D_METHOD("set_fit_content_height_enabled", "enabled"), &TextEdit::set_fit_content_height_enabled);
 	ClassDB::bind_method(D_METHOD("is_fit_content_height_enabled"), &TextEdit::is_fit_content_height_enabled);
 
 	ClassDB::bind_method(D_METHOD("get_scroll_pos_for_line", "line", "wrap_index"), &TextEdit::get_scroll_pos_for_line, DEFVAL(0));
diff --git a/scene/main/resource_preloader.cpp b/scene/main/resource_preloader.cpp
index 5512d0a84e..a9b0285723 100644
--- a/scene/main/resource_preloader.cpp
+++ b/scene/main/resource_preloader.cpp
@@ -138,7 +138,7 @@ void ResourcePreloader::get_resource_list(List<StringName> *p_list) {
 }
 
 void ResourcePreloader::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("_set_resources"), &ResourcePreloader::_set_resources);
+	ClassDB::bind_method(D_METHOD("_set_resources", "resources"), &ResourcePreloader::_set_resources);
 	ClassDB::bind_method(D_METHOD("_get_resources"), &ResourcePreloader::_get_resources);
 
 	ClassDB::bind_method(D_METHOD("add_resource", "name", "resource"), &ResourcePreloader::add_resource);
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 4dd4c8419c..584fad9648 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -2498,17 +2498,20 @@ bool Viewport::_sub_windows_forward_input(const Ref<InputEvent> &p_event) {
 			if (gui.subwindow_drag == SUB_WINDOW_DRAG_RESIZE) {
 				Vector2i diff = mm->get_position() - gui.subwindow_drag_from;
 				Size2i min_size = gui.subwindow_focused->get_min_size();
+
+				Size2i min_size_adjusted = min_size;
 				if (gui.subwindow_focused->is_wrapping_controls()) {
 					Size2i cms = gui.subwindow_focused->get_contents_minimum_size();
-					min_size.x = MAX(cms.x, min_size.x);
-					min_size.y = MAX(cms.y, min_size.y);
+					min_size_adjusted.x = MAX(cms.x, min_size.x);
+					min_size_adjusted.y = MAX(cms.y, min_size.y);
 				}
-				min_size.x = MAX(min_size.x, 1);
-				min_size.y = MAX(min_size.y, 1);
+
+				min_size_adjusted.x = MAX(min_size_adjusted.x, 1);
+				min_size_adjusted.y = MAX(min_size_adjusted.y, 1);
 
 				Rect2i r = gui.subwindow_resize_from_rect;
 
-				Size2i limit = r.size - min_size;
+				Size2i limit = r.size - min_size_adjusted;
 
 				switch (gui.subwindow_resize_mode) {
 					case SUB_WINDOW_RESIZE_TOP_LEFT: {
@@ -2563,6 +2566,19 @@ bool Viewport::_sub_windows_forward_input(const Ref<InputEvent> &p_event) {
 					}
 				}
 
+				Size2i max_size = gui.subwindow_focused->get_max_size();
+				if ((max_size.x > 0 || max_size.y > 0) && (max_size.x >= min_size.x && max_size.y >= min_size.y)) {
+					max_size.x = MAX(max_size.x, 1);
+					max_size.y = MAX(max_size.y, 1);
+
+					if (r.size.x > max_size.x) {
+						r.size.x = max_size.x;
+					}
+					if (r.size.y > max_size.y) {
+						r.size.y = max_size.y;
+					}
+				}
+
 				gui.subwindow_focused->_rect_changed_callback(r);
 			}
 
@@ -2600,7 +2616,7 @@ bool Viewport::_sub_windows_forward_input(const Ref<InputEvent> &p_event) {
 					Ref<Texture2D> close_icon = sw.window->get_theme_icon(SNAME("close"));
 
 					Rect2 close_rect;
-					close_rect.position = Vector2(r.position.x + r.size.x - close_v_ofs, r.position.y - close_h_ofs);
+					close_rect.position = Vector2(r.position.x + r.size.x - close_h_ofs, r.position.y - close_v_ofs);
 					close_rect.size = close_icon->get_size();
 
 					if (gui.subwindow_focused != sw.window) {
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
index bd72858ae6..d40b82f5eb 100644
--- a/scene/main/window.cpp
+++ b/scene/main/window.cpp
@@ -242,8 +242,8 @@ void Window::_make_window() {
 	window_id = DisplayServer::get_singleton()->create_sub_window(DisplayServer::WindowMode(mode), vsync_mode, f, Rect2i(position, size));
 	ERR_FAIL_COND(window_id == DisplayServer::INVALID_WINDOW_ID);
 	DisplayServer::get_singleton()->window_set_current_screen(current_screen, window_id);
-	DisplayServer::get_singleton()->window_set_max_size(max_size, window_id);
-	DisplayServer::get_singleton()->window_set_min_size(min_size, window_id);
+	DisplayServer::get_singleton()->window_set_max_size(Size2i(), window_id);
+	DisplayServer::get_singleton()->window_set_min_size(Size2i(), window_id);
 	String tr_title = atr(title);
 #ifdef DEBUG_ENABLED
 	if (window_id == DisplayServer::MAIN_WINDOW_ID) {
@@ -596,20 +596,43 @@ void Window::_update_window_size() {
 	size.x = MAX(size_limit.x, size.x);
 	size.y = MAX(size_limit.y, size.y);
 
-	if (max_size.x > 0 && max_size.x > min_size.x && size.x > max_size.x) {
-		size.x = max_size.x;
-	}
+	bool reset_min_first = false;
+
+	bool max_size_valid = false;
+	if ((max_size.x > 0 || max_size.y > 0) && (max_size.x >= min_size.x && max_size.y >= min_size.y)) {
+		max_size_valid = true;
+
+		if (size.x > max_size.x) {
+			size.x = max_size.x;
+		}
+		if (size_limit.x > max_size.x) {
+			size_limit.x = max_size.x;
+			reset_min_first = true;
+		}
 
-	if (max_size.y > 0 && max_size.y > min_size.y && size.y > max_size.y) {
-		size.y = max_size.y;
+		if (size.y > max_size.y) {
+			size.y = max_size.y;
+		}
+		if (size_limit.y > max_size.y) {
+			size_limit.y = max_size.y;
+			reset_min_first = true;
+		}
 	}
 
 	if (embedder) {
+		size.x = MAX(size.x, 1);
+		size.y = MAX(size.y, 1);
+
 		embedder->_sub_window_update(this);
 	} else if (window_id != DisplayServer::INVALID_WINDOW_ID) {
+		if (reset_min_first && wrap_controls) {
+			// Avoid an error if setting max_size to a value between min_size and the previous size_limit.
+			DisplayServer::get_singleton()->window_set_min_size(Size2i(), window_id);
+		}
+
 		DisplayServer::get_singleton()->window_set_size(size, window_id);
+		DisplayServer::get_singleton()->window_set_max_size(max_size_valid ? max_size : Size2i(), window_id);
 		DisplayServer::get_singleton()->window_set_min_size(size_limit, window_id);
-		DisplayServer::get_singleton()->window_set_max_size(max_size, window_id);
 	}
 
 	//update the viewport
@@ -953,6 +976,8 @@ void Window::set_wrap_controls(bool p_enable) {
 	wrap_controls = p_enable;
 	if (wrap_controls) {
 		child_controls_changed();
+	} else {
+		_update_window_size();
 	}
 }
 
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
index d7fcd500b2..9979855232 100644
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -100,6 +100,7 @@
 #include "scene/gui/line_edit.h"
 #include "scene/gui/link_button.h"
 #include "scene/gui/margin_container.h"
+#include "scene/gui/menu_bar.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/nine_patch_rect.h"
 #include "scene/gui/option_button.h"
@@ -351,6 +352,7 @@ void register_scene_types() {
 	GDREGISTER_CLASS(VSlider);
 	GDREGISTER_CLASS(Popup);
 	GDREGISTER_CLASS(PopupPanel);
+	GDREGISTER_CLASS(MenuBar);
 	GDREGISTER_CLASS(MenuButton);
 	GDREGISTER_CLASS(CheckBox);
 	GDREGISTER_CLASS(CheckButton);
@@ -785,6 +787,7 @@ void register_scene_types() {
 	GDREGISTER_CLASS(QuadMesh);
 	GDREGISTER_CLASS(SphereMesh);
 	GDREGISTER_CLASS(TextMesh);
+	GDREGISTER_CLASS(TorusMesh);
 	GDREGISTER_CLASS(TubeTrailMesh);
 	GDREGISTER_CLASS(RibbonTrailMesh);
 	GDREGISTER_CLASS(PointMesh);
@@ -821,8 +824,6 @@ void register_scene_types() {
 	ClassDB::register_class<SkeletonModification3DStackHolder>();
 
 	OS::get_singleton()->yield(); // may take time to init
-
-	GDREGISTER_CLASS(VelocityTracker3D);
 #endif
 
 	GDREGISTER_CLASS(PhysicsMaterial);
@@ -842,7 +843,6 @@ void register_scene_types() {
 	GDREGISTER_CLASS(CurveXYZTexture);
 	GDREGISTER_CLASS(GradientTexture1D);
 	GDREGISTER_CLASS(GradientTexture2D);
-	GDREGISTER_CLASS(ProxyTexture);
 	GDREGISTER_CLASS(AnimatedTexture);
 	GDREGISTER_CLASS(CameraTexture);
 	GDREGISTER_VIRTUAL_CLASS(TextureLayered);
@@ -1051,7 +1051,6 @@ void register_scene_types() {
 	ClassDB::add_compatibility_class("Spatial", "Node3D");
 	ClassDB::add_compatibility_class("SpatialGizmo", "Node3DGizmo");
 	ClassDB::add_compatibility_class("SpatialMaterial", "StandardMaterial3D");
-	ClassDB::add_compatibility_class("SpatialVelocityTracker", "VelocityTracker3D");
 	ClassDB::add_compatibility_class("SphereShape", "SphereShape3D");
 	ClassDB::add_compatibility_class("SpotLight", "SpotLight3D");
 	ClassDB::add_compatibility_class("SpringArm", "SpringArm3D");
diff --git a/scene/resources/bit_map.cpp b/scene/resources/bit_map.cpp
index 1ff72825ac..bef431e980 100644
--- a/scene/resources/bit_map.cpp
+++ b/scene/resources/bit_map.cpp
@@ -669,7 +669,7 @@ void BitMap::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_size"), &BitMap::get_size);
 	ClassDB::bind_method(D_METHOD("resize", "new_size"), &BitMap::resize);
 
-	ClassDB::bind_method(D_METHOD("_set_data"), &BitMap::_set_data);
+	ClassDB::bind_method(D_METHOD("_set_data", "data"), &BitMap::_set_data);
 	ClassDB::bind_method(D_METHOD("_get_data"), &BitMap::_get_data);
 
 	ClassDB::bind_method(D_METHOD("grow_mask", "pixels", "rect"), &BitMap::grow_mask);
diff --git a/scene/resources/curve.cpp b/scene/resources/curve.cpp
index da26a0261f..1835604285 100644
--- a/scene/resources/curve.cpp
+++ b/scene/resources/curve.cpp
@@ -1167,7 +1167,7 @@ void Curve2D::_get_property_list(List<PropertyInfo> *p_list) const {
 void Curve2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_point_count"), &Curve2D::get_point_count);
 	ClassDB::bind_method(D_METHOD("set_point_count", "count"), &Curve2D::set_point_count);
-	ClassDB::bind_method(D_METHOD("add_point", "position", "in", "out", "at_position"), &Curve2D::add_point, DEFVAL(Vector2()), DEFVAL(Vector2()), DEFVAL(-1));
+	ClassDB::bind_method(D_METHOD("add_point", "position", "in", "out", "index"), &Curve2D::add_point, DEFVAL(Vector2()), DEFVAL(Vector2()), DEFVAL(-1));
 	ClassDB::bind_method(D_METHOD("set_point_position", "idx", "position"), &Curve2D::set_point_position);
 	ClassDB::bind_method(D_METHOD("get_point_position", "idx"), &Curve2D::get_point_position);
 	ClassDB::bind_method(D_METHOD("set_point_in", "idx", "position"), &Curve2D::set_point_in);
@@ -1190,7 +1190,7 @@ void Curve2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("tessellate", "max_stages", "tolerance_degrees"), &Curve2D::tessellate, DEFVAL(5), DEFVAL(4));
 
 	ClassDB::bind_method(D_METHOD("_get_data"), &Curve2D::_get_data);
-	ClassDB::bind_method(D_METHOD("_set_data"), &Curve2D::_set_data);
+	ClassDB::bind_method(D_METHOD("_set_data", "data"), &Curve2D::_set_data);
 
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "bake_interval", PROPERTY_HINT_RANGE, "0.01,512,0.01"), "set_bake_interval", "get_bake_interval");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "_data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "_set_data", "_get_data");
@@ -1972,7 +1972,7 @@ void Curve3D::_get_property_list(List<PropertyInfo> *p_list) const {
 void Curve3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_point_count"), &Curve3D::get_point_count);
 	ClassDB::bind_method(D_METHOD("set_point_count", "count"), &Curve3D::set_point_count);
-	ClassDB::bind_method(D_METHOD("add_point", "position", "in", "out", "at_position"), &Curve3D::add_point, DEFVAL(Vector3()), DEFVAL(Vector3()), DEFVAL(-1));
+	ClassDB::bind_method(D_METHOD("add_point", "position", "in", "out", "index"), &Curve3D::add_point, DEFVAL(Vector3()), DEFVAL(Vector3()), DEFVAL(-1));
 	ClassDB::bind_method(D_METHOD("set_point_position", "idx", "position"), &Curve3D::set_point_position);
 	ClassDB::bind_method(D_METHOD("get_point_position", "idx"), &Curve3D::get_point_position);
 	ClassDB::bind_method(D_METHOD("set_point_tilt", "idx", "tilt"), &Curve3D::set_point_tilt);
@@ -2002,7 +2002,7 @@ void Curve3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("tessellate", "max_stages", "tolerance_degrees"), &Curve3D::tessellate, DEFVAL(5), DEFVAL(4));
 
 	ClassDB::bind_method(D_METHOD("_get_data"), &Curve3D::_get_data);
-	ClassDB::bind_method(D_METHOD("_set_data"), &Curve3D::_set_data);
+	ClassDB::bind_method(D_METHOD("_set_data", "data"), &Curve3D::_set_data);
 
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "bake_interval", PROPERTY_HINT_RANGE, "0.01,512,0.01"), "set_bake_interval", "get_bake_interval");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "_data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "_set_data", "_get_data");
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index 520a0a04ed..b96ee5c6c4 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -177,6 +177,27 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 
 	theme->set_constant("h_separation", "Button", 2 * scale);
 
+	// MenuBar
+	theme->set_stylebox("normal", "MenuBar", button_normal);
+	theme->set_stylebox("hover", "MenuBar", button_hover);
+	theme->set_stylebox("pressed", "MenuBar", button_pressed);
+	theme->set_stylebox("disabled", "MenuBar", button_disabled);
+	theme->set_stylebox("focus", "MenuBar", focus);
+
+	theme->set_font("font", "MenuBar", Ref<Font>());
+	theme->set_font_size("font_size", "MenuBar", -1);
+	theme->set_constant("outline_size", "MenuBar", 0 * scale);
+
+	theme->set_color("font_color", "MenuBar", control_font_color);
+	theme->set_color("font_pressed_color", "MenuBar", control_font_pressed_color);
+	theme->set_color("font_hover_color", "MenuBar", control_font_hover_color);
+	theme->set_color("font_focus_color", "MenuBar", control_font_focus_color);
+	theme->set_color("font_hover_pressed_color", "MenuBar", control_font_pressed_color);
+	theme->set_color("font_disabled_color", "MenuBar", control_font_disabled_color);
+	theme->set_color("font_outline_color", "MenuBar", Color(1, 1, 1));
+
+	theme->set_constant("h_separation", "MenuBar", 4 * scale);
+
 	// LinkButton
 
 	theme->set_stylebox("focus", "LinkButton", focus);
@@ -224,6 +245,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_color("font_color", "OptionButton", control_font_color);
 	theme->set_color("font_pressed_color", "OptionButton", control_font_pressed_color);
 	theme->set_color("font_hover_color", "OptionButton", control_font_hover_color);
+	theme->set_color("font_hover_pressed_color", "OptionButton", control_font_pressed_color);
 	theme->set_color("font_focus_color", "OptionButton", control_font_focus_color);
 	theme->set_color("font_disabled_color", "OptionButton", control_font_disabled_color);
 	theme->set_color("font_outline_color", "OptionButton", Color(1, 1, 1));
@@ -231,6 +253,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_constant("h_separation", "OptionButton", 2 * scale);
 	theme->set_constant("arrow_margin", "OptionButton", 4 * scale);
 	theme->set_constant("outline_size", "OptionButton", 0);
+	theme->set_constant("modulate_arrow", "OptionButton", false);
 
 	// MenuButton
 
@@ -644,9 +667,13 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_stylebox("labeled_separator_right", "PopupMenu", separator_horizontal);
 
 	theme->set_icon("checked", "PopupMenu", icons["checked"]);
+	theme->set_icon("checked_disabled", "PopupMenu", icons["checked"]);
 	theme->set_icon("unchecked", "PopupMenu", icons["unchecked"]);
+	theme->set_icon("unchecked_disabled", "PopupMenu", icons["unchecked"]);
 	theme->set_icon("radio_checked", "PopupMenu", icons["radio_checked"]);
+	theme->set_icon("radio_checked_disabled", "PopupMenu", icons["radio_checked"]);
 	theme->set_icon("radio_unchecked", "PopupMenu", icons["radio_unchecked"]);
+	theme->set_icon("radio_unchecked_disabled", "PopupMenu", icons["radio_unchecked"]);
 	theme->set_icon("submenu", "PopupMenu", icons["popup_menu_arrow_right"]);
 	theme->set_icon("submenu_mirrored", "PopupMenu", icons["popup_menu_arrow_left"]);
 
@@ -663,6 +690,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_color("font_outline_color", "PopupMenu", Color(1, 1, 1));
 	theme->set_color("font_separator_outline_color", "PopupMenu", Color(1, 1, 1));
 
+	theme->set_constant("indent", "PopupMenu", 10 * scale);
 	theme->set_constant("h_separation", "PopupMenu", 4 * scale);
 	theme->set_constant("v_separation", "PopupMenu", 4 * scale);
 	theme->set_constant("outline_size", "PopupMenu", 0);
@@ -703,6 +731,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_color("resizer_color", "GraphNode", control_font_color);
 	theme->set_constant("separation", "GraphNode", 2 * scale);
 	theme->set_constant("title_offset", "GraphNode", 26 * scale);
+	theme->set_constant("title_h_offset", "GraphNode", 0);
 	theme->set_constant("close_offset", "GraphNode", 22 * scale);
 	theme->set_constant("close_h_offset", "GraphNode", 22 * scale);
 	theme->set_constant("port_offset", "GraphNode", 0);
@@ -741,7 +770,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_color("font_selected_color", "Tree", control_font_pressed_color);
 	theme->set_color("font_outline_color", "Tree", Color(1, 1, 1));
 	theme->set_color("guide_color", "Tree", Color(0.7, 0.7, 0.7, 0.25));
-	theme->set_color("drop_position_color", "Tree", Color(1, 0.3, 0.2));
+	theme->set_color("drop_position_color", "Tree", Color(1, 1, 1));
 	theme->set_color("relationship_line_color", "Tree", Color(0.27, 0.27, 0.27));
 	theme->set_color("parent_hl_line_color", "Tree", Color(0.27, 0.27, 0.27));
 	theme->set_color("children_hl_line_color", "Tree", Color(0.27, 0.27, 0.27));
@@ -776,7 +805,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_color("font_color", "ItemList", control_font_lower_color);
 	theme->set_color("font_selected_color", "ItemList", control_font_pressed_color);
 	theme->set_color("font_outline_color", "ItemList", Color(1, 1, 1));
-	theme->set_color("guide_color", "ItemList", Color(0, 0, 0, 0.1));
+	theme->set_color("guide_color", "ItemList", Color(0.7, 0.7, 0.7, 0.25));
 	theme->set_stylebox("selected", "ItemList", make_flat_stylebox(style_selected_color));
 	theme->set_stylebox("selected_focus", "ItemList", make_flat_stylebox(style_selected_color));
 	theme->set_stylebox("cursor", "ItemList", focus);
diff --git a/scene/resources/environment.cpp b/scene/resources/environment.cpp
index 95b0f9e6c0..d361b34da8 100644
--- a/scene/resources/environment.cpp
+++ b/scene/resources/environment.cpp
@@ -1337,8 +1337,10 @@ void Environment::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "sdfgi_bounce_feedback", PROPERTY_HINT_RANGE, "0,1.99,0.01"), "set_sdfgi_bounce_feedback", "get_sdfgi_bounce_feedback");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "sdfgi_cascades", PROPERTY_HINT_RANGE, "1,8,1"), "set_sdfgi_cascades", "get_sdfgi_cascades");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "sdfgi_min_cell_size", PROPERTY_HINT_RANGE, "0.01,64,0.01"), "set_sdfgi_min_cell_size", "get_sdfgi_min_cell_size");
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "sdfgi_cascade0_distance", PROPERTY_HINT_RANGE, "0.1,16384,0.1,or_greater"), "set_sdfgi_cascade0_distance", "get_sdfgi_cascade0_distance");
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "sdfgi_max_distance", PROPERTY_HINT_RANGE, "0.1,16384,0.1,or_greater"), "set_sdfgi_max_distance", "get_sdfgi_max_distance");
+	// Don't store the values of `sdfgi_cascade0_distance` and `sdfgi_max_distance`
+	// as they're derived from `sdfgi_min_cell_size`.
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "sdfgi_cascade0_distance", PROPERTY_HINT_RANGE, "0.1,16384,0.1,or_greater", PROPERTY_USAGE_EDITOR), "set_sdfgi_cascade0_distance", "get_sdfgi_cascade0_distance");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "sdfgi_max_distance", PROPERTY_HINT_RANGE, "0.1,16384,0.1,or_greater", PROPERTY_USAGE_EDITOR), "set_sdfgi_max_distance", "get_sdfgi_max_distance");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "sdfgi_y_scale", PROPERTY_HINT_ENUM, "50% (Compact),75% (Balanced),100% (Sparse)"), "set_sdfgi_y_scale", "get_sdfgi_y_scale");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "sdfgi_energy"), "set_sdfgi_energy", "get_sdfgi_energy");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "sdfgi_normal_bias"), "set_sdfgi_normal_bias", "get_sdfgi_normal_bias");
diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp
index 619036d296..e7d5d40777 100644
--- a/scene/resources/font.cpp
+++ b/scene/resources/font.cpp
@@ -2714,6 +2714,9 @@ void SystemFont::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_subpixel_positioning", "subpixel_positioning"), &SystemFont::set_subpixel_positioning);
 	ClassDB::bind_method(D_METHOD("get_subpixel_positioning"), &SystemFont::get_subpixel_positioning);
 
+	ClassDB::bind_method(D_METHOD("set_multichannel_signed_distance_field", "msdf"), &SystemFont::set_multichannel_signed_distance_field);
+	ClassDB::bind_method(D_METHOD("is_multichannel_signed_distance_field"), &SystemFont::is_multichannel_signed_distance_field);
+
 	ClassDB::bind_method(D_METHOD("set_oversampling", "oversampling"), &SystemFont::set_oversampling);
 	ClassDB::bind_method(D_METHOD("get_oversampling"), &SystemFont::get_oversampling);
 
@@ -2729,6 +2732,7 @@ void SystemFont::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "force_autohinter"), "set_force_autohinter", "is_force_autohinter");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "hinting", PROPERTY_HINT_ENUM, "None,Light,Normal"), "set_hinting", "get_hinting");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "subpixel_positioning", PROPERTY_HINT_ENUM, "Disabled,Auto,One half of a pixel,One quarter of a pixel"), "set_subpixel_positioning", "get_subpixel_positioning");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "multichannel_signed_distance_field"), "set_multichannel_signed_distance_field", "is_multichannel_signed_distance_field");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "oversampling", PROPERTY_HINT_RANGE, "0,10,0.1"), "set_oversampling", "get_oversampling");
 	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "fallbacks", PROPERTY_HINT_ARRAY_TYPE, vformat("%s/%s:%s", Variant::OBJECT, PROPERTY_HINT_RESOURCE_TYPE, "Font")), "set_fallbacks", "get_fallbacks");
 }
@@ -2805,9 +2809,12 @@ void SystemFont::_update_base_font() {
 		file->set_force_autohinter(force_autohinter);
 		file->set_hinting(hinting);
 		file->set_subpixel_positioning(subpixel_positioning);
+		file->set_multichannel_signed_distance_field(msdf);
 		file->set_oversampling(oversampling);
 
 		base_font = file;
+
+		break;
 	}
 
 	if (base_font.is_valid()) {
@@ -2840,6 +2847,7 @@ void SystemFont::reset_state() {
 	hinting = TextServer::HINTING_LIGHT;
 	subpixel_positioning = TextServer::SUBPIXEL_POSITIONING_DISABLED;
 	oversampling = 0.f;
+	msdf = false;
 
 	Font::reset_state();
 }
@@ -2969,6 +2977,20 @@ TextServer::SubpixelPositioning SystemFont::get_subpixel_positioning() const {
 	return subpixel_positioning;
 }
 
+void SystemFont::set_multichannel_signed_distance_field(bool p_msdf) {
+	if (msdf != p_msdf) {
+		msdf = p_msdf;
+		if (base_font.is_valid()) {
+			base_font->set_multichannel_signed_distance_field(msdf);
+		}
+		emit_changed();
+	}
+}
+
+bool SystemFont::is_multichannel_signed_distance_field() const {
+	return msdf;
+}
+
 void SystemFont::set_oversampling(real_t p_oversampling) {
 	if (oversampling != p_oversampling) {
 		oversampling = p_oversampling;
diff --git a/scene/resources/font.h b/scene/resources/font.h
index 260b4e521f..696152a23b 100644
--- a/scene/resources/font.h
+++ b/scene/resources/font.h
@@ -404,6 +404,7 @@ class SystemFont : public Font {
 	TextServer::Hinting hinting = TextServer::HINTING_LIGHT;
 	TextServer::SubpixelPositioning subpixel_positioning = TextServer::SUBPIXEL_POSITIONING_AUTO;
 	real_t oversampling = 0.f;
+	bool msdf = false;
 
 protected:
 	static void _bind_methods();
@@ -434,6 +435,9 @@ public:
 	virtual void set_oversampling(real_t p_oversampling);
 	virtual real_t get_oversampling() const;
 
+	virtual void set_multichannel_signed_distance_field(bool p_msdf);
+	virtual bool is_multichannel_signed_distance_field() const;
+
 	virtual void set_font_names(const PackedStringArray &p_names);
 	virtual PackedStringArray get_font_names() const;
 
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
index 1d7e6f6470..5d887dae17 100644
--- a/scene/resources/material.cpp
+++ b/scene/resources/material.cpp
@@ -154,18 +154,18 @@ Material::~Material() {
 
 bool ShaderMaterial::_set(const StringName &p_name, const Variant &p_value) {
 	if (shader.is_valid()) {
-		StringName pr = shader->remap_param(p_name);
+		StringName pr = shader->remap_uniform(p_name);
 		if (!pr) {
 			String n = p_name;
 			if (n.find("param/") == 0) { //backwards compatibility
 				pr = n.substr(6, n.length());
 			}
-			if (n.find("shader_param/") == 0) { //backwards compatibility
-				pr = n.replace_first("shader_param/", "");
+			if (n.find("shader_uniform/") == 0) { //backwards compatibility
+				pr = n.replace_first("shader_uniform/", "");
 			}
 		}
 		if (pr) {
-			set_shader_param(pr, p_value);
+			set_shader_uniform(pr, p_value);
 			return true;
 		}
 	}
@@ -175,14 +175,14 @@ bool ShaderMaterial::_set(const StringName &p_name, const Variant &p_value) {
 
 bool ShaderMaterial::_get(const StringName &p_name, Variant &r_ret) const {
 	if (shader.is_valid()) {
-		StringName pr = shader->remap_param(p_name);
+		StringName pr = shader->remap_uniform(p_name);
 		if (!pr) {
 			String n = p_name;
 			if (n.find("param/") == 0) { //backwards compatibility
 				pr = n.substr(6, n.length());
 			}
-			if (n.find("shader_param/") == 0) { //backwards compatibility
-				pr = n.replace_first("shader_param/", "");
+			if (n.find("shader_uniform/") == 0) { //backwards compatibility
+				pr = n.replace_first("shader_uniform/", "");
 			}
 		}
 
@@ -203,7 +203,7 @@ bool ShaderMaterial::_get(const StringName &p_name, Variant &r_ret) const {
 void ShaderMaterial::_get_property_list(List<PropertyInfo> *p_list) const {
 	if (!shader.is_null()) {
 		List<PropertyInfo> list;
-		shader->get_param_list(&list, true);
+		shader->get_shader_uniform_list(&list, true);
 
 		HashMap<String, HashMap<String, List<PropertyInfo>>> groups;
 		{
@@ -233,7 +233,7 @@ void ShaderMaterial::_get_property_list(List<PropertyInfo> *p_list) const {
 					if (!groups.has(last_group)) {
 						PropertyInfo info;
 						info.usage = PROPERTY_USAGE_GROUP;
-						info.name = last_group;
+						info.name = last_group.capitalize();
 
 						List<PropertyInfo> none_subgroup;
 						none_subgroup.push_back(info);
@@ -247,7 +247,7 @@ void ShaderMaterial::_get_property_list(List<PropertyInfo> *p_list) const {
 					if (!groups[last_group].has(last_subgroup)) {
 						PropertyInfo info;
 						info.usage = PROPERTY_USAGE_SUBGROUP;
-						info.name = last_subgroup;
+						info.name = last_subgroup.capitalize();
 
 						List<PropertyInfo> subgroup;
 						subgroup.push_back(info);
@@ -297,9 +297,9 @@ void ShaderMaterial::_get_property_list(List<PropertyInfo> *p_list) const {
 	}
 }
 
-bool ShaderMaterial::property_can_revert(const String &p_name) {
+bool ShaderMaterial::_property_can_revert(const StringName &p_name) const {
 	if (shader.is_valid()) {
-		StringName pr = shader->remap_param(p_name);
+		StringName pr = shader->remap_uniform(p_name);
 		if (pr) {
 			Variant default_value = RenderingServer::get_singleton()->shader_get_param_default(shader->get_rid(), pr);
 			Variant current_value;
@@ -310,15 +310,15 @@ bool ShaderMaterial::property_can_revert(const String &p_name) {
 	return false;
 }
 
-Variant ShaderMaterial::property_get_revert(const String &p_name) {
-	Variant r_ret;
+bool ShaderMaterial::_property_get_revert(const StringName &p_name, Variant &r_property) const {
 	if (shader.is_valid()) {
-		StringName pr = shader->remap_param(p_name);
+		StringName pr = shader->remap_uniform(p_name);
 		if (pr) {
-			r_ret = RenderingServer::get_singleton()->shader_get_param_default(shader->get_rid(), pr);
+			r_property = RenderingServer::get_singleton()->shader_get_param_default(shader->get_rid(), pr);
+			return true;
 		}
 	}
-	return r_ret;
+	return false;
 }
 
 void ShaderMaterial::set_shader(const Ref<Shader> &p_shader) {
@@ -349,7 +349,7 @@ Ref<Shader> ShaderMaterial::get_shader() const {
 	return shader;
 }
 
-void ShaderMaterial::set_shader_param(const StringName &p_param, const Variant &p_value) {
+void ShaderMaterial::set_shader_uniform(const StringName &p_param, const Variant &p_value) {
 	if (p_value.get_type() == Variant::NIL) {
 		param_cache.erase(p_param);
 		RS::get_singleton()->material_set_param(_get_material(), p_param, Variant());
@@ -369,7 +369,7 @@ void ShaderMaterial::set_shader_param(const StringName &p_param, const Variant &
 	}
 }
 
-Variant ShaderMaterial::get_shader_param(const StringName &p_param) const {
+Variant ShaderMaterial::get_shader_uniform(const StringName &p_param) const {
 	if (param_cache.has(p_param)) {
 		return param_cache[p_param];
 	} else {
@@ -384,22 +384,20 @@ void ShaderMaterial::_shader_changed() {
 void ShaderMaterial::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_shader", "shader"), &ShaderMaterial::set_shader);
 	ClassDB::bind_method(D_METHOD("get_shader"), &ShaderMaterial::get_shader);
-	ClassDB::bind_method(D_METHOD("set_shader_param", "param", "value"), &ShaderMaterial::set_shader_param);
-	ClassDB::bind_method(D_METHOD("get_shader_param", "param"), &ShaderMaterial::get_shader_param);
-	ClassDB::bind_method(D_METHOD("property_can_revert", "name"), &ShaderMaterial::property_can_revert);
-	ClassDB::bind_method(D_METHOD("property_get_revert", "name"), &ShaderMaterial::property_get_revert);
+	ClassDB::bind_method(D_METHOD("set_shader_uniform", "param", "value"), &ShaderMaterial::set_shader_uniform);
+	ClassDB::bind_method(D_METHOD("get_shader_uniform", "param"), &ShaderMaterial::get_shader_uniform);
 
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shader", PROPERTY_HINT_RESOURCE_TYPE, "Shader"), "set_shader", "get_shader");
 }
 
 void ShaderMaterial::get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const {
 	String f = p_function.operator String();
-	if ((f == "get_shader_param" || f == "set_shader_param") && p_idx == 0) {
+	if ((f == "get_shader_uniform" || f == "set_shader_uniform") && p_idx == 0) {
 		if (shader.is_valid()) {
 			List<PropertyInfo> pl;
-			shader->get_param_list(&pl);
+			shader->get_shader_uniform_list(&pl);
 			for (const PropertyInfo &E : pl) {
-				r_options->push_back(E.name.replace_first("shader_param/", "").quote());
+				r_options->push_back(E.name.replace_first("shader_uniform/", "").quote());
 			}
 		}
 	}
@@ -1067,7 +1065,8 @@ void BaseMaterial3D::_update_shader() {
 			code += "		float num_layers = mix(float(heightmap_max_layers),float(heightmap_min_layers), abs(dot(vec3(0.0, 0.0, 1.0), view_dir)));\n";
 			code += "		float layer_depth = 1.0 / num_layers;\n";
 			code += "		float current_layer_depth = 0.0;\n";
-			code += "		vec2 P = view_dir.xy * heightmap_scale;\n";
+			// Multiply the heightmap scale by 0.01 to improve heightmap scale usability.
+			code += "		vec2 P = view_dir.xy * heightmap_scale * 0.01;\n";
 			code += "		vec2 delta = P / num_layers;\n";
 			code += "		vec2 ofs = base_uv;\n";
 			if (flags[FLAG_INVERT_HEIGHTMAP]) {
@@ -1103,7 +1102,8 @@ void BaseMaterial3D::_update_shader() {
 			}
 			// Use offset limiting to improve the appearance of non-deep parallax.
 			// This reduces the impression of depth, but avoids visible warping in the distance.
-			code += "		vec2 ofs = base_uv - view_dir.xy * depth * heightmap_scale;\n";
+			// Multiply the heightmap scale by 0.01 to improve heightmap scale usability.
+			code += "		vec2 ofs = base_uv - view_dir.xy * depth * heightmap_scale * 0.01;\n";
 		}
 
 		code += "		base_uv=ofs;\n";
@@ -1276,38 +1276,21 @@ void BaseMaterial3D::_update_shader() {
 		if ((distance_fade == DISTANCE_FADE_OBJECT_DITHER || distance_fade == DISTANCE_FADE_PIXEL_DITHER)) {
 			if (!RenderingServer::get_singleton()->is_low_end()) {
 				code += "	{\n";
+
 				if (distance_fade == DISTANCE_FADE_OBJECT_DITHER) {
 					code += "		float fade_distance = abs((VIEW_MATRIX * MODEL_MATRIX[3]).z);\n";
 
 				} else {
-					code += "		float fade_distance=-VERTEX.z;\n";
+					code += "		float fade_distance = -VERTEX.z;\n";
 				}
+				// Use interleaved gradient noise, which is fast but still looks good.
+				code += "		const vec3 magic = vec3(0.06711056f, 0.00583715f, 52.9829189f);";
+				code += "		float fade = clamp(smoothstep(distance_fade_min, distance_fade_max, fade_distance), 0.0, 1.0);\n";
+				// Use a hard cap to prevent a few stray pixels from remaining when past the fade-out distance.
+				code += "		if (fade < 0.001 || fade < fract(magic.z * fract(dot(FRAGCOORD.xy, magic.xy)))) {\n";
+				code += "			discard;\n";
+				code += "		}\n";
 
-				code += "		float fade=clamp(smoothstep(distance_fade_min,distance_fade_max,fade_distance),0.0,1.0);\n";
-				code += "		int x = int(FRAGCOORD.x) % 4;\n";
-				code += "		int y = int(FRAGCOORD.y) % 4;\n";
-				code += "		int index = x + y * 4;\n";
-				code += "		float limit = 0.0;\n\n";
-				code += "		if (x < 8) {\n";
-				code += "			if (index == 0) limit = 0.0625;\n";
-				code += "			if (index == 1) limit = 0.5625;\n";
-				code += "			if (index == 2) limit = 0.1875;\n";
-				code += "			if (index == 3) limit = 0.6875;\n";
-				code += "			if (index == 4) limit = 0.8125;\n";
-				code += "			if (index == 5) limit = 0.3125;\n";
-				code += "			if (index == 6) limit = 0.9375;\n";
-				code += "			if (index == 7) limit = 0.4375;\n";
-				code += "			if (index == 8) limit = 0.25;\n";
-				code += "			if (index == 9) limit = 0.75;\n";
-				code += "			if (index == 10) limit = 0.125;\n";
-				code += "			if (index == 11) limit = 0.625;\n";
-				code += "			if (index == 12) limit = 1.0;\n";
-				code += "			if (index == 13) limit = 0.5;\n";
-				code += "			if (index == 14) limit = 0.875;\n";
-				code += "			if (index == 15) limit = 0.375;\n";
-				code += "		}\n\n";
-				code += "	if (fade < limit)\n";
-				code += "		discard;\n";
 				code += "	}\n\n";
 			}
 
@@ -2965,7 +2948,7 @@ BaseMaterial3D::BaseMaterial3D(bool p_orm) :
 	set_clearcoat(1);
 	set_clearcoat_roughness(0.5);
 	set_anisotropy(0);
-	set_heightmap_scale(0.05);
+	set_heightmap_scale(5.0);
 	set_subsurface_scattering_strength(0);
 	set_backlight(Color(0, 0, 0));
 	set_transmittance_color(Color(1, 1, 1, 1));
diff --git a/scene/resources/material.h b/scene/resources/material.h
index 8c04817c6b..6049671582 100644
--- a/scene/resources/material.h
+++ b/scene/resources/material.h
@@ -99,8 +99,8 @@ protected:
 	bool _set(const StringName &p_name, const Variant &p_value);
 	bool _get(const StringName &p_name, Variant &r_ret) const;
 	void _get_property_list(List<PropertyInfo> *p_list) const;
-	bool property_can_revert(const String &p_name);
-	Variant property_get_revert(const String &p_name);
+	bool _property_can_revert(const StringName &p_name) const;
+	bool _property_get_revert(const StringName &p_name, Variant &r_property) const;
 
 	static void _bind_methods();
 
@@ -115,8 +115,8 @@ public:
 	void set_shader(const Ref<Shader> &p_shader);
 	Ref<Shader> get_shader() const;
 
-	void set_shader_param(const StringName &p_param, const Variant &p_value);
-	Variant get_shader_param(const StringName &p_param) const;
+	void set_shader_uniform(const StringName &p_param, const Variant &p_value);
+	Variant get_shader_uniform(const StringName &p_param) const;
 
 	virtual Shader::Mode get_shader_mode() const override;
 
diff --git a/scene/resources/multimesh.cpp b/scene/resources/multimesh.cpp
index e5fc61ade5..ff4a7a4560 100644
--- a/scene/resources/multimesh.cpp
+++ b/scene/resources/multimesh.cpp
@@ -340,13 +340,13 @@ void MultiMesh::_bind_methods() {
 
 #ifndef DISABLE_DEPRECATED
 	// Kept for compatibility from 3.x to 4.0.
-	ClassDB::bind_method(D_METHOD("_set_transform_array"), &MultiMesh::_set_transform_array);
+	ClassDB::bind_method(D_METHOD("_set_transform_array", "array"), &MultiMesh::_set_transform_array);
 	ClassDB::bind_method(D_METHOD("_get_transform_array"), &MultiMesh::_get_transform_array);
-	ClassDB::bind_method(D_METHOD("_set_transform_2d_array"), &MultiMesh::_set_transform_2d_array);
+	ClassDB::bind_method(D_METHOD("_set_transform_2d_array", "array"), &MultiMesh::_set_transform_2d_array);
 	ClassDB::bind_method(D_METHOD("_get_transform_2d_array"), &MultiMesh::_get_transform_2d_array);
-	ClassDB::bind_method(D_METHOD("_set_color_array"), &MultiMesh::_set_color_array);
+	ClassDB::bind_method(D_METHOD("_set_color_array", "array"), &MultiMesh::_set_color_array);
 	ClassDB::bind_method(D_METHOD("_get_color_array"), &MultiMesh::_get_color_array);
-	ClassDB::bind_method(D_METHOD("_set_custom_data_array"), &MultiMesh::_set_custom_data_array);
+	ClassDB::bind_method(D_METHOD("_set_custom_data_array", "array"), &MultiMesh::_set_custom_data_array);
 	ClassDB::bind_method(D_METHOD("_get_custom_data_array"), &MultiMesh::_get_custom_data_array);
 
 	ADD_PROPERTY(PropertyInfo(Variant::PACKED_VECTOR3_ARRAY, "transform_array", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "_set_transform_array", "_get_transform_array");
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp
index ac67e6e5e9..0e1b18d584 100644
--- a/scene/resources/packed_scene.cpp
+++ b/scene/resources/packed_scene.cpp
@@ -1779,7 +1779,7 @@ void PackedScene::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("pack", "path"), &PackedScene::pack);
 	ClassDB::bind_method(D_METHOD("instantiate", "edit_state"), &PackedScene::instantiate, DEFVAL(GEN_EDIT_STATE_DISABLED));
 	ClassDB::bind_method(D_METHOD("can_instantiate"), &PackedScene::can_instantiate);
-	ClassDB::bind_method(D_METHOD("_set_bundled_scene"), &PackedScene::_set_bundled_scene);
+	ClassDB::bind_method(D_METHOD("_set_bundled_scene", "scene"), &PackedScene::_set_bundled_scene);
 	ClassDB::bind_method(D_METHOD("_get_bundled_scene"), &PackedScene::_get_bundled_scene);
 	ClassDB::bind_method(D_METHOD("get_state"), &PackedScene::get_state);
 
diff --git a/scene/resources/polygon_path_finder.cpp b/scene/resources/polygon_path_finder.cpp
index 29135e30c9..5e18671c11 100644
--- a/scene/resources/polygon_path_finder.cpp
+++ b/scene/resources/polygon_path_finder.cpp
@@ -553,7 +553,7 @@ void PolygonPathFinder::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_point_penalty", "idx"), &PolygonPathFinder::get_point_penalty);
 
 	ClassDB::bind_method(D_METHOD("get_bounds"), &PolygonPathFinder::get_bounds);
-	ClassDB::bind_method(D_METHOD("_set_data"), &PolygonPathFinder::_set_data);
+	ClassDB::bind_method(D_METHOD("_set_data", "data"), &PolygonPathFinder::_set_data);
 	ClassDB::bind_method(D_METHOD("_get_data"), &PolygonPathFinder::_get_data);
 
 	ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "_set_data", "_get_data");
diff --git a/scene/resources/primitive_meshes.cpp b/scene/resources/primitive_meshes.cpp
index 68441afb1c..f038a79b8f 100644
--- a/scene/resources/primitive_meshes.cpp
+++ b/scene/resources/primitive_meshes.cpp
@@ -1622,6 +1622,134 @@ bool SphereMesh::get_is_hemisphere() const {
 SphereMesh::SphereMesh() {}
 
 /**
+  TorusMesh
+*/
+
+void TorusMesh::_create_mesh_array(Array &p_arr) const {
+	// set our bounding box
+
+	Vector<Vector3> points;
+	Vector<Vector3> normals;
+	Vector<float> tangents;
+	Vector<Vector2> uvs;
+	Vector<int> indices;
+
+#define ADD_TANGENT(m_x, m_y, m_z, m_d) \
+	tangents.push_back(m_x);            \
+	tangents.push_back(m_y);            \
+	tangents.push_back(m_z);            \
+	tangents.push_back(m_d);
+
+	ERR_FAIL_COND_MSG(inner_radius == outer_radius, "Inner radius and outer radius cannot be the same.");
+
+	float min_radius = inner_radius;
+	float max_radius = outer_radius;
+
+	if (min_radius > max_radius) {
+		SWAP(min_radius, max_radius);
+	}
+
+	float radius = (max_radius - min_radius) * 0.5;
+
+	for (int i = 0; i <= rings; i++) {
+		int prevrow = (i - 1) * (ring_segments + 1);
+		int thisrow = i * (ring_segments + 1);
+		float inci = float(i) / rings;
+		float angi = inci * Math_TAU;
+
+		Vector2 normali = Vector2(-Math::sin(angi), -Math::cos(angi));
+
+		for (int j = 0; j <= ring_segments; j++) {
+			float incj = float(j) / ring_segments;
+			float angj = incj * Math_TAU;
+
+			Vector2 normalj = Vector2(-Math::cos(angj), Math::sin(angj));
+			Vector2 normalk = normalj * radius + Vector2(min_radius + radius, 0);
+
+			points.push_back(Vector3(normali.x * normalk.x, normalk.y, normali.y * normalk.x));
+			normals.push_back(Vector3(normali.x * normalj.x, normalj.y, normali.y * normalj.x));
+			ADD_TANGENT(-Math::cos(angi), 0.0, Math::sin(angi), 1.0);
+			uvs.push_back(Vector2(inci, incj));
+
+			if (i > 0 && j > 0) {
+				indices.push_back(thisrow + j - 1);
+				indices.push_back(prevrow + j);
+				indices.push_back(prevrow + j - 1);
+
+				indices.push_back(thisrow + j - 1);
+				indices.push_back(thisrow + j);
+				indices.push_back(prevrow + j);
+			}
+		}
+	}
+
+	p_arr[RS::ARRAY_VERTEX] = points;
+	p_arr[RS::ARRAY_NORMAL] = normals;
+	p_arr[RS::ARRAY_TANGENT] = tangents;
+	p_arr[RS::ARRAY_TEX_UV] = uvs;
+	p_arr[RS::ARRAY_INDEX] = indices;
+}
+
+void TorusMesh::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("set_inner_radius", "radius"), &TorusMesh::set_inner_radius);
+	ClassDB::bind_method(D_METHOD("get_inner_radius"), &TorusMesh::get_inner_radius);
+
+	ClassDB::bind_method(D_METHOD("set_outer_radius", "radius"), &TorusMesh::set_outer_radius);
+	ClassDB::bind_method(D_METHOD("get_outer_radius"), &TorusMesh::get_outer_radius);
+
+	ClassDB::bind_method(D_METHOD("set_rings", "rings"), &TorusMesh::set_rings);
+	ClassDB::bind_method(D_METHOD("get_rings"), &TorusMesh::get_rings);
+
+	ClassDB::bind_method(D_METHOD("set_ring_segments", "rings"), &TorusMesh::set_ring_segments);
+	ClassDB::bind_method(D_METHOD("get_ring_segments"), &TorusMesh::get_ring_segments);
+
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "inner_radius", PROPERTY_HINT_RANGE, "0.001,1000.0,0.001,or_greater,exp"), "set_inner_radius", "get_inner_radius");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "outer_radius", PROPERTY_HINT_RANGE, "0.001,1000.0,0.001,or_greater,exp"), "set_outer_radius", "get_outer_radius");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "rings", PROPERTY_HINT_RANGE, "3,128,1"), "set_rings", "get_rings");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "ring_segments", PROPERTY_HINT_RANGE, "3,64,1"), "set_ring_segments", "get_ring_segments");
+}
+
+void TorusMesh::set_inner_radius(const float p_inner_radius) {
+	inner_radius = p_inner_radius;
+	_request_update();
+}
+
+float TorusMesh::get_inner_radius() const {
+	return inner_radius;
+}
+
+void TorusMesh::set_outer_radius(const float p_outer_radius) {
+	outer_radius = p_outer_radius;
+	_request_update();
+}
+
+float TorusMesh::get_outer_radius() const {
+	return outer_radius;
+}
+
+void TorusMesh::set_rings(const int p_rings) {
+	ERR_FAIL_COND(p_rings < 3);
+	rings = p_rings;
+	_request_update();
+}
+
+int TorusMesh::get_rings() const {
+	return rings;
+}
+
+void TorusMesh::set_ring_segments(const int p_ring_segments) {
+	ERR_FAIL_COND(p_ring_segments < 3);
+	ring_segments = p_ring_segments;
+	_request_update();
+}
+
+int TorusMesh::get_ring_segments() const {
+	return ring_segments;
+}
+
+TorusMesh::TorusMesh() {}
+
+/**
   PointMesh
 */
 
diff --git a/scene/resources/primitive_meshes.h b/scene/resources/primitive_meshes.h
index ec124e379f..64eefd2c07 100644
--- a/scene/resources/primitive_meshes.h
+++ b/scene/resources/primitive_meshes.h
@@ -351,6 +351,38 @@ public:
 };
 
 /**
+	Big donut
+*/
+class TorusMesh : public PrimitiveMesh {
+	GDCLASS(TorusMesh, PrimitiveMesh);
+
+private:
+	float inner_radius = 0.5;
+	float outer_radius = 1.0;
+	int rings = 64;
+	int ring_segments = 32;
+
+protected:
+	static void _bind_methods();
+	virtual void _create_mesh_array(Array &p_arr) const override;
+
+public:
+	void set_inner_radius(const float p_inner_radius);
+	float get_inner_radius() const;
+
+	void set_outer_radius(const float p_outer_radius);
+	float get_outer_radius() const;
+
+	void set_rings(const int p_rings);
+	int get_rings() const;
+
+	void set_ring_segments(const int p_ring_segments);
+	int get_ring_segments() const;
+
+	TorusMesh();
+};
+
+/**
 	A single point for use in particle systems
 */
 
diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp
index 18fd6c8d25..48d06934e3 100644
--- a/scene/resources/shader.cpp
+++ b/scene/resources/shader.cpp
@@ -82,7 +82,7 @@ void Shader::set_code(const String &p_code) {
 		// 1) Need to keep track of include dependencies at resource level
 		// 2) Server does not do interaction with Resource filetypes, this is a scene level feature.
 		ShaderPreprocessor preprocessor;
-		preprocessor.preprocess(p_code, pp_code, nullptr, nullptr, &new_include_dependencies);
+		preprocessor.preprocess(p_code, "", pp_code, nullptr, nullptr, nullptr, &new_include_dependencies);
 	}
 
 	// This ensures previous include resources are not freed and then re-loaded during parse (which would make compiling slower)
@@ -103,11 +103,11 @@ String Shader::get_code() const {
 	return code;
 }
 
-void Shader::get_param_list(List<PropertyInfo> *p_params, bool p_get_groups) const {
+void Shader::get_shader_uniform_list(List<PropertyInfo> *p_params, bool p_get_groups) const {
 	_update_shader();
 
 	List<PropertyInfo> local;
-	RenderingServer::get_singleton()->shader_get_param_list(shader, &local);
+	RenderingServer::get_singleton()->shader_get_shader_uniform_list(shader, &local);
 	params_cache.clear();
 	params_cache_dirty = false;
 
@@ -176,8 +176,8 @@ bool Shader::is_text_shader() const {
 	return true;
 }
 
-bool Shader::has_param(const StringName &p_param) const {
-	return params_cache.has("shader_param/" + p_param);
+bool Shader::has_uniform(const StringName &p_param) const {
+	return params_cache.has("shader_uniform/" + p_param);
 }
 
 void Shader::_update_shader() const {
@@ -192,7 +192,7 @@ void Shader::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_default_texture_param", "param", "texture", "index"), &Shader::set_default_texture_param, DEFVAL(0));
 	ClassDB::bind_method(D_METHOD("get_default_texture_param", "param", "index"), &Shader::get_default_texture_param, DEFVAL(0));
 
-	ClassDB::bind_method(D_METHOD("has_param", "name"), &Shader::has_param);
+	ClassDB::bind_method(D_METHOD("has_uniform", "name"), &Shader::has_uniform);
 
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "code", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), "set_code", "get_code");
 
diff --git a/scene/resources/shader.h b/scene/resources/shader.h
index 082b37d355..abc953de5f 100644
--- a/scene/resources/shader.h
+++ b/scene/resources/shader.h
@@ -78,21 +78,21 @@ public:
 	void set_code(const String &p_code);
 	String get_code() const;
 
-	void get_param_list(List<PropertyInfo> *p_params, bool p_get_groups = false) const;
-	bool has_param(const StringName &p_param) const;
+	void get_shader_uniform_list(List<PropertyInfo> *p_params, bool p_get_groups = false) const;
+	bool has_uniform(const StringName &p_param) const;
 
-	void set_default_texture_param(const StringName &p_param, const Ref<Texture2D> &p_texture, int p_index = 0);
-	Ref<Texture2D> get_default_texture_param(const StringName &p_param, int p_index = 0) const;
+	void set_default_texture_param(const StringName &p_uniform, const Ref<Texture2D> &p_texture, int p_index = 0);
+	Ref<Texture2D> get_default_texture_param(const StringName &p_uniform, int p_index = 0) const;
 	void get_default_texture_param_list(List<StringName> *r_textures) const;
 
 	virtual bool is_text_shader() const;
 
-	_FORCE_INLINE_ StringName remap_param(const StringName &p_param) const {
+	_FORCE_INLINE_ StringName remap_uniform(const StringName &p_uniform) const {
 		if (params_cache_dirty) {
-			get_param_list(nullptr);
+			get_shader_uniform_list(nullptr);
 		}
 
-		const HashMap<StringName, StringName>::Iterator E = params_cache.find(p_param);
+		const HashMap<StringName, StringName>::Iterator E = params_cache.find(p_uniform);
 		if (E) {
 			return E->value;
 		}
diff --git a/scene/resources/shader_include.cpp b/scene/resources/shader_include.cpp
index 42435fe3c7..fe628dd323 100644
--- a/scene/resources/shader_include.cpp
+++ b/scene/resources/shader_include.cpp
@@ -47,7 +47,7 @@ void ShaderInclude::set_code(const String &p_code) {
 	{
 		String pp_code;
 		ShaderPreprocessor preprocessor;
-		preprocessor.preprocess(p_code, pp_code, nullptr, nullptr, &new_dependencies);
+		preprocessor.preprocess(p_code, "", pp_code, nullptr, nullptr, nullptr, &new_dependencies);
 	}
 
 	// This ensures previous include resources are not freed and then re-loaded during parse (which would make compiling slower)
diff --git a/scene/resources/sprite_frames.cpp b/scene/resources/sprite_frames.cpp
index 55c9d7397d..3533e86c3a 100644
--- a/scene/resources/sprite_frames.cpp
+++ b/scene/resources/sprite_frames.cpp
@@ -207,7 +207,7 @@ void SpriteFrames::_bind_methods() {
 
 	// `animations` property is for serialization.
 
-	ClassDB::bind_method(D_METHOD("_set_animations"), &SpriteFrames::_set_animations);
+	ClassDB::bind_method(D_METHOD("_set_animations", "animations"), &SpriteFrames::_set_animations);
 	ClassDB::bind_method(D_METHOD("_get_animations"), &SpriteFrames::_get_animations);
 
 	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "animations", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "_set_animations", "_get_animations");
diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp
index 05ed9238b8..e5c4974967 100644
--- a/scene/resources/texture.cpp
+++ b/scene/resources/texture.cpp
@@ -2537,13 +2537,6 @@ void GradientTexture2D::_bind_methods() {
 
 //////////////////////////////////////
 
-void ProxyTexture::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("set_base", "base"), &ProxyTexture::set_base);
-	ClassDB::bind_method(D_METHOD("get_base"), &ProxyTexture::get_base);
-
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "base", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_base", "get_base");
-}
-
 void ProxyTexture::set_base(const Ref<Texture2D> &p_texture) {
 	ERR_FAIL_COND(p_texture == this);
 
diff --git a/scene/resources/texture.h b/scene/resources/texture.h
index 36b193c5d4..7c5624bd09 100644
--- a/scene/resources/texture.h
+++ b/scene/resources/texture.h
@@ -883,8 +883,6 @@ VARIANT_ENUM_CAST(GradientTexture2D::Fill);
 VARIANT_ENUM_CAST(GradientTexture2D::Repeat);
 
 class ProxyTexture : public Texture2D {
-	GDCLASS(ProxyTexture, Texture2D);
-
 private:
 	mutable RID proxy_ph;
 	mutable RID proxy;
diff --git a/scene/resources/visual_shader.cpp b/scene/resources/visual_shader.cpp
index a67716d52b..fa24a95115 100644
--- a/scene/resources/visual_shader.cpp
+++ b/scene/resources/visual_shader.cpp
@@ -1698,13 +1698,13 @@ Error VisualShader::_write_node(Type type, StringBuilder *global_code, StringBui
 								inputs[i] = "(" + src_var + " ? 1.0 : 0.0)";
 							} break;
 							case VisualShaderNode::PORT_TYPE_VECTOR_2D: {
-								inputs[i] = "dot(" + src_var + ", vec2(0.5, 0.5))";
+								inputs[i] = src_var + ".x";
 							} break;
 							case VisualShaderNode::PORT_TYPE_VECTOR_3D: {
-								inputs[i] = "dot(" + src_var + ", vec3(0.333333, 0.333333, 0.333333))";
+								inputs[i] = src_var + ".x";
 							} break;
 							case VisualShaderNode::PORT_TYPE_VECTOR_4D: {
-								inputs[i] = "dot(" + src_var + ", vec4(0.25, 0.25, 0.25, 0.25))";
+								inputs[i] = src_var + ".x";
 							} break;
 							default:
 								break;
diff --git a/scene/resources/visual_shader_nodes.cpp b/scene/resources/visual_shader_nodes.cpp
index 5cc2073ca5..2911d726b4 100644
--- a/scene/resources/visual_shader_nodes.cpp
+++ b/scene/resources/visual_shader_nodes.cpp
@@ -1015,7 +1015,7 @@ Vector<StringName> VisualShaderNodeCurveTexture::get_editable_properties() const
 }
 
 String VisualShaderNodeCurveTexture::generate_global(Shader::Mode p_mode, VisualShader::Type p_type, int p_id) const {
-	return "uniform sampler2D " + make_unique_id(p_type, p_id, "curve") + ";\n";
+	return "uniform sampler2D " + make_unique_id(p_type, p_id, "curve") + " : repeat_disable;\n";
 }
 
 String VisualShaderNodeCurveTexture::generate_code(Shader::Mode p_mode, VisualShader::Type p_type, int p_id, const String *p_input_vars, const String *p_output_vars, bool p_for_preview) const {
@@ -1901,13 +1901,7 @@ String VisualShaderNodeVectorOp::generate_code(Shader::Mode p_mode, VisualShader
 			code += "atan(" + p_input_vars[0] + ", " + p_input_vars[1] + ");\n";
 			break;
 		case OP_REFLECT:
-			if (op_type == OP_TYPE_VECTOR_2D) { // Not supported.
-				code += "vec2(0.0);\n";
-			} else if (op_type == OP_TYPE_VECTOR_4D) { // Not supported.
-				code += "vec4(0.0);\n";
-			} else {
-				code += "reflect(" + p_input_vars[0] + ", " + p_input_vars[1] + ");\n";
-			}
+			code += "reflect(" + p_input_vars[0] + ", " + p_input_vars[1] + ");\n";
 			break;
 		case OP_STEP:
 			code += "step(" + p_input_vars[0] + ", " + p_input_vars[1] + ");\n";
@@ -1967,7 +1961,7 @@ String VisualShaderNodeVectorOp::get_warning(Shader::Mode p_mode, VisualShader::
 	bool invalid_type = false;
 
 	if (op_type == OP_TYPE_VECTOR_2D || op_type == OP_TYPE_VECTOR_4D) {
-		if (op == OP_CROSS || op == OP_REFLECT) {
+		if (op == OP_CROSS) {
 			invalid_type = true;
 		}
 	}
@@ -4006,14 +4000,6 @@ int VisualShaderNodeVectorRefract::get_input_port_count() const {
 	return 3;
 }
 
-VisualShaderNodeVectorRefract::PortType VisualShaderNodeVectorRefract::get_input_port_type(int p_port) const {
-	if (p_port == 2) {
-		return PORT_TYPE_SCALAR;
-	}
-
-	return PORT_TYPE_VECTOR_3D;
-}
-
 String VisualShaderNodeVectorRefract::get_input_port_name(int p_port) const {
 	switch (p_port) {
 		case 0:
@@ -4030,10 +4016,6 @@ int VisualShaderNodeVectorRefract::get_output_port_count() const {
 	return 1;
 }
 
-VisualShaderNodeVectorRefract::PortType VisualShaderNodeVectorRefract::get_output_port_type(int p_port) const {
-	return PORT_TYPE_VECTOR_3D;
-}
-
 String VisualShaderNodeVectorRefract::get_output_port_name(int p_port) const {
 	return "";
 }
@@ -4042,6 +4024,31 @@ String VisualShaderNodeVectorRefract::generate_code(Shader::Mode p_mode, VisualS
 	return "	" + p_output_vars[0] + " = refract(" + p_input_vars[0] + ", " + p_input_vars[1] + ", " + p_input_vars[2] + ");\n";
 }
 
+void VisualShaderNodeVectorRefract::set_op_type(OpType p_op_type) {
+	ERR_FAIL_INDEX(int(p_op_type), int(OP_TYPE_MAX));
+	if (op_type == p_op_type) {
+		return;
+	}
+	switch (p_op_type) {
+		case OP_TYPE_VECTOR_2D: {
+			set_input_port_default_value(0, Vector2(), get_input_port_default_value(0));
+			set_input_port_default_value(1, Vector2(), get_input_port_default_value(1));
+		} break;
+		case OP_TYPE_VECTOR_3D: {
+			set_input_port_default_value(0, Vector3(), get_input_port_default_value(0));
+			set_input_port_default_value(1, Vector3(), get_input_port_default_value(1));
+		} break;
+		case OP_TYPE_VECTOR_4D: {
+			set_input_port_default_value(0, Quaternion(), get_input_port_default_value(0));
+			set_input_port_default_value(1, Quaternion(), get_input_port_default_value(1));
+		} break;
+		default:
+			break;
+	}
+	op_type = p_op_type;
+	emit_changed();
+}
+
 VisualShaderNodeVectorRefract::VisualShaderNodeVectorRefract() {
 	set_input_port_default_value(0, Vector3(0.0, 0.0, 0.0));
 	set_input_port_default_value(1, Vector3(0.0, 0.0, 0.0));
@@ -6823,23 +6830,23 @@ void VisualShaderNodeMultiplyAdd::set_op_type(OpType p_op_type) {
 	switch (p_op_type) {
 		case OP_TYPE_SCALAR: {
 			set_input_port_default_value(0, 0.0, get_input_port_default_value(0));
-			set_input_port_default_value(1, 0.0, get_input_port_default_value(1));
+			set_input_port_default_value(1, 1.0, get_input_port_default_value(1));
 			set_input_port_default_value(2, 0.0, get_input_port_default_value(2));
 		} break;
 		case OP_TYPE_VECTOR_2D: {
 			set_input_port_default_value(0, Vector2(), get_input_port_default_value(0));
-			set_input_port_default_value(1, Vector2(), get_input_port_default_value(1));
+			set_input_port_default_value(1, Vector2(1.0, 1.0), get_input_port_default_value(1));
 			set_input_port_default_value(2, Vector2(), get_input_port_default_value(2));
 		} break;
 		case OP_TYPE_VECTOR_3D: {
 			set_input_port_default_value(0, Vector3(), get_input_port_default_value(0));
-			set_input_port_default_value(1, Vector3(), get_input_port_default_value(1));
+			set_input_port_default_value(1, Vector3(1.0, 1.0, 1.0), get_input_port_default_value(1));
 			set_input_port_default_value(2, Vector3(), get_input_port_default_value(2));
 		} break;
 		case OP_TYPE_VECTOR_4D: {
-			set_input_port_default_value(0, Quaternion(), get_input_port_default_value(0));
-			set_input_port_default_value(1, Quaternion(), get_input_port_default_value(1));
-			set_input_port_default_value(2, Quaternion(), get_input_port_default_value(2));
+			set_input_port_default_value(0, Vector4(), get_input_port_default_value(0));
+			set_input_port_default_value(1, Vector4(1.0, 1.0, 1.0, 1.0), get_input_port_default_value(1));
+			set_input_port_default_value(2, Vector4(), get_input_port_default_value(2));
 		} break;
 		default:
 			break;
@@ -6873,7 +6880,7 @@ void VisualShaderNodeMultiplyAdd::_bind_methods() {
 
 VisualShaderNodeMultiplyAdd::VisualShaderNodeMultiplyAdd() {
 	set_input_port_default_value(0, 0.0);
-	set_input_port_default_value(1, 0.0);
+	set_input_port_default_value(1, 1.0);
 	set_input_port_default_value(2, 0.0);
 }
 
diff --git a/scene/resources/visual_shader_nodes.h b/scene/resources/visual_shader_nodes.h
index f770156d14..ffcb41072d 100644
--- a/scene/resources/visual_shader_nodes.h
+++ b/scene/resources/visual_shader_nodes.h
@@ -1564,21 +1564,20 @@ public:
 /// REFRACT
 ///////////////////////////////////////
 
-class VisualShaderNodeVectorRefract : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeVectorRefract, VisualShaderNode);
+class VisualShaderNodeVectorRefract : public VisualShaderNodeVectorBase {
+	GDCLASS(VisualShaderNodeVectorRefract, VisualShaderNodeVectorBase);
 
 public:
 	virtual String get_caption() const override;
 
 	virtual int get_input_port_count() const override;
-	virtual PortType get_input_port_type(int p_port) const override;
 	virtual String get_input_port_name(int p_port) const override;
 
 	virtual int get_output_port_count() const override;
-	virtual PortType get_output_port_type(int p_port) const override;
 	virtual String get_output_port_name(int p_port) const override;
 
 	virtual String generate_code(Shader::Mode p_mode, VisualShader::Type p_type, int p_id, const String *p_input_vars, const String *p_output_vars, bool p_for_preview = false) const override;
+	virtual void set_op_type(OpType p_op_type) override;
 
 	VisualShaderNodeVectorRefract();
 };
diff --git a/servers/display_server.cpp b/servers/display_server.cpp
index e9bc28873b..ff6d769a86 100644
--- a/servers/display_server.cpp
+++ b/servers/display_server.cpp
@@ -44,40 +44,49 @@ DisplayServer::DisplayServerCreate DisplayServer::server_create_functions[Displa
 
 int DisplayServer::server_create_count = 1;
 
-void DisplayServer::global_menu_add_item(const String &p_menu_root, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
+int DisplayServer::global_menu_add_item(const String &p_menu_root, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
 	WARN_PRINT("Global menus not supported by this display server.");
+	return -1;
 }
 
-void DisplayServer::global_menu_add_check_item(const String &p_menu_root, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
+int DisplayServer::global_menu_add_check_item(const String &p_menu_root, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
 	WARN_PRINT("Global menus not supported by this display server.");
+	return -1;
 }
 
-void DisplayServer::global_menu_add_icon_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
+int DisplayServer::global_menu_add_icon_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
 	WARN_PRINT("Global menus not supported by this display server.");
+	return -1;
 }
 
-void DisplayServer::global_menu_add_icon_check_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
+int DisplayServer::global_menu_add_icon_check_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
 	WARN_PRINT("Global menus not supported by this display server.");
+	return -1;
 }
 
-void DisplayServer::global_menu_add_radio_check_item(const String &p_menu_root, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
+int DisplayServer::global_menu_add_radio_check_item(const String &p_menu_root, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
 	WARN_PRINT("Global menus not supported by this display server.");
+	return -1;
 }
 
-void DisplayServer::global_menu_add_icon_radio_check_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
+int DisplayServer::global_menu_add_icon_radio_check_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
 	WARN_PRINT("Global menus not supported by this display server.");
+	return -1;
 }
 
-void DisplayServer::global_menu_add_multistate_item(const String &p_menu_root, const String &p_label, int p_max_states, int p_default_state, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
+int DisplayServer::global_menu_add_multistate_item(const String &p_menu_root, const String &p_label, int p_max_states, int p_default_state, const Callable &p_callback, const Variant &p_tag, Key p_accel, int p_index) {
 	WARN_PRINT("Global menus not supported by this display server.");
+	return -1;
 }
 
-void DisplayServer::global_menu_add_submenu_item(const String &p_menu_root, const String &p_label, const String &p_submenu, int p_index) {
+int DisplayServer::global_menu_add_submenu_item(const String &p_menu_root, const String &p_label, const String &p_submenu, int p_index) {
 	WARN_PRINT("Global menus not supported by this display server.");
+	return -1;
 }
 
-void DisplayServer::global_menu_add_separator(const String &p_menu_root, int p_index) {
+int DisplayServer::global_menu_add_separator(const String &p_menu_root, int p_index) {
 	WARN_PRINT("Global menus not supported by this display server.");
+	return -1;
 }
 
 int DisplayServer::global_menu_get_item_index_from_text(const String &p_menu_root, const String &p_text) const {
@@ -159,6 +168,11 @@ Ref<Texture2D> DisplayServer::global_menu_get_item_icon(const String &p_menu_roo
 	return Ref<Texture2D>();
 }
 
+int DisplayServer::global_menu_get_item_indentation_level(const String &p_menu_root, int p_idx) const {
+	WARN_PRINT("Global menus not supported by this display server.");
+	return 0;
+}
+
 void DisplayServer::global_menu_set_item_checked(const String &p_menu_root, int p_idx, bool p_checked) {
 	WARN_PRINT("Global menus not supported by this display server.");
 }
@@ -207,6 +221,10 @@ void DisplayServer::global_menu_set_item_icon(const String &p_menu_root, int p_i
 	WARN_PRINT("Global menus not supported by this display server.");
 }
 
+void DisplayServer::global_menu_set_item_indentation_level(const String &p_menu_root, int p_idx, int p_level) {
+	WARN_PRINT("Global menus not supported by this display server.");
+}
+
 int DisplayServer::global_menu_get_item_count(const String &p_menu_root) const {
 	WARN_PRINT("Global menus not supported by this display server.");
 	return 0;
@@ -400,7 +418,7 @@ String DisplayServer::ime_get_text() const {
 	ERR_FAIL_V_MSG(String(), "IME or NOTIFICATION_WM_IME_UPDATEnot supported by this display server.");
 }
 
-void DisplayServer::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, bool p_multiline, int p_max_length, int p_cursor_start, int p_cursor_end) {
+void DisplayServer::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, VirtualKeyboardType p_type, int p_max_length, int p_cursor_start, int p_cursor_end) {
 	WARN_PRINT("Virtual keyboard not supported by this display server.");
 }
 
@@ -494,11 +512,11 @@ int64_t DisplayServer::window_get_native_handle(HandleType p_handle_type, Window
 }
 
 void DisplayServer::window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, WindowID p_window) {
-	WARN_PRINT("Changing the VSync mode is not supported by this display server.");
+	WARN_PRINT("Changing the V-Sync mode is not supported by this display server.");
 }
 
 DisplayServer::VSyncMode DisplayServer::window_get_vsync_mode(WindowID p_window) const {
-	WARN_PRINT("Changing the VSync mode is not supported by this display server.");
+	WARN_PRINT("Changing the V-Sync mode is not supported by this display server.");
 	return VSyncMode::VSYNC_ENABLED;
 }
 
@@ -535,6 +553,7 @@ void DisplayServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("global_menu_get_item_state", "menu_root", "idx"), &DisplayServer::global_menu_get_item_state);
 	ClassDB::bind_method(D_METHOD("global_menu_get_item_max_states", "menu_root", "idx"), &DisplayServer::global_menu_get_item_max_states);
 	ClassDB::bind_method(D_METHOD("global_menu_get_item_icon", "menu_root", "idx"), &DisplayServer::global_menu_get_item_icon);
+	ClassDB::bind_method(D_METHOD("global_menu_get_item_indentation_level", "menu_root", "idx"), &DisplayServer::global_menu_get_item_indentation_level);
 
 	ClassDB::bind_method(D_METHOD("global_menu_set_item_checked", "menu_root", "idx", "checked"), &DisplayServer::global_menu_set_item_checked);
 	ClassDB::bind_method(D_METHOD("global_menu_set_item_checkable", "menu_root", "idx", "checkable"), &DisplayServer::global_menu_set_item_checkable);
@@ -549,6 +568,7 @@ void DisplayServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("global_menu_set_item_state", "menu_root", "idx", "state"), &DisplayServer::global_menu_set_item_state);
 	ClassDB::bind_method(D_METHOD("global_menu_set_item_max_states", "menu_root", "idx", "max_states"), &DisplayServer::global_menu_set_item_max_states);
 	ClassDB::bind_method(D_METHOD("global_menu_set_item_icon", "menu_root", "idx", "icon"), &DisplayServer::global_menu_set_item_icon);
+	ClassDB::bind_method(D_METHOD("global_menu_set_item_indentation_level", "menu_root", "idx", "level"), &DisplayServer::global_menu_set_item_indentation_level);
 
 	ClassDB::bind_method(D_METHOD("global_menu_remove_item", "menu_root", "idx"), &DisplayServer::global_menu_remove_item);
 	ClassDB::bind_method(D_METHOD("global_menu_clear", "menu_root"), &DisplayServer::global_menu_clear);
@@ -660,7 +680,7 @@ void DisplayServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("ime_get_selection"), &DisplayServer::ime_get_selection);
 	ClassDB::bind_method(D_METHOD("ime_get_text"), &DisplayServer::ime_get_text);
 
-	ClassDB::bind_method(D_METHOD("virtual_keyboard_show", "existing_text", "position", "multiline", "max_length", "cursor_start", "cursor_end"), &DisplayServer::virtual_keyboard_show, DEFVAL(Rect2()), DEFVAL(false), DEFVAL(-1), DEFVAL(-1), DEFVAL(-1));
+	ClassDB::bind_method(D_METHOD("virtual_keyboard_show", "existing_text", "position", "type", "max_length", "cursor_start", "cursor_end"), &DisplayServer::virtual_keyboard_show, DEFVAL(Rect2()), DEFVAL(KEYBOARD_TYPE_DEFAULT), DEFVAL(-1), DEFVAL(-1), DEFVAL(-1));
 	ClassDB::bind_method(D_METHOD("virtual_keyboard_hide"), &DisplayServer::virtual_keyboard_hide);
 
 	ClassDB::bind_method(D_METHOD("virtual_keyboard_get_height"), &DisplayServer::virtual_keyboard_get_height);
@@ -732,6 +752,15 @@ void DisplayServer::_bind_methods() {
 	BIND_ENUM_CONSTANT(SCREEN_SENSOR_PORTRAIT);
 	BIND_ENUM_CONSTANT(SCREEN_SENSOR);
 
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_DEFAULT);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_MULTILINE);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_NUMBER);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_NUMBER_DECIMAL);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_PHONE);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_EMAIL_ADDRESS);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_PASSWORD);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_URL);
+
 	BIND_ENUM_CONSTANT(CURSOR_ARROW);
 	BIND_ENUM_CONSTANT(CURSOR_IBEAM);
 	BIND_ENUM_CONSTANT(CURSOR_POINTING_HAND);
diff --git a/servers/display_server.h b/servers/display_server.h
index 7a15df2f92..a5c42617af 100644
--- a/servers/display_server.h
+++ b/servers/display_server.h
@@ -127,15 +127,15 @@ public:
 	virtual bool has_feature(Feature p_feature) const = 0;
 	virtual String get_name() const = 0;
 
-	virtual void global_menu_add_item(const String &p_menu_root, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1);
-	virtual void global_menu_add_check_item(const String &p_menu_root, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1);
-	virtual void global_menu_add_icon_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1);
-	virtual void global_menu_add_icon_check_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1);
-	virtual void global_menu_add_radio_check_item(const String &p_menu_root, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1);
-	virtual void global_menu_add_icon_radio_check_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1);
-	virtual void global_menu_add_multistate_item(const String &p_menu_root, const String &p_label, int p_max_states, int p_default_state, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1);
-	virtual void global_menu_add_submenu_item(const String &p_menu_root, const String &p_label, const String &p_submenu, int p_index = -1);
-	virtual void global_menu_add_separator(const String &p_menu_root, int p_index = -1);
+	virtual int global_menu_add_item(const String &p_menu_root, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1);
+	virtual int global_menu_add_check_item(const String &p_menu_root, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1);
+	virtual int global_menu_add_icon_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1);
+	virtual int global_menu_add_icon_check_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1);
+	virtual int global_menu_add_radio_check_item(const String &p_menu_root, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1);
+	virtual int global_menu_add_icon_radio_check_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1);
+	virtual int global_menu_add_multistate_item(const String &p_menu_root, const String &p_label, int p_max_states, int p_default_state, const Callable &p_callback = Callable(), const Variant &p_tag = Variant(), Key p_accel = Key::NONE, int p_index = -1);
+	virtual int global_menu_add_submenu_item(const String &p_menu_root, const String &p_label, const String &p_submenu, int p_index = -1);
+	virtual int global_menu_add_separator(const String &p_menu_root, int p_index = -1);
 
 	virtual int global_menu_get_item_index_from_text(const String &p_menu_root, const String &p_text) const;
 	virtual int global_menu_get_item_index_from_tag(const String &p_menu_root, const Variant &p_tag) const;
@@ -153,6 +153,7 @@ public:
 	virtual int global_menu_get_item_state(const String &p_menu_root, int p_idx) const;
 	virtual int global_menu_get_item_max_states(const String &p_menu_root, int p_idx) const;
 	virtual Ref<Texture2D> global_menu_get_item_icon(const String &p_menu_root, int p_idx) const;
+	virtual int global_menu_get_item_indentation_level(const String &p_menu_root, int p_idx) const;
 
 	virtual void global_menu_set_item_checked(const String &p_menu_root, int p_idx, bool p_checked);
 	virtual void global_menu_set_item_checkable(const String &p_menu_root, int p_idx, bool p_checkable);
@@ -167,6 +168,7 @@ public:
 	virtual void global_menu_set_item_state(const String &p_menu_root, int p_idx, int p_state);
 	virtual void global_menu_set_item_max_states(const String &p_menu_root, int p_idx, int p_max_states);
 	virtual void global_menu_set_item_icon(const String &p_menu_root, int p_idx, const Ref<Texture2D> &p_icon);
+	virtual void global_menu_set_item_indentation_level(const String &p_menu_root, int p_idx, int p_level);
 
 	virtual int global_menu_get_item_count(const String &p_menu_root) const;
 
@@ -382,7 +384,18 @@ public:
 	virtual Point2i ime_get_selection() const;
 	virtual String ime_get_text() const;
 
-	virtual void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2(), bool p_multiline = false, int p_max_length = -1, int p_cursor_start = -1, int p_cursor_end = -1);
+	enum VirtualKeyboardType {
+		KEYBOARD_TYPE_DEFAULT,
+		KEYBOARD_TYPE_MULTILINE,
+		KEYBOARD_TYPE_NUMBER,
+		KEYBOARD_TYPE_NUMBER_DECIMAL,
+		KEYBOARD_TYPE_PHONE,
+		KEYBOARD_TYPE_EMAIL_ADDRESS,
+		KEYBOARD_TYPE_PASSWORD,
+		KEYBOARD_TYPE_URL
+	};
+
+	virtual void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2(), VirtualKeyboardType p_type = KEYBOARD_TYPE_DEFAULT, int p_max_length = -1, int p_cursor_start = -1, int p_cursor_end = -1);
 	virtual void virtual_keyboard_hide();
 
 	// returns height of the currently shown virtual keyboard (0 if keyboard is hidden)
@@ -467,6 +480,7 @@ VARIANT_ENUM_CAST(DisplayServer::ScreenOrientation)
 VARIANT_ENUM_CAST(DisplayServer::WindowMode)
 VARIANT_ENUM_CAST(DisplayServer::WindowFlags)
 VARIANT_ENUM_CAST(DisplayServer::HandleType)
+VARIANT_ENUM_CAST(DisplayServer::VirtualKeyboardType);
 VARIANT_ENUM_CAST(DisplayServer::CursorShape)
 VARIANT_ENUM_CAST(DisplayServer::VSyncMode)
 VARIANT_ENUM_CAST(DisplayServer::TTSUtteranceEvent)
diff --git a/servers/navigation_server_2d.cpp b/servers/navigation_server_2d.cpp
index 5e9f1c824a..27b49014d8 100644
--- a/servers/navigation_server_2d.cpp
+++ b/servers/navigation_server_2d.cpp
@@ -158,12 +158,53 @@ void NavigationServer2D::_emit_map_changed(RID p_map) {
 	emit_signal(SNAME("map_changed"), p_map);
 }
 
+#ifdef DEBUG_ENABLED
+void NavigationServer2D::set_debug_enabled(bool p_enabled) {
+	NavigationServer3D::get_singleton_mut()->set_debug_enabled(p_enabled);
+}
+bool NavigationServer2D::get_debug_enabled() const {
+	return NavigationServer3D::get_singleton()->get_debug_enabled();
+}
+
+void NavigationServer2D::set_debug_navigation_edge_connection_color(const Color &p_color) {
+	NavigationServer3D::get_singleton_mut()->set_debug_navigation_edge_connection_color(p_color);
+}
+
+Color NavigationServer2D::get_debug_navigation_edge_connection_color() const {
+	return NavigationServer3D::get_singleton()->get_debug_navigation_edge_connection_color();
+}
+
+void NavigationServer2D::set_debug_navigation_geometry_face_color(const Color &p_color) {
+	NavigationServer3D::get_singleton_mut()->set_debug_navigation_geometry_face_color(p_color);
+}
+
+Color NavigationServer2D::get_debug_navigation_geometry_face_color() const {
+	return NavigationServer3D::get_singleton()->get_debug_navigation_geometry_face_color();
+}
+
+void NavigationServer2D::set_debug_navigation_geometry_face_disabled_color(const Color &p_color) {
+	NavigationServer3D::get_singleton_mut()->set_debug_navigation_geometry_face_disabled_color(p_color);
+}
+
+Color NavigationServer2D::get_debug_navigation_geometry_face_disabled_color() const {
+	return NavigationServer3D::get_singleton()->get_debug_navigation_geometry_face_disabled_color();
+}
+
+void NavigationServer2D::set_debug_navigation_enable_edge_connections(const bool p_value) {
+	NavigationServer3D::get_singleton_mut()->set_debug_navigation_enable_edge_connections(p_value);
+}
+
+bool NavigationServer2D::get_debug_navigation_enable_edge_connections() const {
+	return NavigationServer3D::get_singleton()->get_debug_navigation_enable_edge_connections();
+}
+#endif // DEBUG_ENABLED
+
 void NavigationServer2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_maps"), &NavigationServer2D::get_maps);
 
 	ClassDB::bind_method(D_METHOD("map_create"), &NavigationServer2D::map_create);
 	ClassDB::bind_method(D_METHOD("map_set_active", "map", "active"), &NavigationServer2D::map_set_active);
-	ClassDB::bind_method(D_METHOD("map_is_active", "nap"), &NavigationServer2D::map_is_active);
+	ClassDB::bind_method(D_METHOD("map_is_active", "map"), &NavigationServer2D::map_is_active);
 	ClassDB::bind_method(D_METHOD("map_set_cell_size", "map", "cell_size"), &NavigationServer2D::map_set_cell_size);
 	ClassDB::bind_method(D_METHOD("map_get_cell_size", "map"), &NavigationServer2D::map_get_cell_size);
 	ClassDB::bind_method(D_METHOD("map_set_edge_connection_margin", "map", "margin"), &NavigationServer2D::map_set_edge_connection_margin);
diff --git a/servers/navigation_server_2d.h b/servers/navigation_server_2d.h
index 1b15c7ff37..83271f990e 100644
--- a/servers/navigation_server_2d.h
+++ b/servers/navigation_server_2d.h
@@ -184,6 +184,23 @@ public:
 
 	NavigationServer2D();
 	virtual ~NavigationServer2D();
+
+#ifdef DEBUG_ENABLED
+	void set_debug_enabled(bool p_enabled);
+	bool get_debug_enabled() const;
+
+	void set_debug_navigation_edge_connection_color(const Color &p_color);
+	Color get_debug_navigation_edge_connection_color() const;
+
+	void set_debug_navigation_geometry_face_color(const Color &p_color);
+	Color get_debug_navigation_geometry_face_color() const;
+
+	void set_debug_navigation_geometry_face_disabled_color(const Color &p_color);
+	Color get_debug_navigation_geometry_face_disabled_color() const;
+
+	void set_debug_navigation_enable_edge_connections(const bool p_value);
+	bool get_debug_navigation_enable_edge_connections() const;
+#endif // DEBUG_ENABLED
 };
 
 #endif // NAVIGATION_SERVER_2D_H
diff --git a/servers/navigation_server_3d.cpp b/servers/navigation_server_3d.cpp
index 52855c5931..206698f97c 100644
--- a/servers/navigation_server_3d.cpp
+++ b/servers/navigation_server_3d.cpp
@@ -41,7 +41,7 @@ void NavigationServer3D::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("map_create"), &NavigationServer3D::map_create);
 	ClassDB::bind_method(D_METHOD("map_set_active", "map", "active"), &NavigationServer3D::map_set_active);
-	ClassDB::bind_method(D_METHOD("map_is_active", "nap"), &NavigationServer3D::map_is_active);
+	ClassDB::bind_method(D_METHOD("map_is_active", "map"), &NavigationServer3D::map_is_active);
 	ClassDB::bind_method(D_METHOD("map_set_up", "map", "up"), &NavigationServer3D::map_set_up);
 	ClassDB::bind_method(D_METHOD("map_get_up", "map"), &NavigationServer3D::map_get_up);
 	ClassDB::bind_method(D_METHOD("map_set_cell_size", "map", "cell_size"), &NavigationServer3D::map_set_cell_size);
@@ -123,6 +123,12 @@ NavigationServer3D::NavigationServer3D() {
 	debug_navigation_enable_edge_lines = GLOBAL_DEF("debug/shapes/navigation/enable_edge_lines", true);
 	debug_navigation_enable_edge_lines_xray = GLOBAL_DEF("debug/shapes/navigation/enable_edge_lines_xray", true);
 	debug_navigation_enable_geometry_face_random_color = GLOBAL_DEF("debug/shapes/navigation/enable_geometry_face_random_color", true);
+
+	if (Engine::get_singleton()->is_editor_hint()) {
+		// enable NavigationServer3D when in Editor or else navmesh edge connections are invisible
+		// on runtime tests SceneTree has "Visible Navigation" set and main iteration takes care of this
+		set_debug_enabled(true);
+	}
 #endif // DEBUG_ENABLED
 }
 
diff --git a/servers/physics_2d/godot_area_2d.cpp b/servers/physics_2d/godot_area_2d.cpp
index 96c8dfc69e..af90f96438 100644
--- a/servers/physics_2d/godot_area_2d.cpp
+++ b/servers/physics_2d/godot_area_2d.cpp
@@ -248,6 +248,10 @@ void GodotArea2D::call_queries() {
 				Callable::CallError ce;
 				Variant ret;
 				monitor_callback.callp((const Variant **)resptr, 5, ret, ce);
+
+				if (ce.error != Callable::CallError::CALL_OK) {
+					ERR_PRINT_ONCE("Error calling event callback method " + Variant::get_callable_error_text(monitor_callback, (const Variant **)resptr, 5, ce));
+				}
 			}
 		} else {
 			monitored_bodies.clear();
@@ -286,6 +290,10 @@ void GodotArea2D::call_queries() {
 				Callable::CallError ce;
 				Variant ret;
 				area_monitor_callback.callp((const Variant **)resptr, 5, ret, ce);
+
+				if (ce.error != Callable::CallError::CALL_OK) {
+					ERR_PRINT_ONCE("Error calling event callback method " + Variant::get_callable_error_text(area_monitor_callback, (const Variant **)resptr, 5, ce));
+				}
 			}
 		} else {
 			monitored_areas.clear();
diff --git a/servers/physics_3d/godot_area_3d.cpp b/servers/physics_3d/godot_area_3d.cpp
index fdb9f42b40..9765d0bf58 100644
--- a/servers/physics_3d/godot_area_3d.cpp
+++ b/servers/physics_3d/godot_area_3d.cpp
@@ -277,6 +277,10 @@ void GodotArea3D::call_queries() {
 				Callable::CallError ce;
 				Variant ret;
 				monitor_callback.callp((const Variant **)resptr, 5, ret, ce);
+
+				if (ce.error != Callable::CallError::CALL_OK) {
+					ERR_PRINT_ONCE("Error calling monitor callback method " + Variant::get_callable_error_text(monitor_callback, (const Variant **)resptr, 5, ce));
+				}
 			}
 		} else {
 			monitored_bodies.clear();
@@ -315,6 +319,10 @@ void GodotArea3D::call_queries() {
 				Callable::CallError ce;
 				Variant ret;
 				area_monitor_callback.callp((const Variant **)resptr, 5, ret, ce);
+
+				if (ce.error != Callable::CallError::CALL_OK) {
+					ERR_PRINT_ONCE("Error calling area monitor callback method " + Variant::get_callable_error_text(area_monitor_callback, (const Variant **)resptr, 5, ce));
+				}
 			}
 		} else {
 			monitored_areas.clear();
diff --git a/servers/physics_3d/godot_space_3d.cpp b/servers/physics_3d/godot_space_3d.cpp
index 533d7605ce..13e9a89b2e 100644
--- a/servers/physics_3d/godot_space_3d.cpp
+++ b/servers/physics_3d/godot_space_3d.cpp
@@ -989,6 +989,7 @@ bool GodotSpace3D::test_body_motion(GodotBody3D *p_body, const PhysicsServer3D::
 				r_result->collision_unsafe_fraction = unsafe;
 
 				r_result->collision_count = rcd.result_count;
+				r_result->collision_depth = rcd.best_result.len;
 			}
 
 			collided = true;
@@ -1002,6 +1003,7 @@ bool GodotSpace3D::test_body_motion(GodotBody3D *p_body, const PhysicsServer3D::
 
 		r_result->collision_safe_fraction = 1.0;
 		r_result->collision_unsafe_fraction = 1.0;
+		r_result->collision_depth = 0.0;
 	}
 
 	return collided;
diff --git a/servers/physics_server_2d.cpp b/servers/physics_server_2d.cpp
index 41aae36785..26768e300c 100644
--- a/servers/physics_server_2d.cpp
+++ b/servers/physics_server_2d.cpp
@@ -147,6 +147,16 @@ PhysicsDirectBodyState2D::PhysicsDirectBodyState2D() {}
 
 ///////////////////////////////////////////////////////
 
+Ref<PhysicsRayQueryParameters2D> PhysicsRayQueryParameters2D::create(Vector2 p_from, Vector2 p_to, uint32_t p_mask, const Vector<RID> &p_exclude) {
+	Ref<PhysicsRayQueryParameters2D> params;
+	params.instantiate();
+	params->set_from(p_from);
+	params->set_to(p_to);
+	params->set_collision_mask(p_mask);
+	params->set_exclude(p_exclude);
+	return params;
+}
+
 void PhysicsRayQueryParameters2D::set_exclude(const Vector<RID> &p_exclude) {
 	parameters.exclude.clear();
 	for (int i = 0; i < p_exclude.size(); i++) {
@@ -165,6 +175,8 @@ Vector<RID> PhysicsRayQueryParameters2D::get_exclude() const {
 }
 
 void PhysicsRayQueryParameters2D::_bind_methods() {
+	ClassDB::bind_static_method("PhysicsRayQueryParameters2D", D_METHOD("create", "from", "to", "collision_mask", "exclude"), &PhysicsRayQueryParameters2D::create, DEFVAL(UINT32_MAX), DEFVAL(Vector<RID>()));
+
 	ClassDB::bind_method(D_METHOD("set_from", "from"), &PhysicsRayQueryParameters2D::set_from);
 	ClassDB::bind_method(D_METHOD("get_from"), &PhysicsRayQueryParameters2D::get_from);
 
diff --git a/servers/physics_server_2d.h b/servers/physics_server_2d.h
index 7a821c64e6..6d95c591c2 100644
--- a/servers/physics_server_2d.h
+++ b/servers/physics_server_2d.h
@@ -605,6 +605,7 @@ protected:
 	static void _bind_methods();
 
 public:
+	static Ref<PhysicsRayQueryParameters2D> create(Vector2 p_from, Vector2 p_to, uint32_t p_mask, const Vector<RID> &p_exclude);
 	const PhysicsDirectSpaceState2D::RayParameters &get_parameters() const { return parameters; }
 
 	void set_from(const Vector2 &p_from) { parameters.from = p_from; }
diff --git a/servers/physics_server_3d.cpp b/servers/physics_server_3d.cpp
index a606d055f7..f25db22e66 100644
--- a/servers/physics_server_3d.cpp
+++ b/servers/physics_server_3d.cpp
@@ -184,6 +184,8 @@ Vector<RID> PhysicsRayQueryParameters3D::get_exclude() const {
 }
 
 void PhysicsRayQueryParameters3D::_bind_methods() {
+	ClassDB::bind_static_method("PhysicsRayQueryParameters3D", D_METHOD("create", "from", "to", "collision_mask", "exclude"), &PhysicsRayQueryParameters3D::create, DEFVAL(UINT32_MAX), DEFVAL(Vector<RID>()));
+
 	ClassDB::bind_method(D_METHOD("set_from", "from"), &PhysicsRayQueryParameters3D::set_from);
 	ClassDB::bind_method(D_METHOD("get_from"), &PhysicsRayQueryParameters3D::get_from);
 
@@ -220,6 +222,16 @@ void PhysicsRayQueryParameters3D::_bind_methods() {
 
 ///////////////////////////////////////////////////////
 
+Ref<PhysicsRayQueryParameters3D> PhysicsRayQueryParameters3D::create(Vector3 p_from, Vector3 p_to, uint32_t p_mask, const Vector<RID> &p_exclude) {
+	Ref<PhysicsRayQueryParameters3D> params;
+	params.instantiate();
+	params->set_from(p_from);
+	params->set_to(p_to);
+	params->set_collision_mask(p_mask);
+	params->set_exclude(p_exclude);
+	return params;
+}
+
 void PhysicsPointQueryParameters3D::set_exclude(const Vector<RID> &p_exclude) {
 	parameters.exclude.clear();
 	for (int i = 0; i < p_exclude.size(); i++) {
diff --git a/servers/physics_server_3d.h b/servers/physics_server_3d.h
index 86a41d96ef..12497c0bdf 100644
--- a/servers/physics_server_3d.h
+++ b/servers/physics_server_3d.h
@@ -550,6 +550,7 @@ public:
 	struct MotionResult {
 		Vector3 travel;
 		Vector3 remainder;
+		real_t collision_depth = 0.0;
 		real_t collision_safe_fraction = 0.0;
 		real_t collision_unsafe_fraction = 0.0;
 
@@ -816,6 +817,7 @@ protected:
 	static void _bind_methods();
 
 public:
+	static Ref<PhysicsRayQueryParameters3D> create(Vector3 p_from, Vector3 p_to, uint32_t p_mask, const Vector<RID> &p_exclude);
 	const PhysicsDirectSpaceState3D::RayParameters &get_parameters() const { return parameters; }
 
 	void set_from(const Vector3 &p_from) { parameters.from = p_from; }
diff --git a/servers/rendering/dummy/storage/material_storage.h b/servers/rendering/dummy/storage/material_storage.h
index 55c42330cf..e25a2ac3a9 100644
--- a/servers/rendering/dummy/storage/material_storage.h
+++ b/servers/rendering/dummy/storage/material_storage.h
@@ -66,7 +66,7 @@ public:
 	virtual void shader_set_path_hint(RID p_shader, const String &p_code) override {}
 
 	virtual String shader_get_code(RID p_shader) const override { return ""; }
-	virtual void shader_get_param_list(RID p_shader, List<PropertyInfo> *p_param_list) const override {}
+	virtual void shader_get_shader_uniform_list(RID p_shader, List<PropertyInfo> *p_param_list) const override {}
 
 	virtual void shader_set_default_texture_param(RID p_shader, const StringName &p_name, RID p_texture, int p_index) override {}
 	virtual RID shader_get_default_texture_param(RID p_shader, const StringName &p_name, int p_index) const override { return RID(); }
@@ -89,7 +89,7 @@ public:
 
 	virtual bool material_is_animated(RID p_material) override { return false; }
 	virtual bool material_casts_shadows(RID p_material) override { return false; }
-	virtual void material_get_instance_shader_parameters(RID p_material, List<InstanceShaderParam> *r_parameters) override {}
+	virtual void material_get_instance_shader_uniforms(RID p_material, List<InstanceShaderParam> *r_parameters) override {}
 	virtual void material_update_dependency(RID p_material, DependencyTracker *p_instance) override {}
 };
 
diff --git a/servers/rendering/renderer_geometry_instance.cpp b/servers/rendering/renderer_geometry_instance.cpp
index 3a9bab022c..675659f4c8 100644
--- a/servers/rendering/renderer_geometry_instance.cpp
+++ b/servers/rendering/renderer_geometry_instance.cpp
@@ -117,8 +117,8 @@ void RenderGeometryInstanceBase::set_use_dynamic_gi(bool p_enable) {
 	_mark_dirty();
 }
 
-void RenderGeometryInstanceBase::set_instance_shader_parameters_offset(int32_t p_offset) {
-	shader_parameters_offset = p_offset;
+void RenderGeometryInstanceBase::set_instance_shader_uniforms_offset(int32_t p_offset) {
+	shader_uniforms_offset = p_offset;
 
 	_mark_dirty();
 }
diff --git a/servers/rendering/renderer_geometry_instance.h b/servers/rendering/renderer_geometry_instance.h
index 279566d5c9..fecb9878c2 100644
--- a/servers/rendering/renderer_geometry_instance.h
+++ b/servers/rendering/renderer_geometry_instance.h
@@ -59,7 +59,7 @@ public:
 	virtual void set_use_dynamic_gi(bool p_enable) = 0;
 	virtual void set_use_lightmap(RID p_lightmap_instance, const Rect2 &p_lightmap_uv_scale, int p_lightmap_slice_index) = 0;
 	virtual void set_lightmap_capture(const Color *p_sh9) = 0;
-	virtual void set_instance_shader_parameters_offset(int32_t p_offset) = 0;
+	virtual void set_instance_shader_uniforms_offset(int32_t p_offset) = 0;
 	virtual void set_cast_double_sided_shadows(bool p_enable) = 0;
 
 	virtual Transform3D get_transform() = 0;
@@ -104,7 +104,7 @@ public:
 	float parent_fade_alpha = 1.0;
 	float force_alpha = 1.0;
 
-	int32_t shader_parameters_offset = -1;
+	int32_t shader_uniforms_offset = -1;
 
 	struct Data {
 		//data used less often goes into regular heap
@@ -140,7 +140,7 @@ public:
 	virtual void set_transparency(float p_transparency) override;
 	virtual void set_use_baked_light(bool p_enable) override;
 	virtual void set_use_dynamic_gi(bool p_enable) override;
-	virtual void set_instance_shader_parameters_offset(int32_t p_offset) override;
+	virtual void set_instance_shader_uniforms_offset(int32_t p_offset) override;
 	virtual void set_cast_double_sided_shadows(bool p_enable) override;
 
 	virtual Transform3D get_transform() override;
diff --git a/servers/rendering/renderer_rd/environment/fog.cpp b/servers/rendering/renderer_rd/environment/fog.cpp
index a61d1c4d02..257b67cf04 100644
--- a/servers/rendering/renderer_rd/environment/fog.cpp
+++ b/servers/rendering/renderer_rd/environment/fog.cpp
@@ -378,7 +378,7 @@ void Fog::FogShaderData::set_default_texture_param(const StringName &p_name, RID
 	}
 }
 
-void Fog::FogShaderData::get_param_list(List<PropertyInfo> *p_param_list) const {
+void Fog::FogShaderData::get_shader_uniform_list(List<PropertyInfo> *p_param_list) const {
 	RBMap<int, StringName> order;
 
 	for (const KeyValue<StringName, ShaderLanguage::ShaderNode::Uniform> &E : uniforms) {
@@ -500,7 +500,7 @@ Fog::VolumetricFog::VolumetricFog(const Vector3i &fog_size, RID p_sky_shader) {
 	fog_map = RD::get_singleton()->texture_create(tf, RD::TextureView());
 	RD::get_singleton()->set_resource_name(fog_map, "Fog map");
 
-#if defined(OSX_ENABLED) || defined(IPHONE_ENABLED)
+#if defined(MACOS_ENABLED) || defined(IOS_ENABLED)
 	Vector<uint8_t> dm;
 	dm.resize(fog_size.x * fog_size.y * fog_size.z * 4);
 	dm.fill(0);
@@ -643,7 +643,7 @@ void Fog::volumetric_fog_update(const VolumetricFogSettings &p_settings, const P
 
 			{
 				RD::Uniform u;
-#if defined(OSX_ENABLED) || defined(IPHONE_ENABLED)
+#if defined(MACOS_ENABLED) || defined(IOS_ENABLED)
 				u.uniform_type = RD::UNIFORM_TYPE_STORAGE_BUFFER;
 #else
 				u.uniform_type = RD::UNIFORM_TYPE_IMAGE;
@@ -663,7 +663,7 @@ void Fog::volumetric_fog_update(const VolumetricFogSettings &p_settings, const P
 
 			{
 				RD::Uniform u;
-#if defined(OSX_ENABLED) || defined(IPHONE_ENABLED)
+#if defined(MACOS_ENABLED) || defined(IOS_ENABLED)
 				u.uniform_type = RD::UNIFORM_TYPE_STORAGE_BUFFER;
 #else
 				u.uniform_type = RD::UNIFORM_TYPE_IMAGE;
@@ -675,7 +675,7 @@ void Fog::volumetric_fog_update(const VolumetricFogSettings &p_settings, const P
 
 			{
 				RD::Uniform u;
-#if defined(OSX_ENABLED) || defined(IPHONE_ENABLED)
+#if defined(MACOS_ENABLED) || defined(IOS_ENABLED)
 				u.uniform_type = RD::UNIFORM_TYPE_STORAGE_BUFFER;
 #else
 				u.uniform_type = RD::UNIFORM_TYPE_IMAGE;
@@ -949,7 +949,7 @@ void Fog::volumetric_fog_update(const VolumetricFogSettings &p_settings, const P
 		}
 		{
 			RD::Uniform u;
-#if defined(OSX_ENABLED) || defined(IPHONE_ENABLED)
+#if defined(MACOS_ENABLED) || defined(IOS_ENABLED)
 			u.uniform_type = RD::UNIFORM_TYPE_STORAGE_BUFFER;
 #else
 			u.uniform_type = RD::UNIFORM_TYPE_IMAGE;
@@ -960,7 +960,7 @@ void Fog::volumetric_fog_update(const VolumetricFogSettings &p_settings, const P
 		}
 		{
 			RD::Uniform u;
-#if defined(OSX_ENABLED) || defined(IPHONE_ENABLED)
+#if defined(MACOS_ENABLED) || defined(IOS_ENABLED)
 			u.uniform_type = RD::UNIFORM_TYPE_STORAGE_BUFFER;
 #else
 			u.uniform_type = RD::UNIFORM_TYPE_IMAGE;
@@ -972,7 +972,7 @@ void Fog::volumetric_fog_update(const VolumetricFogSettings &p_settings, const P
 
 		{
 			RD::Uniform u;
-#if defined(OSX_ENABLED) || defined(IPHONE_ENABLED)
+#if defined(MACOS_ENABLED) || defined(IOS_ENABLED)
 			u.uniform_type = RD::UNIFORM_TYPE_STORAGE_BUFFER;
 #else
 			u.uniform_type = RD::UNIFORM_TYPE_IMAGE;
diff --git a/servers/rendering/renderer_rd/environment/fog.h b/servers/rendering/renderer_rd/environment/fog.h
index 7002d6c872..171f9f3b88 100644
--- a/servers/rendering/renderer_rd/environment/fog.h
+++ b/servers/rendering/renderer_rd/environment/fog.h
@@ -200,7 +200,7 @@ private:
 		virtual void set_path_hint(const String &p_hint);
 		virtual void set_code(const String &p_Code);
 		virtual void set_default_texture_param(const StringName &p_name, RID p_texture, int p_index);
-		virtual void get_param_list(List<PropertyInfo> *p_param_list) const;
+		virtual void get_shader_uniform_list(List<PropertyInfo> *p_param_list) const;
 		virtual void get_instance_param_list(List<RendererMaterialStorage::InstanceShaderParam> *p_param_list) const;
 		virtual bool is_param_texture(const StringName &p_param) const;
 		virtual bool is_animated() const;
diff --git a/servers/rendering/renderer_rd/environment/gi.cpp b/servers/rendering/renderer_rd/environment/gi.cpp
index feafcc42c9..eaef5ba39c 100644
--- a/servers/rendering/renderer_rd/environment/gi.cpp
+++ b/servers/rendering/renderer_rd/environment/gi.cpp
@@ -1140,6 +1140,7 @@ void GI::SDFGI::erase() {
 
 	RD::get_singleton()->free(lightprobe_data);
 	RD::get_singleton()->free(lightprobe_history_scroll);
+	RD::get_singleton()->free(lightprobe_average_scroll);
 	RD::get_singleton()->free(occlusion_data);
 	RD::get_singleton()->free(ambient_texture);
 
@@ -2427,18 +2428,7 @@ void GI::VoxelGIInstance::update(bool p_update_light_instances, const Vector<RID
 
 	if (last_probe_data_version != data_version) {
 		//need to re-create everything
-		if (texture.is_valid()) {
-			RD::get_singleton()->free(texture);
-			RD::get_singleton()->free(write_buffer);
-			mipmaps.clear();
-		}
-
-		for (int i = 0; i < dynamic_maps.size(); i++) {
-			RD::get_singleton()->free(dynamic_maps[i].texture);
-			RD::get_singleton()->free(dynamic_maps[i].depth);
-		}
-
-		dynamic_maps.clear();
+		free_resources();
 
 		Vector3i octree_size = gi->voxel_gi_get_octree_size(probe);
 
@@ -3130,6 +3120,37 @@ void GI::VoxelGIInstance::update(bool p_update_light_instances, const Vector<RID
 	last_probe_version = gi->voxel_gi_get_version(probe);
 }
 
+void GI::VoxelGIInstance::free_resources() {
+	if (texture.is_valid()) {
+		RD::get_singleton()->free(texture);
+		RD::get_singleton()->free(write_buffer);
+
+		texture = RID();
+		write_buffer = RID();
+		mipmaps.clear();
+	}
+
+	for (int i = 0; i < dynamic_maps.size(); i++) {
+		RD::get_singleton()->free(dynamic_maps[i].texture);
+		RD::get_singleton()->free(dynamic_maps[i].depth);
+
+		// these only exist on the first level...
+		if (dynamic_maps[i].fb_depth.is_valid()) {
+			RD::get_singleton()->free(dynamic_maps[i].fb_depth);
+		}
+		if (dynamic_maps[i].albedo.is_valid()) {
+			RD::get_singleton()->free(dynamic_maps[i].albedo);
+		}
+		if (dynamic_maps[i].normal.is_valid()) {
+			RD::get_singleton()->free(dynamic_maps[i].normal);
+		}
+		if (dynamic_maps[i].orm.is_valid()) {
+			RD::get_singleton()->free(dynamic_maps[i].orm);
+		}
+	}
+	dynamic_maps.clear();
+}
+
 void GI::VoxelGIInstance::debug(RD::DrawListID p_draw_list, RID p_framebuffer, const Projection &p_camera_with_transform, bool p_lighting, bool p_emission, float p_alpha) {
 	RendererRD::MaterialStorage *material_storage = RendererRD::MaterialStorage::get_singleton();
 
@@ -3936,6 +3957,12 @@ RID GI::voxel_gi_instance_create(RID p_base) {
 	return rid;
 }
 
+void GI::voxel_gi_instance_free(RID p_rid) {
+	GI::VoxelGIInstance *voxel_gi = voxel_gi_instance_owner.get_or_null(p_rid);
+	voxel_gi->free_resources();
+	voxel_gi_instance_owner.free(p_rid);
+}
+
 void GI::voxel_gi_instance_set_transform_to_data(RID p_probe, const Transform3D &p_xform) {
 	VoxelGIInstance *voxel_gi = get_probe_instance(p_probe);
 	ERR_FAIL_COND(!voxel_gi);
diff --git a/servers/rendering/renderer_rd/environment/gi.h b/servers/rendering/renderer_rd/environment/gi.h
index 304df1605b..8860445c3b 100644
--- a/servers/rendering/renderer_rd/environment/gi.h
+++ b/servers/rendering/renderer_rd/environment/gi.h
@@ -469,6 +469,7 @@ public:
 
 		void update(bool p_update_light_instances, const Vector<RID> &p_light_instances, const PagedArray<RenderGeometryInstance *> &p_dynamic_objects, RendererSceneRenderRD *p_scene_render);
 		void debug(RD::DrawListID p_draw_list, RID p_framebuffer, const Projection &p_camera_with_transform, bool p_lighting, bool p_emission, float p_alpha);
+		void free_resources();
 	};
 
 	mutable RID_Owner<VoxelGIInstance> voxel_gi_instance_owner;
@@ -483,6 +484,12 @@ public:
 		return voxel_gi->texture;
 	};
 
+	bool voxel_gi_instance_owns(RID p_rid) const {
+		return voxel_gi_instance_owner.owns(p_rid);
+	}
+
+	void voxel_gi_instance_free(RID p_rid);
+
 	RS::VoxelGIQuality voxel_gi_quality = RS::VOXEL_GI_QUALITY_LOW;
 
 	/* SDFGI */
diff --git a/servers/rendering/renderer_rd/environment/sky.cpp b/servers/rendering/renderer_rd/environment/sky.cpp
index bef288a13b..d3601274b5 100644
--- a/servers/rendering/renderer_rd/environment/sky.cpp
+++ b/servers/rendering/renderer_rd/environment/sky.cpp
@@ -168,7 +168,7 @@ void SkyRD::SkyShaderData::set_default_texture_param(const StringName &p_name, R
 	}
 }
 
-void SkyRD::SkyShaderData::get_param_list(List<PropertyInfo> *p_param_list) const {
+void SkyRD::SkyShaderData::get_shader_uniform_list(List<PropertyInfo> *p_param_list) const {
 	HashMap<int, StringName> order;
 
 	for (const KeyValue<StringName, ShaderLanguage::ShaderNode::Uniform> &E : uniforms) {
diff --git a/servers/rendering/renderer_rd/environment/sky.h b/servers/rendering/renderer_rd/environment/sky.h
index c5a2e2c298..080165c112 100644
--- a/servers/rendering/renderer_rd/environment/sky.h
+++ b/servers/rendering/renderer_rd/environment/sky.h
@@ -131,7 +131,7 @@ private:
 		virtual void set_code(const String &p_Code);
 		virtual void set_path_hint(const String &p_hint);
 		virtual void set_default_texture_param(const StringName &p_name, RID p_texture, int p_index);
-		virtual void get_param_list(List<PropertyInfo> *p_param_list) const;
+		virtual void get_shader_uniform_list(List<PropertyInfo> *p_param_list) const;
 		virtual void get_instance_param_list(List<RendererMaterialStorage::InstanceShaderParam> *p_param_list) const;
 		virtual bool is_param_texture(const StringName &p_param) const;
 		virtual bool is_animated() const;
diff --git a/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp b/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp
index c3af0868e0..8754e90647 100644
--- a/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp
+++ b/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp
@@ -1076,7 +1076,7 @@ void RenderForwardClustered::_fill_instance_data(RenderListType p_render_list, i
 		instance_data.flags = inst->flags_cache;
 		instance_data.gi_offset = inst->gi_offset_cache;
 		instance_data.layer_mask = inst->layer_mask;
-		instance_data.instance_uniforms_ofs = uint32_t(inst->shader_parameters_offset);
+		instance_data.instance_uniforms_ofs = uint32_t(inst->shader_uniforms_offset);
 		instance_data.lightmap_uv_scale[0] = inst->lightmap_uv_scale.position.x;
 		instance_data.lightmap_uv_scale[1] = inst->lightmap_uv_scale.position.y;
 		instance_data.lightmap_uv_scale[2] = inst->lightmap_uv_scale.size.x;
diff --git a/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp b/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp
index 6f8b70d181..0911ee595f 100644
--- a/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp
+++ b/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp
@@ -392,7 +392,7 @@ void SceneShaderForwardClustered::ShaderData::set_default_texture_param(const St
 	}
 }
 
-void SceneShaderForwardClustered::ShaderData::get_param_list(List<PropertyInfo> *p_param_list) const {
+void SceneShaderForwardClustered::ShaderData::get_shader_uniform_list(List<PropertyInfo> *p_param_list) const {
 	HashMap<int, StringName> order;
 
 	for (const KeyValue<StringName, ShaderLanguage::ShaderNode::Uniform> &E : uniforms) {
diff --git a/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.h b/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.h
index 579a252298..d6b526fa4a 100644
--- a/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.h
+++ b/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.h
@@ -183,7 +183,7 @@ public:
 		virtual void set_code(const String &p_Code);
 		virtual void set_path_hint(const String &p_path);
 		virtual void set_default_texture_param(const StringName &p_name, RID p_texture, int p_index);
-		virtual void get_param_list(List<PropertyInfo> *p_param_list) const;
+		virtual void get_shader_uniform_list(List<PropertyInfo> *p_param_list) const;
 		void get_instance_param_list(List<RendererMaterialStorage::InstanceShaderParam> *p_param_list) const;
 
 		virtual bool is_param_texture(const StringName &p_param) const;
diff --git a/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp b/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp
index f74ad7617d..ffd47cc163 100644
--- a/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp
+++ b/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp
@@ -1903,7 +1903,7 @@ void RenderForwardMobile::_render_list_template(RenderingDevice::DrawListID p_dr
 		push_constant.flags = inst->flags_cache;
 		push_constant.gi_offset = inst->gi_offset_cache;
 		push_constant.layer_mask = inst->layer_mask;
-		push_constant.instance_uniforms_ofs = uint32_t(inst->shader_parameters_offset);
+		push_constant.instance_uniforms_ofs = uint32_t(inst->shader_uniforms_offset);
 
 		if (p_params->pass_mode == PASS_MODE_DEPTH_MATERIAL) {
 			// abuse lightmap_uv_scale[0] here, should not be needed here
diff --git a/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp b/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp
index 8abfe5640a..85c9e1db2a 100644
--- a/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp
+++ b/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp
@@ -348,7 +348,7 @@ void SceneShaderForwardMobile::ShaderData::set_default_texture_param(const Strin
 	}
 }
 
-void SceneShaderForwardMobile::ShaderData::get_param_list(List<PropertyInfo> *p_param_list) const {
+void SceneShaderForwardMobile::ShaderData::get_shader_uniform_list(List<PropertyInfo> *p_param_list) const {
 	HashMap<int, StringName> order;
 
 	for (const KeyValue<StringName, ShaderLanguage::ShaderNode::Uniform> &E : uniforms) {
diff --git a/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h b/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h
index 1bb8a08ccf..e208334547 100644
--- a/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h
+++ b/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h
@@ -142,7 +142,7 @@ public:
 		virtual void set_path_hint(const String &p_path);
 
 		virtual void set_default_texture_param(const StringName &p_name, RID p_texture, int p_index);
-		virtual void get_param_list(List<PropertyInfo> *p_param_list) const;
+		virtual void get_shader_uniform_list(List<PropertyInfo> *p_param_list) const;
 		void get_instance_param_list(List<RendererMaterialStorage::InstanceShaderParam> *p_param_list) const;
 
 		virtual bool is_param_texture(const StringName &p_param) const;
diff --git a/modules/websocket/emws_server.h b/servers/rendering/renderer_rd/framebuffer_cache_rd.cpp
index 14a9449605..9baa86a32d 100644
--- a/modules/websocket/emws_server.h
+++ b/servers/rendering/renderer_rd/framebuffer_cache_rd.cpp
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  emws_server.h                                                        */
+/*  framebuffer_cache_rd.cpp                                             */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,37 +28,37 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef EMWS_SERVER_H
-#define EMWS_SERVER_H
+#include "framebuffer_cache_rd.h"
 
-#ifdef JAVASCRIPT_ENABLED
+FramebufferCacheRD *FramebufferCacheRD::singleton = nullptr;
 
-#include "core/object/ref_counted.h"
-#include "emws_peer.h"
-#include "websocket_server.h"
+void FramebufferCacheRD::_invalidate(Cache *p_cache) {
+	if (p_cache->prev) {
+		p_cache->prev->next = p_cache->next;
+	} else {
+		// At beginning of table
+		uint32_t table_idx = p_cache->hash % HASH_TABLE_SIZE;
+		hash_table[table_idx] = p_cache->next;
+	}
 
-class EMWSServer : public WebSocketServer {
-	GDCIIMPL(EMWSServer, WebSocketServer);
+	if (p_cache->next) {
+		p_cache->next->prev = p_cache->prev;
+	}
 
-public:
-	Error set_buffers(int p_in_buffer, int p_in_packets, int p_out_buffer, int p_out_packets) override;
-	void set_extra_headers(const Vector<String> &p_headers) override;
-	Error listen(int p_port, Vector<String> p_protocols = Vector<String>(), bool gd_mp_api = false) override;
-	void stop() override;
-	bool is_listening() const override;
-	bool has_peer(int p_id) const override;
-	Ref<WebSocketPeer> get_peer(int p_id) const override;
-	IPAddress get_peer_address(int p_peer_id) const override;
-	int get_peer_port(int p_peer_id) const override;
-	void disconnect_peer(int p_peer_id, int p_code = 1000, String p_reason = "") override;
-	int get_max_packet_size() const override;
-	virtual void poll() override;
-	virtual Vector<String> get_protocols() const;
+	cache_allocator.free(p_cache);
+	cache_instances_used--;
+}
+void FramebufferCacheRD::_framebuffer_invalidation_callback(void *p_userdata) {
+	singleton->_invalidate(reinterpret_cast<Cache *>(p_userdata));
+}
 
-	EMWSServer();
-	~EMWSServer();
-};
+FramebufferCacheRD::FramebufferCacheRD() {
+	ERR_FAIL_COND(singleton != nullptr);
+	singleton = this;
+}
 
-#endif
-
-#endif // EMWS_SERVER_H
+FramebufferCacheRD::~FramebufferCacheRD() {
+	if (cache_instances_used > 0) {
+		ERR_PRINT("At exit: " + itos(cache_instances_used) + " framebuffer cache instance(s) still in use.");
+	}
+}
diff --git a/servers/rendering/renderer_rd/framebuffer_cache_rd.h b/servers/rendering/renderer_rd/framebuffer_cache_rd.h
new file mode 100644
index 0000000000..f360e0fc6b
--- /dev/null
+++ b/servers/rendering/renderer_rd/framebuffer_cache_rd.h
@@ -0,0 +1,310 @@
+/*************************************************************************/
+/*  framebuffer_cache_rd.h                                               */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef FRAMEBUFFER_CACHE_RD_H
+#define FRAMEBUFFER_CACHE_RD_H
+
+#include "core/templates/local_vector.h"
+#include "core/templates/paged_allocator.h"
+#include "servers/rendering/rendering_device.h"
+
+class FramebufferCacheRD : public Object {
+	GDCLASS(FramebufferCacheRD, Object)
+
+	struct Cache {
+		Cache *prev = nullptr;
+		Cache *next = nullptr;
+		uint32_t hash = 0;
+		RID cache;
+		LocalVector<RID> textures;
+		LocalVector<RD::FramebufferPass> passes;
+		uint32_t views = 0;
+	};
+
+	PagedAllocator<Cache> cache_allocator;
+
+	enum {
+		HASH_TABLE_SIZE = 16381 // Prime
+	};
+
+	Cache *hash_table[HASH_TABLE_SIZE] = {};
+
+	static _FORCE_INLINE_ uint32_t _hash_pass(const RD::FramebufferPass &p, uint32_t h) {
+		h = hash_murmur3_one_32(p.depth_attachment, h);
+		h = hash_murmur3_one_32(p.vrs_attachment, h);
+
+		h = hash_murmur3_one_32(p.color_attachments.size(), h);
+		for (int i = 0; i < p.color_attachments.size(); i++) {
+			h = hash_murmur3_one_32(p.color_attachments[i], h);
+		}
+
+		h = hash_murmur3_one_32(p.resolve_attachments.size(), h);
+		for (int i = 0; i < p.resolve_attachments.size(); i++) {
+			h = hash_murmur3_one_32(p.resolve_attachments[i], h);
+		}
+
+		h = hash_murmur3_one_32(p.preserve_attachments.size(), h);
+		for (int i = 0; i < p.preserve_attachments.size(); i++) {
+			h = hash_murmur3_one_32(p.preserve_attachments[i], h);
+		}
+
+		return h;
+	}
+
+	static _FORCE_INLINE_ bool _compare_pass(const RD::FramebufferPass &a, const RD::FramebufferPass &b) {
+		if (a.depth_attachment != b.depth_attachment) {
+			return false;
+		}
+
+		if (a.vrs_attachment != b.vrs_attachment) {
+			return false;
+		}
+
+		if (a.color_attachments.size() != b.color_attachments.size()) {
+			return false;
+		}
+
+		for (int i = 0; i < a.color_attachments.size(); i++) {
+			if (a.color_attachments[i] != b.color_attachments[i]) {
+				return false;
+			}
+		}
+
+		if (a.resolve_attachments.size() != b.resolve_attachments.size()) {
+			return false;
+		}
+
+		for (int i = 0; i < a.resolve_attachments.size(); i++) {
+			if (a.resolve_attachments[i] != b.resolve_attachments[i]) {
+				return false;
+			}
+		}
+
+		if (a.preserve_attachments.size() != b.preserve_attachments.size()) {
+			return false;
+		}
+
+		for (int i = 0; i < a.preserve_attachments.size(); i++) {
+			if (a.preserve_attachments[i] != b.preserve_attachments[i]) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	_FORCE_INLINE_ uint32_t _hash_rids(uint32_t h, const RID &arg) {
+		return hash_murmur3_one_64(arg.get_id(), h);
+	}
+
+	template <typename... Args>
+	uint32_t _hash_rids(uint32_t h, const RID &arg, Args... args) {
+		h = hash_murmur3_one_64(arg.get_id(), h);
+		return _hash_rids(h, args...);
+	}
+
+	_FORCE_INLINE_ bool _compare_args(uint32_t idx, const LocalVector<RID> &textures, const RID &arg) {
+		return textures[idx] == arg;
+	}
+
+	template <typename... Args>
+	_FORCE_INLINE_ bool _compare_args(uint32_t idx, const LocalVector<RID> &textures, const RID &arg, Args... args) {
+		if (textures[idx] != arg) {
+			return false;
+		}
+		return _compare_args(idx + 1, textures, args...);
+	}
+
+	_FORCE_INLINE_ void _create_args(Vector<RID> &textures, const RID &arg) {
+		textures.push_back(arg);
+	}
+
+	template <typename... Args>
+	_FORCE_INLINE_ void _create_args(Vector<RID> &textures, const RID &arg, Args... args) {
+		textures.push_back(arg);
+		_create_args(textures, args...);
+	}
+
+	static FramebufferCacheRD *singleton;
+
+	uint32_t cache_instances_used = 0;
+
+	void _invalidate(Cache *p_cache);
+	static void _framebuffer_invalidation_callback(void *p_userdata);
+
+	RID _allocate_from_data(uint32_t p_views, uint32_t p_hash, uint32_t p_table_idx, const Vector<RID> &p_textures, const Vector<RD::FramebufferPass> &p_passes) {
+		RID rid;
+		if (p_passes.size()) {
+			rid = RD::get_singleton()->framebuffer_create_multipass(p_textures, p_passes, RD::INVALID_ID, p_views);
+		} else {
+			rid = RD::get_singleton()->framebuffer_create(p_textures, RD::INVALID_ID, p_views);
+		}
+
+		ERR_FAIL_COND_V(rid.is_null(), rid);
+
+		Cache *c = cache_allocator.alloc();
+		c->views = p_views;
+		c->cache = rid;
+		c->hash = p_hash;
+		c->textures.resize(p_textures.size());
+		for (uint32_t i = 0; i < c->textures.size(); i++) {
+			c->textures[i] = p_textures[i];
+		}
+		c->passes.resize(p_passes.size());
+		for (uint32_t i = 0; i < c->passes.size(); i++) {
+			c->passes[i] = p_passes[i];
+		}
+		c->prev = nullptr;
+		c->next = hash_table[p_table_idx];
+		if (hash_table[p_table_idx]) {
+			hash_table[p_table_idx]->prev = c;
+		}
+		hash_table[p_table_idx] = c;
+
+		RD::get_singleton()->framebuffer_set_invalidation_callback(rid, _framebuffer_invalidation_callback, c);
+
+		cache_instances_used++;
+
+		return rid;
+	}
+
+public:
+	template <typename... Args>
+	RID get_cache(Args... args) {
+		uint32_t h = hash_murmur3_one_32(1); //1 view
+		h = hash_murmur3_one_32(sizeof...(Args), h);
+		h = _hash_args(h, args...);
+		h = hash_murmur3_one_32(0, h); // 0 passes
+		h = hash_fmix32(h);
+
+		uint32_t table_idx = h % HASH_TABLE_SIZE;
+		{
+			const Cache *c = hash_table[table_idx];
+
+			while (c) {
+				if (c->hash == h && c->passes.size() == 0 && c->textures.size() == sizeof...(Args) && c->views == 1 && _compare_args(0, c->textures, args...)) {
+					return c->cache;
+				}
+				c = c->next;
+			}
+		}
+
+		// Not in cache, create:
+
+		Vector<RID> textures;
+		_create_args(textures, args...);
+
+		return _allocate_from_data(1, h, table_idx, textures, Vector<RD::FramebufferPass>());
+	}
+
+	template <typename... Args>
+	RID get_cache_multiview(uint32_t p_views, Args... args) {
+		uint32_t h = hash_murmur3_one_32(p_views);
+		h = hash_murmur3_one_32(sizeof...(Args), h);
+		h = _hash_args(h, args...);
+		h = hash_murmur3_one_32(0, h); // 0 passes
+		h = hash_fmix32(h);
+
+		uint32_t table_idx = h % HASH_TABLE_SIZE;
+		{
+			const Cache *c = hash_table[table_idx];
+
+			while (c) {
+				if (c->hash == h && c->passes.size() == 0 && c->textures.size() == sizeof...(Args) && c->views == p_views && _compare_args(0, c->textures, args...)) {
+					return c->cache;
+				}
+				c = c->next;
+			}
+		}
+
+		// Not in cache, create:
+
+		Vector<RID> textures;
+		_create_args(textures, args...);
+
+		return _allocate_from_data(p_views, h, table_idx, textures, Vector<RD::FramebufferPass>());
+	}
+
+	RID get_cache_multipass(const Vector<RID> &p_textures, const Vector<RD::FramebufferPass> &p_passes, uint32_t p_views = 1) {
+		uint32_t h = hash_murmur3_one_32(p_views);
+		h = hash_murmur3_one_32(p_textures.size());
+		for (int i = 0; i < p_textures.size(); i++) {
+			h = hash_murmur3_one_64(p_textures[i].get_id(), h);
+		}
+		h = hash_murmur3_one_32(p_passes.size());
+		for (int i = 0; i < p_passes.size(); i++) {
+			h = _hash_pass(p_passes[i], h);
+		}
+
+		h = hash_fmix32(h);
+
+		uint32_t table_idx = h % HASH_TABLE_SIZE;
+		{
+			const Cache *c = hash_table[table_idx];
+
+			while (c) {
+				if (c->hash == h && c->views == p_views && c->textures.size() == (uint32_t)p_textures.size() && c->passes.size() == (uint32_t)p_passes.size()) {
+					bool all_ok = true;
+
+					for (int i = 0; i < p_textures.size(); i++) {
+						if (p_textures[i] != c->textures[i]) {
+							all_ok = false;
+							break;
+						}
+					}
+
+					if (all_ok) {
+						for (int i = 0; i < p_passes.size(); i++) {
+							if (!_compare_pass(p_passes[i], c->passes[i])) {
+								all_ok = false;
+								break;
+							}
+						}
+					}
+
+					if (all_ok) {
+						return c->cache;
+					}
+				}
+				c = c->next;
+			}
+		}
+
+		// Not in cache, create:
+		return _allocate_from_data(p_views, h, table_idx, p_textures, p_passes);
+	}
+
+	static FramebufferCacheRD *get_singleton() { return singleton; }
+
+	FramebufferCacheRD();
+	~FramebufferCacheRD();
+};
+
+#endif // FRAMEBUFFER_CACHE_RD_H
diff --git a/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp b/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp
index 50e60f4677..38a2340d40 100644
--- a/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp
+++ b/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp
@@ -2180,7 +2180,7 @@ void RendererCanvasRenderRD::CanvasShaderData::set_default_texture_param(const S
 	}
 }
 
-void RendererCanvasRenderRD::CanvasShaderData::get_param_list(List<PropertyInfo> *p_param_list) const {
+void RendererCanvasRenderRD::CanvasShaderData::get_shader_uniform_list(List<PropertyInfo> *p_param_list) const {
 	HashMap<int, StringName> order;
 
 	for (const KeyValue<StringName, ShaderLanguage::ShaderNode::Uniform> &E : uniforms) {
diff --git a/servers/rendering/renderer_rd/renderer_canvas_render_rd.h b/servers/rendering/renderer_rd/renderer_canvas_render_rd.h
index e915c7861f..bcbbbaa1a0 100644
--- a/servers/rendering/renderer_rd/renderer_canvas_render_rd.h
+++ b/servers/rendering/renderer_rd/renderer_canvas_render_rd.h
@@ -181,7 +181,7 @@ class RendererCanvasRenderRD : public RendererCanvasRender {
 		virtual void set_code(const String &p_Code);
 		virtual void set_path_hint(const String &p_path);
 		virtual void set_default_texture_param(const StringName &p_name, RID p_texture, int p_index);
-		virtual void get_param_list(List<PropertyInfo> *p_param_list) const;
+		virtual void get_shader_uniform_list(List<PropertyInfo> *p_param_list) const;
 		virtual void get_instance_param_list(List<RendererMaterialStorage::InstanceShaderParam> *p_param_list) const;
 
 		virtual bool is_param_texture(const StringName &p_param) const;
diff --git a/servers/rendering/renderer_rd/renderer_compositor_rd.cpp b/servers/rendering/renderer_rd/renderer_compositor_rd.cpp
index a61172c8f5..967b725b9e 100644
--- a/servers/rendering/renderer_rd/renderer_compositor_rd.cpp
+++ b/servers/rendering/renderer_rd/renderer_compositor_rd.cpp
@@ -249,6 +249,7 @@ RendererCompositorRD *RendererCompositorRD::singleton = nullptr;
 
 RendererCompositorRD::RendererCompositorRD() {
 	uniform_set_cache = memnew(UniformSetCacheRD);
+	framebuffer_cache = memnew(FramebufferCacheRD);
 
 	{
 		String shader_cache_dir = Engine::get_singleton()->get_shader_cache_path();
@@ -316,5 +317,6 @@ RendererCompositorRD::RendererCompositorRD() {
 
 RendererCompositorRD::~RendererCompositorRD() {
 	memdelete(uniform_set_cache);
+	memdelete(framebuffer_cache);
 	ShaderRD::set_shader_cache_dir(String());
 }
diff --git a/servers/rendering/renderer_rd/renderer_compositor_rd.h b/servers/rendering/renderer_rd/renderer_compositor_rd.h
index 564c26bfe4..a28335f800 100644
--- a/servers/rendering/renderer_rd/renderer_compositor_rd.h
+++ b/servers/rendering/renderer_rd/renderer_compositor_rd.h
@@ -37,6 +37,7 @@
 #include "servers/rendering/renderer_rd/environment/fog.h"
 #include "servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.h"
 #include "servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.h"
+#include "servers/rendering/renderer_rd/framebuffer_cache_rd.h"
 #include "servers/rendering/renderer_rd/renderer_canvas_render_rd.h"
 #include "servers/rendering/renderer_rd/shaders/blit.glsl.gen.h"
 #include "servers/rendering/renderer_rd/storage_rd/light_storage.h"
@@ -50,6 +51,7 @@
 class RendererCompositorRD : public RendererCompositor {
 protected:
 	UniformSetCacheRD *uniform_set_cache = nullptr;
+	FramebufferCacheRD *framebuffer_cache = nullptr;
 	RendererCanvasRenderRD *canvas = nullptr;
 	RendererRD::Utilities *utilities = nullptr;
 	RendererRD::LightStorage *light_storage = nullptr;
diff --git a/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp b/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp
index c6f38012a6..6c219933b0 100644
--- a/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp
+++ b/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp
@@ -2459,8 +2459,7 @@ void RendererSceneRenderRD::render_buffers_configure(RID p_render_buffers, RID p
 		p_internal_width = p_width;
 	}
 
-	const float texture_mipmap_bias = -log2f(p_width / p_internal_width) + p_texture_mipmap_bias;
-	material_storage->sampler_rd_configure_custom(texture_mipmap_bias);
+	material_storage->sampler_rd_configure_custom(p_texture_mipmap_bias);
 	update_uniform_sets();
 
 	RenderBuffers *rb = render_buffers_owner.get_or_null(p_render_buffers);
@@ -2869,7 +2868,7 @@ void RendererSceneRenderRD::_setup_lights(const PagedArray<RID> &p_lights, const
 					WARN_PRINT_ONCE("The DirectionalLight3D PSSM splits debug draw mode is not reimplemented yet.");
 				}
 
-				light_data.shadow_enabled = p_using_shadows && light_storage->light_has_shadow(base);
+				light_data.shadow_opacity = p_using_shadows && light_storage->light_has_shadow(base) ? light_storage->light_get_param(base, RS::LIGHT_PARAM_SHADOW_OPACITY) : 0.0;
 
 				float angular_diameter = light_storage->light_get_param(base, RS::LIGHT_PARAM_SIZE);
 				if (angular_diameter > 0.0) {
@@ -2886,7 +2885,7 @@ void RendererSceneRenderRD::_setup_lights(const PagedArray<RID> &p_lights, const
 					angular_diameter = 0.0;
 				}
 
-				if (light_data.shadow_enabled) {
+				if (light_data.shadow_opacity > 0.001) {
 					RS::LightDirectionalShadowMode smode = light_storage->light_directional_get_shadow_mode(base);
 
 					int limit = smode == RS::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL ? 0 : (smode == RS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS ? 1 : 3);
@@ -3040,19 +3039,26 @@ void RendererSceneRenderRD::_setup_lights(const PagedArray<RID> &p_lights, const
 
 		// Reuse fade begin, fade length and distance for shadow LOD determination later.
 		float fade_begin = 0.0;
+		float fade_shadow = 0.0;
 		float fade_length = 0.0;
 		real_t distance = 0.0;
 
 		float fade = 1.0;
+		float shadow_opacity_fade = 1.0;
 		if (light_storage->light_is_distance_fade_enabled(li->light)) {
 			fade_begin = light_storage->light_get_distance_fade_begin(li->light);
+			fade_shadow = light_storage->light_get_distance_fade_shadow(li->light);
 			fade_length = light_storage->light_get_distance_fade_length(li->light);
 			distance = camera_plane.distance_to(li->transform.origin);
 
+			// Use `smoothstep()` to make opacity changes more gradual and less noticeable to the player.
 			if (distance > fade_begin) {
-				// Use `smoothstep()` to make opacity changes more gradual and less noticeable to the player.
 				fade = Math::smoothstep(0.0f, 1.0f, 1.0f - float(distance - fade_begin) / fade_length);
 			}
+
+			if (distance > fade_shadow) {
+				shadow_opacity_fade = Math::smoothstep(0.0f, 1.0f, 1.0f - float(distance - fade_shadow) / fade_length);
+			}
 		}
 
 		float energy = sign * light_storage->light_get_param(base, RS::LIGHT_PARAM_ENERGY) * Math_PI * fade;
@@ -3120,7 +3126,7 @@ void RendererSceneRenderRD::_setup_lights(const PagedArray<RID> &p_lights, const
 
 		bool in_shadow_range = true;
 		if (needs_shadow && light_storage->light_is_distance_fade_enabled(li->light)) {
-			if (distance > light_storage->light_get_distance_fade_shadow(li->light)) {
+			if (distance > light_storage->light_get_distance_fade_shadow(li->light) + light_storage->light_get_distance_fade_length(li->light)) {
 				// Out of range, don't draw shadows to improve performance.
 				in_shadow_range = false;
 			}
@@ -3129,7 +3135,7 @@ void RendererSceneRenderRD::_setup_lights(const PagedArray<RID> &p_lights, const
 		if (needs_shadow && in_shadow_range) {
 			// fill in the shadow information
 
-			light_data.shadow_enabled = true;
+			light_data.shadow_opacity = light_storage->light_get_param(base, RS::LIGHT_PARAM_SHADOW_OPACITY) * shadow_opacity_fade;
 
 			float shadow_texel_size = light_instance_get_shadow_texel_size(li->self, p_shadow_atlas);
 			light_data.shadow_normal_bias = light_storage->light_get_param(base, RS::LIGHT_PARAM_SHADOW_NORMAL_BIAS) * shadow_texel_size * 10.0;
@@ -3189,7 +3195,7 @@ void RendererSceneRenderRD::_setup_lights(const PagedArray<RID> &p_lights, const
 				}
 			}
 		} else {
-			light_data.shadow_enabled = false;
+			light_data.shadow_opacity = 0.0;
 		}
 
 		li->cull_mask = light_storage->light_get_cull_mask(base);
@@ -3637,7 +3643,7 @@ void RendererSceneRenderRD::_pre_opaque_render(RenderDataRD *p_render_data, bool
 	if (p_render_data->render_buffers.is_valid()) {
 		bool directional_shadows = false;
 		for (uint32_t i = 0; i < directional_light_count; i++) {
-			if (cluster.directional_lights[i].shadow_enabled) {
+			if (cluster.directional_lights[i].shadow_opacity > 0.001) {
 				directional_shadows = true;
 				break;
 			}
@@ -4079,19 +4085,8 @@ bool RendererSceneRenderRD::free(RID p_rid) {
 		decal_instance_owner.free(p_rid);
 	} else if (lightmap_instance_owner.owns(p_rid)) {
 		lightmap_instance_owner.free(p_rid);
-	} else if (gi.voxel_gi_instance_owner.owns(p_rid)) {
-		RendererRD::GI::VoxelGIInstance *voxel_gi = gi.voxel_gi_instance_owner.get_or_null(p_rid);
-		if (voxel_gi->texture.is_valid()) {
-			RD::get_singleton()->free(voxel_gi->texture);
-			RD::get_singleton()->free(voxel_gi->write_buffer);
-		}
-
-		for (int i = 0; i < voxel_gi->dynamic_maps.size(); i++) {
-			RD::get_singleton()->free(voxel_gi->dynamic_maps[i].texture);
-			RD::get_singleton()->free(voxel_gi->dynamic_maps[i].depth);
-		}
-
-		gi.voxel_gi_instance_owner.free(p_rid);
+	} else if (gi.voxel_gi_instance_owns(p_rid)) {
+		gi.voxel_gi_instance_free(p_rid);
 	} else if (sky.sky_owner.owns(p_rid)) {
 		sky.update_dirty_skys();
 		sky.free_sky(p_rid);
diff --git a/servers/rendering/renderer_rd/renderer_scene_render_rd.h b/servers/rendering/renderer_rd/renderer_scene_render_rd.h
index 09ec2a9efd..22e9ead243 100644
--- a/servers/rendering/renderer_rd/renderer_scene_render_rd.h
+++ b/servers/rendering/renderer_rd/renderer_scene_render_rd.h
@@ -608,7 +608,7 @@ private:
 			float inv_spot_attenuation;
 			float cos_spot_angle;
 			float specular_amount;
-			uint32_t shadow_enabled;
+			float shadow_opacity;
 
 			float atlas_rect[4]; // in omni, used for atlas uv, in spot, used for projector uv
 			float shadow_matrix[16];
@@ -633,7 +633,7 @@ private:
 			float softshadow_angle;
 			float soft_shadow_scale;
 			uint32_t blend_splits;
-			uint32_t shadow_enabled;
+			float shadow_opacity;
 			float fade_from;
 			float fade_to;
 			uint32_t pad[2];
diff --git a/servers/rendering/renderer_rd/shaders/effects/bokeh_dof.glsl b/servers/rendering/renderer_rd/shaders/effects/bokeh_dof.glsl
index 0438671dd2..0b43af7738 100644
--- a/servers/rendering/renderer_rd/shaders/effects/bokeh_dof.glsl
+++ b/servers/rendering/renderer_rd/shaders/effects/bokeh_dof.glsl
@@ -30,7 +30,7 @@ layout(set = 1, binding = 0) uniform sampler2D source_bokeh;
 #ifdef MODE_GEN_BLUR_SIZE
 
 float get_depth_at_pos(vec2 uv) {
-	float depth = textureLod(source_depth, uv, 0.0).x;
+	float depth = textureLod(source_depth, uv, 0.0).x * 2.0 - 1.0;
 	if (params.orthogonal) {
 		depth = ((depth + (params.z_far + params.z_near) / (params.z_far - params.z_near)) * (params.z_far - params.z_near)) / 2.0;
 	} else {
diff --git a/servers/rendering/renderer_rd/shaders/effects/bokeh_dof_raster.glsl b/servers/rendering/renderer_rd/shaders/effects/bokeh_dof_raster.glsl
index a3b3938ee9..a06cacfabe 100644
--- a/servers/rendering/renderer_rd/shaders/effects/bokeh_dof_raster.glsl
+++ b/servers/rendering/renderer_rd/shaders/effects/bokeh_dof_raster.glsl
@@ -52,7 +52,7 @@ layout(set = 2, binding = 0) uniform sampler2D original_weight;
 #ifdef MODE_GEN_BLUR_SIZE
 
 float get_depth_at_pos(vec2 uv) {
-	float depth = textureLod(source_depth, uv, 0.0).x;
+	float depth = textureLod(source_depth, uv, 0.0).x * 2.0 - 1.0;
 	if (params.orthogonal) {
 		depth = ((depth + (params.z_far + params.z_near) / (params.z_far - params.z_near)) * (params.z_far - params.z_near)) / 2.0;
 	} else {
diff --git a/servers/rendering/renderer_rd/shaders/environment/volumetric_fog_process.glsl b/servers/rendering/renderer_rd/shaders/environment/volumetric_fog_process.glsl
index e74cfad65c..6f79b9e771 100644
--- a/servers/rendering/renderer_rd/shaders/environment/volumetric_fog_process.glsl
+++ b/servers/rendering/renderer_rd/shaders/environment/volumetric_fog_process.glsl
@@ -377,7 +377,7 @@ void main() {
 		for (uint i = 0; i < params.directional_light_count; i++) {
 			vec3 shadow_attenuation = vec3(1.0);
 
-			if (directional_lights.data[i].shadow_enabled) {
+			if (directional_lights.data[i].shadow_opacity > 0.001) {
 				float depth_z = -view_pos.z;
 
 				vec4 pssm_coord;
@@ -486,7 +486,7 @@ void main() {
 
 						vec3 light = omni_lights.data[light_index].color;
 
-						if (omni_lights.data[light_index].shadow_enabled) {
+						if (omni_lights.data[light_index].shadow_opacity > 0.001) {
 							//has shadow
 							vec4 uv_rect = omni_lights.data[light_index].atlas_rect;
 							vec2 flip_offset = omni_lights.data[light_index].direction.xy;
@@ -572,7 +572,7 @@ void main() {
 
 						vec3 light = spot_lights.data[light_index].color;
 
-						if (spot_lights.data[light_index].shadow_enabled) {
+						if (spot_lights.data[light_index].shadow_opacity > 0.001) {
 							//has shadow
 							vec4 uv_rect = spot_lights.data[light_index].atlas_rect;
 							vec2 flip_offset = spot_lights.data[light_index].direction.xy;
diff --git a/servers/rendering/renderer_rd/shaders/light_data_inc.glsl b/servers/rendering/renderer_rd/shaders/light_data_inc.glsl
index 61c8488a05..799f7087b6 100644
--- a/servers/rendering/renderer_rd/shaders/light_data_inc.glsl
+++ b/servers/rendering/renderer_rd/shaders/light_data_inc.glsl
@@ -15,7 +15,7 @@ struct LightData { //this structure needs to be as packed as possible
 	mediump float cone_attenuation;
 	mediump float cone_angle;
 	mediump float specular_amount;
-	bool shadow_enabled;
+	mediump float shadow_opacity;
 
 	highp vec4 atlas_rect; // rect in the shadow atlas
 	highp mat4 shadow_matrix;
@@ -60,7 +60,7 @@ struct DirectionalLightData {
 	highp float softshadow_angle;
 	highp float soft_shadow_scale;
 	bool blend_splits;
-	bool shadow_enabled;
+	mediump float shadow_opacity;
 	highp float fade_from;
 	highp float fade_to;
 	uvec2 pad;
diff --git a/servers/rendering/renderer_rd/shaders/scene_forward_clustered.glsl b/servers/rendering/renderer_rd/shaders/scene_forward_clustered.glsl
index 22058b3a06..e9515c7670 100644
--- a/servers/rendering/renderer_rd/shaders/scene_forward_clustered.glsl
+++ b/servers/rendering/renderer_rd/shaders/scene_forward_clustered.glsl
@@ -988,8 +988,10 @@ void fragment_shader(in SceneData scene_data) {
 		vec3 anisotropic_normal = cross(anisotropic_tangent, anisotropic_direction);
 		vec3 bent_normal = normalize(mix(normal, anisotropic_normal, abs(anisotropy) * clamp(5.0 * roughness, 0.0, 1.0)));
 		vec3 ref_vec = reflect(-view, bent_normal);
+		ref_vec = mix(ref_vec, bent_normal, roughness * roughness);
 #else
 		vec3 ref_vec = reflect(-view, normal);
+		ref_vec = mix(ref_vec, normal, roughness * roughness);
 #endif
 
 		float horizon = min(1.0 + dot(ref_vec, normal), 1.0);
@@ -1046,6 +1048,7 @@ void fragment_shader(in SceneData scene_data) {
 		ambient_light *= attenuation;
 		specular_light *= attenuation;
 
+		ref_vec = mix(ref_vec, n, clearcoat_roughness * clearcoat_roughness);
 		float horizon = min(1.0 + dot(ref_vec, normal), 1.0);
 		ref_vec = scene_data.radiance_inverse_xform * ref_vec;
 		float roughness_lod = mix(0.001, 0.1, clearcoat_roughness) * MAX_ROUGHNESS_LOD;
@@ -1203,6 +1206,7 @@ void fragment_shader(in SceneData scene_data) {
 
 		uint index1 = instances.data[instance_index].gi_offset & 0xFFFF;
 		vec3 ref_vec = normalize(reflect(-view, normal));
+		ref_vec = mix(ref_vec, normal, roughness * roughness);
 		//find arbitrary tangent and bitangent, then build a matrix
 		vec3 v0 = abs(normal.z) < 0.999 ? vec3(0.0, 0.0, 1.0) : vec3(0.0, 1.0, 0.0);
 		vec3 tangent = normalize(cross(v0, normal));
@@ -1302,6 +1306,18 @@ void fragment_shader(in SceneData scene_data) {
 		item_to = subgroupBroadcastFirst(subgroupMax(item_to));
 #endif
 
+#ifdef LIGHT_ANISOTROPY_USED
+		// https://google.github.io/filament/Filament.html#lighting/imagebasedlights/anisotropy
+		vec3 anisotropic_direction = anisotropy >= 0.0 ? binormal : tangent;
+		vec3 anisotropic_tangent = cross(anisotropic_direction, view);
+		vec3 anisotropic_normal = cross(anisotropic_tangent, anisotropic_direction);
+		vec3 bent_normal = normalize(mix(normal, anisotropic_normal, abs(anisotropy) * clamp(5.0 * roughness, 0.0, 1.0)));
+#else
+		vec3 bent_normal = normal;
+#endif
+		vec3 ref_vec = normalize(reflect(-view, bent_normal));
+		ref_vec = mix(ref_vec, bent_normal, roughness * roughness);
+
 		for (uint i = item_from; i < item_to; i++) {
 			uint mask = cluster_buffer.data[cluster_reflection_offset + i];
 			mask &= cluster_get_range_clip_mask(i, item_min, item_max);
@@ -1324,16 +1340,8 @@ void fragment_shader(in SceneData scene_data) {
 				if (!bool(reflections.data[reflection_index].mask & instances.data[instance_index].layer_mask)) {
 					continue; //not masked
 				}
-#ifdef LIGHT_ANISOTROPY_USED
-				// https://google.github.io/filament/Filament.html#lighting/imagebasedlights/anisotropy
-				vec3 anisotropic_direction = anisotropy >= 0.0 ? binormal : tangent;
-				vec3 anisotropic_tangent = cross(anisotropic_direction, view);
-				vec3 anisotropic_normal = cross(anisotropic_tangent, anisotropic_direction);
-				vec3 bent_normal = normalize(mix(normal, anisotropic_normal, abs(anisotropy) * clamp(5.0 * roughness, 0.0, 1.0)));
-#else
-				vec3 bent_normal = normal;
-#endif
-				reflection_process(reflection_index, view, vertex, bent_normal, roughness, ambient_light, specular_light, ambient_accum, reflection_accum);
+
+				reflection_process(reflection_index, vertex, ref_vec, normal, roughness, ambient_light, specular_light, ambient_accum, reflection_accum);
 			}
 		}
 
@@ -1417,7 +1425,7 @@ void fragment_shader(in SceneData scene_data) {
 
 			float shadow = 1.0;
 
-			if (directional_lights.data[i].shadow_enabled) {
+			if (directional_lights.data[i].shadow_opacity > 0.001) {
 				float depth_z = -vertex.z;
 				vec3 light_dir = directional_lights.data[i].direction;
 				vec3 base_normal_bias = normalize(normal_interp) * (1.0 - max(0.0, dot(light_dir, -normalize(normal_interp))));
@@ -1626,7 +1634,7 @@ void fragment_shader(in SceneData scene_data) {
 #ifdef LIGHT_TRANSMITTANCE_USED
 			float transmittance_z = transmittance_depth;
 
-			if (directional_lights.data[i].shadow_enabled) {
+			if (directional_lights.data[i].shadow_opacity > 0.001) {
 				float depth_z = -vertex.z;
 
 				if (depth_z < directional_lights.data[i].shadow_split_offsets.x) {
@@ -1681,6 +1689,8 @@ void fragment_shader(in SceneData scene_data) {
 			} else {
 				shadow = float(shadow1 >> ((i - 4) * 8) & 0xFF) / 255.0;
 			}
+
+			shadow = shadow * directional_lights.data[i].shadow_opacity + 1.0 - directional_lights.data[i].shadow_opacity;
 #endif
 
 			blur_shadow(shadow);
diff --git a/servers/rendering/renderer_rd/shaders/scene_forward_lights_inc.glsl b/servers/rendering/renderer_rd/shaders/scene_forward_lights_inc.glsl
index e27c81eaea..7299bb0576 100644
--- a/servers/rendering/renderer_rd/shaders/scene_forward_lights_inc.glsl
+++ b/servers/rendering/renderer_rd/shaders/scene_forward_lights_inc.glsl
@@ -395,7 +395,7 @@ float get_omni_attenuation(float distance, float inv_range, float decay) {
 
 float light_process_omni_shadow(uint idx, vec3 vertex, vec3 normal) {
 #ifndef SHADOWS_DISABLED
-	if (omni_lights.data[idx].shadow_enabled) {
+	if (omni_lights.data[idx].shadow_opacity > 0.001) {
 		// there is a shadowmap
 		vec2 texel_size = scene_data_block.data.shadow_atlas_pixel_size;
 		vec4 base_uv_rect = omni_lights.data[idx].atlas_rect;
@@ -498,6 +498,7 @@ float light_process_omni_shadow(uint idx, vec3 vertex, vec3 normal) {
 				}
 
 				shadow /= float(sc_penumbra_shadow_samples);
+				shadow = mix(1.0, shadow, omni_lights.data[idx].shadow_opacity);
 
 			} else {
 				//no blockers found, so no shadow
@@ -516,7 +517,7 @@ float light_process_omni_shadow(uint idx, vec3 vertex, vec3 normal) {
 			vec2 pos = shadow_sample.xy / shadow_sample.z;
 			float depth = shadow_len - omni_lights.data[idx].shadow_bias;
 			depth *= omni_lights.data[idx].inv_radius;
-			shadow = sample_omni_pcf_shadow(shadow_atlas, omni_lights.data[idx].soft_shadow_scale / shadow_sample.z, pos, uv_rect, flip_offset, depth);
+			shadow = mix(1.0, sample_omni_pcf_shadow(shadow_atlas, omni_lights.data[idx].soft_shadow_scale / shadow_sample.z, pos, uv_rect, flip_offset, depth), omni_lights.data[idx].shadow_opacity);
 		}
 
 		return shadow;
@@ -674,7 +675,7 @@ void light_process_omni(uint idx, vec3 vertex, vec3 eye_vec, vec3 normal, vec3 v
 
 float light_process_spot_shadow(uint idx, vec3 vertex, vec3 normal) {
 #ifndef SHADOWS_DISABLED
-	if (spot_lights.data[idx].shadow_enabled) {
+	if (spot_lights.data[idx].shadow_opacity > 0.001) {
 		vec3 light_rel_vec = spot_lights.data[idx].position - vertex;
 		float light_length = length(light_rel_vec);
 		vec3 spot_dir = spot_lights.data[idx].direction;
@@ -735,6 +736,7 @@ float light_process_spot_shadow(uint idx, vec3 vertex, vec3 normal) {
 				}
 
 				shadow /= float(sc_penumbra_shadow_samples);
+				shadow = mix(1.0, shadow, spot_lights.data[idx].shadow_opacity);
 
 			} else {
 				//no blockers found, so no shadow
@@ -743,7 +745,7 @@ float light_process_spot_shadow(uint idx, vec3 vertex, vec3 normal) {
 		} else {
 			//hard shadow
 			vec3 shadow_uv = vec3(splane.xy * spot_lights.data[idx].atlas_rect.zw + spot_lights.data[idx].atlas_rect.xy, splane.z);
-			shadow = sample_pcf_shadow(shadow_atlas, spot_lights.data[idx].soft_shadow_scale * scene_data_block.data.shadow_atlas_pixel_size, shadow_uv);
+			shadow = mix(1.0, sample_pcf_shadow(shadow_atlas, spot_lights.data[idx].soft_shadow_scale * scene_data_block.data.shadow_atlas_pixel_size, shadow_uv), spot_lights.data[idx].shadow_opacity);
 		}
 
 		return shadow;
@@ -872,7 +874,7 @@ void light_process_spot(uint idx, vec3 vertex, vec3 eye_vec, vec3 normal, vec3 v
 			diffuse_light, specular_light);
 }
 
-void reflection_process(uint ref_index, vec3 view, vec3 vertex, vec3 normal, float roughness, vec3 ambient_light, vec3 specular_light, inout vec4 ambient_accum, inout vec4 reflection_accum) {
+void reflection_process(uint ref_index, vec3 vertex, vec3 ref_vec, vec3 normal, float roughness, vec3 ambient_light, vec3 specular_light, inout vec4 ambient_accum, inout vec4 reflection_accum) {
 	vec3 box_extents = reflections.data[ref_index].box_extents;
 	vec3 local_pos = (reflections.data[ref_index].local_matrix * vec4(vertex, 1.0)).xyz;
 
@@ -880,8 +882,6 @@ void reflection_process(uint ref_index, vec3 view, vec3 vertex, vec3 normal, flo
 		return;
 	}
 
-	vec3 ref_vec = normalize(reflect(-view, normal));
-
 	vec3 inner_pos = abs(local_pos / box_extents);
 	float blend = max(inner_pos.x, max(inner_pos.y, inner_pos.z));
 	//make blend more rounded
diff --git a/servers/rendering/renderer_rd/shaders/scene_forward_mobile.glsl b/servers/rendering/renderer_rd/shaders/scene_forward_mobile.glsl
index 26d0de46c2..6548793bee 100644
--- a/servers/rendering/renderer_rd/shaders/scene_forward_mobile.glsl
+++ b/servers/rendering/renderer_rd/shaders/scene_forward_mobile.glsl
@@ -889,8 +889,10 @@ void main() {
 		vec3 anisotropic_normal = cross(anisotropic_tangent, anisotropic_direction);
 		vec3 bent_normal = normalize(mix(normal, anisotropic_normal, abs(anisotropy) * clamp(5.0 * roughness, 0.0, 1.0)));
 		vec3 ref_vec = reflect(-view, bent_normal);
+		ref_vec = mix(ref_vec, bent_normal, roughness * roughness);
 #else
 		vec3 ref_vec = reflect(-view, normal);
+		ref_vec = mix(ref_vec, normal, roughness * roughness);
 #endif
 		float horizon = min(1.0 + dot(ref_vec, normal), 1.0);
 		ref_vec = scene_data.radiance_inverse_xform * ref_vec;
@@ -940,6 +942,7 @@ void main() {
 		vec3 n = normalize(normal_interp); // We want to use geometric normal, not normal_map
 		float NoV = max(dot(n, view), 0.0001);
 		vec3 ref_vec = reflect(-view, n);
+		ref_vec = mix(ref_vec, n, clearcoat_roughness * clearcoat_roughness);
 		// The clear coat layer assumes an IOR of 1.5 (4% reflectance)
 		float Fc = clearcoat * (0.04 + 0.96 * SchlickFresnel(NoV));
 		float attenuation = 1.0 - Fc;
@@ -1036,6 +1039,19 @@ void main() {
 		vec4 ambient_accum = vec4(0.0, 0.0, 0.0, 0.0);
 
 		uint reflection_indices = draw_call.reflection_probes.x;
+
+#ifdef LIGHT_ANISOTROPY_USED
+		// https://google.github.io/filament/Filament.html#lighting/imagebasedlights/anisotropy
+		vec3 anisotropic_direction = anisotropy >= 0.0 ? binormal : tangent;
+		vec3 anisotropic_tangent = cross(anisotropic_direction, view);
+		vec3 anisotropic_normal = cross(anisotropic_tangent, anisotropic_direction);
+		vec3 bent_normal = normalize(mix(normal, anisotropic_normal, abs(anisotropy) * clamp(5.0 * roughness, 0.0, 1.0)));
+#else
+		vec3 bent_normal = normal;
+#endif
+		vec3 ref_vec = normalize(reflect(-view, bent_normal));
+		ref_vec = mix(ref_vec, bent_normal, roughness * roughness);
+
 		for (uint i = 0; i < 8; i++) {
 			uint reflection_index = reflection_indices & 0xFF;
 			if (i == 4) {
@@ -1047,16 +1063,8 @@ void main() {
 			if (reflection_index == 0xFF) {
 				break;
 			}
-#ifdef LIGHT_ANISOTROPY_USED
-			// https://google.github.io/filament/Filament.html#lighting/imagebasedlights/anisotropy
-			vec3 anisotropic_direction = anisotropy >= 0.0 ? binormal : tangent;
-			vec3 anisotropic_tangent = cross(anisotropic_direction, view);
-			vec3 anisotropic_normal = cross(anisotropic_tangent, anisotropic_direction);
-			vec3 bent_normal = normalize(mix(normal, anisotropic_normal, abs(anisotropy) * clamp(5.0 * roughness, 0.0, 1.0)));
-#else
-			vec3 bent_normal = normal;
-#endif
-			reflection_process(reflection_index, view, vertex, bent_normal, roughness, ambient_light, specular_light, ambient_accum, reflection_accum);
+
+			reflection_process(reflection_index, vertex, ref_vec, bent_normal, roughness, ambient_light, specular_light, ambient_accum, reflection_accum);
 		}
 
 		if (reflection_accum.a > 0.0) {
@@ -1134,7 +1142,7 @@ void main() {
 
 #ifdef USE_SOFT_SHADOWS
 			//version with soft shadows, more expensive
-			if (directional_lights.data[i].shadow_enabled) {
+			if (directional_lights.data[i].shadow_opacity > 0.001) {
 				float depth_z = -vertex.z;
 
 				vec4 pssm_coord;
@@ -1286,7 +1294,7 @@ void main() {
 #else
 			// Soft shadow disabled version
 
-			if (directional_lights.data[i].shadow_enabled) {
+			if (directional_lights.data[i].shadow_opacity > 0.001) {
 				float depth_z = -vertex.z;
 
 				vec4 pssm_coord;
diff --git a/servers/rendering/renderer_rd/storage_rd/light_storage.cpp b/servers/rendering/renderer_rd/storage_rd/light_storage.cpp
index d3831b4618..882afdfa54 100644
--- a/servers/rendering/renderer_rd/storage_rd/light_storage.cpp
+++ b/servers/rendering/renderer_rd/storage_rd/light_storage.cpp
@@ -88,6 +88,7 @@ void LightStorage::_light_initialize(RID p_light, RS::LightType p_type) {
 	light.param[RS::LIGHT_PARAM_SHADOW_FADE_START] = 0.8;
 	light.param[RS::LIGHT_PARAM_SHADOW_NORMAL_BIAS] = 1.0;
 	light.param[RS::LIGHT_PARAM_SHADOW_BIAS] = 0.02;
+	light.param[RS::LIGHT_PARAM_SHADOW_OPACITY] = 1.0;
 	light.param[RS::LIGHT_PARAM_SHADOW_BLUR] = 0;
 	light.param[RS::LIGHT_PARAM_SHADOW_PANCAKE_SIZE] = 20.0;
 	light.param[RS::LIGHT_PARAM_SHADOW_VOLUMETRIC_FOG_FADE] = 0.1;
diff --git a/servers/rendering/renderer_rd/storage_rd/material_storage.cpp b/servers/rendering/renderer_rd/storage_rd/material_storage.cpp
index e120424bbb..fa8406e7a1 100644
--- a/servers/rendering/renderer_rd/storage_rd/material_storage.cpp
+++ b/servers/rendering/renderer_rd/storage_rd/material_storage.cpp
@@ -2418,11 +2418,11 @@ String MaterialStorage::shader_get_code(RID p_shader) const {
 	return shader->code;
 }
 
-void MaterialStorage::shader_get_param_list(RID p_shader, List<PropertyInfo> *p_param_list) const {
+void MaterialStorage::shader_get_shader_uniform_list(RID p_shader, List<PropertyInfo> *p_param_list) const {
 	Shader *shader = shader_owner.get_or_null(p_shader);
 	ERR_FAIL_COND(!shader);
 	if (shader->data) {
-		return shader->data->get_param_list(p_param_list);
+		return shader->data->get_shader_uniform_list(p_param_list);
 	}
 }
 
@@ -2684,14 +2684,14 @@ bool MaterialStorage::material_casts_shadows(RID p_material) {
 	return true; //by default everything casts shadows
 }
 
-void MaterialStorage::material_get_instance_shader_parameters(RID p_material, List<InstanceShaderParam> *r_parameters) {
+void MaterialStorage::material_get_instance_shader_uniforms(RID p_material, List<InstanceShaderParam> *r_parameters) {
 	Material *material = material_owner.get_or_null(p_material);
 	ERR_FAIL_COND(!material);
 	if (material->shader && material->shader->data) {
 		material->shader->data->get_instance_param_list(r_parameters);
 
 		if (material->next_pass.is_valid()) {
-			material_get_instance_shader_parameters(material->next_pass, r_parameters);
+			material_get_instance_shader_uniforms(material->next_pass, r_parameters);
 		}
 	}
 }
diff --git a/servers/rendering/renderer_rd/storage_rd/material_storage.h b/servers/rendering/renderer_rd/storage_rd/material_storage.h
index cb98a78bf8..dbf7a92e23 100644
--- a/servers/rendering/renderer_rd/storage_rd/material_storage.h
+++ b/servers/rendering/renderer_rd/storage_rd/material_storage.h
@@ -57,7 +57,7 @@ public:
 		virtual void set_code(const String &p_Code) = 0;
 		virtual void set_path_hint(const String &p_hint) = 0;
 		virtual void set_default_texture_param(const StringName &p_name, RID p_texture, int p_index) = 0;
-		virtual void get_param_list(List<PropertyInfo> *p_param_list) const = 0;
+		virtual void get_shader_uniform_list(List<PropertyInfo> *p_param_list) const = 0;
 
 		virtual void get_instance_param_list(List<RendererMaterialStorage::InstanceShaderParam> *p_param_list) const = 0;
 		virtual bool is_param_texture(const StringName &p_param) const = 0;
@@ -362,7 +362,7 @@ public:
 	virtual void shader_set_code(RID p_shader, const String &p_code) override;
 	virtual void shader_set_path_hint(RID p_shader, const String &p_path) override;
 	virtual String shader_get_code(RID p_shader) const override;
-	virtual void shader_get_param_list(RID p_shader, List<PropertyInfo> *p_param_list) const override;
+	virtual void shader_get_shader_uniform_list(RID p_shader, List<PropertyInfo> *p_param_list) const override;
 
 	virtual void shader_set_default_texture_param(RID p_shader, const StringName &p_name, RID p_texture, int p_index) override;
 	virtual RID shader_get_default_texture_param(RID p_shader, const StringName &p_name, int p_index) const override;
@@ -394,7 +394,7 @@ public:
 	virtual bool material_is_animated(RID p_material) override;
 	virtual bool material_casts_shadows(RID p_material) override;
 
-	virtual void material_get_instance_shader_parameters(RID p_material, List<InstanceShaderParam> *r_parameters) override;
+	virtual void material_get_instance_shader_uniforms(RID p_material, List<InstanceShaderParam> *r_parameters) override;
 
 	virtual void material_update_dependency(RID p_material, DependencyTracker *p_instance) override;
 
diff --git a/servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp b/servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp
index dc3f35f942..585c42b2d8 100644
--- a/servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp
+++ b/servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp
@@ -416,7 +416,10 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RS::SurfaceData &p_surface)
 			mesh->bone_aabbs.resize(p_surface.bone_aabbs.size());
 		}
 		for (int i = 0; i < p_surface.bone_aabbs.size(); i++) {
-			mesh->bone_aabbs.write[i].merge_with(p_surface.bone_aabbs[i]);
+			const AABB &bone = p_surface.bone_aabbs[i];
+			if (!bone.has_no_volume()) {
+				mesh->bone_aabbs.write[i].merge_with(bone);
+			}
 		}
 		mesh->aabb.merge_with(p_surface.aabb);
 	}
diff --git a/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp b/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp
index 3ca648b0d0..ba644e7eb9 100644
--- a/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp
+++ b/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp
@@ -1603,7 +1603,7 @@ void ParticlesStorage::ParticlesShaderData::set_default_texture_param(const Stri
 	}
 }
 
-void ParticlesStorage::ParticlesShaderData::get_param_list(List<PropertyInfo> *p_param_list) const {
+void ParticlesStorage::ParticlesShaderData::get_shader_uniform_list(List<PropertyInfo> *p_param_list) const {
 	HashMap<int, StringName> order;
 
 	for (const KeyValue<StringName, ShaderLanguage::ShaderNode::Uniform> &E : uniforms) {
diff --git a/servers/rendering/renderer_rd/storage_rd/particles_storage.h b/servers/rendering/renderer_rd/storage_rd/particles_storage.h
index 8a69ee45f9..97d100e2da 100644
--- a/servers/rendering/renderer_rd/storage_rd/particles_storage.h
+++ b/servers/rendering/renderer_rd/storage_rd/particles_storage.h
@@ -337,7 +337,7 @@ private:
 		virtual void set_code(const String &p_Code);
 		virtual void set_path_hint(const String &p_hint);
 		virtual void set_default_texture_param(const StringName &p_name, RID p_texture, int p_index);
-		virtual void get_param_list(List<PropertyInfo> *p_param_list) const;
+		virtual void get_shader_uniform_list(List<PropertyInfo> *p_param_list) const;
 		virtual void get_instance_param_list(List<RendererMaterialStorage::InstanceShaderParam> *p_param_list) const;
 		virtual bool is_param_texture(const StringName &p_param) const;
 		virtual bool is_animated() const;
diff --git a/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp b/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp
index e20a04ff2a..84427e1c93 100644
--- a/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp
+++ b/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp
@@ -416,7 +416,10 @@ TextureStorage::TextureStorage() {
 		tformat.format = RD::DATA_FORMAT_R8_UINT;
 		tformat.width = 4;
 		tformat.height = 4;
-		tformat.usage_bits = RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT | RD::TEXTURE_USAGE_VRS_ATTACHMENT_BIT | RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_STORAGE_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT;
+		tformat.usage_bits = RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT | RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_STORAGE_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT;
+		if (RD::get_singleton()->has_feature(RD::SUPPORTS_ATTACHMENT_VRS)) {
+			tformat.usage_bits |= RD::TEXTURE_USAGE_VRS_ATTACHMENT_BIT;
+		}
 		tformat.texture_type = RD::TEXTURE_TYPE_2D;
 
 		Vector<uint8_t> pv;
diff --git a/servers/rendering/renderer_rd/storage_rd/utilities.cpp b/servers/rendering/renderer_rd/storage_rd/utilities.cpp
index 5a91046628..fcef2f24bf 100644
--- a/servers/rendering/renderer_rd/storage_rd/utilities.cpp
+++ b/servers/rendering/renderer_rd/storage_rd/utilities.cpp
@@ -290,9 +290,14 @@ bool Utilities::has_os_feature(const String &p_feature) const {
 		return true;
 	}
 
+#if !defined(ANDROID_ENABLED) && !defined(IOS_ENABLED)
+	// Some Android devices report support for S3TC but we don't expect that and don't export the textures.
+	// This could be fixed but so few devices support it that it doesn't seem useful (and makes bigger APKs).
+	// For good measure we do the same hack for iOS, just in case.
 	if (p_feature == "s3tc" && RD::get_singleton()->texture_is_format_supported_for_usage(RD::DATA_FORMAT_BC1_RGB_UNORM_BLOCK, RD::TEXTURE_USAGE_SAMPLING_BIT)) {
 		return true;
 	}
+#endif
 
 	if (p_feature == "bptc" && RD::get_singleton()->texture_is_format_supported_for_usage(RD::DATA_FORMAT_BC7_UNORM_BLOCK, RD::TEXTURE_USAGE_SAMPLING_BIT)) {
 		return true;
diff --git a/servers/rendering/renderer_rd/uniform_set_cache_rd.h b/servers/rendering/renderer_rd/uniform_set_cache_rd.h
index abf110730b..bca8b02178 100644
--- a/servers/rendering/renderer_rd/uniform_set_cache_rd.h
+++ b/servers/rendering/renderer_rd/uniform_set_cache_rd.h
@@ -163,7 +163,7 @@ public:
 			const Cache *c = hash_table[table_idx];
 
 			while (c) {
-				if (c->hash == h && c->set == p_set && c->shader == p_shader && _compare_args(0, c->uniforms, args...)) {
+				if (c->hash == h && c->set == p_set && c->shader == p_shader && sizeof...(Args) == c->uniforms.size() && _compare_args(0, c->uniforms, args...)) {
 					return c->cache;
 				}
 				c = c->next;
@@ -193,7 +193,7 @@ public:
 			const Cache *c = hash_table[table_idx];
 
 			while (c) {
-				if (c->hash == h && c->set == p_set && c->shader == p_shader) {
+				if (c->hash == h && c->set == p_set && c->shader == p_shader && (uint32_t)p_uniforms.size() == c->uniforms.size()) {
 					bool all_ok = true;
 					for (int i = 0; i < p_uniforms.size(); i++) {
 						if (!_compare_uniform(p_uniforms[i], c->uniforms[i])) {
diff --git a/servers/rendering/renderer_scene.h b/servers/rendering/renderer_scene.h
index 852fe89cd0..ba6fb71e67 100644
--- a/servers/rendering/renderer_scene.h
+++ b/servers/rendering/renderer_scene.h
@@ -100,10 +100,10 @@ public:
 	virtual void instance_geometry_set_visibility_range(RID p_instance, float p_min, float p_max, float p_min_margin, float p_max_margin, RS::VisibilityRangeFadeMode p_fade_mode) = 0;
 	virtual void instance_geometry_set_lightmap(RID p_instance, RID p_lightmap, const Rect2 &p_lightmap_uv_scale, int p_slice_index) = 0;
 	virtual void instance_geometry_set_lod_bias(RID p_instance, float p_lod_bias) = 0;
-	virtual void instance_geometry_set_shader_parameter(RID p_instance, const StringName &p_parameter, const Variant &p_value) = 0;
-	virtual void instance_geometry_get_shader_parameter_list(RID p_instance, List<PropertyInfo> *p_parameters) const = 0;
-	virtual Variant instance_geometry_get_shader_parameter(RID p_instance, const StringName &p_parameter) const = 0;
-	virtual Variant instance_geometry_get_shader_parameter_default_value(RID p_instance, const StringName &p_parameter) const = 0;
+	virtual void instance_geometry_set_shader_uniform(RID p_instance, const StringName &p_parameter, const Variant &p_value) = 0;
+	virtual void instance_geometry_get_shader_uniform_list(RID p_instance, List<PropertyInfo> *p_parameters) const = 0;
+	virtual Variant instance_geometry_get_shader_uniform(RID p_instance, const StringName &p_parameter) const = 0;
+	virtual Variant instance_geometry_get_shader_uniform_default_value(RID p_instance, const StringName &p_parameter) const = 0;
 
 	virtual void directional_shadow_atlas_set_size(int p_size, bool p_16_bits = true) = 0;
 
diff --git a/servers/rendering/renderer_scene_cull.cpp b/servers/rendering/renderer_scene_cull.cpp
index 368bbb63f5..0b20bb372a 100644
--- a/servers/rendering/renderer_scene_cull.cpp
+++ b/servers/rendering/renderer_scene_cull.cpp
@@ -1423,62 +1423,62 @@ void RendererSceneCull::instance_geometry_set_lod_bias(RID p_instance, float p_l
 	}
 }
 
-void RendererSceneCull::instance_geometry_set_shader_parameter(RID p_instance, const StringName &p_parameter, const Variant &p_value) {
+void RendererSceneCull::instance_geometry_set_shader_uniform(RID p_instance, const StringName &p_parameter, const Variant &p_value) {
 	Instance *instance = instance_owner.get_or_null(p_instance);
 	ERR_FAIL_COND(!instance);
 
 	ERR_FAIL_COND(p_value.get_type() == Variant::OBJECT);
 
-	HashMap<StringName, Instance::InstanceShaderParameter>::Iterator E = instance->instance_shader_parameters.find(p_parameter);
+	HashMap<StringName, Instance::InstanceShaderParameter>::Iterator E = instance->instance_shader_uniforms.find(p_parameter);
 
 	if (!E) {
 		Instance::InstanceShaderParameter isp;
 		isp.index = -1;
 		isp.info = PropertyInfo();
 		isp.value = p_value;
-		instance->instance_shader_parameters[p_parameter] = isp;
+		instance->instance_shader_uniforms[p_parameter] = isp;
 	} else {
 		E->value.value = p_value;
-		if (E->value.index >= 0 && instance->instance_allocated_shader_parameters) {
+		if (E->value.index >= 0 && instance->instance_allocated_shader_uniforms) {
 			//update directly
 			RSG::material_storage->global_shader_uniforms_instance_update(p_instance, E->value.index, p_value);
 		}
 	}
 }
 
-Variant RendererSceneCull::instance_geometry_get_shader_parameter(RID p_instance, const StringName &p_parameter) const {
+Variant RendererSceneCull::instance_geometry_get_shader_uniform(RID p_instance, const StringName &p_parameter) const {
 	const Instance *instance = const_cast<RendererSceneCull *>(this)->instance_owner.get_or_null(p_instance);
 	ERR_FAIL_COND_V(!instance, Variant());
 
-	if (instance->instance_shader_parameters.has(p_parameter)) {
-		return instance->instance_shader_parameters[p_parameter].value;
+	if (instance->instance_shader_uniforms.has(p_parameter)) {
+		return instance->instance_shader_uniforms[p_parameter].value;
 	}
 	return Variant();
 }
 
-Variant RendererSceneCull::instance_geometry_get_shader_parameter_default_value(RID p_instance, const StringName &p_parameter) const {
+Variant RendererSceneCull::instance_geometry_get_shader_uniform_default_value(RID p_instance, const StringName &p_parameter) const {
 	const Instance *instance = const_cast<RendererSceneCull *>(this)->instance_owner.get_or_null(p_instance);
 	ERR_FAIL_COND_V(!instance, Variant());
 
-	if (instance->instance_shader_parameters.has(p_parameter)) {
-		return instance->instance_shader_parameters[p_parameter].default_value;
+	if (instance->instance_shader_uniforms.has(p_parameter)) {
+		return instance->instance_shader_uniforms[p_parameter].default_value;
 	}
 	return Variant();
 }
 
-void RendererSceneCull::instance_geometry_get_shader_parameter_list(RID p_instance, List<PropertyInfo> *p_parameters) const {
+void RendererSceneCull::instance_geometry_get_shader_uniform_list(RID p_instance, List<PropertyInfo> *p_parameters) const {
 	const Instance *instance = const_cast<RendererSceneCull *>(this)->instance_owner.get_or_null(p_instance);
 	ERR_FAIL_COND(!instance);
 
 	const_cast<RendererSceneCull *>(this)->update_dirty_instances();
 
 	Vector<StringName> names;
-	for (const KeyValue<StringName, Instance::InstanceShaderParameter> &E : instance->instance_shader_parameters) {
+	for (const KeyValue<StringName, Instance::InstanceShaderParameter> &E : instance->instance_shader_uniforms) {
 		names.push_back(E.key);
 	}
 	names.sort_custom<StringName::AlphCompare>();
 	for (int i = 0; i < names.size(); i++) {
-		PropertyInfo pinfo = instance->instance_shader_parameters[names[i]].info;
+		PropertyInfo pinfo = instance->instance_shader_uniforms[names[i]].info;
 		p_parameters->push_back(pinfo);
 	}
 }
@@ -3642,9 +3642,9 @@ void RendererSceneCull::render_particle_colliders() {
 	}
 }
 
-void RendererSceneCull::_update_instance_shader_parameters_from_material(HashMap<StringName, Instance::InstanceShaderParameter> &isparams, const HashMap<StringName, Instance::InstanceShaderParameter> &existing_isparams, RID p_material) {
+void RendererSceneCull::_update_instance_shader_uniforms_from_material(HashMap<StringName, Instance::InstanceShaderParameter> &isparams, const HashMap<StringName, Instance::InstanceShaderParameter> &existing_isparams, RID p_material) {
 	List<RendererMaterialStorage::InstanceShaderParam> plist;
-	RSG::material_storage->material_get_instance_shader_parameters(p_material, &plist);
+	RSG::material_storage->material_get_instance_shader_uniforms(p_material, &plist);
 	for (const RendererMaterialStorage::InstanceShaderParam &E : plist) {
 		StringName name = E.info.name;
 		if (isparams.has(name)) {
@@ -3724,7 +3724,7 @@ void RendererSceneCull::_update_dirty_instance(Instance *p_instance) {
 					can_cast_shadows = false;
 				}
 				is_animated = RSG::material_storage->material_is_animated(p_instance->material_override);
-				_update_instance_shader_parameters_from_material(isparams, p_instance->instance_shader_parameters, p_instance->material_override);
+				_update_instance_shader_uniforms_from_material(isparams, p_instance->instance_shader_uniforms, p_instance->material_override);
 			} else {
 				if (p_instance->base_type == RS::INSTANCE_MESH) {
 					RID mesh = p_instance->base;
@@ -3746,7 +3746,7 @@ void RendererSceneCull::_update_dirty_instance(Instance *p_instance) {
 									is_animated = true;
 								}
 
-								_update_instance_shader_parameters_from_material(isparams, p_instance->instance_shader_parameters, mat);
+								_update_instance_shader_uniforms_from_material(isparams, p_instance->instance_shader_uniforms, mat);
 
 								RSG::material_storage->material_update_dependency(mat, &p_instance->dependency_tracker);
 							}
@@ -3777,7 +3777,7 @@ void RendererSceneCull::_update_dirty_instance(Instance *p_instance) {
 									is_animated = true;
 								}
 
-								_update_instance_shader_parameters_from_material(isparams, p_instance->instance_shader_parameters, mat);
+								_update_instance_shader_uniforms_from_material(isparams, p_instance->instance_shader_uniforms, mat);
 
 								RSG::material_storage->material_update_dependency(mat, &p_instance->dependency_tracker);
 							}
@@ -3815,7 +3815,7 @@ void RendererSceneCull::_update_dirty_instance(Instance *p_instance) {
 									is_animated = true;
 								}
 
-								_update_instance_shader_parameters_from_material(isparams, p_instance->instance_shader_parameters, mat);
+								_update_instance_shader_uniforms_from_material(isparams, p_instance->instance_shader_uniforms, mat);
 
 								RSG::material_storage->material_update_dependency(mat, &p_instance->dependency_tracker);
 							}
@@ -3831,7 +3831,7 @@ void RendererSceneCull::_update_dirty_instance(Instance *p_instance) {
 			if (p_instance->material_overlay.is_valid()) {
 				can_cast_shadows = can_cast_shadows || RSG::material_storage->material_casts_shadows(p_instance->material_overlay);
 				is_animated = is_animated || RSG::material_storage->material_is_animated(p_instance->material_overlay);
-				_update_instance_shader_parameters_from_material(isparams, p_instance->instance_shader_parameters, p_instance->material_overlay);
+				_update_instance_shader_uniforms_from_material(isparams, p_instance->instance_shader_uniforms, p_instance->material_overlay);
 			}
 
 			if (can_cast_shadows != geom->can_cast_shadows) {
@@ -3845,23 +3845,23 @@ void RendererSceneCull::_update_dirty_instance(Instance *p_instance) {
 			}
 
 			geom->material_is_animated = is_animated;
-			p_instance->instance_shader_parameters = isparams;
+			p_instance->instance_shader_uniforms = isparams;
 
-			if (p_instance->instance_allocated_shader_parameters != (p_instance->instance_shader_parameters.size() > 0)) {
-				p_instance->instance_allocated_shader_parameters = (p_instance->instance_shader_parameters.size() > 0);
-				if (p_instance->instance_allocated_shader_parameters) {
-					p_instance->instance_allocated_shader_parameters_offset = RSG::material_storage->global_shader_uniforms_instance_allocate(p_instance->self);
-					geom->geometry_instance->set_instance_shader_parameters_offset(p_instance->instance_allocated_shader_parameters_offset);
+			if (p_instance->instance_allocated_shader_uniforms != (p_instance->instance_shader_uniforms.size() > 0)) {
+				p_instance->instance_allocated_shader_uniforms = (p_instance->instance_shader_uniforms.size() > 0);
+				if (p_instance->instance_allocated_shader_uniforms) {
+					p_instance->instance_allocated_shader_uniforms_offset = RSG::material_storage->global_shader_uniforms_instance_allocate(p_instance->self);
+					geom->geometry_instance->set_instance_shader_uniforms_offset(p_instance->instance_allocated_shader_uniforms_offset);
 
-					for (const KeyValue<StringName, Instance::InstanceShaderParameter> &E : p_instance->instance_shader_parameters) {
+					for (const KeyValue<StringName, Instance::InstanceShaderParameter> &E : p_instance->instance_shader_uniforms) {
 						if (E.value.value.get_type() != Variant::NIL) {
 							RSG::material_storage->global_shader_uniforms_instance_update(p_instance->self, E.value.index, E.value.value);
 						}
 					}
 				} else {
 					RSG::material_storage->global_shader_uniforms_instance_free(p_instance->self);
-					p_instance->instance_allocated_shader_parameters_offset = -1;
-					geom->geometry_instance->set_instance_shader_parameters_offset(-1);
+					p_instance->instance_allocated_shader_uniforms_offset = -1;
+					geom->geometry_instance->set_instance_shader_uniforms_offset(-1);
 				}
 			}
 		}
@@ -3953,7 +3953,7 @@ bool RendererSceneCull::free(RID p_rid) {
 		instance_geometry_set_material_overlay(p_rid, RID());
 		instance_attach_skeleton(p_rid, RID());
 
-		if (instance->instance_allocated_shader_parameters) {
+		if (instance->instance_allocated_shader_uniforms) {
 			//free the used shader parameters
 			RSG::material_storage->global_shader_uniforms_instance_free(instance->self);
 		}
diff --git a/servers/rendering/renderer_scene_cull.h b/servers/rendering/renderer_scene_cull.h
index 3a2b0a0fdf..540fb0e27a 100644
--- a/servers/rendering/renderer_scene_cull.h
+++ b/servers/rendering/renderer_scene_cull.h
@@ -426,9 +426,9 @@ public:
 			PropertyInfo info;
 		};
 
-		HashMap<StringName, InstanceShaderParameter> instance_shader_parameters;
-		bool instance_allocated_shader_parameters = false;
-		int32_t instance_allocated_shader_parameters_offset = -1;
+		HashMap<StringName, InstanceShaderParameter> instance_shader_uniforms;
+		bool instance_allocated_shader_uniforms = false;
+		int32_t instance_allocated_shader_uniforms_offset = -1;
 
 		//
 
@@ -967,12 +967,12 @@ public:
 	virtual void instance_geometry_set_lightmap(RID p_instance, RID p_lightmap, const Rect2 &p_lightmap_uv_scale, int p_slice_index);
 	virtual void instance_geometry_set_lod_bias(RID p_instance, float p_lod_bias);
 
-	void _update_instance_shader_parameters_from_material(HashMap<StringName, Instance::InstanceShaderParameter> &isparams, const HashMap<StringName, Instance::InstanceShaderParameter> &existing_isparams, RID p_material);
+	void _update_instance_shader_uniforms_from_material(HashMap<StringName, Instance::InstanceShaderParameter> &isparams, const HashMap<StringName, Instance::InstanceShaderParameter> &existing_isparams, RID p_material);
 
-	virtual void instance_geometry_set_shader_parameter(RID p_instance, const StringName &p_parameter, const Variant &p_value);
-	virtual void instance_geometry_get_shader_parameter_list(RID p_instance, List<PropertyInfo> *p_parameters) const;
-	virtual Variant instance_geometry_get_shader_parameter(RID p_instance, const StringName &p_parameter) const;
-	virtual Variant instance_geometry_get_shader_parameter_default_value(RID p_instance, const StringName &p_parameter) const;
+	virtual void instance_geometry_set_shader_uniform(RID p_instance, const StringName &p_parameter, const Variant &p_value);
+	virtual void instance_geometry_get_shader_uniform_list(RID p_instance, List<PropertyInfo> *p_parameters) const;
+	virtual Variant instance_geometry_get_shader_uniform(RID p_instance, const StringName &p_parameter) const;
+	virtual Variant instance_geometry_get_shader_uniform_default_value(RID p_instance, const StringName &p_parameter) const;
 
 	_FORCE_INLINE_ void _update_instance(Instance *p_instance);
 	_FORCE_INLINE_ void _update_instance_aabb(Instance *p_instance);
diff --git a/servers/rendering/renderer_viewport.cpp b/servers/rendering/renderer_viewport.cpp
index 118bf532b3..73b03966c5 100644
--- a/servers/rendering/renderer_viewport.cpp
+++ b/servers/rendering/renderer_viewport.cpp
@@ -138,7 +138,11 @@ void RendererViewport::_configure_3d_render_buffers(Viewport *p_viewport) {
 
 			p_viewport->internal_size = Size2(render_width, render_height);
 
-			RSG::scene->render_buffers_configure(p_viewport->render_buffers, p_viewport->render_target, render_width, render_height, width, height, p_viewport->fsr_sharpness, p_viewport->texture_mipmap_bias, p_viewport->msaa, p_viewport->screen_space_aa, p_viewport->use_taa, p_viewport->use_debanding, p_viewport->get_view_count());
+			// At resolution scales lower than 1.0, use negative texture mipmap bias
+			// to compensate for the loss of sharpness.
+			const float texture_mipmap_bias = log2f(MIN(scaling_3d_scale, 1.0)) + p_viewport->texture_mipmap_bias;
+
+			RSG::scene->render_buffers_configure(p_viewport->render_buffers, p_viewport->render_target, render_width, render_height, width, height, p_viewport->fsr_sharpness, texture_mipmap_bias, p_viewport->msaa, p_viewport->screen_space_aa, p_viewport->use_taa, p_viewport->use_debanding, p_viewport->get_view_count());
 		}
 	}
 }
diff --git a/servers/rendering/rendering_device.cpp b/servers/rendering/rendering_device.cpp
index 0b76bb3051..c07a783302 100644
--- a/servers/rendering/rendering_device.cpp
+++ b/servers/rendering/rendering_device.cpp
@@ -387,6 +387,7 @@ void RenderingDevice::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("framebuffer_create_multipass", "textures", "passes", "validate_with_format", "view_count"), &RenderingDevice::_framebuffer_create_multipass, DEFVAL(INVALID_FORMAT_ID), DEFVAL(1));
 	ClassDB::bind_method(D_METHOD("framebuffer_create_empty", "size", "samples", "validate_with_format"), &RenderingDevice::framebuffer_create_empty, DEFVAL(TEXTURE_SAMPLES_1), DEFVAL(INVALID_FORMAT_ID));
 	ClassDB::bind_method(D_METHOD("framebuffer_get_format", "framebuffer"), &RenderingDevice::framebuffer_get_format);
+	ClassDB::bind_method(D_METHOD("framebuffer_is_valid", "framebuffer"), &RenderingDevice::framebuffer_is_valid);
 
 	ClassDB::bind_method(D_METHOD("sampler_create", "state"), &RenderingDevice::_sampler_create);
 
diff --git a/servers/rendering/rendering_device.h b/servers/rendering/rendering_device.h
index 03aa6f7644..a864cfa74c 100644
--- a/servers/rendering/rendering_device.h
+++ b/servers/rendering/rendering_device.h
@@ -129,6 +129,8 @@ public:
 	typedef Vector<uint8_t> (*ShaderCompileToSPIRVFunction)(ShaderStage p_stage, const String &p_source_code, ShaderLanguage p_language, String *r_error, const RenderingDevice *p_render_device);
 	typedef Vector<uint8_t> (*ShaderCacheFunction)(ShaderStage p_stage, const String &p_source_code, ShaderLanguage p_language);
 
+	typedef void (*InvalidationCallback)(void *);
+
 private:
 	static ShaderCompileToSPIRVFunction compile_to_spirv_function;
 	static ShaderCacheFunction cache_function;
@@ -547,13 +549,15 @@ public:
 		int32_t vrs_attachment = ATTACHMENT_UNUSED; // density map for VRS, only used if supported
 	};
 
-	virtual FramebufferFormatID framebuffer_format_create_multipass(const Vector<AttachmentFormat> &p_attachments, Vector<FramebufferPass> &p_passes, uint32_t p_view_count = 1) = 0;
+	virtual FramebufferFormatID framebuffer_format_create_multipass(const Vector<AttachmentFormat> &p_attachments, const Vector<FramebufferPass> &p_passes, uint32_t p_view_count = 1) = 0;
 	virtual FramebufferFormatID framebuffer_format_create_empty(TextureSamples p_samples = TEXTURE_SAMPLES_1) = 0;
 	virtual TextureSamples framebuffer_format_get_texture_samples(FramebufferFormatID p_format, uint32_t p_pass = 0) = 0;
 
 	virtual RID framebuffer_create(const Vector<RID> &p_texture_attachments, FramebufferFormatID p_format_check = INVALID_ID, uint32_t p_view_count = 1) = 0;
-	virtual RID framebuffer_create_multipass(const Vector<RID> &p_texture_attachments, Vector<FramebufferPass> &p_passes, FramebufferFormatID p_format_check = INVALID_ID, uint32_t p_view_count = 1) = 0;
+	virtual RID framebuffer_create_multipass(const Vector<RID> &p_texture_attachments, const Vector<FramebufferPass> &p_passes, FramebufferFormatID p_format_check = INVALID_ID, uint32_t p_view_count = 1) = 0;
 	virtual RID framebuffer_create_empty(const Size2i &p_size, TextureSamples p_samples = TEXTURE_SAMPLES_1, FramebufferFormatID p_format_check = INVALID_ID) = 0;
+	virtual bool framebuffer_is_valid(RID p_framebuffer) const = 0;
+	virtual void framebuffer_set_invalidation_callback(RID p_framebuffer, InvalidationCallback p_callback, void *p_userdata) = 0;
 
 	virtual FramebufferFormatID framebuffer_get_format(RID p_framebuffer) = 0;
 
@@ -793,8 +797,7 @@ public:
 
 	virtual RID uniform_set_create(const Vector<Uniform> &p_uniforms, RID p_shader, uint32_t p_shader_set) = 0;
 	virtual bool uniform_set_is_valid(RID p_uniform_set) = 0;
-	typedef void (*UniformSetInvalidatedCallback)(void *);
-	virtual void uniform_set_set_invalidation_callback(RID p_uniform_set, UniformSetInvalidatedCallback p_callback, void *p_userdata) = 0;
+	virtual void uniform_set_set_invalidation_callback(RID p_uniform_set, InvalidationCallback p_callback, void *p_userdata) = 0;
 
 	virtual Error buffer_update(RID p_buffer, uint32_t p_offset, uint32_t p_size, const void *p_data, uint32_t p_post_barrier = BARRIER_MASK_ALL) = 0;
 	virtual Error buffer_clear(RID p_buffer, uint32_t p_offset, uint32_t p_size, uint32_t p_post_barrier = BARRIER_MASK_ALL) = 0;
diff --git a/servers/rendering/rendering_server_default.h b/servers/rendering/rendering_server_default.h
index 21a94b88f2..cc79d09503 100644
--- a/servers/rendering/rendering_server_default.h
+++ b/servers/rendering/rendering_server_default.h
@@ -227,7 +227,7 @@ public:
 	FUNC2(shader_set_path_hint, RID, const String &)
 	FUNC1RC(String, shader_get_code, RID)
 
-	FUNC2SC(shader_get_param_list, RID, List<PropertyInfo> *)
+	FUNC2SC(shader_get_shader_uniform_list, RID, List<PropertyInfo> *)
 
 	FUNC4(shader_set_default_texture_param, RID, const StringName &, RID, int)
 	FUNC3RC(RID, shader_get_default_texture_param, RID, const StringName &, int)
@@ -773,10 +773,10 @@ public:
 	FUNC4(instance_geometry_set_lightmap, RID, RID, const Rect2 &, int)
 	FUNC2(instance_geometry_set_lod_bias, RID, float)
 	FUNC2(instance_geometry_set_transparency, RID, float)
-	FUNC3(instance_geometry_set_shader_parameter, RID, const StringName &, const Variant &)
-	FUNC2RC(Variant, instance_geometry_get_shader_parameter, RID, const StringName &)
-	FUNC2RC(Variant, instance_geometry_get_shader_parameter_default_value, RID, const StringName &)
-	FUNC2C(instance_geometry_get_shader_parameter_list, RID, List<PropertyInfo> *)
+	FUNC3(instance_geometry_set_shader_uniform, RID, const StringName &, const Variant &)
+	FUNC2RC(Variant, instance_geometry_get_shader_uniform, RID, const StringName &)
+	FUNC2RC(Variant, instance_geometry_get_shader_uniform_default_value, RID, const StringName &)
+	FUNC2C(instance_geometry_get_shader_uniform_list, RID, List<PropertyInfo> *)
 
 	FUNC3R(TypedArray<Image>, bake_render_uv2, RID, const Vector<RID> &, const Size2i &)
 
diff --git a/servers/rendering/shader_compiler.cpp b/servers/rendering/shader_compiler.cpp
index 5653d6bfe2..f14350305a 100644
--- a/servers/rendering/shader_compiler.cpp
+++ b/servers/rendering/shader_compiler.cpp
@@ -1475,8 +1475,11 @@ void ShaderCompiler::initialize(DefaultIdentifierActions p_actions) {
 	texture_functions.insert("textureLod");
 	texture_functions.insert("textureProjLod");
 	texture_functions.insert("textureGrad");
+	texture_functions.insert("textureProjGrad");
 	texture_functions.insert("textureGather");
 	texture_functions.insert("textureSize");
+	texture_functions.insert("textureQueryLod");
+	texture_functions.insert("textureQueryLevels");
 	texture_functions.insert("texelFetch");
 }
 
diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp
index 36e644c1b1..cab92e6e20 100644
--- a/servers/rendering/shader_language.cpp
+++ b/servers/rendering/shader_language.cpp
@@ -2479,11 +2479,15 @@ const ShaderLanguage::BuiltinFuncDef ShaderLanguage::builtin_func_defs[] = {
 
 	// reflect
 
+	{ "reflect", TYPE_VEC2, { TYPE_VEC2, TYPE_VEC2, TYPE_VOID }, { "I", "N" }, TAG_GLOBAL, false },
 	{ "reflect", TYPE_VEC3, { TYPE_VEC3, TYPE_VEC3, TYPE_VOID }, { "I", "N" }, TAG_GLOBAL, false },
+	{ "reflect", TYPE_VEC4, { TYPE_VEC4, TYPE_VEC4, TYPE_VOID }, { "I", "N" }, TAG_GLOBAL, false },
 
 	// refract
 
+	{ "refract", TYPE_VEC2, { TYPE_VEC2, TYPE_VEC2, TYPE_FLOAT, TYPE_VOID }, { "I", "N", "eta" }, TAG_GLOBAL, false },
 	{ "refract", TYPE_VEC3, { TYPE_VEC3, TYPE_VEC3, TYPE_FLOAT, TYPE_VOID }, { "I", "N", "eta" }, TAG_GLOBAL, false },
+	{ "refract", TYPE_VEC4, { TYPE_VEC4, TYPE_VEC4, TYPE_FLOAT, TYPE_VOID }, { "I", "N", "eta" }, TAG_GLOBAL, false },
 
 	// faceforward
 
@@ -2744,6 +2748,18 @@ const ShaderLanguage::BuiltinFuncDef ShaderLanguage::builtin_func_defs[] = {
 	{ "textureGrad", TYPE_VEC4, { TYPE_SAMPLERCUBE, TYPE_VEC3, TYPE_VEC3, TYPE_VEC3, TYPE_VOID }, { "sampler", "coords", "dPdx", "dPdy" }, TAG_GLOBAL, false },
 	{ "textureGrad", TYPE_VEC4, { TYPE_SAMPLERCUBEARRAY, TYPE_VEC4, TYPE_VEC3, TYPE_VEC3, TYPE_VOID }, { "sampler", "coords", "dPdx", "dPdy" }, TAG_GLOBAL, false },
 
+	// textureProjGrad
+
+	{ "textureProjGrad", TYPE_VEC4, { TYPE_SAMPLER2D, TYPE_VEC3, TYPE_VEC2, TYPE_VEC2, TYPE_VOID }, { "sampler", "coords", "dPdx", "dPdy" }, TAG_GLOBAL, false },
+	{ "textureProjGrad", TYPE_VEC4, { TYPE_SAMPLER2D, TYPE_VEC4, TYPE_VEC2, TYPE_VEC2, TYPE_VOID }, { "sampler", "coords", "dPdx", "dPdy" }, TAG_GLOBAL, false },
+	{ "textureProjGrad", TYPE_IVEC4, { TYPE_ISAMPLER2D, TYPE_VEC3, TYPE_VEC2, TYPE_VEC2, TYPE_VOID }, { "sampler", "coords", "dPdx", "dPdy" }, TAG_GLOBAL, false },
+	{ "textureProjGrad", TYPE_IVEC4, { TYPE_ISAMPLER2D, TYPE_VEC4, TYPE_VEC2, TYPE_VEC2, TYPE_VOID }, { "sampler", "coords", "dPdx", "dPdy" }, TAG_GLOBAL, false },
+	{ "textureProjGrad", TYPE_UVEC4, { TYPE_USAMPLER2D, TYPE_VEC3, TYPE_VEC2, TYPE_VEC2, TYPE_VOID }, { "sampler", "coords", "dPdx", "dPdy" }, TAG_GLOBAL, false },
+	{ "textureProjGrad", TYPE_UVEC4, { TYPE_USAMPLER2D, TYPE_VEC4, TYPE_VEC2, TYPE_VEC2, TYPE_VOID }, { "sampler", "coords", "dPdx", "dPdy" }, TAG_GLOBAL, false },
+	{ "textureProjGrad", TYPE_VEC4, { TYPE_SAMPLER3D, TYPE_VEC4, TYPE_VEC3, TYPE_VEC3, TYPE_VOID }, { "sampler", "coords", "dPdx", "dPdy" }, TAG_GLOBAL, false },
+	{ "textureProjGrad", TYPE_IVEC4, { TYPE_ISAMPLER3D, TYPE_VEC4, TYPE_VEC3, TYPE_VEC3, TYPE_VOID }, { "sampler", "coords", "dPdx", "dPdy" }, TAG_GLOBAL, false },
+	{ "textureProjGrad", TYPE_UVEC4, { TYPE_USAMPLER3D, TYPE_VEC4, TYPE_VEC3, TYPE_VEC3, TYPE_VOID }, { "sampler", "coords", "dPdx", "dPdy" }, TAG_GLOBAL, false },
+
 	// textureGather
 
 	{ "textureGather", TYPE_VEC4, { TYPE_SAMPLER2D, TYPE_VEC2, TYPE_VOID }, { "sampler", "coords" }, TAG_GLOBAL, false },
@@ -2761,6 +2777,32 @@ const ShaderLanguage::BuiltinFuncDef ShaderLanguage::builtin_func_defs[] = {
 	{ "textureGather", TYPE_VEC4, { TYPE_SAMPLERCUBE, TYPE_VEC3, TYPE_VOID }, { "sampler", "coords" }, TAG_GLOBAL, false },
 	{ "textureGather", TYPE_VEC4, { TYPE_SAMPLERCUBE, TYPE_VEC3, TYPE_INT, TYPE_VOID }, { "sampler", "coords", "comp" }, TAG_GLOBAL, false },
 
+	// textureQueryLod
+
+	{ "textureQueryLod", TYPE_VEC2, { TYPE_SAMPLER2D, TYPE_VEC2 }, { "sampler", "coords" }, TAG_GLOBAL, true },
+	{ "textureQueryLod", TYPE_VEC2, { TYPE_ISAMPLER2D, TYPE_VEC2 }, { "sampler", "coords" }, TAG_GLOBAL, true },
+	{ "textureQueryLod", TYPE_VEC2, { TYPE_USAMPLER2D, TYPE_VEC2 }, { "sampler", "coords" }, TAG_GLOBAL, true },
+	{ "textureQueryLod", TYPE_VEC2, { TYPE_SAMPLER2DARRAY, TYPE_VEC2 }, { "sampler", "coords" }, TAG_GLOBAL, true },
+	{ "textureQueryLod", TYPE_VEC2, { TYPE_ISAMPLER2DARRAY, TYPE_VEC2 }, { "sampler", "coords" }, TAG_GLOBAL, true },
+	{ "textureQueryLod", TYPE_VEC2, { TYPE_USAMPLER2DARRAY, TYPE_VEC2 }, { "sampler", "coords" }, TAG_GLOBAL, true },
+	{ "textureQueryLod", TYPE_VEC2, { TYPE_SAMPLER3D, TYPE_VEC3 }, { "sampler", "coords" }, TAG_GLOBAL, true },
+	{ "textureQueryLod", TYPE_VEC2, { TYPE_ISAMPLER3D, TYPE_VEC3 }, { "sampler", "coords" }, TAG_GLOBAL, true },
+	{ "textureQueryLod", TYPE_VEC2, { TYPE_USAMPLER3D, TYPE_VEC3 }, { "sampler", "coords" }, TAG_GLOBAL, true },
+	{ "textureQueryLod", TYPE_VEC2, { TYPE_SAMPLERCUBE, TYPE_VEC3 }, { "sampler", "coords" }, TAG_GLOBAL, true },
+
+	// textureQueryLevels
+
+	{ "textureQueryLevels", TYPE_INT, { TYPE_SAMPLER2D }, { "sampler" }, TAG_GLOBAL, true },
+	{ "textureQueryLevels", TYPE_INT, { TYPE_ISAMPLER2D }, { "sampler" }, TAG_GLOBAL, true },
+	{ "textureQueryLevels", TYPE_INT, { TYPE_USAMPLER2D }, { "sampler" }, TAG_GLOBAL, true },
+	{ "textureQueryLevels", TYPE_INT, { TYPE_SAMPLER2DARRAY }, { "sampler" }, TAG_GLOBAL, true },
+	{ "textureQueryLevels", TYPE_INT, { TYPE_ISAMPLER2DARRAY }, { "sampler" }, TAG_GLOBAL, true },
+	{ "textureQueryLevels", TYPE_INT, { TYPE_USAMPLER2DARRAY }, { "sampler" }, TAG_GLOBAL, true },
+	{ "textureQueryLevels", TYPE_INT, { TYPE_SAMPLER3D }, { "sampler" }, TAG_GLOBAL, true },
+	{ "textureQueryLevels", TYPE_INT, { TYPE_ISAMPLER3D }, { "sampler" }, TAG_GLOBAL, true },
+	{ "textureQueryLevels", TYPE_INT, { TYPE_USAMPLER3D }, { "sampler" }, TAG_GLOBAL, true },
+	{ "textureQueryLevels", TYPE_INT, { TYPE_SAMPLERCUBE }, { "sampler" }, TAG_GLOBAL, true },
+
 	// dFdx
 
 	{ "dFdx", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID }, { "p" }, TAG_GLOBAL, false },
diff --git a/servers/rendering/shader_preprocessor.cpp b/servers/rendering/shader_preprocessor.cpp
index a7b274b3e2..8755ee61cc 100644
--- a/servers/rendering/shader_preprocessor.cpp
+++ b/servers/rendering/shader_preprocessor.cpp
@@ -349,6 +349,8 @@ void ShaderPreprocessor::process_directive(Tokenizer *p_tokenizer) {
 		process_ifdef(p_tokenizer);
 	} else if (directive == "ifndef") {
 		process_ifndef(p_tokenizer);
+	} else if (directive == "elif") {
+		process_elif(p_tokenizer);
 	} else if (directive == "else") {
 		process_else(p_tokenizer);
 	} else if (directive == "endif") {
@@ -415,24 +417,83 @@ void ShaderPreprocessor::process_define(Tokenizer *p_tokenizer) {
 	}
 }
 
+void ShaderPreprocessor::process_elif(Tokenizer *p_tokenizer) {
+	const int line = p_tokenizer->get_line();
+
+	if (state->current_branch == nullptr || state->current_branch->else_defined) {
+		set_error(RTR("Unmatched elif."), line);
+		return;
+	}
+	if (state->previous_region != nullptr) {
+		state->previous_region->to_line = line - 1;
+	}
+
+	String body = tokens_to_string(p_tokenizer->advance('\n')).strip_edges();
+	if (body.is_empty()) {
+		set_error(RTR("Missing condition."), line);
+		return;
+	}
+
+	Error error = expand_macros(body, line, body);
+	if (error != OK) {
+		return;
+	}
+
+	Expression expression;
+	Vector<String> names;
+	error = expression.parse(body, names);
+	if (error != OK) {
+		set_error(expression.get_error_text(), line);
+		return;
+	}
+
+	Variant v = expression.execute(Array(), nullptr, false);
+	if (v.get_type() == Variant::NIL) {
+		set_error(RTR("Condition evaluation error."), line);
+		return;
+	}
+
+	bool skip = false;
+	for (int i = 0; i < state->current_branch->conditions.size(); i++) {
+		if (state->current_branch->conditions[i]) {
+			skip = true;
+			break;
+		}
+	}
+
+	bool success = !skip && v.booleanize();
+	start_branch_condition(p_tokenizer, success, true);
+
+	if (state->save_regions) {
+		add_region(line + 1, success, state->previous_region->parent);
+	}
+}
+
 void ShaderPreprocessor::process_else(Tokenizer *p_tokenizer) {
-	if (state->skip_stack_else.is_empty()) {
-		set_error(RTR("Unmatched else."), p_tokenizer->get_line());
+	const int line = p_tokenizer->get_line();
+
+	if (state->current_branch == nullptr || state->current_branch->else_defined) {
+		set_error(RTR("Unmatched else."), line);
 		return;
 	}
-	p_tokenizer->advance('\n');
+	if (state->previous_region != nullptr) {
+		state->previous_region->to_line = line - 1;
+	}
 
-	bool skip = state->skip_stack_else[state->skip_stack_else.size() - 1];
-	state->skip_stack_else.remove_at(state->skip_stack_else.size() - 1);
+	p_tokenizer->advance('\n');
 
-	Vector<SkippedCondition *> vec = state->skipped_conditions[state->current_include];
-	int index = vec.size() - 1;
-	if (index >= 0) {
-		SkippedCondition *cond = vec[index];
-		if (cond->end_line == -1) {
-			cond->end_line = p_tokenizer->get_line();
+	bool skip = false;
+	for (int i = 0; i < state->current_branch->conditions.size(); i++) {
+		if (state->current_branch->conditions[i]) {
+			skip = true;
+			break;
 		}
 	}
+	state->current_branch->else_defined = true;
+
+	if (state->save_regions) {
+		add_region(line + 1, !skip, state->previous_region->parent);
+	}
 
 	if (skip) {
 		Vector<String> ends;
@@ -447,21 +508,19 @@ void ShaderPreprocessor::process_endif(Tokenizer *p_tokenizer) {
 		set_error(RTR("Unmatched endif."), p_tokenizer->get_line());
 		return;
 	}
-
-	Vector<SkippedCondition *> vec = state->skipped_conditions[state->current_include];
-	int index = vec.size() - 1;
-	if (index >= 0) {
-		SkippedCondition *cond = vec[index];
-		if (cond->end_line == -1) {
-			cond->end_line = p_tokenizer->get_line();
-		}
+	if (state->previous_region != nullptr) {
+		state->previous_region->to_line = p_tokenizer->get_line() - 1;
+		state->previous_region = state->previous_region->parent;
 	}
 
 	p_tokenizer->advance('\n');
+
+	state->current_branch = state->current_branch->parent;
+	state->branches.pop_back();
 }
 
 void ShaderPreprocessor::process_if(Tokenizer *p_tokenizer) {
-	int line = p_tokenizer->get_line();
+	const int line = p_tokenizer->get_line();
 
 	String body = tokens_to_string(p_tokenizer->advance('\n')).strip_edges();
 	if (body.is_empty()) {
@@ -490,6 +549,10 @@ void ShaderPreprocessor::process_if(Tokenizer *p_tokenizer) {
 
 	bool success = v.booleanize();
 	start_branch_condition(p_tokenizer, success);
+
+	if (state->save_regions) {
+		add_region(line + 1, success, state->previous_region);
+	}
 }
 
 void ShaderPreprocessor::process_ifdef(Tokenizer *p_tokenizer) {
@@ -510,6 +573,10 @@ void ShaderPreprocessor::process_ifdef(Tokenizer *p_tokenizer) {
 
 	bool success = state->defines.has(label);
 	start_branch_condition(p_tokenizer, success);
+
+	if (state->save_regions) {
+		add_region(line + 1, success, state->previous_region);
+	}
 }
 
 void ShaderPreprocessor::process_ifndef(Tokenizer *p_tokenizer) {
@@ -530,6 +597,10 @@ void ShaderPreprocessor::process_ifndef(Tokenizer *p_tokenizer) {
 
 	bool success = !state->defines.has(label);
 	start_branch_condition(p_tokenizer, success);
+
+	if (state->save_regions) {
+		add_region(line + 1, success, state->previous_region);
+	}
 }
 
 void ShaderPreprocessor::process_include(Tokenizer *p_tokenizer) {
@@ -594,15 +665,15 @@ void ShaderPreprocessor::process_include(Tokenizer *p_tokenizer) {
 		return;
 	}
 
-	String old_include = state->current_include;
-	state->current_include = real_path;
+	String old_filename = state->current_filename;
+	state->current_filename = real_path;
 	ShaderPreprocessor processor;
 
 	int prev_condition_depth = state->condition_depth;
 	state->condition_depth = 0;
 
 	FilePosition fp;
-	fp.file = state->current_include;
+	fp.file = state->current_filename;
 	fp.line = line;
 	state->include_positions.push_back(fp);
 
@@ -614,7 +685,7 @@ void ShaderPreprocessor::process_include(Tokenizer *p_tokenizer) {
 
 	// Reset to last include if there are no errors. We want to use this as context.
 	if (state->error.is_empty()) {
-		state->current_include = old_include;
+		state->current_filename = old_filename;
 		state->include_positions.pop_back();
 	} else {
 		return;
@@ -668,24 +739,28 @@ void ShaderPreprocessor::process_undef(Tokenizer *p_tokenizer) {
 	state->defines.erase(label);
 }
 
-void ShaderPreprocessor::start_branch_condition(Tokenizer *p_tokenizer, bool p_success) {
-	state->condition_depth++;
+void ShaderPreprocessor::add_region(int p_line, bool p_enabled, Region *p_parent_region) {
+	Region region;
+	region.file = state->current_filename;
+	region.enabled = p_enabled;
+	region.from_line = p_line;
+	region.parent = p_parent_region;
+	state->previous_region = &state->regions[region.file].push_back(region)->get();
+}
 
-	if (p_success) {
-		state->skip_stack_else.push_back(true);
+void ShaderPreprocessor::start_branch_condition(Tokenizer *p_tokenizer, bool p_success, bool p_continue) {
+	if (!p_continue) {
+		state->condition_depth++;
+		state->current_branch = &state->branches.push_back(Branch(p_success, state->current_branch))->get();
 	} else {
-		SkippedCondition *cond = memnew(SkippedCondition());
-		cond->start_line = p_tokenizer->get_line();
-		state->skipped_conditions[state->current_include].push_back(cond);
-
+		state->current_branch->conditions.push_back(p_success);
+	}
+	if (!p_success) {
 		Vector<String> ends;
+		ends.push_back("elif");
 		ends.push_back("else");
 		ends.push_back("endif");
-		if (next_directive(p_tokenizer, ends) == "else") {
-			state->skip_stack_else.push_back(false);
-		} else {
-			state->skip_stack_else.push_back(true);
-		}
+		next_directive(p_tokenizer, ends);
 	}
 }
 
@@ -874,12 +949,6 @@ void ShaderPreprocessor::clear() {
 			memdelete(E->get());
 		}
 
-		for (const RBMap<String, Vector<SkippedCondition *>>::Element *E = state->skipped_conditions.front(); E; E = E->next()) {
-			for (SkippedCondition *condition : E->get()) {
-				memdelete(condition);
-			}
-		}
-
 		memdelete(state);
 	}
 	state_owner = false;
@@ -969,8 +1038,12 @@ Error ShaderPreprocessor::preprocess(State *p_state, const String &p_code, Strin
 	return OK;
 }
 
-Error ShaderPreprocessor::preprocess(const String &p_code, String &r_result, String *r_error_text, List<FilePosition> *r_error_position, HashSet<Ref<ShaderInclude>> *r_includes, List<ScriptLanguage::CodeCompletionOption> *r_completion_options, IncludeCompletionFunction p_include_completion_func) {
+Error ShaderPreprocessor::preprocess(const String &p_code, const String &p_filename, String &r_result, String *r_error_text, List<FilePosition> *r_error_position, List<Region> *r_regions, HashSet<Ref<ShaderInclude>> *r_includes, List<ScriptLanguage::CodeCompletionOption> *r_completion_options, IncludeCompletionFunction p_include_completion_func) {
 	State pp_state;
+	if (!p_filename.is_empty()) {
+		pp_state.current_filename = p_filename;
+		pp_state.save_regions = r_regions != nullptr;
+	}
 	Error err = preprocess(&pp_state, p_code, r_result);
 	if (err != OK) {
 		if (r_error_text) {
@@ -980,6 +1053,9 @@ Error ShaderPreprocessor::preprocess(const String &p_code, String &r_result, Str
 			*r_error_position = pp_state.include_positions;
 		}
 	}
+	if (r_regions) {
+		*r_regions = pp_state.regions[p_filename];
+	}
 	if (r_includes) {
 		*r_includes = pp_state.shader_includes;
 	}
@@ -1022,6 +1098,7 @@ Error ShaderPreprocessor::preprocess(const String &p_code, String &r_result, Str
 
 void ShaderPreprocessor::get_keyword_list(List<String> *r_keywords, bool p_include_shader_keywords) {
 	r_keywords->push_back("define");
+	r_keywords->push_back("elif");
 	if (p_include_shader_keywords) {
 		r_keywords->push_back("else");
 	}
diff --git a/servers/rendering/shader_preprocessor.h b/servers/rendering/shader_preprocessor.h
index a93fb680dd..71dd9a6ca8 100644
--- a/servers/rendering/shader_preprocessor.h
+++ b/servers/rendering/shader_preprocessor.h
@@ -58,6 +58,14 @@ public:
 		int line = 0;
 	};
 
+	struct Region {
+		String file;
+		int from_line = -1;
+		int to_line = -1;
+		bool enabled = false;
+		Region *parent = nullptr;
+	};
+
 private:
 	struct Token {
 		char32_t text;
@@ -122,23 +130,34 @@ private:
 		String body;
 	};
 
-	struct SkippedCondition {
-		int start_line = -1;
-		int end_line = -1;
+	struct Branch {
+		Vector<bool> conditions;
+		Branch *parent = nullptr;
+		bool else_defined = false;
+
+		Branch() {}
+
+		Branch(bool p_condition, Branch *p_parent) :
+				parent(p_parent) {
+			conditions.push_back(p_condition);
+		}
 	};
 
 	struct State {
 		RBMap<String, Define *> defines;
-		Vector<bool> skip_stack_else;
+		List<Branch> branches;
+		Branch *current_branch = nullptr;
 		int condition_depth = 0;
 		RBSet<String> includes;
 		List<uint64_t> cyclic_include_hashes; // Holds code hash of includes.
 		int include_depth = 0;
-		String current_include;
+		String current_filename;
 		String current_shader_type;
 		String error;
 		List<FilePosition> include_positions;
-		RBMap<String, Vector<SkippedCondition *>> skipped_conditions;
+		bool save_regions = false;
+		RBMap<String, List<Region>> regions;
+		Region *previous_region = nullptr;
 		bool disabled = false;
 		CompletionType completion_type = COMPLETION_TYPE_NONE;
 		HashSet<Ref<ShaderInclude>> shader_includes;
@@ -158,6 +177,7 @@ private:
 
 	void process_directive(Tokenizer *p_tokenizer);
 	void process_define(Tokenizer *p_tokenizer);
+	void process_elif(Tokenizer *p_tokenizer);
 	void process_else(Tokenizer *p_tokenizer);
 	void process_endif(Tokenizer *p_tokenizer);
 	void process_if(Tokenizer *p_tokenizer);
@@ -167,7 +187,8 @@ private:
 	void process_pragma(Tokenizer *p_tokenizer);
 	void process_undef(Tokenizer *p_tokenizer);
 
-	void start_branch_condition(Tokenizer *p_tokenizer, bool p_success);
+	void add_region(int p_line, bool p_enabled, Region *p_parent_region);
+	void start_branch_condition(Tokenizer *p_tokenizer, bool p_success, bool p_continue = false);
 
 	void expand_output_macros(int p_start, int p_line);
 	Error expand_macros(const String &p_string, int p_line, String &r_result);
@@ -188,7 +209,7 @@ private:
 public:
 	typedef void (*IncludeCompletionFunction)(List<ScriptLanguage::CodeCompletionOption> *);
 
-	Error preprocess(const String &p_code, String &r_result, String *r_error_text = nullptr, List<FilePosition> *r_error_position = nullptr, HashSet<Ref<ShaderInclude>> *r_includes = nullptr, List<ScriptLanguage::CodeCompletionOption> *r_completion_options = nullptr, IncludeCompletionFunction p_include_completion_func = nullptr);
+	Error preprocess(const String &p_code, const String &p_filename, String &r_result, String *r_error_text = nullptr, List<FilePosition> *r_error_position = nullptr, List<Region> *r_regions = nullptr, HashSet<Ref<ShaderInclude>> *r_includes = nullptr, List<ScriptLanguage::CodeCompletionOption> *r_completion_options = nullptr, IncludeCompletionFunction p_include_completion_func = nullptr);
 
 	static void get_keyword_list(List<String> *r_keywords, bool p_include_shader_keywords);
 	static void get_pragma_list(List<String> *r_pragmas);
diff --git a/servers/rendering/storage/material_storage.h b/servers/rendering/storage/material_storage.h
index 6347b22240..ad8e3e79bf 100644
--- a/servers/rendering/storage/material_storage.h
+++ b/servers/rendering/storage/material_storage.h
@@ -63,7 +63,7 @@ public:
 	virtual void shader_set_code(RID p_shader, const String &p_code) = 0;
 	virtual void shader_set_path_hint(RID p_shader, const String &p_path) = 0;
 	virtual String shader_get_code(RID p_shader) const = 0;
-	virtual void shader_get_param_list(RID p_shader, List<PropertyInfo> *p_param_list) const = 0;
+	virtual void shader_get_shader_uniform_list(RID p_shader, List<PropertyInfo> *p_param_list) const = 0;
 
 	virtual void shader_set_default_texture_param(RID p_shader, const StringName &p_name, RID p_texture, int p_index) = 0;
 	virtual RID shader_get_default_texture_param(RID p_shader, const StringName &p_name, int p_index) const = 0;
@@ -94,7 +94,7 @@ public:
 		Variant default_value;
 	};
 
-	virtual void material_get_instance_shader_parameters(RID p_material, List<InstanceShaderParam> *r_parameters) = 0;
+	virtual void material_get_instance_shader_uniforms(RID p_material, List<InstanceShaderParam> *r_parameters) = 0;
 
 	virtual void material_update_dependency(RID p_material, DependencyTracker *p_instance) = 0;
 };
diff --git a/servers/rendering_server.cpp b/servers/rendering_server.cpp
index e02d82fbc3..a54d4f0384 100644
--- a/servers/rendering_server.cpp
+++ b/servers/rendering_server.cpp
@@ -1500,9 +1500,9 @@ TypedArray<Image> RenderingServer::_texture_3d_get(RID p_texture) const {
 	return ret;
 }
 
-TypedArray<Dictionary> RenderingServer::_shader_get_param_list(RID p_shader) const {
+TypedArray<Dictionary> RenderingServer::_shader_get_shader_uniform_list(RID p_shader) const {
 	List<PropertyInfo> l;
-	shader_get_param_list(p_shader, &l);
+	shader_get_shader_uniform_list(p_shader, &l);
 	return convert_property_list(&l);
 }
 
@@ -1625,9 +1625,9 @@ Dictionary RenderingServer::_mesh_get_surface(RID p_mesh, int p_idx) {
 	return d;
 }
 
-Array RenderingServer::_instance_geometry_get_shader_parameter_list(RID p_instance) const {
+Array RenderingServer::_instance_geometry_get_shader_uniform_list(RID p_instance) const {
 	List<PropertyInfo> params;
-	instance_geometry_get_shader_parameter_list(p_instance, &params);
+	instance_geometry_get_shader_uniform_list(p_instance, &params);
 	return convert_property_list(&params);
 }
 
@@ -1701,7 +1701,7 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("shader_set_code", "shader", "code"), &RenderingServer::shader_set_code);
 	ClassDB::bind_method(D_METHOD("shader_set_path_hint", "shader", "path"), &RenderingServer::shader_set_path_hint);
 	ClassDB::bind_method(D_METHOD("shader_get_code", "shader"), &RenderingServer::shader_get_code);
-	ClassDB::bind_method(D_METHOD("shader_get_param_list", "shader"), &RenderingServer::_shader_get_param_list);
+	ClassDB::bind_method(D_METHOD("shader_get_shader_uniform_list", "shader"), &RenderingServer::_shader_get_shader_uniform_list);
 	ClassDB::bind_method(D_METHOD("shader_get_param_default", "shader", "param"), &RenderingServer::shader_get_param_default);
 
 	ClassDB::bind_method(D_METHOD("shader_set_default_texture_param", "shader", "param", "texture", "index"), &RenderingServer::shader_set_default_texture_param, DEFVAL(0));
@@ -1911,6 +1911,7 @@ void RenderingServer::_bind_methods() {
 	BIND_ENUM_CONSTANT(LIGHT_PARAM_SHADOW_NORMAL_BIAS);
 	BIND_ENUM_CONSTANT(LIGHT_PARAM_SHADOW_BIAS);
 	BIND_ENUM_CONSTANT(LIGHT_PARAM_SHADOW_PANCAKE_SIZE);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_SHADOW_OPACITY);
 	BIND_ENUM_CONSTANT(LIGHT_PARAM_SHADOW_BLUR);
 	BIND_ENUM_CONSTANT(LIGHT_PARAM_SHADOW_VOLUMETRIC_FOG_FADE);
 	BIND_ENUM_CONSTANT(LIGHT_PARAM_TRANSMITTANCE_BIAS);
@@ -2484,10 +2485,10 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("instance_geometry_set_lightmap", "instance", "lightmap", "lightmap_uv_scale", "lightmap_slice"), &RenderingServer::instance_geometry_set_lightmap);
 	ClassDB::bind_method(D_METHOD("instance_geometry_set_lod_bias", "instance", "lod_bias"), &RenderingServer::instance_geometry_set_lod_bias);
 
-	ClassDB::bind_method(D_METHOD("instance_geometry_set_shader_parameter", "instance", "parameter", "value"), &RenderingServer::instance_geometry_set_shader_parameter);
-	ClassDB::bind_method(D_METHOD("instance_geometry_get_shader_parameter", "instance", "parameter"), &RenderingServer::instance_geometry_get_shader_parameter);
-	ClassDB::bind_method(D_METHOD("instance_geometry_get_shader_parameter_default_value", "instance", "parameter"), &RenderingServer::instance_geometry_get_shader_parameter_default_value);
-	ClassDB::bind_method(D_METHOD("instance_geometry_get_shader_parameter_list", "instance"), &RenderingServer::_instance_geometry_get_shader_parameter_list);
+	ClassDB::bind_method(D_METHOD("instance_geometry_set_shader_uniform", "instance", "parameter", "value"), &RenderingServer::instance_geometry_set_shader_uniform);
+	ClassDB::bind_method(D_METHOD("instance_geometry_get_shader_uniform", "instance", "parameter"), &RenderingServer::instance_geometry_get_shader_uniform);
+	ClassDB::bind_method(D_METHOD("instance_geometry_get_shader_uniform_default_value", "instance", "parameter"), &RenderingServer::instance_geometry_get_shader_uniform_default_value);
+	ClassDB::bind_method(D_METHOD("instance_geometry_get_shader_uniform_list", "instance"), &RenderingServer::_instance_geometry_get_shader_uniform_list);
 
 	ClassDB::bind_method(D_METHOD("instances_cull_aabb", "aabb", "scenario"), &RenderingServer::_instances_cull_aabb_bind, DEFVAL(RID()));
 	ClassDB::bind_method(D_METHOD("instances_cull_ray", "from", "to", "scenario"), &RenderingServer::_instances_cull_ray_bind, DEFVAL(RID()));
diff --git a/servers/rendering_server.h b/servers/rendering_server.h
index 845a4a7a3e..a2fe9caf19 100644
--- a/servers/rendering_server.h
+++ b/servers/rendering_server.h
@@ -170,7 +170,7 @@ public:
 	virtual void shader_set_code(RID p_shader, const String &p_code) = 0;
 	virtual void shader_set_path_hint(RID p_shader, const String &p_path) = 0;
 	virtual String shader_get_code(RID p_shader) const = 0;
-	virtual void shader_get_param_list(RID p_shader, List<PropertyInfo> *p_param_list) const = 0;
+	virtual void shader_get_shader_uniform_list(RID p_shader, List<PropertyInfo> *p_param_list) const = 0;
 	virtual Variant shader_get_param_default(RID p_shader, const StringName &p_param) const = 0;
 
 	virtual void shader_set_default_texture_param(RID p_shader, const StringName &p_name, RID p_texture, int p_index = 0) = 0;
@@ -425,6 +425,7 @@ public:
 		LIGHT_PARAM_SHADOW_NORMAL_BIAS,
 		LIGHT_PARAM_SHADOW_BIAS,
 		LIGHT_PARAM_SHADOW_PANCAKE_SIZE,
+		LIGHT_PARAM_SHADOW_OPACITY,
 		LIGHT_PARAM_SHADOW_BLUR,
 		LIGHT_PARAM_SHADOW_VOLUMETRIC_FOG_FADE,
 		LIGHT_PARAM_TRANSMITTANCE_BIAS,
@@ -1244,10 +1245,10 @@ public:
 	virtual void instance_geometry_set_lod_bias(RID p_instance, float p_lod_bias) = 0;
 	virtual void instance_geometry_set_transparency(RID p_instance, float p_transparency) = 0;
 
-	virtual void instance_geometry_set_shader_parameter(RID p_instance, const StringName &, const Variant &p_value) = 0;
-	virtual Variant instance_geometry_get_shader_parameter(RID p_instance, const StringName &) const = 0;
-	virtual Variant instance_geometry_get_shader_parameter_default_value(RID p_instance, const StringName &) const = 0;
-	virtual void instance_geometry_get_shader_parameter_list(RID p_instance, List<PropertyInfo> *p_parameters) const = 0;
+	virtual void instance_geometry_set_shader_uniform(RID p_instance, const StringName &, const Variant &p_value) = 0;
+	virtual Variant instance_geometry_get_shader_uniform(RID p_instance, const StringName &) const = 0;
+	virtual Variant instance_geometry_get_shader_uniform_default_value(RID p_instance, const StringName &) const = 0;
+	virtual void instance_geometry_get_shader_uniform_list(RID p_instance, List<PropertyInfo> *p_parameters) const = 0;
 
 	/* Bake 3D objects */
 
@@ -1571,11 +1572,11 @@ private:
 	RID _texture_3d_create(Image::Format p_format, int p_width, int p_height, int p_depth, bool p_mipmaps, const TypedArray<Image> &p_data);
 	void _texture_3d_update(RID p_texture, const TypedArray<Image> &p_data);
 	TypedArray<Image> _texture_3d_get(RID p_texture) const;
-	TypedArray<Dictionary> _shader_get_param_list(RID p_shader) const;
+	TypedArray<Dictionary> _shader_get_shader_uniform_list(RID p_shader) const;
 	RID _mesh_create_from_surfaces(const TypedArray<Dictionary> &p_surfaces, int p_blend_shape_count);
 	void _mesh_add_surface(RID p_mesh, const Dictionary &p_surface);
 	Dictionary _mesh_get_surface(RID p_mesh, int p_idx);
-	Array _instance_geometry_get_shader_parameter_list(RID p_instance) const;
+	Array _instance_geometry_get_shader_uniform_list(RID p_instance) const;
 	TypedArray<Image> _bake_render_uv2(RID p_base, const TypedArray<RID> &p_material_overrides, const Size2i &p_image_size);
 	void _particles_set_trail_bind_poses(RID p_particles, const TypedArray<Transform3D> &p_bind_poses);
 };
diff --git a/servers/text_server.cpp b/servers/text_server.cpp
index fd63a7b99d..2bf0837d88 100644
--- a/servers/text_server.cpp
+++ b/servers/text_server.cpp
@@ -521,6 +521,7 @@ void TextServer::_bind_methods() {
 	BIND_BITFIELD_FLAG(GRAPHEME_IS_PUNCTUATION);
 	BIND_BITFIELD_FLAG(GRAPHEME_IS_UNDERSCORE);
 	BIND_BITFIELD_FLAG(GRAPHEME_IS_CONNECTED);
+	BIND_BITFIELD_FLAG(GRAPHEME_IS_SAFE_TO_INSERT_TATWEEL);
 
 	/* Hinting */
 	BIND_ENUM_CONSTANT(HINTING_NONE);
diff --git a/servers/text_server.h b/servers/text_server.h
index 5874b8f6e8..d45bea3271 100644
--- a/servers/text_server.h
+++ b/servers/text_server.h
@@ -116,6 +116,7 @@ public:
 		GRAPHEME_IS_PUNCTUATION = 1 << 8, // Punctuation, except underscore (can be used as word break, but not line break or justifiction).
 		GRAPHEME_IS_UNDERSCORE = 1 << 9, // Underscore (can be used as word break).
 		GRAPHEME_IS_CONNECTED = 1 << 10, // Connected to previous grapheme.
+		GRAPHEME_IS_SAFE_TO_INSERT_TATWEEL = 1 << 11, // It is safe to insert a U+0640 before this grapheme for elongation.
 	};
 
 	enum Hinting {
diff --git a/tests/core/input/test_input_event_key.h b/tests/core/input/test_input_event_key.h
new file mode 100644
index 0000000000..5d4ca55a35
--- /dev/null
+++ b/tests/core/input/test_input_event_key.h
@@ -0,0 +1,294 @@
+/*************************************************************************/
+/*  test_input_event_key.h                                               */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef TEST_INPUT_EVENT_KEY_H
+#define TEST_INPUT_EVENT_KEY_H
+
+#include "core/input/input_event.h"
+#include "core/os/keyboard.h"
+
+#include "tests/test_macros.h"
+
+namespace TestInputEventKey {
+
+TEST_CASE("[InputEventKey] Key correctly registers being pressed") {
+	InputEventKey key;
+	key.set_pressed(true);
+	CHECK(key.is_pressed() == true);
+
+	key.set_pressed(false);
+	CHECK(key.is_pressed() == false);
+}
+
+TEST_CASE("[InputEventKey] Key correctly stores and retrieves keycode") {
+	InputEventKey key;
+
+	key.set_keycode(Key::ENTER);
+	CHECK(key.get_keycode() == Key::ENTER);
+	CHECK(key.get_keycode() != Key::PAUSE);
+
+	key.set_physical_keycode(Key::BACKSPACE);
+	CHECK(key.get_physical_keycode() == Key::BACKSPACE);
+	CHECK(key.get_physical_keycode() != Key::PAUSE);
+}
+
+TEST_CASE("[InputEventKey] Key correctly stores and retrieves keycode with modifiers") {
+	InputEventKey key;
+
+	key.set_keycode(Key::ENTER);
+	key.set_ctrl_pressed(true);
+
+	CHECK(key.get_keycode_with_modifiers() == (Key::ENTER | KeyModifierMask::CTRL));
+	CHECK(key.get_keycode_with_modifiers() != (Key::ENTER | KeyModifierMask::SHIFT));
+	CHECK(key.get_keycode_with_modifiers() != Key::ENTER);
+
+	key.set_physical_keycode(Key::SPACE);
+	key.set_ctrl_pressed(true);
+
+	CHECK(key.get_physical_keycode_with_modifiers() == (Key::SPACE | KeyModifierMask::CTRL));
+	CHECK(key.get_physical_keycode_with_modifiers() != (Key::SPACE | KeyModifierMask::SHIFT));
+	CHECK(key.get_physical_keycode_with_modifiers() != Key::SPACE);
+}
+
+TEST_CASE("[InputEventKey] Key correctly stores and retrieves unicode") {
+	InputEventKey key;
+
+	key.set_unicode('x');
+	CHECK(key.get_unicode() == 'x');
+	CHECK(key.get_unicode() != 'y');
+}
+
+TEST_CASE("[InputEventKey] Key correctly stores and checks echo") {
+	InputEventKey key;
+
+	key.set_echo(true);
+	CHECK(key.is_echo() == true);
+
+	key.set_echo(false);
+	CHECK(key.is_echo() == false);
+}
+
+TEST_CASE("[InputEventKey] Key correctly converts itself to text") {
+	InputEventKey none_key;
+
+	// These next three tests test the functionality of getting a key that is set to None
+	// as text. These cases are a bit weird, since None has no textual representation
+	// (find_keycode_name(Key::NONE) results in a nullptr). Thus, these tests look weird
+	// with only (Physical) or a lonely modifier with (Physical) but (as far as I
+	// understand the code, that is intended behaviour.
+
+	// Key is None without a physical key.
+	none_key.set_keycode(Key::NONE);
+	CHECK(none_key.as_text() == " (Physical)");
+
+	// Key is none and has modifiers.
+	none_key.set_ctrl_pressed(true);
+	CHECK(none_key.as_text() == "Ctrl+ (Physical)");
+
+	// Key is None WITH a physical key AND modifiers.
+	none_key.set_physical_keycode(Key::ENTER);
+	CHECK(none_key.as_text() == "Ctrl+Enter (Physical)");
+
+	InputEventKey none_key2;
+
+	// Key is None without modifers with a physical key.
+	none_key2.set_keycode(Key::NONE);
+	none_key2.set_physical_keycode(Key::ENTER);
+
+	CHECK(none_key2.as_text() == "Enter (Physical)");
+
+	InputEventKey key;
+
+	// Key has keycode.
+	key.set_keycode(Key::SPACE);
+	CHECK(key.as_text() != "");
+	CHECK(key.as_text() == "Space");
+
+	// Key has keycode and modifiers.
+	key.set_ctrl_pressed(true);
+	CHECK(key.as_text() != "Space");
+	CHECK(key.as_text() == "Ctrl+Space");
+
+	// Since the keycode is set to Key::NONE upon initialization of the
+	// InputEventKey and you can only update it with another Key, the keycode
+	// cannot be empty, so the kc.is_empty() case cannot be tested.
+}
+
+TEST_CASE("[InputEventKey] Key correctly converts its state to a string representation") {
+	InputEventKey none_key;
+
+	// Set physical to true.
+	CHECK(none_key.to_string() == "InputEventKey: keycode=0 (), mods=none, physical=true, pressed=false, echo=false");
+	// Set physical key to Escape.
+	none_key.set_physical_keycode(Key::ESCAPE);
+	CHECK(none_key.to_string() == "InputEventKey: keycode=16777217 (Escape), mods=none, physical=true, pressed=false, echo=false");
+
+	InputEventKey key;
+
+	// Set physical to None, set keycode to Space.
+	key.set_keycode(Key::SPACE);
+	CHECK(key.to_string() == "InputEventKey: keycode=32 (Space), mods=none, physical=false, pressed=false, echo=false");
+
+	// Set pressed to true.
+	key.set_pressed(true);
+	CHECK(key.to_string() == "InputEventKey: keycode=32 (Space), mods=none, physical=false, pressed=true, echo=false");
+
+	// set echo to true.
+	key.set_echo(true);
+	CHECK(key.to_string() == "InputEventKey: keycode=32 (Space), mods=none, physical=false, pressed=true, echo=true");
+
+	// Press Ctrl and Alt.
+	key.set_ctrl_pressed(true);
+	key.set_alt_pressed(true);
+	CHECK(key.to_string() == "InputEventKey: keycode=32 (Space), mods=Ctrl+Alt, physical=false, pressed=true, echo=true");
+}
+
+TEST_CASE("[InputEventKey] Key is correctly converted to reference") {
+	InputEventKey base_key;
+	Ref<InputEventKey> key_ref = base_key.create_reference(Key::ENTER);
+
+	CHECK(key_ref->get_keycode() == Key::ENTER);
+}
+
+TEST_CASE("[InputEventKey] Keys are correctly matched based on action") {
+	bool pressed = false;
+	float strength, raw_strength = 0.0;
+
+	InputEventKey key;
+
+	// Nullptr.
+	CHECK_MESSAGE(key.action_match(nullptr, false, 0.0f, &pressed, &strength, &raw_strength) == false, "nullptr as key reference should result in false");
+
+	// Match on keycode.
+	key.set_keycode(Key::SPACE);
+	Ref<InputEventKey> match = key.create_reference(Key::SPACE);
+	Ref<InputEventKey> no_match = key.create_reference(Key::ENTER);
+
+	CHECK(key.action_match(match, false, 0.0f, &pressed, &strength, &raw_strength) == true);
+	CHECK(key.action_match(no_match, false, 0.0f, &pressed, &strength, &raw_strength) == false);
+
+	// Check that values are correctly transferred to the pointers.
+	CHECK(pressed == false);
+	CHECK(strength < 0.5);
+	CHECK(raw_strength < 0.5);
+
+	match->set_pressed(true);
+	key.action_match(match, false, 0.0f, &pressed, &strength, &raw_strength);
+
+	CHECK(pressed == true);
+	CHECK(strength > 0.5);
+	CHECK(raw_strength > 0.5);
+
+	// Tests when keycode is None: Then you rely on physical keycode.
+	InputEventKey none_key;
+	none_key.set_physical_keycode(Key::SPACE);
+
+	Ref<InputEventKey> match_none = none_key.create_reference(Key::NONE);
+	match_none->set_physical_keycode(Key::SPACE);
+
+	Ref<InputEventKey> no_match_none = none_key.create_reference(Key::NONE);
+	no_match_none->set_physical_keycode(Key::ENTER);
+
+	CHECK(none_key.action_match(match_none, false, 0.0f, &pressed, &strength, &raw_strength) == true);
+	CHECK(none_key.action_match(no_match_none, false, 0.0f, &pressed, &strength, &raw_strength) == false);
+
+	// Test exact match.
+	InputEventKey key2, ref_key;
+	key2.set_keycode(Key::SPACE);
+
+	Ref<InputEventKey> match2 = ref_key.create_reference(Key::SPACE);
+
+	// Now both press Ctrl and Shift.
+	key2.set_ctrl_pressed(true);
+	key2.set_shift_pressed(true);
+
+	match2->set_ctrl_pressed(true);
+	match2->set_shift_pressed(true);
+
+	// Now they should match.
+	bool exact_match = true;
+	CHECK(key2.action_match(match2, exact_match, 0.0f, &pressed, &strength, &raw_strength) == true);
+
+	// Modify matching key such that it does no longer match in terms of modifiers: Shift
+	// is no longer pressed.
+	match2->set_shift_pressed(false);
+	CHECK(match2->is_shift_pressed() == false);
+	CHECK(key2.action_match(match2, exact_match, 0.0f, &pressed, &strength, &raw_strength) == false);
+}
+
+TEST_CASE("[IsMatch] Keys are correctly matched") {
+	// Key with NONE as keycode.
+	InputEventKey key;
+	key.set_keycode(Key::NONE);
+	key.set_physical_keycode(Key::SPACE);
+
+	// Nullptr.
+	CHECK(key.is_match(nullptr, false) == false);
+
+	Ref<InputEventKey> none_ref = key.create_reference(Key::NONE);
+
+	none_ref->set_physical_keycode(Key::SPACE);
+	CHECK(key.is_match(none_ref, false) == true);
+
+	none_ref->set_physical_keycode(Key::ENTER);
+	CHECK(key.is_match(none_ref, false) == false);
+
+	none_ref->set_physical_keycode(Key::SPACE);
+
+	key.set_ctrl_pressed(true);
+	none_ref->set_ctrl_pressed(false);
+	CHECK(key.is_match(none_ref, true) == false);
+
+	none_ref->set_ctrl_pressed(true);
+	CHECK(key.is_match(none_ref, true) == true);
+
+	// Ref with actual keycode.
+	InputEventKey key2;
+	key2.set_keycode(Key::SPACE);
+
+	Ref<InputEventKey> match = key2.create_reference(Key::SPACE);
+	Ref<InputEventKey> no_match = key2.create_reference(Key::ENTER);
+
+	CHECK(key2.is_match(match, false) == true);
+	CHECK(key2.is_match(no_match, false) == false);
+
+	// Now the keycode is the same, but the modifiers differ.
+	no_match->set_keycode(Key::SPACE);
+
+	key2.set_ctrl_pressed(true);
+	match->set_ctrl_pressed(true);
+	no_match->set_shift_pressed(true);
+
+	CHECK(key2.is_match(match, true) == true);
+	CHECK(key2.is_match(no_match, true) == false);
+}
+} // namespace TestInputEventKey
+
+#endif // TEST_INPUT_EVENT_KEY_H
diff --git a/tests/core/input/test_shortcut.h b/tests/core/input/test_shortcut.h
new file mode 100644
index 0000000000..93edc685ad
--- /dev/null
+++ b/tests/core/input/test_shortcut.h
@@ -0,0 +1,235 @@
+/*************************************************************************/
+/*  test_shortcut.h                                                      */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef TEST_SHORTCUT_H
+#define TEST_SHORTCUT_H
+
+#include "core/input/input_event.h"
+#include "core/input/shortcut.h"
+#include "core/io/config_file.h"
+#include "core/object/ref_counted.h"
+#include "core/os/keyboard.h"
+#include "core/os/os.h"
+
+#include "tests/test_macros.h"
+
+namespace TestShortcut {
+
+TEST_CASE("[Shortcut] Empty shortcut should have no valid events and text equal to None") {
+	Shortcut s;
+
+	CHECK(s.get_as_text() == "None");
+	CHECK(s.has_valid_event() == false);
+}
+
+TEST_CASE("[Shortcut] Setting and getting an event should result in the same event as the input") {
+	Ref<InputEventKey> k1;
+	Ref<InputEventKey> k2;
+	k1.instantiate();
+	k2.instantiate();
+
+	k1->set_keycode(Key::ENTER);
+	k2->set_keycode(Key::BACKSPACE);
+
+	// Cast to InputEvent so the internal code recognizes the objects.
+	Ref<InputEvent> e1 = k1;
+	Ref<InputEvent> e2 = k2;
+
+	Array input_array;
+	input_array.append(e1);
+	input_array.append(e2);
+
+	Shortcut s;
+	s.set_events(input_array);
+
+	// Get result, read it out, check whether it equals the input.
+	Array result_array = s.get_events();
+	Ref<InputEventKey> result1 = result_array.front();
+	Ref<InputEventKey> result2 = result_array.back();
+
+	CHECK(result1->get_keycode() == k1->get_keycode());
+	CHECK(result2->get_keycode() == k2->get_keycode());
+}
+
+TEST_CASE("[Shortcut] 'set_events_list' should result in the same events as the input") {
+	Ref<InputEventKey> k1;
+	Ref<InputEventKey> k2;
+	k1.instantiate();
+	k2.instantiate();
+
+	k1->set_keycode(Key::ENTER);
+	k2->set_keycode(Key::BACKSPACE);
+
+	// Cast to InputEvent so the set_events_list() method recognizes the objects.
+	Ref<InputEvent> e1 = k1;
+	Ref<InputEvent> e2 = k2;
+
+	List<Ref<InputEvent>> list;
+	list.push_back(e1);
+	list.push_back(e2);
+
+	Shortcut s;
+	s.set_events_list(&list);
+
+	// Get result, read it out, check whether it equals the input.
+	Array result_array = s.get_events();
+	Ref<InputEventKey> result1 = result_array.front();
+	Ref<InputEventKey> result2 = result_array.back();
+
+	CHECK(result1->get_keycode() == k1->get_keycode());
+	CHECK(result2->get_keycode() == k2->get_keycode());
+}
+
+TEST_CASE("[Shortcut] 'matches_event' should correctly match the same event") {
+	Ref<InputEventKey> original; // The one we compare with.
+	Ref<InputEventKey> similar_but_not_equal; // Same keycode, different event.
+	Ref<InputEventKey> different; // Different event, different keycode.
+	Ref<InputEventKey> copy; // Copy of original event.
+
+	original.instantiate();
+	similar_but_not_equal.instantiate();
+	different.instantiate();
+	copy.instantiate();
+
+	original->set_keycode(Key::ENTER);
+	similar_but_not_equal->set_keycode(Key::ENTER);
+	similar_but_not_equal->set_keycode(Key::ESCAPE);
+	copy = original;
+
+	// Only the copy is really the same, so only that one should match.
+	// The rest should not match.
+
+	Ref<InputEvent> e_original = original;
+
+	Ref<InputEvent> e_similar_but_not_equal = similar_but_not_equal;
+	Ref<InputEvent> e_different = different;
+	Ref<InputEvent> e_copy = copy;
+
+	Array a;
+	a.append(e_original);
+	Shortcut s;
+	s.set_events(a);
+
+	CHECK(s.matches_event(e_similar_but_not_equal) == false);
+	CHECK(s.matches_event(e_different) == false);
+
+	CHECK(s.matches_event(e_copy) == true);
+}
+
+TEST_CASE("[Shortcut] 'get_as_text' text representation should be correct") {
+	Ref<InputEventKey> same;
+	// k2 will not go into the shortcut but only be used to compare.
+	Ref<InputEventKey> different;
+
+	same.instantiate();
+	different.instantiate();
+
+	same->set_keycode(Key::ENTER);
+	different->set_keycode(Key::ESCAPE);
+
+	Ref<InputEvent> key_event1 = same;
+
+	Array a;
+	a.append(key_event1);
+	Shortcut s;
+	s.set_events(a);
+
+	CHECK(s.get_as_text() == same->as_text());
+	CHECK(s.get_as_text() != different->as_text());
+}
+
+TEST_CASE("[Shortcut] Event validity should be correctly checked.") {
+	Ref<InputEventKey> valid;
+	// k2 will not go into the shortcut but only be used to compare.
+	Ref<InputEventKey> invalid = nullptr;
+
+	valid.instantiate();
+	valid->set_keycode(Key::ENTER);
+
+	Ref<InputEvent> valid_event = valid;
+	Ref<InputEvent> invalid_event = invalid;
+
+	Array a;
+	a.append(invalid_event);
+	a.append(valid_event);
+
+	Shortcut s;
+	s.set_events(a);
+
+	CHECK(s.has_valid_event() == true);
+
+	Array b;
+	b.append(invalid_event);
+
+	Shortcut shortcut_with_invalid_event;
+	shortcut_with_invalid_event.set_events(b);
+
+	CHECK(shortcut_with_invalid_event.has_valid_event() == false);
+}
+
+TEST_CASE("[Shortcut] Equal arrays should be recognized as such.") {
+	Ref<InputEventKey> k1;
+	// k2 will not go into the shortcut but only be used to compare.
+	Ref<InputEventKey> k2;
+
+	k1.instantiate();
+	k2.instantiate();
+
+	k1->set_keycode(Key::ENTER);
+	k2->set_keycode(Key::ESCAPE);
+
+	Ref<InputEvent> key_event1 = k1;
+	Ref<InputEvent> key_event2 = k2;
+
+	Array same;
+	same.append(key_event1);
+
+	Array same_as_same;
+	same_as_same.append(key_event1);
+
+	Array different1;
+	different1.append(key_event2);
+
+	Array different2;
+	different2.append(key_event1);
+	different2.append(key_event2);
+
+	Array different3;
+
+	Shortcut s;
+
+	CHECK(s.is_event_array_equal(same, same_as_same) == true);
+	CHECK(s.is_event_array_equal(same, different1) == false);
+	CHECK(s.is_event_array_equal(same, different2) == false);
+	CHECK(s.is_event_array_equal(same, different3) == false);
+}
+} // namespace TestShortcut
+
+#endif // TEST_SHORTCUT_H
diff --git a/tests/core/io/test_marshalls.h b/tests/core/io/test_marshalls.h
index 546a2e9358..7490df2b2c 100644
--- a/tests/core/io/test_marshalls.h
+++ b/tests/core/io/test_marshalls.h
@@ -254,11 +254,13 @@ TEST_CASE("[Marshalls] Invalid data Variant decoding") {
 	uint8_t some_buffer[1] = { 0x00 };
 	uint8_t out_of_range_type_buffer[4] = { 0xff }; // Greater than Variant::VARIANT_MAX
 
+	ERR_PRINT_OFF;
 	CHECK(decode_variant(variant, some_buffer, /* less than 4 */ 1, &r_len) == ERR_INVALID_DATA);
 	CHECK(r_len == 0);
 
 	CHECK(decode_variant(variant, out_of_range_type_buffer, 4, &r_len) == ERR_INVALID_DATA);
 	CHECK(r_len == 0);
+	ERR_PRINT_ON;
 }
 
 TEST_CASE("[Marshalls] NIL Variant decoding") {
diff --git a/tests/core/math/test_aabb.h b/tests/core/math/test_aabb.h
index 526972a82f..447420fc12 100644
--- a/tests/core/math/test_aabb.h
+++ b/tests/core/math/test_aabb.h
@@ -299,34 +299,28 @@ TEST_CASE("[AABB] Get longest/shortest axis") {
 			"get_shortest_axis_size() should return the expected value.");
 }
 
-#ifndef _MSC_VER
-#warning Support tests need to be re-done
-#endif
-
-/* Support function was actually broken. As it was fixed, the tests now fail. Tests need to be re-done.
-
 TEST_CASE("[AABB] Get support") {
 	const AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
 	CHECK_MESSAGE(
-			aabb.get_support(Vector3(1, 0, 0)).is_equal_approx(Vector3(-1.5, 7, 3.5)),
+			aabb.get_support(Vector3(1, 0, 0)).is_equal_approx(Vector3(2.5, 2, -2.5)),
 			"get_support() should return the expected value.");
 	CHECK_MESSAGE(
-			aabb.get_support(Vector3(0.5, 1, 0)).is_equal_approx(Vector3(-1.5, 2, 3.5)),
+			aabb.get_support(Vector3(0.5, 1, 0)).is_equal_approx(Vector3(2.5, 7, -2.5)),
 			"get_support() should return the expected value.");
 	CHECK_MESSAGE(
-			aabb.get_support(Vector3(0.5, 1, -400)).is_equal_approx(Vector3(-1.5, 2, 3.5)),
+			aabb.get_support(Vector3(0.5, 1, -400)).is_equal_approx(Vector3(2.5, 7, -2.5)),
 			"get_support() should return the expected value.");
 	CHECK_MESSAGE(
-			aabb.get_support(Vector3(0, -1, 0)).is_equal_approx(Vector3(2.5, 7, 3.5)),
+			aabb.get_support(Vector3(0, -1, 0)).is_equal_approx(Vector3(-1.5, 2, -2.5)),
 			"get_support() should return the expected value.");
 	CHECK_MESSAGE(
-			aabb.get_support(Vector3(0, -0.1, 0)).is_equal_approx(Vector3(2.5, 7, 3.5)),
+			aabb.get_support(Vector3(0, -0.1, 0)).is_equal_approx(Vector3(-1.5, 2, -2.5)),
 			"get_support() should return the expected value.");
 	CHECK_MESSAGE(
-			aabb.get_support(Vector3()).is_equal_approx(Vector3(2.5, 7, 3.5)),
+			aabb.get_support(Vector3()).is_equal_approx(Vector3(-1.5, 2, -2.5)),
 			"get_support() should return the expected value with a null vector.");
 }
-*/
+
 TEST_CASE("[AABB] Grow") {
 	const AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
 	CHECK_MESSAGE(
diff --git a/tests/core/math/test_quaternion.h b/tests/core/math/test_quaternion.h
new file mode 100644
index 0000000000..94eef6c463
--- /dev/null
+++ b/tests/core/math/test_quaternion.h
@@ -0,0 +1,389 @@
+/*************************************************************************/
+/*  test_quaternion.h                                                    */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef TEST_QUATERNION_H
+#define TEST_QUATERNION_H
+
+#include "core/math/math_defs.h"
+#include "core/math/math_funcs.h"
+#include "core/math/quaternion.h"
+#include "core/math/vector3.h"
+
+#include "tests/test_macros.h"
+
+namespace TestQuaternion {
+
+Quaternion quat_euler_yxz_deg(Vector3 angle) {
+	double yaw = Math::deg2rad(angle[1]);
+	double pitch = Math::deg2rad(angle[0]);
+	double roll = Math::deg2rad(angle[2]);
+
+	// Generate YXZ (Z-then-X-then-Y) Quaternion using single-axis Euler
+	// constructor and quaternion product, both tested separately.
+	Quaternion q_y(Vector3(0.0, yaw, 0.0));
+	Quaternion q_p(Vector3(pitch, 0.0, 0.0));
+	Quaternion q_r(Vector3(0.0, 0.0, roll));
+	// Roll-Z is followed by Pitch-X, then Yaw-Y.
+	Quaternion q_yxz = q_y * q_p * q_r;
+
+	return q_yxz;
+}
+
+TEST_CASE("[Quaternion] Default Construct") {
+	Quaternion q;
+
+	CHECK(q[0] == 0.0);
+	CHECK(q[1] == 0.0);
+	CHECK(q[2] == 0.0);
+	CHECK(q[3] == 1.0);
+}
+
+TEST_CASE("[Quaternion] Construct x,y,z,w") {
+	// Values are taken from actual use in another project & are valid (except roundoff error).
+	Quaternion q(0.2391, 0.099, 0.3696, 0.8924);
+
+	CHECK(q[0] == doctest::Approx(0.2391));
+	CHECK(q[1] == doctest::Approx(0.099));
+	CHECK(q[2] == doctest::Approx(0.3696));
+	CHECK(q[3] == doctest::Approx(0.8924));
+}
+
+TEST_CASE("[Quaternion] Construct AxisAngle 1") {
+	// Easy to visualize: 120 deg about X-axis.
+	Quaternion q(Vector3(1.0, 0.0, 0.0), Math::deg2rad(120.0));
+
+	// 0.866 isn't close enough; doctest::Approx doesn't cut much slack!
+	CHECK(q[0] == doctest::Approx(0.866025)); // Sine of half the angle.
+	CHECK(q[1] == doctest::Approx(0.0));
+	CHECK(q[2] == doctest::Approx(0.0));
+	CHECK(q[3] == doctest::Approx(0.5)); // Cosine of half the angle.
+}
+
+TEST_CASE("[Quaternion] Construct AxisAngle 2") {
+	// Easy to visualize: 30 deg about Y-axis.
+	Quaternion q(Vector3(0.0, 1.0, 0.0), Math::deg2rad(30.0));
+
+	CHECK(q[0] == doctest::Approx(0.0));
+	CHECK(q[1] == doctest::Approx(0.258819)); // Sine of half the angle.
+	CHECK(q[2] == doctest::Approx(0.0));
+	CHECK(q[3] == doctest::Approx(0.965926)); // Cosine of half the angle.
+}
+
+TEST_CASE("[Quaternion] Construct AxisAngle 3") {
+	// Easy to visualize: 60 deg about Z-axis.
+	Quaternion q(Vector3(0.0, 0.0, 1.0), Math::deg2rad(60.0));
+
+	CHECK(q[0] == doctest::Approx(0.0));
+	CHECK(q[1] == doctest::Approx(0.0));
+	CHECK(q[2] == doctest::Approx(0.5)); // Sine of half the angle.
+	CHECK(q[3] == doctest::Approx(0.866025)); // Cosine of half the angle.
+}
+
+TEST_CASE("[Quaternion] Construct AxisAngle 4") {
+	// More complex & hard to visualize, so test w/ data from online calculator.
+	Vector3 axis(1.0, 2.0, 0.5);
+	Quaternion q(axis.normalized(), Math::deg2rad(35.0));
+
+	CHECK(q[0] == doctest::Approx(0.131239));
+	CHECK(q[1] == doctest::Approx(0.262478));
+	CHECK(q[2] == doctest::Approx(0.0656194));
+	CHECK(q[3] == doctest::Approx(0.953717));
+}
+
+TEST_CASE("[Quaternion] Construct from Quaternion") {
+	Vector3 axis(1.0, 2.0, 0.5);
+	Quaternion q_src(axis.normalized(), Math::deg2rad(35.0));
+	Quaternion q(q_src);
+
+	CHECK(q[0] == doctest::Approx(0.131239));
+	CHECK(q[1] == doctest::Approx(0.262478));
+	CHECK(q[2] == doctest::Approx(0.0656194));
+	CHECK(q[3] == doctest::Approx(0.953717));
+}
+
+TEST_CASE("[Quaternion] Construct Euler SingleAxis") {
+	double yaw = Math::deg2rad(45.0);
+	double pitch = Math::deg2rad(30.0);
+	double roll = Math::deg2rad(10.0);
+
+	Vector3 euler_y(0.0, yaw, 0.0);
+	Quaternion q_y(euler_y);
+	CHECK(q_y[0] == doctest::Approx(0.0));
+	CHECK(q_y[1] == doctest::Approx(0.382684));
+	CHECK(q_y[2] == doctest::Approx(0.0));
+	CHECK(q_y[3] == doctest::Approx(0.923879));
+
+	Vector3 euler_p(pitch, 0.0, 0.0);
+	Quaternion q_p(euler_p);
+	CHECK(q_p[0] == doctest::Approx(0.258819));
+	CHECK(q_p[1] == doctest::Approx(0.0));
+	CHECK(q_p[2] == doctest::Approx(0.0));
+	CHECK(q_p[3] == doctest::Approx(0.965926));
+
+	Vector3 euler_r(0.0, 0.0, roll);
+	Quaternion q_r(euler_r);
+	CHECK(q_r[0] == doctest::Approx(0.0));
+	CHECK(q_r[1] == doctest::Approx(0.0));
+	CHECK(q_r[2] == doctest::Approx(0.0871558));
+	CHECK(q_r[3] == doctest::Approx(0.996195));
+}
+
+TEST_CASE("[Quaternion] Construct Euler YXZ dynamic axes") {
+	double yaw = Math::deg2rad(45.0);
+	double pitch = Math::deg2rad(30.0);
+	double roll = Math::deg2rad(10.0);
+
+	// Generate YXZ comparision data (Z-then-X-then-Y) using single-axis Euler
+	// constructor and quaternion product, both tested separately.
+	Vector3 euler_y(0.0, yaw, 0.0);
+	Quaternion q_y(euler_y);
+	Vector3 euler_p(pitch, 0.0, 0.0);
+	Quaternion q_p(euler_p);
+	Vector3 euler_r(0.0, 0.0, roll);
+	Quaternion q_r(euler_r);
+
+	// Roll-Z is followed by Pitch-X.
+	Quaternion check_xz = q_p * q_r;
+	// Then Yaw-Y follows both.
+	Quaternion check_yxz = q_y * check_xz;
+
+	// Test construction from YXZ Euler angles.
+	Vector3 euler_yxz(pitch, yaw, roll);
+	Quaternion q(euler_yxz);
+	CHECK(q[0] == doctest::Approx(check_yxz[0]));
+	CHECK(q[1] == doctest::Approx(check_yxz[1]));
+	CHECK(q[2] == doctest::Approx(check_yxz[2]));
+	CHECK(q[3] == doctest::Approx(check_yxz[3]));
+
+	// Sneak in a test of is_equal_approx.
+	CHECK(q.is_equal_approx(check_yxz));
+}
+
+TEST_CASE("[Quaternion] Construct Basis Euler") {
+	double yaw = Math::deg2rad(45.0);
+	double pitch = Math::deg2rad(30.0);
+	double roll = Math::deg2rad(10.0);
+	Vector3 euler_yxz(pitch, yaw, roll);
+	Quaternion q_yxz(euler_yxz);
+	Basis basis_axes(euler_yxz);
+	Quaternion q(basis_axes);
+	CHECK(q.is_equal_approx(q_yxz));
+}
+
+TEST_CASE("[Quaternion] Construct Basis Axes") {
+	// Arbitrary Euler angles.
+	Vector3 euler_yxz(Math::deg2rad(31.41), Math::deg2rad(-49.16), Math::deg2rad(12.34));
+	// Basis vectors from online calculation of rotation matrix.
+	Vector3 i_unit(0.5545787, 0.1823950, 0.8118957);
+	Vector3 j_unit(-0.5249245, 0.8337420, 0.1712555);
+	Vector3 k_unit(-0.6456754, -0.5211586, 0.5581192);
+	// Quaternion from online calculation.
+	Quaternion q_calc(0.2016913, -0.4245716, 0.206033, 0.8582598);
+	// Quaternion from local calculation.
+	Quaternion q_local = quat_euler_yxz_deg(Vector3(31.41, -49.16, 12.34));
+	// Quaternion from Euler angles constructor.
+	Quaternion q_euler(euler_yxz);
+	CHECK(q_calc.is_equal_approx(q_local));
+	CHECK(q_local.is_equal_approx(q_euler));
+
+	// Calculate Basis and construct Quaternion.
+	// When this is written, C++ Basis class does not construct from basis vectors.
+	// This is by design, but may be subject to change.
+	// Workaround by constructing Basis from Euler angles.
+	// basis_axes = Basis(i_unit, j_unit, k_unit);
+	Basis basis_axes(euler_yxz);
+	Quaternion q(basis_axes);
+
+	CHECK(basis_axes.get_column(0).is_equal_approx(i_unit));
+	CHECK(basis_axes.get_column(1).is_equal_approx(j_unit));
+	CHECK(basis_axes.get_column(2).is_equal_approx(k_unit));
+
+	CHECK(q.is_equal_approx(q_calc));
+	CHECK_FALSE(q.inverse().is_equal_approx(q_calc));
+	CHECK(q.is_equal_approx(q_local));
+	CHECK(q.is_equal_approx(q_euler));
+	CHECK(q[0] == doctest::Approx(0.2016913));
+	CHECK(q[1] == doctest::Approx(-0.4245716));
+	CHECK(q[2] == doctest::Approx(0.206033));
+	CHECK(q[3] == doctest::Approx(0.8582598));
+}
+
+TEST_CASE("[Quaternion] Product (book)") {
+	// Example from "Quaternions and Rotation Sequences" by Jack Kuipers, p. 108.
+	Quaternion p(1.0, -2.0, 1.0, 3.0);
+	Quaternion q(-1.0, 2.0, 3.0, 2.0);
+
+	Quaternion pq = p * q;
+	CHECK(pq[0] == doctest::Approx(-9.0));
+	CHECK(pq[1] == doctest::Approx(-2.0));
+	CHECK(pq[2] == doctest::Approx(11.0));
+	CHECK(pq[3] == doctest::Approx(8.0));
+}
+
+TEST_CASE("[Quaternion] Product") {
+	double yaw = Math::deg2rad(45.0);
+	double pitch = Math::deg2rad(30.0);
+	double roll = Math::deg2rad(10.0);
+
+	Vector3 euler_y(0.0, yaw, 0.0);
+	Quaternion q_y(euler_y);
+	CHECK(q_y[0] == doctest::Approx(0.0));
+	CHECK(q_y[1] == doctest::Approx(0.382684));
+	CHECK(q_y[2] == doctest::Approx(0.0));
+	CHECK(q_y[3] == doctest::Approx(0.923879));
+
+	Vector3 euler_p(pitch, 0.0, 0.0);
+	Quaternion q_p(euler_p);
+	CHECK(q_p[0] == doctest::Approx(0.258819));
+	CHECK(q_p[1] == doctest::Approx(0.0));
+	CHECK(q_p[2] == doctest::Approx(0.0));
+	CHECK(q_p[3] == doctest::Approx(0.965926));
+
+	Vector3 euler_r(0.0, 0.0, roll);
+	Quaternion q_r(euler_r);
+	CHECK(q_r[0] == doctest::Approx(0.0));
+	CHECK(q_r[1] == doctest::Approx(0.0));
+	CHECK(q_r[2] == doctest::Approx(0.0871558));
+	CHECK(q_r[3] == doctest::Approx(0.996195));
+
+	// Test ZYX dynamic-axes since test data is available online.
+	// Rotate first about X axis, then new Y axis, then new Z axis.
+	// (Godot uses YXZ Yaw-Pitch-Roll order).
+	Quaternion q_yp = q_y * q_p;
+	CHECK(q_yp[0] == doctest::Approx(0.239118));
+	CHECK(q_yp[1] == doctest::Approx(0.369644));
+	CHECK(q_yp[2] == doctest::Approx(-0.099046));
+	CHECK(q_yp[3] == doctest::Approx(0.892399));
+
+	Quaternion q_ryp = q_r * q_yp;
+	CHECK(q_ryp[0] == doctest::Approx(0.205991));
+	CHECK(q_ryp[1] == doctest::Approx(0.389078));
+	CHECK(q_ryp[2] == doctest::Approx(-0.0208912));
+	CHECK(q_ryp[3] == doctest::Approx(0.897636));
+}
+
+TEST_CASE("[Quaternion] xform unit vectors") {
+	// Easy to visualize: 120 deg about X-axis.
+	// Transform the i, j, & k unit vectors.
+	Quaternion q(Vector3(1.0, 0.0, 0.0), Math::deg2rad(120.0));
+	Vector3 i_t = q.xform(Vector3(1.0, 0.0, 0.0));
+	Vector3 j_t = q.xform(Vector3(0.0, 1.0, 0.0));
+	Vector3 k_t = q.xform(Vector3(0.0, 0.0, 1.0));
+	//
+	CHECK(i_t.is_equal_approx(Vector3(1.0, 0.0, 0.0)));
+	CHECK(j_t.is_equal_approx(Vector3(0.0, -0.5, 0.866025)));
+	CHECK(k_t.is_equal_approx(Vector3(0.0, -0.866025, -0.5)));
+	CHECK(i_t.length_squared() == doctest::Approx(1.0));
+	CHECK(j_t.length_squared() == doctest::Approx(1.0));
+	CHECK(k_t.length_squared() == doctest::Approx(1.0));
+
+	// Easy to visualize: 30 deg about Y-axis.
+	q = Quaternion(Vector3(0.0, 1.0, 0.0), Math::deg2rad(30.0));
+	i_t = q.xform(Vector3(1.0, 0.0, 0.0));
+	j_t = q.xform(Vector3(0.0, 1.0, 0.0));
+	k_t = q.xform(Vector3(0.0, 0.0, 1.0));
+	//
+	CHECK(i_t.is_equal_approx(Vector3(0.866025, 0.0, -0.5)));
+	CHECK(j_t.is_equal_approx(Vector3(0.0, 1.0, 0.0)));
+	CHECK(k_t.is_equal_approx(Vector3(0.5, 0.0, 0.866025)));
+	CHECK(i_t.length_squared() == doctest::Approx(1.0));
+	CHECK(j_t.length_squared() == doctest::Approx(1.0));
+	CHECK(k_t.length_squared() == doctest::Approx(1.0));
+
+	// Easy to visualize: 60 deg about Z-axis.
+	q = Quaternion(Vector3(0.0, 0.0, 1.0), Math::deg2rad(60.0));
+	i_t = q.xform(Vector3(1.0, 0.0, 0.0));
+	j_t = q.xform(Vector3(0.0, 1.0, 0.0));
+	k_t = q.xform(Vector3(0.0, 0.0, 1.0));
+	//
+	CHECK(i_t.is_equal_approx(Vector3(0.5, 0.866025, 0.0)));
+	CHECK(j_t.is_equal_approx(Vector3(-0.866025, 0.5, 0.0)));
+	CHECK(k_t.is_equal_approx(Vector3(0.0, 0.0, 1.0)));
+	CHECK(i_t.length_squared() == doctest::Approx(1.0));
+	CHECK(j_t.length_squared() == doctest::Approx(1.0));
+	CHECK(k_t.length_squared() == doctest::Approx(1.0));
+}
+
+TEST_CASE("[Quaternion] xform vector") {
+	// Arbitrary quaternion rotates an arbitrary vector.
+	Vector3 euler_yzx(Math::deg2rad(31.41), Math::deg2rad(-49.16), Math::deg2rad(12.34));
+	Basis basis_axes(euler_yzx);
+	Quaternion q(basis_axes);
+
+	Vector3 v_arb(3.0, 4.0, 5.0);
+	Vector3 v_rot = q.xform(v_arb);
+	Vector3 v_compare = basis_axes.xform(v_arb);
+
+	CHECK(v_rot.length_squared() == doctest::Approx(v_arb.length_squared()));
+	CHECK(v_rot.is_equal_approx(v_compare));
+}
+
+// Test vector xform for a single combination of Quaternion and Vector.
+void test_quat_vec_rotate(Vector3 euler_yzx, Vector3 v_in) {
+	Basis basis_axes(euler_yzx);
+	Quaternion q(basis_axes);
+
+	Vector3 v_rot = q.xform(v_in);
+	Vector3 v_compare = basis_axes.xform(v_in);
+
+	CHECK(v_rot.length_squared() == doctest::Approx(v_in.length_squared()));
+	CHECK(v_rot.is_equal_approx(v_compare));
+}
+
+TEST_CASE("[Stress][Quaternion] Many vector xforms") {
+	// Many arbitrary quaternions rotate many arbitrary vectors.
+	// For each trial, check that rotation by Quaternion yields same result as
+	// rotation by Basis.
+	const int STEPS = 100; // Number of test steps in each dimension
+	const double delta = 2.0 * Math_PI / STEPS; // Angle increment per step
+	const double delta_vec = 20.0 / STEPS; // Vector increment per step
+	Vector3 vec_arb(1.0, 1.0, 1.0);
+	double x_angle = -Math_PI;
+	double y_angle = -Math_PI;
+	double z_angle = -Math_PI;
+	for (double i = 0; i < STEPS; ++i) {
+		vec_arb[0] = -10.0 + i * delta_vec;
+		x_angle = i * delta - Math_PI;
+		for (double j = 0; j < STEPS; ++j) {
+			vec_arb[1] = -10.0 + j * delta_vec;
+			y_angle = j * delta - Math_PI;
+			for (double k = 0; k < STEPS; ++k) {
+				vec_arb[2] = -10.0 + k * delta_vec;
+				z_angle = k * delta - Math_PI;
+				Vector3 euler_yzx(x_angle, y_angle, z_angle);
+				test_quat_vec_rotate(euler_yzx, vec_arb);
+			}
+		}
+	}
+}
+
+} // namespace TestQuaternion
+
+#endif // TEST_QUATERNION_H
diff --git a/tests/core/math/test_vector4.h b/tests/core/math/test_vector4.h
new file mode 100644
index 0000000000..ccf991401b
--- /dev/null
+++ b/tests/core/math/test_vector4.h
@@ -0,0 +1,315 @@
+/*************************************************************************/
+/*  test_vector4.h                                                       */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef TEST_VECTOR4_H
+#define TEST_VECTOR4_H
+
+#include "core/math/vector4.h"
+#include "tests/test_macros.h"
+
+#define Math_SQRT3 1.7320508075688772935274463415059
+
+namespace TestVector4 {
+
+TEST_CASE("[Vector4] Axis methods") {
+	Vector4 vector = Vector4(1.2, 3.4, 5.6, -0.9);
+	CHECK_MESSAGE(
+			vector.max_axis_index() == Vector4::Axis::AXIS_Z,
+			"Vector4 max_axis_index should work as expected.");
+	CHECK_MESSAGE(
+			vector.min_axis_index() == Vector4::Axis::AXIS_W,
+			"Vector4 min_axis_index should work as expected.");
+	CHECK_MESSAGE(
+			vector.get_axis(vector.max_axis_index()) == (real_t)5.6,
+			"Vector4 get_axis should work as expected.");
+	CHECK_MESSAGE(
+			vector[vector.min_axis_index()] == (real_t)-0.9,
+			"Vector4 array operator should work as expected.");
+
+	vector.set_axis(Vector4::Axis::AXIS_Y, 4.7);
+	CHECK_MESSAGE(
+			vector.get_axis(Vector4::Axis::AXIS_Y) == (real_t)4.7,
+			"Vector4 set_axis should work as expected.");
+	vector[Vector4::Axis::AXIS_Y] = 3.7;
+	CHECK_MESSAGE(
+			vector[Vector4::Axis::AXIS_Y] == (real_t)3.7,
+			"Vector4 array operator setter should work as expected.");
+}
+
+TEST_CASE("[Vector4] Interpolation methods") {
+	const Vector4 vector1 = Vector4(1, 2, 3, 4);
+	const Vector4 vector2 = Vector4(4, 5, 6, 7);
+	CHECK_MESSAGE(
+			vector1.lerp(vector2, 0.5) == Vector4(2.5, 3.5, 4.5, 5.5),
+			"Vector4 lerp should work as expected.");
+	CHECK_MESSAGE(
+			vector1.lerp(vector2, 1.0 / 3.0).is_equal_approx(Vector4(2, 3, 4, 5)),
+			"Vector4 lerp should work as expected.");
+	CHECK_MESSAGE(
+			vector1.cubic_interpolate(vector2, Vector4(), Vector4(7, 7, 7, 7), 0.5) == Vector4(2.375, 3.5, 4.625, 5.75),
+			"Vector4 cubic_interpolate should work as expected.");
+	CHECK_MESSAGE(
+			vector1.cubic_interpolate(vector2, Vector4(), Vector4(7, 7, 7, 7), 1.0 / 3.0).is_equal_approx(Vector4(1.851851940155029297, 2.962963104248046875, 4.074074268341064453, 5.185185185185)),
+			"Vector4 cubic_interpolate should work as expected.");
+}
+
+TEST_CASE("[Vector4] Length methods") {
+	const Vector4 vector1 = Vector4(10, 10, 10, 10);
+	const Vector4 vector2 = Vector4(20, 30, 40, 50);
+	CHECK_MESSAGE(
+			vector1.length_squared() == 400,
+			"Vector4 length_squared should work as expected and return exact result.");
+	CHECK_MESSAGE(
+			Math::is_equal_approx(vector1.length(), 20),
+			"Vector4 length should work as expected.");
+	CHECK_MESSAGE(
+			vector2.length_squared() == 5400,
+			"Vector4 length_squared should work as expected and return exact result.");
+	CHECK_MESSAGE(
+			Math::is_equal_approx(vector2.length(), (real_t)73.484692283495),
+			"Vector4 length should work as expected.");
+	CHECK_MESSAGE(
+			Math::is_equal_approx(vector1.distance_to(vector2), (real_t)54.772255750517),
+			"Vector4 distance_to should work as expected.");
+	CHECK_MESSAGE(
+			Math::is_equal_approx(vector1.distance_squared_to(vector2), 3000),
+			"Vector4 distance_squared_to should work as expected.");
+}
+
+TEST_CASE("[Vector4] Limiting methods") {
+	const Vector4 vector = Vector4(10, 10, 10, 10);
+	CHECK_MESSAGE(
+			Vector4(-5, 5, 15, -15).clamp(Vector4(), vector) == Vector4(0, 5, 10, 0),
+			"Vector4 clamp should work as expected.");
+	CHECK_MESSAGE(
+			vector.clamp(Vector4(0, 10, 15, 18), Vector4(5, 10, 20, 25)) == Vector4(5, 10, 15, 18),
+			"Vector4 clamp should work as expected.");
+}
+
+TEST_CASE("[Vector4] Normalization methods") {
+	CHECK_MESSAGE(
+			Vector4(1, 0, 0, 0).is_normalized() == true,
+			"Vector4 is_normalized should return true for a normalized vector.");
+	CHECK_MESSAGE(
+			Vector4(1, 1, 1, 1).is_normalized() == false,
+			"Vector4 is_normalized should return false for a non-normalized vector.");
+	CHECK_MESSAGE(
+			Vector4(1, 0, 0, 0).normalized() == Vector4(1, 0, 0, 0),
+			"Vector4 normalized should return the same vector for a normalized vector.");
+	CHECK_MESSAGE(
+			Vector4(1, 1, 0, 0).normalized().is_equal_approx(Vector4(Math_SQRT12, Math_SQRT12, 0, 0)),
+			"Vector4 normalized should work as expected.");
+	CHECK_MESSAGE(
+			Vector4(1, 1, 1, 1).normalized().is_equal_approx(Vector4(0.5, 0.5, 0.5, 0.5)),
+			"Vector4 normalized should work as expected.");
+}
+
+TEST_CASE("[Vector4] Operators") {
+	const Vector4 decimal1 = Vector4(2.3, 4.9, 7.8, 3.2);
+	const Vector4 decimal2 = Vector4(1.2, 3.4, 5.6, 1.7);
+	const Vector4 power1 = Vector4(0.75, 1.5, 0.625, 0.125);
+	const Vector4 power2 = Vector4(0.5, 0.125, 0.25, 0.75);
+	const Vector4 int1 = Vector4(4, 5, 9, 2);
+	const Vector4 int2 = Vector4(1, 2, 3, 1);
+
+	CHECK_MESSAGE(
+			-decimal1 == Vector4(-2.3, -4.9, -7.8, -3.2),
+			"Vector4 change of sign should work as expected.");
+	CHECK_MESSAGE(
+			(decimal1 + decimal2).is_equal_approx(Vector4(3.5, 8.3, 13.4, 4.9)),
+			"Vector4 addition should behave as expected.");
+	CHECK_MESSAGE(
+			(power1 + power2) == Vector4(1.25, 1.625, 0.875, 0.875),
+			"Vector4 addition with powers of two should give exact results.");
+	CHECK_MESSAGE(
+			(int1 + int2) == Vector4(5, 7, 12, 3),
+			"Vector4 addition with integers should give exact results.");
+
+	CHECK_MESSAGE(
+			(decimal1 - decimal2).is_equal_approx(Vector4(1.1, 1.5, 2.2, 1.5)),
+			"Vector4 subtraction should behave as expected.");
+	CHECK_MESSAGE(
+			(power1 - power2) == Vector4(0.25, 1.375, 0.375, -0.625),
+			"Vector4 subtraction with powers of two should give exact results.");
+	CHECK_MESSAGE(
+			(int1 - int2) == Vector4(3, 3, 6, 1),
+			"Vector4 subtraction with integers should give exact results.");
+
+	CHECK_MESSAGE(
+			(decimal1 * decimal2).is_equal_approx(Vector4(2.76, 16.66, 43.68, 5.44)),
+			"Vector4 multiplication should behave as expected.");
+	CHECK_MESSAGE(
+			(power1 * power2) == Vector4(0.375, 0.1875, 0.15625, 0.09375),
+			"Vector4 multiplication with powers of two should give exact results.");
+	CHECK_MESSAGE(
+			(int1 * int2) == Vector4(4, 10, 27, 2),
+			"Vector4 multiplication with integers should give exact results.");
+
+	CHECK_MESSAGE(
+			(decimal1 / decimal2).is_equal_approx(Vector4(1.91666666666666666, 1.44117647058823529, 1.39285714285714286, 1.88235294118)),
+			"Vector4 division should behave as expected.");
+	CHECK_MESSAGE(
+			(power1 / power2) == Vector4(1.5, 12.0, 2.5, 1.0 / 6.0),
+			"Vector4 division with powers of two should give exact results.");
+	CHECK_MESSAGE(
+			(int1 / int2) == Vector4(4, 2.5, 3, 2),
+			"Vector4 division with integers should give exact results.");
+
+	CHECK_MESSAGE(
+			(decimal1 * 2).is_equal_approx(Vector4(4.6, 9.8, 15.6, 6.4)),
+			"Vector4 multiplication should behave as expected.");
+	CHECK_MESSAGE(
+			(power1 * 2) == Vector4(1.5, 3, 1.25, 0.25),
+			"Vector4 multiplication with powers of two should give exact results.");
+	CHECK_MESSAGE(
+			(int1 * 2) == Vector4(8, 10, 18, 4),
+			"Vector4 multiplication with integers should give exact results.");
+
+	CHECK_MESSAGE(
+			(decimal1 / 2).is_equal_approx(Vector4(1.15, 2.45, 3.9, 1.6)),
+			"Vector4 division should behave as expected.");
+	CHECK_MESSAGE(
+			(power1 / 2) == Vector4(0.375, 0.75, 0.3125, 0.0625),
+			"Vector4 division with powers of two should give exact results.");
+	CHECK_MESSAGE(
+			(int1 / 2) == Vector4(2, 2.5, 4.5, 1),
+			"Vector4 division with integers should give exact results.");
+
+	CHECK_MESSAGE(
+			((String)decimal1) == "(2.3, 4.9, 7.8, 3.2)",
+			"Vector4 cast to String should work as expected.");
+	CHECK_MESSAGE(
+			((String)decimal2) == "(1.2, 3.4, 5.6, 1.7)",
+			"Vector4 cast to String should work as expected.");
+	CHECK_MESSAGE(
+			((String)Vector4(9.7, 9.8, 9.9, -1.8)) == "(9.7, 9.8, 9.9, -1.8)",
+			"Vector4 cast to String should work as expected.");
+#ifdef REAL_T_IS_DOUBLE
+	CHECK_MESSAGE(
+			((String)Vector4(Math_E, Math_SQRT2, Math_SQRT3, Math_SQRT3)) == "(2.71828182845905, 1.4142135623731, 1.73205080756888, 1.73205080756888)",
+			"Vector4 cast to String should print the correct amount of digits for real_t = double.");
+#else
+	CHECK_MESSAGE(
+			((String)Vector4(Math_E, Math_SQRT2, Math_SQRT3, Math_SQRT3)) == "(2.718282, 1.414214, 1.732051, 1.732051)",
+			"Vector4 cast to String should print the correct amount of digits for real_t = float.");
+#endif // REAL_T_IS_DOUBLE
+}
+
+TEST_CASE("[Vector4] Other methods") {
+	const Vector4 vector = Vector4(1.2, 3.4, 5.6, 1.6);
+	CHECK_MESSAGE(
+			vector.direction_to(Vector4()).is_equal_approx(-vector.normalized()),
+			"Vector4 direction_to should work as expected.");
+	CHECK_MESSAGE(
+			Vector4(1, 1, 1, 1).direction_to(Vector4(2, 2, 2, 2)).is_equal_approx(Vector4(0.5, 0.5, 0.5, 0.5)),
+			"Vector4 direction_to should work as expected.");
+	CHECK_MESSAGE(
+			vector.inverse().is_equal_approx(Vector4(1 / 1.2, 1 / 3.4, 1 / 5.6, 1 / 1.6)),
+			"Vector4 inverse should work as expected.");
+	CHECK_MESSAGE(
+			vector.posmod(2).is_equal_approx(Vector4(1.2, 1.4, 1.6, 1.6)),
+			"Vector4 posmod should work as expected.");
+	CHECK_MESSAGE(
+			(-vector).posmod(2).is_equal_approx(Vector4(0.8, 0.6, 0.4, 0.4)),
+			"Vector4 posmod should work as expected.");
+	CHECK_MESSAGE(
+			vector.posmodv(Vector4(1, 2, 3, 4)).is_equal_approx(Vector4(0.2, 1.4, 2.6, 1.6)),
+			"Vector4 posmodv should work as expected.");
+	CHECK_MESSAGE(
+			(-vector).posmodv(Vector4(2, 3, 4, 5)).is_equal_approx(Vector4(0.8, 2.6, 2.4, 3.4)),
+			"Vector4 posmodv should work as expected.");
+	CHECK_MESSAGE(
+			vector.snapped(Vector4(1, 1, 1, 1)) == Vector4(1, 3, 6, 2),
+			"Vector4 snapped to integers should be the same as rounding.");
+	CHECK_MESSAGE(
+			vector.snapped(Vector4(0.25, 0.25, 0.25, 0.25)) == Vector4(1.25, 3.5, 5.5, 1.5),
+			"Vector4 snapped to 0.25 should give exact results.");
+}
+
+TEST_CASE("[Vector4] Rounding methods") {
+	const Vector4 vector1 = Vector4(1.2, 3.4, 5.6, 1.6);
+	const Vector4 vector2 = Vector4(1.2, -3.4, -5.6, -1.6);
+	CHECK_MESSAGE(
+			vector1.abs() == vector1,
+			"Vector4 abs should work as expected.");
+	CHECK_MESSAGE(
+			vector2.abs() == vector1,
+			"Vector4 abs should work as expected.");
+	CHECK_MESSAGE(
+			vector1.ceil() == Vector4(2, 4, 6, 2),
+			"Vector4 ceil should work as expected.");
+	CHECK_MESSAGE(
+			vector2.ceil() == Vector4(2, -3, -5, -1),
+			"Vector4 ceil should work as expected.");
+
+	CHECK_MESSAGE(
+			vector1.floor() == Vector4(1, 3, 5, 1),
+			"Vector4 floor should work as expected.");
+	CHECK_MESSAGE(
+			vector2.floor() == Vector4(1, -4, -6, -2),
+			"Vector4 floor should work as expected.");
+
+	CHECK_MESSAGE(
+			vector1.round() == Vector4(1, 3, 6, 2),
+			"Vector4 round should work as expected.");
+	CHECK_MESSAGE(
+			vector2.round() == Vector4(1, -3, -6, -2),
+			"Vector4 round should work as expected.");
+
+	CHECK_MESSAGE(
+			vector1.sign() == Vector4(1, 1, 1, 1),
+			"Vector4 sign should work as expected.");
+	CHECK_MESSAGE(
+			vector2.sign() == Vector4(1, -1, -1, -1),
+			"Vector4 sign should work as expected.");
+}
+
+TEST_CASE("[Vector4] Linear algebra methods") {
+	const Vector4 vector_x = Vector4(1, 0, 0, 0);
+	const Vector4 vector_y = Vector4(0, 1, 0, 0);
+	const Vector4 vector1 = Vector4(1.7, 2.3, 1, 9.1);
+	const Vector4 vector2 = Vector4(-8.2, -16, 3, 2.4);
+
+	CHECK_MESSAGE(
+			vector_x.dot(vector_y) == 0.0,
+			"Vector4 dot product of perpendicular vectors should be zero.");
+	CHECK_MESSAGE(
+			vector_x.dot(vector_x) == 1.0,
+			"Vector4 dot product of identical unit vectors should be one.");
+	CHECK_MESSAGE(
+			(vector_x * 10).dot(vector_x * 10) == 100.0,
+			"Vector4 dot product of same direction vectors should behave as expected.");
+	CHECK_MESSAGE(
+			Math::is_equal_approx((vector1 * 2).dot(vector2 * 4), (real_t)-25.9 * 8),
+			"Vector4 dot product should work as expected.");
+}
+} // namespace TestVector4
+
+#endif // TEST_VECTOR4_H
diff --git a/tests/core/math/test_vector4i.h b/tests/core/math/test_vector4i.h
new file mode 100644
index 0000000000..ac63001b24
--- /dev/null
+++ b/tests/core/math/test_vector4i.h
@@ -0,0 +1,148 @@
+/*************************************************************************/
+/*  test_vector4i.h                                                      */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef TEST_VECTOR4I_H
+#define TEST_VECTOR4I_H
+
+#include "core/math/vector4i.h"
+#include "tests/test_macros.h"
+
+namespace TestVector4i {
+
+TEST_CASE("[Vector4i] Axis methods") {
+	Vector4i vector = Vector4i(1, 2, 3, 4);
+	CHECK_MESSAGE(
+			vector.max_axis_index() == Vector4i::Axis::AXIS_W,
+			"Vector4i max_axis_index should work as expected.");
+	CHECK_MESSAGE(
+			vector.min_axis_index() == Vector4i::Axis::AXIS_X,
+			"Vector4i min_axis_index should work as expected.");
+	CHECK_MESSAGE(
+			vector.get_axis(vector.max_axis_index()) == 4,
+			"Vector4i get_axis should work as expected.");
+	CHECK_MESSAGE(
+			vector[vector.min_axis_index()] == 1,
+			"Vector4i array operator should work as expected.");
+
+	vector.set_axis(Vector4i::Axis::AXIS_Y, 5);
+	CHECK_MESSAGE(
+			vector.get_axis(Vector4i::Axis::AXIS_Y) == 5,
+			"Vector4i set_axis should work as expected.");
+	vector[Vector4i::Axis::AXIS_Y] = 5;
+	CHECK_MESSAGE(
+			vector[Vector4i::Axis::AXIS_Y] == 5,
+			"Vector4i array operator setter should work as expected.");
+}
+
+TEST_CASE("[Vector4i] Clamp method") {
+	const Vector4i vector = Vector4i(10, 10, 10, 10);
+	CHECK_MESSAGE(
+			Vector4i(-5, 5, 15, INT_MAX).clamp(Vector4i(), vector) == Vector4i(0, 5, 10, 10),
+			"Vector4i clamp should work as expected.");
+	CHECK_MESSAGE(
+			vector.clamp(Vector4i(0, 10, 15, -10), Vector4i(5, 10, 20, -5)) == Vector4i(5, 10, 15, -5),
+			"Vector4i clamp should work as expected.");
+}
+
+TEST_CASE("[Vector4i] Length methods") {
+	const Vector4i vector1 = Vector4i(10, 10, 10, 10);
+	const Vector4i vector2 = Vector4i(20, 30, 40, 50);
+	CHECK_MESSAGE(
+			vector1.length_squared() == 400,
+			"Vector4i length_squared should work as expected and return exact result.");
+	CHECK_MESSAGE(
+			Math::is_equal_approx(vector1.length(), 20),
+			"Vector4i length should work as expected.");
+	CHECK_MESSAGE(
+			vector2.length_squared() == 5400,
+			"Vector4i length_squared should work as expected and return exact result.");
+	CHECK_MESSAGE(
+			Math::is_equal_approx(vector2.length(), 73.4846922835),
+			"Vector4i length should work as expected.");
+}
+
+TEST_CASE("[Vector4i] Operators") {
+	const Vector4i vector1 = Vector4i(4, 5, 9, 2);
+	const Vector4i vector2 = Vector4i(1, 2, 3, 4);
+
+	CHECK_MESSAGE(
+			-vector1 == Vector4i(-4, -5, -9, -2),
+			"Vector4i change of sign should work as expected.");
+	CHECK_MESSAGE(
+			(vector1 + vector2) == Vector4i(5, 7, 12, 6),
+			"Vector4i addition with integers should give exact results.");
+	CHECK_MESSAGE(
+			(vector1 - vector2) == Vector4i(3, 3, 6, -2),
+			"Vector4i subtraction with integers should give exact results.");
+	CHECK_MESSAGE(
+			(vector1 * vector2) == Vector4i(4, 10, 27, 8),
+			"Vector4i multiplication with integers should give exact results.");
+	CHECK_MESSAGE(
+			(vector1 / vector2) == Vector4i(4, 2, 3, 0),
+			"Vector4i division with integers should give exact results.");
+
+	CHECK_MESSAGE(
+			(vector1 * 2) == Vector4i(8, 10, 18, 4),
+			"Vector4i multiplication with integers should give exact results.");
+	CHECK_MESSAGE(
+			(vector1 / 2) == Vector4i(2, 2, 4, 1),
+			"Vector4i division with integers should give exact results.");
+
+	CHECK_MESSAGE(
+			((Vector4)vector1) == Vector4(4, 5, 9, 2),
+			"Vector4i cast to Vector4 should work as expected.");
+	CHECK_MESSAGE(
+			((Vector4)vector2) == Vector4(1, 2, 3, 4),
+			"Vector4i cast to Vector4 should work as expected.");
+	CHECK_MESSAGE(
+			Vector4i(Vector4(1.1, 2.9, 3.9, 100.5)) == Vector4i(1, 2, 3, 100),
+			"Vector4i constructed from Vector4 should work as expected.");
+}
+
+TEST_CASE("[Vector4i] Abs and sign methods") {
+	const Vector4i vector1 = Vector4i(1, 3, 5, 7);
+	const Vector4i vector2 = Vector4i(1, -3, -5, 7);
+	CHECK_MESSAGE(
+			vector1.abs() == vector1,
+			"Vector4i abs should work as expected.");
+	CHECK_MESSAGE(
+			vector2.abs() == vector1,
+			"Vector4i abs should work as expected.");
+
+	CHECK_MESSAGE(
+			vector1.sign() == Vector4i(1, 1, 1, 1),
+			"Vector4i sign should work as expected.");
+	CHECK_MESSAGE(
+			vector2.sign() == Vector4i(1, -1, -1, 1),
+			"Vector4i sign should work as expected.");
+}
+} // namespace TestVector4i
+
+#endif // TEST_VECTOR4I_H
diff --git a/tests/core/object/test_class_db.h b/tests/core/object/test_class_db.h
index c7535426df..208923edb9 100644
--- a/tests/core/object/test_class_db.h
+++ b/tests/core/object/test_class_db.h
@@ -71,6 +71,7 @@ struct ArgumentData {
 	String name;
 	bool has_defval = false;
 	Variant defval;
+	int position;
 };
 
 struct MethodData {
@@ -371,6 +372,39 @@ void validate_property(const Context &p_context, const ExposedClass &p_class, co
 	}
 }
 
+void validate_argument(const Context &p_context, const ExposedClass &p_class, const String &p_owner_name, const String &p_owner_type, const ArgumentData &p_arg) {
+	TEST_COND((p_arg.name.is_empty() || p_arg.name.begins_with("_unnamed_arg")),
+			vformat("Unnamed argument in position %d of %s '%s.%s'.", p_arg.position, p_owner_type, p_class.name, p_owner_name));
+
+	const ExposedClass *arg_class = p_context.find_exposed_class(p_arg.type);
+	if (arg_class) {
+		TEST_COND(arg_class->is_singleton,
+				vformat("Argument type is a singleton: '%s' of %s '%s.%s'.", p_arg.name, p_owner_type, p_class.name, p_owner_name));
+
+		if (p_class.api_type == ClassDB::API_CORE) {
+			TEST_COND(arg_class->api_type == ClassDB::API_EDITOR,
+					vformat("Argument '%s' of %s '%s.%s' has type '%s' from the editor API. Core API cannot have dependencies on the editor API.",
+							p_arg.name, p_owner_type, p_class.name, p_owner_name, arg_class->name));
+		}
+	} else {
+		// Look for types that don't inherit Object.
+		TEST_FAIL_COND(!p_context.has_type(p_arg.type),
+				vformat("Argument type '%s' not found: '%s' of %s '%s.%s'.", p_arg.type.name, p_arg.name, p_owner_type, p_class.name, p_owner_name));
+	}
+
+	if (p_arg.has_defval) {
+		String type_error_msg;
+		bool arg_defval_assignable_to_type = arg_default_value_is_assignable_to_type(p_context, p_arg.defval, p_arg.type, &type_error_msg);
+
+		String err_msg = vformat("Invalid default value for parameter '%s' of %s '%s.%s'.", p_arg.name, p_owner_type, p_class.name, p_owner_name);
+		if (!type_error_msg.is_empty()) {
+			err_msg += " " + type_error_msg;
+		}
+
+		TEST_COND(!arg_defval_assignable_to_type, err_msg.utf8().get_data());
+	}
+}
+
 void validate_method(const Context &p_context, const ExposedClass &p_class, const MethodData &p_method) {
 	if (p_method.return_type.name != StringName()) {
 		const ExposedClass *return_class = p_context.find_exposed_class(p_method.return_type);
@@ -392,54 +426,14 @@ void validate_method(const Context &p_context, const ExposedClass &p_class, cons
 
 	for (const ArgumentData &F : p_method.arguments) {
 		const ArgumentData &arg = F;
-
-		const ExposedClass *arg_class = p_context.find_exposed_class(arg.type);
-		if (arg_class) {
-			TEST_COND(arg_class->is_singleton,
-					"Argument type is a singleton: '", arg.name, "' of method '", p_class.name, ".", p_method.name, "'.");
-
-			if (p_class.api_type == ClassDB::API_CORE) {
-				TEST_COND(arg_class->api_type == ClassDB::API_EDITOR,
-						"Argument '", arg.name, "' of method '", p_class.name, ".", p_method.name, "' has type '",
-						arg_class->name, "' from the editor API. Core API cannot have dependencies on the editor API.");
-			}
-		} else {
-			// Look for types that don't inherit Object
-			TEST_FAIL_COND(!p_context.has_type(arg.type),
-					"Argument type '", arg.type.name, "' not found: '", arg.name, "' of method", p_class.name, ".", p_method.name, "'.");
-		}
-
-		if (arg.has_defval) {
-			String type_error_msg;
-			bool arg_defval_assignable_to_type = arg_default_value_is_assignable_to_type(p_context, arg.defval, arg.type, &type_error_msg);
-			String err_msg = vformat("Invalid default value for parameter '%s' of method '%s.%s'.", arg.name, p_class.name, p_method.name);
-			if (!type_error_msg.is_empty()) {
-				err_msg += " " + type_error_msg;
-			}
-			TEST_COND(!arg_defval_assignable_to_type, err_msg.utf8().get_data());
-		}
+		validate_argument(p_context, p_class, p_method.name, "method", arg);
 	}
 }
 
 void validate_signal(const Context &p_context, const ExposedClass &p_class, const SignalData &p_signal) {
 	for (const ArgumentData &F : p_signal.arguments) {
 		const ArgumentData &arg = F;
-
-		const ExposedClass *arg_class = p_context.find_exposed_class(arg.type);
-		if (arg_class) {
-			TEST_COND(arg_class->is_singleton,
-					"Argument class is a singleton: '", arg.name, "' of signal '", p_class.name, ".", p_signal.name, "'.");
-
-			if (p_class.api_type == ClassDB::API_CORE) {
-				TEST_COND(arg_class->api_type == ClassDB::API_EDITOR,
-						"Argument '", arg.name, "' of signal '", p_class.name, ".", p_signal.name, "' has type '",
-						arg_class->name, "' from the editor API. Core API cannot have dependencies on the editor API.");
-			}
-		} else {
-			// Look for types that don't inherit Object
-			TEST_FAIL_COND(!p_context.has_type(arg.type),
-					"Argument type '", arg.type.name, "' not found: '", arg.name, "' of signal", p_class.name, ".", p_signal.name, "'.");
-		}
+		validate_argument(p_context, p_class, p_signal.name, "signal", arg);
 	}
 }
 
@@ -493,13 +487,13 @@ void add_exposed_classes(Context &r_context) {
 		}
 
 		if (!ClassDB::is_class_exposed(class_name)) {
-			MESSAGE(vformat("Ignoring class '%s' because it's not exposed.", class_name).utf8().get_data());
+			MESSAGE(vformat("Ignoring class '%s' because it's not exposed.", class_name));
 			class_list.pop_front();
 			continue;
 		}
 
 		if (!ClassDB::is_class_enabled(class_name)) {
-			MESSAGE(vformat("Ignoring class '%s' because it's not enabled.", class_name).utf8().get_data());
+			MESSAGE(vformat("Ignoring class '%s' because it's not enabled.", class_name));
 			class_list.pop_front();
 			continue;
 		}
@@ -625,6 +619,7 @@ void add_exposed_classes(Context &r_context) {
 
 				ArgumentData arg;
 				arg.name = orig_arg_name;
+				arg.position = i;
 
 				if (arg_info.type == Variant::INT && arg_info.usage & (PROPERTY_USAGE_CLASS_IS_ENUM | PROPERTY_USAGE_CLASS_IS_BITFIELD)) {
 					arg.type.name = arg_info.class_name;
@@ -693,6 +688,7 @@ void add_exposed_classes(Context &r_context) {
 
 				ArgumentData arg;
 				arg.name = orig_arg_name;
+				arg.position = i;
 
 				if (arg_info.type == Variant::INT && arg_info.usage & (PROPERTY_USAGE_CLASS_IS_ENUM | PROPERTY_USAGE_CLASS_IS_BITFIELD)) {
 					arg.type.name = arg_info.class_name;
@@ -841,7 +837,7 @@ TEST_SUITE("[ClassDB]") {
 		add_builtin_types(context);
 		add_global_enums(context);
 
-		SUBCASE("[ClassDB] Find exposed class") {
+		SUBCASE("[ClassDB] Validate exposed classes") {
 			const ExposedClass *object_class = context.find_exposed_class(context.names_cache.object_class);
 			TEST_FAIL_COND(!object_class, "Object class not found.");
 			TEST_FAIL_COND(object_class->base != StringName(),
diff --git a/tests/core/object/test_method_bind.h b/tests/core/object/test_method_bind.h
index 350a08b6e2..2fe0c264a1 100644
--- a/tests/core/object/test_method_bind.h
+++ b/tests/core/object/test_method_bind.h
@@ -155,7 +155,6 @@ public:
 TEST_CASE("[MethodBind] check all method binds") {
 	MethodBindTester *mbt = memnew(MethodBindTester);
 
-	print_line("testing method bind");
 	mbt->run_tests();
 
 	CHECK(mbt->test_valid[MethodBindTester::TEST_METHOD]);
diff --git a/tests/core/object/test_object.h b/tests/core/object/test_object.h
index 88a3e4ccad..f5c5de7fdf 100644
--- a/tests/core/object/test_object.h
+++ b/tests/core/object/test_object.h
@@ -82,6 +82,12 @@ public:
 	Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid) const override {
 		return Variant::PACKED_FLOAT32_ARRAY;
 	}
+	bool property_can_revert(const StringName &p_name) const override {
+		return false;
+	};
+	bool property_get_revert(const StringName &p_name, Variant &r_ret) const override {
+		return false;
+	};
 	void get_method_list(List<MethodInfo> *p_list) const override {
 	}
 	bool has_method(const StringName &p_method) const override {
diff --git a/tests/core/string/test_string.h b/tests/core/string/test_string.h
index b8b766023a..8914dbfd9a 100644
--- a/tests/core/string/test_string.h
+++ b/tests/core/string/test_string.h
@@ -697,7 +697,9 @@ TEST_CASE("[String] sprintf") {
 	format = "fish %-05d frog";
 	args.clear();
 	args.push_back(-5);
+	ERR_PRINT_OFF; // Silence warning about 0 ignored.
 	output = format.sprintf(args, &error);
+	ERR_PRINT_ON;
 	REQUIRE(error == false);
 	CHECK(output == String("fish -5    frog"));
 
@@ -795,7 +797,9 @@ TEST_CASE("[String] sprintf") {
 	format = "fish %-011f frog";
 	args.clear();
 	args.push_back(-99.99);
+	ERR_PRINT_OFF; // Silence warning about 0 ignored.
 	output = format.sprintf(args, &error);
+	ERR_PRINT_ON;
 	REQUIRE(error == false);
 	CHECK(output == String("fish -99.990000  frog"));
 
diff --git a/tests/core/templates/test_hash_set.h b/tests/core/templates/test_hash_set.h
index 3b9a800641..dad149604b 100644
--- a/tests/core/templates/test_hash_set.h
+++ b/tests/core/templates/test_hash_set.h
@@ -38,7 +38,6 @@
 namespace TestHashSet {
 
 TEST_CASE("[HashSet] Insert element") {
-	print_line("SMALL BEGIN MEM: ", Memory::get_mem_usage());
 	HashSet<int> set;
 	HashSet<int>::Iterator e = set.insert(42);
 
@@ -47,7 +46,6 @@ TEST_CASE("[HashSet] Insert element") {
 	CHECK(set.has(42));
 	CHECK(set.find(42));
 	set.reset();
-	print_line("SMALL END MEM: ", Memory::get_mem_usage());
 }
 
 TEST_CASE("[HashSet] Insert existing element") {
diff --git a/tests/core/templates/test_rid.h b/tests/core/templates/test_rid.h
new file mode 100644
index 0000000000..8d4dd0703b
--- /dev/null
+++ b/tests/core/templates/test_rid.h
@@ -0,0 +1,101 @@
+/*************************************************************************/
+/*  test_rid.h                                                           */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef TEST_RID_H
+#define TEST_RID_H
+
+#include "core/templates/rid.h"
+
+#include "tests/test_macros.h"
+
+namespace TestRID {
+TEST_CASE("[RID] Default Constructor") {
+	RID rid;
+
+	CHECK(rid.get_id() == 0);
+}
+
+TEST_CASE("[RID] Factory method") {
+	RID rid = RID::from_uint64(1);
+
+	CHECK(rid.get_id() == 1);
+}
+
+TEST_CASE("[RID] Operators") {
+	RID rid = RID::from_uint64(1);
+
+	RID rid_zero = RID::from_uint64(0);
+	RID rid_one = RID::from_uint64(1);
+	RID rid_two = RID::from_uint64(2);
+
+	CHECK_FALSE(rid == rid_zero);
+	CHECK(rid == rid_one);
+	CHECK_FALSE(rid == rid_two);
+
+	CHECK_FALSE(rid < rid_zero);
+	CHECK_FALSE(rid < rid_one);
+	CHECK(rid < rid_two);
+
+	CHECK_FALSE(rid <= rid_zero);
+	CHECK(rid <= rid_one);
+	CHECK(rid <= rid_two);
+
+	CHECK(rid > rid_zero);
+	CHECK_FALSE(rid > rid_one);
+	CHECK_FALSE(rid > rid_two);
+
+	CHECK(rid >= rid_zero);
+	CHECK(rid >= rid_one);
+	CHECK_FALSE(rid >= rid_two);
+
+	CHECK(rid != rid_zero);
+	CHECK_FALSE(rid != rid_one);
+	CHECK(rid != rid_two);
+}
+
+TEST_CASE("[RID] 'is_valid' & 'is_null'") {
+	RID rid_zero = RID::from_uint64(0);
+	RID rid_one = RID::from_uint64(1);
+
+	CHECK_FALSE(rid_zero.is_valid());
+	CHECK(rid_zero.is_null());
+
+	CHECK(rid_one.is_valid());
+	CHECK_FALSE(rid_one.is_null());
+}
+
+TEST_CASE("[RID] 'get_local_index'") {
+	CHECK(RID::from_uint64(1).get_local_index() == 1);
+	CHECK(RID::from_uint64(4'294'967'295).get_local_index() == 4'294'967'295);
+	CHECK(RID::from_uint64(4'294'967'297).get_local_index() == 1);
+}
+} // namespace TestRID
+
+#endif // TEST_RID_H
diff --git a/tests/core/templates/test_vector.h b/tests/core/templates/test_vector.h
index f27d6a332e..3fc9264f5a 100644
--- a/tests/core/templates/test_vector.h
+++ b/tests/core/templates/test_vector.h
@@ -291,8 +291,10 @@ TEST_CASE("[Vector] Slice") {
 	CHECK(slice6[1] == 3);
 	CHECK(slice6[2] == 4);
 
+	ERR_PRINT_OFF;
 	Vector<int> slice7 = vector.slice(5, 1);
-	CHECK(slice7.size() == 0);
+	CHECK(slice7.size() == 0); // Expected to fail.
+	ERR_PRINT_ON;
 }
 
 TEST_CASE("[Vector] Find, has") {
diff --git a/tests/core/variant/test_variant.h b/tests/core/variant/test_variant.h
index 916686d7c1..d6799928b4 100644
--- a/tests/core/variant/test_variant.h
+++ b/tests/core/variant/test_variant.h
@@ -719,6 +719,7 @@ TEST_CASE("[Variant] Assignment To Color from Bool,Int,Float,String,Vec2,Vec2i,V
 	vec3i_v = col_v;
 	CHECK(vec3i_v.get_type() == Variant::COLOR);
 }
+
 TEST_CASE("[Variant] Writer and parser array") {
 	Array a = build_array(1, String("hello"), build_array(Variant()));
 	String a_str;
@@ -911,6 +912,67 @@ TEST_CASE("[Variant] Nested dictionary comparison") {
 	CHECK_FALSE(v_d1 == v_d_other_val);
 }
 
+struct ArgumentData {
+	Variant::Type type;
+	String name;
+	bool has_defval = false;
+	Variant defval;
+	int position;
+};
+
+struct MethodData {
+	StringName name;
+	Variant::Type return_type;
+	List<ArgumentData> arguments;
+	bool is_virtual = false;
+	bool is_vararg = false;
+};
+
+TEST_CASE("[Variant] Utility functions") {
+	List<MethodData> functions;
+
+	List<StringName> function_names;
+	Variant::get_utility_function_list(&function_names);
+	function_names.sort_custom<StringName::AlphCompare>();
+
+	for (const StringName &E : function_names) {
+		MethodData md;
+		md.name = E;
+
+		// Utility function's return type.
+		if (Variant::has_utility_function_return_value(E)) {
+			md.return_type = Variant::get_utility_function_return_type(E);
+		}
+
+		// Utility function's arguments.
+		if (Variant::is_utility_function_vararg(E)) {
+			md.is_vararg = true;
+		} else {
+			for (int i = 0; i < Variant::get_utility_function_argument_count(E); i++) {
+				ArgumentData arg;
+				arg.type = Variant::get_utility_function_argument_type(E, i);
+				arg.name = Variant::get_utility_function_argument_name(E, i);
+				arg.position = i;
+
+				md.arguments.push_back(arg);
+			}
+		}
+
+		functions.push_back(md);
+	}
+
+	SUBCASE("[Variant] Validate utility functions") {
+		for (const MethodData &E : functions) {
+			for (const ArgumentData &F : E.arguments) {
+				const ArgumentData &arg = F;
+
+				TEST_COND((arg.name.is_empty() || arg.name.begins_with("_unnamed_arg")),
+						vformat("Unnamed argument in position %d of function '%s'.", arg.position, E.name));
+			}
+		}
+	}
+}
+
 } // namespace TestVariant
 
 #endif // TEST_VARIANT_H
diff --git a/tests/scene/test_audio_stream_wav.h b/tests/scene/test_audio_stream_wav.h
new file mode 100644
index 0000000000..92c524525c
--- /dev/null
+++ b/tests/scene/test_audio_stream_wav.h
@@ -0,0 +1,243 @@
+/*************************************************************************/
+/*  test_audio_stream_wav.h                                              */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef TEST_AUDIO_STREAM_WAV_H
+#define TEST_AUDIO_STREAM_WAV_H
+
+#include "core/math/math_defs.h"
+#include "core/math/math_funcs.h"
+#include "scene/resources/audio_stream_wav.h"
+
+#include "tests/test_macros.h"
+
+#ifdef TOOLS_ENABLED
+#include "core/io/resource_loader.h"
+#include "editor/import/resource_importer_wav.h"
+#endif
+
+namespace TestAudioStreamWAV {
+
+// Default wav rate for test cases.
+constexpr float WAV_RATE = 44100;
+/* Default wav count for test cases. 1 second of audio is used so that the file can be listened
+to manually if needed. */
+constexpr int WAV_COUNT = WAV_RATE;
+
+float gen_wav(float frequency, float wav_rate, int wav_number) {
+	// formula for generating a sin wave with given frequency.
+	return Math::sin((Math_TAU * frequency / wav_rate) * wav_number);
+}
+
+/* Generates a 440Hz sin wave in channel 0 (mono channel or left stereo channel)
+ * and a 261.63Hz wave in channel 1 (right stereo channel).
+ * These waves correspond to the music notes A4 and C4 respectively.
+ */
+Vector<uint8_t> gen_pcm8_test(float wav_rate, int wav_count, bool stereo) {
+	Vector<uint8_t> buffer;
+	buffer.resize(stereo ? wav_count * 2 : wav_count);
+
+	uint8_t *write_ptr = buffer.ptrw();
+	for (int i = 0; i < buffer.size(); i++) {
+		float wav;
+		if (stereo) {
+			if (i % 2 == 0) {
+				wav = gen_wav(440, wav_rate, i / 2);
+			} else {
+				wav = gen_wav(261.63, wav_rate, i / 2);
+			}
+		} else {
+			wav = gen_wav(440, wav_rate, i);
+		}
+
+		// Map sin wave to full range of 8-bit values.
+		uint8_t wav_8bit = Math::fast_ftoi(((wav + 1) / 2) * UINT8_MAX);
+		// Unlike the .wav format, AudioStreamWAV expects signed 8-bit wavs.
+		uint8_t wav_8bit_signed = wav_8bit - (INT8_MAX + 1);
+		write_ptr[i] = wav_8bit_signed;
+	}
+
+	return buffer;
+}
+
+// Same as gen_pcm8_test but with 16-bit wavs.
+Vector<uint8_t> gen_pcm16_test(float wav_rate, int wav_count, bool stereo) {
+	Vector<uint8_t> buffer;
+	buffer.resize(stereo ? wav_count * 4 : wav_count * 2);
+
+	uint8_t *write_ptr = buffer.ptrw();
+	for (int i = 0; i < buffer.size() / 2; i++) {
+		float wav;
+		if (stereo) {
+			if (i % 2 == 0) {
+				wav = gen_wav(440, wav_rate, i / 2);
+			} else {
+				wav = gen_wav(261.63, wav_rate, i / 2);
+			}
+		} else {
+			wav = gen_wav(440, wav_rate, i);
+		}
+
+		// Map sin wave to full range of 16-bit values.
+		uint16_t wav_16bit = Math::fast_ftoi(((wav + 1) / 2) * UINT16_MAX);
+		// The .wav format expects wavs larger than 8 bits to be signed.
+		uint16_t wav_16bit_signed = wav_16bit - (INT16_MAX + 1);
+		encode_uint16(wav_16bit_signed, write_ptr + (i * 2));
+	}
+
+	return buffer;
+}
+
+void run_test(String file_name, AudioStreamWAV::Format data_format, bool stereo, float wav_rate, float wav_count) {
+	String save_path = OS::get_singleton()->get_cache_path().plus_file(file_name);
+
+	Vector<uint8_t> test_data;
+	if (data_format == AudioStreamWAV::FORMAT_8_BITS) {
+		test_data = gen_pcm8_test(wav_rate, wav_count, stereo);
+	} else {
+		test_data = gen_pcm16_test(wav_rate, wav_count, stereo);
+	}
+
+	Ref<AudioStreamWAV> stream = memnew(AudioStreamWAV);
+	stream->set_mix_rate(wav_rate);
+	CHECK(stream->get_mix_rate() == wav_rate);
+
+	stream->set_format(data_format);
+	CHECK(stream->get_format() == data_format);
+
+	stream->set_stereo(stereo);
+	CHECK(stream->is_stereo() == stereo);
+
+	stream->set_data(test_data);
+	CHECK(stream->get_data() == test_data);
+
+	SUBCASE("Stream length is computed properly") {
+		CHECK(Math::is_equal_approx(stream->get_length(), wav_count / wav_rate));
+	}
+
+	SUBCASE("Stream can be saved as .wav") {
+		REQUIRE(stream->save_to_wav(save_path) == OK);
+
+		Error error;
+		Ref<FileAccess> wav_file = FileAccess::open(save_path, FileAccess::READ, &error);
+		REQUIRE(error == OK);
+
+#if TOOLS_ENABLED
+		// The WAV importer can be used if enabled to check that the saved file is valid.
+		Ref<ResourceImporterWAV> wav_importer = memnew(ResourceImporterWAV);
+
+		List<ResourceImporter::ImportOption> options_list;
+		wav_importer->get_import_options("", &options_list);
+
+		HashMap<StringName, Variant> options_map;
+		for (const ResourceImporter::ImportOption &E : options_list) {
+			options_map[E.option.name] = E.default_value;
+		}
+
+		REQUIRE(wav_importer->import(save_path, save_path, options_map, nullptr) == OK);
+
+		String load_path = save_path + "." + wav_importer->get_save_extension();
+		Ref<AudioStreamWAV> loaded_stream = ResourceLoader::load(load_path, "AudioStreamWAV", ResourceFormatImporter::CACHE_MODE_IGNORE, &error);
+		REQUIRE(error == OK);
+
+		CHECK(loaded_stream->get_format() == stream->get_format());
+		CHECK(loaded_stream->get_loop_mode() == stream->get_loop_mode());
+		CHECK(loaded_stream->get_loop_begin() == stream->get_loop_begin());
+		CHECK(loaded_stream->get_loop_end() == stream->get_loop_end());
+		CHECK(loaded_stream->get_mix_rate() == stream->get_mix_rate());
+		CHECK(loaded_stream->is_stereo() == stream->is_stereo());
+		CHECK(loaded_stream->get_length() == stream->get_length());
+		CHECK(loaded_stream->is_monophonic() == stream->is_monophonic());
+		CHECK(loaded_stream->get_data() == stream->get_data());
+#endif
+	}
+}
+
+TEST_CASE("[AudioStreamWAV] Mono PCM8 format") {
+	run_test("test_pcm8_mono.wav", AudioStreamWAV::FORMAT_8_BITS, false, WAV_RATE, WAV_COUNT);
+}
+
+TEST_CASE("[AudioStreamWAV] Mono PCM16 format") {
+	run_test("test_pcm16_mono.wav", AudioStreamWAV::FORMAT_16_BITS, false, WAV_RATE, WAV_COUNT);
+}
+
+TEST_CASE("[AudioStreamWAV] Stereo PCM8 format") {
+	run_test("test_pcm8_stereo.wav", AudioStreamWAV::FORMAT_8_BITS, true, WAV_RATE, WAV_COUNT);
+}
+
+TEST_CASE("[AudioStreamWAV] Stereo PCM16 format") {
+	run_test("test_pcm16_stereo.wav", AudioStreamWAV::FORMAT_16_BITS, true, WAV_RATE, WAV_COUNT);
+}
+
+TEST_CASE("[AudioStreamWAV] Alternate mix rate") {
+	run_test("test_pcm16_stereo_38000Hz.wav", AudioStreamWAV::FORMAT_16_BITS, true, 38000, 38000);
+}
+
+TEST_CASE("[AudioStreamWAV] save_to_wav() adds '.wav' file extension automatically") {
+	String save_path = OS::get_singleton()->get_cache_path().plus_file("test_wav_extension");
+	Vector<uint8_t> test_data = gen_pcm8_test(WAV_RATE, WAV_COUNT, false);
+	Ref<AudioStreamWAV> stream = memnew(AudioStreamWAV);
+	stream->set_data(test_data);
+
+	REQUIRE(stream->save_to_wav(save_path) == OK);
+	Error error;
+	Ref<FileAccess> wav_file = FileAccess::open(save_path + ".wav", FileAccess::READ, &error);
+	CHECK(error == OK);
+}
+
+TEST_CASE("[AudioStreamWAV] Default values") {
+	Ref<AudioStreamWAV> stream = memnew(AudioStreamWAV);
+	CHECK(stream->get_format() == AudioStreamWAV::FORMAT_8_BITS);
+	CHECK(stream->get_loop_mode() == AudioStreamWAV::LOOP_DISABLED);
+	CHECK(stream->get_loop_begin() == 0);
+	CHECK(stream->get_loop_end() == 0);
+	CHECK(stream->get_mix_rate() == 44100);
+	CHECK(stream->is_stereo() == false);
+	CHECK(stream->get_length() == 0);
+	CHECK(stream->is_monophonic() == false);
+	CHECK(stream->get_data() == Vector<uint8_t>{});
+	CHECK(stream->get_stream_name() == "");
+}
+
+TEST_CASE("[AudioStreamWAV] Save empty file") {
+	run_test("test_empty.wav", AudioStreamWAV::FORMAT_8_BITS, false, WAV_RATE, 0);
+}
+
+TEST_CASE("[AudioStreamWAV] Saving IMA ADPCM is not supported") {
+	String save_path = OS::get_singleton()->get_cache_path().plus_file("test_adpcm.wav");
+	Ref<AudioStreamWAV> stream = memnew(AudioStreamWAV);
+	stream->set_format(AudioStreamWAV::FORMAT_IMA_ADPCM);
+	ERR_PRINT_OFF;
+	CHECK(stream->save_to_wav(save_path) == ERR_UNAVAILABLE);
+	ERR_PRINT_ON;
+}
+
+} // namespace TestAudioStreamWAV
+
+#endif // TEST_AUDIO_STREAM_WAV_H
diff --git a/tests/scene/test_sprite_frames.h b/tests/scene/test_sprite_frames.h
new file mode 100644
index 0000000000..61bbd16493
--- /dev/null
+++ b/tests/scene/test_sprite_frames.h
@@ -0,0 +1,247 @@
+/*************************************************************************/
+/*  test_sprite_frames.h                                                 */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef TEST_SPRITE_FRAMES_H
+#define TEST_SPRITE_FRAMES_H
+
+#include "scene/resources/sprite_frames.h"
+
+#include "tests/test_macros.h"
+
+namespace TestSpriteFrames {
+const String test_animation_name = "GodotTest";
+
+TEST_CASE("[SpriteFrames] Constructor methods") {
+	const SpriteFrames frames;
+	CHECK_MESSAGE(
+			frames.get_animation_names().size() == 1,
+			"Should be initialized with 1 entry.");
+	CHECK_MESSAGE(
+			frames.get_animation_names().get(0) == "default",
+			"Should be initialized with default entry.");
+}
+
+TEST_CASE("[SpriteFrames] Animation addition, list getter, renaming, removal, and retrieval") {
+	SpriteFrames frames;
+	Vector<String> test_names = { "default", "2", "1", "3" };
+
+	// "default" is there already
+	frames.add_animation("2");
+	frames.add_animation("1");
+	frames.add_animation("3");
+
+	for (int i = 0; i < test_names.size(); i++) {
+		CHECK_MESSAGE(
+				frames.has_animation(test_names[i]),
+				"Add animation properly worked for each value");
+	}
+
+	CHECK_MESSAGE(
+			!frames.has_animation("999"),
+			"Return false when checking for animation that does not exist");
+
+	List<StringName> sname_list;
+	frames.get_animation_list(&sname_list);
+
+	CHECK_MESSAGE(
+			sname_list.size() == test_names.size(),
+			"StringName List getter returned list of expected size");
+
+	for (int i = 0; i < test_names.size(); i++) {
+		CHECK_MESSAGE(
+				sname_list[i] == StringName(test_names[i]),
+				"StringName List getter returned expected values");
+	}
+
+	// get_animation_names() sorts the results.
+	Vector<String> string_vector = frames.get_animation_names();
+	test_names.sort();
+
+	for (int i = 0; i < test_names.size(); i++) {
+		CHECK_MESSAGE(
+				string_vector[i] == test_names[i],
+				"String Vector getter returned expected values");
+	}
+
+	// These error handling cases should not crash.
+	ERR_PRINT_OFF;
+	frames.rename_animation("This does not exist", "0");
+	ERR_PRINT_ON;
+
+	CHECK_MESSAGE(
+			!frames.has_animation("0"),
+			"Correctly handles rename error when entry does not exist");
+
+	// These error handling cases should not crash.
+	ERR_PRINT_OFF;
+	frames.rename_animation("3", "1");
+	ERR_PRINT_ON;
+
+	CHECK_MESSAGE(
+			frames.has_animation("3"),
+			"Correctly handles rename error when entry exists, but new name already exists");
+
+	ERR_PRINT_OFF;
+	frames.add_animation("1");
+	ERR_PRINT_ON;
+
+	CHECK_MESSAGE(
+			frames.get_animation_names().size() == 4,
+			"Correctly does not add when entry already exists");
+
+	frames.rename_animation("3", "9");
+
+	CHECK_MESSAGE(
+			frames.has_animation("9"),
+			"Animation renamed correctly");
+
+	frames.remove_animation("9");
+
+	CHECK_MESSAGE(
+			!frames.has_animation("9"),
+			"Animation removed correctly");
+
+	frames.clear_all();
+
+	CHECK_MESSAGE(
+			frames.get_animation_names().size() == 1,
+			"Clear all removed all animations and re-added the default animation entry");
+}
+
+TEST_CASE("[SpriteFrames] Animation Speed getter and setter") {
+	SpriteFrames frames;
+
+	frames.add_animation(test_animation_name);
+
+	CHECK_MESSAGE(
+			frames.get_animation_speed(test_animation_name) == 5.0,
+			"Sets new animation to default speed");
+
+	frames.set_animation_speed(test_animation_name, 123.0004);
+
+	CHECK_MESSAGE(
+			frames.get_animation_speed(test_animation_name) == 123.0004,
+			"Sets animation to positive double");
+
+	// These error handling cases should not crash.
+	ERR_PRINT_OFF;
+	frames.get_animation_speed("This does not exist");
+	frames.set_animation_speed("This does not exist", 100);
+	frames.set_animation_speed(test_animation_name, -999.999);
+	ERR_PRINT_ON;
+
+	CHECK_MESSAGE(
+			frames.get_animation_speed(test_animation_name) == 123.0004,
+			"Prevents speed of animation being set to a negative value");
+
+	frames.set_animation_speed(test_animation_name, 0.0);
+
+	CHECK_MESSAGE(
+			frames.get_animation_speed(test_animation_name) == 0.0,
+			"Sets animation to zero");
+}
+
+TEST_CASE("[SpriteFrames] Animation Loop getter and setter") {
+	SpriteFrames frames;
+
+	frames.add_animation(test_animation_name);
+
+	CHECK_MESSAGE(
+			frames.get_animation_loop(test_animation_name),
+			"Sets new animation to default loop value.");
+
+	frames.set_animation_loop(test_animation_name, true);
+
+	CHECK_MESSAGE(
+			frames.get_animation_loop(test_animation_name),
+			"Sets animation loop to true");
+
+	frames.set_animation_loop(test_animation_name, false);
+
+	CHECK_MESSAGE(
+			!frames.get_animation_loop(test_animation_name),
+			"Sets animation loop to false");
+
+	// These error handling cases should not crash.
+	ERR_PRINT_OFF;
+	frames.get_animation_loop("This does not exist");
+	frames.set_animation_loop("This does not exist", false);
+	ERR_PRINT_ON;
+}
+
+// TODO
+TEST_CASE("[SpriteFrames] Frame addition, removal, and retrieval") {
+	Ref<Texture2D> dummy_frame1;
+	dummy_frame1.instantiate();
+
+	SpriteFrames frames;
+	frames.add_animation(test_animation_name);
+	frames.add_animation("1");
+	frames.add_animation("2");
+
+	CHECK_MESSAGE(
+			frames.get_frame_count(test_animation_name) == 0,
+			"Animation has a default frame count of 0");
+
+	frames.add_frame(test_animation_name, dummy_frame1, 0);
+	frames.add_frame(test_animation_name, dummy_frame1, 1);
+	frames.add_frame(test_animation_name, dummy_frame1, 2);
+
+	CHECK_MESSAGE(
+			frames.get_frame_count(test_animation_name) == 3,
+			"Adds multiple frames");
+
+	frames.remove_frame(test_animation_name, 1);
+	frames.remove_frame(test_animation_name, 0);
+
+	CHECK_MESSAGE(
+			frames.get_frame_count(test_animation_name) == 1,
+			"Removes multiple frames");
+
+	// These error handling cases should not crash.
+	ERR_PRINT_OFF;
+	frames.add_frame("does not exist", dummy_frame1, 0);
+	frames.remove_frame(test_animation_name, -99);
+	frames.remove_frame("does not exist", 0);
+	ERR_PRINT_ON;
+
+	CHECK_MESSAGE(
+			frames.get_frame_count(test_animation_name) == 1,
+			"Handles bad values when adding or removing frames.");
+
+	frames.clear(test_animation_name);
+
+	CHECK_MESSAGE(
+			frames.get_frame_count(test_animation_name) == 0,
+			"Clears frames.");
+}
+} // namespace TestSpriteFrames
+
+#endif // TEST_SPRITE_FRAMES_H
diff --git a/tests/scene/test_theme.h b/tests/scene/test_theme.h
index f7cfa0fd5b..f5b21eec32 100644
--- a/tests/scene/test_theme.h
+++ b/tests/scene/test_theme.h
@@ -101,18 +101,24 @@ TEST_CASE_FIXTURE(Fixture, "[Theme] Good theme type names") {
 
 	SUBCASE("set_type_variation") {
 		for (const StringName &name : names) {
+			if (name == StringName()) { // Skip empty here, not allowed.
+				continue;
+			}
 			Ref<Theme> theme = memnew(Theme);
 
 			ErrorDetector ed;
 			theme->set_type_variation(valid_type_name, name);
-			CHECK(ed.has_error == (name == StringName()));
+			CHECK_FALSE(ed.has_error);
 		}
 		for (const StringName &name : names) {
+			if (name == StringName()) { // Skip empty here, not allowed.
+				continue;
+			}
 			Ref<Theme> theme = memnew(Theme);
 
 			ErrorDetector ed;
 			theme->set_type_variation(name, valid_type_name);
-			CHECK(ed.has_error == (name == StringName()));
+			CHECK_FALSE(ed.has_error);
 		}
 	}
 }
@@ -125,6 +131,8 @@ TEST_CASE_FIXTURE(Fixture, "[Theme] Bad theme type names") {
 		String::utf8("contains_汉字"),
 	};
 
+	ERR_PRINT_OFF; // All these rightfully print errors.
+
 	SUBCASE("add_type") {
 		for (const StringName &name : names) {
 			Ref<Theme> theme = memnew(Theme);
@@ -175,6 +183,8 @@ TEST_CASE_FIXTURE(Fixture, "[Theme] Bad theme type names") {
 			CHECK(ed.has_error);
 		}
 	}
+
+	ERR_PRINT_ON;
 }
 
 TEST_CASE_FIXTURE(Fixture, "[Theme] Good theme item names") {
@@ -223,6 +233,8 @@ TEST_CASE_FIXTURE(Fixture, "[Theme] Bad theme item names") {
 		String::utf8("contains_汉字"),
 	};
 
+	ERR_PRINT_OFF; // All these rightfully print errors.
+
 	SUBCASE("set_theme_item") {
 		for (const StringName &name : names) {
 			for (const DataEntry &entry : valid_data) {
@@ -250,6 +262,8 @@ TEST_CASE_FIXTURE(Fixture, "[Theme] Bad theme item names") {
 			}
 		}
 	}
+
+	ERR_PRINT_ON;
 }
 
 } // namespace TestTheme
diff --git a/tests/servers/test_text_server.h b/tests/servers/test_text_server.h
index 57a2cae37f..9ebd0f34b4 100644
--- a/tests/servers/test_text_server.h
+++ b/tests/servers/test_text_server.h
@@ -44,7 +44,7 @@ TEST_SUITE("[TextServer]") {
 		SUBCASE("[TextServer] Loading fonts") {
 			for (int i = 0; i < TextServerManager::get_singleton()->get_interface_count(); i++) {
 				Ref<TextServer> ts = TextServerManager::get_singleton()->get_interface(i);
-				TEST_FAIL_COND(ts.is_null(), "Invalid TS interface.");
+				CHECK_FALSE_MESSAGE(ts.is_null(), "Invalid TS interface.");
 
 				if (!ts->has_feature(TextServer::FEATURE_FONT_DYNAMIC)) {
 					continue;
@@ -52,7 +52,7 @@ TEST_SUITE("[TextServer]") {
 
 				RID font = ts->create_font();
 				ts->font_set_data_ptr(font, _font_NotoSans_Regular, _font_NotoSans_Regular_size);
-				TEST_FAIL_COND(font == RID(), "Loading font failed.");
+				CHECK_FALSE_MESSAGE(font == RID(), "Loading font failed.");
 				ts->free_rid(font);
 			}
 		}
@@ -60,7 +60,7 @@ TEST_SUITE("[TextServer]") {
 		SUBCASE("[TextServer] Text layout: Font fallback") {
 			for (int i = 0; i < TextServerManager::get_singleton()->get_interface_count(); i++) {
 				Ref<TextServer> ts = TextServerManager::get_singleton()->get_interface(i);
-				TEST_FAIL_COND(ts.is_null(), "Invalid TS interface.");
+				CHECK_FALSE_MESSAGE(ts.is_null(), "Invalid TS interface.");
 
 				if (!ts->has_feature(TextServer::FEATURE_FONT_DYNAMIC) || !ts->has_feature(TextServer::FEATURE_SIMPLE_LAYOUT)) {
 					continue;
@@ -79,26 +79,26 @@ TEST_SUITE("[TextServer]") {
 				//                 6^       17^
 
 				RID ctx = ts->create_shaped_text();
-				TEST_FAIL_COND(ctx == RID(), "Creating text buffer failed.");
+				CHECK_FALSE_MESSAGE(ctx == RID(), "Creating text buffer failed.");
 				bool ok = ts->shaped_text_add_string(ctx, test, font, 16);
-				TEST_FAIL_COND(!ok, "Adding text to the buffer failed.");
+				CHECK_FALSE_MESSAGE(!ok, "Adding text to the buffer failed.");
 
 				const Glyph *glyphs = ts->shaped_text_get_glyphs(ctx);
 				int gl_size = ts->shaped_text_get_glyph_count(ctx);
-				TEST_FAIL_COND(gl_size == 0, "Shaping failed");
+				CHECK_FALSE_MESSAGE(gl_size == 0, "Shaping failed");
 				for (int j = 0; j < gl_size; j++) {
 					if (glyphs[j].start < 6) {
-						TEST_FAIL_COND(glyphs[j].font_rid != font[1], "Incorrect font selected.");
+						CHECK_FALSE_MESSAGE(glyphs[j].font_rid != font[1], "Incorrect font selected.");
 					}
 					if ((glyphs[j].start > 6) && (glyphs[j].start < 16)) {
-						TEST_FAIL_COND(glyphs[j].font_rid != font[0], "Incorrect font selected.");
+						CHECK_FALSE_MESSAGE(glyphs[j].font_rid != font[0], "Incorrect font selected.");
 					}
 					if (glyphs[j].start > 16) {
-						TEST_FAIL_COND(glyphs[j].font_rid != RID(), "Incorrect font selected.");
-						TEST_FAIL_COND(glyphs[j].index != test[glyphs[j].start], "Incorrect glyph index.");
+						CHECK_FALSE_MESSAGE(glyphs[j].font_rid != RID(), "Incorrect font selected.");
+						CHECK_FALSE_MESSAGE(glyphs[j].index != test[glyphs[j].start], "Incorrect glyph index.");
 					}
-					TEST_FAIL_COND((glyphs[j].start < 0 || glyphs[j].end > test.length()), "Incorrect glyph range.");
-					TEST_FAIL_COND(glyphs[j].font_size != 16, "Incorrect glyph font size.");
+					CHECK_FALSE_MESSAGE((glyphs[j].start < 0 || glyphs[j].end > test.length()), "Incorrect glyph range.");
+					CHECK_FALSE_MESSAGE(glyphs[j].font_size != 16, "Incorrect glyph font size.");
 				}
 
 				ts->free_rid(ctx);
@@ -113,7 +113,7 @@ TEST_SUITE("[TextServer]") {
 		SUBCASE("[TextServer] Text layout: BiDi") {
 			for (int i = 0; i < TextServerManager::get_singleton()->get_interface_count(); i++) {
 				Ref<TextServer> ts = TextServerManager::get_singleton()->get_interface(i);
-				TEST_FAIL_COND(ts.is_null(), "Invalid TS interface.");
+				CHECK_FALSE_MESSAGE(ts.is_null(), "Invalid TS interface.");
 
 				if (!ts->has_feature(TextServer::FEATURE_FONT_DYNAMIC) || !ts->has_feature(TextServer::FEATURE_BIDI_LAYOUT)) {
 					continue;
@@ -132,23 +132,23 @@ TEST_SUITE("[TextServer]") {
 				//                    7^      26^
 
 				RID ctx = ts->create_shaped_text();
-				TEST_FAIL_COND(ctx == RID(), "Creating text buffer failed.");
+				CHECK_FALSE_MESSAGE(ctx == RID(), "Creating text buffer failed.");
 				bool ok = ts->shaped_text_add_string(ctx, test, font, 16);
-				TEST_FAIL_COND(!ok, "Adding text to the buffer failed.");
+				CHECK_FALSE_MESSAGE(!ok, "Adding text to the buffer failed.");
 
 				const Glyph *glyphs = ts->shaped_text_get_glyphs(ctx);
 				int gl_size = ts->shaped_text_get_glyph_count(ctx);
-				TEST_FAIL_COND(gl_size == 0, "Shaping failed");
+				CHECK_FALSE_MESSAGE(gl_size == 0, "Shaping failed");
 				for (int j = 0; j < gl_size; j++) {
 					if (glyphs[j].count > 0) {
 						if (glyphs[j].start < 7) {
-							TEST_FAIL_COND(((glyphs[j].flags & TextServer::GRAPHEME_IS_RTL) == TextServer::GRAPHEME_IS_RTL), "Incorrect direction.");
+							CHECK_FALSE_MESSAGE(((glyphs[j].flags & TextServer::GRAPHEME_IS_RTL) == TextServer::GRAPHEME_IS_RTL), "Incorrect direction.");
 						}
 						if ((glyphs[j].start > 8) && (glyphs[j].start < 23)) {
-							TEST_FAIL_COND(((glyphs[j].flags & TextServer::GRAPHEME_IS_RTL) != TextServer::GRAPHEME_IS_RTL), "Incorrect direction.");
+							CHECK_FALSE_MESSAGE(((glyphs[j].flags & TextServer::GRAPHEME_IS_RTL) != TextServer::GRAPHEME_IS_RTL), "Incorrect direction.");
 						}
 						if (glyphs[j].start > 26) {
-							TEST_FAIL_COND(((glyphs[j].flags & TextServer::GRAPHEME_IS_RTL) == TextServer::GRAPHEME_IS_RTL), "Incorrect direction.");
+							CHECK_FALSE_MESSAGE(((glyphs[j].flags & TextServer::GRAPHEME_IS_RTL) == TextServer::GRAPHEME_IS_RTL), "Incorrect direction.");
 						}
 					}
 				}
@@ -165,7 +165,7 @@ TEST_SUITE("[TextServer]") {
 		SUBCASE("[TextServer] Text layout: Line break and align points") {
 			for (int i = 0; i < TextServerManager::get_singleton()->get_interface_count(); i++) {
 				Ref<TextServer> ts = TextServerManager::get_singleton()->get_interface(i);
-				TEST_FAIL_COND(ts.is_null(), "Invalid TS interface.");
+				CHECK_FALSE_MESSAGE(ts.is_null(), "Invalid TS interface.");
 
 				if (!ts->has_feature(TextServer::FEATURE_FONT_DYNAMIC) || !ts->has_feature(TextServer::FEATURE_SIMPLE_LAYOUT)) {
 					continue;
@@ -186,16 +186,16 @@ TEST_SUITE("[TextServer]") {
 				{
 					String test = U"Test test long text long text\n";
 					RID ctx = ts->create_shaped_text();
-					TEST_FAIL_COND(ctx == RID(), "Creating text buffer failed.");
+					CHECK_FALSE_MESSAGE(ctx == RID(), "Creating text buffer failed.");
 					bool ok = ts->shaped_text_add_string(ctx, test, font, 16);
-					TEST_FAIL_COND(!ok, "Adding text to the buffer failed.");
+					CHECK_FALSE_MESSAGE(!ok, "Adding text to the buffer failed.");
 					ts->shaped_text_update_breaks(ctx);
 					ts->shaped_text_update_justification_ops(ctx);
 
 					const Glyph *glyphs = ts->shaped_text_get_glyphs(ctx);
 					int gl_size = ts->shaped_text_get_glyph_count(ctx);
 
-					TEST_FAIL_COND(gl_size != 30, "Invalid glyph count.");
+					CHECK_FALSE_MESSAGE(gl_size != 30, "Invalid glyph count.");
 					for (int j = 0; j < gl_size; j++) {
 						bool hard = (glyphs[j].flags & TextServer::GRAPHEME_IS_BREAK_HARD) == TextServer::GRAPHEME_IS_BREAK_HARD;
 						bool soft = (glyphs[j].flags & TextServer::GRAPHEME_IS_BREAK_SOFT) == TextServer::GRAPHEME_IS_BREAK_SOFT;
@@ -203,11 +203,11 @@ TEST_SUITE("[TextServer]") {
 						bool virt = (glyphs[j].flags & TextServer::GRAPHEME_IS_VIRTUAL) == TextServer::GRAPHEME_IS_VIRTUAL;
 						bool elo = (glyphs[j].flags & TextServer::GRAPHEME_IS_ELONGATION) == TextServer::GRAPHEME_IS_ELONGATION;
 						if (j == 4 || j == 9 || j == 14 || j == 19 || j == 24) {
-							TEST_FAIL_COND((!soft || !space || hard || virt || elo), "Invalid glyph flags.");
+							CHECK_FALSE_MESSAGE((!soft || !space || hard || virt || elo), "Invalid glyph flags.");
 						} else if (j == 29) {
-							TEST_FAIL_COND((soft || !space || !hard || virt || elo), "Invalid glyph flags.");
+							CHECK_FALSE_MESSAGE((soft || !space || !hard || virt || elo), "Invalid glyph flags.");
 						} else {
-							TEST_FAIL_COND((soft || space || hard || virt || elo), "Invalid glyph flags.");
+							CHECK_FALSE_MESSAGE((soft || space || hard || virt || elo), "Invalid glyph flags.");
 						}
 					}
 					ts->free_rid(ctx);
@@ -216,21 +216,63 @@ TEST_SUITE("[TextServer]") {
 				{
 					String test = U"الحمـد";
 					RID ctx = ts->create_shaped_text();
-					TEST_FAIL_COND(ctx == RID(), "Creating text buffer failed.");
+					CHECK_FALSE_MESSAGE(ctx == RID(), "Creating text buffer failed.");
 					bool ok = ts->shaped_text_add_string(ctx, test, font, 16);
-					TEST_FAIL_COND(!ok, "Adding text to the buffer failed.");
+					CHECK_FALSE_MESSAGE(!ok, "Adding text to the buffer failed.");
 					ts->shaped_text_update_breaks(ctx);
 
 					const Glyph *glyphs = ts->shaped_text_get_glyphs(ctx);
 					int gl_size = ts->shaped_text_get_glyph_count(ctx);
-					TEST_FAIL_COND(gl_size != 6, "Invalid glyph count.");
+					CHECK_FALSE_MESSAGE(gl_size != 6, "Invalid glyph count.");
 					for (int j = 0; j < gl_size; j++) {
 						bool hard = (glyphs[j].flags & TextServer::GRAPHEME_IS_BREAK_HARD) == TextServer::GRAPHEME_IS_BREAK_HARD;
 						bool soft = (glyphs[j].flags & TextServer::GRAPHEME_IS_BREAK_SOFT) == TextServer::GRAPHEME_IS_BREAK_SOFT;
 						bool space = (glyphs[j].flags & TextServer::GRAPHEME_IS_SPACE) == TextServer::GRAPHEME_IS_SPACE;
 						bool virt = (glyphs[j].flags & TextServer::GRAPHEME_IS_VIRTUAL) == TextServer::GRAPHEME_IS_VIRTUAL;
 						bool elo = (glyphs[j].flags & TextServer::GRAPHEME_IS_ELONGATION) == TextServer::GRAPHEME_IS_ELONGATION;
-						TEST_FAIL_COND((soft || space || hard || virt || elo), "Invalid glyph flags.");
+						CHECK_FALSE_MESSAGE((soft || space || hard || virt || elo), "Invalid glyph flags.");
+					}
+					if (ts->has_feature(TextServer::FEATURE_KASHIDA_JUSTIFICATION)) {
+						ts->shaped_text_update_justification_ops(ctx);
+
+						glyphs = ts->shaped_text_get_glyphs(ctx);
+						gl_size = ts->shaped_text_get_glyph_count(ctx);
+
+						CHECK_FALSE_MESSAGE(gl_size != 6, "Invalid glyph count.");
+						for (int j = 0; j < gl_size; j++) {
+							bool hard = (glyphs[j].flags & TextServer::GRAPHEME_IS_BREAK_HARD) == TextServer::GRAPHEME_IS_BREAK_HARD;
+							bool soft = (glyphs[j].flags & TextServer::GRAPHEME_IS_BREAK_SOFT) == TextServer::GRAPHEME_IS_BREAK_SOFT;
+							bool space = (glyphs[j].flags & TextServer::GRAPHEME_IS_SPACE) == TextServer::GRAPHEME_IS_SPACE;
+							bool virt = (glyphs[j].flags & TextServer::GRAPHEME_IS_VIRTUAL) == TextServer::GRAPHEME_IS_VIRTUAL;
+							bool elo = (glyphs[j].flags & TextServer::GRAPHEME_IS_ELONGATION) == TextServer::GRAPHEME_IS_ELONGATION;
+							if (j == 1) {
+								CHECK_FALSE_MESSAGE((soft || space || hard || virt || !elo), "Invalid glyph flags.");
+							} else {
+								CHECK_FALSE_MESSAGE((soft || space || hard || virt || elo), "Invalid glyph flags.");
+							}
+						}
+					}
+					ts->free_rid(ctx);
+				}
+
+				{
+					String test = U"الحمد";
+					RID ctx = ts->create_shaped_text();
+					CHECK_FALSE_MESSAGE(ctx == RID(), "Creating text buffer failed.");
+					bool ok = ts->shaped_text_add_string(ctx, test, font, 16);
+					CHECK_FALSE_MESSAGE(!ok, "Adding text to the buffer failed.");
+					ts->shaped_text_update_breaks(ctx);
+
+					const Glyph *glyphs = ts->shaped_text_get_glyphs(ctx);
+					int gl_size = ts->shaped_text_get_glyph_count(ctx);
+					CHECK_FALSE_MESSAGE(gl_size != 5, "Invalid glyph count.");
+					for (int j = 0; j < gl_size; j++) {
+						bool hard = (glyphs[j].flags & TextServer::GRAPHEME_IS_BREAK_HARD) == TextServer::GRAPHEME_IS_BREAK_HARD;
+						bool soft = (glyphs[j].flags & TextServer::GRAPHEME_IS_BREAK_SOFT) == TextServer::GRAPHEME_IS_BREAK_SOFT;
+						bool space = (glyphs[j].flags & TextServer::GRAPHEME_IS_SPACE) == TextServer::GRAPHEME_IS_SPACE;
+						bool virt = (glyphs[j].flags & TextServer::GRAPHEME_IS_VIRTUAL) == TextServer::GRAPHEME_IS_VIRTUAL;
+						bool elo = (glyphs[j].flags & TextServer::GRAPHEME_IS_ELONGATION) == TextServer::GRAPHEME_IS_ELONGATION;
+						CHECK_FALSE_MESSAGE((soft || space || hard || virt || elo), "Invalid glyph flags.");
 					}
 
 					if (ts->has_feature(TextServer::FEATURE_KASHIDA_JUSTIFICATION)) {
@@ -239,7 +281,7 @@ TEST_SUITE("[TextServer]") {
 						glyphs = ts->shaped_text_get_glyphs(ctx);
 						gl_size = ts->shaped_text_get_glyph_count(ctx);
 
-						TEST_FAIL_COND(gl_size != 6, "Invalid glyph count.");
+						CHECK_FALSE_MESSAGE(gl_size != 6, "Invalid glyph count.");
 						for (int j = 0; j < gl_size; j++) {
 							bool hard = (glyphs[j].flags & TextServer::GRAPHEME_IS_BREAK_HARD) == TextServer::GRAPHEME_IS_BREAK_HARD;
 							bool soft = (glyphs[j].flags & TextServer::GRAPHEME_IS_BREAK_SOFT) == TextServer::GRAPHEME_IS_BREAK_SOFT;
@@ -247,9 +289,9 @@ TEST_SUITE("[TextServer]") {
 							bool virt = (glyphs[j].flags & TextServer::GRAPHEME_IS_VIRTUAL) == TextServer::GRAPHEME_IS_VIRTUAL;
 							bool elo = (glyphs[j].flags & TextServer::GRAPHEME_IS_ELONGATION) == TextServer::GRAPHEME_IS_ELONGATION;
 							if (j == 1) {
-								TEST_FAIL_COND((soft || space || hard || virt || !elo), "Invalid glyph flags.");
+								CHECK_FALSE_MESSAGE((soft || space || hard || !virt || !elo), "Invalid glyph flags.");
 							} else {
-								TEST_FAIL_COND((soft || space || hard || virt || elo), "Invalid glyph flags.");
+								CHECK_FALSE_MESSAGE((soft || space || hard || virt || elo), "Invalid glyph flags.");
 							}
 						}
 					}
@@ -259,15 +301,15 @@ TEST_SUITE("[TextServer]") {
 				{
 					String test = U"الحمـد الرياضي العربي";
 					RID ctx = ts->create_shaped_text();
-					TEST_FAIL_COND(ctx == RID(), "Creating text buffer failed.");
+					CHECK_FALSE_MESSAGE(ctx == RID(), "Creating text buffer failed.");
 					bool ok = ts->shaped_text_add_string(ctx, test, font, 16);
-					TEST_FAIL_COND(!ok, "Adding text to the buffer failed.");
+					CHECK_FALSE_MESSAGE(!ok, "Adding text to the buffer failed.");
 					ts->shaped_text_update_breaks(ctx);
 
 					const Glyph *glyphs = ts->shaped_text_get_glyphs(ctx);
 					int gl_size = ts->shaped_text_get_glyph_count(ctx);
 
-					TEST_FAIL_COND(gl_size != 21, "Invalid glyph count.");
+					CHECK_FALSE_MESSAGE(gl_size != 21, "Invalid glyph count.");
 					for (int j = 0; j < gl_size; j++) {
 						bool hard = (glyphs[j].flags & TextServer::GRAPHEME_IS_BREAK_HARD) == TextServer::GRAPHEME_IS_BREAK_HARD;
 						bool soft = (glyphs[j].flags & TextServer::GRAPHEME_IS_BREAK_SOFT) == TextServer::GRAPHEME_IS_BREAK_SOFT;
@@ -275,9 +317,9 @@ TEST_SUITE("[TextServer]") {
 						bool virt = (glyphs[j].flags & TextServer::GRAPHEME_IS_VIRTUAL) == TextServer::GRAPHEME_IS_VIRTUAL;
 						bool elo = (glyphs[j].flags & TextServer::GRAPHEME_IS_ELONGATION) == TextServer::GRAPHEME_IS_ELONGATION;
 						if (j == 6 || j == 14) {
-							TEST_FAIL_COND((!soft || !space || hard || virt || elo), "Invalid glyph flags.");
+							CHECK_FALSE_MESSAGE((!soft || !space || hard || virt || elo), "Invalid glyph flags.");
 						} else {
-							TEST_FAIL_COND((soft || space || hard || virt || elo), "Invalid glyph flags.");
+							CHECK_FALSE_MESSAGE((soft || space || hard || virt || elo), "Invalid glyph flags.");
 						}
 					}
 
@@ -287,7 +329,7 @@ TEST_SUITE("[TextServer]") {
 						glyphs = ts->shaped_text_get_glyphs(ctx);
 						gl_size = ts->shaped_text_get_glyph_count(ctx);
 
-						TEST_FAIL_COND(gl_size != 23, "Invalid glyph count.");
+						CHECK_FALSE_MESSAGE(gl_size != 23, "Invalid glyph count.");
 						for (int j = 0; j < gl_size; j++) {
 							bool hard = (glyphs[j].flags & TextServer::GRAPHEME_IS_BREAK_HARD) == TextServer::GRAPHEME_IS_BREAK_HARD;
 							bool soft = (glyphs[j].flags & TextServer::GRAPHEME_IS_BREAK_SOFT) == TextServer::GRAPHEME_IS_BREAK_SOFT;
@@ -295,13 +337,13 @@ TEST_SUITE("[TextServer]") {
 							bool virt = (glyphs[j].flags & TextServer::GRAPHEME_IS_VIRTUAL) == TextServer::GRAPHEME_IS_VIRTUAL;
 							bool elo = (glyphs[j].flags & TextServer::GRAPHEME_IS_ELONGATION) == TextServer::GRAPHEME_IS_ELONGATION;
 							if (j == 7 || j == 16) {
-								TEST_FAIL_COND((!soft || !space || hard || virt || elo), "Invalid glyph flags.");
+								CHECK_FALSE_MESSAGE((!soft || !space || hard || virt || elo), "Invalid glyph flags.");
 							} else if (j == 3 || j == 9) {
-								TEST_FAIL_COND((soft || space || hard || !virt || !elo), "Invalid glyph flags.");
+								CHECK_FALSE_MESSAGE((soft || space || hard || !virt || !elo), "Invalid glyph flags.");
 							} else if (j == 18) {
-								TEST_FAIL_COND((soft || space || hard || virt || !elo), "Invalid glyph flags.");
+								CHECK_FALSE_MESSAGE((soft || space || hard || virt || !elo), "Invalid glyph flags.");
 							} else {
-								TEST_FAIL_COND((soft || space || hard || virt || elo), "Invalid glyph flags.");
+								CHECK_FALSE_MESSAGE((soft || space || hard || virt || elo), "Invalid glyph flags.");
 							}
 						}
 					}
@@ -312,16 +354,16 @@ TEST_SUITE("[TextServer]") {
 				{
 					String test = U"เป็น ภาษา ราช�าร �ละ ภาษา";
 					RID ctx = ts->create_shaped_text();
-					TEST_FAIL_COND(ctx == RID(), "Creating text buffer failed.");
+					CHECK_FALSE_MESSAGE(ctx == RID(), "Creating text buffer failed.");
 					bool ok = ts->shaped_text_add_string(ctx, test, font, 16);
-					TEST_FAIL_COND(!ok, "Adding text to the buffer failed.");
+					CHECK_FALSE_MESSAGE(!ok, "Adding text to the buffer failed.");
 					ts->shaped_text_update_breaks(ctx);
 					ts->shaped_text_update_justification_ops(ctx);
 
 					const Glyph *glyphs = ts->shaped_text_get_glyphs(ctx);
 					int gl_size = ts->shaped_text_get_glyph_count(ctx);
 
-					TEST_FAIL_COND(gl_size != 25, "Invalid glyph count.");
+					CHECK_FALSE_MESSAGE(gl_size != 25, "Invalid glyph count.");
 					for (int j = 0; j < gl_size; j++) {
 						bool hard = (glyphs[j].flags & TextServer::GRAPHEME_IS_BREAK_HARD) == TextServer::GRAPHEME_IS_BREAK_HARD;
 						bool soft = (glyphs[j].flags & TextServer::GRAPHEME_IS_BREAK_SOFT) == TextServer::GRAPHEME_IS_BREAK_SOFT;
@@ -329,9 +371,9 @@ TEST_SUITE("[TextServer]") {
 						bool virt = (glyphs[j].flags & TextServer::GRAPHEME_IS_VIRTUAL) == TextServer::GRAPHEME_IS_VIRTUAL;
 						bool elo = (glyphs[j].flags & TextServer::GRAPHEME_IS_ELONGATION) == TextServer::GRAPHEME_IS_ELONGATION;
 						if (j == 4 || j == 9 || j == 16 || j == 20) {
-							TEST_FAIL_COND((!soft || !space || hard || virt || elo), "Invalid glyph flags.");
+							CHECK_FALSE_MESSAGE((!soft || !space || hard || virt || elo), "Invalid glyph flags.");
 						} else {
-							TEST_FAIL_COND((soft || space || hard || virt || elo), "Invalid glyph flags.");
+							CHECK_FALSE_MESSAGE((soft || space || hard || virt || elo), "Invalid glyph flags.");
 						}
 					}
 					ts->free_rid(ctx);
@@ -340,16 +382,16 @@ TEST_SUITE("[TextServer]") {
 				if (ts->has_feature(TextServer::FEATURE_BREAK_ITERATORS)) {
 					String test = U"เป็นภาษาราช�าร�ละภาษา";
 					RID ctx = ts->create_shaped_text();
-					TEST_FAIL_COND(ctx == RID(), "Creating text buffer failed.");
+					CHECK_FALSE_MESSAGE(ctx == RID(), "Creating text buffer failed.");
 					bool ok = ts->shaped_text_add_string(ctx, test, font, 16);
-					TEST_FAIL_COND(!ok, "Adding text to the buffer failed.");
+					CHECK_FALSE_MESSAGE(!ok, "Adding text to the buffer failed.");
 					ts->shaped_text_update_breaks(ctx);
 					ts->shaped_text_update_justification_ops(ctx);
 
 					const Glyph *glyphs = ts->shaped_text_get_glyphs(ctx);
 					int gl_size = ts->shaped_text_get_glyph_count(ctx);
 
-					TEST_FAIL_COND(gl_size != 25, "Invalid glyph count.");
+					CHECK_FALSE_MESSAGE(gl_size != 25, "Invalid glyph count.");
 					for (int j = 0; j < gl_size; j++) {
 						bool hard = (glyphs[j].flags & TextServer::GRAPHEME_IS_BREAK_HARD) == TextServer::GRAPHEME_IS_BREAK_HARD;
 						bool soft = (glyphs[j].flags & TextServer::GRAPHEME_IS_BREAK_SOFT) == TextServer::GRAPHEME_IS_BREAK_SOFT;
@@ -357,9 +399,9 @@ TEST_SUITE("[TextServer]") {
 						bool virt = (glyphs[j].flags & TextServer::GRAPHEME_IS_VIRTUAL) == TextServer::GRAPHEME_IS_VIRTUAL;
 						bool elo = (glyphs[j].flags & TextServer::GRAPHEME_IS_ELONGATION) == TextServer::GRAPHEME_IS_ELONGATION;
 						if (j == 4 || j == 9 || j == 16 || j == 20) {
-							TEST_FAIL_COND((!soft || !space || hard || !virt || elo), "Invalid glyph flags.");
+							CHECK_FALSE_MESSAGE((!soft || !space || hard || !virt || elo), "Invalid glyph flags.");
 						} else {
-							TEST_FAIL_COND((soft || space || hard || virt || elo), "Invalid glyph flags.");
+							CHECK_FALSE_MESSAGE((soft || space || hard || virt || elo), "Invalid glyph flags.");
 						}
 					}
 					ts->free_rid(ctx);
@@ -375,7 +417,7 @@ TEST_SUITE("[TextServer]") {
 		SUBCASE("[TextServer] Text layout: Line breaking") {
 			for (int i = 0; i < TextServerManager::get_singleton()->get_interface_count(); i++) {
 				Ref<TextServer> ts = TextServerManager::get_singleton()->get_interface(i);
-				TEST_FAIL_COND(ts.is_null(), "Invalid TS interface.");
+				CHECK_FALSE_MESSAGE(ts.is_null(), "Invalid TS interface.");
 
 				if (!ts->has_feature(TextServer::FEATURE_FONT_DYNAMIC) || !ts->has_feature(TextServer::FEATURE_SIMPLE_LAYOUT)) {
 					continue;
@@ -394,21 +436,21 @@ TEST_SUITE("[TextServer]") {
 				font.push_back(font2);
 
 				RID ctx = ts->create_shaped_text();
-				TEST_FAIL_COND(ctx == RID(), "Creating text buffer failed.");
+				CHECK_FALSE_MESSAGE(ctx == RID(), "Creating text buffer failed.");
 				bool ok = ts->shaped_text_add_string(ctx, test_1, font, 16);
-				TEST_FAIL_COND(!ok, "Adding text to the buffer failed.");
+				CHECK_FALSE_MESSAGE(!ok, "Adding text to the buffer failed.");
 
 				PackedInt32Array brks = ts->shaped_text_get_line_breaks(ctx, 1);
-				TEST_FAIL_COND(brks.size() != 6, "Invalid line breaks number.");
+				CHECK_FALSE_MESSAGE(brks.size() != 6, "Invalid line breaks number.");
 				if (brks.size() == 6) {
-					TEST_FAIL_COND(brks[0] != 0, "Invalid line break position.");
-					TEST_FAIL_COND(brks[1] != 5, "Invalid line break position.");
+					CHECK_FALSE_MESSAGE(brks[0] != 0, "Invalid line break position.");
+					CHECK_FALSE_MESSAGE(brks[1] != 5, "Invalid line break position.");
 
-					TEST_FAIL_COND(brks[2] != 5, "Invalid line break position.");
-					TEST_FAIL_COND(brks[3] != 10, "Invalid line break position.");
+					CHECK_FALSE_MESSAGE(brks[2] != 5, "Invalid line break position.");
+					CHECK_FALSE_MESSAGE(brks[3] != 10, "Invalid line break position.");
 
-					TEST_FAIL_COND(brks[4] != 10, "Invalid line break position.");
-					TEST_FAIL_COND(brks[5] != 14, "Invalid line break position.");
+					CHECK_FALSE_MESSAGE(brks[4] != 10, "Invalid line break position.");
+					CHECK_FALSE_MESSAGE(brks[5] != 14, "Invalid line break position.");
 				}
 
 				ts->free_rid(ctx);
@@ -423,7 +465,7 @@ TEST_SUITE("[TextServer]") {
 		SUBCASE("[TextServer] Text layout: Justification") {
 			for (int i = 0; i < TextServerManager::get_singleton()->get_interface_count(); i++) {
 				Ref<TextServer> ts = TextServerManager::get_singleton()->get_interface(i);
-				TEST_FAIL_COND(ts.is_null(), "Invalid TS interface.");
+				CHECK_FALSE_MESSAGE(ts.is_null(), "Invalid TS interface.");
 
 				if (!ts->has_feature(TextServer::FEATURE_FONT_DYNAMIC) || !ts->has_feature(TextServer::FEATURE_SIMPLE_LAYOUT)) {
 					continue;
@@ -448,40 +490,40 @@ TEST_SUITE("[TextServer]") {
 				float width_old, width;
 				if (ts->has_feature(TextServer::FEATURE_KASHIDA_JUSTIFICATION)) {
 					ctx = ts->create_shaped_text();
-					TEST_FAIL_COND(ctx == RID(), "Creating text buffer failed.");
+					CHECK_FALSE_MESSAGE(ctx == RID(), "Creating text buffer failed.");
 					ok = ts->shaped_text_add_string(ctx, test_1, font, 16);
-					TEST_FAIL_COND(!ok, "Adding text to the buffer failed.");
+					CHECK_FALSE_MESSAGE(!ok, "Adding text to the buffer failed.");
 
 					width_old = ts->shaped_text_get_width(ctx);
 					width = ts->shaped_text_fit_to_width(ctx, 100, TextServer::JUSTIFICATION_WORD_BOUND);
-					TEST_FAIL_COND((width != width_old), "Invalid fill width.");
+					CHECK_FALSE_MESSAGE((width != width_old), "Invalid fill width.");
 					width = ts->shaped_text_fit_to_width(ctx, 100, TextServer::JUSTIFICATION_WORD_BOUND | TextServer::JUSTIFICATION_KASHIDA);
-					TEST_FAIL_COND((width <= width_old || width > 100), "Invalid fill width.");
+					CHECK_FALSE_MESSAGE((width <= width_old || width > 100), "Invalid fill width.");
 
 					ts->free_rid(ctx);
 
 					ctx = ts->create_shaped_text();
-					TEST_FAIL_COND(ctx == RID(), "Creating text buffer failed.");
+					CHECK_FALSE_MESSAGE(ctx == RID(), "Creating text buffer failed.");
 					ok = ts->shaped_text_add_string(ctx, test_2, font, 16);
-					TEST_FAIL_COND(!ok, "Adding text to the buffer failed.");
+					CHECK_FALSE_MESSAGE(!ok, "Adding text to the buffer failed.");
 
 					width_old = ts->shaped_text_get_width(ctx);
 					width = ts->shaped_text_fit_to_width(ctx, 100, TextServer::JUSTIFICATION_WORD_BOUND);
-					TEST_FAIL_COND((width <= width_old || width > 100), "Invalid fill width.");
+					CHECK_FALSE_MESSAGE((width <= width_old || width > 100), "Invalid fill width.");
 					width = ts->shaped_text_fit_to_width(ctx, 100, TextServer::JUSTIFICATION_WORD_BOUND | TextServer::JUSTIFICATION_KASHIDA);
-					TEST_FAIL_COND((width <= width_old || width > 100), "Invalid fill width.");
+					CHECK_FALSE_MESSAGE((width <= width_old || width > 100), "Invalid fill width.");
 
 					ts->free_rid(ctx);
 				}
 
 				ctx = ts->create_shaped_text();
-				TEST_FAIL_COND(ctx == RID(), "Creating text buffer failed.");
+				CHECK_FALSE_MESSAGE(ctx == RID(), "Creating text buffer failed.");
 				ok = ts->shaped_text_add_string(ctx, test_3, font, 16);
-				TEST_FAIL_COND(!ok, "Adding text to the buffer failed.");
+				CHECK_FALSE_MESSAGE(!ok, "Adding text to the buffer failed.");
 
 				width_old = ts->shaped_text_get_width(ctx);
 				width = ts->shaped_text_fit_to_width(ctx, 100, TextServer::JUSTIFICATION_WORD_BOUND);
-				TEST_FAIL_COND((width <= width_old || width > 100), "Invalid fill width.");
+				CHECK_FALSE_MESSAGE((width <= width_old || width > 100), "Invalid fill width.");
 
 				ts->free_rid(ctx);
 
@@ -495,7 +537,7 @@ TEST_SUITE("[TextServer]") {
 		SUBCASE("[TextServer] Unicode identifiers") {
 			for (int i = 0; i < TextServerManager::get_singleton()->get_interface_count(); i++) {
 				Ref<TextServer> ts = TextServerManager::get_singleton()->get_interface(i);
-				TEST_FAIL_COND(ts.is_null(), "Invalid TS interface.");
+				CHECK_FALSE_MESSAGE(ts.is_null(), "Invalid TS interface.");
 
 				static const char32_t *data[19] = { U"-30", U"100", U"10.1", U"10,1", U"1e2", U"1e-2", U"1e2e3", U"0xAB", U"AB", U"Test1", U"1Test", U"Test*1", U"test_testeT", U"test_tes teT", U"عَلَيْك�مْ", U"عَلَيْك�مْTest", U"ӒӖӚӜ", U"_test", U"ÂÃÄÅĀĂĄÇĆĈĊ" };
 				static bool isid[19] = { false, false, false, false, false, false, false, false, true, true, false, false, true, false, true, true, true, true, true };
@@ -516,7 +558,7 @@ TEST_SUITE("[TextServer]") {
 		SUBCASE("[TextServer] Strip Diacritics") {
 			for (int i = 0; i < TextServerManager::get_singleton()->get_interface_count(); i++) {
 				Ref<TextServer> ts = TextServerManager::get_singleton()->get_interface(i);
-				TEST_FAIL_COND(ts.is_null(), "Invalid TS interface.");
+				CHECK_FALSE_MESSAGE(ts.is_null(), "Invalid TS interface.");
 
 				if (ts->has_feature(TextServer::FEATURE_SHAPING)) {
 					CHECK(ts->strip_diacritics(U"ٱلسَّلَام� عَلَيْك�مْ") == U"ٱلسلام عليكم");
@@ -544,7 +586,7 @@ TEST_SUITE("[TextServer]") {
 					continue;
 				}
 
-				TEST_FAIL_COND(ts.is_null(), "Invalid TS interface.");
+				CHECK_FALSE_MESSAGE(ts.is_null(), "Invalid TS interface.");
 				{
 					String text1 = U"linguistically similar and effectively form";
 					//                           14^     22^ 26^         38^
diff --git a/tests/test_main.cpp b/tests/test_main.cpp
index d533ce4f63..3d186711cb 100644
--- a/tests/test_main.cpp
+++ b/tests/test_main.cpp
@@ -30,6 +30,8 @@
 
 #include "test_main.h"
 
+#include "tests/core/input/test_input_event_key.h"
+#include "tests/core/input/test_shortcut.h"
 #include "tests/core/io/test_config_file.h"
 #include "tests/core/io/test_file_access.h"
 #include "tests/core/io/test_image.h"
@@ -46,6 +48,7 @@
 #include "tests/core/math/test_geometry_2d.h"
 #include "tests/core/math/test_geometry_3d.h"
 #include "tests/core/math/test_plane.h"
+#include "tests/core/math/test_quaternion.h"
 #include "tests/core/math/test_random_number_generator.h"
 #include "tests/core/math/test_rect2.h"
 #include "tests/core/math/test_rect2i.h"
@@ -55,6 +58,8 @@
 #include "tests/core/math/test_vector2i.h"
 #include "tests/core/math/test_vector3.h"
 #include "tests/core/math/test_vector3i.h"
+#include "tests/core/math/test_vector4.h"
+#include "tests/core/math/test_vector4i.h"
 #include "tests/core/object/test_class_db.h"
 #include "tests/core/object/test_method_bind.h"
 #include "tests/core/object/test_object.h"
@@ -69,6 +74,7 @@
 #include "tests/core/templates/test_local_vector.h"
 #include "tests/core/templates/test_lru.h"
 #include "tests/core/templates/test_paged_array.h"
+#include "tests/core/templates/test_rid.h"
 #include "tests/core/templates/test_vector.h"
 #include "tests/core/test_crypto.h"
 #include "tests/core/test_hashing_context.h"
@@ -78,10 +84,12 @@
 #include "tests/core/variant/test_dictionary.h"
 #include "tests/core/variant/test_variant.h"
 #include "tests/scene/test_animation.h"
+#include "tests/scene/test_audio_stream_wav.h"
 #include "tests/scene/test_code_edit.h"
 #include "tests/scene/test_curve.h"
 #include "tests/scene/test_gradient.h"
 #include "tests/scene/test_path_3d.h"
+#include "tests/scene/test_sprite_frames.h"
 #include "tests/scene/test_text_edit.h"
 #include "tests/scene/test_theme.h"
 #include "tests/servers/test_text_server.h"
@@ -215,6 +223,15 @@ struct GodotTestCaseListener : public doctest::IReporter {
 			SceneTree::get_singleton()->initialize();
 			return;
 		}
+
+		if (name.find("Audio") != -1) {
+			// The last driver index should always be the dummy driver.
+			int dummy_idx = AudioDriverManager::get_driver_count() - 1;
+			AudioDriverManager::initialize(dummy_idx);
+			AudioServer *audio_server = memnew(AudioServer);
+			audio_server->init();
+			return;
+		}
 	}
 
 	void test_case_end(const doctest::CurrentTestCaseStats &) override {
@@ -277,6 +294,11 @@ struct GodotTestCaseListener : public doctest::IReporter {
 			MessageQueue::get_singleton()->flush();
 			memdelete(MessageQueue::get_singleton());
 		}
+
+		if (AudioServer::get_singleton()) {
+			AudioServer::get_singleton()->finish();
+			memdelete(AudioServer::get_singleton());
+		}
 	}
 
 	void test_run_start() override {
diff --git a/thirdparty/README.md b/thirdparty/README.md
index 6db011d3c6..664401fca6 100644
--- a/thirdparty/README.md
+++ b/thirdparty/README.md
@@ -44,7 +44,7 @@ Files extracted from upstream source:
 ## certs
 
 - Upstream: Mozilla, via https://github.com/bagder/ca-bundle
-- Version: git (8b263a18fca98ea371e54227837321c5cdaa1ba7, 2021)
+- Version: git (7f33e7eb8472dbcf31fdcf50cd216c89a282825d, 2022)
 - License: MPL 2.0
 
 
@@ -213,7 +213,7 @@ Files extracted from upstream source:
 ## harfbuzz
 
 - Upstream: https://github.com/harfbuzz/harfbuzz
-- Version: 5.0.1 (cbccadba8d1e51d6cc03a891b7c3a17f598e774c, 2022)
+- Version: 5.1.0 (f1f2be776bcd994fa9262622e1a7098a066e5cf7, 2022)
 - License: MIT
 
 Files extracted from upstream source:
@@ -599,7 +599,7 @@ Godot. See the patch in the `patches` folder for details.
 ## spirv-reflect
 
 - Upstream: https://github.com/KhronosGroup/SPIRV-Reflect
-- Version: git (1aceb6af56e74b92a00378842dda5c5a73f49a4b, 2022)
+- Version: git (1ef99b09fa7ce5aee2c5cf70c61a4f7458d27e09, 2022)
 - License: Apache 2.0
 
 Does not track Vulkan SDK releases closely, but try to package a commit newer
diff --git a/thirdparty/certs/ca-certificates.crt b/thirdparty/certs/ca-certificates.crt
index e218b024d0..036f630d5b 100644
--- a/thirdparty/certs/ca-certificates.crt
+++ b/thirdparty/certs/ca-certificates.crt
@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Thu Mar 31 08:10:21 2022 GMT
+## Certificate data from Mozilla as of: Tue Jul 19 14:20:01 2022 GMT
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -14,7 +14,7 @@
 ## Just configure this file as the SSLCACertificateFile.
 ##
 ## Conversion done with mk-ca-bundle.pl version 1.29.
-## SHA256: d59c5c83ce7a7635fa95521d8d245677949b86d5574bfcc6f855b6a48f2d5566
+## SHA256: 9bf3799611fb58197f61d45e71ce3dc19f30e7dd73731915872ce5108a7bb066
 ##
 
 
@@ -993,30 +993,6 @@ tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
 mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
 -----END CERTIFICATE-----
 
-Hellenic Academic and Research Institutions RootCA 2011
-=======================================================
------BEGIN CERTIFICATE-----
-MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT
-O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y
-aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
-IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT
-AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
-IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo
-IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI
-1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa
-71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u
-8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH
-3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/
-MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8
-MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu
-b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt
-XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
-TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD
-/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N
-7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4
------END CERTIFICATE-----
-
 Actalis Authentication Root CA
 ==============================
 -----BEGIN CERTIFICATE-----
@@ -3279,3 +3255,206 @@ PsVq8JQdjDAKBggqhkjOPQQDAwNpADBmAjEA6ED/g94D9J+uHXqnLrmvT/aDHQ4thQEd0dlq7A/C
 r8deVl5c1RxYIigL9zC2L7F8AjEA8GE8p/SgguMh1YQdc4acLa/KNJvxn7kjNuK8YAOdgLOaVsjh
 4rsUecrNIdSUtUlD
 -----END CERTIFICATE-----
+
+Telia Root CA v2
+================
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIPAWdfJ9b+euPkrL4JWwWeMA0GCSqGSIb3DQEBCwUAMEQxCzAJBgNVBAYT
+AkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEZMBcGA1UEAwwQVGVsaWEgUm9vdCBDQSB2
+MjAeFw0xODExMjkxMTU1NTRaFw00MzExMjkxMTU1NTRaMEQxCzAJBgNVBAYTAkZJMRowGAYDVQQK
+DBFUZWxpYSBGaW5sYW5kIE95ajEZMBcGA1UEAwwQVGVsaWEgUm9vdCBDQSB2MjCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBALLQPwe84nvQa5n44ndp586dpAO8gm2h/oFlH0wnrI4AuhZ7
+6zBqAMCzdGh+sq/H1WKzej9Qyow2RCRj0jbpDIX2Q3bVTKFgcmfiKDOlyzG4OiIjNLh9vVYiQJ3q
+9HsDrWj8soFPmNB06o3lfc1jw6P23pLCWBnglrvFxKk9pXSW/q/5iaq9lRdU2HhE8Qx3FZLgmEKn
+pNaqIJLNwaCzlrI6hEKNfdWV5Nbb6WLEWLN5xYzTNTODn3WhUidhOPFZPY5Q4L15POdslv5e2QJl
+tI5c0BE0312/UqeBAMN/mUWZFdUXyApT7GPzmX3MaRKGwhfwAZ6/hLzRUssbkmbOpFPlob/E2wnW
+5olWK8jjfN7j/4nlNW4o6GwLI1GpJQXrSPjdscr6bAhR77cYbETKJuFzxokGgeWKrLDiKca5JLNr
+RBH0pUPCTEPlcDaMtjNXepUugqD0XBCzYYP2AgWGLnwtbNwDRm41k9V6lS/eINhbfpSQBGq6WT0E
+BXWdN6IOLj3rwaRSg/7Qa9RmjtzG6RJOHSpXqhC8fF6CfaamyfItufUXJ63RDolUK5X6wK0dmBR4
+M0KGCqlztft0DbcbMBnEWg4cJ7faGND/isgFuvGqHKI3t+ZIpEYslOqodmJHixBTB0hXbOKSTbau
+BcvcwUpej6w9GU7C7WB1K9vBykLVAgMBAAGjYzBhMB8GA1UdIwQYMBaAFHKs5DN5qkWH9v2sHZ7W
+xy+G2CQ5MB0GA1UdDgQWBBRyrOQzeapFh/b9rB2e1scvhtgkOTAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAoDtZpwmUPjaE0n4vOaWWl/oRrfxn83EJ
+8rKJhGdEr7nv7ZbsnGTbMjBvZ5qsfl+yqwE2foH65IRe0qw24GtixX1LDoJt0nZi0f6X+J8wfBj5
+tFJ3gh1229MdqfDBmgC9bXXYfef6xzijnHDoRnkDry5023X4blMMA8iZGok1GTzTyVR8qPAs5m4H
+eW9q4ebqkYJpCh3DflminmtGFZhb069GHWLIzoBSSRE/yQQSwxN8PzuKlts8oB4KtItUsiRnDe+C
+y748fdHif64W1lZYudogsYMVoe+KTTJvQS8TUoKU1xrBeKJR3Stwbbca+few4GeXVtt8YVMJAygC
+QMez2P2ccGrGKMOF6eLtGpOg3kuYooQ+BXcBlj37tCAPnHICehIv1aO6UXivKitEZU61/Qrowc15
+h2Er3oBXRb9n8ZuRXqWk7FlIEA04x7D6w0RtBPV4UBySllva9bguulvP5fBqnUsvWHMtTy3EHD70
+sz+rFQ47GUGKpMFXEmZxTPpT41frYpUJnlTd0cI8Vzy9OK2YZLe4A5pTVmBds9hCG1xLEooc6+t9
+xnppxyd/pPiL8uSUZodL6ZQHCRJ5irLrdATczvREWeAWysUsWNc8e89ihmpQfTU2Zqf7N+cox9jQ
+raVplI/owd8k+BsHMYeB2F326CjYSlKArBPuUBQemMc=
+-----END CERTIFICATE-----
+
+D-TRUST BR Root CA 1 2020
+=========================
+-----BEGIN CERTIFICATE-----
+MIIC2zCCAmCgAwIBAgIQfMmPK4TX3+oPyWWa00tNljAKBggqhkjOPQQDAzBIMQswCQYDVQQGEwJE
+RTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlELVRSVVNUIEJSIFJvb3QgQ0EgMSAy
+MDIwMB4XDTIwMDIxMTA5NDUwMFoXDTM1MDIxMTA5NDQ1OVowSDELMAkGA1UEBhMCREUxFTATBgNV
+BAoTDEQtVHJ1c3QgR21iSDEiMCAGA1UEAxMZRC1UUlVTVCBCUiBSb290IENBIDEgMjAyMDB2MBAG
+ByqGSM49AgEGBSuBBAAiA2IABMbLxyjR+4T1mu9CFCDhQ2tuda38KwOE1HaTJddZO0Flax7mNCq7
+dPYSzuht56vkPE4/RAiLzRZxy7+SmfSk1zxQVFKQhYN4lGdnoxwJGT11NIXe7WB9xwy0QVK5buXu
+QqOCAQ0wggEJMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFHOREKv/VbNafAkl1bK6CKBrqx9t
+MA4GA1UdDwEB/wQEAwIBBjCBxgYDVR0fBIG+MIG7MD6gPKA6hjhodHRwOi8vY3JsLmQtdHJ1c3Qu
+bmV0L2NybC9kLXRydXN0X2JyX3Jvb3RfY2FfMV8yMDIwLmNybDB5oHegdYZzbGRhcDovL2RpcmVj
+dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwQlIlMjBSb290JTIwQ0ElMjAxJTIwMjAyMCxP
+PUQtVHJ1c3QlMjBHbWJILEM9REU/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdDAKBggqhkjOPQQD
+AwNpADBmAjEAlJAtE/rhY/hhY+ithXhUkZy4kzg+GkHaQBZTQgjKL47xPoFWwKrY7RjEsK70Pvom
+AjEA8yjixtsrmfu3Ubgko6SUeho/5jbiA1czijDLgsfWFBHVdWNbFJWcHwHP2NVypw87
+-----END CERTIFICATE-----
+
+D-TRUST EV Root CA 1 2020
+=========================
+-----BEGIN CERTIFICATE-----
+MIIC2zCCAmCgAwIBAgIQXwJB13qHfEwDo6yWjfv/0DAKBggqhkjOPQQDAzBIMQswCQYDVQQGEwJE
+RTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlELVRSVVNUIEVWIFJvb3QgQ0EgMSAy
+MDIwMB4XDTIwMDIxMTEwMDAwMFoXDTM1MDIxMTA5NTk1OVowSDELMAkGA1UEBhMCREUxFTATBgNV
+BAoTDEQtVHJ1c3QgR21iSDEiMCAGA1UEAxMZRC1UUlVTVCBFViBSb290IENBIDEgMjAyMDB2MBAG
+ByqGSM49AgEGBSuBBAAiA2IABPEL3YZDIBnfl4XoIkqbz52Yv7QFJsnL46bSj8WeeHsxiamJrSc8
+ZRCC/N/DnU7wMyPE0jL1HLDfMxddxfCxivnvubcUyilKwg+pf3VlSSowZ/Rk99Yad9rDwpdhQntJ
+raOCAQ0wggEJMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFH8QARY3OqQo5FD4pPfsazK2/umL
+MA4GA1UdDwEB/wQEAwIBBjCBxgYDVR0fBIG+MIG7MD6gPKA6hjhodHRwOi8vY3JsLmQtdHJ1c3Qu
+bmV0L2NybC9kLXRydXN0X2V2X3Jvb3RfY2FfMV8yMDIwLmNybDB5oHegdYZzbGRhcDovL2RpcmVj
+dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwRVYlMjBSb290JTIwQ0ElMjAxJTIwMjAyMCxP
+PUQtVHJ1c3QlMjBHbWJILEM9REU/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdDAKBggqhkjOPQQD
+AwNpADBmAjEAyjzGKnXCXnViOTYAYFqLwZOZzNnbQTs7h5kXO9XMT8oi96CAy/m0sRtW9XLS/BnR
+AjEAkfcwkz8QRitxpNA7RJvAKQIFskF3UfN5Wp6OFKBOQtJbgfM0agPnIjhQW+0ZT0MW
+-----END CERTIFICATE-----
+
+DigiCert TLS ECC P384 Root G5
+=============================
+-----BEGIN CERTIFICATE-----
+MIICGTCCAZ+gAwIBAgIQCeCTZaz32ci5PhwLBCou8zAKBggqhkjOPQQDAzBOMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJjAkBgNVBAMTHURpZ2lDZXJ0IFRMUyBFQ0MgUDM4
+NCBSb290IEc1MB4XDTIxMDExNTAwMDAwMFoXDTQ2MDExNDIzNTk1OVowTjELMAkGA1UEBhMCVVMx
+FzAVBgNVBAoTDkRpZ2lDZXJ0LCBJbmMuMSYwJAYDVQQDEx1EaWdpQ2VydCBUTFMgRUNDIFAzODQg
+Um9vdCBHNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABMFEoc8Rl1Ca3iOCNQfN0MsYndLxf3c1Tzvd
+lHJS7cI7+Oz6e2tYIOyZrsn8aLN1udsJ7MgT9U7GCh1mMEy7H0cKPGEQQil8pQgO4CLp0zVozptj
+n4S1mU1YoI71VOeVyaNCMEAwHQYDVR0OBBYEFMFRRVBZqz7nLFr6ICISB4CIfBFqMA4GA1UdDwEB
+/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMDA2gAMGUCMQCJao1H5+z8blUD2Wds
+Jk6Dxv3J+ysTvLd6jLRl0mlpYxNjOyZQLgGheQaRnUi/wr4CMEfDFXuxoJGZSZOoPHzoRgaLLPIx
+AJSdYsiJvRmEFOml+wG4DXZDjC5Ty3zfDBeWUA==
+-----END CERTIFICATE-----
+
+DigiCert TLS RSA4096 Root G5
+============================
+-----BEGIN CERTIFICATE-----
+MIIFZjCCA06gAwIBAgIQCPm0eKj6ftpqMzeJ3nzPijANBgkqhkiG9w0BAQwFADBNMQswCQYDVQQG
+EwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJTAjBgNVBAMTHERpZ2lDZXJ0IFRMUyBSU0E0
+MDk2IFJvb3QgRzUwHhcNMjEwMTE1MDAwMDAwWhcNNDYwMTE0MjM1OTU5WjBNMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJTAjBgNVBAMTHERpZ2lDZXJ0IFRMUyBSU0E0MDk2
+IFJvb3QgRzUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCz0PTJeRGd/fxmgefM1eS8
+7IE+ajWOLrfn3q/5B03PMJ3qCQuZvWxX2hhKuHisOjmopkisLnLlvevxGs3npAOpPxG02C+JFvuU
+AT27L/gTBaF4HI4o4EXgg/RZG5Wzrn4DReW+wkL+7vI8toUTmDKdFqgpwgscONyfMXdcvyej/Ces
+tyu9dJsXLfKB2l2w4SMXPohKEiPQ6s+d3gMXsUJKoBZMpG2T6T867jp8nVid9E6P/DsjyG244gXa
+zOvswzH016cpVIDPRFtMbzCe88zdH5RDnU1/cHAN1DrRN/BsnZvAFJNY781BOHW8EwOVfH/jXOnV
+DdXifBBiqmvwPXbzP6PosMH976pXTayGpxi0KcEsDr9kvimM2AItzVwv8n/vFfQMFawKsPHTDU9q
+TXeXAaDxZre3zu/O7Oyldcqs4+Fj97ihBMi8ez9dLRYiVu1ISf6nL3kwJZu6ay0/nTvEF+cdLvvy
+z6b84xQslpghjLSR6Rlgg/IwKwZzUNWYOwbpx4oMYIwo+FKbbuH2TbsGJJvXKyY//SovcfXWJL5/
+MZ4PbeiPT02jP/816t9JXkGPhvnxd3lLG7SjXi/7RgLQZhNeXoVPzthwiHvOAbWWl9fNff2C+MIk
+wcoBOU+NosEUQB+cZtUMCUbW8tDRSHZWOkPLtgoRObqME2wGtZ7P6wIDAQABo0IwQDAdBgNVHQ4E
+FgQUUTMc7TZArxfTJc1paPKvTiM+s0EwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQEMBQADggIBAGCmr1tfV9qJ20tQqcQjNSH/0GEwhJG3PxDPJY7Jv0Y02cEhJhxw
+GXIeo8mH/qlDZJY6yFMECrZBu8RHANmfGBg7sg7zNOok992vIGCukihfNudd5N7HPNtQOa27PShN
+lnx2xlv0wdsUpasZYgcYQF+Xkdycx6u1UQ3maVNVzDl92sURVXLFO4uJ+DQtpBflF+aZfTCIITfN
+MBc9uPK8qHWgQ9w+iUuQrm0D4ByjoJYJu32jtyoQREtGBzRj7TG5BO6jm5qu5jF49OokYTurWGT/
+u4cnYiWB39yhL/btp/96j1EuMPikAdKFOV8BmZZvWltwGUb+hmA+rYAQCd05JS9Yf7vSdPD3Rh9G
+OUrYU9DzLjtxpdRv/PNn5AeP3SYZ4Y1b+qOTEZvpyDrDVWiakuFSdjjo4bq9+0/V77PnSIMx8IIh
+47a+p6tv75/fTM8BuGJqIz3nCU2AG3swpMPdB380vqQmsvZB6Akd4yCYqjdP//fx4ilwMUc/dNAU
+FvohigLVigmUdy7yWSiLfFCSCmZ4OIN1xLVaqBHG5cGdZlXPU8Sv13WFqUITVuwhd4GTWgzqltlJ
+yqEI8pc7bZsEGCREjnwB8twl2F6GmrE52/WRMmrRpnCKovfepEWFJqgejF0pW8hL2JpqA15w8oVP
+bEtoL8pU9ozaMv7Da4M/OMZ+
+-----END CERTIFICATE-----
+
+Certainly Root R1
+=================
+-----BEGIN CERTIFICATE-----
+MIIFRzCCAy+gAwIBAgIRAI4P+UuQcWhlM1T01EQ5t+AwDQYJKoZIhvcNAQELBQAwPTELMAkGA1UE
+BhMCVVMxEjAQBgNVBAoTCUNlcnRhaW5seTEaMBgGA1UEAxMRQ2VydGFpbmx5IFJvb3QgUjEwHhcN
+MjEwNDAxMDAwMDAwWhcNNDYwNDAxMDAwMDAwWjA9MQswCQYDVQQGEwJVUzESMBAGA1UEChMJQ2Vy
+dGFpbmx5MRowGAYDVQQDExFDZXJ0YWlubHkgUm9vdCBSMTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBANA21B/q3avk0bbm+yLA3RMNansiExyXPGhjZjKcA7WNpIGD2ngwEc/csiu+kr+O
+5MQTvqRoTNoCaBZ0vrLdBORrKt03H2As2/X3oXyVtwxwhi7xOu9S98zTm/mLvg7fMbedaFySpvXl
+8wo0tf97ouSHocavFwDvA5HtqRxOcT3Si2yJ9HiG5mpJoM610rCrm/b01C7jcvk2xusVtyWMOvwl
+DbMicyF0yEqWYZL1LwsYpfSt4u5BvQF5+paMjRcCMLT5r3gajLQ2EBAHBXDQ9DGQilHFhiZ5shGI
+XsXwClTNSaa/ApzSRKft43jvRl5tcdF5cBxGX1HpyTfcX35pe0HfNEXgO4T0oYoKNp43zGJS4YkN
+KPl6I7ENPT2a/Z2B7yyQwHtETrtJ4A5KVpK8y7XdeReJkd5hiXSSqOMyhb5OhaRLWcsrxXiOcVTQ
+AjeZjOVJ6uBUcqQRBi8LjMFbvrWhsFNunLhgkR9Za/kt9JQKl7XsxXYDVBtlUrpMklZRNaBA2Cnb
+rlJ2Oy0wQJuK0EJWtLeIAaSHO1OWzaMWj/Nmqhexx2DgwUMFDO6bW2BvBlyHWyf5QBGenDPBt+U1
+VwV/J84XIIwc/PH72jEpSe31C4SnT8H2TsIonPru4K8H+zMReiFPCyEQtkA6qyI6BJyLm4SGcprS
+p6XEtHWRqSsjAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
+DgQWBBTgqj8ljZ9EXME66C6ud0yEPmcM9DANBgkqhkiG9w0BAQsFAAOCAgEAuVevuBLaV4OPaAsz
+HQNTVfSVcOQrPbA56/qJYv331hgELyE03fFo8NWWWt7CgKPBjcZq91l3rhVkz1t5BXdm6ozTaw3d
+8VkswTOlMIAVRQdFGjEitpIAq5lNOo93r6kiyi9jyhXWx8bwPWz8HA2YEGGeEaIi1wrykXprOQ4v
+MMM2SZ/g6Q8CRFA3lFV96p/2O7qUpUzpvD5RtOjKkjZUbVwlKNrdrRT90+7iIgXr0PK3aBLXWopB
+GsaSpVo7Y0VPv+E6dyIvXL9G+VoDhRNCX8reU9ditaY1BMJH/5n9hN9czulegChB8n3nHpDYT3Y+
+gjwN/KUD+nsa2UUeYNrEjvn8K8l7lcUq/6qJ34IxD3L/DCfXCh5WAFAeDJDBlrXYFIW7pw0WwfgH
+JBu6haEaBQmAupVjyTrsJZ9/nbqkRxWbRHDxakvWOF5D8xh+UG7pWijmZeZ3Gzr9Hb4DJqPb1OG7
+fpYnKx3upPvaJVQTA945xsMfTZDsjxtK0hzthZU4UHlG1sGQUDGpXJpuHfUzVounmdLyyCwzk5Iw
+x06MZTMQZBf9JBeW0Y3COmor6xOLRPIh80oat3df1+2IpHLlOR+Vnb5nwXARPbv0+Em34yaXOp/S
+X3z7wJl8OSngex2/DaeP0ik0biQVy96QXr8axGbqwua6OV+KmalBWQewLK8=
+-----END CERTIFICATE-----
+
+Certainly Root E1
+=================
+-----BEGIN CERTIFICATE-----
+MIIB9zCCAX2gAwIBAgIQBiUzsUcDMydc+Y2aub/M+DAKBggqhkjOPQQDAzA9MQswCQYDVQQGEwJV
+UzESMBAGA1UEChMJQ2VydGFpbmx5MRowGAYDVQQDExFDZXJ0YWlubHkgUm9vdCBFMTAeFw0yMTA0
+MDEwMDAwMDBaFw00NjA0MDEwMDAwMDBaMD0xCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlDZXJ0YWlu
+bHkxGjAYBgNVBAMTEUNlcnRhaW5seSBSb290IEUxMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE3m/4
+fxzf7flHh4axpMCK+IKXgOqPyEpeKn2IaKcBYhSRJHpcnqMXfYqGITQYUBsQ3tA3SybHGWCA6TS9
+YBk2QNYphwk8kXr2vBMj3VlOBF7PyAIcGFPBMdjaIOlEjeR2o0IwQDAOBgNVHQ8BAf8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU8ygYy2R17ikq6+2uI1g4hevIIgcwCgYIKoZIzj0E
+AwMDaAAwZQIxALGOWiDDshliTd6wT99u0nCK8Z9+aozmut6Dacpps6kFtZaSF4fC0urQe87YQVt8
+rgIwRt7qy12a7DLCZRawTDBcMPPaTnOGBtjOiQRINzf43TNRnXCve1XYAS59BWQOhriR
+-----END CERTIFICATE-----
+
+E-Tugra Global Root CA RSA v3
+=============================
+-----BEGIN CERTIFICATE-----
+MIIF8zCCA9ugAwIBAgIUDU3FzRYilZYIfrgLfxUGNPt5EDQwDQYJKoZIhvcNAQELBQAwgYAxCzAJ
+BgNVBAYTAlRSMQ8wDQYDVQQHEwZBbmthcmExGTAXBgNVBAoTEEUtVHVncmEgRUJHIEEuUy4xHTAb
+BgNVBAsTFEUtVHVncmEgVHJ1c3QgQ2VudGVyMSYwJAYDVQQDEx1FLVR1Z3JhIEdsb2JhbCBSb290
+IENBIFJTQSB2MzAeFw0yMDAzMTgwOTA3MTdaFw00NTAzMTIwOTA3MTdaMIGAMQswCQYDVQQGEwJU
+UjEPMA0GA1UEBxMGQW5rYXJhMRkwFwYDVQQKExBFLVR1Z3JhIEVCRyBBLlMuMR0wGwYDVQQLExRF
+LVR1Z3JhIFRydXN0IENlbnRlcjEmMCQGA1UEAxMdRS1UdWdyYSBHbG9iYWwgUm9vdCBDQSBSU0Eg
+djMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCiZvCJt3J77gnJY9LTQ91ew6aEOErx
+jYG7FL1H6EAX8z3DeEVypi6Q3po61CBxyryfHUuXCscxuj7X/iWpKo429NEvx7epXTPcMHD4QGxL
+sqYxYdE0PD0xesevxKenhOGXpOhL9hd87jwH7eKKV9y2+/hDJVDqJ4GohryPUkqWOmAalrv9c/SF
+/YP9f4RtNGx/ardLAQO/rWm31zLZ9Vdq6YaCPqVmMbMWPcLzJmAy01IesGykNz709a/r4d+ABs8q
+QedmCeFLl+d3vSFtKbZnwy1+7dZ5ZdHPOrbRsV5WYVB6Ws5OUDGAA5hH5+QYfERaxqSzO8bGwzrw
+bMOLyKSRBfP12baqBqG3q+Sx6iEUXIOk/P+2UNOMEiaZdnDpwA+mdPy70Bt4znKS4iicvObpCdg6
+04nmvi533wEKb5b25Y08TVJ2Glbhc34XrD2tbKNSEhhw5oBOM/J+JjKsBY04pOZ2PJ8QaQ5tndLB
+eSBrW88zjdGUdjXnXVXHt6woq0bM5zshtQoK5EpZ3IE1S0SVEgpnpaH/WwAH0sDM+T/8nzPyAPiM
+bIedBi3x7+PmBvrFZhNb/FAHnnGGstpvdDDPk1Po3CLW3iAfYY2jLqN4MpBs3KwytQXk9TwzDdbg
+h3cXTJ2w2AmoDVf3RIXwyAS+XF1a4xeOVGNpf0l0ZAWMowIDAQABo2MwYTAPBgNVHRMBAf8EBTAD
+AQH/MB8GA1UdIwQYMBaAFLK0ruYt9ybVqnUtdkvAG1Mh0EjvMB0GA1UdDgQWBBSytK7mLfcm1ap1
+LXZLwBtTIdBI7zAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIBAImocn+M684uGMQQ
+gC0QDP/7FM0E4BQ8Tpr7nym/Ip5XuYJzEmMmtcyQ6dIqKe6cLcwsmb5FJ+Sxce3kOJUxQfJ9emN4
+38o2Fi+CiJ+8EUdPdk3ILY7r3y18Tjvarvbj2l0Upq7ohUSdBm6O++96SmotKygY/r+QLHUWnw/q
+ln0F7psTpURs+APQ3SPh/QMSEgj0GDSz4DcLdxEBSL9htLX4GdnLTeqjjO/98Aa1bZL0SmFQhO3s
+SdPkvmjmLuMxC1QLGpLWgti2omU8ZgT5Vdps+9u1FGZNlIM7zR6mK7L+d0CGq+ffCsn99t2HVhjY
+sCxVYJb6CH5SkPVLpi6HfMsg2wY+oF0Dd32iPBMbKaITVaA9FCKvb7jQmhty3QUBjYZgv6Rn7rWl
+DdF/5horYmbDB7rnoEgcOMPpRfunf/ztAmgayncSd6YAVSgU7NbHEqIbZULpkejLPoeJVF3Zr52X
+nGnnCv8PWniLYypMfUeUP95L6VPQMPHF9p5J3zugkaOj/s1YzOrfr28oO6Bpm4/srK4rVJ2bBLFH
+IK+WEj5jlB0E5y67hscMmoi/dkfv97ALl2bSRM9gUgfh1SxKOidhd8rXj+eHDjD/DLsE4mHDosiX
+YY60MGo8bcIHX0pzLz/5FooBZu+6kcpSV3uu1OYP3Qt6f4ueJiDPO++BcYNZ
+-----END CERTIFICATE-----
+
+E-Tugra Global Root CA ECC v3
+=============================
+-----BEGIN CERTIFICATE-----
+MIICpTCCAiqgAwIBAgIUJkYZdzHhT28oNt45UYbm1JeIIsEwCgYIKoZIzj0EAwMwgYAxCzAJBgNV
+BAYTAlRSMQ8wDQYDVQQHEwZBbmthcmExGTAXBgNVBAoTEEUtVHVncmEgRUJHIEEuUy4xHTAbBgNV
+BAsTFEUtVHVncmEgVHJ1c3QgQ2VudGVyMSYwJAYDVQQDEx1FLVR1Z3JhIEdsb2JhbCBSb290IENB
+IEVDQyB2MzAeFw0yMDAzMTgwOTQ2NThaFw00NTAzMTIwOTQ2NThaMIGAMQswCQYDVQQGEwJUUjEP
+MA0GA1UEBxMGQW5rYXJhMRkwFwYDVQQKExBFLVR1Z3JhIEVCRyBBLlMuMR0wGwYDVQQLExRFLVR1
+Z3JhIFRydXN0IENlbnRlcjEmMCQGA1UEAxMdRS1UdWdyYSBHbG9iYWwgUm9vdCBDQSBFQ0MgdjMw
+djAQBgcqhkjOPQIBBgUrgQQAIgNiAASOmCm/xxAeJ9urA8woLNheSBkQKczLWYHMjLiSF4mDKpL2
+w6QdTGLVn9agRtwcvHbB40fQWxPa56WzZkjnIZpKT4YKfWzqTTKACrJ6CZtpS5iB4i7sAnCWH/31
+Rs7K3IKjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAU/4Ixcj75xGZsrTie0bBRiKWQ
+zPUwHQYDVR0OBBYEFP+CMXI++cRmbK04ntGwUYilkMz1MA4GA1UdDwEB/wQEAwIBBjAKBggqhkjO
+PQQDAwNpADBmAjEA5gVYaWHlLcoNy/EZCL3W/VGSGn5jVASQkZo1kTmZ+gepZpO6yGjUij/67W4W
+Aie3AjEA3VoXK3YdZUKWpqxdinlW2Iob35reX8dQj7FbcQwm32pAAOwzkSFxvmjkI6TZraE3
+-----END CERTIFICATE-----
diff --git a/thirdparty/harfbuzz/src/OT/Layout/GPOS/CursivePosFormat1.hh b/thirdparty/harfbuzz/src/OT/Layout/GPOS/CursivePosFormat1.hh
index 7c34bb3c93..7f58fac8b8 100644
--- a/thirdparty/harfbuzz/src/OT/Layout/GPOS/CursivePosFormat1.hh
+++ b/thirdparty/harfbuzz/src/OT/Layout/GPOS/CursivePosFormat1.hh
@@ -140,6 +140,13 @@ struct CursivePosFormat1
     unsigned int i = skippy_iter.idx;
     unsigned int j = buffer->idx;
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      c->buffer->message (c->font,
+			  "cursive attaching glyph at %d to glyph at %d",
+			  i, j);
+    }
+
     buffer->unsafe_to_break (i, j + 1);
     float entry_x, entry_y, exit_x, exit_y;
     (this+prev_record.exitAnchor).get_anchor (c, buffer->info[i].codepoint, &exit_x, &exit_y);
@@ -231,6 +238,13 @@ struct CursivePosFormat1
 	pos[parent].x_offset = 0;
     }
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      c->buffer->message (c->font,
+			  "cursive attached glyph at %d to glyph at %d",
+			  i, j);
+    }
+
     buffer->idx++;
     return_trace (true);
   }
diff --git a/thirdparty/harfbuzz/src/OT/Layout/GPOS/MarkArray.hh b/thirdparty/harfbuzz/src/OT/Layout/GPOS/MarkArray.hh
index f8cddd1991..cb5e8b2689 100644
--- a/thirdparty/harfbuzz/src/OT/Layout/GPOS/MarkArray.hh
+++ b/thirdparty/harfbuzz/src/OT/Layout/GPOS/MarkArray.hh
@@ -39,6 +39,13 @@ struct MarkArray : Array16Of<MarkRecord>        /* Array of MarkRecords--in Cove
     mark_anchor.get_anchor (c, buffer->cur().codepoint, &mark_x, &mark_y);
     glyph_anchor.get_anchor (c, buffer->info[glyph_pos].codepoint, &base_x, &base_y);
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      c->buffer->message (c->font,
+			  "attaching mark glyph at %d to glyph at %d",
+			  c->buffer->idx, glyph_pos);
+    }
+
     hb_glyph_position_t &o = buffer->cur_pos();
     o.x_offset = roundf (base_x - mark_x);
     o.y_offset = roundf (base_y - mark_y);
@@ -46,6 +53,13 @@ struct MarkArray : Array16Of<MarkRecord>        /* Array of MarkRecords--in Cove
     o.attach_chain() = (int) glyph_pos - (int) buffer->idx;
     buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT;
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      c->buffer->message (c->font,
+			  "attached mark glyph at %d to glyph at %d",
+			  c->buffer->idx, glyph_pos);
+    }
+
     buffer->idx++;
     return_trace (true);
   }
@@ -83,10 +97,11 @@ struct MarkArray : Array16Of<MarkRecord>        /* Array of MarkRecords--in Cove
   }
 };
 
-static void Markclass_closure_and_remap_indexes (const Coverage  &mark_coverage,
-                                                 const MarkArray &mark_array,
-                                                 const hb_set_t  &glyphset,
-                                                 hb_map_t*        klass_mapping /* INOUT */)
+HB_INTERNAL inline
+void Markclass_closure_and_remap_indexes (const Coverage  &mark_coverage,
+                                          const MarkArray &mark_array,
+                                          const hb_set_t  &glyphset,
+                                          hb_map_t*        klass_mapping /* INOUT */)
 {
   hb_set_t orig_classes;
 
diff --git a/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairPosFormat2.hh b/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairPosFormat2.hh
index f58bcb1b30..a80fe0c226 100644
--- a/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairPosFormat2.hh
+++ b/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairPosFormat2.hh
@@ -217,10 +217,23 @@ struct PairPosFormat2_4
     }
     bail:
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      c->buffer->message (c->font,
+			  "kerning glyphs at %d,%d",
+			  c->buffer->idx, skippy_iter.idx);
+    }
 
     applied_first = valueFormat1.apply_value (c, this, v, buffer->cur_pos());
     applied_second = valueFormat2.apply_value (c, this, v + len1, buffer->pos[skippy_iter.idx]);
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      c->buffer->message (c->font,
+			  "kerned glyphs at %d,%d",
+			  c->buffer->idx, skippy_iter.idx);
+    }
+
     success:
     if (applied_first || applied_second)
       buffer->unsafe_to_break (buffer->idx, skippy_iter.idx + 1);
diff --git a/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairSet.hh b/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairSet.hh
index 58ba4de6c1..4578fbd1d6 100644
--- a/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairSet.hh
+++ b/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairSet.hh
@@ -109,12 +109,28 @@ struct PairSet
                                                 record_size);
     if (record)
     {
+      if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+      {
+	c->buffer->message (c->font,
+			    "kerning glyphs at %d,%d",
+			    c->buffer->idx, pos);
+      }
+
       bool applied_first = valueFormats[0].apply_value (c, this, &record->values[0], buffer->cur_pos());
       bool applied_second = valueFormats[1].apply_value (c, this, &record->values[len1], buffer->pos[pos]);
+
+      if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+      {
+	c->buffer->message (c->font,
+			    "kerned glyphs at %d,%d",
+			    c->buffer->idx, pos);
+      }
+
       if (applied_first || applied_second)
         buffer->unsafe_to_break (buffer->idx, pos + 1);
       if (len2)
         pos++;
+
       buffer->idx = pos;
       return_trace (true);
     }
diff --git a/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairValueRecord.hh b/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairValueRecord.hh
index 55de5abebf..bd95abde16 100644
--- a/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairValueRecord.hh
+++ b/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairValueRecord.hh
@@ -1,6 +1,8 @@
 #ifndef OT_LAYOUT_GPOS_PAIRVALUERECORD_HH
 #define OT_LAYOUT_GPOS_PAIRVALUERECORD_HH
 
+#include "ValueFormat.hh"
+
 namespace OT {
 namespace Layout {
 namespace GPOS_impl {
diff --git a/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat1.hh b/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat1.hh
index c0e7d29cea..7cbdf6dc6c 100644
--- a/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat1.hh
+++ b/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat1.hh
@@ -39,12 +39,10 @@ struct SinglePosFormat1
   {
     if (!valueFormat.has_device ()) return;
 
-    auto it =
-    + hb_iter (this+coverage)
-    | hb_filter (c->glyph_set)
-    ;
+    hb_set_t intersection;
+    (this+coverage).intersect_set (*c->glyph_set, intersection);
+    if (!intersection) return;
 
-    if (!it) return;
     valueFormat.collect_variation_indices (c, this, values.as_array (valueFormat.get_len ()));
   }
 
@@ -62,8 +60,22 @@ struct SinglePosFormat1
     unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint);
     if (likely (index == NOT_COVERED)) return_trace (false);
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      c->buffer->message (c->font,
+			  "positioning glyph at %d",
+			  c->buffer->idx);
+    }
+
     valueFormat.apply_value (c, this, values, buffer->cur_pos());
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      c->buffer->message (c->font,
+			  "positioned glyph at %d",
+			  c->buffer->idx);
+    }
+
     buffer->idx++;
     return_trace (true);
   }
diff --git a/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat2.hh b/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat2.hh
index 0d038b4422..518fa9dcb0 100644
--- a/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat2.hh
+++ b/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat2.hh
@@ -70,10 +70,24 @@ struct SinglePosFormat2
 
     if (likely (index >= valueCount)) return_trace (false);
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      c->buffer->message (c->font,
+			  "positioning glyph at %d",
+			  c->buffer->idx);
+    }
+
     valueFormat.apply_value (c, this,
                              &values[index * valueFormat.get_len ()],
                              buffer->cur_pos());
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      c->buffer->message (c->font,
+			  "positioned glyph at %d",
+			  c->buffer->idx);
+    }
+
     buffer->idx++;
     return_trace (true);
   }
diff --git a/thirdparty/harfbuzz/src/OT/Layout/GSUB/AlternateSet.hh b/thirdparty/harfbuzz/src/OT/Layout/GSUB/AlternateSet.hh
index a5dcb65359..4a9e9672eb 100644
--- a/thirdparty/harfbuzz/src/OT/Layout/GSUB/AlternateSet.hh
+++ b/thirdparty/harfbuzz/src/OT/Layout/GSUB/AlternateSet.hh
@@ -57,8 +57,23 @@ struct AlternateSet
 
     if (unlikely (alt_index > count || alt_index == 0)) return_trace (false);
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      c->buffer->sync_so_far ();
+      c->buffer->message (c->font,
+			  "replacing glyph at %d (alternate substitution)",
+			  c->buffer->idx);
+    }
+
     c->replace_glyph (alternates[alt_index - 1]);
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      c->buffer->message (c->font,
+			  "replaced glyph at %d (alternate substitution)",
+			  c->buffer->idx - 1);
+    }
+
     return_trace (true);
   }
 
diff --git a/thirdparty/harfbuzz/src/OT/Layout/GSUB/Ligature.hh b/thirdparty/harfbuzz/src/OT/Layout/GSUB/Ligature.hh
index 22ed65f858..f373d921b5 100644
--- a/thirdparty/harfbuzz/src/OT/Layout/GSUB/Ligature.hh
+++ b/thirdparty/harfbuzz/src/OT/Layout/GSUB/Ligature.hh
@@ -64,7 +64,24 @@ struct Ligature
      * as a "ligated" substitution. */
     if (unlikely (count == 1))
     {
+
+      if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+      {
+	c->buffer->sync_so_far ();
+	c->buffer->message (c->font,
+			    "replacing glyph at %d (ligature substitution)",
+			    c->buffer->idx);
+      }
+
       c->replace_glyph (ligGlyph);
+
+      if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+      {
+	c->buffer->message (c->font,
+			    "replaced glyph at %d (ligature substitution)",
+			    c->buffer->idx - 1);
+      }
+
       return_trace (true);
     }
 
@@ -85,6 +102,31 @@ struct Ligature
       return_trace (false);
     }
 
+    unsigned pos = 0;
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      unsigned delta = c->buffer->sync_so_far ();
+
+      pos = c->buffer->idx;
+
+      char buf[HB_MAX_CONTEXT_LENGTH * 16] = {0};
+      char *p = buf;
+
+      match_end += delta;
+      for (unsigned i = 0; i < count; i++)
+      {
+	match_positions[i] += delta;
+	if (i)
+	  *p++ = ',';
+	sprintf (p, "%u", match_positions[i]);
+	p += strlen(p);
+      }
+
+      c->buffer->message (c->font,
+			  "ligating glyphs at %s",
+			  buf);
+    }
+
     ligate_input (c,
                   count,
                   match_positions,
@@ -92,6 +134,14 @@ struct Ligature
                   ligGlyph,
                   total_component_count);
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      c->buffer->sync_so_far ();
+      c->buffer->message (c->font,
+			  "ligated glyph at %d",
+			  pos);
+    }
+
     return_trace (true);
   }
 
diff --git a/thirdparty/harfbuzz/src/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh b/thirdparty/harfbuzz/src/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh
index 1d27df95dd..a23e92028e 100644
--- a/thirdparty/harfbuzz/src/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh
+++ b/thirdparty/harfbuzz/src/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh
@@ -131,7 +131,23 @@ struct ReverseChainSingleSubstFormat1
                          c->buffer->idx + 1, &end_index))
     {
       c->buffer->unsafe_to_break_from_outbuffer (start_index, end_index);
+
+      if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+      {
+	c->buffer->message (c->font,
+			    "replacing glyph at %d (reverse chaining substitution)",
+			    c->buffer->idx);
+      }
+
       c->replace_glyph_inplace (substitute[index]);
+
+      if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+      {
+	c->buffer->message (c->font,
+			    "replaced glyph at %d (reverse chaining substitution)",
+			    c->buffer->idx);
+      }
+
       /* Note: We DON'T decrease buffer->idx.  The main loop does it
        * for us.  This is useful for preventing surprises if someone
        * calls us through a Context lookup. */
diff --git a/thirdparty/harfbuzz/src/OT/Layout/GSUB/Sequence.hh b/thirdparty/harfbuzz/src/OT/Layout/GSUB/Sequence.hh
index c5cd15bb23..3d84a5e6ea 100644
--- a/thirdparty/harfbuzz/src/OT/Layout/GSUB/Sequence.hh
+++ b/thirdparty/harfbuzz/src/OT/Layout/GSUB/Sequence.hh
@@ -40,17 +40,58 @@ struct Sequence
      * as a "multiplied" substitution. */
     if (unlikely (count == 1))
     {
+      if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+      {
+	c->buffer->sync_so_far ();
+	c->buffer->message (c->font,
+			    "replacing glyph at %d (multiple substitution)",
+			    c->buffer->idx);
+      }
+
       c->replace_glyph (substitute.arrayZ[0]);
+
+      if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+      {
+	c->buffer->message (c->font,
+			    "replaced glyph at %d (multiple subtitution)",
+			    c->buffer->idx - 1);
+      }
+
       return_trace (true);
     }
     /* Spec disallows this, but Uniscribe allows it.
      * https://github.com/harfbuzz/harfbuzz/issues/253 */
     else if (unlikely (count == 0))
     {
+      if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+      {
+	c->buffer->sync_so_far ();
+	c->buffer->message (c->font,
+			    "deleting glyph at %d (multiple substitution)",
+			    c->buffer->idx);
+      }
+
       c->buffer->delete_glyph ();
+
+      if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+      {
+	c->buffer->sync_so_far ();
+	c->buffer->message (c->font,
+			    "deleted glyph at %d (multiple substitution)",
+			    c->buffer->idx);
+      }
+
       return_trace (true);
     }
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      c->buffer->sync_so_far ();
+      c->buffer->message (c->font,
+			  "multiplying glyph at %d",
+			  c->buffer->idx);
+    }
+
     unsigned int klass = _hb_glyph_info_is_ligature (&c->buffer->cur()) ?
                          HB_OT_LAYOUT_GLYPH_PROPS_BASE_GLYPH : 0;
     unsigned lig_id = _hb_glyph_info_get_lig_id (&c->buffer->cur());
@@ -65,6 +106,26 @@ struct Sequence
     }
     c->buffer->skip_glyph ();
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      c->buffer->sync_so_far ();
+
+      char buf[HB_MAX_CONTEXT_LENGTH * 16] = {0};
+      char *p = buf;
+
+      for (unsigned i = c->buffer->idx - count; i < c->buffer->idx; i++)
+      {
+	if (buf < p)
+	  *p++ = ',';
+	sprintf (p, "%u", i);
+	p += strlen(p);
+      }
+
+      c->buffer->message (c->font,
+			  "multiplied glyphs at %s",
+			  buf);
+    }
+
     return_trace (true);
   }
 
diff --git a/thirdparty/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat1.hh b/thirdparty/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat1.hh
index dd44595741..4b17243d81 100644
--- a/thirdparty/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat1.hh
+++ b/thirdparty/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat1.hh
@@ -45,6 +45,18 @@ struct SingleSubstFormat1_3
     hb_set_t intersection;
     (this+coverage).intersect_set (c->parent_active_glyphs (), intersection);
 
+    /* In degenerate fuzzer-found fonts, but not real fonts,
+     * this table can keep adding new glyphs in each round of closure.
+     * Refuse to close-over, if it maps glyph range to overlapping range. */
+    hb_codepoint_t min_before = intersection.get_min ();
+    hb_codepoint_t max_before = intersection.get_max ();
+    hb_codepoint_t min_after = (min_before + d) & mask;
+    hb_codepoint_t max_after = (max_before + d) & mask;
+    if ((this+coverage).get_population () >= max_before - min_before &&
+	((min_before <= min_after && min_after <= max_before) ||
+	 (min_before <= max_after && max_after <= max_before)))
+      return;
+
     + hb_iter (intersection)
     | hb_map ([d, mask] (hb_codepoint_t g) { return (g + d) & mask; })
     | hb_sink (c->output)
@@ -82,8 +94,23 @@ struct SingleSubstFormat1_3
 
     glyph_id = (glyph_id + d) & mask;
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      c->buffer->sync_so_far ();
+      c->buffer->message (c->font,
+			  "replacing glyph at %d (single substitution)",
+			  c->buffer->idx);
+    }
+
     c->replace_glyph (glyph_id);
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      c->buffer->message (c->font,
+			  "replaced glyph at %d (single substitution)",
+			  c->buffer->idx - 1);
+    }
+
     return_trace (true);
   }
 
diff --git a/thirdparty/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat2.hh b/thirdparty/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat2.hh
index 386419a2a5..fb1e90d03e 100644
--- a/thirdparty/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat2.hh
+++ b/thirdparty/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat2.hh
@@ -68,8 +68,23 @@ struct SingleSubstFormat2_4
 
     if (unlikely (index >= substitute.len)) return_trace (false);
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      c->buffer->sync_so_far ();
+      c->buffer->message (c->font,
+			  "replacing glyph at %d (single substitution)",
+			  c->buffer->idx);
+    }
+
     c->replace_glyph (substitute[index]);
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      c->buffer->message (c->font,
+			  "replaced glyph at %d (single substitution)",
+			  c->buffer->idx - 1);
+    }
+
     return_trace (true);
   }
 
diff --git a/thirdparty/harfbuzz/src/OT/glyf/CompositeGlyph.hh b/thirdparty/harfbuzz/src/OT/glyf/CompositeGlyph.hh
index abe4c8330c..98c2ee4e73 100644
--- a/thirdparty/harfbuzz/src/OT/glyf/CompositeGlyph.hh
+++ b/thirdparty/harfbuzz/src/OT/glyf/CompositeGlyph.hh
@@ -26,7 +26,9 @@ struct CompositeGlyphRecord
     OVERLAP_COMPOUND		= 0x0400,
     SCALED_COMPONENT_OFFSET	= 0x0800,
     UNSCALED_COMPONENT_OFFSET	= 0x1000,
+#ifndef HB_NO_BEYOND_64K
     GID_IS_24BIT		= 0x2000
+#endif
   };
 
   public:
@@ -34,7 +36,9 @@ struct CompositeGlyphRecord
   {
     unsigned int size = min_size;
     /* glyphIndex is 24bit instead of 16bit */
+#ifndef HB_NO_BEYOND_64K
     if (flags & GID_IS_24BIT) size += HBGlyphID24::static_size - HBGlyphID16::static_size;
+#endif
     /* arg1 and 2 are int16 */
     if (flags & ARG_1_AND_2_ARE_WORDS) size += 4;
     /* arg1 and 2 are int8 */
@@ -64,9 +68,11 @@ struct CompositeGlyphRecord
   void get_anchor_points (unsigned int &point1, unsigned int &point2) const
   {
     const auto *p = &StructAfter<const HBUINT8> (flags);
+#ifndef HB_NO_BEYOND_64K
     if (flags & GID_IS_24BIT)
       p += HBGlyphID24::static_size;
     else
+#endif
       p += HBGlyphID16::static_size;
     if (flags & ARG_1_AND_2_ARE_WORDS)
     {
@@ -109,9 +115,11 @@ struct CompositeGlyphRecord
     matrix[1] = matrix[2] = 0.f;
 
     const auto *p = &StructAfter<const HBINT8> (flags);
+#ifndef HB_NO_BEYOND_64K
     if (flags & GID_IS_24BIT)
       p += HBGlyphID24::static_size;
     else
+#endif
       p += HBGlyphID16::static_size;
     int tx, ty;
     if (flags & ARG_1_AND_2_ARE_WORDS)
@@ -158,16 +166,20 @@ struct CompositeGlyphRecord
   public:
   hb_codepoint_t get_gid () const
   {
+#ifndef HB_NO_BEYOND_64K
     if (flags & GID_IS_24BIT)
       return StructAfter<const HBGlyphID24> (flags);
     else
+#endif
       return StructAfter<const HBGlyphID16> (flags);
   }
   void set_gid (hb_codepoint_t gid)
   {
+#ifndef HB_NO_BEYOND_64K
     if (flags & GID_IS_24BIT)
       StructAfter<HBGlyphID24> (flags) = gid;
     else
+#endif
       /* TODO assert? */
       StructAfter<HBGlyphID16> (flags) = gid;
   }
diff --git a/thirdparty/harfbuzz/src/graph/coverage-graph.hh b/thirdparty/harfbuzz/src/graph/coverage-graph.hh
new file mode 100644
index 0000000000..1d9fd0eb5b
--- /dev/null
+++ b/thirdparty/harfbuzz/src/graph/coverage-graph.hh
@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2022  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Garret Rieger
+ */
+
+#include "graph.hh"
+#include "../OT/Layout/Common/Coverage.hh"
+
+#ifndef GRAPH_COVERAGE_GRAPH_HH
+#define GRAPH_COVERAGE_GRAPH_HH
+
+namespace graph {
+
+struct CoverageFormat1 : public OT::Layout::Common::CoverageFormat1_3<SmallTypes>
+{
+  bool sanitize (graph_t::vertex_t& vertex) const
+  {
+    int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
+    constexpr unsigned min_size = OT::Layout::Common::CoverageFormat1_3<SmallTypes>::min_size;
+    if (vertex_len < min_size) return false;
+    return vertex_len >= min_size + glyphArray.get_size () - glyphArray.len.get_size ();
+  }
+};
+
+struct CoverageFormat2 : public OT::Layout::Common::CoverageFormat2_4<SmallTypes>
+{
+  bool sanitize (graph_t::vertex_t& vertex) const
+  {
+    int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
+    constexpr unsigned min_size = OT::Layout::Common::CoverageFormat2_4<SmallTypes>::min_size;
+    if (vertex_len < min_size) return false;
+    return vertex_len >= min_size + rangeRecord.get_size () - rangeRecord.len.get_size ();
+  }
+};
+
+struct Coverage : public OT::Layout::Common::Coverage
+{
+  bool sanitize (graph_t::vertex_t& vertex) const
+  {
+    int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
+    if (vertex_len < OT::Layout::Common::Coverage::min_size) return false;
+    switch (u.format)
+    {
+    case 1: return ((CoverageFormat1*)this)->sanitize (vertex);
+    case 2: return ((CoverageFormat2*)this)->sanitize (vertex);
+#ifndef HB_NO_BORING_EXPANSION
+    // Not currently supported
+    case 3:
+    case 4:
+#endif
+    default: return false;
+    }
+  }
+};
+
+
+}
+
+#endif  // GRAPH_COVERAGE_GRAPH_HH
diff --git a/thirdparty/harfbuzz/src/graph/graph.hh b/thirdparty/harfbuzz/src/graph/graph.hh
index 49638f34a7..b3aef558a2 100644
--- a/thirdparty/harfbuzz/src/graph/graph.hh
+++ b/thirdparty/harfbuzz/src/graph/graph.hh
@@ -24,6 +24,10 @@
  * Google Author(s): Garret Rieger
  */
 
+#include "../hb-set.hh"
+#include "../hb-priority-queue.hh"
+#include "../hb-serialize.hh"
+
 #ifndef GRAPH_GRAPH_HH
 #define GRAPH_GRAPH_HH
 
@@ -76,6 +80,22 @@ struct graph_t
       }
     }
 
+    void remove_real_link (unsigned child_index, const void* offset)
+    {
+      for (unsigned i = 0; i < obj.real_links.length; i++)
+      {
+        auto& link = obj.real_links[i];
+        if (link.objidx != child_index)
+          continue;
+
+        if ((obj.head + link.position) != offset)
+          continue;
+
+        obj.real_links.remove (i);
+        return;
+      }
+    }
+
     void remap_parents (const hb_vector_t<unsigned>& id_map)
     {
       for (unsigned i = 0; i < parents.length; i++)
@@ -107,6 +127,10 @@ struct graph_t
       return priority >= 3;
     }
 
+    size_t table_size () const {
+      return obj.tail - obj.head;
+    }
+
     int64_t modified_distance (unsigned order) const
     {
       // TODO(garretrieger): once priority is high enough, should try
@@ -199,13 +223,24 @@ struct graph_t
     return vertices_.length - 1;
   }
 
-  const hb_serialize_context_t::object_t& object(unsigned i) const
+  const hb_serialize_context_t::object_t& object (unsigned i) const
   {
     return vertices_[i].obj;
   }
 
   /*
    * Generates a new topological sorting of graph ordered by the shortest
+   * distance to each node if positions are marked as invalid.
+   */
+  void sort_shortest_distance_if_needed ()
+  {
+    if (!positions_invalid) return;
+    sort_shortest_distance ();
+  }
+
+
+  /*
+   * Generates a new topological sorting of graph ordered by the shortest
    * distance to each node.
    */
   void sort_shortest_distance ()
@@ -256,12 +291,12 @@ struct graph_t
 
     check_success (!queue.in_error ());
     check_success (!sorted_graph.in_error ());
-    if (!check_success (new_id == -1))
-      print_orphaned_nodes ();
 
     remap_all_obj_indices (id_map, &sorted_graph);
-
     hb_swap (vertices_, sorted_graph);
+
+    if (!check_success (new_id == -1))
+      print_orphaned_nodes ();
   }
 
   /*
@@ -310,6 +345,22 @@ struct graph_t
     }
   }
 
+  unsigned index_for_offset(unsigned node_idx, const void* offset) const
+  {
+    const auto& node = object (node_idx);
+    if (offset < node.head || offset >= node.tail) return -1;
+
+    for (const auto& link : node.real_links)
+    {
+      if (offset != node.head + link.position)
+        continue;
+      return link.objidx;
+    }
+
+    return -1;
+  }
+
+
   /*
    * Assign unique space numbers to each connected subgraph of 24 bit and/or 32 bit offset(s).
    * Currently, this is implemented specifically tailored to the structure of a GPOS/GSUB
@@ -317,6 +368,8 @@ struct graph_t
    */
   bool assign_spaces ()
   {
+    update_parents ();
+
     hb_set_t visited;
     hb_set_t roots;
     find_space_roots (visited, roots);
@@ -458,6 +511,21 @@ struct graph_t
       find_subgraph (link.objidx, subgraph);
   }
 
+  size_t find_subgraph_size (unsigned node_idx, hb_set_t& subgraph, unsigned max_depth = -1)
+  {
+    if (subgraph.has (node_idx)) return 0;
+    subgraph.add (node_idx);
+
+    const auto& o = vertices_[node_idx].obj;
+    size_t size = o.tail - o.head;
+    if (max_depth == 0)
+      return size;
+
+    for (const auto& link : o.all_links ())
+      size += find_subgraph_size (link.objidx, subgraph, max_depth - 1);
+    return size;
+  }
+
   /*
    * Finds the topmost children of 32bit offsets in the subgraph starting
    * at node_idx. Found indices are placed into 'found'.
@@ -475,6 +543,37 @@ struct graph_t
   }
 
   /*
+   * Moves the child of old_parent_idx pointed to by old_offset to a new
+   * vertex at the new_offset.
+   */
+  template<typename O>
+  void move_child (unsigned old_parent_idx,
+                   const O* old_offset,
+                   unsigned new_parent_idx,
+                   const O* new_offset)
+  {
+    distance_invalid = true;
+    positions_invalid = true;
+
+    auto& old_v = vertices_[old_parent_idx];
+    auto& new_v = vertices_[new_parent_idx];
+
+    unsigned child_id = index_for_offset (old_parent_idx,
+                                          old_offset);
+
+    auto* new_link = new_v.obj.real_links.push ();
+    new_link->width = O::static_size;
+    new_link->objidx = child_id;
+    new_link->position = (const char*) new_offset - (const char*) new_v.obj.head;
+
+    auto& child = vertices_[child_id];
+    child.parents.push (new_parent_idx);
+
+    old_v.remove_real_link (child_id, old_offset);
+    child.remove_parent (old_parent_idx);
+  }
+
+  /*
    * duplicates all nodes in the subgraph reachable from node_idx. Does not re-assign
    * links. index_map is updated with mappings from old id to new id. If a duplication has already
    * been performed for a given index, then it will be skipped.
@@ -581,6 +680,39 @@ struct graph_t
     return true;
   }
 
+
+  /*
+   * Adds a new node to the graph, not connected to anything.
+   */
+  unsigned new_node (char* head, char* tail)
+  {
+    positions_invalid = true;
+    distance_invalid = true;
+
+    auto* clone = vertices_.push ();
+    if (vertices_.in_error ()) {
+      return -1;
+    }
+
+    clone->obj.head = head;
+    clone->obj.tail = tail;
+    clone->distance = 0;
+    clone->space = 0;
+
+    unsigned clone_idx = vertices_.length - 2;
+
+    // The last object is the root of the graph, so swap back the root to the end.
+    // The root's obj idx does change, however since it's root nothing else refers to it.
+    // all other obj idx's will be unaffected.
+    hb_swap (vertices_[vertices_.length - 2], *clone);
+
+    // Since the root moved, update the parents arrays of all children on the root.
+    for (const auto& l : root ().obj.all_links ())
+      vertices_[l.objidx].remap_parent (root_idx () - 1, root_idx ());
+
+    return clone_idx;
+  }
+
   /*
    * Raises the sorting priority of all children.
    */
diff --git a/thirdparty/harfbuzz/src/graph/gsubgpos-context.cc b/thirdparty/harfbuzz/src/graph/gsubgpos-context.cc
new file mode 100644
index 0000000000..e0ff6ff85f
--- /dev/null
+++ b/thirdparty/harfbuzz/src/graph/gsubgpos-context.cc
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2022  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Garret Rieger
+ */
+
+#include "gsubgpos-graph.hh"
+
+namespace graph {
+
+gsubgpos_graph_context_t::gsubgpos_graph_context_t (hb_tag_t table_tag_,
+                                                    graph_t& graph_)
+    : table_tag (table_tag_),
+      graph (graph_),
+      lookup_list_index (0),
+      lookups (),
+      buffers ()
+{
+  if (table_tag_ != HB_OT_TAG_GPOS
+      &&  table_tag_ != HB_OT_TAG_GSUB)
+    return;
+
+  GSTAR* gstar = graph::GSTAR::graph_to_gstar (graph_);
+  if (gstar) {
+    gstar->find_lookups (graph, lookups);
+    lookup_list_index = gstar->get_lookup_list_index (graph_);
+  }
+}
+
+unsigned gsubgpos_graph_context_t::create_node (unsigned size)
+{
+  char* buffer = (char*) hb_calloc (1, size);
+  if (!buffer)
+    return -1;
+
+  buffers.push (buffer);
+
+  return graph.new_node (buffer, buffer + size);
+}
+
+unsigned gsubgpos_graph_context_t::num_non_ext_subtables ()  {
+  unsigned count = 0;
+  for (auto l : lookups.values ())
+  {
+    if (l->is_extension (table_tag)) continue;
+    count += l->number_of_subtables ();
+  }
+  return count;
+}
+
+}
diff --git a/thirdparty/harfbuzz/src/graph/gsubgpos-context.hh b/thirdparty/harfbuzz/src/graph/gsubgpos-context.hh
new file mode 100644
index 0000000000..49b24198ff
--- /dev/null
+++ b/thirdparty/harfbuzz/src/graph/gsubgpos-context.hh
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2022  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Garret Rieger
+ */
+
+#include "graph.hh"
+#include "../hb-ot-layout-gsubgpos.hh"
+
+#ifndef GRAPH_GSUBGPOS_CONTEXT_HH
+#define GRAPH_GSUBGPOS_CONTEXT_HH
+
+namespace graph {
+
+struct Lookup;
+
+struct gsubgpos_graph_context_t
+{
+  hb_tag_t table_tag;
+  graph_t& graph;
+  unsigned lookup_list_index;
+  hb_hashmap_t<unsigned, graph::Lookup*> lookups;
+  hb_vector_t<char*> buffers;
+
+  HB_INTERNAL gsubgpos_graph_context_t (hb_tag_t table_tag_,
+                                        graph_t& graph_);
+
+  ~gsubgpos_graph_context_t ()
+  {
+    for (char* b : buffers)
+      hb_free (b);
+  }
+
+  HB_INTERNAL unsigned create_node (unsigned size);
+
+  void add_buffer (char* buffer)
+  {
+    buffers.push (buffer);
+  }
+
+ private:
+  HB_INTERNAL unsigned num_non_ext_subtables ();
+};
+
+}
+
+#endif  // GRAPH_GSUBGPOS_CONTEXT
diff --git a/thirdparty/harfbuzz/src/graph/gsubgpos-graph.hh b/thirdparty/harfbuzz/src/graph/gsubgpos-graph.hh
new file mode 100644
index 0000000000..afa1152c44
--- /dev/null
+++ b/thirdparty/harfbuzz/src/graph/gsubgpos-graph.hh
@@ -0,0 +1,351 @@
+/*
+ * Copyright © 2022  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Garret Rieger
+ */
+
+#include "graph.hh"
+#include "../hb-ot-layout-gsubgpos.hh"
+#include "../OT/Layout/GSUB/ExtensionSubst.hh"
+#include "gsubgpos-context.hh"
+#include "pairpos-graph.hh"
+
+#ifndef GRAPH_GSUBGPOS_GRAPH_HH
+#define GRAPH_GSUBGPOS_GRAPH_HH
+
+namespace graph {
+
+struct Lookup;
+
+template<typename T>
+struct ExtensionFormat1 : public OT::ExtensionFormat1<T>
+{
+  void reset(unsigned type)
+  {
+    this->format = 1;
+    this->extensionLookupType = type;
+    this->extensionOffset = 0;
+  }
+
+  bool sanitize (graph_t::vertex_t& vertex) const
+  {
+    int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
+    return vertex_len >= OT::ExtensionFormat1<T>::static_size;
+  }
+
+  unsigned get_lookup_type () const
+  {
+    return this->extensionLookupType;
+  }
+
+  unsigned get_subtable_index (graph_t& graph, unsigned this_index) const
+  {
+    return graph.index_for_offset (this_index, &this->extensionOffset);
+  }
+};
+
+struct Lookup : public OT::Lookup
+{
+  unsigned number_of_subtables () const
+  {
+    return subTable.len;
+  }
+
+  bool sanitize (graph_t::vertex_t& vertex) const
+  {
+    int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
+    if (vertex_len < OT::Lookup::min_size) return false;
+    return vertex_len >= this->get_size ();
+  }
+
+  bool is_extension (hb_tag_t table_tag) const
+  {
+    return lookupType == extension_type (table_tag);
+  }
+
+  bool make_extension (gsubgpos_graph_context_t& c,
+                       unsigned this_index)
+  {
+    unsigned type = lookupType;
+    unsigned ext_type = extension_type (c.table_tag);
+    if (!ext_type || is_extension (c.table_tag))
+    {
+      // NOOP
+      return true;
+    }
+
+    DEBUG_MSG (SUBSET_REPACK, nullptr,
+               "Promoting lookup type %u (obj %u) to extension.",
+               type,
+               this_index);
+
+    for (unsigned i = 0; i < subTable.len; i++)
+    {
+      unsigned subtable_index = c.graph.index_for_offset (this_index, &subTable[i]);
+      if (!make_subtable_extension (c,
+                                    this_index,
+                                    subtable_index))
+        return false;
+    }
+
+    lookupType = ext_type;
+    return true;
+  }
+
+  bool split_subtables_if_needed (gsubgpos_graph_context_t& c,
+                                  unsigned this_index)
+  {
+    unsigned type = lookupType;
+    bool is_ext = is_extension (c.table_tag);
+
+    if (c.table_tag != HB_OT_TAG_GPOS)
+      return true;
+
+    if (!is_ext && type != OT::Layout::GPOS_impl::PosLookupSubTable::Type::Pair)
+      return true;
+
+    hb_vector_t<unsigned> all_new_subtables;
+    for (unsigned i = 0; i < subTable.len; i++)
+    {
+      unsigned subtable_index = c.graph.index_for_offset (this_index, &subTable[i]);
+      if (is_ext) {
+        unsigned ext_subtable_index = subtable_index;
+        ExtensionFormat1<OT::Layout::GSUB_impl::ExtensionSubst>* extension =
+            (ExtensionFormat1<OT::Layout::GSUB_impl::ExtensionSubst>*)
+            c.graph.object (ext_subtable_index).head;
+        if (!extension->sanitize (c.graph.vertices_[ext_subtable_index]))
+          continue;
+
+        subtable_index = extension->get_subtable_index (c.graph, ext_subtable_index);
+        type = extension->get_lookup_type ();
+        if (type != OT::Layout::GPOS_impl::PosLookupSubTable::Type::Pair)
+          continue;
+      }
+
+      PairPos* pairPos = (PairPos*) c.graph.object (subtable_index).head;
+      if (!pairPos->sanitize (c.graph.vertices_[subtable_index])) continue;
+
+      hb_vector_t<unsigned> new_sub_tables = pairPos->split_subtables (c, subtable_index);
+      if (new_sub_tables.in_error ()) return false;
+      + new_sub_tables.iter() | hb_sink (all_new_subtables);
+    }
+
+    if (all_new_subtables)
+      add_sub_tables (c, this_index, type, all_new_subtables);
+
+    return true;
+  }
+
+  void add_sub_tables (gsubgpos_graph_context_t& c,
+                       unsigned this_index,
+                       unsigned type,
+                       hb_vector_t<unsigned>& subtable_indices)
+  {
+    bool is_ext = is_extension (c.table_tag);
+    auto& v = c.graph.vertices_[this_index];
+
+    size_t new_size = v.table_size ()
+                      + subtable_indices.length * OT::Offset16::static_size;
+    char* buffer = (char*) hb_calloc (1, new_size);
+    c.add_buffer (buffer);
+    memcpy (buffer, v.obj.head, v.table_size());
+
+    v.obj.head = buffer;
+    v.obj.tail = buffer + new_size;
+
+    Lookup* new_lookup = (Lookup*) buffer;
+
+    new_lookup->subTable.len = subTable.len + subtable_indices.length;
+    unsigned offset_index = subTable.len;
+    for (unsigned subtable_id : subtable_indices)
+    {
+      if (is_ext)
+      {
+        unsigned ext_id = create_extension_subtable (c, subtable_id, type);
+        c.graph.vertices_[subtable_id].parents.push (ext_id);
+        subtable_id = ext_id;
+      }
+
+      auto* link = v.obj.real_links.push ();
+      link->width = 2;
+      link->objidx = subtable_id;
+      link->position = (char*) &new_lookup->subTable[offset_index++] -
+                       (char*) new_lookup;
+      c.graph.vertices_[subtable_id].parents.push (this_index);
+    }
+
+    // The head location of the lookup has changed, invalidating the lookups map entry
+    // in the context. Update the map.
+    c.lookups.set (this_index, new_lookup);
+  }
+
+  unsigned create_extension_subtable (gsubgpos_graph_context_t& c,
+                                      unsigned subtable_index,
+                                      unsigned type)
+  {
+    unsigned extension_size = OT::ExtensionFormat1<OT::Layout::GSUB_impl::ExtensionSubst>::static_size;
+
+    unsigned ext_index = c.create_node (extension_size);
+    if (ext_index == (unsigned) -1)
+      return -1;
+
+    auto& ext_vertex = c.graph.vertices_[ext_index];
+    ExtensionFormat1<OT::Layout::GSUB_impl::ExtensionSubst>* extension =
+        (ExtensionFormat1<OT::Layout::GSUB_impl::ExtensionSubst>*) ext_vertex.obj.head;
+    extension->reset (type);
+
+    // Make extension point at the subtable.
+    auto* l = ext_vertex.obj.real_links.push ();
+
+    l->width = 4;
+    l->objidx = subtable_index;
+    l->position = 4;
+
+    return ext_index;
+  }
+
+  bool make_subtable_extension (gsubgpos_graph_context_t& c,
+                                unsigned lookup_index,
+                                unsigned subtable_index)
+  {
+    unsigned type = lookupType;
+
+    unsigned ext_index = create_extension_subtable(c, subtable_index, type);
+    if (ext_index == (unsigned) -1)
+      return false;
+
+    auto& lookup_vertex = c.graph.vertices_[lookup_index];
+    for (auto& l : lookup_vertex.obj.real_links.writer ())
+    {
+      if (l.objidx == subtable_index)
+        // Change lookup to point at the extension.
+        l.objidx = ext_index;
+    }
+
+    // Make extension point at the subtable.
+    auto& ext_vertex = c.graph.vertices_[ext_index];
+    auto& subtable_vertex = c.graph.vertices_[subtable_index];
+    ext_vertex.parents.push (lookup_index);
+    subtable_vertex.remap_parent (lookup_index, ext_index);
+
+    return true;
+  }
+
+ private:
+  unsigned extension_type (hb_tag_t table_tag) const
+  {
+    switch (table_tag)
+    {
+    case HB_OT_TAG_GPOS: return 9;
+    case HB_OT_TAG_GSUB: return 7;
+    default: return 0;
+    }
+  }
+};
+
+template <typename T>
+struct LookupList : public OT::LookupList<T>
+{
+  bool sanitize (const graph_t::vertex_t& vertex) const
+  {
+    int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
+    if (vertex_len < OT::LookupList<T>::min_size) return false;
+    return vertex_len >= OT::LookupList<T>::item_size * this->len;
+  }
+};
+
+struct GSTAR : public OT::GSUBGPOS
+{
+  static GSTAR* graph_to_gstar (graph_t& graph)
+  {
+    const auto& r = graph.root ();
+
+    GSTAR* gstar = (GSTAR*) r.obj.head;
+    if (!gstar->sanitize (r))
+      return nullptr;
+
+    return gstar;
+  }
+
+  const void* get_lookup_list_field_offset () const
+  {
+    switch (u.version.major) {
+    case 1: return u.version1.get_lookup_list_offset ();
+#ifndef HB_NO_BORING_EXPANSION
+    case 2: return u.version2.get_lookup_list_offset ();
+#endif
+    default: return 0;
+    }
+  }
+
+  bool sanitize (const graph_t::vertex_t& vertex)
+  {
+    int64_t len = vertex.obj.tail - vertex.obj.head;
+    if (len < OT::GSUBGPOS::min_size) return false;
+    return len >= get_size ();
+  }
+
+  void find_lookups (graph_t& graph,
+                     hb_hashmap_t<unsigned, Lookup*>& lookups /* OUT */)
+  {
+    switch (u.version.major) {
+      case 1: find_lookups<SmallTypes> (graph, lookups); break;
+#ifndef HB_NO_BORING_EXPANSION
+      case 2: find_lookups<MediumTypes> (graph, lookups); break;
+#endif
+    }
+  }
+
+  unsigned get_lookup_list_index (graph_t& graph)
+  {
+    return graph.index_for_offset (graph.root_idx (),
+                                   get_lookup_list_field_offset());
+  }
+
+  template<typename Types>
+  void find_lookups (graph_t& graph,
+                     hb_hashmap_t<unsigned, Lookup*>& lookups /* OUT */)
+  {
+    unsigned lookup_list_idx = get_lookup_list_index (graph);
+
+    const LookupList<Types>* lookupList =
+        (const LookupList<Types>*) graph.object (lookup_list_idx).head;
+    if (!lookupList->sanitize (graph.vertices_[lookup_list_idx]))
+      return;
+
+    for (unsigned i = 0; i < lookupList->len; i++)
+    {
+      unsigned lookup_idx = graph.index_for_offset (lookup_list_idx, &(lookupList->arrayZ[i]));
+      Lookup* lookup = (Lookup*) graph.object (lookup_idx).head;
+      if (!lookup->sanitize (graph.vertices_[lookup_idx])) continue;
+      lookups.set (lookup_idx, lookup);
+    }
+  }
+};
+
+
+
+
+}
+
+#endif  /* GRAPH_GSUBGPOS_GRAPH_HH */
diff --git a/thirdparty/harfbuzz/src/graph/pairpos-graph.hh b/thirdparty/harfbuzz/src/graph/pairpos-graph.hh
new file mode 100644
index 0000000000..3ca4fc701c
--- /dev/null
+++ b/thirdparty/harfbuzz/src/graph/pairpos-graph.hh
@@ -0,0 +1,299 @@
+/*
+ * Copyright © 2022  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Garret Rieger
+ */
+
+#ifndef GRAPH_PAIRPOS_GRAPH_HH
+#define GRAPH_PAIRPOS_GRAPH_HH
+
+#include "coverage-graph.hh"
+#include "../OT/Layout/GPOS/PairPos.hh"
+#include "../OT/Layout/GPOS/PosLookupSubTable.hh"
+
+namespace graph {
+
+struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3<SmallTypes>
+{
+  bool sanitize (graph_t::vertex_t& vertex) const
+  {
+    int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
+    unsigned min_size = OT::Layout::GPOS_impl::PairPosFormat1_3<SmallTypes>::min_size;
+    if (vertex_len < min_size) return false;
+
+    return vertex_len >=
+        min_size + pairSet.get_size () - pairSet.len.get_size();
+  }
+
+  hb_vector_t<unsigned> split_subtables (gsubgpos_graph_context_t& c, unsigned this_index)
+  {
+    hb_set_t visited;
+
+    const unsigned coverage_id = c.graph.index_for_offset (this_index, &coverage);
+    const unsigned coverage_size = c.graph.vertices_[coverage_id].table_size ();
+    const unsigned base_size = OT::Layout::GPOS_impl::PairPosFormat1_3<SmallTypes>::min_size
+                               + coverage_size;
+
+    unsigned accumulated = base_size;
+    hb_vector_t<unsigned> split_points;
+    for (unsigned i = 0; i < pairSet.len; i++)
+    {
+      unsigned pair_set_index = pair_set_graph_index (c, this_index, i);
+      accumulated += c.graph.find_subgraph_size (pair_set_index, visited);
+      accumulated += SmallTypes::size; // for PairSet offset.
+
+      // TODO(garretrieger): don't count the size of the largest pairset against the limit, since
+      //                     it will be packed last in the order and does not contribute to
+      //                     the 64kb limit.
+
+      if (accumulated > (1 << 16))
+      {
+        split_points.push (i);
+        accumulated = base_size;
+        visited.clear (); // Pretend node sharing isn't allowed between splits.
+      }
+    }
+
+    return do_split (c, this_index, split_points);
+  }
+
+ private:
+
+  // Split this PairPos into two or more PairPos's. split_points defines
+  // the indices (first index to include in the new table) to split at.
+  // Returns the object id's of the newly created PairPos subtables.
+  hb_vector_t<unsigned> do_split (gsubgpos_graph_context_t& c,
+                                  unsigned this_index,
+                                  const hb_vector_t<unsigned> split_points)
+  {
+    hb_vector_t<unsigned> new_objects;
+    if (!split_points)
+      return new_objects;
+
+    for (unsigned i = 0; i < split_points.length; i++)
+    {
+      unsigned start = split_points[i];
+      unsigned end = (i < split_points.length - 1) ? split_points[i + 1] : pairSet.len;
+      unsigned id = clone_range (c, this_index, start, end);
+
+      if (id == (unsigned) -1)
+      {
+        new_objects.reset ();
+        new_objects.allocated = -1; // mark error
+        return new_objects;
+      }
+      new_objects.push (id);
+    }
+
+    if (!shrink (c, this_index, split_points[0]))
+    {
+      new_objects.reset ();
+      new_objects.allocated = -1; // mark error
+    }
+
+    return new_objects;
+  }
+
+  bool shrink (gsubgpos_graph_context_t& c,
+               unsigned this_index,
+               unsigned count)
+  {
+    DEBUG_MSG (SUBSET_REPACK, nullptr,
+               "  Shrinking PairPosFormat1 (%u) to [0, %u).",
+               this_index,
+               count);
+    unsigned old_count = pairSet.len;
+    if (count >= old_count)
+      return true;
+
+    pairSet.len = count;
+    c.graph.vertices_[this_index].obj.tail -= (old_count - count) * SmallTypes::size;
+
+    unsigned coverage_id = c.graph.index_for_offset (this_index, &coverage);
+    unsigned coverage_size = c.graph.vertices_[coverage_id].table_size ();
+    auto& coverage_v = c.graph.vertices_[coverage_id];
+    Coverage* coverage_table = (Coverage*) coverage_v.obj.head;
+    if (!coverage_table->sanitize (coverage_v))
+      return false;
+
+    auto new_coverage =
+        + hb_zip (coverage_table->iter (), hb_range ())
+        | hb_filter ([&] (hb_pair_t<unsigned, unsigned> p) {
+          return p.second < count;
+        })
+        | hb_map_retains_sorting (hb_first)
+        ;
+
+    return make_coverage (c, new_coverage, coverage_id, coverage_size);
+  }
+
+  // Create a new PairPos including PairSet's from start (inclusive) to end (exclusive).
+  // Returns object id of the new object.
+  unsigned clone_range (gsubgpos_graph_context_t& c,
+                        unsigned this_index,
+                        unsigned start, unsigned end) const
+  {
+    DEBUG_MSG (SUBSET_REPACK, nullptr,
+               "  Cloning PairPosFormat1 (%u) range [%u, %u).", this_index, start, end);
+
+    unsigned num_pair_sets = end - start;
+    unsigned prime_size = OT::Layout::GPOS_impl::PairPosFormat1_3<SmallTypes>::min_size
+                          + num_pair_sets * SmallTypes::size;
+
+    unsigned pair_pos_prime_id = c.create_node (prime_size);
+    if (pair_pos_prime_id == (unsigned) -1) return -1;
+
+    PairPosFormat1* pair_pos_prime = (PairPosFormat1*) c.graph.object (pair_pos_prime_id).head;
+    pair_pos_prime->format = this->format;
+    pair_pos_prime->valueFormat[0] = this->valueFormat[0];
+    pair_pos_prime->valueFormat[1] = this->valueFormat[1];
+    pair_pos_prime->pairSet.len = num_pair_sets;
+
+    for (unsigned i = start; i < end; i++)
+    {
+      c.graph.move_child<> (this_index,
+                            &pairSet[i],
+                            pair_pos_prime_id,
+                            &pair_pos_prime->pairSet[i - start]);
+    }
+
+    unsigned coverage_id = c.graph.index_for_offset (this_index, &coverage);
+    unsigned coverage_size = c.graph.vertices_[coverage_id].table_size ();
+    auto& coverage_v = c.graph.vertices_[coverage_id];
+    Coverage* coverage_table = (Coverage*) coverage_v.obj.head;
+    if (!coverage_table->sanitize (coverage_v))
+      return false;
+
+    auto new_coverage =
+        + hb_zip (coverage_table->iter (), hb_range ())
+        | hb_filter ([&] (hb_pair_t<unsigned, unsigned> p) {
+          return p.second >= start && p.second < end;
+        })
+        | hb_map_retains_sorting (hb_first)
+        ;
+
+    unsigned coverage_prime_id = c.graph.new_node (nullptr, nullptr);
+    auto& coverage_prime_vertex = c.graph.vertices_[coverage_prime_id];
+    if (!make_coverage (c, new_coverage, coverage_prime_id, coverage_size))
+      return -1;
+
+    auto* coverage_link = c.graph.vertices_[pair_pos_prime_id].obj.real_links.push ();
+    coverage_link->width = SmallTypes::size;
+    coverage_link->objidx = coverage_prime_id;
+    coverage_link->position = 2;
+    coverage_prime_vertex.parents.push (pair_pos_prime_id);
+
+    return pair_pos_prime_id;
+  }
+
+  template<typename It>
+  bool make_coverage (gsubgpos_graph_context_t& c,
+                      It glyphs,
+                      unsigned dest_obj,
+                      unsigned max_size) const
+  {
+    char* buffer = (char*) hb_calloc (1, max_size);
+    hb_serialize_context_t serializer (buffer, max_size);
+    Coverage_serialize (&serializer, glyphs);
+    serializer.end_serialize ();
+    if (serializer.in_error ())
+    {
+      hb_free (buffer);
+      return false;
+    }
+
+    hb_bytes_t coverage_copy = serializer.copy_bytes ();
+    c.add_buffer ((char *) coverage_copy.arrayZ); // Give ownership to the context, it will cleanup the buffer.
+
+    auto& obj = c.graph.vertices_[dest_obj].obj;
+    obj.head = (char *) coverage_copy.arrayZ;
+    obj.tail = obj.head + coverage_copy.length;
+
+    hb_free (buffer);
+    return true;
+  }
+
+  unsigned pair_set_graph_index (gsubgpos_graph_context_t& c, unsigned this_index, unsigned i) const
+  {
+    return c.graph.index_for_offset (this_index, &pairSet[i]);
+  }
+};
+
+struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4<SmallTypes>
+{
+  bool sanitize (graph_t::vertex_t& vertex) const
+  {
+    // TODO(garretrieger): implement me!
+    return true;
+  }
+
+  hb_vector_t<unsigned> split_subtables (gsubgpos_graph_context_t& c, unsigned this_index)
+  {
+    // TODO(garretrieger): implement me!
+    return hb_vector_t<unsigned> ();
+  }
+};
+
+struct PairPos : public OT::Layout::GPOS_impl::PairPos
+{
+  hb_vector_t<unsigned> split_subtables (gsubgpos_graph_context_t& c, unsigned this_index)
+  {
+    switch (u.format) {
+    case 1:
+      return ((PairPosFormat1*)(&u.format1))->split_subtables (c, this_index);
+    case 2:
+      return ((PairPosFormat2*)(&u.format2))->split_subtables (c, this_index);
+#ifndef HB_NO_BORING_EXPANSION
+    case 3: HB_FALLTHROUGH;
+    case 4: HB_FALLTHROUGH;
+      // Don't split 24bit PairPos's.
+#endif
+    default:
+      return hb_vector_t<unsigned> ();
+    }
+  }
+
+  bool sanitize (graph_t::vertex_t& vertex) const
+  {
+    int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
+    if (vertex_len < u.format.get_size ()) return false;
+
+    switch (u.format) {
+    case 1:
+      return ((PairPosFormat1*)(&u.format1))->sanitize (vertex);
+    case 2:
+      return ((PairPosFormat2*)(&u.format2))->sanitize (vertex);
+#ifndef HB_NO_BORING_EXPANSION
+    case 3: HB_FALLTHROUGH;
+    case 4: HB_FALLTHROUGH;
+#endif
+    default:
+      // We don't handle format 3 and 4 here.
+      return false;
+    }
+  }
+};
+
+}
+
+#endif  // GRAPH_PAIRPOS_GRAPH_HH
diff --git a/thirdparty/harfbuzz/src/hb-blob.cc b/thirdparty/harfbuzz/src/hb-blob.cc
index 47062eab9a..9bc12ea3fa 100644
--- a/thirdparty/harfbuzz/src/hb-blob.cc
+++ b/thirdparty/harfbuzz/src/hb-blob.cc
@@ -303,7 +303,7 @@ hb_blob_set_user_data (hb_blob_t          *blob,
  * Since: 0.9.2
  **/
 void *
-hb_blob_get_user_data (hb_blob_t          *blob,
+hb_blob_get_user_data (const hb_blob_t    *blob,
 		       hb_user_data_key_t *key)
 {
   return hb_object_get_user_data (blob, key);
diff --git a/thirdparty/harfbuzz/src/hb-blob.h b/thirdparty/harfbuzz/src/hb-blob.h
index 203f9e19dd..4eb42314da 100644
--- a/thirdparty/harfbuzz/src/hb-blob.h
+++ b/thirdparty/harfbuzz/src/hb-blob.h
@@ -135,7 +135,7 @@ hb_blob_set_user_data (hb_blob_t          *blob,
 
 
 HB_EXTERN void *
-hb_blob_get_user_data (hb_blob_t          *blob,
+hb_blob_get_user_data (const hb_blob_t    *blob,
 		       hb_user_data_key_t *key);
 
 
diff --git a/thirdparty/harfbuzz/src/hb-buffer.cc b/thirdparty/harfbuzz/src/hb-buffer.cc
index fddda23304..57a5ae03ed 100644
--- a/thirdparty/harfbuzz/src/hb-buffer.cc
+++ b/thirdparty/harfbuzz/src/hb-buffer.cc
@@ -387,9 +387,11 @@ hb_buffer_t::clear_positions ()
   hb_memset (pos, 0, sizeof (pos[0]) * len);
 }
 
-void
+bool
 hb_buffer_t::sync ()
 {
+  bool ret = false;
+
   assert (have_output);
 
   assert (idx <= len);
@@ -403,12 +405,39 @@ hb_buffer_t::sync ()
     info = out_info;
   }
   len = out_len;
+  ret = true;
 
 reset:
   have_output = false;
   out_len = 0;
   out_info = info;
   idx = 0;
+
+  return ret;
+}
+
+int
+hb_buffer_t::sync_so_far ()
+{
+  bool had_output = have_output;
+  unsigned out_i = out_len;
+  unsigned i = idx;
+  unsigned old_idx = idx;
+
+  if (sync ())
+    idx = out_i;
+  else
+    idx = i;
+
+  if (had_output)
+  {
+    have_output = true;
+    out_len = idx;
+  }
+
+  assert (idx <= len);
+
+  return idx - old_idx;
 }
 
 bool
@@ -802,7 +831,7 @@ hb_buffer_set_user_data (hb_buffer_t        *buffer,
  * Since: 0.9.2
  **/
 void *
-hb_buffer_get_user_data (hb_buffer_t        *buffer,
+hb_buffer_get_user_data (const hb_buffer_t  *buffer,
 			 hb_user_data_key_t *key)
 {
   return hb_object_get_user_data (buffer, key);
@@ -2090,8 +2119,16 @@ hb_buffer_set_message_func (hb_buffer_t *buffer,
 bool
 hb_buffer_t::message_impl (hb_font_t *font, const char *fmt, va_list ap)
 {
+  assert (!have_output || (out_info == info && out_len == idx));
+
+  message_depth++;
+
   char buf[100];
   vsnprintf (buf, sizeof (buf), fmt, ap);
-  return (bool) this->message_func (this, font, buf, this->message_data);
+  bool ret = (bool) this->message_func (this, font, buf, this->message_data);
+
+  message_depth--;
+
+  return ret;
 }
 #endif
diff --git a/thirdparty/harfbuzz/src/hb-buffer.h b/thirdparty/harfbuzz/src/hb-buffer.h
index e095c5344c..c6af759fb9 100644
--- a/thirdparty/harfbuzz/src/hb-buffer.h
+++ b/thirdparty/harfbuzz/src/hb-buffer.h
@@ -142,6 +142,15 @@ typedef struct hb_glyph_info_t {
  *				   shaping, otherwise the buffer flag will not be
  *				   reliably produced.
  * 				   Since: 4.0.0
+ * @HB_GLYPH_FLAG_SAFE_TO_INSERT_TATWEEL: In scripts that use elongation (Arabic,
+				   Mongolian, Syriac, etc.), this flag signifies
+				   that it is safe to insert a U+0640 TATWEEL
+				   character *before* this cluster for elongation.
+				   This flag does not determine the
+				   script-specific elongation places, but only
+				   when it is safe to do the elongation without
+				   interrupting text shaping.
+				   Since: 5.1.0
  * @HB_GLYPH_FLAG_DEFINED: All the currently defined flags.
  *
  * Flags for #hb_glyph_info_t.
@@ -149,10 +158,11 @@ typedef struct hb_glyph_info_t {
  * Since: 1.5.0
  */
 typedef enum { /*< flags >*/
-  HB_GLYPH_FLAG_UNSAFE_TO_BREAK		= 0x00000001,
-  HB_GLYPH_FLAG_UNSAFE_TO_CONCAT	= 0x00000002,
+  HB_GLYPH_FLAG_UNSAFE_TO_BREAK			= 0x00000001,
+  HB_GLYPH_FLAG_UNSAFE_TO_CONCAT		= 0x00000002,
+  HB_GLYPH_FLAG_SAFE_TO_INSERT_TATWEEL		= 0x00000004,
 
-  HB_GLYPH_FLAG_DEFINED			= 0x00000003 /* OR of all defined flags */
+  HB_GLYPH_FLAG_DEFINED				= 0x00000007 /* OR of all defined flags */
 } hb_glyph_flags_t;
 
 HB_EXTERN hb_glyph_flags_t
@@ -266,7 +276,7 @@ hb_buffer_set_user_data (hb_buffer_t        *buffer,
 			 hb_bool_t           replace);
 
 HB_EXTERN void *
-hb_buffer_get_user_data (hb_buffer_t        *buffer,
+hb_buffer_get_user_data (const hb_buffer_t  *buffer,
 			 hb_user_data_key_t *key);
 
 
@@ -373,6 +383,10 @@ hb_buffer_guess_segment_properties (hb_buffer_t *buffer);
  *                      flag indicating that the @HB_GLYPH_FLAG_UNSAFE_TO_CONCAT
  *                      glyph-flag should be produced by the shaper. By default
  *                      it will not be produced since it incurs a cost. Since: 4.0.0
+ * @HB_BUFFER_FLAG_PRODUCE_SAFE_TO_INSERT_TATWEEL:
+ *                      flag indicating that the @HB_GLYPH_FLAG_SAFE_TO_INSERT_TATWEEL
+ *                      glyph-flag should be produced by the shaper. By default
+ *                      it will not be produced. Since: 5.1.0
  * @HB_BUFFER_FLAG_DEFINED: All currently defined flags: Since: 4.4.0
  *
  * Flags for #hb_buffer_t.
@@ -388,8 +402,9 @@ typedef enum { /*< flags >*/
   HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE	= 0x00000010u,
   HB_BUFFER_FLAG_VERIFY				= 0x00000020u,
   HB_BUFFER_FLAG_PRODUCE_UNSAFE_TO_CONCAT	= 0x00000040u,
+  HB_BUFFER_FLAG_PRODUCE_SAFE_TO_INSERT_TATWEEL	= 0x00000080u,
 
-  HB_BUFFER_FLAG_DEFINED			= 0x0000007Fu
+  HB_BUFFER_FLAG_DEFINED			= 0x000000FFu
 } hb_buffer_flags_t;
 
 HB_EXTERN void
diff --git a/thirdparty/harfbuzz/src/hb-buffer.hh b/thirdparty/harfbuzz/src/hb-buffer.hh
index 6ca78f28d4..26c3f0fac8 100644
--- a/thirdparty/harfbuzz/src/hb-buffer.hh
+++ b/thirdparty/harfbuzz/src/hb-buffer.hh
@@ -288,7 +288,8 @@ struct hb_buffer_t
 
   HB_INTERNAL void guess_segment_properties ();
 
-  HB_INTERNAL void sync ();
+  HB_INTERNAL bool sync ();
+  HB_INTERNAL int sync_so_far ();
   HB_INTERNAL void clear_output ();
   HB_INTERNAL void clear_positions ();
 
@@ -461,6 +462,17 @@ struct hb_buffer_t
 		      start, end,
 		      true);
   }
+  void safe_to_insert_tatweel (unsigned int start = 0, unsigned int end = -1)
+  {
+    if ((flags & HB_BUFFER_FLAG_PRODUCE_SAFE_TO_INSERT_TATWEEL) == 0)
+    {
+      unsafe_to_break (start, end);
+      return;
+    }
+    _set_glyph_flags (HB_GLYPH_FLAG_SAFE_TO_INSERT_TATWEEL,
+		      start, end,
+		      true);
+  }
   void unsafe_to_concat (unsigned int start = 0, unsigned int end = -1)
   {
     if (likely ((flags & HB_BUFFER_FLAG_PRODUCE_UNSAFE_TO_CONCAT) == 0))
@@ -555,15 +567,11 @@ struct hb_buffer_t
     if (likely (!messaging ()))
       return true;
 
-    message_depth++;
-
     va_list ap;
     va_start (ap, fmt);
     bool ret = message_impl (font, fmt, ap);
     va_end (ap);
 
-    message_depth--;
-
     return ret;
 #endif
   }
diff --git a/thirdparty/harfbuzz/src/hb-cplusplus.hh b/thirdparty/harfbuzz/src/hb-cplusplus.hh
index f06a32d912..c4d9d29e23 100644
--- a/thirdparty/harfbuzz/src/hb-cplusplus.hh
+++ b/thirdparty/harfbuzz/src/hb-cplusplus.hh
@@ -130,7 +130,7 @@ template <typename T,
 				       void *,
 				       hb_destroy_func_t,
 				       hb_bool_t),
-	  void * (*_get_user_data) (T *,
+	  void * (*_get_user_data) (const T *,
 				    hb_user_data_key_t *)>
 struct vtable_t
 {
@@ -164,6 +164,27 @@ HB_DEFINE_VTABLE (unicode_funcs);
 #undef HB_DEFINE_VTABLE
 
 
+#ifdef HB_SUBSET_H
+
+#define HB_DEFINE_VTABLE(name) \
+	template<> \
+	struct vtable<hb_##name##_t> \
+	     : vtable_t<hb_##name##_t, \
+			nullptr, \
+			&hb_##name##_reference, \
+			&hb_##name##_destroy, \
+			&hb_##name##_set_user_data, \
+			&hb_##name##_get_user_data> {}
+
+
+HB_DEFINE_VTABLE (subset_input);
+HB_DEFINE_VTABLE (subset_plan);
+
+#undef HB_DEFINE_VTABLE
+
+#endif
+
+
 } // namespace hb
 
 /* Workaround for GCC < 7, see:
diff --git a/thirdparty/harfbuzz/src/hb-debug.hh b/thirdparty/harfbuzz/src/hb-debug.hh
index 3ac7440e80..905a46a087 100644
--- a/thirdparty/harfbuzz/src/hb-debug.hh
+++ b/thirdparty/harfbuzz/src/hb-debug.hh
@@ -460,4 +460,9 @@ struct hb_no_trace_t {
 #endif
 
 
+#ifndef HB_BUFFER_MESSAGE_MORE
+#define HB_BUFFER_MESSAGE_MORE (HB_DEBUG+1)
+#endif
+
+
 #endif /* HB_DEBUG_HH */
diff --git a/thirdparty/harfbuzz/src/hb-face.cc b/thirdparty/harfbuzz/src/hb-face.cc
index 8f8b1a6d14..61adbdd503 100644
--- a/thirdparty/harfbuzz/src/hb-face.cc
+++ b/thirdparty/harfbuzz/src/hb-face.cc
@@ -342,7 +342,7 @@ hb_face_set_user_data (hb_face_t          *face,
  * Since: 0.9.2
  **/
 void *
-hb_face_get_user_data (hb_face_t          *face,
+hb_face_get_user_data (const hb_face_t    *face,
 		       hb_user_data_key_t *key)
 {
   return hb_object_get_user_data (face, key);
diff --git a/thirdparty/harfbuzz/src/hb-face.h b/thirdparty/harfbuzz/src/hb-face.h
index 3b7477a76c..6ef2f8b886 100644
--- a/thirdparty/harfbuzz/src/hb-face.h
+++ b/thirdparty/harfbuzz/src/hb-face.h
@@ -96,7 +96,7 @@ hb_face_set_user_data (hb_face_t          *face,
 		       hb_bool_t           replace);
 
 HB_EXTERN void *
-hb_face_get_user_data (hb_face_t          *face,
+hb_face_get_user_data (const hb_face_t    *face,
 		       hb_user_data_key_t *key);
 
 HB_EXTERN void
diff --git a/thirdparty/harfbuzz/src/hb-font.cc b/thirdparty/harfbuzz/src/hb-font.cc
index fd9073c33e..856bbdda32 100644
--- a/thirdparty/harfbuzz/src/hb-font.cc
+++ b/thirdparty/harfbuzz/src/hb-font.cc
@@ -781,8 +781,8 @@ hb_font_funcs_set_user_data (hb_font_funcs_t    *ffuncs,
  * Since: 0.9.2
  **/
 void *
-hb_font_funcs_get_user_data (hb_font_funcs_t    *ffuncs,
-			     hb_user_data_key_t *key)
+hb_font_funcs_get_user_data (const hb_font_funcs_t *ffuncs,
+			     hb_user_data_key_t    *key)
 {
   return hb_object_get_user_data (ffuncs, key);
 }
@@ -1897,7 +1897,7 @@ hb_font_set_user_data (hb_font_t          *font,
  * Since: 0.9.2
  **/
 void *
-hb_font_get_user_data (hb_font_t          *font,
+hb_font_get_user_data (const hb_font_t    *font,
 		       hb_user_data_key_t *key)
 {
   return hb_object_get_user_data (font, key);
diff --git a/thirdparty/harfbuzz/src/hb-font.h b/thirdparty/harfbuzz/src/hb-font.h
index 3f27bca288..e2c3df4a5a 100644
--- a/thirdparty/harfbuzz/src/hb-font.h
+++ b/thirdparty/harfbuzz/src/hb-font.h
@@ -86,8 +86,8 @@ hb_font_funcs_set_user_data (hb_font_funcs_t    *ffuncs,
 
 
 HB_EXTERN void *
-hb_font_funcs_get_user_data (hb_font_funcs_t    *ffuncs,
-			     hb_user_data_key_t *key);
+hb_font_funcs_get_user_data (const hb_font_funcs_t *ffuncs,
+			     hb_user_data_key_t    *key);
 
 
 HB_EXTERN void
@@ -993,7 +993,7 @@ hb_font_set_user_data (hb_font_t          *font,
 
 
 HB_EXTERN void *
-hb_font_get_user_data (hb_font_t          *font,
+hb_font_get_user_data (const hb_font_t    *font,
 		       hb_user_data_key_t *key);
 
 HB_EXTERN void
diff --git a/thirdparty/harfbuzz/src/hb-ft.cc b/thirdparty/harfbuzz/src/hb-ft.cc
index 5c88a7f3bd..ef073475cb 100644
--- a/thirdparty/harfbuzz/src/hb-ft.cc
+++ b/thirdparty/harfbuzz/src/hb-ft.cc
@@ -1086,7 +1086,8 @@ hb_ft_font_changed (hb_font_t *font)
   }
 #endif
 
-  _hb_ft_hb_font_check_changed (font, ft_font);
+  ft_font->advance_cache.clear ();
+  ft_font->cached_serial = font->serial;
 }
 
 /**
diff --git a/thirdparty/harfbuzz/src/hb-map.cc b/thirdparty/harfbuzz/src/hb-map.cc
index a29fa1a313..5c5f5de59e 100644
--- a/thirdparty/harfbuzz/src/hb-map.cc
+++ b/thirdparty/harfbuzz/src/hb-map.cc
@@ -145,7 +145,7 @@ hb_map_set_user_data (hb_map_t           *map,
  * Since: 1.7.7
  **/
 void *
-hb_map_get_user_data (hb_map_t           *map,
+hb_map_get_user_data (const hb_map_t     *map,
 		      hb_user_data_key_t *key)
 {
   return hb_object_get_user_data (map, key);
diff --git a/thirdparty/harfbuzz/src/hb-map.h b/thirdparty/harfbuzz/src/hb-map.h
index 41d877d6a1..3a067c5c73 100644
--- a/thirdparty/harfbuzz/src/hb-map.h
+++ b/thirdparty/harfbuzz/src/hb-map.h
@@ -74,7 +74,7 @@ hb_map_set_user_data (hb_map_t           *map,
 		      hb_bool_t           replace);
 
 HB_EXTERN void *
-hb_map_get_user_data (hb_map_t           *map,
+hb_map_get_user_data (const hb_map_t     *map,
 		      hb_user_data_key_t *key);
 
 
diff --git a/thirdparty/harfbuzz/src/hb-number-parser.hh b/thirdparty/harfbuzz/src/hb-number-parser.hh
index ec68c3a728..1a9dbba6dd 100644
--- a/thirdparty/harfbuzz/src/hb-number-parser.hh
+++ b/thirdparty/harfbuzz/src/hb-number-parser.hh
@@ -31,7 +31,7 @@
 #include "hb.hh"
 
 
-#line 32 "hb-number-parser.hh"
+#line 35 "hb-number-parser.hh"
 static const unsigned char _double_parser_trans_keys[] = {
 	0u, 0u, 43u, 57u, 46u, 57u, 48u, 57u, 43u, 57u, 48u, 57u, 48u, 101u, 48u, 57u, 
 	46u, 101u, 0
@@ -135,12 +135,12 @@ strtod_rl (const char *p, const char **end_ptr /* IN/OUT */)
 
   int cs;
   
-#line 132 "hb-number-parser.hh"
+#line 139 "hb-number-parser.hh"
 	{
 	cs = double_parser_start;
 	}
 
-#line 135 "hb-number-parser.hh"
+#line 144 "hb-number-parser.hh"
 	{
 	int _slen;
 	int _trans;
@@ -198,7 +198,7 @@ _resume:
 	  exp_overflow = true;
 }
 	break;
-#line 187 "hb-number-parser.hh"
+#line 202 "hb-number-parser.hh"
 	}
 
 _again:
diff --git a/thirdparty/harfbuzz/src/hb-ot-layout-common.hh b/thirdparty/harfbuzz/src/hb-ot-layout-common.hh
index 9a4157b21f..0532039aad 100644
--- a/thirdparty/harfbuzz/src/hb-ot-layout-common.hh
+++ b/thirdparty/harfbuzz/src/hb-ot-layout-common.hh
@@ -72,10 +72,6 @@ using OT::Layout::MediumTypes;
 #define HB_MAX_LANGSYS_FEATURE_COUNT 50000
 #endif
 
-#ifndef HB_MAX_FEATURES
-#define HB_MAX_FEATURES 750
-#endif
-
 #ifndef HB_MAX_FEATURE_INDICES
 #define HB_MAX_FEATURE_INDICES	1500
 #endif
@@ -1337,7 +1333,7 @@ struct Lookup
     return_trace (true);
   }
 
-  private:
+  protected:
   HBUINT16	lookupType;		/* Different enumerations for GSUB and GPOS */
   HBUINT16	lookupFlag;		/* Lookup qualifiers */
   Array16Of<Offset16>
diff --git a/thirdparty/harfbuzz/src/hb-ot-layout-gsubgpos.hh b/thirdparty/harfbuzz/src/hb-ot-layout-gsubgpos.hh
index 5acd228b83..c77ec12fbe 100644
--- a/thirdparty/harfbuzz/src/hb-ot-layout-gsubgpos.hh
+++ b/thirdparty/harfbuzz/src/hb-ot-layout-gsubgpos.hh
@@ -1602,9 +1602,28 @@ static inline void apply_lookup (hb_ot_apply_context_t *c,
     if (unlikely (buffer->max_ops <= 0))
       break;
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      if (buffer->have_output)
+        c->buffer->sync_so_far ();
+      c->buffer->message (c->font,
+			  "recursing to lookup %u at %d",
+			  (unsigned) lookupRecord[i].lookupListIndex,
+			  buffer->idx);
+    }
+
     if (!c->recurse (lookupRecord[i].lookupListIndex))
       continue;
 
+    if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
+    {
+      if (buffer->have_output)
+        c->buffer->sync_so_far ();
+      c->buffer->message (c->font,
+			  "recursed to lookup %u",
+			  (unsigned) lookupRecord[i].lookupListIndex);
+    }
+
     unsigned int new_len = buffer->backtrack_len () + buffer->lookahead_len ();
     int delta = new_len - orig_len;
 
@@ -4010,6 +4029,11 @@ struct GSUBGPOSVersion1_2
 	   (version.to_int () >= 0x00010001u ? featureVars.static_size : 0);
   }
 
+  const typename Types::template OffsetTo<LookupList<Types>>* get_lookup_list_offset () const
+  {
+    return &lookupList;
+  }
+
   template <typename TLookup>
   bool sanitize (hb_sanitize_context_t *c) const
   {
diff --git a/thirdparty/harfbuzz/src/hb-ot-shape.cc b/thirdparty/harfbuzz/src/hb-ot-shape.cc
index 2ada84b8a3..7f679cfd39 100644
--- a/thirdparty/harfbuzz/src/hb-ot-shape.cc
+++ b/thirdparty/harfbuzz/src/hb-ot-shape.cc
@@ -1141,6 +1141,18 @@ hb_propagate_flags (hb_buffer_t *buffer)
   if (!(buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_GLYPH_FLAGS))
     return;
 
+  /* If we are producing SAFE_TO_INSERT_TATWEEL, then do two things:
+   *
+   * - If the places that the Arabic shaper marked as SAFE_TO_INSERT_TATWEEL,
+   *   are UNSAFE_TO_BREAK, then clear the SAFE_TO_INSERT_TATWEEL,
+   * - Any place that is SAFE_TO_INSERT_TATWEEL, is also now UNSAFE_TO_BREAK.
+   *
+   * We couldn't make this interaction earlier. It has to be done here.
+   */
+  bool flip_tatweel = buffer->flags & HB_BUFFER_FLAG_PRODUCE_SAFE_TO_INSERT_TATWEEL;
+
+  bool clear_concat = (buffer->flags & HB_BUFFER_FLAG_PRODUCE_UNSAFE_TO_CONCAT) == 0;
+
   hb_glyph_info_t *info = buffer->info;
 
   foreach_cluster (buffer, start, end)
@@ -1148,9 +1160,20 @@ hb_propagate_flags (hb_buffer_t *buffer)
     unsigned int mask = 0;
     for (unsigned int i = start; i < end; i++)
       mask |= info[i].mask & HB_GLYPH_FLAG_DEFINED;
-    if (mask)
-      for (unsigned int i = start; i < end; i++)
-	info[i].mask |= mask;
+
+    if (flip_tatweel)
+    {
+      if (mask & HB_GLYPH_FLAG_UNSAFE_TO_BREAK)
+	mask &= ~HB_GLYPH_FLAG_SAFE_TO_INSERT_TATWEEL;
+      if (mask & HB_GLYPH_FLAG_SAFE_TO_INSERT_TATWEEL)
+	mask |= HB_GLYPH_FLAG_UNSAFE_TO_BREAK | HB_GLYPH_FLAG_UNSAFE_TO_CONCAT;
+    }
+
+    if (clear_concat)
+	mask &= ~HB_GLYPH_FLAG_UNSAFE_TO_CONCAT;
+
+    for (unsigned int i = start; i < end; i++)
+      info[i].mask = mask;
   }
 }
 
diff --git a/thirdparty/harfbuzz/src/hb-ot-shaper-arabic.cc b/thirdparty/harfbuzz/src/hb-ot-shaper-arabic.cc
index b331a048b6..ed2748b828 100644
--- a/thirdparty/harfbuzz/src/hb-ot-shaper-arabic.cc
+++ b/thirdparty/harfbuzz/src/hb-ot-shaper-arabic.cc
@@ -331,7 +331,7 @@ arabic_joining (hb_buffer_t *buffer)
     if (entry->prev_action != NONE && prev != UINT_MAX)
     {
       info[prev].arabic_shaping_action() = entry->prev_action;
-      buffer->unsafe_to_break (prev, i + 1);
+      buffer->safe_to_insert_tatweel (prev, i + 1);
     }
     else
     {
@@ -365,7 +365,7 @@ arabic_joining (hb_buffer_t *buffer)
     if (entry->prev_action != NONE && prev != UINT_MAX)
     {
       info[prev].arabic_shaping_action() = entry->prev_action;
-      buffer->unsafe_to_break (prev, buffer->len);
+      buffer->safe_to_insert_tatweel (prev, buffer->len);
     }
     else if (2 <= state && state <= 5) /* States that have a possible prev_action. */
     {
diff --git a/thirdparty/harfbuzz/src/hb-ot-shaper-use-table.hh b/thirdparty/harfbuzz/src/hb-ot-shaper-use-table.hh
index 4f09fa805e..e45ea30e60 100644
--- a/thirdparty/harfbuzz/src/hb-ot-shaper-use-table.hh
+++ b/thirdparty/harfbuzz/src/hb-ot-shaper-use-table.hh
@@ -90,263 +90,264 @@
 #pragma GCC diagnostic pop
 
 static const uint8_t
-hb_use_u8[1842] =
+hb_use_u8[3083] =
 {
-      0,    1,    2,    3,    3,    3,    3,    3,    3,    3,    4,    3,    3,    3,    3,    5,
-      6,    7,    3,    8,    3,    3,    9,    3,   10,    3,    3,   11,    3,   12,   13,    3,
-      3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-      3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-      3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-      3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-      3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-      3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-      3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-      3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-      3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-      3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-      3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-      3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-     14,    0,    0,    1,    1,    2,    1,    1,    3,    4,    5,    6,    7,    8,    9,   10,
-      1,   11,   12,    1,    1,    1,    1,    1,    1,   13,   14,   15,   16,   17,   18,   19,
-      1,    1,   20,    1,    1,    1,    1,   21,    1,    1,    1,    1,    1,    1,    1,   22,
-      1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-      1,    1,    1,    1,    1,    1,    1,    1,    1,    1,   23,   24,   25,   26,    1,    1,
-      1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-     27,   28,    1,    1,    1,    1,    1,   29,    1,    1,    1,    1,   30,   31,    1,   32,
-     33,   34,   35,   36,   37,   38,   39,   40,   41,   42,   43,   44,   45,    1,   46,   47,
-     48,    1,   49,   49,   49,   49,   50,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-      1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,   51,   52,    1,    1,
-      1,   53,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,   49,   54,    1,
-      1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,   55,    1,
-      1,    1,    1,   56,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-      1,    1,    1,   57,   58,    1,    1,    1,    1,    1,    1,   59,    1,    1,    1,    1,
-      1,    1,   60,   61,   60,   60,   60,   60,   60,   60,   60,   60,   60,   60,   60,   60,
-     60,   60,    O,    O,    O,    O,    O,   GB,    O,    O,    B,    B,    B,    B,    B,    B,
-      O,    O,   GB,    O,    O,    O,    O,   WJ,    O,    O,    O,    O,FMPst,FMPst,    O,    O,
-      O,   GB,    O,    O,    O,  CGJ,    B,    O,    O,    O,    O,    O,    B,    B,    B,    B,
-      B,VMAbv,VMAbv,VMAbv,VMAbv,VMAbv,    O,    O,    B,    O,    O,VMAbv,    O,    O,    B,CMBlw,
-  CMBlw,CMBlw,VMAbv,VMAbv,VMAbv,VMPst,    B,    B, VAbv, VPst,CMBlw,    B, VPst, VPre, VPst, VBlw,
-   VBlw, VBlw, VBlw, VAbv, VAbv, VAbv, VAbv, VPst, VPst, VPst, VPst,    H, VPre, VPst,    O,VMAbv,
-  VMBlw,    O,    O, VAbv, VBlw, VBlw,    B,    B, VBlw, VBlw,   GB,VMAbv,VMPst,VMPst,    O,    B,
-      B,    B,    B,    O,    O,    B,    B,    O,    B,    B,    B,    O,    B,    O, VBlw,    O,
-      O, VPre, VPre,    O,    O, VPre, VPre,    H,    O,    O,    O,    O,    O, VPst,    B,    B,
-      O,    B,    B,    O,FMAbv,    O,    O,VMAbv,VMAbv,VMPst,    B,    B,    B,    O,    O,    O,
-      O,    B,    O,    B,    B,    O,CMBlw,    O, VPst, VPre, VPst, VBlw, VBlw,    O,    O,    O,
-      O, VAbv, VAbv,    O,    O, VAbv, VAbv,    H,    O,    O,    O,VMBlw,    O,    O,VMAbv,CMAbv,
-     GB,   GB,    O, MBlw,    O,    O, VBlw, VAbv,    O, VAbv, VAbv, VAbv,    O, VPst, VPst,    H,
-      O,    O,    O,    B,VMAbv,VMAbv,VMAbv,CMAbv,CMAbv,CMAbv,    O,VMAbv,VMPst,VMPst,CMBlw,    B,
-   VPst, VAbv,    O, VAbv, VAbv, VAbv,    O,    B,    O,    O,    O,    O,VMAbv,    O,    O,    O,
-   VPst, VPst, VAbv, VPst, VPst,    O,    O,    O, VPre, VPre, VPre,    O, VPre, VPre,VMAbv,VMPst,
-  VMPst,VMPst,VMAbv,    B,    B,    B,CMBlw,    B, VAbv, VAbv, VPst,    O, VAbv, VAbv, VAbv,    O,
-   VAbv, VAbv,    O, VAbv, VBlw,    O,    B,VMAbv,VMPst,VMPst,    O, VPst, VPst,    O,    O,   CS,
-     CS,    O,VMAbv,VMAbv,VMPst,VMPst,    B,    B,    B, VAbv, VAbv,    B, VPst, VPst, VPst, VPst,
-   VPst, VBlw, VBlw,    O, VPre, VPre, VPre,    H,    R,    O,    O,    O,  HVM,    O, VPst, VPst,
-   VAbv, VAbv, VBlw,    O, VBlw,    O, VPst, VPre, VPre, VPre, VPre, VPre, VPre, VPst, VBlw, VBlw,
-      O,    O,    O, FBlw,    O, FBlw,    O,CMAbv,    O,    O,    O,    O, VPst, VPre,    O,CMBlw,
-   VBlw, VAbv, VAbv, VBlw, VAbv, VAbv, VAbv, VAbv, VBlw, VBlw, VBlw, VBlw,VMAbv,    O, VBlw, VAbv,
-  VMAbv,VMAbv, VBlw,    O,VMAbv,VMAbv,    B,  SUB,  SUB,  SUB,  SUB,  SUB,  SUB,  SUB,    O,  SUB,
-    SUB,  SUB,  SUB,    O,    O,    O,    O,    O, FBlw,    O,    B,    B,    B, VPst, VPst, VAbv,
-   VAbv, VBlw, VBlw, VPre, VAbv, VAbv, VAbv, VAbv,VMAbv,VMBlw,VMPst,   IS, VAbv, MPst, MPre, MBlw,
-   MBlw,    B,    B,    B,    O,   GB,    O,    O,   GB,    O,    B,    B, VPst, VPst, VBlw, VBlw,
-      B,    B,    B,    B, MBlw, MBlw, MBlw,    B, VPst,VMPst,VMPst,    B,    B, VPst, VPst,VMPst,
-  VMPst,VMPst,VMPst,VMPst,    B,    B,    B, VAbv, VAbv, VAbv, VAbv,    B,    B,    B,    B,    B,
-   MBlw, VPst, VPre, VAbv, VAbv,VMPst,VMPst,VMPst,VMPst,VMPst,VMPst,VMBlw,    B,VMPst,    B,    B,
-  VMPst,VMPst, VPst, VAbv,    O,    O,    B,    B, VAbv, VBlw, VBlw, VPst,    O,    O, VPst,    O,
-      O,    O,    B,    O, VAbv, VBlw,  CGJ,  CGJ, VPst, VAbv, VAbv, VAbv, VAbv, VBlw, VBlw, VBlw,
-   VPre, VPre, VPre, VPre, VPre, VPre, VPre, VPre,VMAbv,VMPst, VPst,VMAbv,VMAbv,FMAbv, FAbv,CMAbv,
-  FMAbv,VMAbv,FMAbv, VAbv,   IS,FMAbv,    B,FMAbv,    O,    O,    O,    O,    B,  CGJ,  CGJ,  CGJ,
-     WJ,  CGJ,   GB,   GB,   GB,   GB,   GB,CMAbv,CMAbv,    B,    B,CMBlw,    B,    O,   GB,    B,
-      B,    B, VAbv, VAbv, VBlw, VPst, VPst, VAbv, VAbv, VAbv, VAbv,  SUB,  SUB,  SUB, FPst, FPst,
-  VMBlw, FPst, FPst, FPst, FPst, FPst, FPst, FBlw,VMAbv,FMBlw,VMPst,VMPst,    O,    O, VAbv, VPre,
-   VPst, VAbv,    B, MPre, MBlw,  SUB, FAbv, FAbv, MAbv,  SUB,  SUB,  SUB,  SUB,    O,   Sk, VPst,
-   VAbv, VPst, VAbv, VBlw, VBlw, VAbv, VBlw, VPst, VPre, VPre, VPre, VPre, VPre, VAbv,VMAbv,VMAbv,
-   VAbv,VMAbv,VMAbv,    O,    O,VMBlw,VMAbv,VMAbv,VMAbv, FAbv,VMPst,    B,    B,    B,CMAbv, VPst,
-   VAbv, VAbv, VBlw, VBlw, VBlw, VBlw, VAbv, VAbv, VPre, VPre, VPre, VPre, VAbv, VAbv,    H,    B,
-      B,    B,    O,    O,    O,SMAbv,SMBlw,SMAbv,SMAbv,SMAbv,SMAbv,SMAbv,SMAbv,SMAbv,VMAbv, FAbv,
-  VMPst,    B, VAbv, VBlw, VPre, VPst, VAbv, VAbv, VPst,   IS,  SUB,  SUB,    B,    B,    B,    B,
-  CMAbv, VPst, VAbv, VAbv, VPst, VPst, VPst, VAbv, VPst, VAbv, FAbv, FAbv,CMBlw,CMBlw,  SUB,  SUB,
-   VPst, VPre, VPre, VPre, VPst, VPst, VBlw, FAbv, FAbv, FAbv, FAbv, FAbv, FAbv, FAbv,VMPre,VMPre,
-  FMAbv,CMBlw,VMAbv,VMAbv,VMAbv,    O,VMBlw,VMBlw,VMBlw,VMBlw,VMBlw,VMBlw,VMAbv,VMAbv,VMAbv,VMPst,
-  VMBlw,VMBlw,VMBlw,    O,    O,    O,VMAbv,   CS,   CS,VMPst,VMAbv,VMAbv,   GB,    O,    O,    O,
-      O,FMAbv,    O,    O,    O,   WJ, ZWNJ,  CGJ,   WJ,   WJ,    O,    O,   WJ,   WJ,   WJ,   WJ,
-     WJ,    O,   WJ,   WJ,   WJ,   WJ,FMPst,    O,    O,    O,VMAbv,    O,    O,    O,    O,    O,
-      O,    H,    B,    B, VAbv,    B,    B,    B,    H,    B, VPst, VBlw, VAbv, VPst, VBlw,    O,
-      O,    O, MPst, VPst, VPst, VPst, VPst, VPst, VPst, VPst,    H,VMAbv,    O,    O,VMAbv,VMAbv,
-      B,    B,    O,    O,    B, VAbv,    B,    B, VAbv, VAbv, VAbv, VAbv, VAbv,VMBlw,VMBlw,VMBlw,
-      O,    O,    B,    B,    B, VBlw, VBlw, VBlw, VAbv, VBlw, VBlw, VBlw, VBlw, FAbv, FAbv, FAbv,
-   FPst, VPst,VMAbv,VMAbv, FAbv,VMPst,    B,    B,    B,CMAbv, VAbv, MBlw, MPst, MBlw,    H,    O,
-      O,    O,    B, VAbv,    O,    B,    B,VMAbv, VAbv, VAbv, VAbv, VBlw, VAbv, VPre, VPre, VAbv,
-   VBlw, MPst, MPre, MAbv, MBlw,    O,    B,    B,    B, FAbv, FAbv, FPst,    O,    O,   GB,   GB,
-     GB,    O,    O,    O,    B,VMPst,VMAbv,VMPst,    B,    B, VAbv,    B, VAbv, VAbv, VBlw,    B,
-      B, VAbv,    B,    B, VAbv,VMAbv,    B,VMAbv,    B,    O,    B,    B,    B, VPre, VBlw, VAbv,
-   VPre, VPst,    O,VMPst,   IS,    O, VPst, VAbv, VPst, VPst, VBlw, VPst, VPst,    O,VMPst, VBlw,
-      O,    O,  CGJ,  CGJ,  CGJ,  CGJ,   WJ,    O,    O,    O,    B, VBlw, VBlw, VBlw, VPst,VMBlw,
-  VMBlw,VMAbv,CMBlw,CMBlw,CMBlw,    O,    O,    O,    O,   IS,    B,CMBlw,CMBlw,    O,VMAbv,VMAbv,
-  VMAbv,CMAbv,    B,    B,    O, VAbv, VAbv,    O,    O,    O,    B,    B,VMBlw,VMBlw,VMBlw,    B,
-      B,    B,    B,    B,CMBlw,CMBlw,CMBlw,CMBlw,    O,    O,VMPst,VMAbv,VMPst,   CS,   CS,    B,
-      B,    B, VAbv, VAbv, VAbv, VAbv, VBlw, VBlw, VAbv, VAbv, VAbv, VAbv,    H,    O,    O,    O,
-      N,    N,    N,    N,    N,    N,    N,    N,    B,    B, VAbv,    B,    B, VAbv, VAbv,    B,
-      O,    O,    O,    O,    O,   HN,VMAbv,VMAbv,VMPst,    B, VPst, VPre, VPst, VBlw, VBlw, VAbv,
-   VAbv, VPst, VPst,    H,CMBlw,    O,    O,    O, VBlw,    O,VMAbv,VMAbv,VMAbv,    B, VPre, VBlw,
-   VAbv, VAbv, VBlw, VAbv, VAbv,   IS,CMAbv,    O,    B,    B,    B, VPst, VPst,    B,    B,    B,
-      B,CMBlw, VPre, VPst, VBlw, VBlw,    H,    B,    R,    R,    O,FMBlw,CMBlw, VAbv, VBlw,    O,
-   VPre,VMAbv,VMAbv,    H,CMAbv,CMAbv, VAbv,CMBlw, VBlw,    O,    B,    B,    O,CMBlw,CMBlw,    B,
-   VPst, VPst, VPst,    O,    O, VPre,    O,    O,VMAbv,VMAbv,    B, VPst, VPre, VPst, VPst, VPst,
-      H,VMAbv,VMAbv,VMPst,CMBlw,    B,    O,    O,FMAbv,    B,   CS,   CS,    O,    O, VBlw, VPre,
-   VAbv, VPre, VPre, VPst, VPre,VMAbv,VMAbv,VMAbv,    H,CMBlw,VMAbv,VMAbv,VMPst,    H,CMBlw,    O,
-      O,    O, VPst,VMAbv,VMPst,    H,VMPst, VAbv, VPre, VPst, VAbv, VAbv,    H,CMBlw,    O, MBlw,
-   MPre, MAbv, VBlw, VBlw, VPre, VAbv, VBlw, VBlw, VBlw, VAbv, VAbv, VAbv, VAbv,VMAbv,VMPst,    H,
-  CMBlw,    O, VPst, VPre,    O, VPre, VPre,    O,    O,VMAbv,VMAbv, VPst,   IS,    R, MPst,    R,
-   MPst,CMBlw,    O,    O, VAbv, VAbv, VPst, VPst,VMPst,VMPst,    H,    B,    O,    O, VPre,    O,
-      O,    O,    B, VAbv, VBlw, VBlw, VAbv, VAbv, VBlw,    B,    B,    B,    B,FMBlw, VBlw,VMAbv,
-  VMAbv,VMAbv,VMAbv,VMPst,    R, MBlw, MBlw, MBlw, MBlw,   GB,    O,   GB,    O,   IS, VAbv, VAbv,
-   VAbv, VPst,    R,    R,    R,    R,    R,    R, FBlw, FBlw, FBlw, FBlw, FBlw, FBlw, FBlw, FBlw,
-  VMAbv,VMPst,CMAbv,   IS,    O,    O, VBlw, VBlw, VBlw,    O,    O,    O,  SUB,  SUB, VBlw, VPre,
-   VBlw, VAbv, VPst,VMAbv,VMAbv,    O, VAbv, VAbv, VBlw,    O,    O,    O, VAbv,    O, VAbv, VAbv,
-      O, VAbv,VMAbv,VMAbv,CMBlw, VAbv, VBlw,   IS,    R, MBlw, VPst, VPst, VPst,    O, VPst,VMAbv,
-  VMPst,   IS,    B,    B,   GB, VAbv, VBlw, VPre, VPst,    O,    H,    H,    H,    H,    H,    H,
-      H,    B,    O,    O,    O,CMBlw,    O, VBlw, VBlw, VBlw,    O,    O,    O,VMBlw,VMBlw,VMBlw,
-  VMBlw,    O,    O,CMBlw,CMBlw,    O,    B,    B,VMAbv,    O,CMAbv,CMAbv,CMAbv,CMAbv,CMAbv,CMAbv,
-  CMAbv,    B,
+     16,   50,   51,   51,   51,   52,   51,   83,  118,  131,   51,   57,   58,  179,  195,   61,
+     51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+     51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+     51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+     51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+     51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+     51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+     14,    0,    1,    2,    2,    2,    2,    3,    2,    2,    2,    2,    2,    4,    2,    2,
+      5,    6,    2,    7,    8,    9,   10,   11,   12,   13,   14,   15,   16,    2,    2,   17,
+     18,   19,   20,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   21,
+     22,   23,   24,   25,   26,   27,   28,   29,   30,   31,   32,    2,   33,    2,    2,    2,
+      2,   34,   35,    2,    2,    2,    2,    2,    2,    2,    2,    2,   36,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   37,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,   38,   39,   40,   41,   42,   43,    2,   44,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   45,   46,    2,
+     47,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   48,   49,    2,    2,    2,
+      2,    2,    2,    2,    2,   50,   51,    2,   52,    2,    2,   53,    2,    2,   54,   55,
+     56,   57,   58,   59,   60,   61,   62,   63,    2,   64,   65,    2,   66,   67,   68,   69,
+      2,   70,    2,   71,   72,   73,   74,    2,    2,   75,   76,   77,   78,    2,   79,    2,
+      2,   80,   80,   80,   80,   80,   80,   80,   80,   81,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,   82,   83,    2,    2,    2,    2,    2,    2,    2,   84,
+     85,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,   80,   80,   80,   86,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,   87,   88,    2,    2,    2,    2,    2,
+      2,    2,    2,   89,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,   90,    2,    2,   91,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,   92,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,   93,   93,   94,   95,   93,   93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
+     93,   93,   93,   93,   93,   93,   93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
+     93,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    1,
+      0,    2,    2,    2,    2,    2,    0,    0,    0,    3,    0,    0,    0,    0,    0,    4,
+      0,    0,    5,    0,    0,    0,    0,    0,    0,    0,    0,    0,    1,    0,    0,    0,
+      0,    0,    0,    0,    0,    0,    0,    0,    6,    7,    0,    0,    0,    0,    0,    0,
+      0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    8,    9,    9,    9,    9,    0,    0,    0,    7,   10,
+      0,    2,    2,    2,    2,   11,   12,    0,    0,    9,   13,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,   14,   15,   16,   17,   18,   19,   20,   14,   21,   22,
+     23,   10,   24,   25,   18,    2,    2,    2,    2,    2,   18,    0,    2,    2,    2,    2,
+      2,    0,    2,    2,    2,    2,    2,    2,    2,   26,   27,   28,    2,    2,    2,    7,
+     28,    7,   28,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    7,    2,    2,
+      2,    7,    7,    0,    2,    2,    0,   15,   16,   17,   18,   29,   30,   31,   30,   32,
+      0,    0,    0,    0,   33,    0,    0,    2,   28,    2,    0,    0,    0,    0,    0,    7,
+     34,   10,   13,   28,    2,    2,    7,    0,   28,    7,    2,   28,    7,    2,    0,   35,
+     16,   17,   29,    0,   25,   36,   25,   37,    0,   38,    0,    0,    0,   28,    2,    7,
+      7,    0,    0,    0,    2,    2,    2,    2,    2,   39,   40,   41,    0,    0,    0,    0,
+      0,   10,   13,   28,    2,    2,    2,    2,   28,    2,   28,    2,    2,    2,    2,    2,
+      2,    7,    2,   28,    2,    2,    0,   15,   16,   17,   18,   19,   25,   20,   33,   22,
+      0,    0,    0,    0,    0,   28,    9,   39,   42,   10,   27,   28,    2,    2,    2,    7,
+     28,    7,    2,   28,    2,    2,    0,   15,   43,    0,    0,   25,   20,    0,    0,    2,
+     28,   28,    0,    0,    0,    0,    0,    0,    0,    0,   44,   28,    2,    2,    7,    0,
+      2,    7,    2,    2,    0,   28,    7,    7,    2,    0,   28,    7,    0,    2,    7,    0,
+      2,    2,    2,    2,    2,    2,    0,    0,   21,   14,   45,    0,   46,   31,   46,   32,
+      0,    0,    0,    0,   33,    0,    0,    0,    0,   13,   27,   47,    2,    2,    2,    7,
+      2,    7,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    0,   15,
+     20,   14,   21,   45,   20,   36,   20,   37,    0,    0,    0,   25,   29,    2,    7,    0,
+      0,    8,   27,   28,    2,    2,    2,    7,    2,    2,    2,   28,    2,    2,    0,   15,
+     43,    0,    0,   33,   45,    0,    0,    0,    7,   48,   49,    0,    0,    0,    0,    0,
+      0,    9,   27,    2,    2,    2,    2,    7,    2,    2,    2,    2,    2,    2,   50,   51,
+     21,   21,   17,   29,   46,   31,   46,   32,   52,    0,    0,    0,   33,    0,    0,    0,
+     28,   10,   27,   28,    2,    2,    2,    2,    2,    2,    2,    2,    7,    0,    2,    2,
+      2,    2,   28,    2,    2,    2,    2,   28,    0,    2,    2,    2,    7,    0,   53,    0,
+     33,   21,   20,   29,   29,   16,   46,   46,   23,    0,   21,    0,    0,    0,    0,    0,
+      0,    2,    0,    2,    7,    0,    0,    0,    0,    0,    0,    0,    0,   18,    0,    0,
+      0,    2,    2,   54,   54,   55,    0,    0,   16,    2,    2,    2,    2,   28,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    7,    0,   56,   19,   57,   20,   20,   18,   18,
+     44,   19,    9,   29,    9,    2,    2,   58,   59,   59,   59,   59,   59,   60,   59,   59,
+     59,   59,   59,   59,   59,   59,   59,   59,   59,   59,   59,   59,   59,   59,   59,   61,
+      0,    0,    0,    0,   62,    0,    0,    0,    0,    2,    2,    2,    2,    2,   63,   43,
+     57,   64,   20,   20,   65,   66,   67,   68,   69,    2,    2,    2,    2,    2,    1,    0,
+      3,    2,    2,    2,   21,   18,    2,    2,   70,   69,   71,   72,   63,   71,   27,   27,
+      2,   50,   20,   51,    2,    2,    2,    2,    2,    2,   73,   74,   75,   27,   27,   76,
+     77,    2,    2,    2,    2,    2,   27,   43,    0,    2,   57,   78,    0,    0,    0,    0,
+     28,    2,   57,   45,    0,    0,    0,    0,    0,    2,   57,    0,    0,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,    2,    7,    2,    7,   57,    0,    0,    0,    0,    0,
+      0,    2,    2,   79,   43,   20,   57,   18,   46,   46,   46,   46,   13,   80,   81,   82,
+     83,   84,   85,    0,    0,    0,    0,   86,    0,    7,    0,    0,   28,    0,   87,   79,
+     88,    2,    2,    2,    2,    7,    0,    0,    0,   40,   40,   89,   90,    2,    2,    2,
+      2,    2,    2,    2,    2,   11,    7,    0,    0,   91,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    7,   20,   78,   43,   20,   92,   59,    0,
+      0,   93,   94,   93,   93,   95,   96,    0,    0,    2,    2,    2,    2,    2,    2,    2,
+      0,    2,    2,    7,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,    0,
+      0,    2,    2,    2,    2,   27,    0,    0,    0,    2,    2,    2,    2,    2,    7,    0,
+      0,    2,    2,    2,   50,   97,   43,    0,    0,    2,    2,   98,   99,  100,  101,   59,
+     61,  102,   14,   43,   20,   57,   19,   78,   46,   46,   74,    9,    9,    9,  103,   44,
+     38,    9,  104,   72,    2,    2,    2,    2,    2,    2,    2,  105,   20,   18,   18,   20,
+     46,   46,   20,  106,    2,    2,    2,    7,    0,    0,    0,    0,    0,    0,  107,  108,
+    109,  109,  109,    0,    0,    0,    0,    0,    0,  104,   72,    2,    2,    2,    2,    2,
+      2,   58,   59,   57,   23,   20,  110,   59,    2,    2,    2,    2,  105,   20,   21,   43,
+     43,  100,   12,    0,    0,    0,    0,    0,    0,    2,    2,   59,   16,   46,   21,  111,
+    100,  100,  100,  112,  113,    0,    0,    0,    0,    2,    2,    2,    2,    2,    0,   28,
+      2,    9,   44,  114,  114,  114,    9,  114,  114,   13,  114,  114,  114,   24,    0,   38,
+      0,    0,    0,  115,  116,    9,    3,    0,    0,    0,    0,    0,    0,    0,  117,    0,
+      0,    0,    0,    0,    0,    0,    4,  118,  119,   40,   40,    3,    0,    0,    0,    0,
+      0,    0,    0,    0,    0,    0,  119,  119,  120,  119,  119,  119,  119,  119,  119,  119,
+    119,    0,    0,  121,    0,    0,    0,    0,    0,    0,    5,  121,    0,    0,    0,    0,
+      0,   44,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    7,
+      0,    2,    2,    2,    2,    0,    0,    0,   28,    0,    0,    0,    0,    0,    0,    0,
+    122,    2,   51,    2,  106,    2,    8,    2,    2,    2,   63,   17,   14,    0,    0,   29,
+      0,    2,    2,    0,    0,    0,    0,    0,    0,   27,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,  123,   21,   21,   21,   21,   21,   21,   21,  124,    0,    0,    0,    0,
+      0,    9,    9,    9,    9,    9,    9,    9,    9,    9,    2,    0,    0,    0,    0,    0,
+     50,    2,    2,    2,   20,   20,  125,  114,    0,    2,    2,    2,  126,   18,   57,   18,
+    111,  100,  127,    0,    0,    0,    0,    0,    0,    9,  128,    2,    2,    2,    2,    2,
+      2,    2,  129,   21,   20,   18,   46,  130,  131,  132,    0,    0,    0,    0,    0,    0,
+      0,    2,    2,   50,   28,    2,    2,    2,    2,    2,    2,    2,    2,    8,   20,   57,
+     97,   74,  133,  134,  135,    0,    0,    0,    0,    2,  136,    2,    2,    2,    2,  137,
+      0,   28,    2,   40,    3,    0,   77,   13,    2,   51,   20,  138,   50,   51,    2,    2,
+    103,    8,    7,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,  139,   19,
+     23,    0,    0,  140,  141,    0,    0,    0,    0,    2,   63,   43,   21,   78,   45,  142,
+      0,   79,   79,   79,   79,   79,   79,   79,   79,    0,    0,    0,    0,    0,    0,    0,
+      4,  119,  119,  119,  119,  120,    0,    0,    0,    2,    2,    2,    2,    2,    7,    2,
+      2,    2,    7,    2,   28,    2,    2,    2,    2,    2,   28,    2,    2,    2,   28,    7,
+      0,  126,   18,   25,   29,    0,    0,  143,  144,    2,    2,   28,    2,   28,    2,    2,
+      2,    2,    2,    2,    0,   12,   35,    0,  145,    2,    2,   11,   35,    0,   28,    2,
+      2,    2,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   28,    2,    2,
+      7,    2,    2,    9,   39,    0,    0,    0,    0,    2,    2,    2,    2,    2,   25,   36,
+      0,    2,    2,    2,  114,  114,  114,  114,  114,  146,    2,    7,    0,    0,    0,    0,
+      0,    2,   12,   12,    0,    0,    0,    0,    0,    7,    2,    2,    7,    2,    2,    2,
+      2,   28,    2,    7,    0,   28,    2,    0,    0,  147,  148,  149,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,   20,   20,   18,   18,   18,   20,   20,  132,    0,    0,    0,
+      0,    0,  150,  150,  150,  150,  150,  150,  150,  150,  150,  150,    2,    2,    2,    2,
+      2,   51,   50,   51,    0,    0,    0,    0,  151,    9,   72,    2,    2,    2,    2,    2,
+      2,   16,   17,   19,   14,   22,   35,    0,    0,    0,   29,    0,    0,    0,    0,    0,
+      0,    9,   47,    2,    2,    2,    2,    2,    2,    2,    2,    2,  126,   18,   20,  152,
+     20,   19,  153,  154,    2,    2,    2,    2,    2,    0,    0,   63,  155,    0,    0,    0,
+      0,    2,   11,    0,    0,    0,    0,    0,    0,    2,   63,   23,   18,   18,   18,   20,
+     20,  106,  156,    0,    0,  157,  158,   29,  159,   28,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,   21,   17,   20,   20,  160,   42,    0,    0,    0,
+     44,    2,    2,    2,    7,    7,    2,    2,   28,    2,    2,    2,    2,    2,    2,    2,
+     28,    2,    2,    2,    2,    2,    2,    2,    8,   16,   17,   19,   20,  161,   29,    0,
+      0,    9,    9,   28,    2,    2,    2,    7,   28,    7,    2,   28,    2,    2,   56,   15,
+     21,   14,   21,   45,   30,   31,   30,   32,    0,    0,    0,    0,   33,    0,    0,    0,
+      2,    2,   21,    0,    9,    9,    9,   44,    0,    9,    9,   44,    0,    0,    0,    0,
+      0,    2,    2,   63,   23,   18,   18,   18,   20,   21,  124,   13,   15,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,    0,    0,  162,  163,    0,    0,    0,    0,    0,    0,
+      0,   16,   17,   18,   18,   64,   97,   23,  159,    9,  164,    7,    0,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,    2,    2,   63,   23,   18,   18,    0,   46,   46,    9,
+    165,   35,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    2,    2,   18,
+      0,   21,   17,   18,   18,   19,   14,   80,  165,   36,    0,    0,    0,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,    8,  166,   23,   18,   20,   20,  164,    7,    0,    0,
+      0,    2,    2,    2,    2,    2,    7,   41,  134,   21,   20,   18,   74,   19,   20,    0,
+      0,    2,    2,    2,    7,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,   16,
+     17,   18,   19,   20,  103,  165,   35,    0,    0,    2,    2,    2,    7,   28,    0,    2,
+      2,    2,    2,   28,    7,    2,    2,    2,    2,   21,   21,   16,   30,   31,   10,  167,
+    168,  169,  170,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    0,    2,    2,
+      2,   63,   23,   18,   18,    0,   20,   21,   27,  106,    0,   31,    0,    0,    0,    0,
+      0,   50,   18,   20,   20,   20,  138,    2,    2,    2,  171,  172,    9,   13,  173,   70,
+    174,    0,    0,    1,  145,    0,    0,    0,    0,   50,   18,   20,   14,   17,   18,    2,
+      2,    2,    2,  156,  156,  156,  175,  175,  175,  175,  175,  175,   13,  176,    0,   28,
+      0,   20,   18,   18,   29,   20,   20,    9,  165,    0,   59,   59,   59,   59,   59,   59,
+     59,   64,   19,   80,   44,    0,    0,    0,    0,    2,    2,    2,    7,    2,   28,    2,
+      2,   50,   20,   20,   29,    0,   36,   20,   25,    9,  158,  177,  173,    0,    0,    0,
+      0,    2,    2,    2,   28,    7,    2,    2,    2,    2,    2,    2,    2,    2,   21,   21,
+     45,   20,   33,   80,   66,    0,    0,    0,    0,    2,  178,   64,   45,    0,    0,    0,
+      0,  179,  179,  179,  106,    7,    0,    0,    0,    9,    9,    9,   44,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,    7,    0,   56,  180,   18,   18,   18,   18,   18,   18,
+     18,   18,   18,   18,   18,   18,   18,   18,   18,   18,   18,   18,   18,    0,    0,    0,
+     38,  114,   24,    0,    0,    0,    0,    0,    0,    0,    0,    7,    0,    0,    0,    0,
+      0,    2,    2,    2,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    0,   56,
+     35,    0,    4,  119,  119,  119,  120,    0,    0,    9,    9,    9,   47,    2,    2,    2,
+      0,    2,    2,    2,    2,    2,    0,    0,    2,    2,    2,    2,    2,    2,    2,    2,
+     44,    2,    2,    2,    2,    2,    2,    9,    9,    2,    2,   42,   42,   42,   90,    0,
+      0,    O,    O,    O,   GB,    B,    B,   GB,    O,    O,   WJ,FMPst,FMPst,    O,  CGJ,    B,
+      O,    B,VMAbv,VMAbv,VMAbv,    O,VMAbv,    B,CMBlw,CMBlw,CMBlw,VMAbv,VMPst, VAbv, VPst,CMBlw,
+      B, VPst, VPre, VPst, VBlw, VBlw, VBlw, VBlw, VAbv, VAbv, VAbv, VPst, VPst, VPst,    H, VPre,
+   VPst,VMBlw,    O,    O, VAbv,   GB,VMAbv,VMPst,VMPst,    O,    B, VBlw,    O,    O, VPre, VPre,
+      O, VPre,    H,    O, VPst,FMAbv,    O,CMBlw,    O, VAbv,    O, VAbv,    H,    O,VMBlw,VMAbv,
+  CMAbv,   GB,   GB,    O, MBlw,CMAbv,CMAbv, VPst, VAbv,VMAbv,    O, VPst,    O, VPre, VPre,VMAbv,
+      B,    O,   CS,   CS,    O,    B, VAbv, VAbv,    B,    R,    O,  HVM,    O,    O, FBlw,    O,
+  CMAbv,    O,CMBlw, VAbv, VBlw,    B,  SUB,  SUB,  SUB,    O,  SUB,  SUB,    O, FBlw,    O,    B,
+   VPst, VBlw, VPre,VMAbv,VMBlw,VMPst,   IS, VAbv, MPst, MPre, MBlw, MBlw,    B, MBlw, MBlw, VPst,
+  VMPst,VMPst,    B, MBlw, VPst, VPre, VAbv, VAbv,VMPst,VMPst,VMBlw,    B,VMPst, VBlw, VPst,  CGJ,
+    CGJ, VPst,VMAbv,VMAbv,FMAbv, FAbv,CMAbv,FMAbv,VMAbv,FMAbv, VAbv,   IS,FMAbv,    B,FMAbv,    B,
+    CGJ,   WJ,  CGJ,   GB,CMAbv,CMAbv,    B,   GB,    B, VAbv,  SUB, FPst, FPst,VMBlw, FPst, FPst,
+   FBlw,VMAbv,FMBlw, VAbv, VPre,    B, MPre, MBlw,  SUB, FAbv, FAbv, MAbv,  SUB,   Sk, VPst, VAbv,
+  VMAbv,VMAbv, FAbv,CMAbv, VPst,    H,    B,    O,SMAbv,SMBlw,SMAbv,SMAbv,SMAbv, VPst,   IS, VBlw,
+   FAbv,VMPre,VMPre,FMAbv,CMBlw,VMBlw,VMBlw,VMAbv,   CS,   CS,VMPst,    O,FMAbv, ZWNJ,  CGJ,   WJ,
+     WJ,   WJ,    O,FMPst,    O,    O,    H, MPst, VPst,    H,VMAbv, VAbv,VMBlw,    B, VBlw, FPst,
+   VPst, FAbv,VMPst,    B,CMAbv, VAbv, MBlw, MPst, MBlw,    H,    O, VBlw, MPst, MPre, MAbv, MBlw,
+      O,    B, FAbv, FAbv, FPst, VBlw,    B,    B, VPre,    O,VMPst,   IS,    O,VMPst, VBlw, VPst,
+  VMBlw,VMBlw,VMAbv,    O,   IS,VMBlw,    B,VMPst,VMAbv,VMPst,   CS,   CS,    B,    N,    N,    O,
+     HN, VPre, VBlw, VAbv,   IS,CMAbv,    O, VPst,    B,    R,    R,    O,FMBlw,CMBlw, VAbv, VPre,
+  VMAbv,VMAbv,    H, VAbv,CMBlw,FMAbv,    B,   CS,   CS,    H,CMBlw,VMPst,    H,VMPst, VAbv,VMAbv,
+   VPst,   IS,    R, MPst,    R, MPst,CMBlw,    B,FMBlw, VBlw,VMAbv,    R, MBlw, MBlw,   GB, FBlw,
+   FBlw,CMAbv,   IS, VBlw,   IS,   GB, VAbv,    H,    H,    O, VBlw,
 };
 static const uint16_t
-hb_use_u16[2056] =
+hb_use_u16[768] =
 {
     0,  0,  1,  2,  0,  0,  0,  0,  0,  0,  3,  4,  0,  5,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,  9, 10, 11,
-    0,  0,  0,  0,  9, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   13,  9,  9, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 17, 25,
-   26, 20, 21, 27, 28, 29, 30, 31, 32, 33, 21, 34, 35,  0, 17, 36,
-   37, 20, 21, 38, 23, 39, 17, 40, 41, 42, 43, 44, 45, 46, 30,  0,
-   47, 48, 21, 49, 50, 51, 17,  0, 52, 48, 21, 53, 50, 54, 17, 55,
-   56, 48,  9, 57, 58, 59, 17,  0, 60, 61,  9, 62, 63, 64, 30, 65,
-   66, 67,  9, 68, 69,  9, 70, 71, 72, 73, 74, 75, 76,  0,  0,  0,
-    9,  9, 77, 78, 79, 80, 81, 82, 83, 84,  0,  0,  0,  0,  0,  0,
-    9, 85,  9, 86,  9, 87, 88, 89,  9,  9,  9, 90, 91, 92,  2,  0,
-   93,  0,  9,  9,  9,  9,  9, 94, 95,  9, 96,  0,  0,  0,  0,  0,
-   97, 98, 99,100, 30,  9,101,102,  9,  9,103,  9,104,105,  0,  0,
-    9,106,  9,  9,  9,107,108,109,  2,  2,  0,  0,  0,  0,  0,  0,
-  110,  9,  9,111,112,  2,113,114,115,  9,116,  9,  9,  9,117,118,
-    9,  9,119,120,121,  0,  0,  0,  0,  0,  0,  0,  0,122,123,124,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,125,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,
+    0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  8,  9, 10, 11,
+    0,  0,  0,  0,  9, 12,  0,  0, 13,  9,  9, 14, 15, 16, 17, 18,
+   19, 20, 21, 22, 23, 24, 17, 25, 26, 20, 21, 27, 28, 29, 30, 31,
+   32, 33, 21, 34, 35,  0, 17, 36, 37, 20, 21, 38, 23, 39, 17, 40,
+   41, 42, 43, 44, 45, 46, 30,  0, 47, 48, 21, 49, 50, 51, 17,  0,
+   52, 48, 21, 53, 50, 54, 17, 55, 56, 48,  9, 57, 58, 59, 17,  0,
+   60, 61,  9, 62, 63, 64, 30, 65, 66, 67,  9, 68, 69,  9, 70, 71,
+   72, 73, 74, 75, 76,  0,  0,  0,  9,  9, 77, 78, 79, 80, 81, 82,
+   83, 84,  0,  0,  0,  0,  0,  0,  9, 85,  9, 86,  9, 87, 88, 89,
+    9,  9,  9, 90, 91, 92,  2,  0, 93,  0,  9,  9,  9,  9,  9, 94,
+   95,  9, 96,  0,  0,  0,  0,  0, 97, 98, 99,100, 30,  9,101,102,
+    9,  9,103,  9,104,105,  0,  0,  9,106,  9,  9,  9,107,108,109,
+    2,  2,  0,  0,  0,  0,  0,  0,110,  9,  9,111,112,  2,113,114,
+  115,  9,116,  9,  9,  9,117,118,  9,  9,119,120,121,  0,  0,  0,
+    0,  0,  0,  0,  0,122,123,124,  0,  0,  0,  0,  0,  0,  0,125,
   126,127,128,  0,  0,  0,129,130,131,  0,  0,  0,  0,  0,  0,132,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,133,  0,  0,  0,
-    0,  0,  0,  9,  9,  9,134,135,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,133,  0,  0,  0,  0,  0,  0,  9,  9,  9,134,135,
   136,  9,137,  0,  9,  9,  9,138,139,  9,  9,140,141,  2,142,143,
     9,  9,144,  9,145,146,  0,  0,147,  9,  9,148,149,  2,150, 98,
     9,  9,151,152,153,  2,  9,154,  9,  9,  9,155,156,  0,157,158,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  9,  9,159,  2,
-  160,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,161,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,162,
+    0,  0,  0,  0,  9,  9,159,  2,160,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,161,  0,  0,  0,  0,  0,  0,  0,162,
     0,  0,  0,  0,  0,  0,  0,163,163,164, 33,165,  0,  0,  0,  0,
   166,167,  9,168, 94,  0,  0,  0,  0,  0,  0,  0, 69,  9,169,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  9,170,171,  0,  0,  0,  0,  0,
-    9,  9,172,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  9,  9,173,170,  0,  0,  0,  0,
-    0,  0,  0,  9,174,175,  0,  9,176,  0,  0,177,178,  0,  0,  0,
-  179,  9,  9,180,181,182,183,184,185,  9,  9,186,187,  0,  0,  0,
-  188,  9,189,190,191,  9,  9,192,185,  9,  9,193,194,105,195,102,
-    9, 33,196,197,  0,  0,  0,  0,198,199, 94,  9,  9,200,201,  2,
-  202, 20, 21,203,204,205,206,207,  0,  0,  0,  0,  0,  0,  0,  0,
+    9,170,171,  0,  0,  0,  0,  0,  9,  9,172,  2,  0,  0,  0,  0,
+    9,  9,173,170,  0,  0,  0,  0,  0,  0,  0,  9,174,175,  0,  9,
+  176,  0,  0,177,178,  0,  0,  0,179,  9,  9,180,181,182,183,184,
+  185,  9,  9,186,187,  0,  0,  0,188,  9,189,190,191,  9,  9,192,
+  185,  9,  9,193,194,105,195,102,  9, 33,196,197,  0,  0,  0,  0,
+  198,199, 94,  9,  9,200,201,  2,202, 20, 21,203,204,205,206,207,
     9,  9,  9,208,209,210,211,  0,195,  9,  9,212,213,  2,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  9,  9,214,215,216,217,  0,  0,
-    9,  9,  9,218,219,  2,  0,  0,  9,  9,220,221,  2,  0,  0,  0,
-    9,222,223,103,224,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    9,  9,225,226,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  227,228,  9,229,230,  2,  0,  0,  0,  0,231,  9,  9,232,233,  0,
-  234,  9,  9,235,236,237,  9,  9,238,239,  0,  0,  0,  0,  0,  0,
-   21,  9,214,240,  7,  9, 70, 18,  9,241, 73,242,  0,  0,  0,  0,
-  243,  9,  9,244,245,  2,246,  9,247,248,  2,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  9,249,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9, 98,250,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
-    9,  9,  9,251,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    9,  9,214,215,216,217,  0,  0,  9,  9,  9,218,219,  2,  0,  0,
+    9,  9,220,221,  2,  0,  0,  0,  9,222,223,103,224,  0,  0,  0,
+    9,  9,225,226,  0,  0,  0,  0,227,228,  9,229,230,  2,  0,  0,
+    0,  0,231,  9,  9,232,233,  0,234,  9,  9,235,236,237,  9,  9,
+  238,239,  0,  0,  0,  0,  0,  0, 21,  9,214,240,  7,  9, 70, 18,
+    9,241, 73,242,  0,  0,  0,  0,243,  9,  9,244,245,  2,246,  9,
+  247,248,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  9,249,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 98,250,  0,  0,  0,  0,
+    0,  0,  0,  0,  2,  0,  0,  0,  9,  9,  9,251,  0,  0,  0,  0,
     9,  9,  9,  9,252,253,254,254,255,256,  0,  0,  0,  0,257,  0,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,258,  0,  0,
-    9,  9,  9,  9,  9,  9,105, 70, 94,259,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,260,  0,  0,  0,  0,  0,  0,  0,  0,
-    9,  9, 70,261,262,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  9,263,  0,  9,  9,264,  2,
-    9,  9,  9,  9,265,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,
+    9,  9,  9,  9,  9,258,  0,  0,  9,  9,  9,  9,  9,  9,105, 70,
+   94,259,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,260,
+    9,  9, 70,261,262,  0,  0,  0,  0,  9,263,  0,  9,  9,264,  2,
+    9,  9,  9,  9,265,  2,  0,  0,129,129,129,129,129,129,129,129,
   160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,129,
-    0,  0,  0,  0,  0,  0,  0,  1,  2,  2,  3,  0,  4,  0,  0,  5,
-    6,  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  8,  9,  0,  0,  0,
-    0,  0, 10,  2,  2,  2,  2,  2,  2,  2, 11, 12, 12,  0, 13, 14,
-    2,  2, 15,  0, 16,  2,  2,  2,  2,  2, 17, 18, 19, 20, 21, 22,
-   23, 24,  2,  2, 25, 10,  2,  2, 10,  2,  2,  2, 26, 27,  2, 28,
-   28,  2,  2,  2,  2,  2, 29,  2, 30, 10,  3, 18, 19, 31, 32, 33,
-    0, 34,  0, 35,  3,  0,  0, 36, 37, 27, 38, 39, 29, 40,  3, 41,
-   42, 43, 44, 45, 46,  0, 27, 30,  0, 10,  2,  2, 47, 48,  0,  0,
-   37, 27,  2, 35, 35,  2,  2,  2, 29, 27,  3, 18, 19, 49, 50, 51,
-    0,  0, 52, 53, 54, 27,  2, 28, 29, 27,  3, 55,  0, 56,  0, 35,
-   57,  0,  0,  0, 58, 27, 38, 10, 29,  3, 40, 29, 39,  9, 38, 10,
-    2,  2,  3, 59, 60, 61, 62, 33,  0, 34,  0,  0, 63, 64,  2, 29,
-   29,  2,  2,  2,  2,  2,  3, 65, 21, 66, 67, 45,  0, 68, 38,  0,
-   69, 27,  2, 29,  2, 27,  3, 55,  0, 70,  0, 13, 71,  0,  0,  0,
-   72,  2,  2, 29,  2,  2, 73, 74, 75, 76, 62, 77,  0, 34,  0, 39,
-   54, 27,  2,  2,  2, 38, 10,  2, 35,  2,  2, 57,  2, 38, 78, 34,
-   79, 80, 81, 82, 59,  0,  0,  0,  3, 38,  0,  0,  0,  0, 83,  0,
-    2, 84, 85, 86,  2,  2, 27,  2,  2,  2,  2,  9, 87, 88, 89, 90,
-   91, 92,  2, 93, 94, 94, 95, 94, 94, 94, 94, 94, 94, 94, 94, 96,
-    0, 97,  0,  0,  2,  2, 98, 99,100,101,102,103,  2,  2,104,105,
-    2,106,107,108,109,110,111,112,113,114,  2,  2,115,116,117,118,
-    2,  2,119,120,121,122,  0, 39,121,123,  0,  0,121,  0,  0,  0,
-    2,  2,  2, 29,124,  0,  0,  0,  2,125,126,127,128,129,130,131,
-  132,  0,  0,133,  9, 39,134,135,  2,  2,  9,  0,136,137,  2,  2,
-    2,  2,138,  0,139,  2,  2,  2,  2,  2,  2, 38,140,141,142,  0,
-  143,144,145,  0,  2,  2,  2,  3,  2,  9,  0,  0,  2,  2,  2,  0,
-    2,  2,146,  0,  2,  2, 38,  0,  2, 73,147,  0,  2,148,149,150,
-  151,141,152,153,154, 12,155,156,157,158,  2,  2,  2,159,160,161,
-  162,163,  2,  9,  0,  0,164,165,166,  0,  0,  0,167,  2,  2,  2,
-   93,168,169,170,  2,171,172,173,174,  0,  0,  0,  2,175,176,177,
-  178,179,  0,  0,  2,  2,  3, 27,180,181,182,181,183,181,184, 46,
-    0,185,186,  0,  0,  0,187,  0,  0,  0,188,189,136,  4,  0,  0,
-    0,  0,190,191,192,192,192,192,  0,193,  0,  0,  6,193,  0,  0,
-  194,  0,  0,  0,  0,  0,  0,  9,  2,  2,  0, 39,  0,  0,  0,195,
-  196,197, 11,  2, 98,198,  0,199,  2,  0,  0,  0,112,  2,  2,  2,
-    2,200,201,201,201,202,  0,  0, 12, 12, 12, 12,203,  0,  0,204,
-    2,205,206,207,  2,208,209,210,211,  0,  0,  0,212,  2,  2,  2,
-  213, 79,127,214,215,  0,  0,  0,  2,216,  2,  2,  2,  2,217,218,
-  219,220,  0,  0,221,  2,  2,222, 27,223,224,225,226,227,114,228,
-  229,  0,  0,  0,  2,  2,230,231,  0,232,  0,  0, 98,233,234,235,
-  236,236,236,236,  0,  0,  0,188,192,192,237,  0,  2,  2, 38,  2,
-   38, 35,  2,  2, 35,  2, 35,  9,238, 68,  0,239,  2, 27, 27,  2,
-    2,  3,240,241,  2,242, 39,  2,  3,  0,  0,  0,  0,  0, 27, 38,
-    2,243,  0,  0,  2,  2,244,245,  2,246,181,181,247,  9,  0,  0,
-  248,249,  0,  0, 29, 38,  2,  2, 27,  9, 27,  0,250,251,  2,  2,
-    2,  2,252,160,253,254,  0,  0,255,256,256,256,256,257,  2,  2,
-  258,259,  0,260,261,  2,  2,  2,262,263,264,  0,265,  0,  0,  0,
-  266,  2,  2,  2,  2,208,253,267,268,269,  2,  2,  0,270,  0,  0,
-  271,  0,  0,  0, 98,272,160,252,273,  0,274,275, 27,  2,  2,  2,
-    2,  2,  2, 75,252,276,  0, 58,  2, 38, 29, 35,  2,  2,  2, 35,
-    2,  2,  2, 11,262, 20,277,  0, 12, 27,  2, 28, 29, 27,278,279,
-   21,280, 32, 33,  0, 34,  0, 10,106,281, 12,194, 12,194,  0,  0,
-    2,282,160,253,283,284,  0,  0,  2,  2,  3,285,286,  0,  0,  0,
-  262,160,287,288,289,  9,  0,  0,  2,  2,  2, 98,272, 83,128,290,
-  291,  0,  0,  0,  0,  0,  2, 83, 75,160,263,292,245,  0,  0,  0,
-    2,  2, 11,293,253,294,  9,  0,  2,  2, 38,295, 79,296, 20,  0,
-    2, 38,  0,  0,  2,  2,  2,262,297,298,299,  0,  2, 38, 57,  2,
-    2, 40,  2,  2,201,300,301,302,303,  0,  0,  0,  2,  2, 10,  2,
-  282,160,304,305,306,307,  0,  0,308,252,309,  2,310,311,312,313,
-    0,314,  0,  0,308,315, 19,  2,  2,316,317,318,318,319,320, 57,
-   89,321,252,290,322, 94, 94, 94,323,324,  0,  0,  2, 38, 35,  2,
-  113,325,326,327,328,329,  0,  0,  2, 35, 29,  2,  2,  2,106,330,
-   50,331,  0,  0,332,333,  0,  0,334,335,  9,  0, 12,180,  0,  0,
-    2,  2, 38,336,337,160,160,160,160,160,160,160,160,160,  0,338,
-  339,  0,  0,  0,  0,  9,  0,  0,  2,  3,  0,  0,  2,  2,  3,340,
-  188,192,191,  0, 12,266,  2,  3,  2,  2,  3, 10,  2,  2,  2,341,
-    2,  2,  2, 12,  2,342,343,  0,
 };
 
+static inline unsigned
+hb_use_b4 (const uint8_t* a, unsigned i)
+{
+  return (a[i>>1]>>((i&1u)<<2))&15u;
+}
 static inline uint_fast8_t
 hb_use_get_category (unsigned u)
 {
-  return u<921600u?hb_use_u8[466+(((hb_use_u16[992+(((hb_use_u16[((hb_use_u8[226+(((hb_use_u8[u>>2>>2>>4>>4])<<4)+((u>>2>>2>>4)&15u))])<<4)+((u>>2>>2)&15u)])<<2)+((u>>2)&3u))])<<2)+((u)&3u))]:O;
+  return u<921600u?hb_use_u8[2721+(((hb_use_u8[593+(((hb_use_u16[((hb_use_u8[113+(((hb_use_b4(hb_use_u8,u>>1>>3>>3>>5))<<5)+((u>>1>>3>>3)&31u))])<<3)+((u>>1>>3)&7u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:O;
 }
 
 #undef B
@@ -392,5 +393,26 @@ hb_use_get_category (unsigned u)
 #undef VMPre
 
 
+#ifdef HB_USE_TABLE_MAIN
+int main (int argc, char **argv)
+{
+  if (argc != 2)
+  {
+    for (unsigned u = 0; u < 0x10FFFFu; u++)
+      printf ("U+%04X %d\n", u, hb_use_get_category (u));
+    return 0;
+  }
+
+  hb_codepoint_t u;
+  sscanf (argv[1], "%x", &u);
+
+  printf ("%d\n", hb_use_get_category (u));
+
+  return 0;
+}
+
+#endif
+
+
 #endif /* HB_OT_SHAPER_USE_TABLE_HH */
 /* == End of generated table == */
diff --git a/thirdparty/harfbuzz/src/hb-repacker.hh b/thirdparty/harfbuzz/src/hb-repacker.hh
index 173fe4a2fb..61b142238e 100644
--- a/thirdparty/harfbuzz/src/hb-repacker.hh
+++ b/thirdparty/harfbuzz/src/hb-repacker.hh
@@ -29,10 +29,9 @@
 
 #include "hb-open-type.hh"
 #include "hb-map.hh"
-#include "hb-priority-queue.hh"
-#include "hb-serialize.hh"
 #include "hb-vector.hh"
 #include "graph/graph.hh"
+#include "graph/gsubgpos-graph.hh"
 #include "graph/serialize.hh"
 
 using graph::graph_t;
@@ -42,6 +41,143 @@ using graph::graph_t;
  * docs/repacker.md
  */
 
+struct lookup_size_t
+{
+  unsigned lookup_index;
+  size_t size;
+  unsigned num_subtables;
+
+  static int cmp (const void* a, const void* b)
+  {
+    return cmp ((const lookup_size_t*) a,
+                (const lookup_size_t*) b);
+  }
+
+  static int cmp (const lookup_size_t* a, const lookup_size_t* b)
+  {
+    double subtables_per_byte_a = (double) a->num_subtables / (double) a->size;
+    double subtables_per_byte_b = (double) b->num_subtables / (double) b->size;
+    if (subtables_per_byte_a == subtables_per_byte_b) {
+      return b->lookup_index - a->lookup_index;
+    }
+
+    double cmp = subtables_per_byte_b - subtables_per_byte_a;
+    if (cmp < 0) return -1;
+    if (cmp > 0) return 1;
+    return 0;
+  }
+};
+
+static inline
+bool _presplit_subtables_if_needed (graph::gsubgpos_graph_context_t& ext_context)
+{
+  // For each lookup this will check the size of subtables and split them as needed
+  // so that no subtable is at risk of overflowing. (where we support splitting for
+  // that subtable type).
+  //
+  // TODO(grieger): de-dup newly added nodes as necessary. Probably just want a full de-dup
+  //                pass after this processing is done. Not super necessary as splits are
+  //                only done where overflow is likely, so de-dup probably will get undone
+  //                later anyways.
+  for (unsigned lookup_index : ext_context.lookups.keys ())
+  {
+    graph::Lookup* lookup = ext_context.lookups.get(lookup_index);
+    if (!lookup->split_subtables_if_needed (ext_context, lookup_index))
+      return false;
+  }
+
+  return true;
+}
+
+/*
+ * Analyze the lookups in a GSUB/GPOS table and decide if any should be promoted
+ * to extension lookups.
+ */
+static inline
+bool _promote_extensions_if_needed (graph::gsubgpos_graph_context_t& ext_context)
+{
+  // Simple Algorithm (v1, current):
+  // 1. Calculate how many bytes each non-extension lookup consumes.
+  // 2. Select up to 64k of those to remain as non-extension (greedy, highest subtables per byte first)
+  // 3. Promote the rest.
+  //
+  // Advanced Algorithm (v2, not implemented):
+  // 1. Perform connected component analysis using lookups as roots.
+  // 2. Compute size of each connected component.
+  // 3. Select up to 64k worth of connected components to remain as non-extensions.
+  //    (greedy, highest subtables per byte first)
+  // 4. Promote the rest.
+
+  // TODO(garretrieger): support extension demotion, then consider all lookups. Requires advanced algo.
+  // TODO(garretrieger): also support extension promotion during iterative resolution phase, then
+  //                     we can use a less conservative threshold here.
+  // TODO(grieger): skip this for the 24 bit case.
+  if (!ext_context.lookups) return true;
+
+  hb_vector_t<lookup_size_t> lookup_sizes;
+  lookup_sizes.alloc (ext_context.lookups.get_population ());
+
+  for (unsigned lookup_index : ext_context.lookups.keys ())
+  {
+    const graph::Lookup* lookup = ext_context.lookups.get(lookup_index);
+    hb_set_t visited;
+    lookup_sizes.push (lookup_size_t {
+        lookup_index,
+        ext_context.graph.find_subgraph_size (lookup_index, visited),
+        lookup->number_of_subtables (),
+      });
+  }
+
+  lookup_sizes.qsort ();
+
+  size_t lookup_list_size = ext_context.graph.vertices_[ext_context.lookup_list_index].table_size ();
+  size_t l2_l3_size = lookup_list_size; // Lookup List + Lookups
+  size_t l3_l4_size = 0; // Lookups + SubTables
+  size_t l4_plus_size = 0; // SubTables + their descendants
+
+  // Start by assuming all lookups are using extension subtables, this size will be removed later
+  // if it's decided to not make a lookup extension.
+  for (auto p : lookup_sizes)
+  {
+    unsigned subtables_size = p.num_subtables * 8;
+    l3_l4_size += subtables_size;
+    l4_plus_size += subtables_size;
+  }
+
+  bool layers_full = false;
+  for (auto p : lookup_sizes)
+  {
+    const graph::Lookup* lookup = ext_context.lookups.get(p.lookup_index);
+    if (lookup->is_extension (ext_context.table_tag))
+      // already an extension so size is counted by the loop above.
+      continue;
+
+    if (!layers_full)
+    {
+      size_t lookup_size = ext_context.graph.vertices_[p.lookup_index].table_size ();
+      hb_set_t visited;
+      size_t subtables_size = ext_context.graph.find_subgraph_size (p.lookup_index, visited, 1) - lookup_size;
+      size_t remaining_size = p.size - subtables_size - lookup_size;
+
+      l2_l3_size   += lookup_size;
+      l3_l4_size   += lookup_size + subtables_size;
+      l3_l4_size   -= p.num_subtables * 8;
+      l4_plus_size += subtables_size + remaining_size;
+
+      if (l2_l3_size < (1 << 16)
+          && l3_l4_size < (1 << 16)
+          && l4_plus_size < (1 << 16)) continue; // this lookup fits within all layers groups
+
+      layers_full = true;
+    }
+
+    if (!ext_context.lookups.get(p.lookup_index)->make_extension (ext_context, p.lookup_index))
+      return false;
+  }
+
+  return true;
+}
+
 static inline
 bool _try_isolating_subgraphs (const hb_vector_t<graph::overflow_record_t>& overflows,
                                graph_t& sorted_graph)
@@ -157,7 +293,8 @@ template<typename T>
 inline hb_blob_t*
 hb_resolve_overflows (const T& packed,
                       hb_tag_t table_tag,
-                      unsigned max_rounds = 20) {
+                      unsigned max_rounds = 20,
+                      bool recalculate_extensions = false) {
   graph_t sorted_graph (packed);
   sorted_graph.sort_shortest_distance ();
 
@@ -167,13 +304,31 @@ hb_resolve_overflows (const T& packed,
     return graph::serialize (sorted_graph);
   }
 
+  graph::gsubgpos_graph_context_t ext_context (table_tag, sorted_graph);
   if ((table_tag == HB_OT_TAG_GPOS
        ||  table_tag == HB_OT_TAG_GSUB)
       && will_overflow)
   {
+    if (recalculate_extensions)
+    {
+      DEBUG_MSG (SUBSET_REPACK, nullptr, "Splitting subtables if needed.");
+      if (!_presplit_subtables_if_needed (ext_context)) {
+        DEBUG_MSG (SUBSET_REPACK, nullptr, "Subtable splitting failed.");
+        return nullptr;
+      }
+
+      DEBUG_MSG (SUBSET_REPACK, nullptr, "Promoting lookups to extensions if needed.");
+      if (!_promote_extensions_if_needed (ext_context)) {
+        DEBUG_MSG (SUBSET_REPACK, nullptr, "Extensions promotion failed.");
+        return nullptr;
+      }
+    }
+
     DEBUG_MSG (SUBSET_REPACK, nullptr, "Assigning spaces to 32 bit subgraphs.");
     if (sorted_graph.assign_spaces ())
       sorted_graph.sort_shortest_distance ();
+    else
+      sorted_graph.sort_shortest_distance_if_needed ();
   }
 
   unsigned round = 0;
diff --git a/thirdparty/harfbuzz/src/hb-set.cc b/thirdparty/harfbuzz/src/hb-set.cc
index 5bf9d7c8cd..0270b21998 100644
--- a/thirdparty/harfbuzz/src/hb-set.cc
+++ b/thirdparty/harfbuzz/src/hb-set.cc
@@ -145,7 +145,7 @@ hb_set_set_user_data (hb_set_t           *set,
  * Since: 0.9.2
  **/
 void *
-hb_set_get_user_data (hb_set_t           *set,
+hb_set_get_user_data (const hb_set_t     *set,
 		      hb_user_data_key_t *key)
 {
   return hb_object_get_user_data (set, key);
diff --git a/thirdparty/harfbuzz/src/hb-set.h b/thirdparty/harfbuzz/src/hb-set.h
index 56902c267e..93636ab5d7 100644
--- a/thirdparty/harfbuzz/src/hb-set.h
+++ b/thirdparty/harfbuzz/src/hb-set.h
@@ -77,7 +77,7 @@ hb_set_set_user_data (hb_set_t           *set,
 		      hb_bool_t           replace);
 
 HB_EXTERN void *
-hb_set_get_user_data (hb_set_t           *set,
+hb_set_get_user_data (const hb_set_t     *set,
 		      hb_user_data_key_t *key);
 
 
diff --git a/thirdparty/harfbuzz/src/hb-shape-plan.cc b/thirdparty/harfbuzz/src/hb-shape-plan.cc
index 8dbb661cd2..9e513c0458 100644
--- a/thirdparty/harfbuzz/src/hb-shape-plan.cc
+++ b/thirdparty/harfbuzz/src/hb-shape-plan.cc
@@ -358,8 +358,8 @@ hb_shape_plan_set_user_data (hb_shape_plan_t    *shape_plan,
  * Since: 0.9.7
  **/
 void *
-hb_shape_plan_get_user_data (hb_shape_plan_t    *shape_plan,
-			     hb_user_data_key_t *key)
+hb_shape_plan_get_user_data (const hb_shape_plan_t *shape_plan,
+			     hb_user_data_key_t    *key)
 {
   return hb_object_get_user_data (shape_plan, key);
 }
diff --git a/thirdparty/harfbuzz/src/hb-shape-plan.h b/thirdparty/harfbuzz/src/hb-shape-plan.h
index fc7c041899..aaf5cf9c45 100644
--- a/thirdparty/harfbuzz/src/hb-shape-plan.h
+++ b/thirdparty/harfbuzz/src/hb-shape-plan.h
@@ -102,8 +102,8 @@ hb_shape_plan_set_user_data (hb_shape_plan_t    *shape_plan,
 			     hb_bool_t           replace);
 
 HB_EXTERN void *
-hb_shape_plan_get_user_data (hb_shape_plan_t    *shape_plan,
-			     hb_user_data_key_t *key);
+hb_shape_plan_get_user_data (const hb_shape_plan_t *shape_plan,
+			     hb_user_data_key_t    *key);
 
 
 HB_EXTERN hb_bool_t
diff --git a/thirdparty/harfbuzz/src/hb-subset-repacker.cc b/thirdparty/harfbuzz/src/hb-subset-repacker.cc
index 03e3feb1f6..55ca48d709 100644
--- a/thirdparty/harfbuzz/src/hb-subset-repacker.cc
+++ b/thirdparty/harfbuzz/src/hb-subset-repacker.cc
@@ -25,18 +25,24 @@
 #include "hb-repacker.hh"
 
 #ifdef HB_EXPERIMENTAL_API
+
 /**
  * hb_subset_repack_or_fail:
+ * @table_tag: tag of the table being packed, needed to allow table specific optimizations.
  * @hb_objects: raw array of struct hb_object_t, which provides
  * object graph info
  * @num_hb_objs: number of hb_object_t in the hb_objects array.
  *
  * Given the input object graph info, repack a table to eliminate
  * offset overflows. A nullptr is returned if the repacking attempt fails.
+ * Table specific optimizations (eg. extension promotion in GSUB/GPOS) may be performed.
+ * Passing HB_TAG_NONE will disable table specific optimizations.
  *
  * Since: EXPERIMENTAL
  **/
-hb_blob_t* hb_subset_repack_or_fail (hb_object_t* hb_objects, unsigned num_hb_objs)
+hb_blob_t* hb_subset_repack_or_fail (hb_tag_t table_tag,
+                                     hb_object_t* hb_objects,
+                                     unsigned num_hb_objs)
 {
   hb_vector_t<const hb_object_t *> packed;
   packed.alloc (num_hb_objs + 1);
@@ -44,6 +50,9 @@ hb_blob_t* hb_subset_repack_or_fail (hb_object_t* hb_objects, unsigned num_hb_ob
   for (unsigned i = 0 ; i < num_hb_objs ; i++)
     packed.push (&(hb_objects[i]));
 
-  return hb_resolve_overflows (packed, HB_OT_TAG_GSUB);
+  return hb_resolve_overflows (packed,
+                               table_tag,
+                               20,
+                               true);
 }
 #endif
diff --git a/thirdparty/harfbuzz/src/hb-subset-repacker.h b/thirdparty/harfbuzz/src/hb-subset-repacker.h
index e28f879362..245cf60765 100644
--- a/thirdparty/harfbuzz/src/hb-subset-repacker.h
+++ b/thirdparty/harfbuzz/src/hb-subset-repacker.h
@@ -70,7 +70,8 @@ struct hb_object_t
 typedef struct hb_object_t hb_object_t;
 
 HB_EXTERN hb_blob_t*
-hb_subset_repack_or_fail (hb_object_t* hb_objects,
+hb_subset_repack_or_fail (hb_tag_t table_tag,
+                          hb_object_t* hb_objects,
                           unsigned num_hb_objs);
 
 #endif
diff --git a/thirdparty/harfbuzz/src/hb-ucd-table.hh b/thirdparty/harfbuzz/src/hb-ucd-table.hh
index 9e76ca460b..14734c91ea 100644
--- a/thirdparty/harfbuzz/src/hb-ucd-table.hh
+++ b/thirdparty/harfbuzz/src/hb-ucd-table.hh
@@ -1068,2860 +1068,6 @@ _hb_ucd_dm2_u64_map[388] =
 #ifndef HB_OPTIMIZE_SIZE
 
 static const uint8_t
-_hb_ucd_u8[33120] =
-{
-    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 27, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   28, 26, 29, 30, 31, 32, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 33, 34, 34, 34, 34,
-   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 36, 37, 38, 39,
-   40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
-   26, 56, 57, 58, 58, 58, 58, 59, 26, 26, 60, 58, 58, 58, 58, 58,
-   58, 58, 26, 61, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 26, 62, 58, 63, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 64, 26, 26, 65, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 66, 67, 68, 58, 58, 58, 58, 69, 58,
-   58, 58, 58, 58, 58, 58, 58, 70, 71, 72, 73, 74, 75, 76, 58, 77,
-   78, 79, 58, 80, 81, 58, 82, 83, 84, 85, 75, 86, 87, 88, 58, 58,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 89, 26, 26, 26, 26, 26, 26, 26, 90, 91, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 92, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 93, 58, 58, 58, 58, 58, 58, 26, 94, 58, 58,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 95, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   96, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 97,
-   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 98,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   29, 21, 21, 21, 23, 21, 21, 21, 22, 18, 21, 25, 21, 17, 21, 21,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 21, 21, 25, 25, 25, 21,
-   21,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 22, 21, 18, 24, 16,
-   24,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5, 22, 25, 18, 25,  0,
-   29, 21, 23, 23, 23, 23, 26, 21, 24, 26,  7, 20, 25,  1, 26, 24,
-   26, 25, 15, 15, 24,  5, 21, 21, 24, 15,  7, 19, 15, 15, 15, 21,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9, 25,  9,  9,  9,  9,  9,  9,  9,  5,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,
-    5,  5,  5,  5,  5,  5,  5, 25,  5,  5,  5,  5,  5,  5,  5,  5,
-    9,  5,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,
-    9,  5,  9,  5,  9,  5,  9,  5,  5,  9,  5,  9,  5,  9,  5,  9,
-    5,  9,  5,  9,  5,  9,  5,  9,  5,  5,  9,  5,  9,  5,  9,  5,
-    9,  5,  9,  5,  9,  5,  9,  5,  9,  9,  5,  9,  5,  9,  5,  5,
-    5,  9,  9,  5,  9,  5,  9,  9,  5,  9,  9,  9,  5,  5,  9,  9,
-    9,  9,  5,  9,  9,  5,  9,  9,  9,  5,  5,  5,  9,  9,  5,  9,
-    9,  5,  9,  5,  9,  5,  9,  9,  5,  9,  5,  5,  9,  5,  9,  9,
-    5,  9,  9,  9,  5,  9,  5,  9,  9,  5,  5,  7,  9,  5,  5,  5,
-    7,  7,  7,  7,  9,  8,  5,  9,  8,  5,  9,  8,  5,  9,  5,  9,
-    5,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,  5,  9,  5,
-    5,  9,  8,  5,  9,  5,  9,  9,  9,  5,  9,  5,  9,  5,  9,  5,
-    9,  5,  9,  5,  5,  5,  5,  5,  5,  5,  9,  9,  5,  9,  9,  5,
-    5,  9,  5,  9,  9,  9,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,
-    5,  5,  5,  5,  7,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,
-    6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
-    6,  6, 24, 24, 24, 24,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
-    6,  6, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-    6,  6,  6,  6,  6, 24, 24, 24, 24, 24, 24, 24,  6, 24,  6, 24,
-   24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-    9,  5,  9,  5,  6, 24,  9,  5,  2,  2,  6,  5,  5,  5, 21,  9,
-    2,  2,  2,  2, 24, 24,  9, 21,  9,  9,  9,  2,  9,  2,  9,  9,
-    5,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  2,  9,  9,  9,  9,  9,  9,  9,  9,  9,  5,  5,  5,  5,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  9,
-    5,  5,  9,  9,  9,  5,  5,  5,  9,  5,  9,  5,  9,  5,  9,  5,
-    5,  5,  5,  5,  9,  5, 25,  9,  5,  9,  9,  5,  5,  9,  9,  9,
-    9,  5, 26, 12, 12, 12, 12, 12, 11, 11,  9,  5,  9,  5,  9,  5,
-    9,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,  5,
-    2,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  2,  2,  6, 21, 21, 21, 21, 21, 21,
-    5,  5,  5,  5,  5,  5,  5,  5,  5, 21, 17,  2,  2, 26, 26, 23,
-    2, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 17, 12,
-   21, 12, 12, 21, 12, 12, 21, 12,  2,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2,  2,  7,
-    7,  7,  7, 21, 21,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    1,  1,  1,  1,  1,  1, 25, 25, 25, 21, 21, 23, 21, 21, 26, 26,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 21,  1, 21, 21, 21,
-    6,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 12, 12, 12, 12, 12,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 21, 21, 21, 21,  7,  7,
-   12,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7, 21,  7, 12, 12, 12, 12, 12, 12, 12,  1, 26, 12,
-   12, 12, 12, 12, 12,  6,  6, 12, 12, 26, 12, 12, 12, 12,  7,  7,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13,  7,  7,  7, 26, 26,  7,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,  2,  1,
-    7, 12,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,  2,  2,  7,  7,  7,
-    7,  7,  7,  7,  7,  7, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12,  7,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 12, 12, 12, 12, 12,
-   12, 12, 12, 12,  6,  6, 26, 21, 21, 21,  6,  2,  2, 12, 23, 23,
-    7,  7,  7,  7,  7,  7, 12, 12, 12, 12,  6, 12, 12, 12, 12, 12,
-   12, 12, 12, 12,  6, 12, 12, 12,  6, 12, 12, 12, 12, 12,  2,  2,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7, 12, 12, 12,  2,  2, 21,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  7, 24,  7,  7,  7,  7,  7,  7,  2,
-    1,  1,  2,  2,  2,  2,  2,  2, 12, 12, 12, 12, 12, 12, 12, 12,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  6, 12, 12, 12, 12, 12, 12,
-   12, 12,  1, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 10,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 12, 10, 12,  7, 10, 10,
-   10, 12, 12, 12, 12, 12, 12, 12, 12, 10, 10, 10, 10, 12, 10, 10,
-    7, 12, 12, 12, 12, 12, 12, 12,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7, 12, 12, 21, 21, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   21,  6,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7, 12, 10, 10,  2,  7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  7,
-    7,  2,  2,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  7,  7,  7,  7,  7,  7,
-    7,  2,  7,  2,  2,  2,  7,  7,  7,  7,  2,  2, 12,  7, 10, 10,
-   10, 12, 12, 12, 12,  2,  2, 10, 10,  2,  2, 10, 10, 12,  7,  2,
-    2,  2,  2,  2,  2,  2,  2, 10,  2,  2,  2,  2,  7,  7,  2,  7,
-    7,  7, 12, 12,  2,  2, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-    7,  7, 23, 23, 15, 15, 15, 15, 15, 15, 26, 23,  7, 21, 12,  2,
-    2, 12, 12, 10,  2,  7,  7,  7,  7,  7,  7,  2,  2,  2,  2,  7,
-    7,  2,  7,  7,  2,  7,  7,  2,  7,  7,  2,  2, 12,  2, 10, 10,
-   10, 12, 12,  2,  2,  2,  2, 12, 12,  2,  2, 12, 12, 12,  2,  2,
-    2, 12,  2,  2,  2,  2,  2,  2,  2,  7,  7,  7,  7,  2,  7,  2,
-    2,  2,  2,  2,  2,  2, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   12, 12,  7,  7,  7, 12, 21,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2, 12, 12, 10,  2,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  7,
-    7,  7,  2,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  2,  7,  7,  2,  7,  7,  7,  7,  7,  2,  2, 12,  7, 10, 10,
-   10, 12, 12, 12, 12, 12,  2, 12, 12, 10,  2, 10, 10, 12,  2,  2,
-    7,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   21, 23,  2,  2,  2,  2,  2,  2,  2,  7, 12, 12, 12, 12, 12, 12,
-    2, 12, 10, 10,  2,  7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  7,
-    7,  2,  7,  7,  2,  7,  7,  7,  7,  7,  2,  2, 12,  7, 10, 12,
-   10, 12, 12, 12, 12,  2,  2, 10, 10,  2,  2, 10, 10, 12,  2,  2,
-    2,  2,  2,  2,  2, 12, 12, 10,  2,  2,  2,  2,  7,  7,  2,  7,
-   26,  7, 15, 15, 15, 15, 15, 15,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2, 12,  7,  2,  7,  7,  7,  7,  7,  7,  2,  2,  2,  7,  7,
-    7,  2,  7,  7,  7,  7,  2,  2,  2,  7,  7,  2,  7,  2,  7,  7,
-    2,  2,  2,  7,  7,  2,  2,  2,  7,  7,  7,  2,  2,  2,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2,  2, 10, 10,
-   12, 10, 10,  2,  2,  2, 10, 10, 10,  2, 10, 10, 10, 12,  2,  2,
-    7,  2,  2,  2,  2,  2,  2, 10,  2,  2,  2,  2,  2,  2,  2,  2,
-   15, 15, 15, 26, 26, 26, 26, 26, 26, 23, 26,  2,  2,  2,  2,  2,
-   12, 10, 10, 10, 12,  7,  7,  7,  7,  7,  7,  7,  7,  2,  7,  7,
-    7,  2,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  2, 12,  7, 12, 12,
-   12, 10, 10, 10, 10,  2, 12, 12, 12,  2, 12, 12, 12, 12,  2,  2,
-    2,  2,  2,  2,  2, 12, 12,  2,  7,  7,  7,  2,  2,  7,  2,  2,
-    2,  2,  2,  2,  2,  2,  2, 21, 15, 15, 15, 15, 15, 15, 15, 26,
-    7, 12, 10, 10, 21,  7,  7,  7,  7,  7,  7,  7,  7,  2,  7,  7,
-    7,  7,  7,  7,  2,  7,  7,  7,  7,  7,  2,  2, 12,  7, 10, 12,
-   10, 10, 10, 10, 10,  2, 12, 10, 10,  2, 10, 10, 12, 12,  2,  2,
-    2,  2,  2,  2,  2, 10, 10,  2,  2,  2,  2,  2,  2,  7,  7,  2,
-    2,  7,  7,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   12, 12, 10, 10,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 12, 12,  7, 10, 10,
-   10, 12, 12, 12, 12,  2, 10, 10, 10,  2, 10, 10, 10, 12,  7, 26,
-    2,  2,  2,  2,  7,  7,  7, 10, 15, 15, 15, 15, 15, 15, 15,  7,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 26,  7,  7,  7,  7,  7,  7,
-    2, 12, 10, 10,  2,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  2,  2,  2,  7,  7,  7,  7,  7,  7,
-    7,  7,  2,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  7,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  2,  2,  2, 12,  2,  2,  2,  2, 10,
-   10, 10, 12, 12, 12,  2, 12,  2, 10, 10, 10, 10, 10, 10, 10, 10,
-    2,  2, 10, 10, 21,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7, 12,  7,  7, 12, 12, 12, 12, 12, 12, 12,  2,  2,  2,  2, 23,
-    7,  7,  7,  7,  7,  7,  6, 12, 12, 12, 12, 12, 12, 12, 12, 21,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 21, 21,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  7,  7,  2,  7,  2,  7,  7,  7,  7,  7,  2,  7,  7,  7,  7,
-    7,  7,  7,  7,  2,  7,  2,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7, 12,  7,  7, 12, 12, 12, 12, 12, 12, 12, 12, 12,  7,  2,  2,
-    7,  7,  7,  7,  7,  2,  6,  2, 12, 12, 12, 12, 12, 12,  2,  2,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13,  2,  2,  7,  7,  7,  7,
-    7, 26, 26, 26, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 26, 21, 26, 26, 26, 12, 12, 26, 26, 26, 26, 26, 26,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 26, 12, 26, 12, 26, 12, 22, 18, 22, 18, 10, 10,
-    7,  7,  7,  7,  7,  7,  7,  7,  2,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2,
-    2, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 10,
-   12, 12, 12, 12, 12, 21, 12, 12,  7,  7,  7,  7,  7, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12,  2, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,  2, 26, 26,
-   26, 26, 26, 26, 26, 26, 12, 26, 26, 26, 26, 26, 26,  2, 26, 26,
-   21, 21, 21, 21, 21, 26, 26, 26, 26, 21, 21,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 10, 10, 12, 12, 12,
-   12, 10, 12, 12, 12, 12, 12, 12, 10, 12, 12, 10, 10, 12, 12,  7,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 21, 21, 21, 21, 21, 21,
-    7,  7,  7,  7,  7,  7, 10, 10, 12, 12,  7,  7,  7,  7, 12, 12,
-   12,  7, 10, 10, 10,  7,  7, 10, 10, 10, 10, 10, 10, 10,  7,  7,
-    7, 12, 12, 12, 12,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7, 12, 10, 10, 12, 12, 10, 10, 10, 10, 10, 10, 12,  7, 10,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 10, 10, 10, 12, 26, 26,
-    9,  9,  9,  9,  9,  9,  2,  9,  2,  2,  2,  2,  2,  9,  2,  2,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5, 21,  6,  5,  5,  5,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  7,  7,  7,  7,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  2,  7,  2,  7,  7,  7,  7,  2,  2,
-    7,  2,  7,  7,  7,  7,  2,  2,  7,  7,  7,  7,  7,  7,  7,  2,
-    7,  2,  7,  7,  7,  7,  2,  2,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  2,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  2, 12, 12, 12,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  2,  2,  2,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26,  2,  2,  2,  2,  2,  2,
-    9,  9,  9,  9,  9,  9,  2,  2,  5,  5,  5,  5,  5,  5,  2,  2,
-   17,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 26, 21,  7,
-   29,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 22, 18,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 21, 21, 21, 14, 14,
-   14,  7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2,  2,  2,  2,  2,
-    7,  7, 12, 12, 12, 10,  2,  2,  2,  2,  2,  2,  2,  2,  2,  7,
-    7,  7, 12, 12, 10, 21, 21,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    7,  7, 12, 12,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  7,  7,
-    7,  2, 12, 12,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7, 12, 12, 10, 12, 12, 12, 12, 12, 12, 12, 10, 10,
-   10, 10, 10, 10, 10, 10, 12, 10, 10, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 21, 21, 21,  6, 21, 21, 21, 23,  7, 12,  2,  2,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13,  2,  2,  2,  2,  2,  2,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  2,  2,  2,  2,  2,  2,
-   21, 21, 21, 21, 21, 21, 17, 21, 21, 21, 21, 12, 12, 12,  1, 12,
-    7,  7,  7,  6,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7, 12, 12,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7, 12,  7,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,
-   12, 12, 12, 10, 10, 10, 10, 12, 12, 10, 10, 10,  2,  2,  2,  2,
-   10, 10, 12, 10, 10, 10, 10, 10, 10, 12, 12, 12,  2,  2,  2,  2,
-   26,  2,  2,  2, 21, 21, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  2,
-    7,  7,  7,  7,  7,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2,  2,  2,  2,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 15,  2,  2,  2, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-    7,  7,  7,  7,  7,  7,  7, 12, 12, 10, 10, 12,  2,  2, 21, 21,
-    7,  7,  7,  7,  7, 10, 12, 10, 12, 12, 12, 12, 12, 12, 12,  2,
-   12, 10, 12, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12, 10, 10, 10,
-   10, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,  2,  2, 12,
-   21, 21, 21, 21, 21, 21, 21,  6, 21, 21, 21, 21, 21, 21,  2,  2,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 11, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,  2,
-   12, 12, 12, 12, 10,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7, 12, 10, 12, 12, 12, 12, 12, 10, 12, 10, 10, 10,
-   10, 10, 12, 10, 10,  7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2,
-   21, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 26, 26, 26, 26, 26, 26, 26, 26, 26, 21, 21,  2,
-   12, 12, 10,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7, 10, 12, 12, 12, 12, 10, 10, 12, 12, 10, 12, 12, 12,  7,  7,
-    7,  7,  7,  7,  7,  7, 12, 10, 12, 12, 10, 10, 10, 12, 10, 12,
-   12, 12, 10, 10,  2,  2,  2,  2,  2,  2,  2,  2, 21, 21, 21, 21,
-    7,  7,  7,  7, 10, 10, 10, 10, 10, 10, 10, 10, 12, 12, 12, 12,
-   12, 12, 12, 12, 10, 10, 12, 12,  2,  2,  2, 21, 21, 21, 21, 21,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13,  2,  2,  2,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  6,  6,  6,  6,  6,  6, 21, 21,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  2,  2,  2,  2,  2,  2,  2,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  2,  2,  9,  9,  9,
-   21, 21, 21, 21, 21, 21, 21, 21,  2,  2,  2,  2,  2,  2,  2,  2,
-   12, 12, 12, 21, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 10, 12, 12, 12, 12, 12, 12, 12,  7,  7,  7,  7, 12,  7,  7,
-    7,  7,  7,  7, 12,  7,  7, 10, 12, 12,  7,  2,  2,  2,  2,  2,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  6,  6,  6,  6,
-    6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  5,  5,  5,  5,  5,
-    5,  5,  5,  5,  5,  5,  5,  5,  6,  5,  5,  5,  5,  5,  5,  5,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  6,  6,  6,  6,  6,
-    9,  5,  9,  5,  9,  5,  5,  5,  5,  5,  5,  5,  5,  5,  9,  5,
-    5,  5,  5,  5,  5,  5,  5,  5,  9,  9,  9,  9,  9,  9,  9,  9,
-    5,  5,  5,  5,  5,  5,  2,  2,  9,  9,  9,  9,  9,  9,  2,  2,
-    5,  5,  5,  5,  5,  5,  5,  5,  2,  9,  2,  9,  2,  9,  2,  9,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  2,  2,
-    5,  5,  5,  5,  5,  5,  5,  5,  8,  8,  8,  8,  8,  8,  8,  8,
-    5,  5,  5,  5,  5,  2,  5,  5,  9,  9,  9,  9,  8, 24,  5, 24,
-   24, 24,  5,  5,  5,  2,  5,  5,  9,  9,  9,  9,  8, 24, 24, 24,
-    5,  5,  5,  5,  2,  2,  5,  5,  9,  9,  9,  9,  2, 24, 24, 24,
-    5,  5,  5,  5,  5,  5,  5,  5,  9,  9,  9,  9,  9, 24, 24, 24,
-    2,  2,  5,  5,  5,  2,  5,  5,  9,  9,  9,  9,  8, 24, 24,  2,
-   29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,  1,  1,  1,  1,  1,
-   17, 17, 17, 17, 17, 17, 21, 21, 20, 19, 22, 20, 20, 19, 22, 20,
-   21, 21, 21, 21, 21, 21, 21, 21, 27, 28,  1,  1,  1,  1,  1, 29,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 20, 19, 21, 21, 21, 21, 16,
-   16, 21, 21, 21, 25, 22, 18, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 25, 21, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 29,
-    1,  1,  1,  1,  1,  2,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-   15,  6,  2,  2, 15, 15, 15, 15, 15, 15, 25, 25, 25, 22, 18,  6,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 25, 25, 25, 22, 18,  2,
-    6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  2,  2,  2,
-   23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-   23,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 11, 11, 11,
-   11, 12, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   26, 26,  9, 26, 26, 26, 26,  9, 26, 26,  5,  9,  9,  9,  5,  5,
-    9,  9,  9,  5, 26,  9, 26, 26, 25,  9,  9,  9,  9,  9, 26, 26,
-   26, 26, 26, 26,  9, 26,  9, 26,  9, 26,  9,  9,  9,  9, 26,  5,
-    9,  9,  9,  9,  5,  7,  7,  7,  7,  5, 26, 26,  5,  5,  9,  9,
-   25, 25, 25, 25, 25,  9,  5,  5,  5,  5, 26, 25, 26, 26,  5, 26,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-   14, 14, 14,  9,  5, 14, 14, 14, 14, 15, 26, 26,  2,  2,  2,  2,
-   25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 25, 25, 26, 26, 26, 26,
-   25, 26, 26, 25, 26, 26, 25, 26, 26, 26, 26, 26, 26, 26, 25, 26,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 25, 25,
-   26, 26, 25, 26, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-   25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-   26, 26, 26, 26, 26, 26, 26, 26, 22, 18, 22, 18, 26, 26, 26, 26,
-   25, 25, 26, 26, 26, 26, 26, 26, 26, 22, 18, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 25, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 25, 25, 25, 25, 25,
-   25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 25, 25, 25, 25,
-   25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,  2,  2,  2,  2,  2,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 15, 15, 15, 15, 15, 15,
-   26, 26, 26, 26, 26, 26, 26, 25, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 26, 25, 25, 25, 25, 25, 25, 25, 25,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 25,
-   26, 26, 26, 26, 26, 26, 26, 26, 22, 18, 22, 18, 22, 18, 22, 18,
-   22, 18, 22, 18, 22, 18, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   25, 25, 25, 25, 25, 22, 18, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-   25, 25, 25, 25, 25, 25, 22, 18, 22, 18, 22, 18, 22, 18, 22, 18,
-   25, 25, 25, 22, 18, 22, 18, 22, 18, 22, 18, 22, 18, 22, 18, 22,
-   18, 22, 18, 22, 18, 22, 18, 22, 18, 25, 25, 25, 25, 25, 25, 25,
-   25, 25, 25, 25, 25, 25, 25, 25, 22, 18, 22, 18, 25, 25, 25, 25,
-   25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 22, 18, 25, 25,
-   25, 25, 25, 25, 25, 26, 26, 25, 25, 25, 25, 25, 25, 26, 26, 26,
-   26, 26, 26, 26,  2,  2, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26,  2, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-    9,  5,  9,  9,  9,  5,  5,  9,  5,  9,  5,  9,  5,  9,  9,  9,
-    9,  5,  9,  5,  5,  9,  5,  5,  5,  5,  5,  5,  6,  6,  9,  9,
-    9,  5,  9,  5,  5, 26, 26, 26, 26, 26, 26,  9,  5,  9,  5, 12,
-   12, 12,  9,  5,  2,  2,  2,  2,  2, 21, 21, 21, 21, 15, 21, 21,
-    5,  5,  5,  5,  5,  5,  2,  5,  2,  2,  2,  2,  2,  5,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2,  2,  2,  2,  2,  6,
-   21,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 12,
-    7,  7,  7,  7,  7,  7,  7,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  2,  7,  7,  7,  7,  7,  7,  7,  2,
-   21, 21, 20, 19, 20, 19, 21, 21, 21, 20, 19, 21, 20, 19, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 17, 21, 21, 17, 21, 20, 19, 21, 21,
-   20, 19, 22, 18, 22, 18, 22, 18, 22, 18, 21, 21, 21, 21, 21,  6,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 17, 17, 21, 21, 21, 21,
-   17, 21, 22, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   26, 26, 21, 21, 21, 22, 18, 22, 18, 22, 18, 22, 18, 17,  2,  2,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26,  2, 26, 26, 26, 26, 26,
-   26, 26, 26, 26,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   26, 26, 26, 26, 26, 26,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,  2,  2,  2,  2,
-   29, 21, 21, 21, 26,  6,  7, 14, 22, 18, 22, 18, 22, 18, 22, 18,
-   22, 18, 26, 26, 22, 18, 22, 18, 22, 18, 22, 18, 17, 22, 18, 18,
-   26, 14, 14, 14, 14, 14, 14, 14, 14, 14, 12, 12, 12, 12, 10, 10,
-   17,  6,  6,  6,  6,  6, 26, 26, 14, 14, 14,  6,  7, 21, 26, 26,
-    7,  7,  7,  7,  7,  7,  7,  2,  2, 12, 12, 24, 24,  6,  6,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 21,  6,  6,  6,  7,
-    2,  2,  2,  2,  2,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-   26, 26, 15, 15, 15, 15, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,  2,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 26, 15, 15, 15, 15, 15, 15, 15, 15,
-   26, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-    7,  7,  7,  7,  7,  6,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  6, 21, 21, 21,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13,  7,  7,  2,  2,  2,  2,
-    9,  5,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,  7, 12,
-   11, 11, 11, 21, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 21,  6,
-    9,  5,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,  6,  6, 12, 12,
-    7,  7,  7,  7,  7,  7, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-   12, 12, 21, 21, 21, 21, 21, 21,  2,  2,  2,  2,  2,  2,  2,  2,
-   24, 24, 24, 24, 24, 24, 24,  6,  6,  6,  6,  6,  6,  6,  6,  6,
-   24, 24,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,
-    5,  5,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,
-    6,  5,  5,  5,  5,  5,  5,  5,  5,  9,  5,  9,  5,  9,  9,  5,
-    9,  5,  9,  5,  9,  5,  9,  5,  6, 24, 24,  9,  5,  9,  5,  7,
-    9,  5,  9,  5,  5,  5,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,
-    9,  5,  9,  5,  9,  5,  9,  5,  9,  5,  9,  9,  9,  9,  9,  5,
-    9,  9,  9,  9,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,  9,  5,
-    9,  5,  9,  5,  9,  9,  9,  9,  5,  9,  5,  2,  2,  2,  2,  2,
-    9,  5,  2,  5,  2,  5,  9,  5,  9,  5,  2,  2,  2,  2,  2,  2,
-    2,  2,  6,  6,  6,  9,  5,  7,  6,  6,  5,  7,  7,  7,  7,  7,
-    7,  7, 12,  7,  7,  7, 12,  7,  7,  7,  7, 12,  7,  7,  7,  7,
-    7,  7,  7, 10, 10, 12, 12, 10, 26, 26, 26, 26, 12,  2,  2,  2,
-   15, 15, 15, 15, 15, 15, 26, 26, 23, 26,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7, 21, 21, 21, 21,  2,  2,  2,  2,  2,  2,  2,  2,
-   10, 10,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-   10, 10, 10, 10, 12, 12,  2,  2,  2,  2,  2,  2,  2,  2, 21, 21,
-   12, 12,  7,  7,  7,  7,  7,  7, 21, 21, 21,  7, 21,  7,  7, 12,
-    7,  7,  7,  7,  7,  7, 12, 12, 12, 12, 12, 12, 12, 12, 21, 21,
-    7,  7,  7,  7,  7,  7,  7, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 10, 10,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 21,
-    7,  7,  7, 12, 10, 10, 12, 12, 12, 12, 10, 10, 12, 12, 10, 10,
-   10, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,  2,  6,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13,  2,  2,  2,  2, 21, 21,
-    7,  7,  7,  7,  7, 12,  6,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13,  7,  7,  7,  7,  7,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7, 12, 12, 12, 12, 12, 12, 10,
-   10, 12, 12, 10, 10, 12, 12,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7, 12,  7,  7,  7,  7,  7,  7,  7,  7, 12, 10,  2,  2,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13,  2,  2, 21, 21, 21, 21,
-    6,  7,  7,  7,  7,  7,  7, 26, 26, 26,  7, 10, 12, 10,  7,  7,
-   12,  7, 12, 12, 12,  7,  7, 12, 12,  7,  7,  7,  7,  7, 12, 12,
-    7, 12,  7,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  7,  7,  6, 21, 21,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 10, 12, 12, 10, 10,
-   21, 21,  7,  6,  6, 10, 12,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  7,  7,  7,  7,  7,  7,  2,  2,  7,  7,  7,  7,  7,  7,  2,
-    2,  7,  7,  7,  7,  7,  7,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5, 24,  6,  6,  6,  6,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  6, 24, 24,  2,  2,  2,  2,
-    7,  7,  7, 10, 10, 12, 10, 10, 12, 10, 10, 21, 10, 12,  2,  2,
-    7,  7,  7,  7,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  2,  2,  2,  2,  7,  7,  7,  7,  7,
-    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
-    3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    5,  5,  5,  5,  5,  5,  5,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  5,  5,  5,  5,  5,  2,  2,  2,  2,  2,  7, 12,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7, 25,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  2,  7,  7,  7,  7,  7,  2,  7,  2,
-    7,  7,  2,  7,  7,  2,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-   24, 24, 24,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 18, 22,
-    2,  2,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2,  2,  2,  2,  2, 26,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 23, 26, 26, 26,
-   21, 21, 21, 21, 21, 21, 21, 22, 18, 21,  2,  2,  2,  2,  2,  2,
-   21, 17, 17, 16, 16, 22, 18, 22, 18, 22, 18, 22, 18, 22, 18, 22,
-   18, 22, 18, 22, 18, 21, 21, 22, 18, 21, 21, 21, 21, 16, 16, 16,
-   21, 21, 21,  2, 21, 21, 21, 21, 17, 22, 18, 22, 18, 22, 18, 21,
-   21, 21, 25, 17, 25, 25, 25,  2, 21, 23, 21, 21,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  2,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  1,
-    2, 21, 21, 21, 23, 21, 21, 21, 22, 18, 21, 25, 21, 17, 21, 21,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5, 22, 25, 18, 25, 22,
-   18, 21, 22, 18, 21, 21,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    6,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  6,  6,
-    2,  2,  7,  7,  7,  7,  7,  7,  2,  2,  7,  7,  7,  7,  7,  7,
-    2,  2,  7,  7,  7,  7,  7,  7,  2,  2,  7,  7,  7,  2,  2,  2,
-   23, 23, 25, 24, 26, 23, 23,  2, 26, 25, 25, 25, 25, 26, 26,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  1,  1,  1, 26, 26,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  7,  7,  2,  7,
-   21, 21, 21,  2,  2,  2,  2, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15,  2,  2,  2, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   14, 14, 14, 14, 14, 15, 15, 15, 15, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 15, 15, 26, 26, 26,  2,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,  2,  2,  2,
-   26,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 12,  2,  2,
-   12, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  2,  2,  2,  2,
-   15, 15, 15, 15,  2,  2,  2,  2,  2,  2,  2,  2,  2,  7,  7,  7,
-    7, 14,  7,  7,  7,  7,  7,  7,  7,  7, 14,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7, 12, 12, 12, 12, 12,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2, 21,
-    7,  7,  7,  7,  2,  2,  2,  2,  7,  7,  7,  7,  7,  7,  7,  7,
-   21, 14, 14, 14, 14, 14,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    9,  9,  9,  9,  9,  9,  9,  9,  5,  5,  5,  5,  5,  5,  5,  5,
-    9,  9,  9,  9,  2,  2,  2,  2,  5,  5,  5,  5,  5,  5,  5,  5,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 21,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  2,  9,  9,  9,  9,
-    9,  9,  9,  2,  9,  9,  2,  5,  5,  5,  5,  5,  5,  5,  5,  5,
-    5,  5,  2,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,
-    5,  5,  2,  5,  5,  5,  5,  5,  5,  5,  2,  5,  5,  2,  2,  2,
-    6,  6,  6,  6,  6,  6,  2,  6,  6,  6,  6,  6,  6,  6,  6,  6,
-    6,  2,  6,  6,  6,  6,  6,  6,  6,  6,  6,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  2,  2,  7,  2,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  2,  7,  7,  2,  2,  2,  7,  2,  2,  7,
-    7,  7,  7,  7,  7,  7,  2, 21, 15, 15, 15, 15, 15, 15, 15, 15,
-    7,  7,  7,  7,  7,  7,  7, 26, 26, 15, 15, 15, 15, 15, 15, 15,
-    2,  2,  2,  2,  2,  2,  2, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-    7,  7,  7,  2,  7,  7,  2,  2,  2,  2,  2, 15, 15, 15, 15, 15,
-    7,  7,  7,  7,  7,  7, 15, 15, 15, 15, 15, 15,  2,  2,  2, 21,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2,  2,  2, 21,
-    7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2,  2, 15, 15,  7,  7,
-    2,  2, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-    7, 12, 12, 12,  2, 12, 12,  2,  2,  2,  2,  2, 12, 12, 12, 12,
-    7,  7,  7,  7,  2,  7,  7,  7,  2,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  2,  2, 12, 12, 12,  2,  2,  2,  2, 12,
-   15, 15, 15, 15, 15, 15, 15, 15, 15,  2,  2,  2,  2,  2,  2,  2,
-   21, 21, 21, 21, 21, 21, 21, 21, 21,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 15, 15, 21,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 15, 15, 15,
-    7,  7,  7,  7,  7,  7,  7,  7, 26,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7, 12, 12,  2,  2,  2,  2, 15, 15, 15, 15, 15,
-   21, 21, 21, 21, 21, 21, 21,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  2,  2,  2, 21, 21, 21, 21, 21, 21, 21,
-    7,  7,  7,  7,  7,  7,  2,  2, 15, 15, 15, 15, 15, 15, 15, 15,
-    7,  7,  7,  2,  2,  2,  2,  2, 15, 15, 15, 15, 15, 15, 15, 15,
-    7,  7,  2,  2,  2,  2,  2,  2,  2, 21, 21, 21, 21,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2, 15, 15, 15, 15, 15, 15, 15,
-    9,  9,  9,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    5,  5,  5,  2,  2,  2,  2,  2,  2,  2, 15, 15, 15, 15, 15, 15,
-    7,  7,  7,  7, 12, 12, 12, 12,  2,  2,  2,  2,  2,  2,  2,  2,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2, 12, 12, 17,  2,  2,
-    7,  7,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   15, 15, 15, 15, 15, 15, 15,  7,  2,  2,  2,  2,  2,  2,  2,  2,
-   12, 15, 15, 15, 15, 21, 21, 21, 21, 21,  2,  2,  2,  2,  2,  2,
-    7,  7, 12, 12, 12, 12, 21, 21, 21, 21,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7, 15, 15, 15, 15, 15, 15, 15,  2,  2,  2,  2,
-   10, 12, 10,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 21, 21, 21, 21, 21, 21, 21,  2,  2,
-   15, 15, 15, 15, 15, 15, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   12,  7,  7, 12, 12,  7,  2,  2,  2,  2,  2,  2,  2,  2,  2, 12,
-   10, 10, 10, 12, 12, 12, 12, 10, 10, 12, 12, 21, 21,  1, 21, 21,
-   21, 21, 12,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  1,  2,  2,
-   12, 12, 12,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7, 12, 12, 12, 12, 12, 10, 12, 12, 12,
-   12, 12, 12, 12, 12,  2, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   21, 21, 21, 21,  7, 10, 10,  7,  2,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7, 12, 21, 21,  7,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7, 10, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12, 12, 10,
-   10,  7,  7,  7,  7, 21, 21, 21, 21, 12, 12, 12, 12, 21, 10, 12,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13,  7, 21,  7, 21, 21, 21,
-    2, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 15,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 10, 10, 10, 12,
-   12, 12, 10, 10, 12, 10, 12, 12, 21, 21, 21, 21, 21, 21, 12,  2,
-    7,  7,  7,  7,  7,  7,  7,  2,  7,  2,  7,  7,  7,  7,  2,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7, 21,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 12,
-   10, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12,  2,  2,  2,  2,  2,
-   12, 12, 10, 10,  2,  7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  7,
-    7,  2,  7,  7,  2,  7,  7,  7,  7,  7,  2, 12, 12,  7, 10, 10,
-   12, 10, 10, 10, 10,  2,  2, 10, 10,  2,  2, 10, 10, 10,  2,  2,
-    7,  2,  2,  2,  2,  2,  2, 10,  2,  2,  2,  2,  2,  7,  7,  7,
-    7,  7, 10, 10,  2,  2, 12, 12, 12, 12, 12, 12, 12,  2,  2,  2,
-   12, 12, 12, 12, 12,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7, 10, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12,
-   10, 10, 12, 12, 12, 10, 12,  7,  7,  7,  7, 21, 21, 21, 21, 21,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 21, 21,  2, 21, 12,  7,
-   10, 10, 10, 12, 12, 12, 12, 12, 12, 10, 12, 10, 10, 10, 10, 12,
-   12, 10, 12, 12,  7,  7, 21,  7,  2,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 10,
-   10, 10, 12, 12, 12, 12,  2,  2, 10, 10, 10, 10, 12, 12, 10, 12,
-   12, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21,  7,  7,  7,  7, 12, 12,  2,  2,
-   10, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12, 10, 10, 12, 10, 12,
-   12, 21, 21, 21,  7,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 12, 10, 12, 10, 10,
-   12, 12, 12, 12, 12, 12, 10, 12,  7, 21,  2,  2,  2,  2,  2,  2,
-   10, 10, 12, 12, 12, 12, 10, 12, 12, 12, 12, 12,  2,  2,  2,  2,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 15, 15, 21, 21, 21, 26,
-   12, 12, 12, 12, 12, 12, 12, 12, 10, 12, 12, 21,  2,  2,  2,  2,
-   15, 15, 15,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  7,
-    7,  7,  7,  7,  7,  7,  7,  2,  2,  7,  2,  2,  7,  7,  7,  7,
-    7,  7,  7,  7,  2,  7,  7,  2,  7,  7,  7,  7,  7,  7,  7,  7,
-   10, 10, 10, 10, 10, 10,  2, 10, 10,  2,  2, 12, 12, 10, 12,  7,
-   10,  7, 10, 12, 21, 21, 21,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  7,  7,  7,  7,  7,  7,
-    7, 10, 10, 10, 12, 12, 12, 12,  2,  2, 12, 12, 10, 10, 10, 10,
-   12,  7, 21,  7, 10,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    7, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,  7,  7,  7,  7,  7,
-    7,  7,  7, 12, 12, 12, 12, 12, 12, 10,  7, 12, 12, 12, 12, 21,
-   21, 21, 21, 21, 21, 21, 21, 12,  2,  2,  2,  2,  2,  2,  2,  2,
-    7, 12, 12, 12, 12, 12, 12, 10, 10, 12, 12, 12,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 10, 12, 12, 21, 21, 21,  7, 21, 21,
-   21, 21, 21,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   12, 12, 12, 12, 12, 12, 12,  2, 12, 12, 12, 12, 12, 12, 10, 12,
-    7, 21, 21, 21, 21, 21,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   21, 21,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    2,  2, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12,  2, 10, 12, 12, 12, 12, 12, 12,
-   12, 10, 12, 12, 10, 12, 12,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  2,  7,  7,  2,  7,  7,  7,  7,  7,
-    7, 12, 12, 12, 12, 12, 12,  2,  2,  2, 12,  2, 12, 12,  2, 12,
-   12, 12, 12, 12, 12, 12,  7, 12,  2,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  2,  7,  7,  2,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 10, 10, 10, 10, 10,  2,
-   12, 12,  2, 10, 10, 12, 10, 12,  7,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7, 12, 12, 10, 10, 21, 21,  2,  2,  2,  2,  2,  2,  2,
-   15, 15, 15, 15, 15, 26, 26, 26, 26, 26, 26, 26, 26, 23, 23, 23,
-   23, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 26,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 21,
-   14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,  2,
-   21, 21, 21, 21, 21,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    7, 21, 21,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  2,  2,  2,  2,  2,  2,  2,
-   12, 12, 12, 12, 12, 21,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   12, 12, 12, 12, 12, 12, 12, 21, 21, 21, 21, 21, 26, 26, 26, 26,
-    6,  6,  6,  6, 21, 26,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13,  2, 15, 15, 15, 15, 15,
-   15, 15,  2,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2,  2,  2,  7,  7,  7,
-   15, 15, 15, 15, 15, 15, 15, 21, 21, 21, 21,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2,  2, 12,
-    7, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-   10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-   10, 10, 10, 10, 10, 10, 10, 10,  2,  2,  2,  2,  2,  2,  2, 12,
-   12, 12, 12,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
-    6,  6, 21,  6, 12,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   10, 10,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    6,  6,  6,  6,  2,  6,  6,  6,  6,  6,  6,  6,  2,  6,  6,  2,
-    7,  7,  7,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  7,  7,  7,  7,  2,  2,  2,  2,  2,  2,  2,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  2, 26, 12, 12, 21,
-    1,  1,  1,  1,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,  2,  2,
-   12, 12, 12, 12, 12, 12, 12,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   26, 26, 26, 26, 26, 26, 26,  2,  2, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 10, 10, 12, 12, 12, 26, 26, 26, 10, 10, 10,
-   10, 10, 10,  1,  1,  1,  1,  1,  1,  1,  1, 12, 12, 12, 12, 12,
-   12, 12, 12, 26, 26, 12, 12, 12, 12, 12, 12, 12, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 12, 12, 12, 12, 26, 26,
-   26, 26, 12, 12, 12, 26,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   15, 15, 15, 15,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  5,  5,  5,  5,  5,  5,
-    5,  5,  5,  5,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  5,  5,
-    5,  5,  5,  5,  5,  2,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,
-    9,  9,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  9,  2,  9,  9,
-    2,  2,  9,  2,  2,  9,  9,  2,  2,  9,  9,  9,  9,  2,  9,  9,
-    9,  9,  9,  9,  9,  9,  5,  5,  5,  5,  2,  5,  2,  5,  5,  5,
-    5,  5,  5,  5,  2,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,
-    5,  5,  5,  5,  9,  9,  2,  9,  9,  9,  9,  2,  2,  9,  9,  9,
-    9,  9,  9,  9,  9,  2,  9,  9,  9,  9,  9,  9,  9,  2,  5,  5,
-    5,  5,  5,  5,  5,  5,  5,  5,  9,  9,  2,  9,  9,  9,  9,  2,
-    9,  9,  9,  9,  9,  2,  9,  2,  2,  2,  9,  9,  9,  9,  9,  9,
-    9,  2,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,
-    5,  5,  5,  5,  5,  5,  2,  2,  9,  9,  9,  9,  9,  9,  9,  9,
-    9, 25,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5, 25,  5,  5,  5,  5,
-    5,  5,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 25,  5,  5,  5,  5,
-    5,  5,  5,  5,  5, 25,  5,  5,  5,  5,  5,  5,  9,  9,  9,  9,
-    9,  9,  9,  9,  9, 25,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5, 25,
-    5,  5,  5,  5,  5,  5,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 25,
-    5,  5,  5,  5,  5,  5,  5,  5,  5, 25,  5,  5,  5,  5,  5,  5,
-    9,  9,  9,  9,  9,  9,  9,  9,  9, 25,  5,  5,  5,  5,  5,  5,
-    5,  5,  5, 25,  5,  5,  5,  5,  5,  5,  9,  5,  2,  2, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   12, 12, 12, 12, 12, 12, 12, 26, 26, 26, 26, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 26, 26, 26,
-   26, 26, 26, 26, 26, 12, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 12, 26, 26, 21, 21, 21, 21, 21,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 12, 12, 12, 12, 12,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  7,  5,  5,  5,  5,  5,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  2,
-   12, 12, 12, 12, 12, 12, 12,  2, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12,  2,  2, 12, 12, 12, 12, 12,
-   12, 12,  2, 12, 12,  2, 12, 12, 12, 12, 12,  2,  2,  2,  2,  2,
-   12, 12, 12, 12, 12, 12, 12,  6,  6,  6,  6,  6,  6,  6,  2,  2,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13,  2,  2,  2,  2,  7, 26,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 12,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 12, 12, 12, 12,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13,  2,  2,  2,  2,  2, 23,
-    7,  7,  7,  7,  7,  7,  7,  2,  7,  7,  7,  7,  2,  7,  7,  2,
-    7,  7,  7,  7,  7,  2,  2, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-    5,  5,  5,  5, 12, 12, 12, 12, 12, 12, 12,  6,  2,  2,  2,  2,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 26, 15, 15, 15,
-   23, 15, 15, 15, 15,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 26, 15,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  2,  2,
-    7,  7,  7,  7,  2,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    2,  7,  7,  2,  7,  2,  2,  7,  2,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  2,  7,  7,  7,  7,  2,  7,  2,  7,  2,  2,  2,  2,
-    2,  2,  7,  2,  2,  2,  2,  7,  2,  7,  2,  7,  2,  7,  7,  7,
-    2,  7,  7,  2,  7,  2,  2,  7,  2,  7,  2,  7,  2,  7,  2,  7,
-    2,  7,  7,  2,  7,  2,  2,  7,  7,  7,  7,  2,  7,  7,  7,  7,
-    7,  7,  7,  2,  7,  7,  7,  7,  2,  7,  7,  7,  7,  2,  7,  2,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  2,  7,  7,  7,  7,  7,
-    2,  7,  7,  7,  2,  7,  7,  7,  7,  7,  2,  7,  7,  7,  7,  7,
-   25, 25,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,  2,  2,
-    2,  2,  2,  2,  2,  2, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   26, 26, 26, 26, 26, 26, 26, 26, 26,  2,  2,  2,  2,  2,  2,  2,
-   26, 26,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 24, 24, 24, 24, 24,
-   26, 26, 26, 26, 26, 26, 26, 26,  2,  2,  2,  2,  2, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 26,  2,  2,  2,  2,  2,  2,  2,  2,
-   26, 26, 26, 26, 26,  2,  2,  2, 26, 26, 26, 26, 26,  2,  2,  2,
-   26, 26, 26,  2, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-    2,  1,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  2,  2,
-    3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  0,  0,
-    0,  0,  0,  0,  0,  0,  1,  0,  0,  2,  0,  3,  4,  5,  6,  7,
-    8,  9, 10, 11, 12, 12, 12, 13, 14, 12, 15, 16, 17, 18, 19, 20,
-   21, 22,  0,  0,  0,  0, 23,  0,  0,  0,  0,  0,  0,  0, 24, 25,
-    0, 26, 27,  0, 28, 29, 30, 31, 32, 33,  0, 34,  0,  0,  0,  0,
-    0, 35,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0, 36, 37, 38,  0,  0,  0,  0,
-   39, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 41, 42,  0,  0,
-   43, 44, 45, 46,  0, 47,  0, 48,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 49,  0,  0,  0,  0,  0, 50,  0,  0,  0,
-    0,  0,  0, 51,  0, 52, 53,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 54, 55,  0,  0,  0,  0, 56,  0,  0, 57, 58, 59,
-   60, 61, 62, 63, 64, 65, 66,  0, 67, 68,  0, 69, 70, 71, 72,  0,
-   61,  0, 73, 74, 75, 76,  0,  0, 70,  0, 77, 78,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 79, 80,  0,  0,  0,  0,  0,  0,  0,  0, 81,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0, 82,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0, 83, 84, 85,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   86,  0, 80,  0,  0, 87,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0, 88, 89,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  1,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,
-   12,  1,  0,  0, 13,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 14, 15, 16, 17, 18, 19, 20,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  1, 21,  0,  0,  0,  0,  0, 22, 23, 24,
-    0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 26, 27,
-   28, 29,  0,  0,  0,  0, 30,  0,  0,  0, 31, 32, 33, 34,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0, 13, 35, 36,  0,  0, 26, 37, 38, 39,  0,  0,  0,  0,  0, 40,
-    0,  0,  0,  0,  0,  0,  0, 41,  0,  0,  0,  0,  0, 42, 43,  1,
-   44, 45, 46, 47,  0,  0,  0,  0,  0,  0,  0, 48,  0, 49, 50,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48,  0, 49,  0,  0,
-    0,  0,  0, 51,  0,  0,  0,  0,  0,  0,  0, 48,  0, 49,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 49,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48,  0, 49, 52,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 53,  0, 49,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 54,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 55,  0, 56,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 57,  0, 58,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 59,  0,  0, 60, 61,  0,  0,  0,  0,
-    0,  0, 62, 63, 64,  0,  0,  0,  0,  0,  0,  0, 65,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 67,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 36,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,
-    0,  0,  0,  0,  0,  0, 69,  0,  0,  0, 70,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 54, 71,
-    0,  0,  0,  0,  0,  0,  0,  0,  0, 72,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 73,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 74, 75,  0,  0,  0,  0,  0,  0,  0,  0,
-   76,  0, 68, 77,  0,  0,  0,  0,  0,  0, 78, 79, 80, 81,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48,  0, 70,  0,  0,  0,
-    0, 82, 83,  0,  0,  0,  0,  0,  0, 84,  0,  0,  0,  0,  0,  0,
-   85,  0, 84,  0,  0,  0,  0,  0,  0,  0, 66,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 87,
-   88, 89, 90, 91,  0,  0,  0,  0,  0,  0,  0,  0, 92, 93, 94,  1,
-    1,  1, 95, 96,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 97, 98,
-   99,100,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0, 74, 91,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    1,  1,  1,  1,  0,  0,  0,  0,  0,103,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,104,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0, 74,105,106,  0,  0,  0, 26,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0, 91,  0,107,  0,  0,  0,  0, 70,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 70,  0,  0,  0,
-    1,  1, 91,  0,  0,  0,  0,  0,  0,108,  0,  0,  0,  0,109,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,110,  0, 76,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,111,112,113,  0,  0,  0,
-    0,  0,107,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0, 49,  0,  0,  0,  0,  0,114,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,115,116,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0, 36,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   75,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0, 26,117,  0,118,  0,  0,  0,  0,  0,119,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  120,  0,  0,  0,  0,  0,  0,  0,105,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,121,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,122,123, 75,  0,
-    0,  0,  0,  0,124,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,  0,  0,  0,
-    0,  0, 76,102,  0,  0,  0,  0,  0,  0,  0,125,  0,  0,  0,  0,
-    0,  0,  0,  0,117,  0,  0,  0,  0,  0, 53,  0,  0,  0,  0,  0,
-    0,  0,110,  0,  0,  0,  0,  0,  0,  0,  0,  0, 76,126,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,127,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,129,  0, 49,  0,  0,
-   26,130,130,  0,  0,  0,  0,  0,  0,  0,  0,  0,131,  0,  0, 51,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,132,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,102,133,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,102,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,134,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,109,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,135,110,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   76,  0,  0,  0,  0,  0,  0,  0,  0,  0, 70,  0,102,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,136,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,137,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,138,  0,  0,  0,  0,  0,  0,  0,139,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,140,  0,  0,  0,  0,141,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  142,143,144,145,146,147,  0,  0,  0,148,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,149,  0,  0,  0,
-    0,  0,  0,  0,139,  1,  1,150,151,117,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0, 51,  0,  0,  0,  0,  0,  0,
-    0,105,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,105,153,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,230,230,230,230,
-  230,230,230,230,230,230,230,230,230,232,220,220,220,220,232,216,
-  220,220,220,220,220,202,202,220,220,220,220,202,202,220,220,220,
-  220,220,220,220,220,220,220,220,  1,  1,  1,  1,  1,220,220,220,
-  220,230,230,230,230,230,230,230,230,240,230,220,220,220,230,230,
-  230,220,220,  0,230,230,230,220,220,220,220,230,232,220,220,230,
-  233,234,234,233,234,234,233,230,230,230,230,230,  0,  0,  0,230,
-  230,230,230,230,  0,220,230,230,230,230,220,230,230,230,222,220,
-  230,230,230,230,230,230,220,220,220,220,220,220,230,230,220,230,
-  230,222,228,230, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20,
-   21, 22,  0, 23,  0, 24, 25,  0,230,220,  0, 18, 30, 31, 32,  0,
-    0,  0,  0,  0,  0,  0,  0, 27, 28, 29, 30, 31, 32, 33, 34,230,
-  230,220,220,230,230,230,230,230,220,230,230,220, 35,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,230,230,230,230,230,230,
-  230,  0,  0,230,230,230,230,220,230,  0,  0,230,230,  0,220,230,
-  230,220,  0,  0,  0, 36,  0,  0,  0,  0,  0,  0,230,220,230,230,
-  220,230,230,220,220,220,230,220,220,230,220,230,230,230,220,230,
-  220,230,220,230,220,230,230,  0,  0,  0,  0,  0,230,230,220,230,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,220,  0,  0,230,230,  0,230,
-  230,230,230,230,230,230,230,230,  0,230,230,230,  0,230,230,230,
-  230,230,  0,  0,  0,220,220,220,  0,  0,  0,  0,230,220,220,220,
-  230,230,230,230,  0,  0,230,230,230,230,230,220,220,220,220,220,
-  230,230,230,230,230,230,  0,220,230,230,220,230,230,220,230,230,
-  230,220,220,220, 27, 28, 29,230,230,230,220,230,230,220,220,230,
-  230,230,230,230,  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,
-    0,  9,  0,  0,  0,230,220,230,230,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,230,  0,  0,  0,  0,  0,  0, 84, 91,  0,  0,  0,  0,  9,
-    9,  0,  0,  0,  0,  0,  9,  0,  0,  0,  0,  0,103,103,  9,  0,
-    0,  0,  0,  0,107,107,107,107,  0,  0,  0,  0,118,118,  9,  0,
-    0,  0,  0,  0,122,122,122,122,  0,  0,  0,  0,220,220,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,220,  0,220,  0,216,  0,  0,
-    0,  0,  0,  0,  0,129,130,  0,132,  0,  0,  0,  0,  0,130,130,
-  130,130,  0,  0,130,  0,230,230,  9,  0,230,230,  0,  0,  0,  0,
-    0,  0,220,  0,  0,  0,  0,  0,  0,  0,  0,  7,  0,  9,  9,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,230,230,230,  0,  0,  0,  0,
-    9,  9,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,
-    0,230,  0,  0,  0,228,  0,  0,  0,  0,  0,  0,  0,222,230,220,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,230,220,  0,  0,  0,
-    0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,230,230,230,230,
-  230,  0,  0,220,230,230,230,230,230,220,220,220,220,220,220,230,
-  230,220,  0,220,220,230,230,220,220,230,230,230,230,230,220,230,
-  230,230,230,  0,  0,  0,  0,230,220,230,230,230,230,230,230,230,
-    0,  0,  0,  0,  0,  0,  9,  9,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  7,  0,230,230,230,  0,  1,220,220,220,220,220,230,230,
-  220,220,220,220,230,  0,  1,  1,  1,  1,  1,  1,  1,  0,  0,  0,
-    0,220,  0,  0,  0,  0,  0,  0,230,  0,  0,  0,230,230,  0,  0,
-    0,  0,  0,  0,230,230,220,230,230,230,230,230,230,230,220,230,
-  230,234,214,220,202,230,230,230,230,230,230,230,230,230,230,230,
-  230,230,232,228,228,220,218,230,233,220,230,220,230,230,  1,  1,
-  230,230,230,230,  1,  1,  1,230,230,  0,  0,  0,  0,230,  0,  0,
-    0,  1,  1,230,220,230,  1,  1,220,220,220,220,230,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  9,  0,  0,218,228,
-  232,222,224,224,  0,  8,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  230,230,230,230,230,230,230,230,230,230,  0,  0,  0,  0,  0,  0,
-    0,  0,  9,  0,  0,  0,  0,220,220,220,  0,  0,  0,  0,  0,  9,
-    0,  0,  0,  0,  0,  0,  0,  7,  0,  0,  0,  0,230,  0,230,230,
-  220,  0,  0,230,230,  0,  0,  0,  0,  0,230,230,  0,230,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 26,  0,230,230,230,230,
-  230,230,230,220,220,220,220,220,220,220,230,230,230,230,230,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,220,  0,230,230,  1,220,  0,
-    0,  0,  0,  9,  0,  0,  0,  0,  0,230,220,  0,  0,  0,  0,230,
-  230,  0,  0,  0,  0,  0,  0,  0,  0,  0,220,220,230,230,230,220,
-  230,220,220,220,  0,  0,230,220,230,220,  0,  0,  0,  9,  7,  0,
-    0,  0,  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  9,  7,  0,  0,  7,  9,  0,  0,  0,  0,  0,  0,  0,  0,  7,
-    7,  0,  0,  0,230,230,230,230,230,  0,  0,  0,  0,  0,  9,  0,
-    0,  0,  7,  0,  0,  0,  9,  7,  0,  0,  0,  0,  7,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  9,  7,  0,  0,  0,  0,
-    0,  9,  9,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,  0,  7,  0,
-    9,  9,  0,  0,  1,  1,  1,  1,  1,  0,  0,  0,230,230,230,230,
-  230,230,230,  0,  6,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  1,  0,  0,  0,  0,  0,  0,216,216,  1,  1,  1,  0,  0,
-    0,226,216,216,216,216,216,  0,  0,  0,  0,  0,  0,  0,  0,220,
-  220,220,220,220,220,220,220,  0,  0,230,230,230,230,230,220,220,
-    0,  0,  0,  0,  0,  0,230,230,230,230,  0,  0,  0,  0,230,230,
-  230,  0,  0,  0,230,  0,  0,230,230,230,230,230,230,230,  0,230,
-  230,  0,230,230,220,220,220,220,220,220,220,  0,230,230,  7,  0,
-    0,  0,  0,  0, 16, 17, 17, 17, 17, 17, 17, 33, 17, 17, 17, 19,
-   17, 17, 17, 17, 20,101, 17,113,129,169, 17, 27, 28, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17,237,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,
-    0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,  0,  0,
-    0,  0,  3,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  0,
-    0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  7,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,  9,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0, 10,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0, 10,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 11, 12,  0, 13,  0, 14, 15, 16,  0,  0,
-    0,  0,  0,  1, 17, 18,  0, 19,  7,  1,  0,  0,  0, 20, 20,  7,
-   20, 20, 20, 20, 20, 20, 20,  8, 21,  0, 22,  0,  7, 23, 24,  0,
-   20, 20, 25,  0,  0,  0, 26, 27,  1,  7, 20, 20, 20, 20, 20,  1,
-   28, 29, 30, 31,  0,  0, 20,  0,  0,  0,  0,  0,  0,  0, 10,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20, 20,
-   20,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  8, 21, 32,  4,  0, 10,  0, 33,  7, 20, 20, 20,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  8, 34, 34, 35, 36, 34, 37,  0, 38,  1, 20, 20,
-    0,  0, 39,  0,  1,  1,  0,  8, 21,  1, 20,  0,  0,  0,  1,  0,
-    0, 40,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8, 21,
-    0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,
-    0,  0, 26, 34, 34, 34, 34, 34, 34, 34, 34, 34, 21,  7, 20, 41,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 21,  0, 42, 43, 44,  0, 45,
-    0,  8, 21,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0, 46,  7,  1, 10,  1,  0,  0,  0,  1, 20, 20,  1,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0, 26, 34,  9,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 20, 20,  1, 20, 20,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 26, 21,  0,  1,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  2,  0,  0,  0,  0,
-    0,  0,  3,  4,  0,  0,  0,  0,  0,  0,  3, 47, 48,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,
-    0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,  0,  0,
-    0,  0,  3,  4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,
-   12, 13, 14, 15, 16, 17, 18, 17, 19, 20, 21, 22, 23, 24, 25, 25,
-   25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 25, 25, 25, 25, 25,
-   25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-   25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-   25, 25, 25, 25, 27, 27, 28, 29, 30, 31, 32, 32, 32, 32, 32, 32,
-   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-   51, 52, 53, 54, 55, 56, 57, 34, 34, 34, 34, 58, 59, 59, 60, 34,
-   34, 34, 34, 34, 34, 34, 61, 62, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 63, 64, 34, 65, 66, 66, 66, 66,
-   66, 66, 66, 66, 66, 66, 66, 67, 66, 68, 69, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 70, 71, 72, 34, 34,
-   34, 34, 73, 34, 34, 34, 34, 34, 34, 34, 34, 74, 75, 76, 77, 78,
-   79, 80, 34, 81, 82, 83, 34, 84, 85, 34, 86, 87, 88, 89, 17, 90,
-   91, 92, 34, 34, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-   25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-   25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-   25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-   25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-   25, 25, 25, 25, 25, 25, 25, 93, 25, 25, 25, 25, 25, 25, 25, 94,
-   95, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 96, 25, 25, 25, 25,
-   25, 25, 25, 25, 25, 25, 25, 25, 25, 97, 34, 34, 34, 34, 34, 34,
-   25, 98, 34, 34, 25, 25, 25, 25, 25, 25, 25, 25, 25, 99, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34,100,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-   19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-   19,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   19,  0,  0,  0,  0,  0, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-   19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  0, 19, 19,
-   19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  0,
-    0,  0,  0,  0,  0,  0, 19, 19, 19, 19, 19,  0,  0,  0,  0,  0,
-   26, 26,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  9,  9,  9,  9,  0,  9,  9,  9,  2,  2,
-    9,  9,  9,  9,  0,  9,  2,  2,  2,  2,  9,  0,  9,  0,  9,  9,
-    9,  2,  9,  2,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  2,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9, 55, 55, 55, 55, 55, 55, 55, 55,
-   55, 55, 55, 55, 55, 55,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
-    6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  1,  1,  6,  6,  6,
-    6,  6,  6,  6,  6,  6,  2,  4,  4,  4,  4,  4,  4,  4,  4,  4,
-    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
-    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  2,  2,  4,
-    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
-    4,  2,  2,  4,  4,  4,  2, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-   14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-   14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,  2,  2,
-    2,  2,  2,  2,  2,  2, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-   14,  2,  2,  2,  2, 14, 14, 14, 14, 14, 14,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  3,  3,  3,  3,  3,  0,  3,  3,  3,  3,
-    3,  3,  0,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    3,  0,  3,  3,  3,  0,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    3,  3,  3,  3,  3,  3,  0,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    3,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  3,  3,  3,  3,
-    3,  3,  3,  3,  3,  3,  1,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    3,  3,  3,  0,  3,  3, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-   37, 37, 37, 37,  2, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-   37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-   37,  2,  2, 37, 37, 37, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-   38, 38, 38, 38, 38, 38, 38, 38,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-   64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-   64,  2,  2, 64, 64, 64, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
-   90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
-   90, 90, 90, 90,  2,  2, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
-   90, 90, 90, 90, 90,  2, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
-   95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
-   95, 95,  2,  2, 95,  2, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-   37,  2,  2,  2,  2,  2,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    3,  3,  3,  3,  3,  2,  3,  3,  2,  2,  2,  2,  2,  2,  3,  3,
-    3,  3,  3,  3,  3,  3,  3,  3,  0,  3,  3,  3,  3,  3,  3,  3,
-    3,  3,  3,  3,  3,  3,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  1,  1,  1,  1,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  0,  0,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  5,  5,  5,  5,  2,  5,  5,  5,  5,  5,
-    5,  5,  5,  2,  2,  5,  5,  2,  2,  5,  5,  5,  5,  5,  5,  5,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  2,
-    5,  5,  5,  5,  5,  5,  5,  2,  5,  2,  2,  2,  5,  5,  5,  5,
-    2,  2,  5,  5,  5,  5,  5,  5,  5,  5,  5,  2,  2,  5,  5,  2,
-    2,  5,  5,  5,  5,  2,  2,  2,  2,  2,  2,  2,  2,  5,  2,  2,
-    2,  2,  5,  5,  2,  5,  5,  5,  5,  5,  2,  2,  5,  5,  5,  5,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,
-    5,  5,  5,  5,  5,  2,  2, 11, 11, 11,  2, 11, 11, 11, 11, 11,
-   11,  2,  2,  2,  2, 11, 11,  2,  2, 11, 11, 11, 11, 11, 11, 11,
-   11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,  2,
-   11, 11, 11, 11, 11, 11, 11,  2, 11, 11,  2, 11, 11,  2, 11, 11,
-    2,  2, 11,  2, 11, 11, 11, 11, 11,  2,  2,  2,  2, 11, 11,  2,
-    2, 11, 11, 11,  2,  2,  2, 11,  2,  2,  2,  2,  2,  2,  2, 11,
-   11, 11, 11,  2, 11,  2,  2,  2,  2,  2,  2,  2, 11, 11, 11, 11,
-   11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2, 10, 10, 10,  2, 10, 10, 10, 10, 10,
-   10, 10, 10, 10,  2, 10, 10, 10,  2, 10, 10, 10, 10, 10, 10, 10,
-   10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  2,
-   10, 10, 10, 10, 10, 10, 10,  2, 10, 10,  2, 10, 10, 10, 10, 10,
-    2,  2, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  2, 10, 10, 10,
-    2, 10, 10, 10,  2,  2, 10,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 10, 10, 10, 10,  2,  2, 10, 10, 10, 10,
-   10, 10, 10, 10, 10, 10, 10, 10,  2,  2,  2,  2,  2,  2,  2, 10,
-   10, 10, 10, 10, 10, 10,  2, 21, 21, 21,  2, 21, 21, 21, 21, 21,
-   21, 21, 21,  2,  2, 21, 21,  2,  2, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,  2,
-   21, 21, 21, 21, 21, 21, 21,  2, 21, 21,  2, 21, 21, 21, 21, 21,
-    2,  2, 21, 21, 21, 21, 21, 21, 21, 21, 21,  2,  2, 21, 21,  2,
-    2, 21, 21, 21,  2,  2,  2,  2,  2,  2,  2, 21, 21, 21,  2,  2,
-    2,  2, 21, 21,  2, 21, 21, 21, 21, 21,  2,  2, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2, 22, 22,  2, 22, 22, 22, 22, 22,
-   22,  2,  2,  2, 22, 22, 22,  2, 22, 22, 22, 22,  2,  2,  2, 22,
-   22,  2, 22,  2, 22, 22,  2,  2,  2, 22, 22,  2,  2,  2, 22, 22,
-   22,  2,  2,  2, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-    2,  2,  2,  2, 22, 22, 22, 22, 22,  2,  2,  2, 22, 22, 22,  2,
-   22, 22, 22, 22,  2,  2, 22,  2,  2,  2,  2,  2,  2, 22,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22,  2,  2,  2,  2,  2, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-   23, 23, 23,  2, 23, 23, 23,  2, 23, 23, 23, 23, 23, 23, 23, 23,
-   23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,  2,
-   23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-    2,  2, 23, 23, 23, 23, 23, 23, 23, 23, 23,  2, 23, 23, 23,  2,
-   23, 23, 23, 23,  2,  2,  2,  2,  2,  2,  2, 23, 23,  2, 23, 23,
-   23,  2,  2, 23,  2,  2, 23, 23, 23, 23,  2,  2, 23, 23, 23, 23,
-   23, 23, 23, 23, 23, 23,  2,  2,  2,  2,  2,  2,  2, 23, 23, 23,
-   23, 23, 23, 23, 23, 23, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-   16, 16, 16,  2, 16, 16, 16,  2, 16, 16, 16, 16, 16, 16, 16, 16,
-   16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,  2,
-   16, 16, 16, 16, 16, 16, 16, 16, 16, 16,  2, 16, 16, 16, 16, 16,
-    2,  2, 16, 16, 16, 16, 16, 16, 16, 16, 16,  2, 16, 16, 16,  2,
-   16, 16, 16, 16,  2,  2,  2,  2,  2,  2,  2, 16, 16,  2,  2,  2,
-    2,  2,  2, 16, 16,  2, 16, 16, 16, 16,  2,  2, 16, 16, 16, 16,
-   16, 16, 16, 16, 16, 16,  2, 16, 16,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20,  2, 20, 20, 20,  2, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,  2, 20, 20, 20,  2,
-   20, 20, 20, 20, 20, 20,  2,  2,  2,  2, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20,  2,  2, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20,  2, 36, 36, 36,  2, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,  2,  2,  2,
-   36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 36, 36, 36, 36,  2, 36, 36, 36, 36, 36, 36, 36,
-   36, 36,  2, 36,  2,  2, 36, 36, 36, 36, 36, 36, 36,  2,  2,  2,
-   36,  2,  2,  2,  2, 36, 36, 36, 36, 36, 36,  2, 36,  2, 36, 36,
-   36, 36, 36, 36, 36, 36,  2,  2,  2,  2,  2,  2, 36, 36, 36, 36,
-   36, 36, 36, 36, 36, 36,  2,  2, 36, 36, 36,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-   24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-   24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-   24,  2,  2,  2,  2,  0, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-   24, 24,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2, 18, 18,  2, 18,  2, 18, 18, 18, 18,
-   18,  2, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-   18, 18, 18, 18, 18, 18, 18, 18, 18, 18,  2, 18,  2, 18, 18, 18,
-   18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-   18, 18, 18, 18,  2,  2, 18, 18, 18, 18, 18,  2, 18,  2, 18, 18,
-   18, 18, 18, 18,  2,  2, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-    2,  2, 18, 18, 18, 18, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-   25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,  2, 25,
-   25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-   25, 25, 25,  2,  2,  2,  2, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-   25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-   25, 25, 25,  2, 25, 25, 25, 25, 25, 25, 25,  0,  0,  0,  0, 25,
-   25,  2,  2,  2,  2,  2, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
-   33, 33, 33, 33, 33, 33,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-    8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  2,  8,  2,  2,
-    2,  2,  2,  8,  2,  2,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-    8,  0,  8,  8,  8,  8, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-   30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,  2,
-   30, 30, 30, 30,  2,  2, 30, 30, 30, 30, 30, 30, 30,  2, 30,  2,
-   30, 30, 30, 30,  2,  2, 30,  2, 30, 30, 30, 30,  2,  2, 30, 30,
-   30, 30, 30, 30, 30,  2, 30,  2, 30, 30, 30, 30,  2,  2, 30, 30,
-   30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,  2, 30, 30,
-   30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-   30,  2,  2, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-   30, 30, 30,  2,  2,  2, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-    2,  2,  2,  2,  2,  2, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-   29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,  2,  2, 29, 29,
-   29, 29, 29, 29,  2,  2, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-   28, 28, 28, 28, 28, 28, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34,  2,  2,  2, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-   35,  0,  0,  0, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,  2,
-    2,  2,  2,  2,  2,  2, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
-   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,  2,  2,  2,  2,
-    2,  2,  2,  2,  2, 45, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-   44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,  0,  0,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-   43, 43, 43, 43, 43, 43, 43, 43, 43, 43,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
-   46, 46, 46,  2, 46, 46, 46,  2, 46, 46,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
-   31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
-   31, 31, 31, 31,  2,  2, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
-    2,  2,  2,  2,  2,  2, 32, 32,  0,  0, 32,  0, 32, 32, 32, 32,
-   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-    2,  2,  2,  2,  2,  2, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,  2,
-    2,  2,  2,  2,  2,  2, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-   32,  2,  2,  2,  2,  2, 28, 28, 28, 28, 28, 28,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-   48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-   48, 48, 48, 48, 48,  2, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-   48, 48,  2,  2,  2,  2, 48,  2,  2,  2, 48, 48, 48, 48, 48, 48,
-   48, 48, 48, 48, 48, 48, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-   52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-   52, 52, 52, 52,  2,  2, 52, 52, 52, 52, 52,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58, 58,  2,  2,  2,  2, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-    2,  2,  2,  2,  2,  2, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-   58,  2,  2,  2, 58, 58, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-   54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-   54, 54,  2,  2, 54, 54, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
-   91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
-   91, 91, 91, 91, 91,  2, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
-   91, 91, 91,  2,  2, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
-    2,  2,  2,  2,  2,  2, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
-   91, 91, 91, 91,  2,  2,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  2, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
-   62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
-   62, 62, 62,  2,  2,  2, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
-   62, 62, 62, 62, 62,  2, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
-   76, 76, 76, 76, 76, 76, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-   93, 93, 93, 93, 93, 93, 93, 93, 93, 93,  2,  2,  2,  2,  2,  2,
-    2,  2, 93, 93, 93, 93, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
-   70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,  2,  2,
-    2, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
-    2,  2,  2, 70, 70, 70, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
-   73, 73, 73, 73, 73, 73,  6,  6,  6,  6,  6,  6,  6,  6,  6,  2,
-    2,  2,  2,  2,  2,  2,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-    8,  2,  2,  8,  8,  8, 76, 76, 76, 76, 76, 76, 76, 76,  2,  2,
-    2,  2,  2,  2,  2,  2,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  0,
-    0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  1,
-    0,  2,  2,  2,  2,  2, 19, 19, 19, 19, 19, 19,  9,  9,  9,  9,
-    9,  6, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-   19, 19, 19,  9,  9,  9,  9,  9, 19, 19, 19, 19,  9,  9,  9,  9,
-    9, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  6, 19,
-   19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-   19, 19, 19, 19, 19,  9,  9,  9,  9,  9,  9,  9,  2,  2,  9,  9,
-    9,  9,  9,  9,  2,  2,  9,  9,  9,  9,  9,  9,  9,  9,  2,  9,
-    2,  9,  2,  9,  2,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  2,  2,  9,  9,  9,  9,  9,  2,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  2,  2,  9,  9,  9,  9,
-    9,  9,  2,  9,  9,  9,  2,  2,  9,  9,  9,  2,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  1,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 19,  2,  2,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 19,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  2, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-   19, 19, 19,  2,  2,  2,  0,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  1,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,
-   19, 19,  0,  0,  0,  0,  0,  0, 19,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 19,  0, 19, 19, 19, 19, 19, 19, 19, 19, 19,  0,
-    0,  0,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  0,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  2,  2,  2,  2,  2, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-   27, 27, 27, 27, 27, 27,  0,  0,  0,  0,  2,  2,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-   56, 56, 56, 56, 56, 56, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-   55, 55, 55, 55, 55, 55, 55, 55, 55, 55,  2,  2,  2,  2,  2, 55,
-   55, 55, 55, 55, 55, 55, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
-   61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,  2,  2,
-    2,  2,  2,  2,  2, 61, 61,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2, 61, 30, 30, 30, 30, 30, 30, 30,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 30, 30, 30, 30, 30, 30, 30,  2, 30, 30,
-   30, 30, 30, 30, 30,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  2,  2, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-    2, 13, 13, 13, 13, 13, 13, 13, 13, 13,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 13, 13, 13, 13, 13, 13,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  2,  2,  2,  2,  0,  0,  0,  0,  0, 13,  0, 13,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-    1,  1,  1,  1, 12, 12,  0,  0,  0,  0,  0,  0,  0,  0, 13, 13,
-   13, 13,  0,  0,  0,  0,  2, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  2,  2,  1,
-    1,  0,  0, 15, 15, 15,  0, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17,  0,  0, 17, 17, 17,  2,  2,  2,  2,  2, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26,  2, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12,  2,  0,  0,  0,  0,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12,  0, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17,  0, 17, 17, 17, 17, 17, 17, 17, 17,  0,  0,
-    0,  0,  0,  0,  0,  0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-   39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-   39, 39, 39,  2,  2,  2, 39, 39, 39, 39, 39, 39, 39,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-   86, 86, 86, 86, 86, 86, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
-   77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
-   77, 77,  2,  2,  2,  2, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-   79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79,  2,  2,
-    2,  2,  2,  2,  2,  2,  0,  0, 19, 19, 19, 19, 19, 19, 19, 19,
-   19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  0,  0,
-    0, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-   19,  2,  2,  2,  2,  2, 19, 19,  2, 19,  2, 19, 19, 19, 19, 19,
-    2,  2,  2,  2,  2,  2,  2,  2, 19, 19, 19, 19, 19, 19, 19, 19,
-   19, 19, 19, 19, 19, 19, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-   60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-   60, 60, 60,  2,  2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    2,  2,  2,  2,  2,  2, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-   65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,  2,  2,
-    2,  2,  2,  2,  2,  2, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
-   75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,  2,  2,  2,  2,
-    2,  2,  2,  2, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
-    2,  2,  2,  2,  2,  2, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
-   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
-   69, 69, 69, 69,  0, 69, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
-   74, 74, 74, 74, 74, 74, 74, 74, 74, 74,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2, 74, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12,  2,  2,  2, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
-   84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
-   84, 84, 84, 84,  2,  0, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
-    2,  2,  2,  2, 84, 84, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
-   33, 33, 33, 33, 33,  2, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-   68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-   68, 68, 68, 68,  2,  2, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-    2,  2, 68, 68, 68, 68, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-   92, 92, 92, 92, 92, 92, 92, 92, 92,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2, 92, 92, 92, 92, 92, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
-   87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2, 30, 30, 30, 30, 30, 30,  2,  2, 30,
-   30, 30, 30, 30, 30,  2,  2, 30, 30, 30, 30, 30, 30,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-   19,  0, 19, 19, 19, 19, 19, 19, 19, 19, 19,  9, 19, 19, 19, 19,
-    0,  0,  2,  2,  2,  2, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
-   87, 87, 87, 87,  2,  2, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
-    2,  2,  2,  2,  2,  2, 12, 12, 12, 12,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 12, 12, 12, 12, 12, 12, 12,  2,  2,  2,
-    2, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12,  2,  2,  2,  2, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13,  2,  2, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-    2,  2,  2,  2,  2,  2, 19, 19, 19, 19, 19, 19, 19,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  4,  4,  4,  4,  4,  2,  2,
-    2,  2,  2, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,  2, 14, 14,
-   14, 14, 14,  2, 14,  2, 14, 14,  2, 14, 14,  2, 14, 14, 14, 14,
-   14, 14, 14, 14, 14, 14,  3,  3,  3,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  3,  3,  3,  3,  3,  3,  3,
-    3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    3,  3,  3,  3,  0,  0,  2,  2,  3,  3,  3,  3,  3,  3,  3,  3,
-    3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  2,  2,
-    2,  2,  2,  2,  2,  3,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  6,  6,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,
-    0,  0,  2,  2,  2,  2,  3,  3,  3,  3,  3,  2,  3,  3,  3,  3,
-    3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    3,  3,  3,  2,  2,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17,  0,  0,  2,  2, 12, 12, 12, 12, 12, 12,  2,  2,
-   12, 12, 12, 12, 12, 12,  2,  2, 12, 12, 12, 12, 12, 12,  2,  2,
-   12, 12, 12,  2,  2,  2,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,
-    0,  0,  0,  0,  0,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  0,
-    0,  0,  0,  0,  2,  2, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
-   49, 49,  2, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
-   49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,  2, 49, 49,
-   49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
-   49,  2, 49, 49,  2, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
-   49, 49, 49, 49,  2,  2, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
-   49,  2,  2,  2,  2,  2,  0,  0,  0,  2,  2,  2,  2,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  2,  2,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  2,  2,  2,  9,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  1,  2,  2, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-   71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-   71, 71, 71,  2,  2,  2, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-   67, 67, 67, 67, 67, 67, 67,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42,
-   42, 42, 42, 42, 42, 42, 42, 42, 42, 42,  2,  2,  2,  2,  2,  2,
-    2,  2,  2, 42, 42, 42, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-   41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-   41,  2,  2,  2,  2,  2,118,118,118,118,118,118,118,118,118,118,
-  118,118,118,118,118,118,118,118,118,118,118,118,118,118,118,118,
-  118,  2,  2,  2,  2,  2, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
-   53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
-   53, 53, 53, 53,  2, 53, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-   59, 59, 59, 59, 59, 59, 59, 59, 59, 59,  2,  2,  2,  2, 59, 59,
-   59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
-   40, 40, 40, 40, 40, 40, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-   51, 51, 51, 51, 51, 51, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-   50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-   50, 50, 50, 50,  2,  2, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-    2,  2,  2,  2,  2,  2,135,135,135,135,135,135,135,135,135,135,
-  135,135,135,135,135,135,135,135,135,135,  2,  2,  2,  2,135,135,
-  135,135,135,135,135,135,135,135,135,135,135,135,135,135,135,135,
-  135,135,  2,  2,  2,  2,106,106,106,106,106,106,106,106,106,106,
-  106,106,106,106,106,106,106,106,106,106,106,106,106,106,  2,  2,
-    2,  2,  2,  2,  2,  2,104,104,104,104,104,104,104,104,104,104,
-  104,104,104,104,104,104,104,104,104,104,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,104,161,161,161,161,161,161,161,161,161,161,
-  161,  2,161,161,161,161,161,161,161,  2,161,161,  2,161,161,161,
-  161,161,161,161,161,161,161,161,  2,161,161,161,161,161,161,161,
-  161,161,161,161,161,161,161,161,  2,161,161,161,161,161,161,161,
-    2,161,161,  2,  2,  2,110,110,110,110,110,110,110,110,110,110,
-  110,110,110,110,110,110,110,110,110,110,110,110,110,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,110,110,110,110,110,110,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,110,110,110,110,110,110,110,110,  2,  2,
-    2,  2,  2,  2,  2,  2, 19, 19, 19, 19, 19, 19,  2, 19, 19, 19,
-   19, 19, 19, 19, 19, 19, 19,  2, 19, 19, 19, 19, 19, 19, 19, 19,
-   19,  2,  2,  2,  2,  2, 47, 47, 47, 47, 47, 47,  2,  2, 47,  2,
-   47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
-   47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,  2, 47, 47,  2,
-    2,  2, 47,  2,  2, 47, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
-   81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,  2, 81, 81, 81,
-   81, 81, 81, 81, 81, 81,120,120,120,120,120,120,120,120,120,120,
-  120,120,120,120,120,120,116,116,116,116,116,116,116,116,116,116,
-  116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,
-  116,116,116,116,116,  2,  2,  2,  2,  2,  2,  2,  2,116,116,116,
-  116,116,116,116,116,116,128,128,128,128,128,128,128,128,128,128,
-  128,128,128,128,128,128,128,128,128,  2,128,128,  2,  2,  2,  2,
-    2,128,128,128,128,128, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-   66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-   66, 66,  2,  2,  2, 66, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-   72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-    2,  2,  2,  2,  2, 72, 98, 98, 98, 98, 98, 98, 98, 98, 98, 98,
-   98, 98, 98, 98, 98, 98, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97,
-   97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97,  2,  2,
-    2,  2, 97, 97, 97, 97,  2,  2, 97, 97, 97, 97, 97, 97, 97, 97,
-   97, 97, 97, 97, 97, 97, 57, 57, 57, 57,  2, 57, 57,  2,  2,  2,
-    2,  2, 57, 57, 57, 57, 57, 57, 57, 57,  2, 57, 57, 57,  2, 57,
-   57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
-   57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,  2,  2, 57, 57,
-   57,  2,  2,  2,  2, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,  2,
-    2,  2,  2,  2,  2,  2, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
-   88, 88, 88, 88, 88, 88,117,117,117,117,117,117,117,117,117,117,
-  117,117,117,117,117,117,112,112,112,112,112,112,112,112,112,112,
-  112,112,112,112,112,112,112,112,112,112,112,112,112,  2,  2,  2,
-    2,112,112,112,112,112,112,112,112,112,112,112,112,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
-   78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78,  2,  2,  2, 78,
-   78, 78, 78, 78, 78, 78, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
-   83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,  2,  2, 83, 83,
-   83, 83, 83, 83, 83, 83, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-   82, 82, 82, 82, 82, 82, 82, 82, 82,  2,  2,  2,  2,  2, 82, 82,
-   82, 82, 82, 82, 82, 82,122,122,122,122,122,122,122,122,122,122,
-  122,122,122,122,122,122,122,122,  2,  2,  2,  2,  2,  2,  2,122,
-  122,122,122,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,122,
-  122,122,122,122,122,122, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-   89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,  2,
-    2,  2,  2,  2,  2,  2,130,130,130,130,130,130,130,130,130,130,
-  130,130,130,130,130,130,130,130,130,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,130,130,130,  2,  2,  2,  2,  2,  2,  2,
-  130,130,130,130,130,130,144,144,144,144,144,144,144,144,144,144,
-  144,144,144,144,144,144,144,144,144,144,144,144,144,144,  2,  2,
-    2,  2,  2,  2,  2,  2,144,144,144,144,144,144,144,144,144,144,
-    2,  2,  2,  2,  2,  2,156,156,156,156,156,156,156,156,156,156,
-  156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,
-    2,156,156,156,  2,  2,156,156,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,147,147,147,147,147,147,147,147,147,147,
-  147,147,147,147,147,147,147,147,147,147,147,147,147,147,  2,  2,
-    2,  2,  2,  2,  2,  2,148,148,148,148,148,148,148,148,148,148,
-  148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,
-    2,  2,  2,  2,  2,  2,158,158,158,158,158,158,158,158,158,158,
-  158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,
-    2,  2,  2,  2,  2,  2,153,153,153,153,153,153,153,153,153,153,
-  153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
-  153,153,  2,  2,  2,  2,149,149,149,149,149,149,149,149,149,149,
-  149,149,149,149,149,149,149,149,149,149,149,149,149,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
-   94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
-   94, 94, 94, 94,  2,  2,  2,  2, 94, 94, 94, 94, 94, 94, 94, 94,
-   94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,  2,  2,  2,  2,
-    2,  2,  2,  2,  2, 94, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
-   85, 85, 85, 85, 85, 85, 85, 85, 85,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2, 85,  2,  2,101,101,101,101,101,101,101,101,101,101,
-  101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,  2,
-    2,  2,  2,  2,  2,  2,101,101,101,101,101,101,101,101,101,101,
-    2,  2,  2,  2,  2,  2, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-   96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,  2, 96, 96, 96, 96,
-   96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,  2,  2,
-    2,  2,  2,  2,  2,  2,111,111,111,111,111,111,111,111,111,111,
-  111,111,111,111,111,111,111,111,111,111,111,111,111,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,100,100,100,100,100,100,100,100,100,100,
-  100,100,100,100,100,100,  2, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,108,108,108,108,108,108,108,108,108,108,
-  108,108,108,108,108,108,108,108,  2,108,108,108,108,108,108,108,
-  108,108,108,108,108,108,108,108,108,108,108,108,108,108,108,108,
-  108,108,108,108,108,  2,129,129,129,129,129,129,129,  2,129,  2,
-  129,129,129,129,  2,129,129,129,129,129,129,129,129,129,129,129,
-  129,129,129,129,  2,129,129,129,129,129,129,129,129,129,129,129,
-    2,  2,  2,  2,  2,  2,109,109,109,109,109,109,109,109,109,109,
-  109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-  109,  2,  2,  2,  2,  2,109,109,109,109,109,109,109,109,109,109,
-    2,  2,  2,  2,  2,  2,107,107,107,107,  2,107,107,107,107,107,
-  107,107,107,  2,  2,107,107,  2,  2,107,107,107,107,107,107,107,
-  107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,  2,
-  107,107,107,107,107,107,107,  2,107,107,  2,107,107,107,107,107,
-    2,  1,107,107,107,107,107,107,107,107,107,  2,  2,107,107,  2,
-    2,107,107,107,  2,  2,107,  2,  2,  2,  2,  2,  2,107,  2,  2,
-    2,  2,  2,107,107,107,107,107,107,107,  2,  2,107,107,107,107,
-  107,107,107,  2,  2,  2,107,107,107,107,107,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,137,137,137,137,137,137,137,137,137,137,
-  137,137,137,137,137,137,137,137,137,137,137,137,137,137,137,137,
-  137,137,  2,137,137,137,137,137,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,124,124,124,124,124,124,124,124,124,124,
-  124,124,124,124,124,124,124,124,124,124,124,124,124,124,  2,  2,
-    2,  2,  2,  2,  2,  2,124,124,124,124,124,124,124,124,124,124,
-    2,  2,  2,  2,  2,  2,123,123,123,123,123,123,123,123,123,123,
-  123,123,123,123,123,123,123,123,123,123,123,123,  2,  2,123,123,
-  123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,
-  123,123,123,123,  2,  2,114,114,114,114,114,114,114,114,114,114,
-  114,114,114,114,114,114,114,114,114,114,114,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,114,114,114,114,114,114,114,114,114,114,
-    2,  2,  2,  2,  2,  2, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-   32, 32, 32,  2,  2,  2,102,102,102,102,102,102,102,102,102,102,
-  102,102,102,102,102,102,102,102,102,102,102,102,102,102,102,102,
-    2,  2,  2,  2,  2,  2,126,126,126,126,126,126,126,126,126,126,
-  126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,
-  126,  2,  2,126,126,126,126,126,126,126,126,126,126,126,126,126,
-  126,126,  2,  2,  2,  2,126,126,126,126,126,126,126,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,142,142,142,142,142,142,142,142,142,142,
-  142,142,142,142,142,142,142,142,142,142,142,142,142,142,142,142,
-  142,142,  2,  2,  2,  2,125,125,125,125,125,125,125,125,125,125,
-  125,125,125,125,125,125,125,125,125,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,125,154,154,154,154,154,154,154,  2,  2,154,
-    2,  2,154,154,154,154,154,154,154,154,  2,154,154,  2,154,154,
-  154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,
-  154,154,154,154,154,154,154,154,154,154,154,154,  2,154,154,  2,
-    2,154,154,154,154,154,154,154,154,154,154,154,154,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,154,154,154,154,154,154,154,154,154,154,
-    2,  2,  2,  2,  2,  2,150,150,150,150,150,150,150,150,  2,  2,
-  150,150,150,150,150,150,150,150,150,150,150,150,150,150,150,150,
-  150,150,150,150,150,150,150,150,150,150,150,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,141,141,141,141,141,141,141,141,141,141,
-  141,141,141,141,141,141,141,141,141,141,141,141,141,141,  2,  2,
-    2,  2,  2,  2,  2,  2,140,140,140,140,140,140,140,140,140,140,
-  140,140,140,140,140,140,140,140,140,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,121,121,121,121,121,121,121,121,121,121,
-  121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,  2,
-    2,  2,  2,  2,  2,  2,133,133,133,133,133,133,133,133,133,  2,
-  133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,
-  133,133,133,133,133,133,133,133,133,133,133,133,133,  2,133,133,
-  133,133,133,133,133,133,133,133,133,133,133,133,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,133,133,133,133,133,133,133,133,133,133,
-  133,133,133,  2,  2,  2,134,134,134,134,134,134,134,134,134,134,
-  134,134,134,134,134,134,  2,  2,134,134,134,134,134,134,134,134,
-  134,134,134,134,134,134,134,134,134,134,134,134,134,134,  2,134,
-  134,134,134,134,134,134,134,134,134,134,134,134,134,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,138,138,138,138,138,138,138,  2,138,138,
-    2,138,138,138,138,138,138,138,138,138,138,138,138,138,138,138,
-  138,138,138,138,138,138,138,138,138,138,138,138,138,  2,  2,  2,
-  138,  2,138,138,  2,138,138,138,138,138,138,138,138,138,  2,  2,
-    2,  2,  2,  2,  2,  2,138,138,138,138,138,138,138,138,138,138,
-    2,  2,  2,  2,  2,  2,143,143,143,143,143,143,  2,143,143,  2,
-  143,143,143,143,143,143,143,143,143,143,143,143,143,143,143,143,
-  143,143,143,143,143,143,143,143,143,143,143,143,143,143,143,143,
-  143,143,143,143,143,  2,143,143,  2,143,143,143,143,143,143,  2,
-    2,  2,  2,  2,  2,  2,143,143,143,143,143,143,143,143,143,143,
-    2,  2,  2,  2,  2,  2,145,145,145,145,145,145,145,145,145,145,
-  145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,  2,
-    2,  2,  2,  2,  2,  2, 86,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2, 22, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-   63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-    2,  2,  2,  2,  2,  2, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-   63, 63, 63, 63, 63,  2, 63, 63, 63, 63, 63,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 63, 63, 63, 63,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,157,157,157,157,157,157,157,157,157,157,
-  157,157,157,157,157,157,157,157,157,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-   80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-   80, 80, 80, 80, 80,  2, 80, 80, 80, 80, 80, 80, 80, 80, 80,  2,
-    2,  2,  2,  2,  2,  2,127,127,127,127,127,127,127,127,127,127,
-  127,127,127,127,127,127,127,127,127,127,127,127,127,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 79, 79, 79, 79, 79, 79, 79, 79, 79,  2,
-    2,  2,  2,  2,  2,  2,115,115,115,115,115,115,115,115,115,115,
-  115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,
-  115,115,115,115,115,  2,115,115,115,115,115,115,115,115,115,115,
-    2,  2,  2,  2,115,115,159,159,159,159,159,159,159,159,159,159,
-  159,159,159,159,159,159,159,159,159,159,159,159,159,159,159,159,
-  159,159,159,159,159,  2,159,159,159,159,159,159,159,159,159,159,
-    2,  2,  2,  2,  2,  2,103,103,103,103,103,103,103,103,103,103,
-  103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,
-  103,103,103,103,  2,  2,103,103,103,103,103,103,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,119,119,119,119,119,119,119,119,119,119,
-  119,119,119,119,119,119,119,119,119,119,119,119,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,119,119,119,119,119,119,119,119,119,119,
-    2,119,119,119,119,119,119,119,  2,119,119,119,119,119,119,119,
-  119,119,119,119,119,119,119,119,119,119,119,119,119,119,  2,  2,
-    2,  2,  2,119,119,119,146,146,146,146,146,146,146,146,146,146,
-  146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,
-  146,  2,  2,  2,  2,  2, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
-   99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
-   99,  2,  2,  2,  2, 99, 99, 99, 99, 99, 99, 99, 99, 99,  2,  2,
-    2,  2,  2,  2,  2, 99,136,139, 13, 13,155,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 13, 13,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,136,136,136,136,136,136,136,136,136,136,
-  136,136,136,136,136,136,136,136,136,136,136,136,136,136,  2,  2,
-    2,  2,  2,  2,  2,  2,155,155,155,155,155,155,155,155,155,155,
-  155,155,155,155,155,155,155,155,155,155,155,155,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,136,136,136,136,136,136,136,136,136,  2,
-    2,  2,  2,  2,  2,  2, 17, 17, 17, 17,  2, 17, 17, 17, 17, 17,
-   17, 17,  2, 17, 17,  2, 17, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 15, 15, 17, 17, 17,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 15, 15, 15,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 17, 17, 17, 17,  2,  2,
-    2,  2,  2,  2,  2,  2,139,139,139,139,139,139,139,139,139,139,
-  139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,
-  139,139,  2,  2,  2,  2,105,105,105,105,105,105,105,105,105,105,
-  105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,
-  105,  2,  2,  2,  2,  2,105,105,105,105,105,105,105,105,105,105,
-  105,105,105,  2,  2,  2,105,105,105,105,105,105,105,105,105,  2,
-    2,  2,  2,  2,  2,  2,105,105,105,105,105,105,105,105,105,105,
-    2,  2,105,105,105,105,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  2,  2,  1,  1,  1,  1,  1,  1,  1,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  0,  2,  2,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  1,  1,  1,  1,  1,  1,  1,  1,  0,  0,  1,  1,  1,  1,  1,
-    1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    1,  1,  1,  1,  0,  0,  9,  9,  9,  9,  9,  9,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,
-    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  2,  0,  0,  2,  2,  0,  2,  2,  0,  0,  2,  2,  0,
-    0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    2,  0,  2,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
-    0,  2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,
-    0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    2,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  2,  0,  2,  2,  2,
-    0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  2,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  2,  2,  0,  0,131,131,131,131,131,131,131,131,131,131,
-  131,131,131,131,131,131,131,131,131,131,131,131,131,131,131,131,
-  131,131,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,131,131,131,131,131,  2,131,131,131,131,131,131,131,131,131,
-  131,131,131,131,131,131, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-   19, 19, 19, 19, 19,  2, 56, 56, 56, 56, 56, 56, 56,  2, 56, 56,
-   56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,  2,
-    2, 56, 56, 56, 56, 56, 56, 56,  2, 56, 56,  2, 56, 56, 56, 56,
-   56,  2,  2,  2,  2,  2,151,151,151,151,151,151,151,151,151,151,
-  151,151,151,151,151,151,151,151,151,151,151,151,151,151,151,151,
-  151,151,151,  2,  2,  2,151,151,151,151,151,151,151,151,151,151,
-  151,151,151,151,  2,  2,151,151,151,151,151,151,151,151,151,151,
-    2,  2,  2,  2,151,151,160,160,160,160,160,160,160,160,160,160,
-  160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,
-  160,160,160,160,160,  2,152,152,152,152,152,152,152,152,152,152,
-  152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,
-    2,  2,  2,  2,  2,152, 30, 30, 30, 30, 30, 30, 30,  2, 30, 30,
-   30, 30,  2, 30, 30,  2, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-   30, 30, 30, 30, 30,  2,113,113,113,113,113,113,113,113,113,113,
-  113,113,113,113,113,113,113,113,113,113,113,  2,  2,113,113,113,
-  113,113,113,113,113,113,113,113,113,113,113,113,113,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,132,132,132,132,132,132,132,132,132,132,
-  132,132,132,132,132,132,132,132,132,132,132,132,132,132,132,132,
-  132,132,  2,  2,  2,  2,132,132,132,132,132,132,132,132,132,132,
-    2,  2,  2,  2,132,132,  0,  0,  0,  0,  0,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  3,  3,  3,  3,  2,  3,  3,  3,  3,  3,
-    3,  3,  3,  3,  3,  3,  2,  3,  3,  2,  3,  2,  2,  3,  2,  3,
-    3,  3,  3,  3,  3,  3,  3,  3,  3,  2,  3,  3,  3,  3,  2,  3,
-    2,  3,  2,  2,  2,  2,  2,  2,  3,  2,  2,  2,  2,  3,  2,  3,
-    2,  3,  2,  3,  3,  3,  2,  3,  3,  2,  3,  2,  2,  3,  2,  3,
-    2,  3,  2,  3,  2,  3,  2,  3,  3,  2,  3,  2,  2,  3,  3,  3,
-    3,  2,  3,  3,  3,  3,  3,  3,  3,  2,  3,  3,  3,  3,  2,  3,
-    3,  3,  3,  2,  3,  2,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    2,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    3,  3,  2,  2,  2,  2,  2,  3,  3,  3,  2,  3,  3,  3,  3,  3,
-    2,  3,  3,  3,  3,  3,  3,  3,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 15,  0,  0,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  0,  0,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  2,  2,
-    2,  2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  2,
-    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  2,  2,  2,  0,  0,
-    0,  0,  0,  2,  2,  2, 13, 13, 13, 13, 13, 13, 13, 13, 13,  2,
-    2,  2,  2,  2,  2,  2, 13,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13,  2,  2,  2,  2,  2,  2,  0,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  0,  0,  0,  1,  2,  3,  4,  5,  6,  0,
-    0,  0,  0,  7,  8,  9, 10, 11,  0, 12,  0,  0,  0,  0, 13,  0,
-    0, 14,  0,  0,  0,  0,  0,  0,  0,  0, 15, 16,  0, 17, 18, 19,
-    0,  0,  0, 20, 21, 22,  0, 23,  0, 24,  0, 25,  0, 26,  0,  0,
-    0,  0,  0, 27, 28,  0, 29,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0, 30, 31,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 33,
-   34, 35, 36, 37, 38, 39, 40,  0,  0,  0, 41,  0, 42, 43, 44, 45,
-   46, 47, 48,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 50, 51, 52,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 53, 54, 55, 56, 57, 58,
-   59, 60, 61, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0, 63,  0, 64,  0,  0,  0,  0,  0,
-    0,  0,  0, 65,  0,  0,  0,  0, 66,  0,  0,  0, 67,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 69, 70, 71,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 72, 73, 74, 75, 76, 77, 78, 79, 80,  0,
-};
-static const uint16_t
-_hb_ucd_u16[11584] =
-{
-     0,   0,   1,   2,   3,   4,   5,   6,   0,   0,   7,   8,   9,  10,  11,  12,
-    13,  13,  13,  14,  15,  13,  13,  16,  17,  18,  19,  20,  21,  22,  13,  23,
-    13,  13,  13,  24,  25,  11,  11,  11,  11,  26,  11,  27,  28,  29,  30,  31,
-    32,  32,  32,  32,  32,  32,  32,  33,  34,  35,  36,  11,  37,  38,  13,  39,
-     9,   9,   9,  11,  11,  11,  13,  13,  40,  13,  13,  13,  41,  13,  13,  13,
-    13,  13,  13,  42,   9,  43,  11,  11,  44,  45,  32,  46,  47,  48,  49,  50,
-    51,  52,  48,  48,  53,  32,  54,  55,  48,  48,  48,  48,  48,  56,  57,  58,
-    59,  60,  48,  32,  61,  48,  48,  48,  48,  48,  62,  63,  64,  48,  65,  66,
-    48,  67,  68,  69,  48,  70,  71,  48,  72,  73,  48,  48,  74,  32,  75,  32,
-    76,  48,  48,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
-    90,  83,  84,  91,  92,  93,  94,  95,  96,  97,  84,  98,  99, 100,  88, 101,
-   102,  83,  84, 103, 104, 105,  88, 106, 107, 108, 109, 110, 111, 112,  94, 113,
-   114, 115,  84, 116, 117, 118,  88, 119, 120, 115,  84, 121, 122, 123,  88, 124,
-   125, 115,  48, 126, 127, 128,  88, 129, 130, 131,  48, 132, 133, 134,  94, 135,
-   136,  48,  48, 137, 138, 139, 140, 140, 141,  48, 142, 143, 144, 145, 140, 140,
-   146, 147, 148, 149, 150,  48, 151, 152, 153, 154,  32, 155, 156, 157, 140, 140,
-    48,  48, 158, 159, 160, 161, 162, 163, 164, 165,   9,   9, 166,  11,  11, 167,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48, 168, 169,  48,  48, 168,  48,  48, 170, 171, 172,  48,  48,
-    48, 171,  48,  48,  48, 173, 174, 175,  48, 176,   9,   9,   9,   9,   9, 177,
-   178,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48, 179,  48, 180, 181,  48,  48,  48,  48, 182, 183,
-    48, 184,  48, 185,  48, 186, 187, 188,  48,  48,  48, 189, 190, 191, 192, 193,
-   194, 192,  48,  48, 195,  48,  48, 196, 197,  48, 198,  48,  48,  48,  48, 199,
-    48, 200, 201, 202, 203,  48, 204, 205,  48,  48, 206,  48, 207, 208, 209, 209,
-    48, 210,  48,  48,  48, 211, 212, 213, 192, 192, 214, 215, 216, 140, 140, 140,
-   217,  48,  48, 218, 219, 160, 220, 221, 222,  48, 223,  64,  48,  48, 224, 225,
-    48,  48, 226, 227, 228,  64,  48, 229, 230,   9,   9, 231, 232, 233, 234, 235,
-    11,  11, 236,  27,  27,  27, 237, 238,  11, 239,  27,  27,  32,  32,  32,  32,
-    13,  13,  13,  13,  13,  13,  13,  13,  13, 240,  13,  13,  13,  13,  13,  13,
-   241, 242, 241, 241, 242, 243, 241, 244, 245, 245, 245, 246, 247, 248, 249, 250,
-   251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 261, 262, 263, 264, 265,
-   266, 267, 268, 269, 270, 271, 272, 272, 273, 274, 275, 209, 276, 277, 209, 278,
-   279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279,
-   280, 209, 281, 209, 209, 209, 209, 282, 209, 283, 279, 284, 209, 285, 286, 209,
-   209, 209, 287, 140, 288, 140, 271, 271, 271, 289, 209, 209, 209, 209, 290, 271,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 291, 292, 209, 209, 293,
-   209, 209, 209, 209, 209, 209, 294, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-   209, 209, 209, 209, 209, 209, 295, 296, 271, 297, 209, 209, 298, 279, 299, 279,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-   279, 279, 279, 279, 279, 279, 279, 279, 300, 301, 279, 279, 279, 302, 279, 303,
-   279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279,
-   209, 209, 209, 279, 304, 209, 209, 305, 209, 306, 209, 209, 209, 209, 209, 209,
-     9,   9,   9,  11,  11,  11, 307, 308,  13,  13,  13,  13,  13,  13, 309, 310,
-    11,  11, 311,  48,  48,  48, 312, 313,  48, 314, 315, 315, 315, 315,  32,  32,
-   316, 317, 318, 319, 320, 321, 140, 140, 209, 322, 209, 209, 209, 209, 209, 323,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 324, 140, 325,
-   326, 327, 328, 329, 136,  48,  48,  48,  48, 330, 178,  48,  48,  48,  48, 331,
-   332,  48,  48, 136,  48,  48,  48,  48, 200, 333,  48,  48, 209, 209, 323,  48,
-   209, 334, 335, 209, 336, 337, 209, 209, 335, 209, 209, 337, 209, 209, 209, 209,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 209, 209, 209, 209,
-    48, 338,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48, 151, 209, 209, 209, 287,  48,  48, 229,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-   339,  48, 340, 140,  13,  13, 341, 342,  13, 343,  48,  48,  48,  48, 344, 345,
-    31, 346, 347, 348,  13,  13,  13, 349, 350, 351, 352, 353, 354, 355, 140, 356,
-   357,  48, 358, 359,  48,  48,  48, 360, 361,  48,  48, 362, 363, 192,  32, 364,
-    64,  48, 365,  48, 366, 367,  48, 151,  76,  48,  48, 368, 369, 370, 371, 372,
-    48,  48, 373, 374, 375, 376,  48, 377,  48,  48,  48, 378, 379, 380, 381, 382,
-   383, 384, 315,  11,  11, 385, 386,  11,  11,  11,  11,  11,  48,  48, 387, 192,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 388,  48, 389,  48,  48, 206,
-   390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390,
-   390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390,
-   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
-   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
-   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48, 204,  48,  48,  48,  48,  48,  48, 207, 140, 140,
-   392, 393, 394, 395, 396,  48,  48,  48,  48,  48,  48, 397, 398, 399,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48, 400, 209,  48,  48,  48,  48, 401,  48,  48, 402, 140, 140, 403,
-    32, 404,  32, 405, 406, 407, 408, 409,  48,  48,  48,  48,  48,  48,  48, 410,
-   411,   2,   3,   4,   5, 412, 413, 414,  48, 415,  48, 200, 416, 417, 418, 419,
-   420,  48, 172, 421, 204, 204, 140, 140,  48,  48,  48,  48,  48,  48,  48,  71,
-   422, 271, 271, 423, 272, 272, 272, 424, 425, 426, 427, 140, 140, 209, 209, 428,
-   140, 140, 140, 140, 140, 140, 140, 140,  48, 151,  48,  48,  48, 100, 429, 430,
-    48,  48, 431,  48, 432,  48,  48, 433,  48, 434,  48,  48, 435, 436, 140, 140,
-     9,   9, 437,  11,  11,  48,  48,  48,  48, 204, 192,   9,   9, 438,  11, 439,
-    48,  48, 440,  48,  48,  48, 441, 442, 442, 443, 444, 445, 140, 140, 140, 140,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48, 314,  48, 199, 440, 140, 446,  27,  27, 447, 140, 140, 140, 140,
-   448,  48,  48, 449,  48, 450,  48, 451,  48, 200, 452, 140, 140, 140,  48, 453,
-    48, 454,  48, 455, 140, 140, 140, 140,  48,  48,  48, 456, 271, 457, 271, 271,
-   458, 459,  48, 460, 461, 462,  48, 463,  48, 464, 140, 140, 465,  48, 466, 467,
-    48,  48,  48, 468,  48, 469,  48, 470,  48, 471, 472, 140, 140, 140, 140, 140,
-    48,  48,  48,  48, 196, 140, 140, 140,   9,   9,   9, 473,  11,  11,  11, 474,
-    48,  48, 475, 192, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 271, 476,  48,  48, 477, 478, 140, 140, 140, 140,
-    48, 464, 479,  48,  62, 480, 140,  48, 481, 140, 140,  48, 482, 140,  48, 314,
-   483,  48,  48, 484, 485, 457, 486, 487, 222,  48,  48, 488, 489,  48, 196, 192,
-   490,  48, 491, 492, 493,  48,  48, 494, 222,  48,  48, 495, 496, 497, 498, 499,
-    48,  97, 500, 501, 140, 140, 140, 140, 502, 503, 504,  48,  48, 505, 506, 192,
-   507,  83,  84, 508, 509, 510, 511, 512, 140, 140, 140, 140, 140, 140, 140, 140,
-    48,  48,  48, 513, 514, 515, 478, 140,  48,  48,  48, 516, 517, 192, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140,  48,  48, 518, 519, 520, 521, 140, 140,
-    48,  48,  48, 522, 523, 192, 524, 140,  48,  48, 525, 526, 192, 140, 140, 140,
-    48, 173, 527, 528, 314, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-    48,  48, 500, 529, 140, 140, 140, 140, 140, 140,   9,   9,  11,  11, 148, 530,
-   531, 532,  48, 533, 534, 192, 140, 140, 140, 140, 535,  48,  48, 536, 537, 140,
-   538,  48,  48, 539, 540, 541,  48,  48, 542, 543, 544,  48,  48,  48,  48, 196,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-    84,  48, 518, 545, 546, 148, 175, 547,  48, 548, 549, 550, 140, 140, 140, 140,
-   551,  48,  48, 552, 553, 192, 554,  48, 555, 556, 192, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 557,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 100, 271, 558, 559, 560,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48,  48, 207, 140, 140, 140, 140, 140, 140,
-   272, 272, 272, 272, 272, 272, 561, 562,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48, 388, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140,  48,  48,  48,  48,  48,  48, 563,
-    48,  48, 200, 564, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-    48,  48,  48,  48, 314, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-    48,  48,  48, 196,  48, 200, 370,  48,  48,  48,  48, 200, 192,  48, 204, 565,
-    48,  48,  48, 566, 567, 568, 569, 570,  48, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140,   9,   9,  11,  11, 271, 571, 140, 140, 140, 140, 140, 140,
-    48,  48,  48,  48, 572, 573, 574, 574, 575, 576, 140, 140, 140, 140, 577, 578,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 440,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 199, 140, 140,
-   196, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 579,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48, 580, 140, 140, 580, 581,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 206,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-    48,  48,  48,  48,  48,  48,  71, 151, 196, 582, 583, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-    32,  32, 584,  32, 585, 209, 209, 209, 209, 209, 209, 209, 323, 140, 140, 140,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 324,
-   209, 209, 586, 209, 209, 209, 587, 588, 589, 209, 590, 209, 209, 209, 288, 140,
-   209, 209, 209, 209, 591, 140, 140, 140, 140, 140, 140, 140, 140, 140, 271, 592,
-   209, 209, 209, 209, 209, 287, 271, 461, 140, 140, 140, 140, 140, 140, 140, 140,
-     9, 593,  11, 594, 595, 596, 241,   9, 597, 598, 599, 600, 601,   9, 593,  11,
-   602, 603,  11, 604, 605, 606, 607,   9, 608,  11,   9, 593,  11, 594, 595,  11,
-   241,   9, 597, 607,   9, 608,  11,   9, 593,  11, 609,   9, 610, 611, 612, 613,
-    11, 614,   9, 615, 616, 617, 618,  11, 619,   9, 620,  11, 621, 622, 622, 622,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-    32,  32,  32, 623,  32,  32, 624, 625, 626, 627,  45, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   628, 629, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   630, 631, 632, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-    48,  48, 151, 633, 634, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 635, 140,  48,  48, 636, 637,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 638, 200,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 639, 585, 140, 140,
-     9,   9, 597,  11, 640, 370, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 498, 271, 271, 641, 642, 140, 140, 140, 140,
-   498, 271, 643, 644, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   645,  48, 646, 647, 648, 649, 650, 651, 652, 206, 653, 206, 140, 140, 140, 654,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   209, 209, 325, 209, 209, 209, 209, 209, 209, 323, 334, 655, 655, 655, 209, 324,
-   656, 209, 209, 209, 209, 209, 209, 209, 209, 209, 657, 140, 140, 140, 658, 209,
-   659, 209, 209, 325, 660, 661, 324, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 662,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 663, 426, 426,
-   209, 209, 209, 209, 209, 209, 209, 323, 209, 209, 209, 209, 209, 660, 325, 427,
-   325, 209, 209, 209, 664, 176, 209, 209, 664, 209, 657, 661, 140, 140, 140, 140,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-   209, 209, 209, 209, 209, 323, 657, 665, 287, 209, 426, 288, 324, 176, 664, 287,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 666, 209, 209, 288, 140, 140, 192,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 140, 140,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48, 196,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48, 204,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 478,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 100, 140,
-    48, 204, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  71, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   667, 140, 668, 668, 668, 668, 668, 668, 140, 140, 140, 140, 140, 140, 140, 140,
-    32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32, 140,
-   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
-   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 669,
-   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
-   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 670,
-     0,   0,   0,   0,   1,   2,   1,   2,   0,   0,   3,   3,   4,   5,   4,   5,
-     4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,
-     4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   6,   0,   0,   7,   0,
-     8,   8,   8,   8,   8,   8,   8,   9,  10,  11,  12,  11,  11,  11,  13,  11,
-    14,  14,  14,  14,  14,  14,  14,  14,  15,  14,  14,  14,  14,  14,  14,  14,
-    14,  14,  14,  16,  17,  18,  17,  17,  19,  20,  21,  21,  22,  21,  23,  24,
-    25,  26,  27,  27,  28,  29,  27,  30,  27,  27,  27,  27,  27,  31,  27,  27,
-    32,  33,  33,  33,  34,  27,  27,  27,  35,  35,  35,  36,  37,  37,  37,  38,
-    39,  39,  40,  41,  42,  43,  44,  27,  45,  46,  27,  27,  27,  27,  47,  27,
-    48,  48,  48,  48,  48,  49,  50,  48,  51,  52,  53,  54,  55,  56,  57,  58,
-    59,  60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,
-    75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,  90,
-    91,  92,  93,  94,  95,  96,  97,  98,  99, 100, 101, 102, 103, 104, 105, 106,
-   107, 108, 109, 109, 110, 111, 112, 109, 113, 114, 115, 116, 117, 118, 119, 120,
-   121, 122, 122, 123, 122, 124, 125, 125, 126, 127, 128, 129, 130, 131, 125, 125,
-   132, 132, 132, 132, 133, 132, 134, 135, 132, 133, 132, 136, 136, 137, 125, 125,
-   138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 139, 139, 140, 139, 139, 141,
-   142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142,
-   143, 143, 143, 143, 144, 145, 143, 143, 144, 143, 143, 146, 147, 148, 143, 143,
-   143, 147, 143, 143, 143, 149, 143, 150, 143, 151, 152, 152, 152, 152, 152, 153,
-   154, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-   154, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-   154, 154, 154, 154, 154, 154, 154, 154, 155, 156, 157, 157, 157, 157, 158, 159,
-   160, 161, 162, 163, 164, 165, 166, 167, 168, 168, 168, 168, 168, 169, 170, 170,
-   171, 172, 173, 173, 173, 173, 173, 174, 173, 173, 175, 154, 154, 154, 154, 176,
-   177, 178, 179, 179, 180, 181, 182, 183, 184, 184, 185, 184, 186, 187, 168, 168,
-   188, 189, 190, 190, 190, 191, 190, 192, 193, 193, 194,   8, 195, 125, 125, 125,
-   196, 196, 196, 196, 197, 196, 196, 198, 199, 199, 199, 199, 200, 200, 200, 201,
-   202, 202, 202, 203, 204, 205, 205, 205, 206, 139, 139, 207, 208, 209, 210, 211,
-     4,   4, 212,   4,   4, 213, 214, 215,   4,   4,   4, 216,   8,   8,   8,   8,
-     4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,
-    11, 217,  11,  11, 217, 218,  11, 219,  11,  11,  11, 220, 220, 221,  11, 222,
-   223,   0,   0,   0,   0,   0, 224, 225, 226, 227,   0,   0, 228,   8,   8, 229,
-     0,   0, 230, 231, 232,   0,   4,   4, 233,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0, 234, 125, 235, 125,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   236, 236, 236, 236, 236, 236, 236, 236, 236, 236, 236, 236, 236, 236, 236, 236,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0, 237,   0, 238,   0,   0,   0,   0,   0,   0,
-   239, 239, 239, 239, 239, 239,   4,   4, 240, 240, 240, 240, 240, 240, 240, 241,
-   139, 139, 140, 242, 242, 242, 243, 244, 143, 245, 246, 246, 246, 246,  14,  14,
-     0,   0,   0,   0,   0, 247, 125, 125, 248, 249, 248, 248, 248, 248, 248, 250,
-   248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 251, 125, 252,
-   253,   0, 254, 255, 256, 257, 257, 257, 257, 258, 259, 260, 260, 260, 260, 261,
-   262, 263, 263, 264, 142, 142, 142, 142, 265,   0, 263, 263,   0,   0, 266, 260,
-   142, 265,   0,   0,   0,   0, 142, 267,   0,   0,   0,   0,   0, 260, 260, 268,
-   260, 260, 260, 260, 260, 269,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-   248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-   248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-   248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,   0,   0,   0,   0,
-   270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
-   270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
-   270, 270, 270, 270, 270, 270, 270, 270, 271, 270, 270, 270, 272, 273, 273, 273,
-   274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274,
-   274, 274, 275, 125,  14,  14,  14,  14,  14,  14, 276, 276, 276, 276, 276, 277,
-     0,   0, 278,   4,   4,   4,   4,   4, 279,   4,   4,   4, 280, 281, 125, 282,
-   283, 283, 284, 285, 286, 286, 286, 287, 288, 288, 288, 288, 289, 290,  48,  48,
-   291, 291, 292, 293, 293, 294, 142, 295, 296, 296, 296, 296, 297, 298, 138, 299,
-   300, 300, 300, 301, 302, 303, 138, 138, 304, 304, 304, 304, 305, 306, 307, 308,
-   309, 310, 246,   4,   4, 311, 312, 152, 152, 152, 152, 152, 307, 307, 313, 314,
-   142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142,
-   142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142,
-   142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142,
-   142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 315, 142, 316, 142, 142, 317,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-   248, 248, 248, 248, 248, 248, 318, 248, 248, 248, 248, 248, 248, 319, 125, 125,
-   320, 321,  21, 322, 323,  27,  27,  27,  27,  27,  27,  27, 324, 325,  27,  27,
-    27,  27,  27,  27,  27,  27,  27,  27,  27,  27,  27,  27,  27,  27,  27,  27,
-    27,  27,  27, 326,  27,  27,  27,  27,  27, 327,  27,  27, 328, 125, 125,  27,
-     8, 285, 329,   0,   0, 330, 331, 332,  27,  27,  27,  27,  27,  27,  27, 333,
-   334,   0,   1,   2,   1,   2, 335, 259, 260, 336, 142, 265, 337, 338, 339, 340,
-   341, 342, 343, 344, 345, 345, 125, 125, 342, 342, 342, 342, 342, 342, 342, 346,
-   347,   0,   0, 348,  11,  11,  11,  11, 349, 350, 351, 125, 125,   0,   0, 352,
-   125, 125, 125, 125, 125, 125, 125, 125, 353, 354, 355, 355, 355, 356, 357, 252,
-   358, 358, 359, 360, 361, 362, 362, 363, 364, 365, 366, 366, 367, 368, 125, 125,
-   369, 369, 369, 369, 369, 370, 370, 370, 371, 372, 373, 374, 374, 375, 374, 376,
-   377, 377, 378, 379, 379, 379, 380, 381, 381, 382, 383, 384, 125, 125, 125, 125,
-   385, 385, 385, 385, 385, 385, 385, 385, 385, 385, 385, 385, 385, 385, 385, 385,
-   385, 385, 385, 386, 385, 387, 388, 125, 389,   4,   4, 390, 125, 125, 125, 125,
-   391, 392, 392, 393, 394, 395, 396, 396, 397, 398, 399, 125, 125, 125, 400, 401,
-   402, 403, 404, 405, 125, 125, 125, 125, 406, 406, 407, 408, 407, 409, 407, 407,
-   410, 411, 412, 413, 414, 414, 415, 415, 416, 416, 125, 125, 417, 417, 418, 419,
-   420, 420, 420, 421, 422, 423, 424, 425, 426, 427, 428, 125, 125, 125, 125, 125,
-   429, 429, 429, 429, 430, 125, 125, 125, 431, 431, 431, 432, 431, 431, 431, 433,
-   434, 434, 435, 436, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 125, 125,  27,  45, 437, 437, 438, 439, 125, 125, 125, 125,
-   440, 440, 441, 442, 442, 443, 125, 444, 445, 125, 125, 446, 447, 125, 448, 449,
-   450, 450, 450, 450, 451, 452, 450, 453, 454, 454, 454, 454, 455, 456, 457, 458,
-   459, 459, 459, 460, 461, 462, 462, 463, 464, 464, 464, 464, 464, 464, 465, 466,
-   467, 468, 467, 469, 125, 125, 125, 125, 470, 471, 472, 473, 473, 473, 474, 475,
-   476, 477, 478, 479, 480, 481, 482, 483, 125, 125, 125, 125, 125, 125, 125, 125,
-   484, 484, 484, 484, 484, 485, 486, 125, 487, 487, 487, 487, 488, 489, 125, 125,
-   125, 125, 125, 125, 125, 125, 125, 125, 490, 490, 490, 491, 490, 492, 125, 125,
-   493, 493, 493, 493, 494, 495, 496, 125, 497, 497, 497, 498, 498, 125, 125, 125,
-   499, 500, 501, 499, 502, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   503, 503, 503, 504, 125, 125, 125, 125, 125, 125, 505, 505, 505, 505, 505, 506,
-   507, 508, 509, 510, 511, 512, 125, 125, 125, 125, 513, 514, 514, 513, 515, 125,
-   516, 516, 516, 516, 517, 518, 518, 518, 518, 518, 519, 154, 520, 520, 520, 521,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   522, 523, 523, 524, 525, 523, 526, 527, 527, 528, 529, 530, 125, 125, 125, 125,
-   531, 532, 532, 533, 534, 535, 536, 537, 538, 539, 540, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 541, 542,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 543, 544, 544, 544, 545,
-   546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546,
-   546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546,
-   546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546,
-   546, 546, 546, 546, 546, 546, 546, 546, 546, 547, 125, 125, 125, 125, 125, 125,
-   546, 546, 546, 546, 546, 546, 548, 549, 546, 546, 546, 546, 546, 546, 546, 546,
-   546, 546, 546, 546, 550, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 551, 551, 551, 551, 551, 551, 552,
-   553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553,
-   553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553, 553,
-   553, 553, 554, 555, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   556, 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, 556,
-   556, 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, 556,
-   556, 556, 556, 556, 557, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
-   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
-   276, 276, 276, 558, 559, 560, 561, 562, 562, 562, 562, 563, 564, 565, 566, 567,
-   568, 568, 568, 568, 569, 570, 571, 572, 568, 125, 125, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 573, 573, 573, 573, 573, 574, 125, 125, 125, 125, 125, 125,
-   575, 575, 575, 575, 576, 575, 575, 575, 577, 575, 125, 125, 125, 125, 578, 579,
-   580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580,
-   580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580,
-   580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580,
-   580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 581,
-   580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580,
-   582, 582, 582, 582, 582, 582, 582, 582, 582, 582, 582, 582, 582, 582, 582, 582,
-   582, 582, 582, 582, 582, 582, 582, 582, 582, 582, 582, 582, 582, 583, 125, 125,
-   584, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 585,
-   586, 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
-   257, 257, 587, 125, 125, 588, 589, 590, 590, 590, 590, 590, 590, 590, 590, 590,
-   590, 590, 590, 590, 590, 590, 590, 590, 590, 590, 590, 590, 590, 590, 590, 591,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   592, 592, 592, 592, 592, 592, 593, 594, 595, 596, 266, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-     8,   8, 597,   8, 598,   0,   0,   0,   0,   0,   0,   0, 266, 125, 125, 125,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 599,
-     0,   0, 600,   0,   0,   0, 601, 602, 603,   0, 604,   0,   0,   0, 235, 125,
-    11,  11,  11,  11, 605, 125, 125, 125, 125, 125, 125, 125, 125, 125,   0, 266,
-     0,   0,   0,   0,   0, 234,   0, 606, 125, 125, 125, 125, 125, 125, 125, 125,
-     0,   0,   0,   0,   0, 224,   0,   0,   0, 607, 608, 609, 610,   0,   0,   0,
-   611, 612,   0, 613, 614, 615,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 616,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 617,   0,   0,   0,
-   618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618,
-   618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618,
-   618, 618, 618, 618, 618, 618, 618, 618, 619, 620, 621, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-     4, 622, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   623, 624, 625, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   626, 626, 627, 628, 629, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 630, 631, 125, 632, 632, 632, 633,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 634, 635,
-   636, 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, 637, 638, 125, 125,
-   639, 639, 639, 639, 640, 641, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 125, 125, 125, 334,   0,   0,   0, 642, 125, 125, 125, 125,
-   334,   0,   0, 247, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   643,  27, 644, 645, 646, 647, 648, 649, 650, 651, 652, 651, 125, 125, 125, 653,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-     0,   0, 252,   0,   0,   0,   0,   0,   0, 266, 226, 334, 334, 334,   0, 599,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 247, 125, 125, 125, 654,   0,
-   655,   0,   0, 252, 606, 656, 599, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 657, 350, 350,
-     0,   0,   0,   0,   0,   0,   0, 266,   0,   0,   0,   0,   0, 606, 252, 228,
-   252,   0,   0,   0, 658, 285,   0,   0, 658,   0, 247, 656, 125, 125, 125, 125,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0, 266, 247, 659, 234,   0, 350, 235, 599, 285, 658, 234,
-     0,   0,   0,   0,   0,   0,   0,   0,   0, 330,   0,   0, 235, 125, 125, 285,
-   248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 125, 125,
-   248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-   248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-   248, 248, 248, 660, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-   248, 318, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-   248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-   248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 579, 248, 248, 248, 248, 248,
-   248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-   248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-   248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 661, 125,
-   248, 318, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-   248, 248, 248, 248, 662, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
-   663, 125,   0,   0,   0,   0,   0,   0, 125, 125, 125, 125, 125, 125, 125, 125,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   939, 940, 941, 942, 946, 948,   0, 962, 969, 970, 971, 976,1001,1002,1003,1008,
-     0,1033,1040,1041,1042,1043,1047,   0,   0,1080,1081,1082,1086,1110,   0,   0,
-  1124,1125,1126,1127,1131,1133,   0,1147,1154,1155,1156,1161,1187,1188,1189,1193,
-     0,1219,1226,1227,1228,1229,1233,   0,   0,1267,1268,1269,1273,1298,   0,1303,
-   943,1128, 944,1129, 954,1139, 958,1143, 959,1144, 960,1145, 961,1146, 964,1149,
-     0,   0, 973,1158, 974,1159, 975,1160, 983,1168, 978,1163, 988,1173, 990,1175,
-   991,1176, 993,1178, 994,1179,   0,   0,1004,1190,1005,1191,1006,1192,1014,1199,
-  1007,   0,   0,   0,1016,1201,1020,1206,   0,1022,1208,1025,1211,1023,1209,   0,
-     0,   0,   0,1032,1218,1037,1223,1035,1221,   0,   0,   0,1044,1230,1045,1231,
-  1049,1235,   0,   0,1058,1244,1064,1250,1060,1246,1066,1252,1067,1253,1072,1258,
-  1069,1255,1077,1264,1074,1261,   0,   0,1083,1270,1084,1271,1085,1272,1088,1275,
-  1089,1276,1096,1283,1103,1290,1111,1299,1115,1118,1307,1120,1309,1121,1310,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  1053,1239,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1093,
-  1280,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 949,1134,1010,
-  1195,1050,1236,1090,1277,1341,1368,1340,1367,1342,1369,1339,1366,   0,1320,1347,
-  1418,1419,1323,1350,   0,   0, 992,1177,1018,1204,1055,1241,1416,1417,1415,1424,
-  1202,   0,   0,   0, 987,1172,   0,   0,1031,1217,1321,1348,1322,1349,1338,1365,
-   950,1135, 951,1136, 979,1164, 980,1165,1011,1196,1012,1197,1051,1237,1052,1238,
-  1061,1247,1062,1248,1091,1278,1092,1279,1071,1257,1076,1263,   0,   0, 997,1182,
-     0,   0,   0,   0,   0,   0, 945,1130, 982,1167,1337,1364,1335,1362,1046,1232,
-  1422,1423,1113,1301,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     8,   9,   0,  10,1425,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   7,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,1314,1427,   5,1434,1438,1443,   0,1450,   0,1455,1461,
-  1514,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1446,1458,1468,1476,1480,1486,
-  1517,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1489,1503,1494,1500,1508,   0,
-     0,   0,   0,1520,1521,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  1526,1528,   0,1525,   0,   0,   0,1522,   0,   0,   0,   0,1536,1532,1539,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,1534,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,1556,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  1548,1550,   0,1547,   0,   0,   0,1567,   0,   0,   0,   0,1558,1554,1561,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1568,1569,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,1529,1551,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  1523,1545,1524,1546,   0,   0,1527,1549,   0,   0,1570,1571,1530,1552,1531,1553,
-     0,   0,1533,1555,1535,1557,1537,1559,   0,   0,1572,1573,1544,1566,1538,1560,
-  1540,1562,1541,1563,1542,1564,   0,   0,1543,1565,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,1606,1607,1609,1608,1610,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  1613,   0,1611,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,1612,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,1620,   0,   0,   0,   0,   0,   0,
-     0,1623,   0,   0,1624,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,1614,1615,1616,1617,1618,1619,1621,1622,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1628,1629,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1625,1626,   0,1627,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,1634,   0,   0,1635,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,1630,1631,1632,   0,   0,1633,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,1639,   0,   0,1638,1640,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1636,1637,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,1641,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1642,1644,1643,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,1645,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  1646,   0,   0,   0,   0,   0,   0,1648,1649,   0,1647,1650,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1651,1653,1652,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1654,   0,1655,1657,1656,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,1659,   0,   0,   0,   0,   0,   0,   0,   0,   0,1660,   0,   0,
-     0,   0,1661,   0,   0,   0,   0,1662,   0,   0,   0,   0,1663,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,1658,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,1664,   0,1665,1673,   0,1674,   0,   0,   0,   0,   0,   0,   0,
-     0,1666,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,1668,   0,   0,   0,   0,   0,   0,   0,   0,   0,1669,   0,   0,
-     0,   0,1670,   0,   0,   0,   0,1671,   0,   0,   0,   0,1672,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,1667,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1675,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1676,   0,1677,   0,1678,   0,1679,   0,1680,   0,
-     0,   0,1681,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1682,   0,1683,   0,   0,
-  1684,1685,   0,1686,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   953,1138, 955,1140, 956,1141, 957,1142,1324,1351, 963,1148, 965,1150, 968,1153,
-   966,1151, 967,1152,1378,1380,1379,1381, 984,1169, 985,1170,1420,1421, 986,1171,
-   989,1174, 995,1180, 998,1183, 996,1181, 999,1184,1000,1185,1015,1200,1329,1356,
-  1017,1203,1019,1205,1021,1207,1024,1210,1687,1688,1027,1213,1026,1212,1028,1214,
-  1029,1215,1030,1216,1034,1220,1036,1222,1039,1225,1038,1224,1334,1361,1336,1363,
-  1382,1384,1383,1385,1056,1242,1057,1243,1059,1245,1063,1249,1689,1690,1065,1251,
-  1068,1254,1070,1256,1386,1387,1388,1389,1691,1692,1073,1259,1075,1262,1079,1266,
-  1078,1265,1095,1282,1098,1285,1097,1284,1390,1391,1392,1393,1099,1286,1100,1287,
-  1101,1288,1102,1289,1105,1292,1104,1291,1106,1294,1107,1295,1108,1296,1114,1302,
-  1119,1308,1122,1311,1123,1312,1186,1260,1293,1305,   0,1394,   0,   0,   0,   0,
-   952,1137, 947,1132,1317,1344,1316,1343,1319,1346,1318,1345,1693,1695,1371,1375,
-  1370,1374,1373,1377,1372,1376,1694,1696, 981,1166, 977,1162, 972,1157,1326,1353,
-  1325,1352,1328,1355,1327,1354,1697,1698,1009,1194,1013,1198,1054,1240,1048,1234,
-  1331,1358,1330,1357,1333,1360,1332,1359,1699,1700,1396,1401,1395,1400,1398,1403,
-  1397,1402,1399,1404,1094,1281,1087,1274,1406,1411,1405,1410,1408,1413,1407,1412,
-  1409,1414,1109,1297,1117,1306,1116,1304,1112,1300,   0,   0,   0,   0,   0,   0,
-  1471,1472,1701,1705,1702,1706,1703,1707,1430,1431,1715,1719,1716,1720,1717,1721,
-  1477,1478,1729,1731,1730,1732,   0,   0,1435,1436,1733,1735,1734,1736,   0,   0,
-  1481,1482,1737,1741,1738,1742,1739,1743,1439,1440,1751,1755,1752,1756,1753,1757,
-  1490,1491,1765,1768,1766,1769,1767,1770,1447,1448,1771,1774,1772,1775,1773,1776,
-  1495,1496,1777,1779,1778,1780,   0,   0,1451,1452,1781,1783,1782,1784,   0,   0,
-  1504,1505,1785,1788,1786,1789,1787,1790,   0,1459,   0,1791,   0,1792,   0,1793,
-  1509,1510,1794,1798,1795,1799,1796,1800,1462,1463,1808,1812,1809,1813,1810,1814,
-  1467,  21,1475,  22,1479,  23,1485,  24,1493,  27,1499,  28,1507,  29,   0,   0,
-  1704,1708,1709,1710,1711,1712,1713,1714,1718,1722,1723,1724,1725,1726,1727,1728,
-  1740,1744,1745,1746,1747,1748,1749,1750,1754,1758,1759,1760,1761,1762,1763,1764,
-  1797,1801,1802,1803,1804,1805,1806,1807,1811,1815,1816,1817,1818,1819,1820,1821,
-  1470,1469,1822,1474,1465,   0,1473,1825,1429,1428,1426,  12,1432,   0,  26,   0,
-     0,1315,1823,1484,1466,   0,1483,1829,1433,  13,1437,  14,1441,1826,1827,1828,
-  1488,1487,1513,  19,   0,   0,1492,1515,1445,1444,1442,  15,   0,1831,1832,1833,
-  1502,1501,1516,  25,1497,1498,1506,1518,1457,1456,1454,  17,1453,1313,  11,   3,
-     0,   0,1824,1512,1519,   0,1511,1830,1449,  16,1460,  18,1464,   4,   0,   0,
-    30,  31,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,  20,   0,   0,   0,   2,   6,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1834,1835,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1836,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1837,1839,1838,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,1840,   0,   0,   0,   0,1841,   0,   0,1842,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,1843,   0,1844,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,1845,   0,   0,1846,   0,   0,1847,   0,1848,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   937,   0,1850,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1849, 936, 938,
-  1851,1852,   0,   0,1853,1854,   0,   0,1855,1856,   0,   0,   0,   0,   0,   0,
-  1857,1858,   0,   0,1861,1862,   0,   0,1863,1864,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1867,1868,1869,1870,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  1859,1860,1865,1866,   0,   0,   0,   0,   0,   0,1871,1872,1873,1874,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,  32,  33,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1875,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1877,   0,1878,   0,
-  1879,   0,1880,   0,1881,   0,1882,   0,1883,   0,1884,   0,1885,   0,1886,   0,
-  1887,   0,1888,   0,   0,1889,   0,1890,   0,1891,   0,   0,   0,   0,   0,   0,
-  1892,1893,   0,1894,1895,   0,1896,1897,   0,1898,1899,   0,1900,1901,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,1876,   0,   0,   0,   0,   0,   0,   0,   0,   0,1902,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1904,   0,1905,   0,
-  1906,   0,1907,   0,1908,   0,1909,   0,1910,   0,1911,   0,1912,   0,1913,   0,
-  1914,   0,1915,   0,   0,1916,   0,1917,   0,1918,   0,   0,   0,   0,   0,   0,
-  1919,1920,   0,1921,1922,   0,1923,1924,   0,1925,1926,   0,1927,1928,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,1903,   0,   0,1929,1930,1931,1932,   0,   0,   0,1933,   0,
-   710, 385, 724, 715, 455, 103, 186, 825, 825, 242, 751, 205, 241, 336, 524, 601,
-   663, 676, 688, 738, 411, 434, 474, 500, 649, 746, 799, 108, 180, 416, 482, 662,
-   810, 275, 462, 658, 692, 344, 618, 679, 293, 388, 440, 492, 740, 116, 146, 168,
-   368, 414, 481, 527, 606, 660, 665, 722, 781, 803, 809, 538, 553, 588, 642, 758,
-   811, 701, 233, 299, 573, 612, 487, 540, 714, 779, 232, 267, 412, 445, 457, 585,
-   594, 766, 167, 613, 149, 148, 560, 589, 648, 768, 708, 345, 411, 704, 105, 259,
-   313, 496, 518, 174, 542, 120, 307, 101, 430, 372, 584, 183, 228, 529, 650, 697,
-   424, 732, 428, 349, 632, 355, 517, 110, 135, 147, 403, 580, 624, 700, 750, 170,
-   193, 245, 297, 374, 463, 543, 763, 801, 812, 815, 162, 384, 420, 730, 287, 330,
-   337, 366, 459, 476, 509, 558, 591, 610, 726, 652, 734, 759, 154, 163, 198, 473,
-   683, 697, 292, 311, 353, 423, 572, 494, 113, 217, 259, 280, 314, 499, 506, 603,
-   608, 752, 778, 782, 788, 117, 557, 748, 774, 320, 109, 126, 260, 265, 373, 411,
-   479, 523, 655, 737, 823, 380, 765, 161, 395, 398, 438, 451, 502, 516, 537, 583,
-   791, 136, 340, 769, 122, 273, 446, 727, 305, 322, 400, 496, 771, 155, 190, 269,
-   377, 391, 406, 432, 501, 519, 599, 684, 687, 749, 776, 175, 452, 191, 480, 510,
-   659, 772, 805, 813, 397, 444, 619, 566, 568, 575, 491, 471, 707, 111, 636, 156,
-   153, 288, 346, 578, 256, 435, 383, 729, 680, 767, 694, 295, 128, 210,   0,   0,
-   227,   0, 379,   0,   0, 150, 493, 525, 544, 551, 552, 556, 783, 576, 604,   0,
-   661,   0, 703,   0,   0, 735, 743,   0,   0,   0, 793, 794, 795, 808, 741, 773,
-   118, 127, 130, 166, 169, 177, 207, 213, 215, 226, 229, 268, 270, 317, 327, 329,
-   335, 369, 375, 381, 404, 441, 448, 458, 477, 484, 503, 539, 545, 547, 546, 548,
-   549, 550, 554, 555, 561, 564, 569, 591, 593, 595, 598, 607, 620, 625, 625, 651,
-   690, 695, 705, 706, 716, 717, 733, 735, 777, 786, 790, 315, 869, 623,   0,   0,
-   102, 145, 134, 115, 129, 138, 165, 171, 207, 202, 206, 212, 227, 231, 240, 243,
-   250, 254, 294, 296, 303, 308, 319, 325, 321, 329, 326, 335, 341, 357, 360, 362,
-   370, 379, 388, 389, 393, 421, 424, 438, 456, 454, 458, 465, 477, 535, 485, 490,
-   493, 507, 512, 514, 521, 522, 525, 526, 528, 533, 532, 541, 565, 569, 574, 586,
-   591, 597, 607, 637, 647, 674, 691, 693, 695, 698, 703, 699, 705, 704, 702, 706,
-   709, 717, 728, 736, 747, 754, 770, 777, 783, 784, 786, 787, 790, 802, 825, 848,
-   847, 857,  55,  65,  66, 883, 892, 916, 822, 824,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1586,   0,1605,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1602,1603,1934,1935,1574,1575,
-  1576,1577,1579,1580,1581,1583,1584,   0,1585,1587,1588,1589,1591,   0,1592,   0,
-  1593,1594,   0,1595,1596,   0,1598,1599,1600,1601,1604,1582,1578,1590,1597,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1936,   0,1937,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1938,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1939,1940,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1941,1942,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1944,1943,   0,1945,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1946,1947,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,1948,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1949,1950,
-  1951,1952,1953,1954,1955,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1956,1957,1958,1960,1959,
-  1961,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   106, 104, 107, 826, 114, 118, 119, 121, 123, 124, 127, 125,  34, 830, 130, 131,
-   132, 137, 827,  35, 133, 139, 829, 142, 143, 112, 144, 145, 924, 151, 152,  37,
-   157, 158, 159, 160,  38, 165, 166, 169, 171, 172, 173, 174, 176, 177, 178, 179,
-   181, 182, 182, 182, 833, 468, 184, 185, 834, 187, 188, 189, 196, 192, 194, 195,
-   197, 199, 200, 201, 203, 204, 204, 206, 208, 209, 211, 218, 213, 219, 214, 216,
-   153, 234, 221, 222, 223, 220, 225, 224, 230, 835, 235, 236, 237, 238, 239, 244,
-   836, 837, 247, 248, 249, 246, 251,  39,  40, 253, 255, 255, 838, 257, 258, 259,
-   261, 839, 262, 263, 301, 264,  41, 266, 270, 272, 271, 841, 274, 842, 277, 276,
-   278, 281, 282,  42, 283, 284, 285, 286,  43, 843,  44, 289, 290, 291, 293, 934,
-   298, 845, 845, 621, 300, 300,  45, 852, 894, 302, 304,  46, 306, 309, 310, 312,
-   316,  48,  47, 317, 846, 318, 323, 324, 325, 324, 328, 329, 333, 331, 332, 334,
-   335, 336, 338, 339, 342, 343, 347, 351, 849, 350, 348, 352, 354, 359, 850, 361,
-   358, 356,  49, 363, 365, 367, 364,  50, 369, 371, 851, 376, 386, 378,  53, 381,
-    52,  51, 140, 141, 387, 382, 614,  78, 388, 389, 390, 394, 392, 856,  54, 399,
-   396, 402, 404, 858, 405, 401, 407,  55, 408, 409, 410, 413, 859, 415,  56, 417,
-   860, 418,  57, 419, 422, 424, 425, 861, 840, 862, 426, 863, 429, 431, 427, 433,
-   437, 441, 438, 439, 442, 443, 864, 436, 449, 450,  58, 454, 453, 865, 447, 460,
-   866, 867, 461, 466, 465, 464,  59, 467, 470, 469, 472, 828, 475, 868, 478, 870,
-   483, 485, 486, 871, 488, 489, 872, 873, 495, 497,  60, 498,  61,  61, 504, 505,
-   507, 508, 511,  62, 513, 874, 515, 875, 518, 844, 520, 876, 877, 878,  63,  64,
-   528, 880, 879, 881, 882, 530, 531, 531, 533,  66, 534,  67,  68, 884, 536, 538,
-   541,  69, 885, 549, 886, 887, 556, 559,  70, 561, 562, 563, 888, 889, 889, 567,
-    71, 890, 570, 571,  72, 891, 577,  73, 581, 579, 582, 893, 587,  74, 590, 592,
-   596,  75, 895, 896,  76, 897, 600, 898, 602, 605, 607, 899, 900, 609, 901, 611,
-   853,  77, 615, 616,  79, 617, 252, 902, 903, 854, 855, 621, 622, 731,  80, 627,
-   626, 628, 164, 629, 630, 631, 633, 904, 632, 634, 639, 640, 635, 641, 646, 651,
-   638, 643, 644, 645, 905, 907, 906,  81, 653, 654, 656, 911, 657, 908,  82,  83,
-   909, 910,  84, 664, 665, 666, 667, 669, 668, 671, 670, 674, 672, 673, 675,  85,
-   677, 678,  86, 681, 682, 912, 685, 686,  87, 689,  36, 913, 914,  88,  89, 696,
-   702, 709, 711, 915, 712, 713, 718, 719, 917, 831, 721, 720, 723, 832, 725, 728,
-   918, 919, 739, 742, 744, 920, 745, 753, 756, 757, 755, 760, 761, 921, 762,  90,
-   764, 922,  91, 775, 279, 780, 923, 925,  92,  93, 785, 926,  94, 927, 787, 787,
-   789, 928, 792,  95, 796, 797, 798, 800,  96, 929, 802, 804, 806,  97,  98, 807,
-   930,  99, 931, 932, 933, 814, 100, 816, 817, 818, 819, 820, 821, 935,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-};
-static const int16_t
-_hb_ucd_i16[196] =
-{
-      0,    0,    0,    0,    1,   -1,    0,    0,    2,    0,   -2,    0,    0,    0,    0,    2,
-      0,   -2,    0,    0,    0,    0,    0,   16,    0,    0,    0,  -16,    0,    0,    1,   -1,
-      0,    0,    0,    1,   -1,    0,    0,    0,    0,    1,   -1,    0,    3,    3,    3,   -3,
-     -3,   -3,    0,    0,    0, 2016,    0,    0,    0,    0,    0, 2527, 1923, 1914, 1918,    0,
-   2250,    0,    0,    0,    0,    0,    0,  138,    0,    7,    0,    0,   -7,    0,    0,    0,
-      1,   -1,    1,   -1,   -1,    1,   -1,    0, 1824,    0,    0,    0,    0,    0, 2104,    0,
-   2108, 2106,    0, 2106, 1316,    0,    0,    0,    0,    1,   -1,    1,   -1, -138,    0,    0,
-      1,   -1,    8,    8,    8,    0,    7,    7,    0,    0,   -8,   -8,   -8,   -7,   -7,    0,
-      1,   -1,    0,    2,-1316,    1,   -1,    0,   -1,    1,   -1,    1,   -1,    3,    1,   -1,
-     -3,    1,   -1,    1,   -1,    0,    0,-1914,-1918,    0,    0,-1923,-1824,    0,    0,    0,
-      0,-2016,    0,    0,    1,   -1,    0,    1,    0,    0,-2104,    0,    0,    0,    0,-2106,
-  -2108,-2106,    0,    0,    1,   -1,-2250,    0,    0,    0,-2527,    0,    0,   -2,    0,    1,
-     -1,    0,    1,   -1,
-};
-
-static inline uint_fast8_t
-_hb_ucd_gc (unsigned u)
-{
-  return u<1114110u?_hb_ucd_u8[2176+(((_hb_ucd_u16[((_hb_ucd_u8[u>>4>>5])<<5)+((u>>4)&31u)])<<4)+((u)&15u))]:2;
-}
-static inline uint_fast8_t
-_hb_ucd_ccc (unsigned u)
-{
-  return u<125259u?_hb_ucd_u8[15332+(((_hb_ucd_u8[13892+(((_hb_ucd_u8[12912+(u>>3>>4)])<<4)+((u>>3)&15u))])<<3)+((u)&7u))]:0;
-}
-static inline unsigned
-_hb_ucd_b4 (const uint8_t* a, unsigned i)
-{
-  return (a[i>>1]>>((i&1u)<<2))&15u;
-}
-static inline int_fast16_t
-_hb_ucd_bmg (unsigned u)
-{
-  return u<65380u?_hb_ucd_i16[((_hb_ucd_u8[16692+(((_hb_ucd_b4(16564+_hb_ucd_u8,u>>2>>6))<<6)+((u>>2)&63u))])<<2)+((u)&3u)]:0;
-}
-static inline uint_fast8_t
-_hb_ucd_sc (unsigned u)
-{
-  return u<918000u?_hb_ucd_u8[19446+(((_hb_ucd_u16[3168+(((_hb_ucd_u8[17652+(u>>4>>5)])<<5)+((u>>4)&31u))])<<4)+((u)&15u))]:2;
-}
-static inline uint_fast16_t
-_hb_ucd_dm (unsigned u)
-{
-  return u<195102u?_hb_ucd_u16[6400+(((_hb_ucd_u8[30070+(u>>6)])<<6)+((u)&63u))]:0;
-}
-
-
-#elif !defined(HB_NO_UCD_UNASSIGNED)
-
-static const uint8_t
 _hb_ucd_u8[17936] =
 {
     0,  1,  2,  3,  4,  5,  6,  7,  7,  8,  7,  7,  7,  7,  7,  7,
@@ -5675,10 +2821,1743 @@ _hb_ucd_dm (unsigned u)
 }
 
 
+#elif !defined(HB_NO_UCD_UNASSIGNED)
+
+static const uint8_t
+_hb_ucd_u8[17564] =
+{
+    0,  1,  2,  3,  4,  5,  6,  7,  7,  8,  7,  7,  7,  7,  7,  7,
+    7,  7,  7,  7,  9, 10,  7,  7,  7,  7, 11, 12, 13, 13, 13, 14,
+   15, 16, 17, 18, 19, 20, 21, 22, 23, 22, 22, 22, 22, 24,  7,  7,
+   25, 26, 22, 22, 22, 27, 28, 29, 22, 30, 31, 32, 33, 34, 35, 36,
+    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+    7,  7,  7,  7, 37,  7, 38, 39,  7, 40,  7,  7,  7, 41, 22, 42,
+    7,  7, 43, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   44, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 45,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 46,
+    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 34, 35, 36, 37, 38, 39, 34, 34, 34, 40, 41, 42, 43,
+   44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+   60, 61, 62, 63, 64, 64, 65, 66, 67, 68, 69, 70, 71, 69, 72, 73,
+   69, 69, 64, 74, 64, 64, 75, 76, 77, 78, 79, 80, 81, 82, 69, 83,
+   84, 85, 86, 87, 88, 89, 69, 69, 34, 34, 34, 34, 34, 34, 34, 34,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 90, 34, 34, 34, 34,
+   91, 34, 34, 34, 34, 34, 34, 34, 34, 92, 34, 34, 93, 94, 95, 96,
+   97, 98, 99,100,101,102,103,104, 34, 34, 34, 34, 34, 34, 34, 34,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,105,
+  106,106,106,106,106,106,106,106,106,106,106,106,106,106,106,106,
+  107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+  107,107, 34, 34,108,109,110,111, 34, 34,112,113,114,115,116,117,
+  118,119,120,121,122,123,124,125,126,127,128,129, 34, 34,130,131,
+  132,133,134,135,136,137,138,139,140,141,142,122,143,144,145,146,
+  147,148,149,150,151,152,153,122,154,155,122,156,157,158,159,122,
+  160,161,162,163,164,165,122,122,166,167,168,169,122,170,122,171,
+   34, 34, 34, 34, 34, 34, 34,172,173, 34,174,122,122,122,122,122,
+  122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,175,
+   34, 34, 34, 34, 34, 34, 34, 34,176,122,122,122,122,122,122,122,
+  122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,
+  122,122,122,122,122,122,122,122, 34, 34, 34, 34,177,122,122,122,
+   34, 34, 34, 34,178,179,180,181,122,122,122,122,182,183,184,185,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,186,
+   34, 34, 34, 34, 34, 34, 34, 34, 34,187,188,122,122,122,122,122,
+  122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,189,
+   34, 34,190, 34, 34,191,122,122,122,122,122,122,122,122,122,122,
+  122,122,122,122,122,122,122,122,192,193,122,122,122,122,122,122,
+  122,122,122,122,122,122,122,122,122,122,122,122,122,122,194,195,
+   69,196,197,198,199,200,201,122,202,203,204,205,206,207,208,209,
+   69, 69, 69, 69,210,211,122,122,122,122,122,122,122,122,212,122,
+  213,122,214,122,122,215,122,122,122,122,122,122,122,122,122,216,
+   34,217,218,122,122,122,122,122,219,220,221,122,222,223,122,122,
+  224,225,226,227,228,122, 69,229, 69, 69, 69, 69, 69,230,231,232,
+  233,234, 69, 69,235,236, 69,237,122,122,122,122,122,122,122,122,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,238, 34, 34,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,239, 34,
+  240, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,241, 34, 34,
+   34, 34, 34, 34, 34, 34, 34,242,122,122,122,122,122,122,122,122,
+   34, 34, 34, 34,243,122,122,122,122,122,122,122,122,122,122,122,
+   34, 34, 34, 34, 34, 34,244,122,122,122,122,122,122,122,122,122,
+  245,122,246,247,122,122,122,122,122,122,122,122,122,122,122,122,
+  107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,248,
+  107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,249,
+    0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  2,  4,  5,  6,  2,
+    7,  7,  7,  7,  7,  2,  8,  9, 10, 11, 11, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 17, 18, 19,  1, 20, 20, 21, 22, 23, 24, 25,
+   26, 27, 15,  2, 28, 29, 27, 30, 11, 11, 11, 11, 11, 11, 11, 11,
+   11, 11, 11, 31, 11, 11, 11, 32, 16, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 33, 16, 16, 16, 16, 32, 32, 32, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 34, 34, 34, 34, 34, 34, 34, 34, 16, 32, 32, 32,
+   32, 32, 32, 32, 11, 34, 34, 16, 34, 32, 32, 11, 34, 11, 16, 11,
+   11, 34, 32, 11, 32, 16, 11, 34, 32, 32, 32, 11, 34, 16, 32, 11,
+   34, 11, 34, 34, 32, 35, 32, 16, 36, 36, 37, 34, 38, 37, 34, 34,
+   34, 34, 34, 34, 34, 34, 16, 32, 34, 38, 32, 11, 32, 32, 32, 32,
+   32, 32, 16, 16, 16, 11, 34, 32, 34, 34, 11, 32, 32, 32, 32, 32,
+   16, 16, 39, 16, 16, 16, 16, 16, 40, 40, 40, 40, 40, 40, 40, 40,
+   40, 41, 41, 40, 40, 40, 40, 40, 40, 41, 41, 41, 41, 41, 41, 41,
+   40, 40, 42, 41, 41, 41, 42, 42, 41, 41, 41, 41, 41, 41, 41, 41,
+   43, 43, 43, 43, 43, 43, 43, 43, 32, 32, 42, 32, 44, 45, 16, 10,
+   44, 44, 41, 46, 11, 47, 47, 11, 34, 11, 11, 11, 11, 11, 11, 11,
+   11, 48, 11, 11, 11, 11, 16, 16, 16, 16, 16, 16, 16, 16, 16, 34,
+   16, 11, 32, 16, 32, 32, 32, 32, 16, 16, 32, 49, 34, 32, 34, 11,
+   32, 50, 43, 43, 51, 32, 32, 32, 11, 34, 34, 34, 34, 34, 34, 16,
+   48, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 47, 52,  2,  2,  2,
+   16, 16, 16, 16, 53, 54, 55, 56, 57, 43, 43, 43, 43, 43, 43, 43,
+   43, 43, 43, 43, 43, 43, 43, 58, 59, 60, 43, 59, 44, 44, 44, 44,
+   36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 61, 44, 62,
+   36, 63, 64, 44, 44, 44, 44, 44, 65, 65, 65,  8,  9, 66,  2, 67,
+   43, 43, 43, 43, 43, 60, 68,  2, 69, 36, 36, 36, 36, 70, 43, 43,
+    7,  7,  7,  7,  7,  2,  2, 36, 71, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 72, 43, 43, 43, 73, 50, 43, 43, 74, 75, 76, 43, 43, 36,
+    7,  7,  7,  7,  7, 36, 77, 78,  2,  2,  2,  2,  2,  2,  2, 79,
+   70, 36, 36, 36, 36, 36, 36, 36, 43, 43, 43, 43, 43, 80, 62, 36,
+   36, 36, 36, 43, 43, 43, 43, 43, 71, 44, 44, 44, 44, 44, 44, 44,
+    7,  7,  7,  7,  7, 36, 36, 36, 36, 36, 36, 36, 36, 70, 43, 43,
+   43, 43, 40, 21,  2, 81, 57, 20, 36, 36, 36, 43, 43, 75, 43, 43,
+   43, 43, 75, 43, 75, 43, 43, 44,  2,  2,  2,  2,  2,  2,  2, 64,
+   36, 36, 36, 36, 70, 43, 44, 64, 36, 36, 36, 36, 36, 61, 44, 44,
+   36, 36, 36, 36, 82, 36, 36, 61, 65, 44, 44, 44, 43, 43, 43, 43,
+   36, 36, 36, 36, 83, 43, 43, 43, 43, 84, 43, 43, 43, 43, 43, 43,
+   43, 85, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 85, 71, 86,
+   87, 43, 43, 43, 85, 86, 87, 86, 70, 43, 43, 43, 36, 36, 36, 36,
+   36, 43,  2,  7,  7,  7,  7,  7, 88, 36, 36, 36, 36, 36, 36, 36,
+   70, 86, 62, 36, 36, 36, 61, 62, 61, 62, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 61, 36, 36, 36, 61, 61, 44, 36, 36, 44, 71, 86,
+   87, 43, 80, 89, 90, 89, 87, 61, 44, 44, 44, 89, 44, 44, 36, 62,
+   36, 43, 44,  7,  7,  7,  7,  7, 36, 20, 27, 27, 27, 56, 63, 80,
+   57, 85, 62, 36, 36, 61, 44, 62, 61, 36, 62, 61, 36, 44, 80, 86,
+   87, 80, 44, 57, 80, 57, 43, 44, 57, 44, 44, 44, 62, 36, 61, 61,
+   44, 44, 44,  7,  7,  7,  7,  7, 43, 36, 70, 64, 44, 44, 44, 44,
+   57, 85, 62, 36, 36, 36, 36, 62, 36, 62, 36, 36, 36, 36, 36, 36,
+   61, 36, 62, 36, 36, 44, 71, 86, 87, 43, 43, 57, 85, 89, 87, 44,
+   61, 44, 44, 44, 44, 44, 44, 44, 66, 44, 44, 44, 62, 43, 43, 43,
+   57, 86, 62, 36, 36, 36, 61, 62, 61, 36, 62, 36, 36, 44, 71, 87,
+   87, 43, 80, 89, 90, 89, 87, 44, 44, 44, 57, 85, 44, 44, 36, 62,
+   78, 27, 27, 27, 44, 44, 44, 44, 44, 71, 62, 36, 36, 61, 44, 36,
+   61, 36, 36, 44, 62, 61, 61, 36, 44, 62, 61, 44, 36, 61, 44, 36,
+   36, 36, 36, 36, 36, 44, 44, 86, 85, 90, 44, 86, 90, 86, 87, 44,
+   61, 44, 44, 89, 44, 44, 44, 44, 27, 91, 67, 67, 56, 92, 44, 44,
+   85, 86, 71, 36, 36, 36, 61, 36, 61, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 44, 71, 43, 85, 86, 90, 43, 80, 43, 43, 44,
+   44, 44, 57, 80, 36, 61, 62, 44, 44, 44, 44, 93, 27, 27, 27, 91,
+   70, 86, 72, 36, 36, 36, 61, 36, 36, 36, 62, 36, 36, 44, 71, 87,
+   86, 86, 90, 85, 90, 86, 43, 44, 44, 44, 89, 90, 44, 44, 62, 61,
+   62, 61, 44, 44, 44, 44, 44, 44, 43, 86, 36, 36, 36, 36, 61, 36,
+   36, 36, 36, 36, 36, 70, 71, 86, 87, 43, 80, 86, 90, 86, 87, 77,
+   44, 44, 36, 94, 27, 27, 27, 95, 27, 27, 27, 27, 91, 36, 36, 36,
+   57, 86, 62, 36, 36, 36, 36, 36, 36, 36, 36, 61, 44, 36, 36, 36,
+   36, 62, 36, 36, 36, 36, 62, 44, 36, 36, 36, 61, 44, 80, 44, 89,
+   86, 43, 80, 80, 86, 86, 86, 86, 44, 86, 64, 44, 44, 44, 44, 44,
+   62, 36, 36, 36, 36, 36, 36, 36, 70, 36, 43, 43, 43, 80, 44, 96,
+   36, 36, 36, 75, 43, 43, 43, 60,  7,  7,  7,  7,  7,  2, 44, 44,
+   44, 44, 44, 44, 44, 44, 44, 44, 62, 61, 61, 36, 36, 61, 36, 36,
+   36, 36, 62, 62, 36, 36, 36, 36, 70, 36, 43, 43, 43, 43, 71, 44,
+   36, 36, 61, 81, 43, 43, 43, 44,  7,  7,  7,  7,  7, 44, 36, 36,
+   77, 67,  2,  2,  2,  2,  2,  2,  2, 97, 97, 67, 43, 67, 67, 67,
+    7,  7,  7,  7,  7, 27, 27, 27, 27, 27, 50, 50, 50,  4,  4, 86,
+   36, 36, 36, 36, 62, 36, 36, 36, 36, 36, 36, 36, 36, 36, 61, 44,
+   57, 43, 43, 43, 43, 43, 43, 85, 43, 43, 60, 43, 36, 36, 70, 43,
+   43, 43, 43, 43, 57, 43, 43, 43, 43, 43, 43, 43, 43, 43, 80, 67,
+   67, 67, 67, 76, 67, 67, 92, 67,  2,  2, 97, 67, 21, 64, 44, 44,
+   36, 36, 36, 36, 36, 94, 87, 43, 85, 43, 43, 43, 87, 85, 87, 71,
+    7,  7,  7,  7,  7,  2,  2,  2, 36, 36, 36, 86, 43, 36, 36, 43,
+   71, 86, 98, 94, 86, 86, 86, 36, 70, 43, 71, 36, 36, 36, 36, 36,
+   36, 85, 87, 85, 86, 86, 87, 94,  7,  7,  7,  7,  7, 86, 87, 67,
+   11, 11, 11, 48, 44, 44, 48, 44, 16, 16, 16, 16, 16, 53, 45, 16,
+   36, 36, 36, 36, 61, 36, 36, 44, 36, 36, 36, 61, 61, 36, 36, 44,
+   61, 36, 36, 44, 36, 36, 36, 61, 61, 36, 36, 44, 36, 36, 36, 36,
+   36, 36, 36, 61, 36, 36, 36, 36, 36, 36, 36, 36, 36, 61, 57, 43,
+    2,  2,  2,  2, 99, 27, 27, 27, 27, 27, 27, 27, 27, 27,100, 44,
+   67, 67, 67, 67, 67, 44, 44, 44, 11, 11, 11, 44, 16, 16, 16, 44,
+  101, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 77, 72,
+  102, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,103,104, 44,
+   36, 36, 36, 36, 36, 63,  2,105,106, 36, 36, 36, 61, 44, 44, 44,
+   36, 43, 85, 44, 44, 44, 44, 62, 36, 43,107, 64, 44, 44, 44, 44,
+   36, 43, 44, 44, 44, 44, 44, 44, 36, 36, 36, 36, 36, 36, 61, 36,
+   61, 43, 44, 44, 44, 44, 44, 44, 36, 36, 43, 87, 43, 43, 43, 86,
+   86, 86, 86, 85, 87, 43, 43, 43, 43, 43,  2, 88,  2, 66, 70, 44,
+    7,  7,  7,  7,  7, 44, 44, 44, 27, 27, 27, 27, 27, 44, 44, 44,
+    2,  2,  2,108,  2, 59, 43, 84, 36, 83, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 61, 44, 44, 44, 36, 36, 70, 71, 36, 36, 36, 36,
+   36, 36, 36, 36, 70, 61, 44, 44, 36, 36, 36, 44, 44, 44, 44, 44,
+   36, 36, 36, 36, 36, 36, 36, 61, 43, 85, 86, 87, 85, 86, 44, 44,
+   86, 85, 86, 86, 87, 43, 44, 44, 92, 44,  2,  7,  7,  7,  7,  7,
+   36, 36, 36, 36, 36, 36, 36, 44, 36, 36, 61, 44, 44, 44, 44, 44,
+   36, 36, 36, 36, 36, 36, 44, 44, 36, 36, 36, 36, 36, 44, 44, 44,
+    7,  7,  7,  7,  7,100, 44, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+   36, 36, 36, 70, 85, 87, 44,  2, 36, 36, 94, 85, 43, 43, 43, 80,
+   85, 85, 87, 43, 43, 43, 85, 86, 86, 87, 43, 43, 43, 43, 80, 57,
+    2,  2,  2, 88,  2,  2,  2, 44, 43, 43, 43, 43, 43, 43, 43,109,
+   43, 43, 43, 43, 43, 43, 43, 80, 43, 43, 98, 36, 36, 36, 36, 36,
+   36, 36, 85, 43, 43, 85, 85, 86, 86, 85, 98, 36, 36, 36, 61, 44,
+   97, 67, 67, 67, 67, 50, 43, 43, 43, 43, 67, 67, 67, 67, 21, 64,
+   43, 98, 36, 36, 36, 36, 36, 36, 94, 43, 43, 86, 43, 87, 43, 36,
+   36, 36, 36, 85, 43, 86, 87, 87, 43, 86, 44, 44, 44, 44,  2,  2,
+   36, 36, 86, 86, 86, 86, 43, 43, 43, 43, 86, 43, 44, 93,  2,  2,
+    7,  7,  7,  7,  7, 44, 62, 36, 36, 36, 36, 36, 40, 40, 40,  2,
+   16, 16, 16, 16,110, 44, 44, 44, 11, 11, 11, 11, 11, 47, 48, 11,
+    2,  2,  2,  2, 44, 44, 44, 44, 43, 60, 43, 43, 43, 43, 43, 43,
+   85, 43, 43, 43, 71, 36, 70, 36, 36, 36, 71, 94, 43, 61, 44, 44,
+   16, 16, 16, 16, 16, 16, 40, 40, 40, 40, 40, 40, 40, 45, 16, 16,
+   16, 16, 16, 16, 45, 16, 16, 16, 16, 16, 16, 16, 16,111, 40, 40,
+   32, 32, 32, 16, 16, 16, 16, 32, 16, 16, 16, 16, 11, 11, 11, 11,
+   16, 16, 16, 44, 11, 11, 11, 44, 16, 16, 16, 16, 48, 48, 48, 48,
+   16, 16, 16, 16, 16, 16, 16, 44, 16, 16, 16, 16,112,112,112,112,
+   16, 16,110, 16, 11, 11,113,114, 41, 16,110, 16, 11, 11,113, 41,
+   16, 16, 44, 16, 11, 11,115, 41, 16, 16, 16, 16, 11, 11,116, 41,
+   44, 16,110, 16, 11, 11,113,117,118,118,118,118,118,119, 65, 65,
+  120,120,120,  2,121,122,121,122,  2,  2,  2,  2,123, 65, 65,124,
+    2,  2,  2,  2,125,126,  2,127,128,  2,129,130,  2,  2,  2,  2,
+    2,  9,128,  2,  2,  2,  2,131, 65, 65,132, 65, 65, 65, 65, 65,
+  133, 44, 27, 27, 27,  8,129,134, 27, 27, 27, 27, 27,  8,129,104,
+   40, 40, 40, 40, 40, 40, 81, 44, 20, 20, 20, 20, 20, 20, 20, 20,
+  135, 44, 44, 44, 44, 44, 44, 44, 43, 43, 43, 43, 43, 43,136, 51,
+  109, 51,109, 43, 43, 43, 43, 43, 80, 44, 44, 44, 44, 44, 44, 44,
+   67,137, 67,138, 67, 34, 11, 16, 11, 32,138, 67, 49, 11, 11, 67,
+   67, 67,137,137,137, 11, 11,139, 11, 11, 35, 36, 39, 67, 16, 11,
+    8,  8, 49, 16, 16, 26, 67,140, 27, 27, 27, 27, 27, 27, 27, 27,
+  105,105,105,105,105,105,105,105,105,141,142,105,143, 67, 44, 44,
+    8,  8,144, 67, 67,  8, 67, 67,144, 26, 67,144, 67, 67, 67,144,
+   67, 67, 67, 67, 67, 67, 67,  8, 67,144,144, 67, 67, 67, 67, 67,
+   67, 67,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+   67, 67, 67, 67,  4,  4, 67, 67,  8, 67, 67, 67,145,146, 67, 67,
+   67, 67, 67, 67, 67, 67,144, 67, 67, 67, 67, 67, 67, 26,  8,  8,
+    8,  8, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67,  8,  8,
+    8, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 92, 44, 44, 44, 44,
+   67, 67, 67, 67, 67, 92, 44, 44, 27, 27, 27, 27, 27, 27, 67, 67,
+   67, 67, 67, 67, 67, 27, 27, 27, 67, 67, 67, 26, 67, 67, 67, 67,
+   26, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67,  8,  8,  8,  8,
+   67, 67, 67, 67, 67, 67, 67, 26, 67, 67, 67, 67,  4,  4,  4,  4,
+    4,  4,  4, 27, 27, 27, 27, 27, 27, 27, 67, 67, 67, 67, 67, 67,
+    8,  8,129,147,  8,  8,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,
+    8,129,148,148,148,148,148,148,148,148,148,148,147,  8,  8,  8,
+    8,  8,  8,  8,  4,  4,  8,  8,  8,  8,  8,  8,  8,  8,  4,  8,
+    8,  8,144, 26,  8,  8,144, 67, 67, 67, 44, 67, 67, 67, 67, 67,
+   67, 67, 67, 55, 67, 67, 67, 67, 32, 11, 32, 34, 34, 34, 34, 11,
+   32, 32, 34, 16, 16, 16, 40, 11, 32, 32,140, 67, 67,138, 34,149,
+   43, 32, 44, 44, 93,  2, 99,  2, 16, 16, 16,150, 44, 44,150, 44,
+   36, 36, 36, 36, 44, 44, 44, 52, 64, 44, 44, 44, 44, 44, 44, 57,
+   36, 36, 36, 61, 44, 44, 44, 44, 36, 36, 36, 61, 36, 36, 36, 61,
+    2,121,121,  2,125,126,121,  2,  2,  2,  2,  6,  2,108,121,  2,
+  121,  4,  4,  4,  4,  2,  2, 88,  2,  2,  2,  2,  2,120,  2,  2,
+  108,151,  2,  2,  2,  2,  2,  2, 67,  2,152,148,148,148,153, 44,
+   67, 67, 67, 67, 67, 55, 67, 67, 67, 67, 44, 44, 44, 44, 44, 44,
+   67, 67, 67, 44, 44, 44, 44, 44, 67, 67, 67, 67, 67, 67, 44, 44,
+    1,  2,154,155,  4,  4,  4,  4,  4, 67,  4,  4,  4,  4,156,157,
+  158,105,105,105,105, 43, 43, 86,159, 40, 40, 67,105,160, 63, 67,
+   36, 36, 36, 61, 57,161,162, 69, 36, 36, 36, 36, 36, 63, 40, 69,
+   44, 44, 62, 36, 36, 36, 36, 36, 67, 27, 27, 67, 67, 67, 67, 67,
+   67, 67, 67, 67, 67, 67, 67, 92, 27, 27, 27, 27, 27, 67, 67, 67,
+   67, 67, 67, 67, 27, 27, 27, 27,163, 27, 27, 27, 27, 27, 27, 27,
+   36, 36, 83, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,164,  2,
+    7,  7,  7,  7,  7, 36, 44, 44, 32, 32, 32, 32, 32, 32, 32, 70,
+   51,165, 43, 43, 43, 43, 43, 88, 32, 32, 32, 32, 32, 32, 40, 43,
+   36, 36, 36,105,105,105,105,105, 43,  2,  2,  2, 44, 44, 44, 44,
+   41, 41, 41,162, 40, 40, 40, 40, 41, 32, 32, 32, 32, 32, 32, 32,
+   16, 32, 32, 32, 32, 32, 32, 32, 45, 16, 16, 16, 34, 34, 34, 32,
+   32, 32, 32, 32, 42,166, 34, 35, 32, 32, 16, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 32, 11, 11, 32, 11, 11, 32, 32, 32, 32, 32, 32,
+   32, 32, 11, 11, 34,110, 44, 44, 32,150,150, 32, 32, 44, 44, 44,
+   44, 40,167, 35, 40, 35, 36, 36, 36, 71, 36, 71, 36, 70, 36, 36,
+   36, 94, 87, 85, 67, 67, 80, 44, 27, 27, 27, 67,168, 44, 44, 44,
+   36, 36,  2,  2, 44, 44, 44, 44, 86, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 86, 86, 86, 86, 86, 86, 86, 86, 43, 44, 44, 44, 44,  2,
+   43, 36, 36, 36,  2, 72, 72, 70, 36, 36, 36, 43, 43, 43, 43,  2,
+   36, 36, 36, 70, 43, 43, 43, 43, 43, 86, 44, 44, 44, 44, 44, 93,
+   36, 70, 86, 43, 43, 86, 43, 86,107,  2,  2,  2,  2,  2,  2, 52,
+    7,  7,  7,  7,  7, 44, 44,  2, 36, 36, 70, 69, 36, 36, 36, 36,
+    7,  7,  7,  7,  7, 36, 36, 61, 36, 36, 36, 36, 70, 43, 43, 85,
+   87, 85, 87, 80, 44, 44, 44, 44, 36, 70, 36, 36, 36, 36, 85, 44,
+    7,  7,  7,  7,  7, 44,  2,  2, 69, 36, 36, 77, 67, 94, 85, 36,
+   71, 43, 71, 70, 71, 36, 36, 43, 70, 61, 44, 44, 44, 44, 44, 44,
+   44, 44, 44, 44, 44, 62, 83,  2, 36, 36, 36, 36, 36, 94, 43, 86,
+    2, 83,169, 80, 44, 44, 44, 44, 62, 36, 36, 61, 62, 36, 36, 61,
+   62, 36, 36, 61, 44, 44, 44, 44, 16, 16, 16, 16, 16,114, 40, 40,
+   16, 16, 16, 16,111, 41, 44, 44, 36, 94, 87, 86, 85,107, 87, 44,
+   36, 36, 44, 44, 44, 44, 44, 44, 36, 36, 36, 61, 44, 62, 36, 36,
+  170,170,170,170,170,170,170,170,171,171,171,171,171,171,171,171,
+   16, 16, 16,110, 44, 44, 44, 44, 44,150, 16, 16, 44, 44, 62, 71,
+   36, 36, 36, 36,172, 36, 36, 36, 36, 36, 36, 61, 36, 36, 61, 61,
+   36, 62, 61, 36, 36, 36, 36, 36, 36, 41, 41, 41, 41, 41, 41, 41,
+   41,117, 44, 44, 44, 44, 44, 44, 44, 62, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36, 36,148, 44, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 44, 44, 44, 55, 36, 36, 36, 36, 36, 36,168, 67,
+    2,  2,  2,152,130, 44, 44, 44,  6,173,174,148,148,148,148,148,
+  148,148,130,152,130,  2,127,175,  2, 64,  2,  2,156,148,148,130,
+    2,176,  8,177, 66,  2, 44, 44, 36, 36, 61, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36, 61, 79, 93,  2,  3,  2,  4,  5,  6,  2,
+   16, 16, 16, 16, 16, 17, 18,129,130,  4,  2, 36, 36, 36, 36, 36,
+   69, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 40,
+   44, 36, 36, 36, 44, 36, 36, 36, 44, 36, 36, 36, 44, 36, 61, 44,
+   20,178, 56,135, 26,  8,144, 92, 44, 44, 44, 44, 79, 65, 67, 44,
+   36, 36, 36, 36, 36, 36, 62, 36, 36, 36, 36, 36, 36, 61, 36, 62,
+    2, 64, 44,179, 27, 27, 27, 27, 27, 27, 44, 55, 67, 67, 67, 67,
+  105,105,143, 27, 91, 67, 67, 67, 67, 67, 67, 67, 67, 27, 67, 92,
+   67, 67, 67, 67, 67, 67, 92, 44, 92, 44, 44, 44, 44, 44, 44, 44,
+   67, 67, 67, 67, 67, 67, 50, 44,180, 27, 27, 27, 27, 27, 27, 27,
+   27, 27, 27, 27, 27, 27, 44, 44, 27, 27, 44, 44, 44, 44, 62, 36,
+  155, 36, 36, 36, 36,181, 44, 44, 36, 36, 36, 43, 43, 80, 44, 44,
+   36, 36, 36, 36, 36, 36, 36, 93, 36, 36, 44, 44, 36, 36, 36, 36,
+  182,105,105, 44, 44, 44, 44, 44, 11, 11, 11, 11, 16, 16, 16, 16,
+   11, 11, 44, 44, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 44, 44,
+   36, 36, 36, 36, 44, 44, 44, 44, 36, 36, 44, 44, 44, 44, 44, 93,
+   11, 11, 11, 11, 11, 47, 11, 11, 11, 47, 11,150, 16, 16, 16, 16,
+   16,150, 16, 16, 16, 16, 16, 16, 16,150, 16, 16, 16,150,110, 44,
+   40, 40, 40, 52, 40, 40, 40, 40, 81, 40, 40, 40, 40, 81, 44, 44,
+   36, 36, 36, 44, 61, 36, 36, 36, 36, 36, 36, 62, 61, 44, 61, 62,
+   36, 36, 36, 93, 27, 27, 27, 27, 36, 36, 36, 77,163, 27, 27, 27,
+   44, 44, 44,179, 27, 27, 27, 27, 36, 61, 36, 44, 44,179, 27, 27,
+   36, 36, 36, 27, 27, 27, 44, 93, 36, 36, 36, 36, 36, 44, 44, 93,
+   36, 36, 36, 36, 44, 44, 27, 36, 44, 27, 27, 27, 27, 27, 27, 27,
+   70, 43, 57, 80, 44, 44, 43, 43, 36, 36, 62, 36, 62, 36, 36, 36,
+   36, 36, 36, 44, 43, 80, 44, 57, 27, 27, 27, 27,100, 44, 44, 44,
+    2,  2,  2,  2, 64, 44, 44, 44, 36, 36, 36, 36, 36, 36,183, 30,
+   36, 36, 36, 36, 36, 36,183, 27, 36, 36, 36, 36, 78, 36, 36, 36,
+   36, 36, 70, 80, 44,179, 27, 27,  2,  2,  2, 64, 44, 44, 44, 44,
+   36, 36, 36, 44, 93,  2,  2,  2, 36, 36, 36, 44, 27, 27, 27, 27,
+   36, 61, 44, 44, 27, 27, 27, 27, 36, 44, 44, 44, 93,  2, 64, 44,
+   44, 44, 44, 44,179, 27, 27, 27, 11, 47, 44, 44, 44, 44, 44, 44,
+   16,110, 44, 44, 44, 27, 27, 27, 36, 36, 43, 43, 44, 44, 44, 44,
+   27, 27, 27, 27, 27, 27, 27,100, 36, 36, 36, 36, 36, 57,184, 44,
+   36, 44, 44, 44, 44, 44, 44, 44, 27, 27, 27, 95, 44, 44, 44, 44,
+  180, 27, 30,  2,  2, 44, 44, 44, 36, 43, 43,  2,  2, 44, 44, 44,
+   36, 36,183, 27, 27, 27, 44, 44, 87, 98, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 43, 43, 43, 43, 43, 43, 43, 60,  2,  2,  2, 44,
+   27, 27, 27,  7,  7,  7,  7,  7, 71, 70, 71, 44, 44, 44, 44, 57,
+   86, 87, 43, 85, 87, 60,185,  2,  2, 80, 44, 44, 44, 44, 79, 44,
+   43, 71, 36, 36, 36, 36, 36, 36, 36, 36, 36, 70, 43, 43, 87, 43,
+   43, 43, 80,  7,  7,  7,  7,  7,  2,  2, 94, 98, 44, 44, 44, 44,
+   36, 70,  2, 61, 44, 44, 44, 44, 36, 94, 86, 43, 43, 43, 43, 85,
+   98, 36, 63,  2, 59, 43, 60, 87,  7,  7,  7,  7,  7, 63, 63,  2,
+  179, 27, 27, 27, 27, 27, 27, 27, 27, 27,100, 44, 44, 44, 44, 44,
+   36, 36, 36, 36, 36, 36, 86, 87, 43, 86, 85, 43,  2,  2,  2, 80,
+   36, 36, 36, 61, 61, 36, 36, 62, 36, 36, 36, 36, 36, 36, 36, 62,
+   36, 36, 36, 36, 63, 44, 44, 44, 36, 36, 36, 36, 36, 36, 36, 70,
+   86, 87, 43, 43, 43, 80, 44, 44, 43, 86, 62, 36, 36, 36, 61, 62,
+   61, 36, 62, 36, 36, 57, 71, 86, 85, 86, 90, 89, 90, 89, 86, 44,
+   61, 44, 44, 89, 44, 44, 62, 36, 36, 86, 44, 43, 43, 43, 80, 44,
+   43, 43, 80, 44, 44, 44, 44, 44, 36, 36, 94, 86, 43, 43, 43, 43,
+   86, 43, 85, 71, 36, 63,  2,  2,  7,  7,  7,  7,  7,  2, 93, 71,
+   86, 87, 43, 43, 85, 85, 86, 87, 85, 43, 36, 72, 44, 44, 44, 44,
+   36, 36, 36, 36, 36, 36, 36, 94, 86, 43, 43, 44, 86, 86, 43, 87,
+   60,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 36, 36, 43, 44,
+   86, 87, 43, 43, 43, 85, 87, 87, 60,  2, 61, 44, 44, 44, 44, 44,
+    2,  2,  2,  2,  2,  2, 64, 44, 36, 36, 36, 36, 36, 70, 87, 86,
+   43, 43, 43, 87, 63, 44, 44, 44, 86, 43, 43, 87, 43, 43, 44, 44,
+    7,  7,  7,  7,  7, 27,  2, 97, 43, 43, 43, 43, 87, 60, 44, 44,
+   27,100, 44, 44, 44, 44, 44, 62, 36, 36, 36, 61, 62, 44, 36, 36,
+   36, 36, 62, 61, 36, 36, 36, 36, 86, 86, 86, 89, 90, 57, 85, 71,
+   98, 87,  2, 64, 44, 44, 44, 44, 36, 36, 36, 36, 44, 36, 36, 36,
+   94, 86, 43, 43, 44, 43, 86, 86, 71, 72, 90, 44, 44, 44, 44, 44,
+   70, 43, 43, 43, 43, 71, 36, 36, 36, 70, 43, 43, 85, 70, 43, 60,
+    2,  2,  2, 59, 44, 44, 44, 44, 70, 43, 43, 85, 87, 43, 36, 36,
+   36, 36, 36, 36, 36, 43, 43, 43, 43, 43, 43, 85, 43,  2, 72,  2,
+    2, 64, 44, 44, 44, 44, 44, 44, 43, 43, 43, 80, 43, 43, 43, 87,
+   63,  2,  2, 44, 44, 44, 44, 44,  2, 36, 36, 36, 36, 36, 36, 36,
+   44, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 89, 43, 43, 43,
+   85, 43, 87, 80, 44, 44, 44, 44, 36, 36, 36, 61, 36, 62, 36, 36,
+   70, 43, 43, 80, 44, 80, 43, 57, 43, 43, 43, 70, 44, 44, 44, 44,
+   36, 36, 36, 62, 61, 36, 36, 36, 36, 36, 36, 36, 36, 86, 86, 90,
+   43, 89, 87, 87, 61, 44, 44, 44, 36, 70, 85,107, 64, 44, 44, 44,
+   27, 27, 91, 67, 67, 67, 56, 20,168, 67, 67, 67, 67, 67, 67, 67,
+   67, 44, 44, 44, 44, 44, 44, 93,105,105,105,105,105,105,105,181,
+    2,  2, 64, 44, 44, 44, 44, 44, 63, 64, 44, 44, 44, 44, 44, 44,
+   65, 65, 65, 65,132, 44, 44, 44, 43, 43, 60, 44, 44, 44, 44, 44,
+   43, 43, 43, 60,  2,  2, 67, 67, 40, 40, 97, 44, 44, 44, 44, 44,
+    7,  7,  7,  7,  7,179, 27, 27, 27, 62, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 44, 44, 62, 36, 27, 27, 27, 30,  2, 64, 44, 44,
+   36, 36, 36, 36, 36, 61, 44, 57, 94, 86, 86, 86, 86, 86, 86, 86,
+   86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 44, 44, 44, 57,
+   43, 74, 40, 40, 40, 40, 40, 40, 40, 88, 80, 44, 44, 44, 44, 44,
+   86, 44, 44, 44, 44, 44, 44, 44, 40, 40, 52, 40, 40, 40, 52, 81,
+   36, 61, 44, 44, 44, 44, 44, 44, 44, 44, 36, 36, 44, 44, 44, 44,
+   36, 36, 36, 36, 36, 44, 50, 60, 65, 65, 44, 44, 44, 44, 44, 44,
+   43, 43, 43, 43, 43, 43, 43, 44, 43, 43, 43, 80, 44, 44, 44, 44,
+   67, 67, 67, 92, 55, 67, 67, 67, 67, 67,186, 87, 43, 67,186, 86,
+   86,187, 65, 65, 65, 84, 43, 43, 43, 76, 50, 43, 43, 43, 67, 67,
+   67, 67, 67, 67, 67, 43, 43, 67, 67, 43, 76, 44, 44, 44, 44, 44,
+   27, 27, 44, 44, 44, 44, 44, 44, 11, 11, 11, 11, 11, 16, 16, 16,
+   16, 16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 16,
+   16, 16,110, 16, 16, 16, 16, 16, 11, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 16, 47, 11, 44, 47, 48, 47, 48, 11, 47, 11,
+   11, 11, 11, 16, 16,150,150, 16, 16, 16,150, 16, 16, 16, 16, 16,
+   16, 16, 11, 48, 11, 47, 48, 11, 11, 11, 47, 11, 11, 11, 47, 16,
+   16, 16, 16, 16, 11, 48, 11, 47, 11, 11, 47, 47, 44, 11, 11, 11,
+   47, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 11, 11,
+   11, 11, 11, 16, 16, 16, 16, 16, 16, 16, 16, 44, 11, 11, 11, 11,
+   31, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 33, 16, 16,
+   16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 31, 16, 16,
+   16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 31, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16,
+   11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16, 32, 44,  7,
+    7,  7,  7,  7,  7,  7,  7,  7, 43, 43, 43, 76, 67, 50, 43, 43,
+   43, 43, 43, 43, 43, 43, 76, 67, 67, 67, 50, 67, 67, 67, 67, 67,
+   67, 67, 76, 21,  2,  2, 44, 44, 44, 44, 44, 44, 44, 57, 43, 43,
+   16, 16, 16, 16, 16, 39, 16, 16, 16, 16, 16, 16, 16, 16, 16,110,
+   43, 43, 43, 80, 43, 43, 43, 43, 43, 43, 43, 43, 80, 57, 43, 43,
+   43, 57, 80, 43, 43, 80, 44, 44, 43, 43, 43, 74, 40, 40, 40, 44,
+    7,  7,  7,  7,  7, 44, 44, 77, 36, 36, 36, 36, 36, 36, 36, 80,
+   36, 36, 36, 36, 36, 36, 43, 43,  7,  7,  7,  7,  7, 44, 44, 96,
+   36, 36, 36, 61, 36, 36, 62, 61, 36, 36, 61,179, 27, 27, 27, 27,
+   16, 16, 43, 43, 43, 74, 44, 44, 27, 27, 27, 27, 27, 27,163, 27,
+  188, 27,100, 44, 44, 44, 44, 44, 27, 27, 27, 27, 27, 27, 27,163,
+   27, 27, 27, 27, 27, 27, 27, 44, 36, 36, 62, 36, 36, 36, 36, 36,
+   62, 61, 61, 62, 62, 36, 36, 36, 36, 61, 36, 36, 62, 62, 44, 44,
+   44, 61, 44, 62, 62, 62, 62, 36, 62, 61, 61, 62, 62, 62, 62, 62,
+   62, 61, 61, 62, 36, 61, 36, 36, 36, 61, 36, 36, 62, 36, 61, 61,
+   36, 36, 36, 36, 36, 62, 36, 36, 62, 36, 62, 36, 36, 62, 36, 36,
+    8, 44, 44, 44, 44, 44, 44, 44, 55, 67, 67, 67, 67, 67, 67, 67,
+   27, 27, 27, 27, 27, 27, 91, 67, 67, 67, 67, 67, 67, 67, 67, 44,
+   44, 44, 44, 67, 67, 67, 67, 67, 67, 92, 44, 44, 44, 44, 44, 44,
+   67, 67, 67, 67, 92, 44, 44, 44, 67, 44, 44, 44, 44, 44, 44, 44,
+   67, 67, 67, 67, 67, 25, 41, 41, 67, 67, 67, 67, 44, 44, 55, 67,
+   67, 67, 67, 67, 44, 44, 44, 44, 67, 67, 92, 44, 67, 67, 92, 44,
+   67, 92, 67, 67, 67, 67, 67, 67, 79, 44, 44, 44, 44, 44, 44, 44,
+   65, 65, 65, 65, 65, 65, 65, 65,171,171,171,171,171,171,171, 44,
+  171,171,171,171,171,171,171,  0,  0,  0, 29, 21, 21, 21, 23, 21,
+   22, 18, 21, 25, 21, 17, 13, 13, 25, 25, 25, 21, 21,  9,  9,  9,
+    9, 22, 21, 18, 24, 16, 24,  5,  5,  5,  5, 22, 25, 18, 25,  0,
+   23, 23, 26, 21, 24, 26,  7, 20, 25,  1, 26, 24, 26, 25, 15, 15,
+   24, 15,  7, 19, 15, 21,  9, 25,  9,  5,  5, 25,  5,  9,  5,  7,
+    7,  7,  9,  8,  8,  5,  7,  5,  6,  6, 24, 24,  6, 24, 12, 12,
+    2,  2,  6,  5,  9, 21,  9,  2,  2,  9, 25,  9, 26, 12, 11, 11,
+    2,  6,  5, 21, 17,  2,  2, 26, 26, 23,  2, 12, 17, 12, 21, 12,
+   12, 21,  7,  2,  2,  7,  7, 21, 21,  2,  1,  1, 21, 23, 26, 26,
+    1, 21,  6,  7,  7, 12, 12,  7, 21,  7, 12,  1, 12,  6,  6, 12,
+   12, 26,  7, 26, 26,  7,  2,  1, 12,  2,  6,  2, 24,  7,  7,  6,
+    1, 12, 12, 10, 10, 10, 10, 12, 21,  6,  2, 10, 10,  2, 15, 26,
+   26,  2,  2, 21,  7, 10, 15,  7,  2, 23, 21, 26, 10,  7, 21, 15,
+   15,  2, 17,  7, 29,  7,  7, 22, 18,  2, 14, 14, 14,  7, 10, 21,
+   17, 21, 11, 12,  5,  2,  5,  6,  8,  8,  8, 24,  5, 24,  2, 24,
+    9, 24, 24,  2, 29, 29, 29,  1, 17, 17, 20, 19, 22, 20, 27, 28,
+    1, 29, 21, 20, 19, 21, 21, 16, 16, 21, 25, 22, 18, 21, 21, 29,
+    1,  2, 15,  6, 18,  6, 23,  2, 12, 11,  9, 26, 26,  9, 26,  5,
+    5, 26, 14,  9,  5, 14, 14, 15, 25, 26, 26, 22, 18, 26, 18, 25,
+   18, 22,  5, 12,  2,  5, 22, 21, 21, 22, 18, 17, 26,  6,  7, 14,
+   17, 22, 18, 18, 26, 14, 17,  6, 14,  6, 12, 24, 24,  6, 26, 15,
+    6, 21, 11, 21, 24,  9,  6,  9, 23, 26,  6, 10,  4,  4,  3,  3,
+    7, 25, 17, 16, 16, 22, 16, 16, 25, 17, 25,  2, 25, 24,  2, 15,
+   12, 15, 14,  2, 21, 14,  7, 15, 12, 17, 21,  1, 26, 10, 10,  1,
+   23, 15,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  0, 10, 11, 12,
+   13,  0, 14,  0,  0,  0,  0,  0, 15,  0, 16,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0, 17, 18, 19,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,
+    0, 21, 22, 23,  0,  0,  0, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+   33,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0, 34,  0, 35,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   36,  0,  0,  0,  0,  0,  0,  0,  0,  0, 37, 38,  0,  0,  0,  0,
+    0,  0, 39, 40,  0,  0, 41,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  1,  2,  0,  0,  0,  0,  3,  0,  0,  0,  4,  5,
+    6,  7,  0,  8,  9, 10,  0, 11, 12, 13, 14, 15, 16, 17, 16, 18,
+   16, 19, 16, 19, 16, 19,  0, 19, 16, 20, 16, 19, 21, 19,  0, 22,
+   23, 24, 25, 26, 27, 28, 29, 30, 31,  0, 32,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 34,  0,  0, 35,
+    0,  0, 36,  0, 37,  0,  0,  0, 38, 39, 40, 41, 42, 43, 44, 45,
+   46,  0,  0, 47,  0,  0,  0, 48,  0,  0,  0, 49,  0,  0,  0,  0,
+    0,  0,  0, 50,  0, 51,  0, 52, 53,  0, 54,  0,  0,  0,  0,  0,
+    0, 55, 56, 57,  0,  0,  0,  0, 58,  0,  0, 59, 60, 61, 62, 63,
+    0,  0, 64, 65,  0,  0,  0, 66,  0,  0,  0,  0, 67,  0,  0,  0,
+   68,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 69,
+    0,  0,  0, 70,  0, 71,  0,  0, 72,  0,  0, 73,  0,  0,  0,  0,
+    0,  0,  0,  0, 74,  0,  0,  0,  0,  0, 75,  0,  0, 76, 77,  0,
+    0, 78, 79,  0, 80, 62,  0, 81, 82,  0,  0, 83, 84, 85,  0,  0,
+    0, 86,  0, 87,  0,  0, 51, 88, 51,  0, 89,  0, 90,  0,  0,  0,
+   79,  0,  0,  0, 91, 92,  0, 93, 94, 95, 96,  0,  0,  0,  0,  0,
+   51,  0,  0,  0,  0, 97, 98,  0,  0,  0,  0, 99,100,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,101,  0,  0,102,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,103,104,  0,  0,105,  0,  0,  0,  0,  0,  0,
+  106,  0,  0,  0,100,  0,  0,  0,  0,  0,107,108,  0,  0,  0,  0,
+    0,  0,  0,109,  0,110,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,
+    5,  6,  7,  0,  8,  0,  0,  0,  0,  9, 10, 11, 12,  0,  0,  0,
+    0, 13,  0,  0, 14, 15,  0, 16,  0, 17, 18,  0,  0, 19,  0, 20,
+   21,  0,  0,  0,  0,  0, 22, 23,  0, 24, 25,  0,  0, 26,  0,  0,
+    0, 27,  0,  0, 28, 29, 30, 31,  0,  0,  0, 32, 33, 34,  0,  0,
+   33,  0,  0, 35, 33,  0,  0,  0, 33, 36,  0,  0,  0,  0,  0, 37,
+   38,  0,  0,  0,  0,  0,  0, 39, 40,  0,  0,  0,  0,  0,  0, 41,
+   42,  0,  0,  0,  0, 43,  0, 44,  0,  0,  0, 45, 46,  0,  0,  0,
+   47,  0,  0,  0,  0,  0,  0, 48, 49,  0,  0,  0,  0, 50,  0,  0,
+    0, 51,  0, 52,  0, 53,  0,  0,  0,  0, 54,  0,  0,  0,  0, 55,
+    0, 56,  0,  0,  0,  0, 57, 58,  0,  0,  0, 59, 60,  0,  0,  0,
+    0,  0,  0, 61, 52,  0, 62, 63,  0,  0, 64,  0,  0,  0, 65, 66,
+    0,  0,  0, 67,  0, 68, 69, 70, 71, 72,  1, 73,  0, 74, 75, 76,
+    0,  0, 77, 78,  0,  0,  0, 79,  0,  0,  1,  1,  0,  0, 80,  0,
+    0, 81,  0,  0,  0,  0, 77, 82,  0, 83,  0,  0,  0,  0,  0, 78,
+   84,  0, 85,  0, 52,  0,  1, 78,  0,  0, 86,  0,  0, 87,  0,  0,
+    0,  0,  0, 88, 57,  0,  0,  0,  0,  0,  0, 89, 90,  0,  0, 84,
+    0,  0, 33,  0,  0, 91,  0,  0,  0,  0, 92,  0,  0,  0,  0, 49,
+    0,  0, 93,  0,  0,  0,  0, 94, 95,  0,  0, 96,  0,  0, 97,  0,
+    0,  0, 98,  0,  0,  0, 99,  0,100, 93,  0,  0,101,  0,  0,  0,
+   84,  0,  0,102,  0,  0,  0,103,104,  0,  0,105,106,  0,  0,  0,
+    0,  0,  0,107,  0,  0,108,  0,  0,  0,  0,109, 33,  0,110,111,
+  112, 35,  0,  0,113,  0,  0,  0,114,  0,  0,  0,  0,  0,  0,115,
+    0,  0,116,  0,  0,  0,  0,117, 88,  0,  0,  0,  0,  0, 57,  0,
+    0,  0,  0, 52,118,  0,  0,  0,  0,119,  0,  0,120,  0,  0,  0,
+    0,118,  0,  0,  0,  0,  0,121,  0,  0,  0,122,  0,  0,  0,123,
+    0,124,  0,  0,  0,  0,125,126,127,  0,128,  0,129,  0,  0,  0,
+  130,131,132,  0,  0,  0, 35,  0,  0,  0,133,  0,  0,134,  0,  0,
+  135,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  2,  3,  4,
+    5,  6,  7,  4,  4,  8,  9, 10,  1, 11, 12, 13, 14, 15, 16, 17,
+   18,  1,  1,  1, 19,  1,  0,  0, 20, 21, 22,  1, 23,  4, 21, 24,
+   25, 26, 27, 28, 29, 30,  0,  0,  1,  1, 31,  0,  0,  0, 32, 33,
+   34, 35,  1, 36, 37,  0,  0,  0,  0, 38,  1, 39, 14, 39, 40, 41,
+   42,  0,  0,  0, 43, 36, 44, 45, 21, 45, 46,  0,  0,  0, 19,  1,
+   21,  0,  0, 47,  0, 38, 48,  1,  1, 49, 49, 50,  0,  0, 51,  0,
+    0,  0, 52,  1,  0,  0, 38, 14,  4,  1,  1,  1, 53, 21, 43, 52,
+   54, 21, 35,  1,  0,  0,  0, 55,  0,  0,  0, 56, 57, 58,  0,  0,
+    0,  0,  0, 59,  0, 60,  0,  0,  0,  0, 61, 62,  0,  0, 63,  0,
+    0,  0, 64,  0,  0,  0, 65,  0,  0,  0, 66,  0,  0,  0, 67,  0,
+    0,  0, 68,  0,  0, 69, 70,  0, 71, 72, 73, 74, 75, 76,  0,  0,
+    0, 77,  0,  0,  0, 78, 79,  0,  0,  0,  0, 47,  0,  0,  0, 49,
+    0, 80,  0,  0,  0, 62,  0,  0, 63,  0,  0, 81,  0,  0, 82,  0,
+    0,  0, 83,  0,  0, 19, 84,  0, 62,  0,  0,  0,  0, 49,  1, 85,
+    1, 52, 15, 86, 36, 10, 21, 87,  0, 55,  0,  0,  0,  0, 19, 10,
+    1,  0,  0,  0,  0,  0, 88,  0,  0, 89,  0,  0, 88,  0,  0,  0,
+    0, 78,  0,  0, 87,  9, 12,  4, 90,  8, 91, 47,  0, 58, 50,  0,
+   21,  1, 21, 92, 93,  1,  1,  1,  1, 94, 95, 96, 97,  1, 98, 58,
+   81, 99,100,  4, 58,  0,  0,  0,  0,  0,  0, 19, 50,  0,  0,  0,
+    0,  0,  0, 61,  0,  0,101,102,  0,  0,103,  0,  0,  1,  1, 50,
+    0,  0,  0, 38,  0, 63,  0,  0,  0,  0,  0, 62,  0,  0,104, 68,
+   61,  0,  0,  0, 78,  0,  0,  0,105,106, 58, 38, 81,  0,  0,  0,
+    0,  0,  0,107,  1, 14,  4, 12, 84,  0,  0,  0,  0, 38, 87,  0,
+    0,  0,  0,108,  0,  0,109, 61,  0,110,  0,  0,  0,  1,  0,  0,
+    0,  0, 19, 58,  0,111, 14, 52,112, 41,  0,  0, 62,  0,  0, 61,
+    0,  0,113,  0, 87,  0,  0,  0, 61, 62,  0,  0, 62,  0, 89,  0,
+    0,113,  0,  0,  0,  0,114,  0,  0,  0, 78, 55,  0, 38,  1, 58,
+    1, 58,  0,  0, 63, 89,  0,  0,115,  0,  0,  0, 55,  0,  0,  0,
+    0,115,  0,  0,  0,  0, 61,  0,  0,  0,  0, 79,  0, 61,  0,  0,
+    0,  0, 56,  0, 89, 80,  0,  0,  8, 91,  0,  0,  1, 87,  0,  0,
+  116,  0,  0,  0,  0,  0,  0,117,  0,118,119,120,121,  0,104,  4,
+  122, 49, 23,  0,  0,  0, 38, 50, 38, 58,  0,  0,  1, 87,  1,  1,
+    1,  1, 39,  1, 48,105, 87,  0,  0,  0,  0,  1,  4,122,  0,  0,
+    0,  1,123,  0,  0,  0,  0,  0,230,230,230,230,230,232,220,220,
+  220,220,232,216,220,220,220,220,220,202,202,220,220,220,220,202,
+  202,220,220,220,  1,  1,  1,  1,  1,220,220,220,220,230,230,230,
+  230,240,230,220,220,220,230,230,230,220,220,  0,230,230,230,220,
+  220,220,220,230,232,220,220,230,233,234,234,233,234,234,233,230,
+    0,  0,  0,230,  0,220,230,230,230,230,220,230,230,230,222,220,
+  230,230,220,220,230,222,228,230, 10, 11, 12, 13, 14, 15, 16, 17,
+   18, 19, 19, 20, 21, 22,  0, 23,  0, 24, 25,  0,230,220,  0, 18,
+   30, 31, 32,  0,  0,  0,  0, 27, 28, 29, 30, 31, 32, 33, 34,230,
+  230,220,220,230,220,230,230,220, 35,  0,  0,  0,  0,  0,230,230,
+  230,  0,  0,230,230,  0,220,230,230,220,  0,  0,  0, 36,  0,  0,
+  230,220,230,230,220,220,230,220,220,230,220,230,220,230,230,  0,
+    0,220,  0,  0,230,230,  0,230,  0,230,230,230,230,230,  0,  0,
+    0,220,220,220,230,220,220,220,230,230,  0,220, 27, 28, 29,230,
+    7,  0,  0,  0,  0,  9,  0,  0,  0,230,220,230,230,  0,  0,  0,
+    0,  0,230,  0,  0, 84, 91,  0,  0,  0,  0,  9,  9,  0,  0,  0,
+    0,  0,  9,  0,103,103,  9,  0,107,107,107,107,118,118,  9,  0,
+  122,122,122,122,220,220,  0,  0,  0,220,  0,220,  0,216,  0,  0,
+    0,129,130,  0,132,  0,  0,  0,  0,  0,130,130,130,130,  0,  0,
+  130,  0,230,230,  9,  0,230,230,  0,  0,220,  0,  0,  0,  0,  7,
+    0,  9,  9,  0,  9,  9,  0,  0,  0,230,  0,  0,  0,228,  0,  0,
+    0,222,230,220,220,  0,  0,  0,230,  0,  0,220,230,220,  0,220,
+  230,230,230,  0,  0,  0,  9,  9,  0,  0,  7,  0,230,  0,  1,  1,
+    1,  0,  0,  0,230,234,214,220,202,230,230,230,230,230,232,228,
+  228,220,218,230,233,220,230,220,230,230,  1,  1,  1,  1,  1,230,
+    0,  1,  1,230,220,230,  1,  1,  0,  0,218,228,232,222,224,224,
+    0,  8,  8,  0,  0,  0,  0,220,230,  0,230,230,220,  0,  0,230,
+    0,  0, 26,  0,  0,220,  0,230,230,  1,220,  0,  0,230,220,  0,
+    0,  0,220,220,  0,  0,230,220,  0,  9,  7,  0,  0,  7,  9,  0,
+    0,  0,  9,  7,  6,  6,  0,  0,  0,  0,  1,  0,  0,216,216,  1,
+    1,  1,  0,  0,  0,226,216,216,216,216,216,  0,220,220,220,  0,
+  230,230,  7,  0, 16, 17, 17, 17, 17, 17, 17, 33, 17, 17, 17, 19,
+   17, 17, 17, 17, 20,101, 17,113,129,169, 17, 27, 28, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17,237,  0,  1,  2,  2,  0,  3,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    5,  0,  0,  0,  0,  6,  7,  8,  9,  0,  0,  0, 10, 11, 12, 13,
+   14, 15, 16, 17, 18, 19,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,
+    0,  0, 21, 22,  0,  0,  0,  0, 23, 24, 25, 26,  0, 27,  0, 28,
+   29, 30, 31, 32,  0,  0,  0,  0,  0,  0,  0, 33, 34, 35, 36,  0,
+    0,  0,  0,  0, 37,  0,  0,  0,  0,  0,  0,  0,  0,  0, 38, 39,
+    0,  0,  0,  0,  1,  2, 40, 41,  0,  1,  2,  2,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  2,  0,  0,  0,  0,
+    0,  0,  3,  4,  0,  0,  5,  0,  0,  0,  6,  0,  0,  0,  0,  0,
+    0,  0,  7,  1,  0,  0,  0,  0,  0,  0,  8,  9,  0,  0,  0,  0,
+    0,  0, 10,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0, 10,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0, 11, 12,
+    0, 13,  0, 14, 15, 16,  0,  0,  0,  0,  0,  1, 17, 18,  0, 19,
+    7,  1,  0,  0,  0, 20, 20,  7, 20, 20, 20, 20, 20, 20, 20,  8,
+   21,  0, 22,  0,  7, 23, 24,  0, 20, 20, 25,  0,  0,  0, 26, 27,
+    1,  7, 20, 20, 20, 20, 20,  1, 28, 29, 30, 31,  0,  0, 20,  0,
+    0,  0,  0,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0, 20, 20,
+   20,  1,  0,  0,  8, 21, 32,  4,  0, 10,  0, 33,  7, 20, 20, 20,
+    0,  0,  0,  0,  8, 34, 34, 35, 36, 34, 37,  0, 38,  1, 20, 20,
+    0,  0, 39,  0,  1,  1,  0,  8, 21,  1, 20,  0,  0,  0,  1,  0,
+    0, 40,  1,  1,  0,  0,  8, 21,  0,  1,  0,  1,  0,  1,  0,  0,
+    0,  0, 26, 34, 34, 34, 34, 34, 34, 34, 34, 34, 21,  7, 20, 41,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 21,  0, 42, 43, 44,  0, 45,
+    0,  8, 21,  0,  0,  0,  0,  0,  0,  0,  0, 46,  7,  1, 10,  1,
+    0,  0,  0,  1, 20, 20,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0, 26, 34,  9,  0,  0, 20, 20,  1, 20, 20,  0,  0,  0,  0,  0,
+    0,  0, 26, 21,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  3, 47, 48,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,
+    4,  5,  6,  7,  7,  8,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+    9, 10, 11, 11, 11, 11, 12, 13, 13, 13, 13, 14, 15, 16, 17, 18,
+   19, 20, 21, 13, 22, 13, 13, 13, 13, 23, 24, 24, 25, 26, 13, 13,
+   13, 27, 28, 29, 13, 30, 31, 32, 33, 34, 35, 36,  7,  7,  7,  7,
+    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+   37,  7, 38, 39,  7, 40,  7,  7,  7, 41, 13, 42,  7,  7, 43, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 44,  0,  0,  1,
+    2,  2,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+   32, 32, 33, 34, 35, 36, 37, 37, 37, 37, 37, 38, 39, 40, 41, 42,
+   43, 44, 45, 46, 47, 48, 49, 50, 51, 52,  2,  2, 53, 54, 55, 56,
+   57, 58, 59, 59, 59, 59, 60, 59, 59, 59, 59, 59, 59, 59, 61, 61,
+   59, 59, 59, 59, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
+   74, 75, 76, 77, 78, 59, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
+   70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
+   70, 70, 70, 70, 70, 70, 70, 70, 70, 79, 70, 70, 70, 70, 80, 80,
+   80, 80, 80, 80, 80, 80, 80, 81, 82, 82, 83, 84, 85, 86, 87, 88,
+   89, 90, 91, 92, 93, 94, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 95, 96, 96,
+   96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+   70, 70, 97, 98, 99,100,101,101,102,103,104,105,106,107,108,109,
+  110,111, 96,112,113,114,115,116,117,118,119,119,120,121,122,123,
+  124,125,126,127,128,129,130,131,132, 96,133,134,135,136,137,138,
+  139,140,141,142,143, 96,144,145, 96,146,147,148,149, 96,150,151,
+  152,153,154,155, 96, 96,156,157,158,159, 96,160, 96,161,162,162,
+  162,162,162,162,162,163,164,162,165, 96, 96, 96, 96, 96, 96, 96,
+   96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,166,167,167,
+  167,167,167,167,167,167,168, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+   96, 96, 96, 96, 96, 96,169,169,169,169,170, 96, 96, 96,171,171,
+  171,171,172,173,174,175, 96, 96, 96, 96,176,177,178,179,180,180,
+  180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,
+  180,180,180,180,180,180,180,180,180,180,180,180,180,181,180,180,
+  180,180,180,180,182,182,182,183,184, 96, 96, 96, 96, 96, 96, 96,
+   96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,185,186,187,
+  188,189,189,190, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+   96, 96, 96, 96, 96, 96,191,192, 96, 96, 96, 96, 96, 96, 96, 96,
+   96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,193,194, 59,195,
+  196,197,198,199,200, 96,201,202,203, 59, 59,204, 59,205,206,206,
+  206,206,206,207, 96, 96, 96, 96, 96, 96, 96, 96,208, 96,209, 96,
+  210, 96, 96,211, 96, 96, 96, 96, 96, 96, 96, 96, 96,212,213,214,
+  215, 96, 96, 96, 96, 96,216,217,218, 96,219,220, 96, 96,221,222,
+   59,223,224, 96, 59, 59, 59, 59, 59, 59, 59,225,226,227,228,229,
+   59, 59,230,231, 59,232, 96, 96, 96, 96, 96, 96, 96, 96, 70, 70,
+   70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,233, 70, 70, 70, 70,
+   70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,234, 70,235, 70,
+   70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
+   70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,236, 70, 70, 70, 70,
+   70, 70, 70, 70, 70,237, 96, 96, 96, 96, 96, 96, 96, 96, 70, 70,
+   70, 70,238, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 70, 70,
+   70, 70, 70, 70,239, 96, 96, 96, 96, 96, 96, 96, 96, 96,240, 96,
+  241,242,  0,  1,  2,  2,  0,  1,  2,  2,  2,  3,  4,  5,  0,  0,
+    0,  0,  0,  0,  0,  0,  0, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+   19, 19, 19, 19, 19, 19, 19, 19, 19,  0,  0,  0,  0,  0,  0,  0,
+   19,  0,  0,  0,  0,  0, 19, 19, 19, 19, 19, 19, 19,  0, 19,  0,
+    0,  0,  0,  0,  0,  0, 19, 19, 19, 19, 19,  0,  0,  0,  0,  0,
+   26, 26,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,  1,  1,  9,  9,
+    9,  9,  0,  9,  9,  9,  2,  2,  9,  9,  9,  9,  0,  9,  2,  2,
+    2,  2,  9,  0,  9,  0,  9,  9,  9,  2,  9,  2,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  2,  9,  9,  9,  9,  9,  9,  9,
+   55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,  6,  6,
+    6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  1,  1,  6,  2,  4,
+    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
+    4,  4,  4,  4,  4,  2,  4,  4,  4,  2,  2,  4,  4,  4,  2, 14,
+   14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,  2,  2,
+    2,  2,  2,  2,  2,  2, 14, 14, 14,  2,  2,  2,  2, 14, 14, 14,
+   14, 14, 14,  2,  2,  2,  3,  3,  3,  3,  3,  0,  3,  3,  3,  3,
+    3,  3,  0,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
+    3,  0,  3,  3,  3,  0,  0,  3,  3,  3,  3,  3,  3,  3,  3,  3,
+    3,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  3,  3,  1,  3,
+    3,  3,  3,  3,  3,  3, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
+   37, 37, 37, 37,  2, 37, 37, 37, 37,  2,  2, 37, 37, 37, 38, 38,
+   38, 38, 38, 38, 38, 38, 38, 38,  2,  2,  2,  2,  2,  2, 64, 64,
+   64, 64, 64, 64, 64, 64, 64, 64, 64,  2,  2, 64, 64, 64, 90, 90,
+   90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,  2,  2, 90, 90,
+   90, 90, 90, 90, 90,  2, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+   95, 95,  2,  2, 95,  2, 37, 37, 37,  2,  2,  2,  2,  2,  3,  3,
+    3,  3,  3,  3,  3,  2,  3,  3,  2,  2,  2,  2,  2,  2,  3,  3,
+    0,  3,  3,  3,  3,  3,  7,  7,  7,  7,  7,  7,  7,  7,  7,  1,
+    1,  1,  1,  7,  7,  7,  7,  7,  7,  7,  0,  0,  7,  7,  5,  5,
+    5,  5,  2,  5,  5,  5,  5,  5,  5,  5,  5,  2,  2,  5,  5,  2,
+    2,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  2,
+    5,  5,  5,  5,  5,  5,  5,  2,  5,  2,  2,  2,  5,  5,  5,  5,
+    2,  2,  5,  5,  5,  5,  5,  2,  2,  5,  5,  5,  5,  2,  2,  2,
+    2,  2,  2,  2,  2,  5,  2,  2,  2,  2,  5,  5,  2,  5,  5,  5,
+    5,  5,  2,  2,  5,  5,  5,  5,  5,  5,  5,  5,  5,  2,  2, 11,
+   11, 11,  2, 11, 11, 11, 11, 11, 11,  2,  2,  2,  2, 11, 11,  2,
+    2, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,  2,
+   11, 11, 11, 11, 11, 11, 11,  2, 11, 11,  2, 11, 11,  2, 11, 11,
+    2,  2, 11,  2, 11, 11, 11,  2,  2, 11, 11, 11,  2,  2,  2, 11,
+    2,  2,  2,  2,  2,  2,  2, 11, 11, 11, 11,  2, 11,  2,  2,  2,
+    2,  2,  2,  2, 11, 11, 11, 11, 11, 11, 11, 11, 11,  2,  2, 10,
+   10, 10,  2, 10, 10, 10, 10, 10, 10, 10, 10, 10,  2, 10, 10, 10,
+    2, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  2,
+   10, 10, 10, 10, 10, 10, 10,  2, 10, 10,  2, 10, 10, 10, 10, 10,
+    2,  2, 10, 10, 10, 10, 10, 10,  2, 10, 10, 10,  2,  2, 10,  2,
+    2,  2,  2,  2,  2,  2, 10, 10, 10, 10,  2,  2, 10, 10, 10, 10,
+    2,  2,  2,  2,  2,  2,  2, 10, 10, 10, 10, 10, 10, 10,  2, 21,
+   21, 21,  2, 21, 21, 21, 21, 21, 21, 21, 21,  2,  2, 21, 21,  2,
+    2, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,  2,
+   21, 21, 21, 21, 21, 21, 21,  2, 21, 21,  2, 21, 21, 21, 21, 21,
+    2,  2, 21, 21, 21, 21, 21,  2,  2, 21, 21, 21,  2,  2,  2,  2,
+    2,  2,  2, 21, 21, 21,  2,  2,  2,  2, 21, 21,  2, 21, 21, 21,
+   21, 21,  2,  2, 21, 21,  2,  2, 22, 22,  2, 22, 22, 22, 22, 22,
+   22,  2,  2,  2, 22, 22, 22,  2, 22, 22, 22, 22,  2,  2,  2, 22,
+   22,  2, 22,  2, 22, 22,  2,  2,  2, 22, 22,  2,  2,  2, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22,  2,  2,  2,  2, 22, 22, 22,  2,
+    2,  2,  2,  2,  2, 22,  2,  2,  2,  2,  2,  2, 22, 22, 22, 22,
+   22,  2,  2,  2,  2,  2, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+   23, 23, 23,  2, 23, 23, 23,  2, 23, 23, 23, 23, 23, 23, 23, 23,
+    2,  2, 23, 23, 23, 23, 23,  2, 23, 23, 23, 23,  2,  2,  2,  2,
+    2,  2,  2, 23, 23,  2, 23, 23, 23,  2,  2, 23,  2,  2, 23, 23,
+   23, 23,  2,  2, 23, 23,  2,  2,  2,  2,  2,  2,  2, 23, 16, 16,
+   16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,  2, 16, 16, 16,  2,
+   16, 16, 16, 16, 16, 16, 16, 16, 16, 16,  2, 16, 16, 16, 16, 16,
+    2,  2, 16, 16, 16, 16, 16,  2, 16, 16, 16, 16,  2,  2,  2,  2,
+    2,  2,  2, 16, 16,  2, 16, 16, 16, 16,  2,  2, 16, 16,  2, 16,
+   16,  2,  2,  2,  2,  2, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20,  2, 20, 20, 20,  2, 20, 20, 20, 20, 20, 20,  2,  2,
+    2,  2, 20, 20, 20, 20, 20, 20, 20, 20,  2,  2, 20, 20,  2, 36,
+   36, 36,  2, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36,  2,  2,  2, 36, 36, 36, 36, 36, 36, 36, 36,
+    2, 36, 36, 36, 36, 36, 36, 36, 36, 36,  2, 36,  2,  2,  2,  2,
+   36,  2,  2,  2,  2, 36, 36, 36, 36, 36, 36,  2, 36,  2,  2,  2,
+    2,  2,  2,  2, 36, 36,  2,  2, 36, 36, 36,  2,  2,  2,  2, 24,
+   24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+   24,  2,  2,  2,  2,  0, 24, 24, 24, 24,  2,  2,  2,  2,  2, 18,
+   18,  2, 18,  2, 18, 18, 18, 18, 18,  2, 18, 18, 18, 18, 18, 18,
+   18, 18, 18, 18, 18, 18, 18, 18, 18, 18,  2, 18,  2, 18, 18, 18,
+   18, 18, 18, 18,  2,  2, 18, 18, 18, 18, 18,  2, 18,  2, 18, 18,
+    2,  2, 18, 18, 18, 18, 25, 25, 25, 25, 25, 25, 25, 25,  2, 25,
+   25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,  2,  2,  2, 25, 25,
+   25, 25, 25,  2, 25, 25, 25, 25, 25, 25, 25,  0,  0,  0,  0, 25,
+   25,  2,  2,  2,  2,  2, 33, 33, 33, 33, 33, 33, 33, 33,  8,  8,
+    8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  2,  8,  2,  2,
+    2,  2,  2,  8,  2,  2,  8,  8,  8,  0,  8,  8,  8,  8, 12, 12,
+   12, 12, 12, 12, 12, 12, 30, 30, 30, 30, 30, 30, 30, 30, 30,  2,
+   30, 30, 30, 30,  2,  2, 30, 30, 30, 30, 30, 30, 30,  2, 30, 30,
+   30,  2,  2, 30, 30, 30, 30, 30, 30, 30, 30,  2,  2,  2, 30, 30,
+    2,  2,  2,  2,  2,  2, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+   29, 29, 29, 29,  2,  2, 28, 28, 28, 28, 28, 28, 28, 28, 34, 34,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,  2,  2,  2, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35,  0,  0,  0, 35, 35, 35,  2,
+    2,  2,  2,  2,  2,  2, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+   45, 45, 45, 45,  2,  2,  2,  2,  2,  2,  2,  2,  2, 45, 44, 44,
+   44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,  0,  0,  2, 43, 43,
+   43, 43, 43, 43, 43, 43, 43, 43, 43, 43,  2,  2,  2,  2, 46, 46,
+   46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,  2, 46, 46, 46,  2,
+   46, 46,  2,  2,  2,  2, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+   31, 31, 31, 31,  2,  2, 31, 31,  2,  2,  2,  2,  2,  2, 32, 32,
+    0,  0, 32,  0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    2,  2,  2,  2,  2,  2, 32,  2,  2,  2,  2,  2,  2,  2, 32, 32,
+   32,  2,  2,  2,  2,  2, 28, 28, 28, 28, 28, 28,  2,  2, 48, 48,
+   48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,  2, 48, 48,
+   48, 48,  2,  2,  2,  2, 48,  2,  2,  2, 48, 48, 48, 48, 52, 52,
+   52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,  2,  2, 52, 52,
+   52, 52, 52,  2,  2,  2, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58,  2,  2,  2,  2, 58, 58,  2,  2,  2,  2,  2,  2, 58, 58,
+   58,  2,  2,  2, 58, 58, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+   54, 54,  2,  2, 54, 54, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+   91, 91, 91, 91, 91,  2, 91, 91, 91, 91, 91,  2,  2, 91, 91, 91,
+    2,  2,  2,  2,  2,  2, 91, 91, 91, 91, 91, 91,  2,  2,  1,  1,
+    1,  1,  1,  1,  1,  2, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
+   62, 62, 62,  2,  2,  2, 62, 62, 62, 62, 62, 62, 62,  2, 76, 76,
+   76, 76, 76, 76, 76, 76, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
+   93, 93,  2,  2,  2,  2,  2,  2,  2,  2, 93, 93, 93, 93, 70, 70,
+   70, 70, 70, 70, 70, 70,  2,  2,  2, 70, 70, 70, 70, 70, 70, 70,
+    2,  2,  2, 70, 70, 70, 73, 73, 73, 73, 73, 73, 73, 73,  6,  2,
+    2,  2,  2,  2,  2,  2,  8,  8,  8,  2,  2,  8,  8,  8,  1,  1,
+    1,  0,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  0,
+    0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  1,
+    0,  2,  2,  2,  2,  2, 19, 19, 19, 19, 19, 19,  9,  9,  9,  9,
+    9,  6, 19, 19, 19, 19, 19, 19, 19, 19, 19,  9,  9,  9,  9,  9,
+   19, 19, 19, 19,  9,  9,  9,  9,  9, 19, 19, 19, 19, 19,  6, 19,
+   19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  9,  9,  9,
+    9,  9,  9,  9,  2,  2,  2,  9,  2,  9,  2,  9,  2,  9,  9,  9,
+    9,  9,  9,  2,  9,  9,  9,  9,  9,  9,  2,  2,  9,  9,  9,  9,
+    9,  9,  2,  9,  9,  9,  2,  2,  9,  9,  9,  2,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  2,  0,  0,  0,  0,  1,  1,  0,  0,  0,  0,
+    0,  0,  0,  2,  0,  0,  0, 19,  2,  2,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0, 19,  0,  0,  0,  0,  0,  0,  0,  2, 19, 19,
+   19, 19, 19,  2,  2,  2,  0,  2,  2,  2,  2,  2,  2,  2,  1,  2,
+    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,
+   19, 19,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 19,  0, 19,  0,
+    0,  0,  2,  2,  2,  2,  0,  0,  0,  2,  2,  2,  2,  2, 27, 27,
+   27, 27, 27, 27, 27, 27,  0,  0,  0,  0,  2,  2,  0,  0,  0,  0,
+    0,  0,  0,  0,  2,  0, 56, 56, 56, 56, 56, 56, 56, 56, 55, 55,
+   55, 55,  2,  2,  2,  2,  2, 55, 55, 55, 55, 55, 55, 55, 61, 61,
+   61, 61, 61, 61, 61, 61,  2,  2,  2,  2,  2,  2,  2, 61, 61,  2,
+    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  2,  2, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13,  2, 13, 13, 13, 13, 13, 13, 13,
+   13, 13,  2,  2,  2,  2, 13, 13, 13, 13, 13, 13,  2,  2,  0,  0,
+    0,  0,  2,  2,  2,  2,  0,  0,  0,  0,  0, 13,  0, 13,  0, 13,
+   13, 13, 13, 13, 13, 13, 13, 13,  1,  1,  1,  1, 12, 12, 13, 13,
+   13, 13,  0,  0,  0,  0,  2, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  2,  2,  1,
+    1,  0,  0, 15, 15, 15,  0, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17,  0,  0, 17, 17, 17,  2,  2,
+    2,  2,  2, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,  2, 12,
+   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,  2, 12, 12,
+   12, 12, 12, 12, 12,  0, 17, 17, 17, 17, 17, 17, 17,  0, 39, 39,
+   39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,  2,  2,  2, 39, 39,
+   39, 39, 39, 39, 39,  2, 86, 86, 86, 86, 86, 86, 86, 86, 77, 77,
+   77, 77, 77, 77, 77, 77, 77, 77, 77, 77,  2,  2,  2,  2, 79, 79,
+   79, 79, 79, 79, 79, 79,  0,  0, 19, 19, 19, 19, 19, 19,  0,  0,
+    0, 19, 19, 19, 19, 19, 19, 19, 19,  2,  2,  2,  2,  2, 19, 19,
+    2, 19,  2, 19, 19, 19, 19, 19,  2,  2,  2,  2,  2,  2,  2,  2,
+   19, 19, 19, 19, 19, 19, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+   60, 60, 60,  2,  2,  2,  0,  0,  2,  2,  2,  2,  2,  2, 65, 65,
+   65, 65, 65, 65, 65, 65, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
+   75, 75, 75, 75,  2,  2,  2,  2,  2,  2,  2,  2, 75, 75, 75, 75,
+    2,  2,  2,  2,  2,  2, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 69, 69, 69,  0, 69, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
+   74, 74,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 74, 12, 12,
+   12, 12, 12,  2,  2,  2, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
+   84, 84, 84, 84,  2,  0, 84, 84,  2,  2,  2,  2, 84, 84, 33, 33,
+   33, 33, 33, 33, 33,  2, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+   68, 68, 68, 68, 68,  2, 68, 68, 68, 68, 68, 68,  2,  2, 68, 68,
+    2,  2, 68, 68, 68, 68, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
+   92,  2,  2,  2,  2,  2,  2,  2,  2, 92, 92, 92, 92, 92, 87, 87,
+   87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,  2,  2, 30,
+   30, 30, 30, 30, 30,  2, 19, 19, 19,  0, 19, 19, 19, 19, 19, 19,
+   19, 19, 19,  9, 19, 19, 19, 19,  0,  0,  2,  2,  2,  2, 87, 87,
+   87, 87, 87, 87,  2,  2, 87, 87,  2,  2,  2,  2,  2,  2, 12, 12,
+   12, 12,  2,  2,  2,  2,  2,  2,  2, 12, 12, 12, 12, 12, 13, 13,
+    2,  2,  2,  2,  2,  2, 19, 19, 19, 19, 19, 19, 19,  2,  2,  2,
+    2,  4,  4,  4,  4,  4,  2,  2,  2,  2,  2, 14, 14, 14, 14, 14,
+   14, 14, 14, 14, 14,  2, 14, 14, 14, 14, 14,  2, 14,  2, 14, 14,
+    2, 14, 14,  2, 14, 14,  3,  3,  3,  2,  2,  2,  2,  2,  2,  2,
+    2,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  0,  0,  2,  2,
+    3,  3,  3,  3,  3,  3,  2,  2,  2,  2,  2,  2,  2,  3,  1,  1,
+    1,  1,  1,  1,  6,  6,  0,  0,  0,  2,  0,  0,  0,  0,  3,  3,
+    3,  3,  3,  2,  3,  3,  3,  3,  3,  3,  3,  2,  2,  0,  2,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17, 17, 17, 17,
+   17, 17, 17, 17,  0,  0,  2,  2, 12, 12, 12, 12, 12, 12,  2,  2,
+   12, 12, 12,  2,  2,  2,  2,  0,  0,  0,  0,  0,  2,  2, 49, 49,
+   49, 49, 49, 49, 49, 49, 49, 49, 49, 49,  2, 49, 49, 49, 49, 49,
+   49, 49, 49, 49, 49,  2, 49, 49, 49,  2, 49, 49,  2, 49, 49, 49,
+   49, 49, 49, 49,  2,  2, 49, 49, 49,  2,  2,  2,  2,  2,  0,  0,
+    0,  2,  2,  2,  2,  0,  0,  0,  0,  0,  2,  2,  2,  0,  0,  0,
+    0,  0,  0,  2,  2,  2,  9,  2,  2,  2,  2,  2,  2,  2,  0,  0,
+    0,  0,  0,  1,  2,  2, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+   71, 71, 71,  2,  2,  2, 67, 67, 67, 67, 67, 67, 67, 67, 67,  2,
+    2,  2,  2,  2,  2,  2,  1,  0,  0,  0,  0,  0,  0,  0, 42, 42,
+   42, 42, 42, 42, 42, 42, 42, 42, 42, 42,  2,  2,  2,  2,  2,  2,
+    2,  2,  2, 42, 42, 42, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
+   41,  2,  2,  2,  2,  2,118,118,118,118,118,118,118,118,118,118,
+  118,  2,  2,  2,  2,  2, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
+   53, 53, 53, 53,  2, 53, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
+   59, 59,  2,  2,  2,  2, 59, 59, 59, 59, 59, 59,  2,  2, 40, 40,
+   40, 40, 40, 40, 40, 40, 51, 51, 51, 51, 51, 51, 51, 51, 50, 50,
+   50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,  2,  2, 50, 50,
+    2,  2,  2,  2,  2,  2,135,135,135,135,135,135,135,135,135,135,
+  135,135,  2,  2,  2,  2,106,106,106,106,106,106,106,106,104,104,
+  104,104,104,104,104,104,104,104,104,104,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2,104,161,161,161,161,161,161,161,161,161,161,
+  161,  2,161,161,161,161,161,161,161,  2,161,161,  2,161,161,161,
+    2,161,161,161,161,161,161,161,  2,161,161,  2,  2,  2,110,110,
+  110,110,110,110,110,110,110,110,110,110,110,110,110,  2,110,110,
+  110,110,110,110,  2,  2, 19, 19, 19, 19, 19, 19,  2, 19, 19,  2,
+   19, 19, 19, 19, 19, 19, 47, 47, 47, 47, 47, 47,  2,  2, 47,  2,
+   47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+   47, 47, 47, 47,  2, 47, 47,  2,  2,  2, 47,  2,  2, 47, 81, 81,
+   81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,  2, 81,120,120,
+  120,120,120,120,120,120,116,116,116,116,116,116,116,116,116,116,
+  116,116,116,116,116,  2,  2,  2,  2,  2,  2,  2,  2,116,128,128,
+  128,128,128,128,128,128,128,128,128,  2,128,128,  2,  2,  2,  2,
+    2,128,128,128,128,128, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+   66, 66,  2,  2,  2, 66, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
+    2,  2,  2,  2,  2, 72, 98, 98, 98, 98, 98, 98, 98, 98, 97, 97,
+   97, 97, 97, 97, 97, 97,  2,  2,  2,  2, 97, 97, 97, 97,  2,  2,
+   97, 97, 97, 97, 97, 97, 57, 57, 57, 57,  2, 57, 57,  2,  2,  2,
+    2,  2, 57, 57, 57, 57, 57, 57, 57, 57,  2, 57, 57, 57,  2, 57,
+   57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
+   57, 57, 57, 57,  2,  2, 57, 57, 57,  2,  2,  2,  2, 57, 57,  2,
+    2,  2,  2,  2,  2,  2, 88, 88, 88, 88, 88, 88, 88, 88,117,117,
+  117,117,117,117,117,117,112,112,112,112,112,112,112,112,112,112,
+  112,112,112,112,112,  2,  2,  2,  2,112,112,112,112,112, 78, 78,
+   78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78,  2,  2,  2, 78,
+   78, 78, 78, 78, 78, 78, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
+   83, 83, 83, 83,  2,  2, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+   82,  2,  2,  2,  2,  2,122,122,122,122,122,122,122,122,122,122,
+    2,  2,  2,  2,  2,  2,  2,122,122,122,122,  2,  2,  2,  2,122,
+  122,122,122,122,122,122, 89, 89, 89, 89, 89, 89, 89, 89, 89,  2,
+    2,  2,  2,  2,  2,  2,130,130,130,130,130,130,130,130,130,130,
+  130,  2,  2,  2,  2,  2,  2,  2,130,130,130,130,130,130,144,144,
+  144,144,144,144,144,144,144,144,  2,  2,  2,  2,  2,  2,156,156,
+  156,156,156,156,156,156,156,156,  2,156,156,156,  2,  2,156,156,
+    2,  2,  2,  2,  2,  2,147,147,147,147,147,147,147,147,148,148,
+  148,148,148,148,148,148,148,148,  2,  2,  2,  2,  2,  2,158,158,
+  158,158,158,158,158,158,158,158,  2,  2,  2,  2,  2,  2,153,153,
+  153,153,153,153,153,153,153,153,153,153,  2,  2,  2,  2,149,149,
+  149,149,149,149,149,149,149,149,149,149,149,149,149,  2, 94, 94,
+   94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,  2,  2,  2,  2,
+   94, 94, 94, 94, 94, 94,  2,  2,  2,  2,  2,  2,  2, 94, 85, 85,
+   85, 85, 85, 85, 85, 85, 85, 85, 85,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2, 85,  2,  2,101,101,101,101,101,101,101,101,101,  2,
+    2,  2,  2,  2,  2,  2,101,101,  2,  2,  2,  2,  2,  2, 96, 96,
+   96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,  2, 96, 96,111,111,
+  111,111,111,111,111,111,111,111,111,111,111,111,111,  2,100,100,
+  100,100,100,100,100,100,  2, 36, 36, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 36,  2,  2,  2,108,108,108,108,108,108,108,108,108,108,
+    2,108,108,108,108,108,108,108,108,108,108,108,108,  2,129,129,
+  129,129,129,129,129,  2,129,  2,129,129,129,129,  2,129,129,129,
+  129,129,129,129,129,129,129,129,129,129,129,129,  2,129,129,129,
+    2,  2,  2,  2,  2,  2,109,109,109,109,109,109,109,109,109,109,
+  109,  2,  2,  2,  2,  2,109,109,  2,  2,  2,  2,  2,  2,107,107,
+  107,107,  2,107,107,107,107,107,107,107,107,  2,  2,107,107,  2,
+    2,107,107,107,107,107,107,107,107,107,107,107,107,107,107,  2,
+  107,107,107,107,107,107,107,  2,107,107,  2,107,107,107,107,107,
+    2,  1,107,107,107,107,107,  2,  2,107,107,107,  2,  2,107,  2,
+    2,  2,  2,  2,  2,107,  2,  2,  2,  2,  2,107,107,107,107,107,
+  107,107,  2,  2,107,107,107,107,107,107,107,  2,  2,  2,137,137,
+  137,137,137,137,137,137,137,137,137,137,  2,137,137,137,137,137,
+    2,  2,  2,  2,  2,  2,124,124,124,124,124,124,124,124,124,124,
+    2,  2,  2,  2,  2,  2,123,123,123,123,123,123,123,123,123,123,
+  123,123,123,123,  2,  2,114,114,114,114,114,114,114,114,114,114,
+  114,114,114,  2,  2,  2,114,114,  2,  2,  2,  2,  2,  2, 32, 32,
+   32, 32, 32,  2,  2,  2,102,102,102,102,102,102,102,102,102,102,
+    2,  2,  2,  2,  2,  2,126,126,126,126,126,126,126,126,126,126,
+  126,  2,  2,126,126,126,126,126,126,126,  2,  2,  2,  2,126,126,
+  126,126,126,126,126,  2,142,142,142,142,142,142,142,142,142,142,
+  142,142,  2,  2,  2,  2,125,125,125,125,125,125,125,125,125,125,
+  125,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,125,154,154,
+  154,154,154,154,154,  2,  2,154,  2,  2,154,154,154,154,154,154,
+  154,154,  2,154,154,  2,154,154,154,154,154,154,154,154,154,154,
+  154,154,154,154,  2,154,154,  2,  2,154,154,154,154,154,154,154,
+    2,  2,  2,  2,  2,  2,150,150,150,150,150,150,150,150,  2,  2,
+  150,150,150,150,150,150,150,150,150,150,150,  2,  2,  2,141,141,
+  141,141,141,141,141,141,140,140,140,140,140,140,140,140,140,140,
+  140,  2,  2,  2,  2,  2,121,121,121,121,121,121,121,121,121,  2,
+    2,  2,  2,  2,  2,  2,133,133,133,133,133,133,133,133,133,  2,
+  133,133,133,133,133,133,133,133,133,133,133,133,133,  2,133,133,
+  133,133,133,133,  2,  2,133,133,133,133,133,  2,  2,  2,134,134,
+  134,134,134,134,134,134,  2,  2,134,134,134,134,134,134,  2,134,
+  134,134,134,134,134,134,134,134,134,134,134,134,134,  2,138,138,
+  138,138,138,138,138,  2,138,138,  2,138,138,138,138,138,138,138,
+  138,138,138,138,138,138,  2,  2,138,  2,138,138,  2,138,138,138,
+    2,  2,  2,  2,  2,  2,143,143,143,143,143,143,  2,143,143,  2,
+  143,143,143,143,143,143,143,143,143,143,143,143,143,143,143,143,
+  143,143,143,143,143,  2,143,143,  2,143,143,143,143,143,143,  2,
+    2,  2,  2,  2,  2,  2,143,143,  2,  2,  2,  2,  2,  2,145,145,
+  145,145,145,145,145,145,145,  2,  2,  2,  2,  2,  2,  2, 86,  2,
+    2,  2,  2,  2,  2,  2, 22, 22,  2,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2, 22, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+    2,  2,  2,  2,  2,  2, 63, 63, 63, 63, 63, 63, 63,  2, 63, 63,
+   63, 63, 63,  2,  2,  2, 63, 63, 63, 63,  2,  2,  2,  2,157,157,
+  157,157,157,157,157,157,157,157,157,  2,  2,  2,  2,  2, 80, 80,
+   80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80,  2, 80,  2,
+    2,  2,  2,  2,  2,  2,127,127,127,127,127,127,127,127,127,127,
+  127,127,127,127,127,  2, 79,  2,  2,  2,  2,  2,  2,  2,115,115,
+  115,115,115,115,115,115,115,115,115,115,115,115,115,  2,115,115,
+    2,  2,  2,  2,115,115,159,159,159,159,159,159,159,159,159,159,
+  159,159,159,159,159,  2,159,159,  2,  2,  2,  2,  2,  2,103,103,
+  103,103,103,103,103,103,103,103,103,103,103,103,  2,  2,119,119,
+  119,119,119,119,119,119,119,119,119,119,119,119,  2,  2,119,119,
+    2,119,119,119,119,119,  2,  2,  2,  2,  2,119,119,119,146,146,
+  146,146,146,146,146,146,146,146,146,  2,  2,  2,  2,  2, 99, 99,
+   99, 99, 99, 99, 99, 99, 99, 99, 99,  2,  2,  2,  2, 99,  2,  2,
+    2,  2,  2,  2,  2, 99,136,139, 13, 13,155,  2,  2,  2,136,136,
+  136,136,136,136,136,136,155,155,155,155,155,155,155,155,155,155,
+  155,155,155,155,  2,  2,136,  2,  2,  2,  2,  2,  2,  2, 17, 17,
+   17, 17,  2, 17, 17, 17, 17, 17, 17, 17,  2, 17, 17,  2, 17, 15,
+   15, 15, 15, 15, 15, 15, 17, 17, 17,  2,  2,  2,  2,  2, 15, 15,
+   15,  2,  2,  2,  2,  2,  2,  2,  2,  2, 17, 17, 17, 17,139,139,
+  139,139,139,139,139,139,139,139,139,139,  2,  2,  2,  2,105,105,
+  105,105,105,105,105,105,105,105,105,  2,  2,  2,  2,  2,105,105,
+  105,105,105,  2,  2,  2,105,  2,  2,  2,  2,  2,  2,  2,105,105,
+    2,  2,105,105,105,105,  1,  1,  1,  1,  1,  1,  2,  2,  0,  0,
+    0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  1,  1,  1,  1,  1,  1,  1,  1,  0,  0,  1,  1,  1,  1,  1,
+    1,  1,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  0,  0,  2,  2,
+    0,  2,  2,  0,  0,  2,  2,  0,  0,  0,  0,  2,  0,  0,  0,  0,
+    2,  0,  2,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,
+    0,  2,  2,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  2,  0,  0,
+    0,  0,  0,  2,  0,  2,  2,  2,  0,  0,  0,  0,  0,  0,  0,  2,
+    0,  0,  0,  0,  0,  0,131,131,131,131,131,131,131,131,131,131,
+  131,131,  2,  2,  2,  2,  2,  2,  2,131,131,131,131,131,  2,131,
+  131,131,131,131,131,131, 56, 56, 56, 56, 56, 56, 56,  2, 56,  2,
+    2, 56, 56, 56, 56, 56, 56, 56,  2, 56, 56,  2, 56, 56, 56, 56,
+   56,  2,  2,  2,  2,  2,151,151,151,151,151,151,151,151,151,151,
+  151,151,151,  2,  2,  2,151,151,151,151,151,151,  2,  2,151,151,
+    2,  2,  2,  2,151,151,160,160,160,160,160,160,160,160,160,160,
+  160,160,160,160,160,  2,152,152,152,152,152,152,152,152,152,152,
+    2,  2,  2,  2,  2,152, 30, 30, 30, 30,  2, 30, 30,  2,113,113,
+  113,113,113,113,113,113,113,113,113,113,113,  2,  2,113,113,113,
+  113,113,113,113,113,  2,132,132,132,132,132,132,132,132,132,132,
+  132,132,  2,  2,  2,  2,132,132,  2,  2,  2,  2,132,132,  3,  3,
+    3,  3,  2,  3,  3,  3,  2,  3,  3,  2,  3,  2,  2,  3,  2,  3,
+    3,  3,  3,  3,  3,  3,  3,  3,  3,  2,  3,  3,  3,  3,  2,  3,
+    2,  3,  2,  2,  2,  2,  2,  2,  3,  2,  2,  2,  2,  3,  2,  3,
+    2,  3,  2,  3,  3,  3,  2,  3,  2,  3,  2,  3,  2,  3,  2,  3,
+    3,  3,  3,  2,  3,  2,  3,  3,  2,  3,  3,  3,  3,  3,  3,  3,
+    3,  3,  2,  2,  2,  2,  2,  3,  3,  3,  2,  3,  3,  3,  2,  2,
+    2,  2,  2,  2,  0,  0, 15,  0,  0,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  0,  0,  0, 13,  2,  2,  2,  2,  2,  2,  2, 13, 13,
+   13,  2,  2,  2,  2,  2,  2,  0,  2,  2,  2,  2,  2,  2,  0,  1,
+    2,  3,  4,  5,  6,  7,  8,  9,  9,  9,  9, 10,  9, 11, 12, 13,
+    9,  9,  9, 14,  9,  9, 15,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 16, 17,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9, 18, 19, 20,  9, 21,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9, 22,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 23, 24,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  8,
+    9, 10, 11, 12,  0,  0, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   23,  0,  0, 24, 25, 26, 27, 28, 29, 30,  0,  0, 31, 32,  0, 33,
+    0, 34,  0, 35,  0,  0,  0,  0, 36, 37, 38, 39,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,  0,
+    0,  0,  0,  0,  0,  0,  0,  0, 41, 42,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 43, 44,
+    0, 45,  0,  0,  0,  0,  0,  0, 46, 47,  0,  0,  0,  0,  0, 48,
+    0, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   50, 51,  0,  0,  0, 52,  0,  0, 53,  0,  0,  0,  0,  0,  0,  0,
+   54,  0,  0,  0,  0,  0,  0,  0, 55,  0,  0,  0,  0,  0,  0,  0,
+   56,  0,  0,  0,  0,  0,  0,  0,  0, 57,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   58, 59, 60, 61, 62, 63, 64, 65,  0,  0,  0,  0,  0,  0, 66,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 68,  0, 69,
+   70,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 71, 72, 73, 74,
+   75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
+   91, 92, 93, 94, 95, 96, 97, 98, 99,100,101,102,103,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,104,  0,
+    0,  0,  0,  0,  0,105,106,  0,107,  0,  0,  0,108,  0,109,  0,
+  110,  0,111,112,113,  0,114,  0,  0,  0,115,  0,  0,  0,116,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,117,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  118,119,120,121,  0,122,123,124,125,126,  0,127,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,129,130,131,
+  132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,
+  148,149,150,151,152,153,154,155,156,157,  0,  0,  0,158,159,160,
+  161,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,162,163,  0,  0,  0,  0,  0,  0,  0,164,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  165,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,166,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,167,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,169,170,  0,  0,  0,  0,171,172,  0,  0,  0,173,174,175,176,
+  177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,
+  193,194,195,196,197,198,199,200,201,202,203,204,205,206,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,
+};
+static const uint16_t
+_hb_ucd_u16[9200] =
+{
+     0,   0,   1,   2,   3,   4,   5,   6,   0,   0,   7,   8,   9,  10,  11,  12,
+    13,  13,  13,  14,  15,  13,  13,  16,  17,  18,  19,  20,  21,  22,  13,  23,
+    13,  13,  13,  24,  25,  11,  11,  11,  11,  26,  11,  27,  28,  29,  30,  31,
+    32,  32,  32,  32,  32,  32,  32,  33,  34,  35,  36,  11,  37,  38,  13,  39,
+     9,   9,   9,  11,  11,  11,  13,  13,  40,  13,  13,  13,  41,  13,  13,  13,
+    13,  13,  13,  42,   9,  43,  11,  11,  44,  45,  32,  46,  47,  48,  49,  50,
+    51,  52,  48,  48,  53,  32,  54,  55,  48,  48,  48,  48,  48,  56,  57,  58,
+    59,  60,  48,  32,  61,  48,  48,  48,  48,  48,  62,  63,  64,  48,  65,  66,
+    48,  67,  68,  69,  48,  70,  71,  48,  72,  73,  48,  48,  74,  32,  75,  32,
+    76,  48,  48,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+    90,  83,  84,  91,  92,  93,  94,  95,  96,  97,  84,  98,  99, 100,  88, 101,
+   102,  83,  84, 103, 104, 105,  88, 106, 107, 108, 109, 110, 111, 112,  94, 113,
+   114, 115,  84, 116, 117, 118,  88, 119, 120, 115,  84, 121, 122, 123,  88, 124,
+   125, 115,  48, 126, 127, 128,  88, 129, 130, 131,  48, 132, 133, 134,  94, 135,
+   136,  48,  48, 137, 138, 139, 140, 140, 141,  48, 142, 143, 144, 145, 140, 140,
+   146, 147, 148, 149, 150,  48, 151, 152, 153, 154,  32, 155, 156, 157, 140, 140,
+    48,  48, 158, 159, 160, 161, 162, 163, 164, 165,   9,   9, 166,  11,  11, 167,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 168, 169,  48,  48,
+   168,  48,  48, 170, 171, 172,  48,  48,  48, 171,  48,  48,  48, 173, 174, 175,
+    48, 176,   9,   9,   9,   9,   9, 177, 178,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48, 179,  48, 180, 181,  48,  48,  48,  48, 182, 183,
+    48, 184,  48, 185,  48, 186, 187, 188,  48,  48,  48, 189, 190, 191, 192, 193,
+   194, 192,  48,  48, 195,  48,  48, 196, 197,  48, 198,  48,  48,  48,  48, 199,
+    48, 200, 201, 202, 203,  48, 204, 205,  48,  48, 206,  48, 207, 208, 209, 209,
+    48, 210,  48,  48,  48, 211, 212, 213, 192, 192, 214, 215, 216, 140, 140, 140,
+   217,  48,  48, 218, 219, 160, 220, 221, 222,  48, 223,  64,  48,  48, 224, 225,
+    48,  48, 226, 227, 228,  64,  48, 229, 230,   9,   9, 231, 232, 233, 234, 235,
+    11,  11, 236,  27,  27,  27, 237, 238,  11, 239,  27,  27,  32,  32,  32,  32,
+    13,  13,  13,  13,  13,  13,  13,  13,  13, 240,  13,  13,  13,  13,  13,  13,
+   241, 242, 241, 241, 242, 243, 241, 244, 245, 245, 245, 246, 247, 248, 249, 250,
+   251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 261, 262, 263, 264, 265,
+   266, 267, 268, 269, 270, 271, 272, 272, 273, 274, 275, 209, 276, 277, 209, 278,
+   279, 279, 279, 279, 279, 279, 279, 279, 280, 209, 281, 209, 209, 209, 209, 282,
+   209, 283, 279, 284, 209, 285, 286, 209, 209, 209, 287, 140, 288, 140, 271, 271,
+   271, 289, 209, 209, 209, 209, 290, 271, 209, 209, 209, 209, 209, 209, 209, 209,
+   209, 209, 209, 291, 292, 209, 209, 293, 209, 209, 209, 209, 209, 209, 294, 209,
+   209, 209, 209, 209, 209, 209, 295, 296, 271, 297, 209, 209, 298, 279, 299, 279,
+   300, 301, 279, 279, 279, 302, 279, 303, 209, 209, 209, 279, 304, 209, 209, 305,
+   209, 306, 209, 209, 209, 209, 209, 209,   9,   9,   9,  11,  11,  11, 307, 308,
+    13,  13,  13,  13,  13,  13, 309, 310,  11,  11, 311,  48,  48,  48, 312, 313,
+    48, 314, 315, 315, 315, 315,  32,  32, 316, 317, 318, 319, 320, 321, 140, 140,
+   209, 322, 209, 209, 209, 209, 209, 323, 209, 209, 209, 209, 209, 324, 140, 325,
+   326, 327, 328, 329, 136,  48,  48,  48,  48, 330, 178,  48,  48,  48,  48, 331,
+   332,  48,  48, 136,  48,  48,  48,  48, 200, 333,  48,  48, 209, 209, 323,  48,
+   209, 334, 335, 209, 336, 337, 209, 209, 335, 209, 209, 337, 209, 209, 209, 209,
+    48,  48,  48,  48, 209, 209, 209, 209,  48, 338,  48,  48,  48,  48,  48,  48,
+   151, 209, 209, 209, 287,  48,  48, 229, 339,  48, 340, 140,  13,  13, 341, 342,
+    13, 343,  48,  48,  48,  48, 344, 345,  31, 346, 347, 348,  13,  13,  13, 349,
+   350, 351, 352, 353, 354, 355, 140, 356, 357,  48, 358, 359,  48,  48,  48, 360,
+   361,  48,  48, 362, 363, 192,  32, 364,  64,  48, 365,  48, 366, 367,  48, 151,
+    76,  48,  48, 368, 369, 370, 371, 372,  48,  48, 373, 374, 375, 376,  48, 377,
+    48,  48,  48, 378, 379, 380, 381, 382, 383, 384, 315,  11,  11, 385, 386,  11,
+    11,  11,  11,  11,  48,  48, 387, 192,  48,  48, 388,  48, 389,  48,  48, 206,
+   390, 390, 390, 390, 390, 390, 390, 390, 391, 391, 391, 391, 391, 391, 391, 391,
+    48,  48,  48,  48,  48,  48, 204,  48,  48,  48,  48,  48,  48, 207, 140, 140,
+   392, 393, 394, 395, 396,  48,  48,  48,  48,  48,  48, 397, 398, 399,  48,  48,
+    48,  48,  48, 400, 209,  48,  48,  48,  48, 401,  48,  48, 402, 140, 140, 403,
+    32, 404,  32, 405, 406, 407, 408, 409,  48,  48,  48,  48,  48,  48,  48, 410,
+   411,   2,   3,   4,   5, 412, 413, 414,  48, 415,  48, 200, 416, 417, 418, 419,
+   420,  48, 172, 421, 204, 204, 140, 140,  48,  48,  48,  48,  48,  48,  48,  71,
+   422, 271, 271, 423, 272, 272, 272, 424, 425, 426, 427, 140, 140, 209, 209, 428,
+   140, 140, 140, 140, 140, 140, 140, 140,  48, 151,  48,  48,  48, 100, 429, 430,
+    48,  48, 431,  48, 432,  48,  48, 433,  48, 434,  48,  48, 435, 436, 140, 140,
+     9,   9, 437,  11,  11,  48,  48,  48,  48, 204, 192,   9,   9, 438,  11, 439,
+    48,  48, 440,  48,  48,  48, 441, 442, 442, 443, 444, 445, 140, 140, 140, 140,
+    48,  48,  48, 314,  48, 199, 440, 140, 446,  27,  27, 447, 140, 140, 140, 140,
+   448,  48,  48, 449,  48, 450,  48, 451,  48, 200, 452, 140, 140, 140,  48, 453,
+    48, 454,  48, 455, 140, 140, 140, 140,  48,  48,  48, 456, 271, 457, 271, 271,
+   458, 459,  48, 460, 461, 462,  48, 463,  48, 464, 140, 140, 465,  48, 466, 467,
+    48,  48,  48, 468,  48, 469,  48, 470,  48, 471, 472, 140, 140, 140, 140, 140,
+    48,  48,  48,  48, 196, 140, 140, 140,   9,   9,   9, 473,  11,  11,  11, 474,
+    48,  48, 475, 192, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 271, 476,
+    48,  48, 477, 478, 140, 140, 140, 140,  48, 464, 479,  48,  62, 480, 140,  48,
+   481, 140, 140,  48, 482, 140,  48, 314, 483,  48,  48, 484, 485, 457, 486, 487,
+   222,  48,  48, 488, 489,  48, 196, 192, 490,  48, 491, 492, 493,  48,  48, 494,
+   222,  48,  48, 495, 496, 497, 498, 499,  48,  97, 500, 501, 140, 140, 140, 140,
+   502, 503, 504,  48,  48, 505, 506, 192, 507,  83,  84, 508, 509, 510, 511, 512,
+    48,  48,  48, 513, 514, 515, 478, 140,  48,  48,  48, 516, 517, 192, 140, 140,
+    48,  48, 518, 519, 520, 521, 140, 140,  48,  48,  48, 522, 523, 192, 524, 140,
+    48,  48, 525, 526, 192, 140, 140, 140,  48, 173, 527, 528, 314, 140, 140, 140,
+    48,  48, 500, 529, 140, 140, 140, 140, 140, 140,   9,   9,  11,  11, 148, 530,
+   531, 532,  48, 533, 534, 192, 140, 140, 140, 140, 535,  48,  48, 536, 537, 140,
+   538,  48,  48, 539, 540, 541,  48,  48, 542, 543, 544,  48,  48,  48,  48, 196,
+    84,  48, 518, 545, 546, 148, 175, 547,  48, 548, 549, 550, 140, 140, 140, 140,
+   551,  48,  48, 552, 553, 192, 554,  48, 555, 556, 192, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140,  48, 557, 140, 140, 140, 100, 271, 558, 559, 560,
+    48, 207, 140, 140, 140, 140, 140, 140, 272, 272, 272, 272, 272, 272, 561, 562,
+    48,  48,  48,  48, 388, 140, 140, 140, 140,  48,  48,  48,  48,  48,  48, 563,
+    48,  48, 200, 564, 140, 140, 140, 140,  48,  48,  48,  48, 314, 140, 140, 140,
+    48,  48,  48, 196,  48, 200, 370,  48,  48,  48,  48, 200, 192,  48, 204, 565,
+    48,  48,  48, 566, 567, 568, 569, 570,  48, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140,   9,   9,  11,  11, 271, 571, 140, 140, 140, 140, 140, 140,
+    48,  48,  48,  48, 572, 573, 574, 574, 575, 576, 140, 140, 140, 140, 577, 578,
+    48,  48,  48,  48,  48,  48,  48, 440,  48,  48,  48,  48,  48, 199, 140, 140,
+   196, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 579,
+    48,  48, 580, 140, 140, 580, 581,  48,  48,  48,  48,  48,  48,  48,  48, 206,
+    48,  48,  48,  48,  48,  48,  71, 151, 196, 582, 583, 140, 140, 140, 140, 140,
+    32,  32, 584,  32, 585, 209, 209, 209, 209, 209, 209, 209, 323, 140, 140, 140,
+   209, 209, 209, 209, 209, 209, 209, 324, 209, 209, 586, 209, 209, 209, 587, 588,
+   589, 209, 590, 209, 209, 209, 288, 140, 209, 209, 209, 209, 591, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 271, 592, 209, 209, 209, 209, 209, 287, 271, 461,
+     9, 593,  11, 594, 595, 596, 241,   9, 597, 598, 599, 600, 601,   9, 593,  11,
+   602, 603,  11, 604, 605, 606, 607,   9, 608,  11,   9, 593,  11, 594, 595,  11,
+   241,   9, 597, 607,   9, 608,  11,   9, 593,  11, 609,   9, 610, 611, 612, 613,
+    11, 614,   9, 615, 616, 617, 618,  11, 619,   9, 620,  11, 621, 622, 622, 622,
+    32,  32,  32, 623,  32,  32, 624, 625, 626, 627,  45, 140, 140, 140, 140, 140,
+   628, 629, 140, 140, 140, 140, 140, 140, 630, 631, 632, 140, 140, 140, 140, 140,
+    48,  48, 151, 633, 634, 140, 140, 140, 140,  48, 635, 140,  48,  48, 636, 637,
+   140, 140, 140, 140, 140, 140, 638, 200,  48,  48,  48,  48, 639, 585, 140, 140,
+     9,   9, 597,  11, 640, 370, 140, 140, 140, 140, 140, 140, 140, 140, 140, 498,
+   271, 271, 641, 642, 140, 140, 140, 140, 498, 271, 643, 644, 140, 140, 140, 140,
+   645,  48, 646, 647, 648, 649, 650, 651, 652, 206, 653, 206, 140, 140, 140, 654,
+   209, 209, 325, 209, 209, 209, 209, 209, 209, 323, 334, 655, 655, 655, 209, 324,
+   656, 209, 209, 209, 209, 209, 209, 209, 209, 209, 657, 140, 140, 140, 658, 209,
+   659, 209, 209, 325, 660, 661, 324, 140, 209, 209, 209, 209, 209, 209, 209, 662,
+   209, 209, 209, 209, 209, 663, 426, 426, 209, 209, 209, 209, 209, 209, 209, 323,
+   209, 209, 209, 209, 209, 660, 325, 427, 325, 209, 209, 209, 664, 176, 209, 209,
+   664, 209, 657, 661, 140, 140, 140, 140, 209, 209, 209, 209, 209, 323, 657, 665,
+   287, 209, 426, 288, 324, 176, 664, 287, 209, 666, 209, 209, 288, 140, 140, 192,
+    48,  48,  48,  48,  48,  48, 140, 140,  48,  48,  48, 196,  48,  48,  48,  48,
+    48, 204,  48,  48,  48,  48,  48,  48,  48,  48, 478,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48, 100, 140,  48, 204, 140, 140, 140, 140, 140, 140,
+    48,  48,  48,  48,  71, 140, 140, 140, 667, 140, 668, 668, 668, 668, 668, 668,
+    32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32, 140,
+   391, 391, 391, 391, 391, 391, 391, 669, 391, 391, 391, 391, 391, 391, 391, 670,
+     0,   0,   0,   0,   0,   0,   0,   0,   1,   2,   2,   3,   1,   2,   2,   3,
+     0,   0,   0,   0,   0,   4,   0,   4,   2,   2,   5,   2,   2,   2,   5,   2,
+     2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,
+     2,   2,   2,   2,   2,   2,   2,   6,   0,   0,   0,   0,   7,   8,   0,   0,
+     9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,  10,  11,
+    12,  13,  14,  14,  15,  14,  14,  14,  14,  14,  14,  14,  16,  17,  14,  14,
+    18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,
+    19,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,
+    18,  18,  18,  18,  18,  18,  20,  21,  21,  21,  22,  20,  21,  21,  21,  21,
+    21,  23,  24,  25,  25,  25,  25,  25,  25,  26,  25,  25,  25,  27,  28,  26,
+    29,  30,  31,  32,  31,  31,  31,  31,  33,  34,  35,  31,  31,  31,  36,  31,
+    31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  29,  31,  31,  31,  31,
+    37,  38,  37,  37,  37,  37,  37,  37,  37,  39,  31,  31,  31,  31,  31,  31,
+    40,  40,  40,  40,  40,  40,  41,  26,  42,  42,  42,  42,  42,  42,  42,  43,
+    44,  44,  44,  44,  44,  45,  44,  46,  47,  47,  47,  48,  37,  49,  31,  31,
+    31,  50,  51,  31,  31,  31,  31,  31,  31,  31,  31,  31,  52,  31,  31,  31,
+    53,  53,  53,  53,  53,  53,  53,  53,  53,  53,  54,  53,  55,  53,  53,  53,
+    56,  57,  58,  59,  59,  60,  61,  62,  57,  63,  64,  65,  66,  59,  59,  67,
+    68,  69,  70,  71,  71,  72,  73,  74,  69,  75,  76,  77,  78,  71,  79,  26,
+    80,  81,  82,  83,  83,  84,  85,  86,  81,  87,  88,  26,  89,  83,  90,  91,
+    92,  93,  94,  95,  95,  96,  97,  98,  93,  99, 100, 101, 102,  95,  95,  26,
+   103, 104, 105, 106, 107, 104, 108, 109, 104, 105, 110,  26, 111, 108, 108, 112,
+   113, 114, 115, 113, 113, 115, 113, 116, 114, 117, 118, 119, 120, 113, 121, 113,
+   122, 123, 124, 122, 122, 124, 125, 126, 123, 127, 128, 128, 129, 122, 130,  26,
+   131, 132, 133, 131, 131, 131, 131, 131, 132, 133, 134, 131, 135, 131, 131, 131,
+   136, 137, 138, 139, 137, 137, 140, 141, 138, 142, 143, 137, 144, 137, 145,  26,
+   146, 147, 147, 147, 147, 147, 147, 148, 147, 147, 147, 149,  26,  26,  26,  26,
+   150, 151, 152, 152, 153, 152, 152, 154, 155, 154, 152, 156,  26,  26,  26,  26,
+   157, 157, 157, 157, 157, 157, 157, 157, 157, 158, 157, 157, 157, 159, 158, 157,
+   157, 157, 157, 158, 157, 157, 157, 160, 157, 160, 161, 162,  26,  26,  26,  26,
+   163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163,
+   163, 163, 163, 163, 164, 164, 164, 164, 165, 166, 164, 164, 164, 164, 164, 167,
+   168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
+   169, 169, 169, 169, 169, 169, 169, 169, 169, 170, 171, 170, 169, 169, 169, 169,
+   169, 170, 169, 169, 169, 169, 170, 171, 170, 169, 171, 169, 169, 169, 169, 169,
+   169, 169, 170, 169, 169, 169, 169, 169, 169, 169, 169, 172, 169, 169, 169, 173,
+   169, 169, 169, 174, 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, 176, 176,
+   177, 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
+   178, 178, 178, 179, 180, 180, 180, 180, 180, 180, 180, 180, 180, 181, 180, 182,
+   183, 183, 184, 185, 186, 186, 187,  26, 188, 188, 189,  26, 190, 191, 192,  26,
+   193, 193, 193, 193, 193, 193, 193, 193, 193, 193, 193, 194, 193, 195, 193, 195,
+   196, 197, 197, 198, 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, 199,
+   197, 197, 197, 197, 197, 200, 177, 177, 177, 177, 177, 177, 177, 177, 201,  26,
+   202, 202, 202, 203, 202, 204, 202, 204, 205, 202, 206, 206, 206, 207, 208,  26,
+   209, 209, 209, 209, 209, 210, 209, 209, 209, 211, 209, 212, 193, 193, 193, 193,
+   213, 213, 213, 214, 215, 215, 215, 215, 215, 215, 215, 216, 215, 215, 215, 217,
+   215, 218, 215, 218, 215, 219,   9,   9,   9, 220,  26,  26,  26,  26,  26,  26,
+   221, 221, 221, 221, 221, 221, 221, 221, 221, 222, 221, 221, 221, 221, 221, 223,
+   224, 224, 224, 224, 224, 224, 224, 224, 225, 225, 225, 225, 225, 225, 226, 227,
+   228, 228, 228, 228, 228, 228, 228, 229, 228, 230, 231, 231, 231, 231, 231, 231,
+    18, 232, 164, 164, 164, 164, 164, 233, 224,  26, 234,   9, 235, 236, 237, 238,
+     2,   2,   2,   2, 239, 240,   2,   2,   2,   2,   2, 241, 242, 243,   2, 244,
+     2,   2,   2,   2,   2,   2,   2, 245,   9,   9,   9,   9,   9,   9,   9,   9,
+    14,  14, 246, 246,  14,  14,  14,  14, 246, 246,  14, 247,  14,  14,  14, 246,
+    14,  14,  14,  14,  14,  14, 248,  14, 248,  14, 249, 250,  14,  14, 251, 252,
+     0, 253,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 254,   0, 255, 256,
+     0, 257,   2, 258,   0,   0,   0,   0, 259,  26,   9,   9,   9,   9, 260,  26,
+     0,   0,   0,   0, 261, 262,   4,   0,   0, 263,   0,   0,   2,   2,   2,   2,
+     2, 264,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0, 257,  26,  26,  26,   0, 265,  26,  26,   0,   0,   0,   0,
+   266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 267,   0,
+     0,   0, 268,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269,   2,   2,   2,   2,
+    17,  17,  17,  17,  17,  17,  17,  17,  17,  17,  17,  17,  17,  17, 270, 271,
+   164, 164, 164, 164, 165, 166, 272, 272, 272, 272, 272, 272, 272, 273, 274, 273,
+   169, 169, 171,  26, 171, 171, 171, 171, 171, 171, 171, 171,  18,  18,  18,  18,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 275,  26,  26,  26,  26,
+   276, 276, 276, 277, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 278,  26,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 279,  26,  26,  26,   0, 280,
+   281,   0,   0,   0, 282, 283,   0, 284, 285, 286, 286, 286, 286, 286, 286, 286,
+   286, 286, 287, 288, 289, 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, 291,
+   292, 293, 293, 293, 293, 293, 294, 168, 168, 168, 168, 168, 168, 168, 168, 168,
+   168, 295,   0,   0, 293, 293, 293, 293,   0,   0,   0,   0, 280,  26, 290, 290,
+   168, 168, 168, 295,   0,   0,   0,   0,   0,   0,   0,   0, 168, 168, 168, 296,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 290, 290, 290, 290, 290, 297,
+   290, 290, 290, 290, 290, 290, 290, 290, 290, 290, 290,   0,   0,   0,   0,   0,
+   276, 276, 276, 276, 276, 276, 276, 276,   0,   0,   0,   0,   0,   0,   0,   0,
+   298, 298, 298, 298, 298, 298, 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+   298, 299, 298, 298, 298, 298, 298, 298, 300,  26, 301, 301, 301, 301, 301, 301,
+   302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+   302, 302, 302, 302, 302, 303,  26,  26,  18,  18,  18,  18,  18,  18,  18,  18,
+    18,  18,  18,  18, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304,  26,
+     0,   0,   0,   0, 305,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,
+     2, 306,   2,   2,   2,   2,   2,   2,   2, 307, 308, 309,  26,  26, 310,   2,
+   311, 311, 311, 311, 311, 312,   0, 313, 314, 314, 314, 314, 314, 314, 314,  26,
+   315, 315, 315, 315, 315, 315, 315, 315, 316, 317, 315, 318,  53,  53,  53,  53,
+   319, 319, 319, 319, 319, 320, 321, 321, 321, 321, 322, 323, 168, 168, 168, 324,
+   325, 325, 325, 325, 325, 325, 325, 325, 325, 326, 325, 327, 163, 163, 163, 328,
+   329, 329, 329, 329, 329, 329, 330,  26, 329, 331, 329, 332, 163, 163, 163, 163,
+   333, 333, 333, 333, 333, 333, 333, 333, 334,  26,  26, 335, 336, 336, 337,  26,
+   338, 338, 338,  26, 171, 171,   2,   2,   2,   2,   2, 339, 340, 341, 175, 175,
+   175, 175, 175, 175, 175, 175, 175, 175, 336, 336, 336, 336, 336, 342, 336, 343,
+   168, 168, 168, 168, 344,  26, 168, 168, 295, 345, 168, 168, 168, 168, 168, 344,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 279, 276, 276,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 346,  26,  26,  26,  26,
+   347,  26, 348, 349,  25,  25, 350, 351, 352,  25,  31,  31,  31,  31,  31,  31,
+    31,  31,  31,  31,  31,  31,  31,  31, 353,  26, 354,  31,  31,  31,  31,  31,
+    31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,
+    31,  31,  31,  31,  31,  31,  31, 355,  31,  31,  31,  31,  31,  31,  31,  31,
+    31,  31, 356,  31,  31,  31,  31,  31,  31, 357,  26,  26,  26,  26,  31,  31,
+     9,   9,   0, 313,   9, 358,   0,   0,   0,   0, 359,   0, 257, 280, 360,  31,
+    31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31, 361,
+   362,   0,   0,   0,   1,   2,   2,   3,   1,   2,   2,   3, 363, 290, 289, 290,
+   290, 290, 290, 364, 168, 168, 168, 295, 365, 365, 365, 366, 257, 257,  26, 367,
+   368, 369, 368, 368, 370, 368, 368, 371, 368, 372, 368, 372,  26,  26,  26,  26,
+   368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 373,
+   374,   0,   0,   0,   0,   0, 375,   0,  14,  14,  14,  14,  14,  14,  14,  14,
+    14, 252,   0, 376, 377,  26,  26,  26,  26,  26,   0,   0,   0,   0,   0, 378,
+   379, 379, 379, 380, 381, 381, 381, 381, 381, 381, 382,  26, 383,   0,   0, 280,
+   384, 384, 384, 384, 385, 386, 387, 387, 387, 388, 389, 389, 389, 389, 389, 390,
+   391, 391, 391, 392, 393, 393, 393, 393, 394, 393, 395,  26,  26,  26,  26,  26,
+   396, 396, 396, 396, 396, 396, 396, 396, 396, 396, 397, 397, 397, 397, 397, 397,
+   398, 398, 398, 399, 398, 400, 401, 401, 401, 401, 402, 401, 401, 401, 401, 402,
+   403, 403, 403, 403, 403,  26, 404, 404, 404, 404, 404, 404, 405, 406, 407, 408,
+   407, 408, 409, 407, 410, 407, 410, 411,  26,  26,  26,  26,  26,  26,  26,  26,
+   412, 412, 412, 412, 412, 412, 412, 412, 412, 412, 412, 412, 412, 412, 412, 412,
+   412, 412, 412, 412, 412, 412, 413,  26, 412, 412, 414,  26, 412,  26,  26,  26,
+   415,   2,   2,   2,   2,   2, 416, 307,  26,  26,  26,  26,  26,  26,  26,  26,
+   417, 418, 419, 419, 419, 419, 420, 421, 422, 422, 423, 422, 424, 424, 424, 424,
+   425, 425, 425, 426, 427, 425,  26,  26,  26,  26,  26,  26, 428, 428, 429, 430,
+   431, 431, 431, 432, 433, 433, 433, 434,  26,  26,  26,  26,  26,  26,  26,  26,
+   435, 435, 435, 435, 436, 436, 436, 437, 436, 436, 438, 436, 436, 436, 436, 436,
+   439, 440, 441, 442, 443, 443, 444, 445, 443, 446, 443, 446, 447, 447, 447, 447,
+   448, 448, 448, 448,  26,  26,  26,  26, 449, 449, 449, 449, 450, 451, 450,  26,
+   452, 452, 452, 452, 452, 452, 453, 454, 455, 455, 456, 455, 457, 457, 458, 457,
+   459, 459, 460, 461,  26, 462,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   463, 463, 463, 463, 463, 463, 463, 463, 463, 464,  26,  26,  26,  26,  26,  26,
+   465, 465, 465, 465, 465, 465, 466,  26, 465, 465, 465, 465, 465, 465, 466, 467,
+   468, 468, 468, 468, 468,  26, 468, 469,  26,  26,  26,  26,  26,  26,  26,  26,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  31,  31,  31,  50,
+   470, 470, 470, 470, 470, 471, 472,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   473, 473, 473, 473, 473,  26, 474, 474, 474, 474, 474, 475,  26,  26, 476, 476,
+   476, 477,  26,  26,  26,  26, 478, 478, 478, 479,  26,  26, 480, 480, 481,  26,
+   482, 482, 482, 482, 482, 482, 482, 482, 482, 483, 484, 482, 482, 482, 483, 485,
+   486, 486, 486, 486, 486, 486, 486, 486, 487, 488, 489, 489, 489, 490, 489, 491,
+   492, 492, 492, 492, 492, 492, 493, 492, 492,  26, 494, 494, 494, 494, 495,  26,
+   496, 496, 496, 496, 496, 496, 496, 496, 496, 496, 496, 496, 497, 137, 498,  26,
+   499, 499, 500, 499, 499, 499, 499, 501,  26,  26,  26,  26,  26,  26,  26,  26,
+   502, 503, 504, 505, 504, 506, 507, 507, 507, 507, 507, 507, 507, 508, 507, 509,
+   510, 511, 512, 513, 513, 514, 515, 516, 511, 517, 518, 519, 520, 521, 521,  26,
+   522, 522, 522, 522, 522, 522, 522, 522, 522, 522, 522, 523, 524,  26,  26,  26,
+   525, 525, 525, 525, 525, 525, 525, 525, 525,  26, 525, 526,  26,  26,  26,  26,
+   527, 527, 527, 527, 527, 527, 528, 527, 527, 527, 527, 528,  26,  26,  26,  26,
+   529, 529, 529, 529, 529, 529, 529, 529, 530,  26, 529, 531, 197, 532,  26,  26,
+   533, 533, 533, 533, 533, 533, 533, 534, 533, 534,  26,  26,  26,  26,  26,  26,
+   535, 535, 535, 536, 535, 537, 535, 535, 538,  26,  26,  26,  26,  26,  26,  26,
+   539, 539, 539, 539, 539, 539, 539, 540,  26,  26,  26,  26,  26,  26,  26,  26,
+    26,  26,  26,  26, 541, 541, 541, 541, 541, 541, 541, 541, 541, 541, 542, 543,
+   544, 545, 546, 547, 547, 547, 548, 549, 544,  26, 547, 550,  26,  26,  26,  26,
+    26,  26,  26,  26, 551, 552, 551, 551, 551, 551, 551, 552, 553,  26,  26,  26,
+   554, 554, 554, 554, 554, 554, 554, 554, 554,  26, 555, 555, 555, 555, 555, 555,
+   555, 555, 555, 555, 556,  26, 177, 177, 557, 557, 557, 557, 557, 557, 557, 558,
+   559, 560, 559, 559, 559, 559, 561, 559, 562,  26, 559, 559, 559, 563, 564, 564,
+   564, 564, 565, 564, 564, 566, 567,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   568, 569, 570, 570, 570, 570, 568, 571, 570,  26, 570, 572, 573, 574, 575, 575,
+   575, 576, 577, 578, 575, 579,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 580, 580, 580, 581,
+    26,  26,  26,  26,  26,  26, 582,  26, 108, 108, 108, 108, 108, 108, 583, 584,
+   585, 585, 585, 585, 585, 585, 585, 585, 585, 585, 585, 585, 585, 585, 585, 585,
+   585, 585, 585, 586,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   585, 585, 585, 585, 585, 585, 585, 585, 585, 585, 585, 585, 585, 587, 588,  26,
+   585, 585, 585, 585, 585, 585, 585, 585, 589,  26,  26,  26,  26,  26,  26,  26,
+    26,  26, 590, 590, 590, 590, 590, 590, 590, 590, 590, 590, 590, 590, 591,  26,
+   592, 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, 592,
+   592, 592, 592, 592, 592, 593, 592, 594,  26,  26,  26,  26,  26,  26,  26,  26,
+   595, 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, 595,
+   595, 595, 595, 595, 595, 595, 595, 595, 596,  26,  26,  26,  26,  26,  26,  26,
+   304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304,
+   304, 304, 304, 304, 304, 304, 304, 597, 598, 598, 598, 599, 598, 600, 601, 601,
+   601, 601, 601, 601, 601, 601, 601, 602, 601, 603, 604, 604, 604, 605, 605,  26,
+   606, 606, 606, 606, 606, 606, 606, 606, 607,  26, 606, 608, 608, 606, 606, 609,
+   606, 606,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+    26,  26,  26,  26,  26,  26,  26,  26, 610, 610, 610, 610, 610, 610, 610, 610,
+   610, 610, 610, 611,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   612, 612, 612, 612, 612, 612, 612, 612, 612, 613, 612, 612, 612, 612, 612, 612,
+   612, 614, 612, 612,  26,  26,  26,  26,  26,  26,  26,  26, 615,  26, 346,  26,
+   616, 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, 616,
+   616, 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, 616,  26,
+   617, 617, 617, 617, 617, 617, 617, 617, 617, 617, 617, 617, 617, 617, 617, 617,
+   617, 617, 617, 617, 617, 617, 617, 617, 617, 617, 618,  26,  26,  26,  26,  26,
+   616, 619,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 620, 621,
+   622, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286,
+   286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286,
+   286, 286, 286, 286, 623,  26,  26,  26,  26,  26, 624,  26, 625,  26, 626, 626,
+   626, 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, 626,
+   626, 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, 627,
+   628, 628, 628, 628, 628, 628, 628, 628, 628, 628, 628, 628, 628, 629, 628, 630,
+   628, 631, 628, 632, 280,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+     9,   9,   9,   9,   9, 633,   9,   9, 220,  26,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0, 280,  26,  26,  26,  26,  26,  26,  26,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 275,  26,
+     0,   0,   0,   0, 257, 362,   0,   0,   0,   0,   0,   0, 634, 635,   0, 636,
+   637, 638,   0,   0,   0, 639,   0,   0,   0,   0,   0,   0,   0, 265,  26,  26,
+    14,  14,  14,  14,  14,  14,  14,  14, 246,  26,  26,  26,  26,  26,  26,  26,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,   0,   0, 280,  26,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 257,  26,   0,   0,   0, 259,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 254,   0,   0,   0,   0,   0,
+     0,   0,   0, 254, 640, 641,   0, 642, 643,   0,   0,   0,   0,   0,   0,   0,
+   268, 644, 254, 254,   0,   0,   0, 645, 646, 647, 648,   0,   0,   0,   0,   0,
+     0,   0,   0,   0, 275,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0, 267,   0,   0,   0,   0,   0,   0,
+   649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649,
+   649, 650,  26, 651, 652, 649,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+     2,   2,   2, 347,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   653, 269, 269, 654, 655, 656,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   657, 657, 657, 657, 657, 658, 657, 659, 657, 660,  26,  26,  26,  26,  26,  26,
+    26,  26, 661, 661, 661, 662,  26,  26, 663, 663, 663, 663, 663, 663, 663, 664,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 171, 665, 169, 171,
+   666, 666, 666, 666, 666, 666, 666, 666, 666, 666, 666, 666, 666, 666, 666, 666,
+   666, 666, 666, 666, 666, 666, 666, 666, 667, 666, 668,  26,  26,  26,  26,  26,
+   669, 669, 669, 669, 669, 669, 669, 669, 669, 670, 669, 671,  26,  26,  26,  26,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 362,   0,
+     0,   0,   0,   0,   0,   0, 376,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   362,   0,   0,   0,   0,   0,   0, 275,  26,  26,  26,  26,  26,  26,  26,  26,
+   672,  31,  31,  31, 673, 674, 675, 676, 677, 678, 673, 679, 673, 675, 675, 680,
+    31, 681,  31, 682, 683, 681,  31, 682,  26,  26,  26,  26,  26,  26,  51,  26,
+     0,   0,   0,   0,   0, 280,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0, 280,  26,   0, 257, 362,   0, 362,   0, 362,   0,   0,   0, 275,  26,
+     0,   0,   0,   0,   0, 275,  26,  26,  26,  26,  26,  26, 684,   0,   0,   0,
+   685,  26,   0,   0,   0,   0,   0, 280,   0, 259, 313,  26, 275,  26,  26,  26,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 686,   0, 376,   0, 376,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 280,  26,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 259,   0, 280, 259,  26,
+     0, 280,   0,   0,   0,   0,   0,   0,   0,  26,   0, 313,   0,   0,   0,   0,
+     0,  26,   0,   0,   0, 275, 313,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 280,  26,   0, 275, 376, 376,
+   257,  26,   0,   0,   0, 376,   0, 265, 275,  26,   0, 313,   0,  26, 257,  26,
+     0,   0, 359,   0,   0,   0,   0,   0,   0, 265,  26,  26,  26,  26,   0, 313,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,  26,  26,  26,  26,
+   276, 276, 276, 276, 276, 276, 276, 687, 276, 276, 276, 276, 276, 276, 276, 276,
+   276, 276, 276, 279, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
+   276, 276, 276, 276, 346,  26, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 687,  26,  26,  26,
+   276, 276, 276, 279,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 688,  26,  26,  26,  26,  26,  26,
+   689,  26,  26,  26,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,
+     9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   939, 940, 941, 942, 946, 948,   0, 962, 969, 970, 971, 976,1001,1002,1003,1008,
+     0,1033,1040,1041,1042,1043,1047,   0,   0,1080,1081,1082,1086,1110,   0,   0,
+  1124,1125,1126,1127,1131,1133,   0,1147,1154,1155,1156,1161,1187,1188,1189,1193,
+     0,1219,1226,1227,1228,1229,1233,   0,   0,1267,1268,1269,1273,1298,   0,1303,
+   943,1128, 944,1129, 954,1139, 958,1143, 959,1144, 960,1145, 961,1146, 964,1149,
+     0,   0, 973,1158, 974,1159, 975,1160, 983,1168, 978,1163, 988,1173, 990,1175,
+   991,1176, 993,1178, 994,1179,   0,   0,1004,1190,1005,1191,1006,1192,1014,1199,
+  1007,   0,   0,   0,1016,1201,1020,1206,   0,1022,1208,1025,1211,1023,1209,   0,
+     0,   0,   0,1032,1218,1037,1223,1035,1221,   0,   0,   0,1044,1230,1045,1231,
+  1049,1235,   0,   0,1058,1244,1064,1250,1060,1246,1066,1252,1067,1253,1072,1258,
+  1069,1255,1077,1264,1074,1261,   0,   0,1083,1270,1084,1271,1085,1272,1088,1275,
+  1089,1276,1096,1283,1103,1290,1111,1299,1115,1118,1307,1120,1309,1121,1310,   0,
+  1053,1239,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1093,
+  1280,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 949,1134,1010,
+  1195,1050,1236,1090,1277,1341,1368,1340,1367,1342,1369,1339,1366,   0,1320,1347,
+  1418,1419,1323,1350,   0,   0, 992,1177,1018,1204,1055,1241,1416,1417,1415,1424,
+  1202,   0,   0,   0, 987,1172,   0,   0,1031,1217,1321,1348,1322,1349,1338,1365,
+   950,1135, 951,1136, 979,1164, 980,1165,1011,1196,1012,1197,1051,1237,1052,1238,
+  1061,1247,1062,1248,1091,1278,1092,1279,1071,1257,1076,1263,   0,   0, 997,1182,
+     0,   0,   0,   0,   0,   0, 945,1130, 982,1167,1337,1364,1335,1362,1046,1232,
+  1422,1423,1113,1301,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     8,   9,   0,  10,1425,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   7,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
+     0,   0,   0,   0,   0,1314,1427,   5,1434,1438,1443,   0,1450,   0,1455,1461,
+  1514,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1446,1458,1468,1476,1480,1486,
+  1517,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1489,1503,1494,1500,1508,   0,
+     0,   0,   0,1520,1521,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+  1526,1528,   0,1525,   0,   0,   0,1522,   0,   0,   0,   0,1536,1532,1539,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,1534,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,1556,   0,   0,   0,   0,   0,   0,
+  1548,1550,   0,1547,   0,   0,   0,1567,   0,   0,   0,   0,1558,1554,1561,   0,
+     0,   0,   0,   0,   0,   0,1568,1569,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,1529,1551,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+  1523,1545,1524,1546,   0,   0,1527,1549,   0,   0,1570,1571,1530,1552,1531,1553,
+     0,   0,1533,1555,1535,1557,1537,1559,   0,   0,1572,1573,1544,1566,1538,1560,
+  1540,1562,1541,1563,1542,1564,   0,   0,1543,1565,   0,   0,   0,   0,   0,   0,
+     0,   0,1606,1607,1609,1608,1610,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+  1613,   0,1611,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,1612,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,1620,   0,   0,   0,   0,   0,   0,
+     0,1623,   0,   0,1624,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,1614,1615,1616,1617,1618,1619,1621,1622,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1628,1629,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1625,1626,   0,1627,
+     0,   0,   0,1634,   0,   0,1635,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,1630,1631,1632,   0,   0,1633,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,1639,   0,   0,1638,1640,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1636,1637,   0,   0,
+     0,   0,   0,   0,1641,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1642,1644,1643,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,1645,   0,   0,   0,   0,   0,   0,   0,
+  1646,   0,   0,   0,   0,   0,   0,1648,1649,   0,1647,1650,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1651,1653,1652,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1654,   0,1655,1657,1656,   0,
+     0,   0,   0,1659,   0,   0,   0,   0,   0,   0,   0,   0,   0,1660,   0,   0,
+     0,   0,1661,   0,   0,   0,   0,1662,   0,   0,   0,   0,1663,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,1658,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,1664,   0,1665,1673,   0,1674,   0,   0,   0,   0,   0,   0,   0,
+     0,1666,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,1668,   0,   0,   0,   0,   0,   0,   0,   0,   0,1669,   0,   0,
+     0,   0,1670,   0,   0,   0,   0,1671,   0,   0,   0,   0,1672,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,1667,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,1675,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,1676,   0,1677,   0,1678,   0,1679,   0,1680,   0,
+     0,   0,1681,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1682,   0,1683,   0,   0,
+  1684,1685,   0,1686,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   953,1138, 955,1140, 956,1141, 957,1142,1324,1351, 963,1148, 965,1150, 968,1153,
+   966,1151, 967,1152,1378,1380,1379,1381, 984,1169, 985,1170,1420,1421, 986,1171,
+   989,1174, 995,1180, 998,1183, 996,1181, 999,1184,1000,1185,1015,1200,1329,1356,
+  1017,1203,1019,1205,1021,1207,1024,1210,1687,1688,1027,1213,1026,1212,1028,1214,
+  1029,1215,1030,1216,1034,1220,1036,1222,1039,1225,1038,1224,1334,1361,1336,1363,
+  1382,1384,1383,1385,1056,1242,1057,1243,1059,1245,1063,1249,1689,1690,1065,1251,
+  1068,1254,1070,1256,1386,1387,1388,1389,1691,1692,1073,1259,1075,1262,1079,1266,
+  1078,1265,1095,1282,1098,1285,1097,1284,1390,1391,1392,1393,1099,1286,1100,1287,
+  1101,1288,1102,1289,1105,1292,1104,1291,1106,1294,1107,1295,1108,1296,1114,1302,
+  1119,1308,1122,1311,1123,1312,1186,1260,1293,1305,   0,1394,   0,   0,   0,   0,
+   952,1137, 947,1132,1317,1344,1316,1343,1319,1346,1318,1345,1693,1695,1371,1375,
+  1370,1374,1373,1377,1372,1376,1694,1696, 981,1166, 977,1162, 972,1157,1326,1353,
+  1325,1352,1328,1355,1327,1354,1697,1698,1009,1194,1013,1198,1054,1240,1048,1234,
+  1331,1358,1330,1357,1333,1360,1332,1359,1699,1700,1396,1401,1395,1400,1398,1403,
+  1397,1402,1399,1404,1094,1281,1087,1274,1406,1411,1405,1410,1408,1413,1407,1412,
+  1409,1414,1109,1297,1117,1306,1116,1304,1112,1300,   0,   0,   0,   0,   0,   0,
+  1471,1472,1701,1705,1702,1706,1703,1707,1430,1431,1715,1719,1716,1720,1717,1721,
+  1477,1478,1729,1731,1730,1732,   0,   0,1435,1436,1733,1735,1734,1736,   0,   0,
+  1481,1482,1737,1741,1738,1742,1739,1743,1439,1440,1751,1755,1752,1756,1753,1757,
+  1490,1491,1765,1768,1766,1769,1767,1770,1447,1448,1771,1774,1772,1775,1773,1776,
+  1495,1496,1777,1779,1778,1780,   0,   0,1451,1452,1781,1783,1782,1784,   0,   0,
+  1504,1505,1785,1788,1786,1789,1787,1790,   0,1459,   0,1791,   0,1792,   0,1793,
+  1509,1510,1794,1798,1795,1799,1796,1800,1462,1463,1808,1812,1809,1813,1810,1814,
+  1467,  21,1475,  22,1479,  23,1485,  24,1493,  27,1499,  28,1507,  29,   0,   0,
+  1704,1708,1709,1710,1711,1712,1713,1714,1718,1722,1723,1724,1725,1726,1727,1728,
+  1740,1744,1745,1746,1747,1748,1749,1750,1754,1758,1759,1760,1761,1762,1763,1764,
+  1797,1801,1802,1803,1804,1805,1806,1807,1811,1815,1816,1817,1818,1819,1820,1821,
+  1470,1469,1822,1474,1465,   0,1473,1825,1429,1428,1426,  12,1432,   0,  26,   0,
+     0,1315,1823,1484,1466,   0,1483,1829,1433,  13,1437,  14,1441,1826,1827,1828,
+  1488,1487,1513,  19,   0,   0,1492,1515,1445,1444,1442,  15,   0,1831,1832,1833,
+  1502,1501,1516,  25,1497,1498,1506,1518,1457,1456,1454,  17,1453,1313,  11,   3,
+     0,   0,1824,1512,1519,   0,1511,1830,1449,  16,1460,  18,1464,   4,   0,   0,
+    30,  31,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,  20,   0,   0,   0,   2,   6,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1834,1835,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1836,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1837,1839,1838,
+     0,   0,   0,   0,1840,   0,   0,   0,   0,1841,   0,   0,1842,   0,   0,   0,
+     0,   0,   0,   0,1843,   0,1844,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,1845,   0,   0,1846,   0,   0,1847,   0,1848,   0,   0,   0,   0,   0,   0,
+   937,   0,1850,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1849, 936, 938,
+  1851,1852,   0,   0,1853,1854,   0,   0,1855,1856,   0,   0,   0,   0,   0,   0,
+  1857,1858,   0,   0,1861,1862,   0,   0,1863,1864,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1867,1868,1869,1870,
+  1859,1860,1865,1866,   0,   0,   0,   0,   0,   0,1871,1872,1873,1874,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,  32,  33,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1875,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1877,   0,1878,   0,
+  1879,   0,1880,   0,1881,   0,1882,   0,1883,   0,1884,   0,1885,   0,1886,   0,
+  1887,   0,1888,   0,   0,1889,   0,1890,   0,1891,   0,   0,   0,   0,   0,   0,
+  1892,1893,   0,1894,1895,   0,1896,1897,   0,1898,1899,   0,1900,1901,   0,   0,
+     0,   0,   0,   0,1876,   0,   0,   0,   0,   0,   0,   0,   0,   0,1902,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1904,   0,1905,   0,
+  1906,   0,1907,   0,1908,   0,1909,   0,1910,   0,1911,   0,1912,   0,1913,   0,
+  1914,   0,1915,   0,   0,1916,   0,1917,   0,1918,   0,   0,   0,   0,   0,   0,
+  1919,1920,   0,1921,1922,   0,1923,1924,   0,1925,1926,   0,1927,1928,   0,   0,
+     0,   0,   0,   0,1903,   0,   0,1929,1930,1931,1932,   0,   0,   0,1933,   0,
+   710, 385, 724, 715, 455, 103, 186, 825, 825, 242, 751, 205, 241, 336, 524, 601,
+   663, 676, 688, 738, 411, 434, 474, 500, 649, 746, 799, 108, 180, 416, 482, 662,
+   810, 275, 462, 658, 692, 344, 618, 679, 293, 388, 440, 492, 740, 116, 146, 168,
+   368, 414, 481, 527, 606, 660, 665, 722, 781, 803, 809, 538, 553, 588, 642, 758,
+   811, 701, 233, 299, 573, 612, 487, 540, 714, 779, 232, 267, 412, 445, 457, 585,
+   594, 766, 167, 613, 149, 148, 560, 589, 648, 768, 708, 345, 411, 704, 105, 259,
+   313, 496, 518, 174, 542, 120, 307, 101, 430, 372, 584, 183, 228, 529, 650, 697,
+   424, 732, 428, 349, 632, 355, 517, 110, 135, 147, 403, 580, 624, 700, 750, 170,
+   193, 245, 297, 374, 463, 543, 763, 801, 812, 815, 162, 384, 420, 730, 287, 330,
+   337, 366, 459, 476, 509, 558, 591, 610, 726, 652, 734, 759, 154, 163, 198, 473,
+   683, 697, 292, 311, 353, 423, 572, 494, 113, 217, 259, 280, 314, 499, 506, 603,
+   608, 752, 778, 782, 788, 117, 557, 748, 774, 320, 109, 126, 260, 265, 373, 411,
+   479, 523, 655, 737, 823, 380, 765, 161, 395, 398, 438, 451, 502, 516, 537, 583,
+   791, 136, 340, 769, 122, 273, 446, 727, 305, 322, 400, 496, 771, 155, 190, 269,
+   377, 391, 406, 432, 501, 519, 599, 684, 687, 749, 776, 175, 452, 191, 480, 510,
+   659, 772, 805, 813, 397, 444, 619, 566, 568, 575, 491, 471, 707, 111, 636, 156,
+   153, 288, 346, 578, 256, 435, 383, 729, 680, 767, 694, 295, 128, 210,   0,   0,
+   227,   0, 379,   0,   0, 150, 493, 525, 544, 551, 552, 556, 783, 576, 604,   0,
+   661,   0, 703,   0,   0, 735, 743,   0,   0,   0, 793, 794, 795, 808, 741, 773,
+   118, 127, 130, 166, 169, 177, 207, 213, 215, 226, 229, 268, 270, 317, 327, 329,
+   335, 369, 375, 381, 404, 441, 448, 458, 477, 484, 503, 539, 545, 547, 546, 548,
+   549, 550, 554, 555, 561, 564, 569, 591, 593, 595, 598, 607, 620, 625, 625, 651,
+   690, 695, 705, 706, 716, 717, 733, 735, 777, 786, 790, 315, 869, 623,   0,   0,
+   102, 145, 134, 115, 129, 138, 165, 171, 207, 202, 206, 212, 227, 231, 240, 243,
+   250, 254, 294, 296, 303, 308, 319, 325, 321, 329, 326, 335, 341, 357, 360, 362,
+   370, 379, 388, 389, 393, 421, 424, 438, 456, 454, 458, 465, 477, 535, 485, 490,
+   493, 507, 512, 514, 521, 522, 525, 526, 528, 533, 532, 541, 565, 569, 574, 586,
+   591, 597, 607, 637, 647, 674, 691, 693, 695, 698, 703, 699, 705, 704, 702, 706,
+   709, 717, 728, 736, 747, 754, 770, 777, 783, 784, 786, 787, 790, 802, 825, 848,
+   847, 857,  55,  65,  66, 883, 892, 916, 822, 824,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1586,   0,1605,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1602,1603,1934,1935,1574,1575,
+  1576,1577,1579,1580,1581,1583,1584,   0,1585,1587,1588,1589,1591,   0,1592,   0,
+  1593,1594,   0,1595,1596,   0,1598,1599,1600,1601,1604,1582,1578,1590,1597,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1936,   0,1937,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1938,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1939,1940,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1941,1942,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1944,1943,   0,1945,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1946,1947,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,1948,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1949,1950,
+  1951,1952,1953,1954,1955,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1956,1957,1958,1960,1959,
+  1961,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   106, 104, 107, 826, 114, 118, 119, 121, 123, 124, 127, 125,  34, 830, 130, 131,
+   132, 137, 827,  35, 133, 139, 829, 142, 143, 112, 144, 145, 924, 151, 152,  37,
+   157, 158, 159, 160,  38, 165, 166, 169, 171, 172, 173, 174, 176, 177, 178, 179,
+   181, 182, 182, 182, 833, 468, 184, 185, 834, 187, 188, 189, 196, 192, 194, 195,
+   197, 199, 200, 201, 203, 204, 204, 206, 208, 209, 211, 218, 213, 219, 214, 216,
+   153, 234, 221, 222, 223, 220, 225, 224, 230, 835, 235, 236, 237, 238, 239, 244,
+   836, 837, 247, 248, 249, 246, 251,  39,  40, 253, 255, 255, 838, 257, 258, 259,
+   261, 839, 262, 263, 301, 264,  41, 266, 270, 272, 271, 841, 274, 842, 277, 276,
+   278, 281, 282,  42, 283, 284, 285, 286,  43, 843,  44, 289, 290, 291, 293, 934,
+   298, 845, 845, 621, 300, 300,  45, 852, 894, 302, 304,  46, 306, 309, 310, 312,
+   316,  48,  47, 317, 846, 318, 323, 324, 325, 324, 328, 329, 333, 331, 332, 334,
+   335, 336, 338, 339, 342, 343, 347, 351, 849, 350, 348, 352, 354, 359, 850, 361,
+   358, 356,  49, 363, 365, 367, 364,  50, 369, 371, 851, 376, 386, 378,  53, 381,
+    52,  51, 140, 141, 387, 382, 614,  78, 388, 389, 390, 394, 392, 856,  54, 399,
+   396, 402, 404, 858, 405, 401, 407,  55, 408, 409, 410, 413, 859, 415,  56, 417,
+   860, 418,  57, 419, 422, 424, 425, 861, 840, 862, 426, 863, 429, 431, 427, 433,
+   437, 441, 438, 439, 442, 443, 864, 436, 449, 450,  58, 454, 453, 865, 447, 460,
+   866, 867, 461, 466, 465, 464,  59, 467, 470, 469, 472, 828, 475, 868, 478, 870,
+   483, 485, 486, 871, 488, 489, 872, 873, 495, 497,  60, 498,  61,  61, 504, 505,
+   507, 508, 511,  62, 513, 874, 515, 875, 518, 844, 520, 876, 877, 878,  63,  64,
+   528, 880, 879, 881, 882, 530, 531, 531, 533,  66, 534,  67,  68, 884, 536, 538,
+   541,  69, 885, 549, 886, 887, 556, 559,  70, 561, 562, 563, 888, 889, 889, 567,
+    71, 890, 570, 571,  72, 891, 577,  73, 581, 579, 582, 893, 587,  74, 590, 592,
+   596,  75, 895, 896,  76, 897, 600, 898, 602, 605, 607, 899, 900, 609, 901, 611,
+   853,  77, 615, 616,  79, 617, 252, 902, 903, 854, 855, 621, 622, 731,  80, 627,
+   626, 628, 164, 629, 630, 631, 633, 904, 632, 634, 639, 640, 635, 641, 646, 651,
+   638, 643, 644, 645, 905, 907, 906,  81, 653, 654, 656, 911, 657, 908,  82,  83,
+   909, 910,  84, 664, 665, 666, 667, 669, 668, 671, 670, 674, 672, 673, 675,  85,
+   677, 678,  86, 681, 682, 912, 685, 686,  87, 689,  36, 913, 914,  88,  89, 696,
+   702, 709, 711, 915, 712, 713, 718, 719, 917, 831, 721, 720, 723, 832, 725, 728,
+   918, 919, 739, 742, 744, 920, 745, 753, 756, 757, 755, 760, 761, 921, 762,  90,
+   764, 922,  91, 775, 279, 780, 923, 925,  92,  93, 785, 926,  94, 927, 787, 787,
+   789, 928, 792,  95, 796, 797, 798, 800,  96, 929, 802, 804, 806,  97,  98, 807,
+   930,  99, 931, 932, 933, 814, 100, 816, 817, 818, 819, 820, 821, 935,   0,   0,
+};
+static const int16_t
+_hb_ucd_i16[196] =
+{
+      0,    0,    0,    0,    1,   -1,    0,    0,    2,    0,   -2,    0,    0,    0,    0,    2,
+      0,   -2,    0,    0,    0,    0,    0,   16,    0,    0,    0,  -16,    0,    0,    1,   -1,
+      0,    0,    0,    1,   -1,    0,    0,    0,    0,    1,   -1,    0,    3,    3,    3,   -3,
+     -3,   -3,    0,    0,    0, 2016,    0,    0,    0,    0,    0, 2527, 1923, 1914, 1918,    0,
+   2250,    0,    0,    0,    0,    0,    0,  138,    0,    7,    0,    0,   -7,    0,    0,    0,
+      1,   -1,    1,   -1,   -1,    1,   -1,    0, 1824,    0,    0,    0,    0,    0, 2104,    0,
+   2108, 2106,    0, 2106, 1316,    0,    0,    0,    0,    1,   -1,    1,   -1, -138,    0,    0,
+      1,   -1,    8,    8,    8,    0,    7,    7,    0,    0,   -8,   -8,   -8,   -7,   -7,    0,
+      1,   -1,    0,    2,-1316,    1,   -1,    0,   -1,    1,   -1,    1,   -1,    3,    1,   -1,
+     -3,    1,   -1,    1,   -1,    0,    0,-1914,-1918,    0,    0,-1923,-1824,    0,    0,    0,
+      0,-2016,    0,    0,    1,   -1,    0,    1,    0,    0,-2104,    0,    0,    0,    0,-2106,
+  -2108,-2106,    0,    0,    1,   -1,-2250,    0,    0,    0,-2527,    0,    0,   -2,    0,    1,
+     -1,    0,    1,   -1,
+};
+
+static inline uint_fast8_t
+_hb_ucd_gc (unsigned u)
+{
+  return u<1114110u?_hb_ucd_u8[6664+(((_hb_ucd_u8[1296+(((_hb_ucd_u16[((_hb_ucd_u8[544+(((_hb_ucd_u8[u>>1>>3>>3>>4])<<4)+((u>>1>>3>>3)&15u))])<<3)+((u>>1>>3)&7u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:2;
+}
+static inline uint_fast8_t
+_hb_ucd_ccc (unsigned u)
+{
+  return u<125259u?_hb_ucd_u8[8612+(((_hb_ucd_u8[8068+(((_hb_ucd_u8[7624+(((_hb_ucd_u8[7288+(((_hb_ucd_u8[7042+(u>>2>>2>>2>>3)])<<3)+((u>>2>>2>>2)&7u))])<<2)+((u>>2>>2)&3u))])<<2)+((u>>2)&3u))])<<2)+((u)&3u))]:0;
+}
+static inline unsigned
+_hb_ucd_b4 (const uint8_t* a, unsigned i)
+{
+  return (a[i>>1]>>((i&1u)<<2))&15u;
+}
+static inline int_fast16_t
+_hb_ucd_bmg (unsigned u)
+{
+  return u<65380u?_hb_ucd_i16[((_hb_ucd_u8[9356+(((_hb_ucd_u8[9236+(((_hb_ucd_b4(9108+_hb_ucd_u8,u>>2>>3>>3))<<3)+((u>>2>>3)&7u))])<<3)+((u>>2)&7u))])<<2)+((u)&3u)]:0;
+}
+static inline uint_fast8_t
+_hb_ucd_sc (unsigned u)
+{
+  return u<918000u?_hb_ucd_u8[10862+(((_hb_ucd_u16[2000+(((_hb_ucd_u8[10142+(((_hb_ucd_u8[9692+(u>>3>>4>>4)])<<4)+((u>>3>>4)&15u))])<<4)+((u>>3)&15u))])<<3)+((u)&7u))]:2;
+}
+static inline uint_fast16_t
+_hb_ucd_dm (unsigned u)
+{
+  return u<195102u?_hb_ucd_u16[5888+(((_hb_ucd_u8[16764+(((_hb_ucd_u8[16382+(u>>4>>5)])<<5)+((u>>4)&31u))])<<4)+((u)&15u))]:0;
+}
+
+
 #else
 
 static const uint8_t
-_hb_ucd_u8[13602] =
+_hb_ucd_u8[13246] =
 {
     0,  1,  2,  3,  4,  5,  6,  7,  7,  8,  7,  7,  7,  7,  7,  7,
     7,  7,  7,  7,  9, 10,  7,  7,  7,  7,  7, 11, 12, 12, 12, 13,
@@ -6146,331 +5025,309 @@ _hb_ucd_u8[13602] =
   220,  0,  0,230,220,  0,  0,  0,220,220,  0,  0,230,220,  0,  9,
     7,  0,  0,  7,  9,  0,  0,  0,  9,  7,  6,  6,  0,  0,  0,  0,
     1,  0,  0,216,216,  1,  1,  1,  0,  0,  0,226,216,216,216,216,
-  216,  0,220,220,220,  0,230,230,  7,  0, 16, 17, 17, 17, 17, 17,
-   17, 33, 17, 17, 17, 19, 17, 17, 17, 17, 20,101, 17,113,129,169,
-   17, 27, 28, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+  216,  0,220,220,220,  0,230,230,  7,  0, 16, 17, 17, 33, 17, 49,
+   17, 17, 84, 97,135,145, 26, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17,177,  0,  1,  2,  3,  3,  3,
+    3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  4,  3,
+    3,  3,  3,  3,  5,  3,  3,  3,  3,  3,  6,  7,  8,  3,  3,  3,
+    3,  3,  9, 10, 11, 12, 13,  3,  3,  3,  3,  3,  3,  3,  3, 14,
+    3, 15,  3,  3,  3,  3,  3,  3, 16, 17, 18, 19, 20, 21,  3,  3,
+    3, 22, 23, 24,  3,  3,  3,  3,  3,  3, 25,  3,  3,  3,  3,  3,
+    3,  3,  3, 26,  3,  3, 27, 28,  0,  1,  0,  0,  0,  0,  0,  1,
+    0,  2,  0,  0,  0,  3,  0,  0,  0,  3,  0,  0,  0,  0,  0,  4,
+    0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  6,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  8,  9,  0,  0,  0,  0,  0,  0,  9,  0,  9,  0,  0,  0,  0,
+    0,  0,  0, 10, 11, 12, 13,  0,  0, 14, 15, 16,  6,  0, 17, 18,
+   19, 19, 19, 20, 21, 22, 23, 24, 19, 25,  0, 26, 27, 19, 19, 28,
+   29, 30,  0, 31,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0, 19,
+   28,  0, 32, 33,  9, 34, 35, 19,  0,  0, 36, 37, 38, 39, 40, 19,
+    0, 41, 42, 43, 44, 31,  0,  1, 45, 42,  0,  0,  0,  0,  0, 32,
+   14, 14,  0,  0,  0,  0, 14,  0,  0, 46, 47, 47, 47, 47, 48, 49,
+   47, 47, 47, 47, 50, 51, 52, 53, 43, 21,  0,  0,  0,  0,  0,  0,
+    0, 54,  6, 55,  0, 14, 19,  1,  0,  0,  0,  0, 56, 57,  0,  0,
+    0,  0,  0, 19, 58, 31,  0,  0,  0,  0,  0,  0,  0, 59, 14,  0,
+    0,  0,  0,  1,  0,  2,  0,  0,  0,  3,  0,  0,  0, 60, 61,  0,
+    0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  2,  3,  0,  4,
+    5,  0,  0,  6,  0,  0,  0,  7,  0,  0,  0,  1,  1,  0,  0,  8,
+    9,  0,  8,  9,  0,  0,  0,  0,  8,  9, 10, 11, 12,  0,  0,  0,
+   13,  0,  0,  0,  0, 14, 15, 16, 17,  0,  0,  0,  1,  0,  0, 18,
+   19,  0,  0,  0, 20,  0,  0,  0,  1,  1,  1,  1,  0,  1,  1,  1,
+    1,  1,  1,  1,  0,  8, 21,  9,  0,  0, 22,  0,  0,  0,  0,  1,
+    0, 23, 24, 25,  0,  0, 26,  0,  0,  0,  8, 21, 27,  0,  1,  0,
+    0,  1,  1,  1,  1,  0,  1, 28, 29, 30,  0, 31, 32, 20,  1,  1,
+    0,  0,  0,  8, 21,  9,  1,  4,  5,  0,  0,  0, 33,  9,  0,  1,
+    1,  1,  0,  8, 21, 21, 21, 21, 34,  1, 35, 21, 21, 21,  9, 36,
+    0,  0, 37, 38,  1,  0, 39,  0,  0,  0,  1,  0,  1,  0,  0,  0,
+    0,  8, 21,  9,  1,  0,  0,  0, 40,  0,  8, 21, 21, 21, 21, 21,
+   21, 21, 21,  9,  0,  1,  1,  1,  1,  8, 21, 21, 21,  9,  0,  0,
+    0, 41,  0, 42, 43,  0,  0,  0,  1, 44,  0,  0,  0, 45,  8,  9,
+    1,  0,  0,  0,  8, 21, 21, 21,  9,  0,  1,  0,  1,  1,  8, 21,
+   21,  9,  0,  4,  5,  8,  9,  1,  0,  0,  0,  1,  2,  3,  3,  4,
+    5,  6,  7,  8,  9, 10, 11, 12, 13, 14,  3,  3,  3,  3,  3,  3,
+    3, 15, 16, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17,237,  0,  1,  2,  2,  0,  3,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  5,  0,  0,  0,  0,  6,  7,  8,  9,  0,
-    0,  0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 20,  0,  0, 21, 22,  0,  0,  0,  0, 23, 24,
-   25, 26,  0, 27,  0, 28, 29, 30, 31, 32,  0,  0,  0,  0,  0,  0,
-    0, 33, 34, 35, 36,  0,  0,  0,  0,  0, 37,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 38, 39,  0,  0,  0,  0,  1,  2, 40, 41,  0,  1,
-    2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
-    0,  2,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,  5,  0,  0,  0,
-    6,  0,  0,  0,  0,  0,  0,  0,  7,  1,  0,  0,  0,  0,  0,  0,
-    8,  9,  0,  0,  0,  0,  0,  0, 10,  0,  0, 10,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0, 10,  0,  0,
-    0,  0,  0,  0, 11, 12,  0, 13,  0, 14, 15, 16,  0,  0,  0,  0,
-    0,  1, 17, 18,  0, 19,  7,  1,  0,  0,  0, 20, 20,  7, 20, 20,
-   20, 20, 20, 20, 20,  8, 21,  0, 22,  0,  7, 23, 24,  0, 20, 20,
-   25,  0,  0,  0, 26, 27,  1,  7, 20, 20, 20, 20, 20,  1, 28, 29,
-   30, 31,  0,  0, 20,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,
-    0,  0,  0,  0, 20, 20, 20,  1,  0,  0,  8, 21, 32,  4,  0, 10,
-    0, 33,  7, 20, 20, 20,  0,  0,  0,  0,  8, 34, 34, 35, 36, 34,
-   37,  0, 38,  1, 20, 20,  0,  0, 39,  0,  1,  1,  0,  8, 21,  1,
-   20,  0,  0,  0,  1,  0,  0, 40,  1,  1,  0,  0,  8, 21,  0,  1,
-    0,  1,  0,  1,  0,  0,  0,  0, 26, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 21,  7, 20, 41, 34, 34, 34, 34, 34, 34, 34, 34, 34, 21,
-    0, 42, 43, 44,  0, 45,  0,  8, 21,  0,  0,  0,  0,  0,  0,  0,
-    0, 46,  7,  1, 10,  1,  0,  0,  0,  1, 20, 20,  1,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 26, 34,  9,  0,  0, 20, 20,  1, 20,
-   20,  0,  0,  0,  0,  0,  0,  0, 26, 21,  0,  1,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  3, 47, 48,  0,  0,  0,  0,  0,
-    0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  7,  8,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  9, 10, 11, 11, 11, 11, 11, 12, 12, 12,
-   12, 13, 14, 15, 16, 17, 18, 19, 20, 12, 21, 12, 12, 12, 12, 22,
-   23, 23, 23, 24, 12, 12, 12, 25, 26, 27, 12, 28, 29, 30, 31, 32,
-   33, 34,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 35,
-   12, 36,  7,  7, 37, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 38,  0,  0,  1,  2,  2,  2,  3,  4,  5,  6,  7,  8,  9,
-   10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
-   26, 27, 28, 29, 30, 31, 32, 32, 33, 33, 33, 34, 35, 35, 35, 35,
-   35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-    2,  2, 51, 51, 52, 53, 54, 55, 56, 56, 56, 56, 56, 56, 56, 56,
-   56, 56, 56, 56, 57, 57, 56, 56, 56, 56, 56, 56, 58, 59, 60, 61,
-   56, 62, 62, 63, 64, 65, 66, 67, 68, 69, 70, 56, 62, 62, 62, 62,
-   62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
-   62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 71,
-   62, 62, 62, 62, 72, 72, 72, 72, 72, 72, 72, 72, 72, 73, 74, 74,
-   75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 32, 32, 32, 32,
-   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-   32, 32, 32, 32, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
-   87, 87, 87, 87, 87, 87, 62, 62, 62, 62, 88, 89, 89, 89, 90, 89,
-   91, 92, 93, 94, 95, 95, 96, 97, 87, 98, 99,100,101,102,103,104,
-  105,105,105,  2,106,107,108,109,110,111,112,113,114,115,116, 87,
-   89,117,118,119,120,121,122,123,124,125,126, 87,127,128, 87,129,
-  130,131,132, 87,133,134,135,136,137,138, 87, 87,139,140,141,142,
-   87,143, 87,144,145,145,145,145,145,145,145,145,145,145,145, 87,
-   87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
-   87, 87, 87,146,147,147,147,147,147,147,147,147,147, 87, 87, 87,
-   87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,148,148,148,148,
-  148, 87, 87, 87,149,149,149,149,150,151,152,152, 87, 87, 87, 87,
-  153,153,154,155,156,156,156,156,156,156,156,156,156,156,156,156,
-  156,156,156,156,156,156,156,156,156,156,157,157,157,157,156, 87,
-   87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
-   87, 87, 87,158,159,160,161,162,162,162, 87, 87, 87, 87, 87, 87,
-   87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,163,164, 87, 87,
-   87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
-   87, 87,165, 56, 56, 56,166,167, 51, 56, 56, 87, 56, 56, 56, 56,
-   56, 56, 56, 56,168,168,168,168,168,168, 87, 87, 87, 87, 87, 87,
-   87, 87,  2, 87,169, 87,170, 87, 87,171, 87, 87, 87, 87, 87, 87,
-   87, 87, 87, 33,172,172,173, 87, 87, 87, 87, 87, 56, 56, 56, 87,
-   89, 89, 87, 87, 56, 56, 56, 56,174, 87, 56, 56, 56, 56, 56, 56,
-   56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 87, 87, 87, 87,
-   87, 87, 87, 87, 62, 62, 62, 62, 62, 62, 62, 62, 87, 87, 87, 87,
-   87, 87, 87, 87, 62, 62, 62, 62, 62, 87, 87, 87, 87, 87, 87, 87,
-   87, 87, 87, 87, 62, 62, 62, 62, 62, 62, 62, 87, 87, 87, 87, 87,
-   87, 87, 87, 87, 56, 87,175,175,  0,  1,  2,  2,  0,  1,  2,  2,
-    2,  3,  4,  5,  0,  0,  0,  0,  1,  2,  1,  2,  0,  0,  3,  3,
-    4,  5,  4,  5,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  6,
-    0,  0,  7,  0,  8,  8,  8,  8,  8,  8,  8,  9, 10, 11, 11, 11,
-   11, 11, 12, 11, 13, 13, 13, 13, 13, 13, 13, 13, 14, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 15, 16, 16, 16, 16, 16, 17, 18, 18,
-   18, 18, 18, 18, 19, 20, 21, 21, 22, 23, 21, 24, 21, 21, 21, 21,
-   21, 25, 21, 21, 26, 26, 26, 26, 26, 21, 21, 21, 27, 27, 27, 27,
-   28, 28, 28, 28, 29, 29, 29, 29, 30, 30, 26, 21, 21, 21, 21, 21,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 18,  0,  0,  1,  2,  3,
+    4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 17, 17,
+   18, 17, 19, 20, 21, 22, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+   23, 23, 24, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+   23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 25, 25, 26, 27,
+   28, 29, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
+   30, 30, 30, 30, 30, 30, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31,
+   31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+   40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 52, 53, 31,
+   31, 31, 31, 54, 55, 55, 56, 31, 31, 31, 31, 31, 31, 31, 57, 58,
+   31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+   59, 60, 31, 61, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
+   62, 63, 64, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+   31, 31, 31, 65, 66, 67, 31, 31, 31, 31, 68, 31, 31, 31, 31, 31,
+   31, 31, 31, 69, 70, 71, 17, 17, 72, 73, 31, 74, 75, 76, 31, 77,
+   78, 31, 79, 80, 17, 81, 17, 17, 17, 17, 31, 31, 23, 23, 23, 23,
+   23, 23, 31, 31, 31, 31, 31, 31, 23, 82, 31, 31, 23, 23, 23, 23,
+   23, 23, 23, 23, 23, 83, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+   31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 84,  0,  0,  1,
+    0,  1,  2,  3,  0,  1,  2,  3,  4,  5,  6,  7,  0,  1,  2,  3,
+    4,  4,  4,  4,  4,  4,  5,  6,  7,  8,  9, 10, 11, 11, 12, 11,
+   13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 19, 27,
+   28, 29, 30, 30, 31, 31, 32, 32, 33, 33, 34, 34, 35, 35, 36, 36,
+   37, 37, 38, 38, 39, 40, 41, 41, 42, 42, 42, 43, 44, 44, 45, 46,
+   47, 47, 47, 47, 48, 48, 48, 48, 48, 48, 49, 50, 51, 51, 51, 51,
+   51, 51, 51, 51, 51, 51, 52, 53, 54, 55, 56, 56, 57, 58, 59, 51,
+   60, 61, 62, 63, 64, 65, 66,  7, 67, 67, 68, 69, 70, 71, 72, 73,
+   74, 75, 76,  7,  4,  4,  4,  4, 77, 77, 77, 77, 78, 79, 80, 81,
+   82, 83, 84,  0,  0,  0,  0,  0,  0,  0,  0,  0, 85, 85, 85, 85,
+    0,  0,  0,  0, 86, 87, 88, 88, 89, 90, 48, 91,  0,  0, 92, 92,
+   92, 92, 92, 93, 94, 95, 96, 97, 98, 47, 99,100,101,102,  0,103,
+  104,105,  0,  0, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
+   92, 92, 92,  0,106,106,106,106,106,106,106,106,106,106,106,107,
+  108,108,108,108,108, 11,109,110,111,  4,112,  4,113,114,115,116,
+  117,118,119,120,121,122,123,124,125,126, 50,127, 47, 47, 47, 47,
+   47, 47, 47, 47,128,128,128,128,128,128,128,128,128,128,128,128,
+   92, 92, 92, 92, 92, 92, 92, 92,129,130, 19, 19, 19, 19, 19, 19,
+  131, 19, 19, 19,132,133, 19,134,135,136,137,101,138,138,138,138,
+    0, 77,139,140,128,128,141,142,143,144,145,146,147,148,149,150,
+  151,152,153,153,154,154,154,154,154,154,  4,  4,155,156,157,158,
+  159,160,161,162,163,164,165,166,167,168,169,169,170,170,171,171,
+  172,172,128,128, 19, 19,173,173,174,175,176,177,178,178,179,180,
+  181,182,183,184,185,185,186,187,188,189,128,128,190,190,191,191,
+  128,128,192,192,193,194,195,195,196,196,128,128,197,197,198,198,
+  199,199,200,200,201,202,203,204,128,128,128,128,205,206,207,207,
+  208,209,210,210,128,128,211,211,128,128,212, 34,213,213,213,213,
+  213,213,213,213,213,213,213,213,213,213,128,128,128,128,128,128,
+  128,128,214,214,215,215,215,215,215,215,215,215,215,215,128,128,
+  128,128,128,128,216,216,216,216,216,216,216,216,216,216,128,128,
+  128,128,128,128,110,110,110,110,110,110,110,110,110,217,218,219,
+  220,220,220,220,221,221,221,221,222,222,222,223,224,224,224,224,
+  224,224,224,224,224,224,224,224,225,225,225,225,225,225,225,225,
+  224,224,128,128,128,128,128,128,128,128,104,104,226,227,227,227,
+  228,229,230,230,230,230,230,230,128,128,128,128,231,231,232,  0,
+  128,128,128,128,128,128,128,128,  7,233,  0,  0,  0,  0,  0,  0,
+    0,234,235,  0, 77, 77,  0,  0,  0,  0,128,128,236,236,236,236,
+  236,236,236,236,236,236,236,236,128,128,128,128,128,128,128,128,
+    4,  4,128,128, 86, 86,128,128,237,237,128,128,128,128,238,239,
+  128,128,128,128,128,128,128,128,128,128, 48, 48,240,240,240,240,
+  241,241,128,128,  0,  0,  0,  0,  0,  0,128,128, 19, 19, 19, 19,
+  128,128,128,128,242,  0,128,128,  0,  0,  0,  0, 92, 92,128,128,
+  128,128,128,128, 92, 92, 92, 92, 92, 92,128,128,  0,  0,128,128,
+    7,  7,  7,  7,  0,  0,  0,  0,  1,  2,  1,  2,  0,  0,  3,  3,
+    4,  5,  4,  5,  4,  4,  4,  4,  4,  4,  4,  6,  0,  0,  7,  0,
+    8,  8,  8,  8,  8,  8,  8,  9, 10, 11, 11, 11, 11, 11, 12, 11,
+   13, 13, 13, 13, 14, 13, 13, 13, 13, 13, 13, 15, 16, 16, 16, 16,
+   16, 17, 18, 18, 18, 18, 18, 18, 19, 20, 21, 21, 22, 23, 21, 24,
+   21, 21, 21, 21, 21, 25, 21, 21, 26, 26, 26, 26, 26, 21, 21, 21,
+   27, 27, 27, 27, 28, 28, 28, 28, 29, 29, 29, 29, 30, 30, 26, 21,
    21, 21, 31, 21, 32, 32, 32, 32, 32, 33, 34, 32, 35, 35, 35, 35,
-   35, 35, 35, 35, 36, 36, 36, 36, 36, 36, 36, 36, 37, 37, 37, 37,
-   37, 37, 37, 37, 38, 38, 38, 38, 38, 38, 38, 38, 39, 39, 39, 39,
-   39, 39, 39, 39, 40, 40, 40, 40, 40, 40, 40, 40, 41, 41, 41, 41,
-   41, 41, 41, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 43, 43, 43,
-   43, 43, 43, 43, 44, 44, 44, 45, 44, 44, 44, 44, 46, 46, 46, 46,
-   46, 46, 46, 46, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
-   47, 48, 47, 47, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 50, 50,
-   50, 50, 50, 51, 52, 52, 52, 52, 52, 52, 52, 52, 53, 53, 53, 53,
-   53, 53, 53, 53, 53, 53, 54, 54, 54, 54, 54, 54, 55, 55, 55, 55,
+   36, 36, 36, 36, 37, 37, 37, 37, 38, 38, 38, 38, 39, 39, 39, 39,
+   40, 40, 40, 40, 41, 41, 41, 41, 42, 42, 42, 42, 43, 43, 43, 43,
+   44, 44, 44, 45, 44, 44, 44, 44, 46, 46, 46, 46, 47, 47, 47, 47,
+   47, 48, 47, 47, 49, 49, 49, 49, 49, 49, 50, 50, 50, 50, 50, 51,
+   52, 52, 52, 52, 53, 53, 53, 53, 53, 53, 54, 54, 54, 54, 54, 54,
    55, 55, 55, 55, 56, 56, 57, 57, 57, 57, 58, 57, 59, 59, 60, 61,
-   62, 62, 63, 63, 64, 64, 64, 64, 64, 64, 64, 64, 65, 66, 66, 66,
-   66, 66, 66, 66, 66, 66, 66, 55, 55, 55, 55, 55, 67, 67, 67, 67,
-   67, 68, 68, 68, 69, 69, 69, 69, 69, 69, 64, 64, 70, 70, 71, 71,
-   71, 71, 71, 71, 71, 71, 71,  8,  8,  8,  8,  8, 72, 72, 72, 72,
+   62, 62, 63, 63, 64, 64, 64, 64, 65, 66, 66, 66, 66, 66, 66, 66,
+   66, 66, 66, 55, 67, 67, 67, 67, 67, 68, 68, 68, 69, 69, 69, 69,
+   69, 69, 64, 64, 70, 70, 71, 71, 71, 71, 71, 71, 71, 71, 71,  8,
    72, 72, 72, 72, 73, 73, 73, 73, 74, 74, 74, 74, 75, 75, 75, 75,
    75, 76, 76, 76, 13, 50, 50, 50, 73, 77, 78, 79,  4,  4, 80,  4,
-    4, 81, 82, 83,  4,  4,  4, 84,  8,  8,  8,  8, 11, 11, 11, 11,
-   11, 11, 11, 11, 85,  0,  0,  0,  0,  0,  0, 86,  0,  4,  0,  0,
-    0,  8,  8,  8,  0,  0, 87, 88, 89,  0,  4,  4,  6,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 90, 90, 90, 90,
-   90, 90, 90, 90, 91, 91, 91, 91, 91, 91,  4,  4, 92, 92, 92, 92,
-   92, 92, 92, 92, 50, 50, 50, 93, 93, 93, 93, 93, 53, 53, 53, 53,
-   53, 53, 13, 13, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
-   94, 94, 94,  0, 95,  0, 96, 97, 98, 99, 99, 99, 99,100,101,102,
-  102,102,102,103,104,104,104,105, 52, 52, 52, 52, 52,  0,104,104,
-    0,  0,  0,102, 52, 52,  0,  0,  0,  0, 52,106,  0,  0,  0,  0,
-    0,102,102,107,102,102,102,102,102,108,  0,  0, 94, 94, 94, 94,
-    0,  0,  0,  0,109,109,109,109,109,109,109,109,109,109,109,109,
-  109,110,110,110,111,111,111,111,111,111,111,111,111,111,111,111,
-   13, 13, 13, 13, 13, 13,112,112,112,112,112,112,  0,  0,113,  4,
-    4,  4,  4,  4,114,  4,  4,  4,  4,  4,  4,  4,115,115,115,  0,
-  116,116,116,116,117,117,117,117,117,117, 32, 32,118,118,119,120,
-  120,120, 52, 52,121,121,121,121,122,121, 49, 49,123,123,123,123,
-  123,123, 49, 49,124,124,124,124,124,124,125,125, 53, 53, 53,  4,
-    4,126,127, 54, 54, 54, 54, 54,125,125,125,125,128,128,128,128,
-  128,128,128,128,  4,129, 18, 18, 18, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21,130, 21, 21, 21, 21,  8,  0,131,  0,
-    0,  0,  0, 21, 21, 21, 21, 21, 21, 21, 21,132,  0,  0,  1,  2,
-    1,  2,133,101,102,134, 52, 52, 52, 52,  0,  0,135,135,135,135,
-  135,135,135,135,  0,  0,  0,  0, 11, 11, 11, 11, 11,  0, 11, 11,
-   11,  0,  0,136,137,137,138,138,138,138,139,  0,140,140,140,141,
-  141,142,142,142,143,143,144,144,144,144,144,144,145,145,145,145,
-  145,146,146,146,147,147,147,148,148,148,148,148,149,149,149,150,
-  150,150,150,151,151,151,151,151,151,151,151,151,152,152,152,152,
-  152,152,152,152,153,153,153,153,154,154,155,155,156,156,156,156,
-  156,156,157,157,158,158,159,159,159,159,159,159,160,160,161,161,
-  161,161,161,161,162,162,162,162,162,162,163,163,164,164,164,164,
-  165,165,165,165,166,166,166,166,167,167,168,168,169,169,169,169,
-  169,169,169,169,170,170,170,170,170,170,170,170,171,171,171,171,
-  171,171,171,171,172,172,172,172,172,172,172,172,173,173,173,173,
-  173,173,173,173,174,174,174,175,175,175,175,176,176,176,176,177,
-  177,177,178,178,179,179,179,179,179,179,179,179,180,180,180,180,
-  180,181,181,181,182,182,182,182,182,183,183,183,184,184,184,184,
-  184,184,185, 43,186,186,186,186,186,186,186,186,187,187,187,188,
+    4, 81, 82, 83,  4,  4,  4, 84, 11, 11, 11, 11, 85,  0,  0,  0,
+    0,  0,  0, 86,  0,  4,  0,  0,  0,  8,  8,  8,  0,  0, 87, 88,
+   89,  0,  4,  4,  6,  0,  0,  0, 90, 90, 90, 90, 91, 91, 91, 91,
+   91, 91,  4,  4, 92, 92, 92, 92, 50, 50, 50, 93, 93, 93, 93, 93,
+   53, 53, 13, 13, 94, 94, 94, 94, 94, 94, 94,  0, 95,  0, 96, 97,
+   98, 99, 99, 99, 99,100,101,102,102,102,102,103,104,104,104,105,
+   52,  0,104,104,  0,  0,  0,102, 52, 52,  0,  0,  0,  0, 52,106,
+    0,102,102,107,102,102,102,102,102,108,  0,  0,109,109,109,109,
+  109,110,110,110,111,111,111,111, 13, 13,112,112,112,112,112,112,
+    0,  0,113,  4,114,  4,  4,  4,115,115,115,  0,116,116,116,116,
+  117,117,117,117,117,117, 32, 32,118,118,119,120,120,120, 52, 52,
+  121,121,121,121,122,121, 49, 49,123,123,123,123,123,123, 49, 49,
+  124,124,124,124,124,124,125,125, 53, 53, 53,  4,  4,126,127, 54,
+  125,125,125,125,128,128,128,128,  4,129, 18, 18, 18, 21, 21, 21,
+   21, 21, 21,130,  8,  0,131,  0,  0,  0,  0, 21, 21, 21, 21,132,
+    0,  0,  1,  2,  1,  2,133,101,102,134, 52, 52,135,135,135,135,
+   11,  0, 11, 11, 11,  0,  0,136,137,137,138,138,138,138,139,  0,
+  140,140,140,141,141,142,142,142,143,143,144,144,144,144,144,144,
+  145,145,145,145,145,146,146,146,147,147,147,148,148,148,148,148,
+  149,149,149,150,150,150,150,151,151,151,151,151,152,152,152,152,
+  153,153,153,153,154,154,155,155,156,156,156,156,156,156,157,157,
+  158,158,159,159,159,159,159,159,160,160,161,161,161,161,161,161,
+  162,162,162,162,162,162,163,163,164,164,164,164,165,165,165,165,
+  166,166,166,166,167,167,168,168,169,169,169,169,170,170,170,170,
+  171,171,171,171,172,172,172,172,173,173,173,173,174,174,174,175,
+  175,175,175,176,176,176,176,177,177,177,178,178,179,179,179,179,
+  180,180,180,180,180,181,181,181,182,182,182,182,182,183,183,183,
+  184,184,184,184,184,184,185, 43,186,186,186,186,187,187,187,188,
   188,188,188,188,189,189,189,190,189,189,189,189,191,191,191,191,
-  191,191,191,191,192,192,192,192,192,192,192,192,193,193,193,193,
-  193,193,193,193,194,194,194,194,194,194, 66, 66,195,195,195,195,
-  195,195,195,195,196,196,196,196,196,196,196,196,197,197,197,197,
-  197,197,197,197,198,198,198,198,198,198,198,198,199,199,199,199,
-  199,199,199,199,200,200,200,200,200,200,200,200,201,201,201,201,
-  201,202,202,202,202,202,202, 55,203,203,203,203,204,204,204,204,
-  204,204,204,205,205,205,205,205,205,205,205,205,206,206,206,206,
-  206,206,207,207,207,207,207,207,207,207,207,207,208,208,208,208,
-  208,208,208,208,110,110,110,110, 39, 39, 39, 39,209,209,209,209,
-  209,209,209,209,210,210,210,210,210,210,210,210,211,211,211,211,
-  211,211,211,211,212,212,212,212,212,212,212,212,112,112,112,112,
-  112,112,112,112,112,112,112,112,213,213,213,214,214,214,214,214,
-  214,215,215,215,216,216,216,216,216,216,216,216,217,217,217,217,
-  217,217,217,217,218,218,218,218,218,218,218,218,218,218,218,218,
-  218,218,219, 94,220,220,220,220,220,220,220,220,221,221,221,221,
-  221,221,221,221,102,102,102,102,102,102,102,102,222, 99, 99, 99,
-   99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,102,102,
-  102, 99,223,224,224,224,224,224,224,224,224,224,225,225,225,225,
-  225,225,225,225,225,225,  0,  0,  0,  0,  0,  0,  8,  8,  8,  8,
-    8,  0,  0,  0,  0,  0,  0,  0,  0,  0,226,227,228,  0,229,  0,
-    0,  0,  0,  0,230,230,230,230,230,230,230,230, 91, 91, 91, 91,
-   91, 91, 91, 91,231,231,231,231,231,231,231,231,232,232,232,232,
-  233,233,233,233,234,234,234,234,234,234,234,234,235,235,235,235,
-  235,235,235,235,236,  0,  0,  0,  0,  0,  0,  0,  8,  8,  8,  8,
-    8,  8,  8,  8,  0,  0,  0,  0,  1,  2,  2,  2,  2,  2,  3,  0,
-    0,  0,  4,  0,  2,  2,  2,  2,  2,  3,  2,  2,  2,  2,  5,  0,
-    2,  5,  6,  0,  7,  7,  7,  7,  8,  9,  8, 10,  8, 11,  8,  8,
-    8,  8,  8,  8, 12, 13, 13, 13, 14, 14, 14, 14, 14, 15, 14, 14,
-   16, 17, 17, 17, 17, 17, 17, 17, 18, 19, 19, 19, 19, 19, 19, 19,
-   20, 21, 20, 22, 20, 20, 23, 23, 20, 20, 20, 20, 22, 20, 24,  7,
-    7, 25, 20, 20, 26, 20, 20, 20, 20, 20, 20, 21, 27, 27, 27, 27,
-   28, 28, 28, 28, 29, 29, 29, 29, 30, 30, 30, 30, 31, 31, 31, 31,
-   32, 20, 20, 20, 33, 33, 33, 33, 34, 35, 33, 33, 33, 36, 33, 33,
-   37, 37, 37, 37, 38, 38, 38, 38, 39, 39, 39, 39, 40, 40, 40, 40,
-   41, 41, 41, 41, 42, 42, 42, 42, 43, 43, 43, 43, 44, 44, 44, 44,
-   45, 45, 45, 45, 46, 46, 46, 46, 46, 46, 46, 47, 48, 48, 48, 48,
-   49, 49, 49, 49, 49, 50, 51, 49, 52, 52, 52, 52, 53, 53, 53, 53,
-   53, 53, 54, 53, 55, 55, 55, 55, 56, 56, 56, 56, 57, 57, 57, 57,
-   58, 58, 58, 58, 59, 59, 59, 59, 60, 60, 60, 60, 60, 60, 61, 62,
-   63, 63, 63, 63, 64, 64, 64, 64, 64, 65,  0,  0, 66, 66, 66, 66,
-   67, 67, 67, 67, 68, 68, 68, 68, 69, 70, 71, 71, 71, 71, 71, 71,
-   72, 72, 72, 72, 73, 73, 73, 73, 74, 74, 74, 74, 75, 75, 75, 75,
-   76, 76, 76, 76, 77, 77, 77, 77, 78, 78, 78, 78, 79, 79, 79, 79,
-   80, 80, 80, 80, 81, 81, 81, 81, 82,  7,  7,  7, 83,  7, 84, 85,
-    0, 84, 86,  0,  2, 87, 88,  2,  2,  2,  2, 89, 90, 87, 91,  2,
-    2,  2, 92,  2,  2,  2,  2, 93,  0,  0,  0, 86,  1,  0,  0, 94,
-    0, 95, 96,  0,  4,  0,  0,  0,  0,  0,  0,  4, 97, 97, 97, 97,
-   98, 98, 98, 98, 13, 13, 13, 13, 99, 99, 99, 99,100,100,100,100,
-    0,101,  0,  0,102,100,103,104,  0,  0,100,  0,105,106,106,106,
-  106,106,106,106,106,106,107,105,108,109,109,109,109,109,109,109,
-  109,109,110,108,111,111,111,111,112, 55, 55, 55, 55, 55, 55,113,
-  109,109,109,110,109,109,  0,  0,114,114,114,114,115,115,115,115,
-  116,116,116,116,117,117,117,117, 96,  2,  2,  2,  2,  2, 94,  2,
-  118,118,118,118,119,119,119,119,120,120,120,120,121,121,121,121,
-  121,121,121,122,123,123,123,123,124,124,124,124,124,124,124,125,
-  126,126,126,126,127,127,127,127,128,128,128,128,  2,  2,  3,  2,
-    2,129,130,  0,131,131,131,131,132, 17, 17, 18, 20, 20, 20,133,
-    7,  7,  7,134, 20, 20, 20, 23,  0,135,109,109,109,109,109,136,
-  137,137,137,137,  0,  0,  0,138,139,139,139,139,140,140,140,140,
-   84,  0,  0,  0,141,141,141,141,142,142,142,142,143,143,143,143,
-  144,144,144,144,145,145,145,145,146,146,146,146,147,147,147,147,
-  148,148,148,148,149,149,149,149,150,150,150,150,151,151,151,151,
-  152,152,152,152,153,153,153,153,154,154,154,154,155,155,155,155,
-  156,156,156,156,157,157,157,157,158,158,158,158,159,159,159,159,
-  160,160,160,160,161,161,161,161,162,162,162,162,163,163,163,163,
-  164,164,164,164,165,165,165,165,166,166,166,166,167,167,167,167,
-  168,168,168,168,169,169,169,169,170,170,170,170,171,171,171,171,
-  172,172,172,172,173,173,173,173,174,174,174,174,175,175,175,175,
-  176,176,176,176,177,177,177,177,178,178,178,178,179,179,179,179,
-  180,180,180,180,181,181,181,181,182,182,182,182,183,183,183,183,
-  184,184,184,184,185,185,185,185,186, 45, 45, 45,187,187,187,187,
-  188,188,188,188,189,189,189,189,190,190,190,190,190,190,191,190,
-  192,192,192,192,193,193,193,193,194,194,194,194,195,195,195,195,
-  196,196,196,196,197,197,197,197,198,198,198,198,199,199,199,199,
-  200,200,200,200,201,201,201,201,202,202,202,202,203,203,203,203,
-  204,204,204,204,205,205,205,205,206,206,206,206,207,207,207,207,
-  208,208,208,208,209,209,209,209,210,210,210,210,211,211,211,211,
-  212,212,212,212,213,213,213,213,214,214,214,214,215,215,215,215,
-  216,216,216,216,217,217,217,217,218,218,218,218,219,219,219,219,
-  220,221,221,221,222,222,222,222,221,221,221,221,223,106,106,106,
-  106,109,109,109,224,224,224,224,225,225,225,225,  0,226, 86,  0,
-    0,  0,226,  7, 82,138,  7,  0,  0,  0,227, 86,228,228,228,228,
-  229,229,229,229,230,230,230,230,231,231,231,231,232,232,232,232,
-  233,233,233,233,234,  0,  0,  0,  0,  0,  0,  0,  0, 19, 19, 19,
-   19, 19, 19, 19, 19, 19, 19,  0,  0,  0, 19,  0, 19,  0,  0,  0,
-    0,  0, 26, 26,  1,  1,  1,  1,  9,  9,  9,  9,  0,  9,  9,  9,
-    9,  9,  0,  9,  9,  0,  9,  0,  9,  9, 55, 55, 55, 55, 55, 55,
-    6,  6,  6,  6,  6,  1,  1,  6,  6,  4,  4,  4,  4,  4,  4,  4,
-    4, 14, 14, 14, 14, 14, 14, 14,  3,  3,  3,  3,  3,  0,  3,  3,
-    0,  3,  3,  3,  3,  3,  3,  0,  3,  3,  3,  1,  1,  1,  3,  3,
-    1,  3,  3,  3, 37, 37, 37, 37, 38, 38, 38, 38, 64, 64, 64, 64,
-   90, 90, 90, 90, 95, 95, 95, 95,  3,  3,  0,  3,  7,  7,  7,  7,
-    7,  1,  1,  1,  1,  7,  7,  7,  0,  0,  7,  7,  5,  5,  5,  5,
-   11, 11, 11, 11, 10, 10, 10, 10, 21, 21, 21, 21, 22, 22, 22, 22,
-   23, 23, 23, 23, 16, 16, 16, 16, 20, 20, 20, 20, 36, 36, 36, 36,
-   24, 24, 24, 24, 24, 24, 24,  0, 18, 18, 18, 18, 25, 25, 25, 25,
-   25,  0,  0,  0,  0, 25, 25, 25, 33, 33, 33, 33,  8,  8,  8,  8,
-    8,  8,  8,  0, 12, 12, 12, 12, 30, 30, 30, 30, 29, 29, 29, 29,
-   28, 28, 28, 28, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35,  0,
-    0,  0, 35, 35, 45, 45, 45, 45, 44, 44, 44, 44, 44,  0,  0,  0,
-   43, 43, 43, 43, 46, 46, 46, 46, 31, 31, 31, 31, 32, 32,  0,  0,
-   32,  0, 32, 32, 32, 32, 32, 32, 48, 48, 48, 48, 52, 52, 52, 52,
-   58, 58, 58, 58, 54, 54, 54, 54, 91, 91, 91, 91, 62, 62, 62, 62,
-   76, 76, 76, 76, 93, 93, 93, 93, 70, 70, 70, 70, 73, 73, 73, 73,
-    1,  1,  1,  0,  1,  0,  1,  1,  1,  0,  0,  0,  0,  1,  0,  0,
-    1,  1,  0,  0, 19, 19,  9,  9,  9,  9,  9,  6, 19,  9,  9,  9,
-    9,  9, 19, 19,  9,  9,  9, 19,  6, 19, 19, 19, 19, 19, 19,  9,
-    0,  0,  0, 19,  0,  0,  9,  0,  0,  0, 19, 19, 27, 27, 27, 27,
-   56, 56, 56, 56, 61, 61, 61, 61, 13, 13, 13, 13,  0, 13,  0, 13,
-    0, 13, 13, 13, 13, 13,  1,  1,  1,  1, 12, 12,  0, 15, 15, 15,
-   15, 15, 15, 15, 15,  1,  1,  0,  0, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17,  0, 26, 26, 26, 26, 26, 12, 12, 12, 12, 12, 12,  0,
-   39, 39, 39, 39, 86, 86, 86, 86, 77, 77, 77, 77, 79, 79, 79, 79,
-   60, 60, 60, 60, 65, 65, 65, 65, 75, 75, 75, 75, 69, 69, 69, 69,
-   69, 69,  0, 69, 74, 74, 74, 74, 84, 84, 84, 84, 84, 84, 84,  0,
-   68, 68, 68, 68, 92, 92, 92, 92, 87, 87, 87, 87, 19,  9, 19, 19,
-   19, 19,  0,  0,  2,  2,  2,  2, 19, 19, 19,  4,  3,  3,  0,  0,
-    1,  1,  6,  6,  0,  0, 17, 17, 17, 17,  0,  0, 49, 49, 49, 49,
-    0,  1,  1,  1, 71, 71, 71, 71, 67, 67, 67, 67, 42, 42, 42, 42,
-   41, 41, 41, 41,118,118,118,118, 53, 53, 53, 53, 59, 59, 59, 59,
-   40, 40, 40, 40, 51, 51, 51, 51, 50, 50, 50, 50,135,135,135,135,
-  106,106,106,106,104,104,104,104,161,161,161,161,110,110,110,110,
-   47, 47, 47, 47, 81, 81, 81, 81,120,120,120,120,116,116,116,116,
-  128,128,128,128, 66, 66, 66, 66, 72, 72, 72, 72, 98, 98, 98, 98,
-   97, 97, 97, 97, 57, 57, 57, 57, 88, 88, 88, 88,117,117,117,117,
-  112,112,112,112, 78, 78, 78, 78, 83, 83, 83, 83, 82, 82, 82, 82,
-  122,122,122,122, 89, 89, 89, 89,130,130,130,130,144,144,144,144,
-  156,156,156,156,147,147,147,147,148,148,148,148,158,158,158,158,
-  153,153,153,153,149,149,149,149, 94, 94, 94, 94, 85, 85, 85, 85,
-  101,101,101,101, 96, 96, 96, 96,111,111,111,111,100,100,100,100,
-  100, 36, 36, 36,108,108,108,108,129,129,129,129,109,109,109,109,
-  107,107,107,107,107,107,107,  1,137,137,137,137,124,124,124,124,
-  123,123,123,123,114,114,114,114,102,102,102,102,126,126,126,126,
-  142,142,142,142,125,125,125,125,154,154,154,154,150,150,150,150,
-  141,141,141,141,140,140,140,140,121,121,121,121,133,133,133,133,
-  134,134,134,134,138,138,138,138,143,143,143,143,145,145,145,145,
-   63, 63, 63, 63,157,157,157,157, 80, 80, 80, 80,127,127,127,127,
-  115,115,115,115,159,159,159,159,103,103,103,103,119,119,119,119,
-  146,146,146,146, 99, 99, 99, 99,136,139, 13, 13,155,155,155,155,
-  136,136,136,136, 17, 15, 15, 15,139,139,139,139,105,105,105,105,
-    0,  0,  0,  1,  0,  0,  1,  1,131,131,131,131,151,151,151,151,
-  160,160,160,160,152,152,152,152,113,113,113,113,132,132,132,132,
-   15,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  9,  9,
-    9, 10,  9, 11, 12, 13,  9,  9,  9, 14,  9,  9, 15,  9,  9,  9,
+  192,192,192,192,193,193,193,193,194,194,194,194,194,194, 66, 66,
+  195,195,195,195,196,196,196,196,197,197,197,197,198,198,198,198,
+  199,199,199,199,200,200,200,200,201,201,201,201,201,202,202,202,
+  202,202,202, 55,203,203,203,203,204,204,204,204,204,204,204,205,
+  205,205,205,205,206,206,206,206,206,206,207,207,207,207,207,207,
+  208,208,208,208,110,110,110,110,209,209,209,209,210,210,210,210,
+  211,211,211,211,212,212,212,212,213,213,213,214,214,214,214,214,
+  214,215,215,215,216,216,216,216,217,217,217,217,218,218,218,218,
+  218,218,219, 94,220,220,220,220,221,221,221,221,222, 99, 99, 99,
+   99, 99, 99, 99, 99, 99,102,102,102, 99,223,224,224,224,224,224,
+  225,225,225,225,225,225,  0,  0,  8,  0,  0,  0,  0,  0,226,227,
+  228,  0,229,  0,230,230,230,230,231,231,231,231,232,232,232,232,
+  233,233,233,233,234,234,234,234,235,235,235,235,236,  0,  0,  0,
+    0,  0,  0,  0,  1,  2,  2,  2,  2,  2,  3,  0,  0,  0,  4,  0,
+    2,  2,  2,  2,  2,  3,  2,  2,  2,  2,  5,  0,  2,  5,  6,  0,
+    7,  7,  7,  7,  8,  9,  8, 10,  8, 11,  8,  8,  8,  8,  8,  8,
+   12, 13, 13, 13, 14, 14, 14, 14, 14, 15, 14, 14, 16, 17, 17, 17,
+   17, 17, 17, 17, 18, 19, 19, 19, 19, 19, 19, 19, 20, 21, 20, 22,
+   20, 20, 23, 23, 20, 20, 20, 20, 22, 20, 24,  7,  7, 25, 20, 20,
+   26, 20, 20, 20, 20, 20, 20, 21, 27, 27, 27, 27, 28, 28, 28, 28,
+   29, 29, 29, 29, 30, 30, 30, 30, 31, 31, 31, 31, 32, 20, 20, 20,
+   33, 33, 33, 33, 34, 35, 33, 33, 33, 36, 33, 33, 37, 37, 37, 37,
+   38, 38, 38, 38, 39, 39, 39, 39, 40, 40, 40, 40, 41, 41, 41, 41,
+   42, 42, 42, 42, 43, 43, 43, 43, 44, 44, 44, 44, 45, 45, 45, 45,
+   46, 46, 46, 46, 46, 46, 46, 47, 48, 48, 48, 48, 49, 49, 49, 49,
+   49, 50, 51, 49, 52, 52, 52, 52, 53, 53, 53, 53, 53, 53, 54, 53,
+   55, 55, 55, 55, 56, 56, 56, 56, 57, 57, 57, 57, 58, 58, 58, 58,
+   59, 59, 59, 59, 60, 60, 60, 60, 60, 60, 61, 62, 63, 63, 63, 63,
+   64, 64, 64, 64, 64, 65,  0,  0, 66, 66, 66, 66, 67, 67, 67, 67,
+   68, 68, 68, 68, 69, 70, 71, 71, 71, 71, 71, 71, 72, 72, 72, 72,
+   73, 73, 73, 73, 74, 74, 74, 74, 75, 75, 75, 75, 76, 76, 76, 76,
+   77, 77, 77, 77, 78, 78, 78, 78, 79, 79, 79, 79, 80, 80, 80, 80,
+   81, 81, 81, 81, 82,  7,  7,  7, 83,  7, 84, 85,  0, 84, 86,  0,
+    2, 87, 88,  2,  2,  2,  2, 89, 90, 87, 91,  2,  2,  2, 92,  2,
+    2,  2,  2, 93,  0,  0,  0, 86,  1,  0,  0, 94,  0, 95, 96,  0,
+    4,  0,  0,  0,  0,  0,  0,  4, 97, 97, 97, 97, 98, 98, 98, 98,
+   13, 13, 13, 13, 99, 99, 99, 99,100,100,100,100,  0,101,  0,  0,
+  102,100,103,104,  0,  0,100,  0,105,106,106,106,106,106,106,106,
+  106,106,107,105,108,109,109,109,109,109,109,109,109,109,110,108,
+  111,111,111,111,112, 55, 55, 55, 55, 55, 55,113,109,109,109,110,
+  109,109,  0,  0,114,114,114,114,115,115,115,115,116,116,116,116,
+  117,117,117,117, 96,  2,  2,  2,  2,  2, 94,  2,118,118,118,118,
+  119,119,119,119,120,120,120,120,121,121,121,121,121,121,121,122,
+  123,123,123,123,124,124,124,124,124,124,124,125,126,126,126,126,
+  127,127,127,127,128,128,128,128,  2,  2,  3,  2,  2,129,130,  0,
+  131,131,131,131,132, 17, 17, 18, 20, 20, 20,133,  7,  7,  7,134,
+   20, 20, 20, 23,  0,135,109,109,109,109,109,136,137,137,137,137,
+    0,  0,  0,138,139,139,139,139,140,140,140,140, 84,  0,  0,  0,
+  141,141,141,141,142,142,142,142,143,143,143,143,144,144,144,144,
+  145,145,145,145,146,146,146,146,147,147,147,147,148,148,148,148,
+  149,149,149,149,150,150,150,150,151,151,151,151,152,152,152,152,
+  153,153,153,153,154,154,154,154,155,155,155,155,156,156,156,156,
+  157,157,157,157,158,158,158,158,159,159,159,159,160,160,160,160,
+  161,161,161,161,162,162,162,162,163,163,163,163,164,164,164,164,
+  165,165,165,165,166,166,166,166,167,167,167,167,168,168,168,168,
+  169,169,169,169,170,170,170,170,171,171,171,171,172,172,172,172,
+  173,173,173,173,174,174,174,174,175,175,175,175,176,176,176,176,
+  177,177,177,177,178,178,178,178,179,179,179,179,180,180,180,180,
+  181,181,181,181,182,182,182,182,183,183,183,183,184,184,184,184,
+  185,185,185,185,186, 45, 45, 45,187,187,187,187,188,188,188,188,
+  189,189,189,189,190,190,190,190,190,190,191,190,192,192,192,192,
+  193,193,193,193,194,194,194,194,195,195,195,195,196,196,196,196,
+  197,197,197,197,198,198,198,198,199,199,199,199,200,200,200,200,
+  201,201,201,201,202,202,202,202,203,203,203,203,204,204,204,204,
+  205,205,205,205,206,206,206,206,207,207,207,207,208,208,208,208,
+  209,209,209,209,210,210,210,210,211,211,211,211,212,212,212,212,
+  213,213,213,213,214,214,214,214,215,215,215,215,216,216,216,216,
+  217,217,217,217,218,218,218,218,219,219,219,219,220,221,221,221,
+  222,222,222,222,221,221,221,221,223,106,106,106,106,109,109,109,
+  224,224,224,224,225,225,225,225,  0,226, 86,  0,  0,  0,226,  7,
+   82,138,  7,  0,  0,  0,227, 86,228,228,228,228,229,229,229,229,
+  230,230,230,230,231,231,231,231,232,232,232,232,233,233,233,233,
+  234,  0,  0,  0,  0,  0,  0,  0,  0, 19, 19, 19, 19, 19, 19, 19,
+   19, 19, 19,  0,  0,  0, 19,  0, 19,  0,  0,  0,  0,  0, 26, 26,
+    1,  1,  1,  1,  9,  9,  9,  9,  0,  9,  9,  9,  9,  9,  0,  9,
+    9,  0,  9,  0,  9,  9, 55, 55, 55, 55, 55, 55,  6,  6,  6,  6,
+    6,  1,  1,  6,  6,  4,  4,  4,  4,  4,  4,  4,  4, 14, 14, 14,
+   14, 14, 14, 14,  3,  3,  3,  3,  3,  0,  3,  3,  0,  3,  3,  3,
+    3,  3,  3,  0,  3,  3,  3,  1,  1,  1,  3,  3,  1,  3,  3,  3,
+   37, 37, 37, 37, 38, 38, 38, 38, 64, 64, 64, 64, 90, 90, 90, 90,
+   95, 95, 95, 95,  3,  3,  0,  3,  7,  7,  7,  7,  7,  1,  1,  1,
+    1,  7,  7,  7,  0,  0,  7,  7,  5,  5,  5,  5, 11, 11, 11, 11,
+   10, 10, 10, 10, 21, 21, 21, 21, 22, 22, 22, 22, 23, 23, 23, 23,
+   16, 16, 16, 16, 20, 20, 20, 20, 36, 36, 36, 36, 24, 24, 24, 24,
+   24, 24, 24,  0, 18, 18, 18, 18, 25, 25, 25, 25, 25,  0,  0,  0,
+    0, 25, 25, 25, 33, 33, 33, 33,  8,  8,  8,  8,  8,  8,  8,  0,
+   12, 12, 12, 12, 30, 30, 30, 30, 29, 29, 29, 29, 28, 28, 28, 28,
+   34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35,  0,  0,  0, 35, 35,
+   45, 45, 45, 45, 44, 44, 44, 44, 44,  0,  0,  0, 43, 43, 43, 43,
+   46, 46, 46, 46, 31, 31, 31, 31, 32, 32,  0,  0, 32,  0, 32, 32,
+   32, 32, 32, 32, 48, 48, 48, 48, 52, 52, 52, 52, 58, 58, 58, 58,
+   54, 54, 54, 54, 91, 91, 91, 91, 62, 62, 62, 62, 76, 76, 76, 76,
+   93, 93, 93, 93, 70, 70, 70, 70, 73, 73, 73, 73,  1,  1,  1,  0,
+    1,  0,  1,  1,  1,  0,  0,  0,  0,  1,  0,  0,  1,  1,  0,  0,
+   19, 19,  9,  9,  9,  9,  9,  6, 19,  9,  9,  9,  9,  9, 19, 19,
+    9,  9,  9, 19,  6, 19, 19, 19, 19, 19, 19,  9,  0,  0,  0, 19,
+    0,  0,  9,  0,  0,  0, 19, 19, 27, 27, 27, 27, 56, 56, 56, 56,
+   61, 61, 61, 61, 13, 13, 13, 13,  0, 13,  0, 13,  0, 13, 13, 13,
+   13, 13,  1,  1,  1,  1, 12, 12,  0, 15, 15, 15, 15, 15, 15, 15,
+   15,  1,  1,  0,  0, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,  0,
+   26, 26, 26, 26, 26, 12, 12, 12, 12, 12, 12,  0, 39, 39, 39, 39,
+   86, 86, 86, 86, 77, 77, 77, 77, 79, 79, 79, 79, 60, 60, 60, 60,
+   65, 65, 65, 65, 75, 75, 75, 75, 69, 69, 69, 69, 69, 69,  0, 69,
+   74, 74, 74, 74, 84, 84, 84, 84, 84, 84, 84,  0, 68, 68, 68, 68,
+   92, 92, 92, 92, 87, 87, 87, 87, 19,  9, 19, 19, 19, 19,  0,  0,
+    2,  2,  2,  2, 19, 19, 19,  4,  3,  3,  0,  0,  1,  1,  6,  6,
+    0,  0, 17, 17, 17, 17,  0,  0, 49, 49, 49, 49,  0,  1,  1,  1,
+   71, 71, 71, 71, 67, 67, 67, 67, 42, 42, 42, 42, 41, 41, 41, 41,
+  118,118,118,118, 53, 53, 53, 53, 59, 59, 59, 59, 40, 40, 40, 40,
+   51, 51, 51, 51, 50, 50, 50, 50,135,135,135,135,106,106,106,106,
+  104,104,104,104,161,161,161,161,110,110,110,110, 47, 47, 47, 47,
+   81, 81, 81, 81,120,120,120,120,116,116,116,116,128,128,128,128,
+   66, 66, 66, 66, 72, 72, 72, 72, 98, 98, 98, 98, 97, 97, 97, 97,
+   57, 57, 57, 57, 88, 88, 88, 88,117,117,117,117,112,112,112,112,
+   78, 78, 78, 78, 83, 83, 83, 83, 82, 82, 82, 82,122,122,122,122,
+   89, 89, 89, 89,130,130,130,130,144,144,144,144,156,156,156,156,
+  147,147,147,147,148,148,148,148,158,158,158,158,153,153,153,153,
+  149,149,149,149, 94, 94, 94, 94, 85, 85, 85, 85,101,101,101,101,
+   96, 96, 96, 96,111,111,111,111,100,100,100,100,100, 36, 36, 36,
+  108,108,108,108,129,129,129,129,109,109,109,109,107,107,107,107,
+  107,107,107,  1,137,137,137,137,124,124,124,124,123,123,123,123,
+  114,114,114,114,102,102,102,102,126,126,126,126,142,142,142,142,
+  125,125,125,125,154,154,154,154,150,150,150,150,141,141,141,141,
+  140,140,140,140,121,121,121,121,133,133,133,133,134,134,134,134,
+  138,138,138,138,143,143,143,143,145,145,145,145, 63, 63, 63, 63,
+  157,157,157,157, 80, 80, 80, 80,127,127,127,127,115,115,115,115,
+  159,159,159,159,103,103,103,103,119,119,119,119,146,146,146,146,
+   99, 99, 99, 99,136,139, 13, 13,155,155,155,155,136,136,136,136,
+   17, 15, 15, 15,139,139,139,139,105,105,105,105,  0,  0,  0,  1,
+    0,  0,  1,  1,131,131,131,131,151,151,151,151,160,160,160,160,
+  152,152,152,152,113,113,113,113,132,132,132,132, 15,  0,  0,  0,
+    0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  9,  9,  9, 10,  9, 11,
+   12, 13,  9,  9,  9, 14,  9,  9, 15,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 16, 17,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9, 18, 19, 20,  9, 21,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-   16, 17,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 18, 19, 20,  9,
-   21,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 22,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9, 22,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
@@ -6479,58 +5336,57 @@ _hb_ucd_u8[13602] =
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-   23, 24,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,
-    3,  4,  5,  6,  7,  8,  9, 10, 11, 12,  0,  0, 13, 14, 15, 16,
-   17, 18, 19, 20, 21, 22,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 23,  0,  0, 24, 25, 26, 27, 28, 29, 30,
-    0,  0, 31, 32,  0, 33,  0, 34,  0, 35,  0,  0,  0,  0, 36, 37,
-   38, 39,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0, 41, 42,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 23, 24,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,
+    7,  8,  9, 10, 11, 12,  0,  0, 13, 14, 15, 16, 17, 18, 19, 20,
+   21, 22,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0, 23,  0,  0, 24, 25, 26, 27, 28, 29, 30,  0,  0, 31, 32,
+    0, 33,  0, 34,  0, 35,  0,  0,  0,  0, 36, 37, 38, 39,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   40,  0,  0,  0,  0,  0,  0,  0,  0,  0, 41, 42,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   43, 44,  0, 45,  0,  0,  0,  0,  0,  0, 46, 47,  0,  0,  0,  0,
+    0, 48,  0, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0, 50, 51,  0,  0,  0, 52,  0,  0, 53,  0,  0,  0,  0,  0,
+    0,  0, 54,  0,  0,  0,  0,  0,  0,  0, 55,  0,  0,  0,  0,  0,
+    0,  0, 56,  0,  0,  0,  0,  0,  0,  0,  0, 57,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 43, 44,  0, 45,  0,  0,  0,  0,  0,  0, 46, 47,
-    0,  0,  0,  0,  0, 48,  0, 49,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 50, 51,  0,  0,  0, 52,  0,  0, 53,  0,
-    0,  0,  0,  0,  0,  0, 54,  0,  0,  0,  0,  0,  0,  0, 55,  0,
-    0,  0,  0,  0,  0,  0, 56,  0,  0,  0,  0,  0,  0,  0,  0, 57,
+    0,  0, 58, 59, 60, 61, 62, 63, 64, 65,  0,  0,  0,  0,  0,  0,
+   66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 58, 59, 60, 61, 62, 63, 64, 65,  0,  0,
-    0,  0,  0,  0, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 68,
+    0, 69, 70,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 71, 72,
+   73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
+   89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,100,101,102,103,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  104,  0,  0,  0,  0,  0,  0,105,106,  0,107,  0,  0,  0,108,  0,
+  109,  0,110,  0,111,112,113,  0,114,  0,  0,  0,115,  0,  0,  0,
+  116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,117,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0, 67, 68,  0, 69, 70,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
-   85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,100,
-  101,102,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,104,  0,  0,  0,  0,  0,  0,105,106,  0,107,  0,
-    0,  0,108,  0,109,  0,110,  0,111,112,113,  0,114,  0,  0,  0,
-  115,  0,  0,  0,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,117,
+    0,  0,118,119,120,121,  0,122,123,124,125,126,  0,127,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,118,119,120,121,  0,122,123,124,125,126,
-    0,127,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,129,
+  130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,
+  146,147,148,149,150,151,152,153,154,155,156,157,  0,  0,  0,158,
+  159,160,161,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,162,163,  0,  0,  0,  0,  0,  0,  0,
+  164,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,128,129,130,131,132,133,134,135,136,137,138,139,140,141,
-  142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,
-    0,  0,  0,158,159,160,161,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,162,163,  0,  0,  0,
-    0,  0,  0,  0,164,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,165,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,166,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,167,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,165,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,166,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,167,  0,  0,
+    0,168,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,168,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,169,170,  0,  0,  0,  0,171,172,  0,  0,  0,173,174,
+  175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,
+  191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,169,170,  0,  0,  0,  0,171,172,  0,
-    0,  0,173,174,175,176,177,178,179,180,181,182,183,184,185,186,
-  187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,
-  203,204,205,206,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,
-    3,  4,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,
 };
 static const uint16_t
 _hb_ucd_u16[4888] =
@@ -6843,21 +5699,14 @@ _hb_ucd_u16[4888] =
    817, 818, 819, 820, 821, 935,   0,   0,
 };
 static const int16_t
-_hb_ucd_i16[196] =
+_hb_ucd_i16[92] =
 {
-      0,    0,    0,    0,    1,   -1,    0,    0,    2,    0,   -2,    0,    0,    0,    0,    2,
-      0,   -2,    0,    0,    0,    0,    0,   16,    0,    0,    0,  -16,    0,    0,    1,   -1,
-      0,    0,    0,    1,   -1,    0,    0,    0,    0,    1,   -1,    0,    3,    3,    3,   -3,
-     -3,   -3,    0,    0,    0, 2016,    0,    0,    0,    0,    0, 2527, 1923, 1914, 1918,    0,
-   2250,    0,    0,    0,    0,    0,    0,  138,    0,    7,    0,    0,   -7,    0,    0,    0,
-      1,   -1,    1,   -1,   -1,    1,   -1,    0, 1824,    0,    0,    0,    0,    0, 2104,    0,
-   2108, 2106,    0, 2106, 1316,    0,    0,    0,    0,    1,   -1,    1,   -1, -138,    0,    0,
-      1,   -1,    8,    8,    8,    0,    7,    7,    0,    0,   -8,   -8,   -8,   -7,   -7,    0,
-      1,   -1,    0,    2,-1316,    1,   -1,    0,   -1,    1,   -1,    1,   -1,    3,    1,   -1,
-     -3,    1,   -1,    1,   -1,    0,    0,-1914,-1918,    0,    0,-1923,-1824,    0,    0,    0,
-      0,-2016,    0,    0,    1,   -1,    0,    1,    0,    0,-2104,    0,    0,    0,    0,-2106,
-  -2108,-2106,    0,    0,    1,   -1,-2250,    0,    0,    0,-2527,    0,    0,   -2,    0,    1,
-     -1,    0,    1,   -1,
+      0,    0,    1,   -1,    2,    0,   -2,    0,    0,    2,    0,   -2,    0,   16,    0,  -16,
+      0,    1,   -1,    0,    3,    3,    3,   -3,   -3,   -3,    0, 2016,    0, 2527, 1923, 1914,
+   1918,    0, 2250,    0,    0,  138,    0,    7,   -7,    0,   -1,    1, 1824,    0, 2104,    0,
+   2108, 2106,    0, 2106, 1316,    0,   -1, -138,    8,    8,    8,    0,    7,    7,   -8,   -8,
+     -8,   -7,-1316,    1,   -1,    3,   -3,    1,    0,-1914,-1918,    0,    0,-1923,-1824,    0,
+      0,-2016,-2104,    0,    0,-2106,-2108,-2106,-2250,    0,-2527,    0,
 };
 
 static inline uint_fast8_t
@@ -6878,17 +5727,17 @@ _hb_ucd_b4 (const uint8_t* a, unsigned i)
 static inline int_fast16_t
 _hb_ucd_bmg (unsigned u)
 {
-  return u<65380u?_hb_ucd_i16[((_hb_ucd_u8[7714+(((_hb_ucd_u8[7594+(((_hb_ucd_b4(7466+_hb_ucd_u8,u>>2>>3>>3))<<3)+((u>>2>>3)&7u))])<<3)+((u>>2)&7u))])<<2)+((u)&3u)]:0;
+  return u<65380u?_hb_ucd_i16[((_hb_ucd_u8[7858+(((_hb_ucd_u8[7626+(((_hb_ucd_u8[7530+(((_hb_ucd_b4(7466+_hb_ucd_u8,u>>1>>2>>3>>3))<<3)+((u>>1>>2>>3)&7u))])<<3)+((u>>1>>2)&7u))])<<2)+((u>>1)&3u))])<<1)+((u)&1u)]:0;
 }
 static inline uint_fast8_t
 _hb_ucd_sc (unsigned u)
 {
-  return u<918016u?_hb_ucd_u8[11480+(((_hb_ucd_u8[10532+(((_hb_ucd_u8[9124+(((_hb_ucd_u8[8500+(((_hb_ucd_u8[8050+(u>>2>>2>>3>>4)])<<4)+((u>>2>>2>>3)&15u))])<<3)+((u>>2>>2)&7u))])<<2)+((u>>2)&3u))])<<2)+((u)&3u))]:2;
+  return u<918016u?_hb_ucd_u8[11124+(((_hb_ucd_u8[10176+(((_hb_ucd_u8[9204+(((_hb_ucd_u8[8524+(((_hb_ucd_u8[8220+(((_hb_ucd_u8[8106+(u>>2>>2>>2>>3>>4)])<<4)+((u>>2>>2>>2>>3)&15u))])<<3)+((u>>2>>2>>2)&7u))])<<2)+((u>>2>>2)&3u))])<<2)+((u>>2)&3u))])<<2)+((u)&3u))]:2;
 }
 static inline uint_fast16_t
 _hb_ucd_dm (unsigned u)
 {
-  return u<195102u?_hb_ucd_u16[1576+(((_hb_ucd_u8[12802+(((_hb_ucd_u8[12420+(u>>4>>5)])<<5)+((u>>4)&31u))])<<4)+((u)&15u))]:0;
+  return u<195102u?_hb_ucd_u16[1576+(((_hb_ucd_u8[12446+(((_hb_ucd_u8[12064+(u>>4>>5)])<<5)+((u>>4)&31u))])<<4)+((u)&15u))]:0;
 }
 
 #endif
diff --git a/thirdparty/harfbuzz/src/hb-unicode-emoji-table.hh b/thirdparty/harfbuzz/src/hb-unicode-emoji-table.hh
index c216379201..036c71a424 100644
--- a/thirdparty/harfbuzz/src/hb-unicode-emoji-table.hh
+++ b/thirdparty/harfbuzz/src/hb-unicode-emoji-table.hh
@@ -24,42 +24,37 @@
 #include "hb-unicode.hh"
 
 static const uint8_t
-_hb_emoji_u8[544] =
+_hb_emoji_u8[464] =
 {
    16, 17, 17, 17, 50, 20, 21, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,118,152,
-    0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    2,  3,  0,  0,  4,  0,  5,  0,  0,  0,  0,  0,  6,  0,  7,  8,
-    0,  0,  0,  9,  0,  0, 10, 11, 12, 13, 14, 13, 15, 16, 17,  0,
-    0,  0,  0,  0, 18,  0,  0,  0,  0,  0,  0,  0, 19, 20,  0,  0,
-   21,  0,  0,  0,  0,  0,  0,  0,  0,  0, 22,  0,  0,  0,  0,  0,
-   13, 13, 13, 13, 23, 24, 25, 26, 27, 28, 13, 13, 13, 13, 13, 29,
-   13, 13, 13, 13, 30, 31, 13, 13, 13, 32, 13, 13,  0, 33,  0, 34,
-   35, 36, 37, 13, 38, 39, 13, 13, 13, 13, 13, 13,  0,  0,  0,  0,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 30,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 16,  0,  2,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  4,  0,  0,  2,  0,  0,240,  3,  0,  6,  0,  0,
-    0,  0,  0, 12,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,
-    0,128,  0,  0,  0,254, 15,  7,  4,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 12, 64,  0,  1,  0,  0,  0,  0,  0,  0,120,
-  191,255,247,255,255,255,255,255,255,255,255,255,255,255,255,255,
-   63,  0,255,255,255,255,255,255, 63,255, 87, 32,  2,  1, 24,  0,
-  144, 80,184,  0,248,  0,  0,  0,  0,  0,224,  0,  2,  0,  1,128,
-    0,  0,  0,  0,  0,  0, 48,  0,224,  0,  0, 24,  0,  0,  0,  0,
-    0,  0, 33,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1, 32,
-    0,  0,128,  2,  0,  0,  0,  0,  0,224,  0,  0,  0,128,  0,  0,
-    0,  0,  0,  0,  0,240,  3,192,  0, 64,254,  7,  0,224,255,255,
-  255,255,255,255, 63,  0,  0,  0,254,255,  0,  4,  0,128,252,247,
-    0,254,255,255,255,255,255,255,255,255,255,255,255,255,255,  7,
-  255,255,255,255,255,255,255, 63,192,255,255,255,255,255,255,255,
-  255,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,255,
-    0,  0,224,255,255,255,255,255,  0,240,  0,  0,  0,  0,  0,  0,
-    0,255,  0,252,  0,  0,  0,  0,  0,255,  0,  0,  0,192,255,255,
-    0,240,255,255,255,255,255,247,191,255,255,255,255,255,255,255,
+    0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    2,  0,  3,  4,  0,  0,  5,  6,  0,  7,  0,  8,  9, 10, 11, 12,
+    0,  0, 13,  0,  0,  0, 14,  0, 15,  0,  0,  0,  0, 16,  0,  0,
+   17, 17, 18, 19, 20, 17, 17, 21, 17, 17, 22, 17, 23, 17, 24, 25,
+   26, 27, 28, 17, 17, 17,  0,  0, 17, 17, 17, 17, 17, 17, 17, 29,
+    0,  0,  0,  0,  0,  1,  0,  0,  0,  2,  3,  0,  0,  4,  0,  0,
+    5,  6,  0,  0,  7,  8,  0,  0,  8,  0,  9, 10,  0,  0, 11,  0,
+    0, 12, 13, 14, 15, 16, 16, 16, 17, 16, 16, 16, 18, 19, 20, 21,
+   22, 23,  0,  0,  0, 24,  0,  0, 25,  0, 26,  0,  0, 27,  0,  0,
+   28,  0,  0,  0, 16, 16, 16, 16, 29,  9,  0, 30, 31, 32, 16, 33,
+   34, 35, 36, 16, 16, 16, 16, 37, 16, 38, 39, 16, 16, 16, 40,  0,
+    0,  0,  0, 41,  0,  0, 42, 16, 43,  0, 44,  0, 45, 46, 16, 16,
+   47, 48, 49, 16, 16, 16, 16, 38,  0,  0,  0,  0,  0, 66,  0,  0,
+    0,  0,  0, 16,  0,  2,  0,  0,  4,  0,  0,  2,  0,  0,240,  3,
+    0,  6,  0,  0,  0,  0,  0, 12,  0,  1,  0,  0,  0,128,  0,  0,
+    0,254, 15,  7,  4,  0,  0,  0,  0, 12, 64,  0,  1,  0,  0,  0,
+    0,  0,  0,120,191,255,247,255,255,255,255,255, 63,  0,255,255,
+   63,255, 87, 32,  2,  1, 24,  0,144, 80,184,  0,248,  0,  0,  0,
+    0,  0,224,  0,  2,  0,  1,128,  0,  0, 48,  0,224,  0,  0, 24,
+    0,  0, 33,  0,  0,  0,  1, 32,  0,  0,128,  2,  0,224,  0,  0,
+    0,240,  3,192,  0, 64,254,  7,  0,224,255,255, 63,  0,  0,  0,
+  254,255,  0,  4,  0,128,252,247,  0,254,255,255,255,255,255,  7,
+  255,255,255, 63,192,255,255,255,255,255,  0,  0,  0,  0,240,255,
+    0,  0,224,255,  0,240,  0,  0,  0,255,  0,252,  0,255,  0,  0,
+    0,192,255,255,  0,240,255,255,255,255,255,247,191,255,255,255,
 };
 
 static inline unsigned
@@ -75,7 +70,7 @@ _hb_emoji_b1 (const uint8_t* a, unsigned i)
 static inline uint_fast8_t
 _hb_emoji_is_Extended_Pictographic (unsigned u)
 {
-  return u<131070u?_hb_emoji_b1(224+_hb_emoji_u8,((_hb_emoji_u8[64+(((_hb_emoji_b4(_hb_emoji_u8,u>>6>>4))<<4)+((u>>6)&15u))])<<6)+((u)&63u)):0;
+  return u<131070u?_hb_emoji_b1(264+_hb_emoji_u8,((_hb_emoji_u8[144+(((_hb_emoji_u8[64+(((_hb_emoji_b4(_hb_emoji_u8,u>>5>>2>>3))<<3)+((u>>5>>2)&7u))])<<2)+((u>>5)&3u))])<<5)+((u)&31u)):0;
 }
 
 
diff --git a/thirdparty/harfbuzz/src/hb-unicode.cc b/thirdparty/harfbuzz/src/hb-unicode.cc
index 9899e01a41..c1795dc7f2 100644
--- a/thirdparty/harfbuzz/src/hb-unicode.cc
+++ b/thirdparty/harfbuzz/src/hb-unicode.cc
@@ -308,8 +308,8 @@ hb_unicode_funcs_set_user_data (hb_unicode_funcs_t *ufuncs,
  * Since: 0.9.2
  **/
 void *
-hb_unicode_funcs_get_user_data (hb_unicode_funcs_t *ufuncs,
-				hb_user_data_key_t *key)
+hb_unicode_funcs_get_user_data (const hb_unicode_funcs_t *ufuncs,
+				hb_user_data_key_t       *key)
 {
   return hb_object_get_user_data (ufuncs, key);
 }
diff --git a/thirdparty/harfbuzz/src/hb-unicode.h b/thirdparty/harfbuzz/src/hb-unicode.h
index a500384575..faa8d67924 100644
--- a/thirdparty/harfbuzz/src/hb-unicode.h
+++ b/thirdparty/harfbuzz/src/hb-unicode.h
@@ -317,8 +317,8 @@ hb_unicode_funcs_set_user_data (hb_unicode_funcs_t *ufuncs,
 
 
 HB_EXTERN void *
-hb_unicode_funcs_get_user_data (hb_unicode_funcs_t *ufuncs,
-				hb_user_data_key_t *key);
+hb_unicode_funcs_get_user_data (const hb_unicode_funcs_t *ufuncs,
+				hb_user_data_key_t       *key);
 
 
 HB_EXTERN void
diff --git a/thirdparty/harfbuzz/src/hb-version.h b/thirdparty/harfbuzz/src/hb-version.h
index 40ea3eb017..a1586a58b6 100644
--- a/thirdparty/harfbuzz/src/hb-version.h
+++ b/thirdparty/harfbuzz/src/hb-version.h
@@ -47,20 +47,20 @@ HB_BEGIN_DECLS
  *
  * The minor component of the library version available at compile-time.
  */
-#define HB_VERSION_MINOR 0
+#define HB_VERSION_MINOR 1
 /**
  * HB_VERSION_MICRO:
  *
  * The micro component of the library version available at compile-time.
  */
-#define HB_VERSION_MICRO 1
+#define HB_VERSION_MICRO 0
 
 /**
  * HB_VERSION_STRING:
  *
  * A string literal containing the library version available at compile-time.
  */
-#define HB_VERSION_STRING "5.0.1"
+#define HB_VERSION_STRING "5.1.0"
 
 /**
  * HB_VERSION_ATLEAST:
diff --git a/thirdparty/spirv-reflect/include/spirv/unified1/spirv.h b/thirdparty/spirv-reflect/include/spirv/unified1/spirv.h
index c15736e255..ae81f141c4 100644
--- a/thirdparty/spirv-reflect/include/spirv/unified1/spirv.h
+++ b/thirdparty/spirv-reflect/include/spirv/unified1/spirv.h
@@ -70,6 +70,7 @@ typedef enum SpvSourceLanguage_ {
     SpvSourceLanguageOpenCL_CPP = 4,
     SpvSourceLanguageHLSL = 5,
     SpvSourceLanguageCPP_for_OpenCL = 6,
+    SpvSourceLanguageSYCL = 7,
     SpvSourceLanguageMax = 0x7fffffff,
 } SpvSourceLanguage;
 
@@ -184,6 +185,7 @@ typedef enum SpvExecutionMode_ {
     SpvExecutionModeNoGlobalOffsetINTEL = 5895,
     SpvExecutionModeNumSIMDWorkitemsINTEL = 5896,
     SpvExecutionModeSchedulerTargetFmaxMhzINTEL = 5903,
+    SpvExecutionModeNamedBarrierCountINTEL = 6417,
     SpvExecutionModeMax = 0x7fffffff,
 } SpvExecutionMode;
 
@@ -546,6 +548,8 @@ typedef enum SpvDecoration_ {
     SpvDecorationPrefetchINTEL = 5902,
     SpvDecorationStallEnableINTEL = 5905,
     SpvDecorationFuseLoopsInFunctionINTEL = 5907,
+    SpvDecorationAliasScopeINTEL = 5914,
+    SpvDecorationNoAliasINTEL = 5915,
     SpvDecorationBufferLocationINTEL = 5921,
     SpvDecorationIOPipeStorageINTEL = 5944,
     SpvDecorationFunctionFloatingPointModeINTEL = 6080,
@@ -677,6 +681,7 @@ typedef enum SpvBuiltIn_ {
     SpvBuiltInSMCountNV = 5375,
     SpvBuiltInWarpIDNV = 5376,
     SpvBuiltInSMIDNV = 5377,
+    SpvBuiltInCullMaskKHR = 6021,
     SpvBuiltInMax = 0x7fffffff,
 } SpvBuiltIn;
 
@@ -804,6 +809,8 @@ typedef enum SpvMemoryAccessShift_ {
     SpvMemoryAccessMakePointerVisibleKHRShift = 4,
     SpvMemoryAccessNonPrivatePointerShift = 5,
     SpvMemoryAccessNonPrivatePointerKHRShift = 5,
+    SpvMemoryAccessAliasScopeINTELMaskShift = 16,
+    SpvMemoryAccessNoAliasINTELMaskShift = 17,
     SpvMemoryAccessMax = 0x7fffffff,
 } SpvMemoryAccessShift;
 
@@ -818,6 +825,8 @@ typedef enum SpvMemoryAccessMask_ {
     SpvMemoryAccessMakePointerVisibleKHRMask = 0x00000010,
     SpvMemoryAccessNonPrivatePointerMask = 0x00000020,
     SpvMemoryAccessNonPrivatePointerKHRMask = 0x00000020,
+    SpvMemoryAccessAliasScopeINTELMaskMask = 0x00010000,
+    SpvMemoryAccessNoAliasINTELMaskMask = 0x00020000,
 } SpvMemoryAccessMask;
 
 typedef enum SpvScope_ {
@@ -1059,6 +1068,7 @@ typedef enum SpvCapability_ {
     SpvCapabilityFPGAMemoryAccessesINTEL = 5898,
     SpvCapabilityFPGAClusterAttributesINTEL = 5904,
     SpvCapabilityLoopFuseINTEL = 5906,
+    SpvCapabilityMemoryAccessAliasingINTEL = 5910,
     SpvCapabilityFPGABufferLocationINTEL = 5920,
     SpvCapabilityArbitraryPrecisionFixedPointINTEL = 5922,
     SpvCapabilityUSMStorageClassesINTEL = 5935,
@@ -1073,13 +1083,17 @@ typedef enum SpvCapability_ {
     SpvCapabilityDotProductInput4x8BitPackedKHR = 6018,
     SpvCapabilityDotProduct = 6019,
     SpvCapabilityDotProductKHR = 6019,
+    SpvCapabilityRayCullMaskKHR = 6020,
     SpvCapabilityBitInstructions = 6025,
+    SpvCapabilityGroupNonUniformRotateKHR = 6026,
     SpvCapabilityAtomicFloat32AddEXT = 6033,
     SpvCapabilityAtomicFloat64AddEXT = 6034,
     SpvCapabilityLongConstantCompositeINTEL = 6089,
     SpvCapabilityOptNoneINTEL = 6094,
     SpvCapabilityAtomicFloat16AddEXT = 6095,
     SpvCapabilityDebugInfoModuleINTEL = 6114,
+    SpvCapabilitySplitBarrierINTEL = 6141,
+    SpvCapabilityGroupUniformArithmeticKHR = 6400,
     SpvCapabilityMax = 0x7fffffff,
 } SpvCapability;
 
@@ -1535,6 +1549,7 @@ typedef enum SpvOp_ {
     SpvOpSubgroupAllKHR = 4428,
     SpvOpSubgroupAnyKHR = 4429,
     SpvOpSubgroupAllEqualKHR = 4430,
+    SpvOpGroupNonUniformRotateKHR = 4431,
     SpvOpSubgroupReadInvocationKHR = 4432,
     SpvOpTraceRayKHR = 4445,
     SpvOpExecuteCallableKHR = 4446,
@@ -1801,6 +1816,9 @@ typedef enum SpvOp_ {
     SpvOpArbitraryFloatPowRINTEL = 5881,
     SpvOpArbitraryFloatPowNINTEL = 5882,
     SpvOpLoopControlINTEL = 5887,
+    SpvOpAliasDomainDeclINTEL = 5911,
+    SpvOpAliasScopeDeclINTEL = 5912,
+    SpvOpAliasScopeListDeclINTEL = 5913,
     SpvOpFixedSqrtINTEL = 5923,
     SpvOpFixedRecipINTEL = 5924,
     SpvOpFixedRsqrtINTEL = 5925,
@@ -1839,10 +1857,23 @@ typedef enum SpvOp_ {
     SpvOpTypeStructContinuedINTEL = 6090,
     SpvOpConstantCompositeContinuedINTEL = 6091,
     SpvOpSpecConstantCompositeContinuedINTEL = 6092,
+    SpvOpControlBarrierArriveINTEL = 6142,
+    SpvOpControlBarrierWaitINTEL = 6143,
+    SpvOpGroupIMulKHR = 6401,
+    SpvOpGroupFMulKHR = 6402,
+    SpvOpGroupBitwiseAndKHR = 6403,
+    SpvOpGroupBitwiseOrKHR = 6404,
+    SpvOpGroupBitwiseXorKHR = 6405,
+    SpvOpGroupLogicalAndKHR = 6406,
+    SpvOpGroupLogicalOrKHR = 6407,
+    SpvOpGroupLogicalXorKHR = 6408,
     SpvOpMax = 0x7fffffff,
 } SpvOp;
 
 #ifdef SPV_ENABLE_UTILITY_CODE
+#ifndef __cplusplus
+#include <stdbool.h>
+#endif
 inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultType) {
     *hasResult = *hasResultType = false;
     switch (opcode) {
@@ -2197,6 +2228,7 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy
     case SpvOpSubgroupAllKHR: *hasResult = true; *hasResultType = true; break;
     case SpvOpSubgroupAnyKHR: *hasResult = true; *hasResultType = true; break;
     case SpvOpSubgroupAllEqualKHR: *hasResult = true; *hasResultType = true; break;
+    case SpvOpGroupNonUniformRotateKHR: *hasResult = true; *hasResultType = true; break;
     case SpvOpSubgroupReadInvocationKHR: *hasResult = true; *hasResultType = true; break;
     case SpvOpTraceRayKHR: *hasResult = false; *hasResultType = false; break;
     case SpvOpExecuteCallableKHR: *hasResult = false; *hasResultType = false; break;
@@ -2452,6 +2484,9 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy
     case SpvOpArbitraryFloatPowRINTEL: *hasResult = true; *hasResultType = true; break;
     case SpvOpArbitraryFloatPowNINTEL: *hasResult = true; *hasResultType = true; break;
     case SpvOpLoopControlINTEL: *hasResult = false; *hasResultType = false; break;
+    case SpvOpAliasDomainDeclINTEL: *hasResult = true; *hasResultType = false; break;
+    case SpvOpAliasScopeDeclINTEL: *hasResult = true; *hasResultType = false; break;
+    case SpvOpAliasScopeListDeclINTEL: *hasResult = true; *hasResultType = false; break;
     case SpvOpFixedSqrtINTEL: *hasResult = true; *hasResultType = true; break;
     case SpvOpFixedRecipINTEL: *hasResult = true; *hasResultType = true; break;
     case SpvOpFixedRsqrtINTEL: *hasResult = true; *hasResultType = true; break;
@@ -2490,9 +2525,18 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy
     case SpvOpTypeStructContinuedINTEL: *hasResult = false; *hasResultType = false; break;
     case SpvOpConstantCompositeContinuedINTEL: *hasResult = false; *hasResultType = false; break;
     case SpvOpSpecConstantCompositeContinuedINTEL: *hasResult = false; *hasResultType = false; break;
+    case SpvOpControlBarrierArriveINTEL: *hasResult = false; *hasResultType = false; break;
+    case SpvOpControlBarrierWaitINTEL: *hasResult = false; *hasResultType = false; break;
+    case SpvOpGroupIMulKHR: *hasResult = true; *hasResultType = true; break;
+    case SpvOpGroupFMulKHR: *hasResult = true; *hasResultType = true; break;
+    case SpvOpGroupBitwiseAndKHR: *hasResult = true; *hasResultType = true; break;
+    case SpvOpGroupBitwiseOrKHR: *hasResult = true; *hasResultType = true; break;
+    case SpvOpGroupBitwiseXorKHR: *hasResult = true; *hasResultType = true; break;
+    case SpvOpGroupLogicalAndKHR: *hasResult = true; *hasResultType = true; break;
+    case SpvOpGroupLogicalOrKHR: *hasResult = true; *hasResultType = true; break;
+    case SpvOpGroupLogicalXorKHR: *hasResult = true; *hasResultType = true; break;
     }
 }
 #endif /* SPV_ENABLE_UTILITY_CODE */
 
 #endif
-
diff --git a/thirdparty/spirv-reflect/patches/specialization-constants.patch b/thirdparty/spirv-reflect/patches/specialization-constants.patch
index 9bb5f97cd3..99815c9162 100644
--- a/thirdparty/spirv-reflect/patches/specialization-constants.patch
+++ b/thirdparty/spirv-reflect/patches/specialization-constants.patch
@@ -1,8 +1,8 @@
 diff --git a/thirdparty/spirv-reflect/spirv_reflect.c b/thirdparty/spirv-reflect/spirv_reflect.c
-index e9b11bf495..f181df5fa2 100644
+index cdcf3ca663..c174ae1900 100644
 --- a/thirdparty/spirv-reflect/spirv_reflect.c
 +++ b/thirdparty/spirv-reflect/spirv_reflect.c
-@@ -125,6 +125,9 @@ typedef struct SpvReflectPrvDecorations {
+@@ -126,6 +126,9 @@ typedef struct SpvReflectPrvDecorations {
    SpvReflectPrvNumberDecoration   location;
    SpvReflectPrvNumberDecoration   offset;
    SpvReflectPrvNumberDecoration   uav_counter_buffer;
@@ -12,7 +12,7 @@ index e9b11bf495..f181df5fa2 100644
    SpvReflectPrvStringDecoration   semantic;
    uint32_t                        array_stride;
    uint32_t                        matrix_stride;
-@@ -631,6 +634,9 @@ static SpvReflectResult ParseNodes(SpvReflectPrvParser* p_parser)
+@@ -639,6 +642,9 @@ static SpvReflectResult ParseNodes(SpvReflectPrvParser* p_parser)
      p_parser->nodes[i].decorations.offset.value = (uint32_t)INVALID_VALUE;
      p_parser->nodes[i].decorations.uav_counter_buffer.value = (uint32_t)INVALID_VALUE;
      p_parser->nodes[i].decorations.built_in = (SpvBuiltIn)INVALID_VALUE;
@@ -22,7 +22,7 @@ index e9b11bf495..f181df5fa2 100644
    }
    // Mark source file id node
    p_parser->source_file_id = (uint32_t)INVALID_VALUE;
-@@ -821,10 +827,16 @@ static SpvReflectResult ParseNodes(SpvReflectPrvParser* p_parser)
+@@ -829,10 +835,16 @@ static SpvReflectResult ParseNodes(SpvReflectPrvParser* p_parser)
          CHECKED_READU32(p_parser, p_node->word_offset + 2, p_node->result_id);
        }
        break;
@@ -41,7 +41,7 @@ index e9b11bf495..f181df5fa2 100644
        case SpvOpSpecConstantComposite:
        case SpvOpSpecConstantOp: {
          CHECKED_READU32(p_parser, p_node->word_offset + 1, p_node->result_type_id);
-@@ -856,7 +868,7 @@ static SpvReflectResult ParseNodes(SpvReflectPrvParser* p_parser)
+@@ -864,7 +876,7 @@ static SpvReflectResult ParseNodes(SpvReflectPrvParser* p_parser)
          CHECKED_READU32(p_parser, p_node->word_offset + 3, p_access_chain->base_id);
          //
          // SPIRV_ACCESS_CHAIN_INDEX_OFFSET (4) is the number of words up until the first index:
@@ -50,7 +50,7 @@ index e9b11bf495..f181df5fa2 100644
          //
          p_access_chain->index_count = (node_word_count - SPIRV_ACCESS_CHAIN_INDEX_OFFSET);
          if (p_access_chain->index_count > 0) {
-@@ -1338,6 +1350,9 @@ static SpvReflectResult ParseDecorations(SpvReflectPrvParser* p_parser)
+@@ -1346,6 +1358,9 @@ static SpvReflectResult ParseDecorations(SpvReflectPrvParser* p_parser)
          skip = true;
        }
        break;
@@ -60,7 +60,7 @@ index e9b11bf495..f181df5fa2 100644
        case SpvDecorationRelaxedPrecision:
        case SpvDecorationBlock:
        case SpvDecorationBufferBlock:
-@@ -1481,7 +1496,14 @@ static SpvReflectResult ParseDecorations(SpvReflectPrvParser* p_parser)
+@@ -1495,7 +1510,14 @@ static SpvReflectResult ParseDecorations(SpvReflectPrvParser* p_parser)
          p_target_decorations->input_attachment_index.word_offset = word_offset;
        }
        break;
@@ -76,7 +76,7 @@ index e9b11bf495..f181df5fa2 100644
        case SpvReflectDecorationHlslCounterBufferGOOGLE: {
          uint32_t word_offset = p_node->word_offset + member_offset+ 3;
          CHECKED_READU32(p_parser, word_offset, p_target_decorations->uav_counter_buffer.value);
-@@ -1789,6 +1811,13 @@ static SpvReflectResult ParseType(
+@@ -1803,6 +1825,13 @@ static SpvReflectResult ParseType(
          p_type->type_flags |= SPV_REFLECT_TYPE_FLAG_EXTERNAL_ACCELERATION_STRUCTURE;
        }
        break;
@@ -90,7 +90,7 @@ index e9b11bf495..f181df5fa2 100644
      }
  
      if (result == SPV_REFLECT_RESULT_SUCCESS) {
-@@ -3269,6 +3298,69 @@ static SpvReflectResult ParseExecutionModes(
+@@ -3332,6 +3361,69 @@ static SpvReflectResult ParseExecutionModes(
    return SPV_REFLECT_RESULT_SUCCESS;
  }
  
@@ -160,7 +160,7 @@ index e9b11bf495..f181df5fa2 100644
  static SpvReflectResult ParsePushConstantBlocks(
    SpvReflectPrvParser*    p_parser, 
    SpvReflectShaderModule* p_module)
-@@ -3650,6 +3742,12 @@ static SpvReflectResult CreateShaderModule(
+@@ -3717,6 +3809,12 @@ static SpvReflectResult CreateShaderModule(
      result = ParsePushConstantBlocks(&parser, p_module);
      SPV_REFLECT_ASSERT(result == SPV_REFLECT_RESULT_SUCCESS);
    }
@@ -173,8 +173,8 @@ index e9b11bf495..f181df5fa2 100644
    if (result == SPV_REFLECT_RESULT_SUCCESS) {
      result = ParseEntryPoints(&parser, p_module);
      SPV_REFLECT_ASSERT(result == SPV_REFLECT_RESULT_SUCCESS);
-@@ -3807,6 +3905,9 @@ void spvReflectDestroyShaderModule(SpvReflectShaderModule* p_module)
-     SafeFree(p_entry->used_push_constants);
+@@ -3875,6 +3973,9 @@ void spvReflectDestroyShaderModule(SpvReflectShaderModule* p_module)
+     SafeFree(p_entry->execution_modes);
    }
    SafeFree(p_module->entry_points);
 +// -- GODOT begin --
@@ -183,7 +183,7 @@ index e9b11bf495..f181df5fa2 100644
  
    // Push constants
    for (size_t i = 0; i < p_module->push_constant_block_count; ++i) {
-@@ -4077,6 +4178,38 @@ SpvReflectResult spvReflectEnumerateEntryPointInterfaceVariables(
+@@ -4145,6 +4246,38 @@ SpvReflectResult spvReflectEnumerateEntryPointInterfaceVariables(
    return SPV_REFLECT_RESULT_SUCCESS;
  }
  
@@ -223,10 +223,10 @@ index e9b11bf495..f181df5fa2 100644
    const SpvReflectShaderModule* p_module,
    uint32_t*                     p_count,
 diff --git a/thirdparty/spirv-reflect/spirv_reflect.h b/thirdparty/spirv-reflect/spirv_reflect.h
-index e9e4c40755..948533d3c0 100644
+index 02b81613a1..02850f8811 100644
 --- a/thirdparty/spirv-reflect/spirv_reflect.h
 +++ b/thirdparty/spirv-reflect/spirv_reflect.h
-@@ -323,6 +323,28 @@ typedef struct SpvReflectTypeDescription {
+@@ -329,6 +329,28 @@ typedef struct SpvReflectTypeDescription {
    struct SpvReflectTypeDescription* members;
  } SpvReflectTypeDescription;
  
@@ -255,7 +255,7 @@ index e9e4c40755..948533d3c0 100644
  
  /*! @struct SpvReflectInterfaceVariable
  
-@@ -472,6 +494,10 @@ typedef struct SpvReflectShaderModule {
+@@ -483,6 +505,10 @@ typedef struct SpvReflectShaderModule {
    SpvReflectInterfaceVariable*      interface_variables;                              // Uses value(s) from first entry point
    uint32_t                          push_constant_block_count;                        // Uses value(s) from first entry point
    SpvReflectBlockVariable*          push_constant_blocks;                             // Uses value(s) from first entry point
@@ -266,7 +266,7 @@ index e9e4c40755..948533d3c0 100644
  
    struct Internal {
      SpvReflectModuleFlags           module_flags;
-@@ -744,6 +770,33 @@ SpvReflectResult spvReflectEnumerateInputVariables(
+@@ -755,6 +781,33 @@ SpvReflectResult spvReflectEnumerateInputVariables(
    SpvReflectInterfaceVariable** pp_variables
  );
  
diff --git a/thirdparty/spirv-reflect/spirv_reflect.c b/thirdparty/spirv-reflect/spirv_reflect.c
index f181df5fa2..c174ae1900 100644
--- a/thirdparty/spirv-reflect/spirv_reflect.c
+++ b/thirdparty/spirv-reflect/spirv_reflect.c
@@ -119,6 +119,7 @@ typedef struct SpvReflectPrvDecorations {
   bool                            is_noperspective;
   bool                            is_flat;
   bool                            is_non_writable;
+  bool                            is_non_readable;
   SpvReflectPrvNumberDecoration   set;
   SpvReflectPrvNumberDecoration   binding;
   SpvReflectPrvNumberDecoration   input_attachment_index;
@@ -306,7 +307,12 @@ static SpvReflectResult IntersectSortedUint32(
   size_t*         res_size
 )
 {
+  *pp_res = NULL;
   *res_size = 0;
+  if (IsNull(p_arr0) || IsNull(p_arr1)) {
+    return SPV_REFLECT_RESULT_SUCCESS;
+  }
+
   const uint32_t* arr0_end = p_arr0 + arr0_size;
   const uint32_t* arr1_end = p_arr1 + arr1_size;
 
@@ -324,7 +330,6 @@ static SpvReflectResult IntersectSortedUint32(
     }
   }
 
-  *pp_res = NULL;
   if (*res_size > 0) {
     *pp_res = (uint32_t*)calloc(*res_size, sizeof(**pp_res));
     if (IsNull(*pp_res)) {
@@ -488,6 +493,9 @@ static SpvReflectDecorationFlags ApplyDecorations(const SpvReflectPrvDecorations
   if (p_decoration_fields->is_non_writable) {
     decorations |= SPV_REFLECT_DECORATION_NON_WRITABLE;
   }
+  if (p_decoration_fields->is_non_readable) {
+    decorations |= SPV_REFLECT_DECORATION_NON_READABLE;
+  }
   return decorations;
 }
 
@@ -1364,6 +1372,7 @@ static SpvReflectResult ParseDecorations(SpvReflectPrvParser* p_parser)
       case SpvDecorationNoPerspective:
       case SpvDecorationFlat:
       case SpvDecorationNonWritable:
+      case SpvDecorationNonReadable:
       case SpvDecorationLocation:
       case SpvDecorationBinding:
       case SpvDecorationDescriptorSet:
@@ -1462,6 +1471,11 @@ static SpvReflectResult ParseDecorations(SpvReflectPrvParser* p_parser)
       }
       break;
 
+      case SpvDecorationNonReadable: {
+        p_target_decorations->is_non_readable = true;
+      }
+      break;
+
       case SpvDecorationLocation: {
         uint32_t word_offset = p_node->word_offset + member_offset + 3;
         CHECKED_READU32(p_parser, word_offset, p_target_decorations->location.value);
@@ -1970,6 +1984,7 @@ static SpvReflectResult ParseDescriptorBindings(
     p_descriptor->count = 1;
     p_descriptor->uav_counter_id = p_node->decorations.uav_counter_buffer.value;
     p_descriptor->type_description = p_type;
+    p_descriptor->decoration_flags = ApplyDecorations(&p_node->decorations);
 
     // If this is in the StorageBuffer storage class, it's for sure a storage
     // buffer descriptor. We need to handle this case earlier because in SPIR-V
@@ -3208,8 +3223,8 @@ static SpvReflectResult ParseExecutionModes(
       // Read entry point id
       uint32_t entry_point_id = 0;
       CHECKED_READU32(p_parser, p_node->word_offset + 1, entry_point_id);
-      
-      // Find entry point 
+
+      // Find entry point
       SpvReflectEntryPoint* p_entry_point = NULL;
       for (size_t entry_point_idx = 0; entry_point_idx < p_module->entry_point_count; ++entry_point_idx) {
         if (p_module->entry_points[entry_point_idx].id == entry_point_id) {
@@ -3221,7 +3236,7 @@ static SpvReflectResult ParseExecutionModes(
       if (IsNull(p_entry_point)) {
         return SPV_REFLECT_RESULT_ERROR_SPIRV_INVALID_ENTRY_POINT;
       }
-      
+
       // Read execution mode
       uint32_t execution_mode = (uint32_t)INVALID_VALUE;
       CHECKED_READU32(p_parser, p_node->word_offset + 2, execution_mode);
@@ -3288,12 +3303,60 @@ static SpvReflectResult ParseExecutionModes(
         case SpvExecutionModeLocalSizeId:
         case SpvExecutionModeLocalSizeHintId:
         case SpvExecutionModePostDepthCoverage:
+        case SpvExecutionModeDenormPreserve:
+        case SpvExecutionModeDenormFlushToZero:
+        case SpvExecutionModeSignedZeroInfNanPreserve:
+        case SpvExecutionModeRoundingModeRTE:
+        case SpvExecutionModeRoundingModeRTZ:
         case SpvExecutionModeStencilRefReplacingEXT:
+        case SpvExecutionModeOutputLinesNV:
         case SpvExecutionModeOutputPrimitivesNV:
         case SpvExecutionModeOutputTrianglesNV:
           break;
       }
+      p_entry_point->execution_mode_count++;
+    }
+    uint32_t* indices = (uint32_t*)calloc(p_module->entry_point_count, sizeof(indices));
+    if (IsNull(indices)) {
+      return SPV_REFLECT_RESULT_ERROR_ALLOC_FAILED;
     }
+    for (size_t entry_point_idx = 0; entry_point_idx < p_module->entry_point_count; ++entry_point_idx) {
+      SpvReflectEntryPoint* p_entry_point = &p_module->entry_points[entry_point_idx];
+      p_entry_point->execution_modes =
+          (SpvExecutionMode*)calloc(p_entry_point->execution_mode_count, sizeof(*p_entry_point->execution_modes));
+      if (IsNull(p_entry_point->execution_modes)) {
+        SafeFree(indices);
+        return SPV_REFLECT_RESULT_ERROR_ALLOC_FAILED;
+      }
+    }
+
+    for (size_t node_idx = 0; node_idx < p_parser->node_count; ++node_idx) {
+      SpvReflectPrvNode* p_node = &(p_parser->nodes[node_idx]);
+      if (p_node->op != SpvOpExecutionMode) {
+        continue;
+      }
+
+      // Read entry point id
+      uint32_t entry_point_id = 0;
+      CHECKED_READU32(p_parser, p_node->word_offset + 1, entry_point_id);
+
+      // Find entry point
+      SpvReflectEntryPoint* p_entry_point = NULL;
+      uint32_t* idx = NULL;
+      for (size_t entry_point_idx = 0; entry_point_idx < p_module->entry_point_count; ++entry_point_idx) {
+        if (p_module->entry_points[entry_point_idx].id == entry_point_id) {
+          p_entry_point = &p_module->entry_points[entry_point_idx];
+          idx = &indices[entry_point_idx];
+          break;
+        }
+      }
+
+      // Read execution mode
+      uint32_t execution_mode = (uint32_t)INVALID_VALUE;
+      CHECKED_READU32(p_parser, p_node->word_offset + 2, execution_mode);
+      p_entry_point->execution_modes[(*idx)++] = (SpvExecutionMode)execution_mode;
+    }
+    SafeFree(indices);
   }
   return SPV_REFLECT_RESULT_SUCCESS;
 }
@@ -3649,7 +3712,11 @@ static SpvReflectResult CreateShaderModule(
   if (flags & SPV_REFLECT_MODULE_FLAG_NO_COPY) {
     // Set internal size and pointer to args passed in
     p_module->_internal->spirv_size = size;
+#if defined(__cplusplus)
+    p_module->_internal->spirv_code = const_cast<uint32_t*>(static_cast<const uint32_t*>(p_code)); // cast that const away
+#else
     p_module->_internal->spirv_code = (void*)p_code; // cast that const away
+#endif
     p_module->_internal->spirv_word_count = (uint32_t)(size / SPIRV_WORD_SIZE);
   }
   else {
@@ -3903,6 +3970,7 @@ void spvReflectDestroyShaderModule(SpvReflectShaderModule* p_module)
     SafeFree(p_entry->interface_variables);
     SafeFree(p_entry->used_uniforms);
     SafeFree(p_entry->used_push_constants);
+    SafeFree(p_entry->execution_modes);
   }
   SafeFree(p_module->entry_points);
 // -- GODOT begin --
@@ -5093,6 +5161,7 @@ const char* spvReflectSourceLanguage(SpvSourceLanguage source_lang)
     case SpvSourceLanguageOpenCL_CPP     : return "OpenCL_CPP";
     case SpvSourceLanguageHLSL           : return "HLSL";
     case SpvSourceLanguageCPP_for_OpenCL : return "CPP_for_OpenCL";
+    case SpvSourceLanguageSYCL           : return "SYCL";
     case SpvSourceLanguageMax:
       break;
   }
diff --git a/thirdparty/spirv-reflect/spirv_reflect.h b/thirdparty/spirv-reflect/spirv_reflect.h
index 948533d3c0..02850f8811 100644
--- a/thirdparty/spirv-reflect/spirv_reflect.h
+++ b/thirdparty/spirv-reflect/spirv_reflect.h
@@ -30,7 +30,12 @@ VERSION HISTORY
 #ifndef SPIRV_REFLECT_H
 #define SPIRV_REFLECT_H
 
+#if defined(SPIRV_REFLECT_USE_SYSTEM_SPIRV_H)
+#include <spirv/unified1/spirv.h>
+#else
 #include "./include/spirv/unified1/spirv.h"
+#endif
+
 
 #include <stdint.h>
 #include <string.h>
@@ -139,6 +144,7 @@ typedef enum SpvReflectDecorationFlagBits {
   SPV_REFLECT_DECORATION_FLAT                   = 0x00000040,
   SPV_REFLECT_DECORATION_NON_WRITABLE           = 0x00000080,
   SPV_REFLECT_DECORATION_RELAXED_PRECISION      = 0x00000100,
+  SPV_REFLECT_DECORATION_NON_READABLE           = 0x00000200,
 } SpvReflectDecorationFlagBits;
 
 typedef uint32_t SpvReflectDecorationFlags;
@@ -422,6 +428,8 @@ typedef struct SpvReflectDescriptorBinding {
     uint32_t                          binding;
     uint32_t                          set;
   } word_offset;
+
+  SpvReflectDecorationFlags           decoration_flags;
 } SpvReflectDescriptorBinding;
 
 /*! @struct SpvReflectDescriptorSet
@@ -458,6 +466,9 @@ typedef struct SpvReflectEntryPoint {
   uint32_t                          used_push_constant_count;
   uint32_t*                         used_push_constants;
 
+  uint32_t                          execution_mode_count;
+  SpvExecutionMode*                 execution_modes;
+
   struct LocalSize {
     uint32_t                        x;
     uint32_t                        y;