Synchronize parameter names in definition and declaration

Fixes #10244.

20 files changed, 499 insertions, 499 deletions

diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp
index 459d3ffe41..a2ff45c623 100644
--- a/scene/resources/animation.cpp
+++ b/scene/resources/animation.cpp
@@ -733,7 +733,7 @@ int Animation::track_find_key(int p_track, float p_time, bool p_exact) const {
 	return -1;
 }
 
-void Animation::track_insert_key(int p_track, float p_time, const Variant &p_value, float p_transition) {
+void Animation::track_insert_key(int p_track, float p_time, const Variant &p_key, float p_transition) {
 
 	ERR_FAIL_INDEX(p_track, tracks.size());
 	Track *t = tracks[p_track];
@@ -742,7 +742,7 @@ void Animation::track_insert_key(int p_track, float p_time, const Variant &p_val
 
 		case TYPE_TRANSFORM: {
 
-			Dictionary d = p_value;
+			Dictionary d = p_key;
 			Vector3 loc;
 			if (d.has("loc"))
 				loc = d["loc"];
@@ -766,7 +766,7 @@ void Animation::track_insert_key(int p_track, float p_time, const Variant &p_val
 			TKey<Variant> k;
 			k.time = p_time;
 			k.transition = p_transition;
-			k.value = p_value;
+			k.value = p_key;
 			_insert(p_time, vt->values, k);
 
 		} break;
@@ -774,9 +774,9 @@ void Animation::track_insert_key(int p_track, float p_time, const Variant &p_val
 
 			MethodTrack *mt = static_cast<MethodTrack *>(t);
 
-			ERR_FAIL_COND(p_value.get_type() != Variant::DICTIONARY);
+			ERR_FAIL_COND(p_key.get_type() != Variant::DICTIONARY);
 
-			Dictionary d = p_value;
+			Dictionary d = p_key;
 			ERR_FAIL_COND(!d.has("method") || d["method"].get_type() != Variant::STRING);
 			ERR_FAIL_COND(!d.has("args") || !d["args"].is_array());
 
@@ -1871,7 +1871,7 @@ bool Animation::_transform_track_optimize_key(const TKey<TransformKey> &t0, cons
 	return erase;
 }
 
-void Animation::_transform_track_optimize(int p_idx, float p_alowed_linear_err, float p_alowed_angular_err, float p_max_optimizable_angle) {
+void Animation::_transform_track_optimize(int p_idx, float p_allowed_linear_err, float p_allowed_angular_err, float p_max_optimizable_angle) {
 
 	ERR_FAIL_INDEX(p_idx, tracks.size());
 	ERR_FAIL_COND(tracks[p_idx]->type != TYPE_TRANSFORM);
@@ -1887,12 +1887,12 @@ void Animation::_transform_track_optimize(int p_idx, float p_alowed_linear_err,
 		TKey<TransformKey> &t1 = tt->transforms[i];
 		TKey<TransformKey> &t2 = tt->transforms[i + 1];
 
-		bool erase = _transform_track_optimize_key(t0, t1, t2, p_alowed_linear_err, p_alowed_angular_err, p_max_optimizable_angle, norm);
+		bool erase = _transform_track_optimize_key(t0, t1, t2, p_allowed_linear_err, p_allowed_angular_err, p_max_optimizable_angle, norm);
 		if (erase && !prev_erased) {
 			norm = (t2.value.loc - t1.value.loc).normalized();
 		}
 
-		if (prev_erased && !_transform_track_optimize_key(t0, first_erased, t2, p_alowed_linear_err, p_alowed_angular_err, p_max_optimizable_angle, norm)) {
+		if (prev_erased && !_transform_track_optimize_key(t0, first_erased, t2, p_allowed_linear_err, p_allowed_angular_err, p_max_optimizable_angle, norm)) {
 			//avoid error to go beyond first erased key
 			erase = false;
 		}
@@ -1914,12 +1914,12 @@ void Animation::_transform_track_optimize(int p_idx, float p_alowed_linear_err,
 	}
 }
 
-void Animation::optimize(float p_allowed_linear_err, float p_allowed_angular_err, float p_angle_max) {
+void Animation::optimize(float p_allowed_linear_err, float p_allowed_angular_err, float p_max_optimizable_angle) {
 
 	for (int i = 0; i < tracks.size(); i++) {
 
 		if (tracks[i]->type == TYPE_TRANSFORM)
-			_transform_track_optimize(i, p_allowed_linear_err, p_allowed_angular_err, p_angle_max);
+			_transform_track_optimize(i, p_allowed_linear_err, p_allowed_angular_err, p_max_optimizable_angle);
 	}
 }
 
diff --git a/scene/resources/animation.h b/scene/resources/animation.h
index b363f2b666..27c58aba8c 100644
--- a/scene/resources/animation.h
+++ b/scene/resources/animation.h
@@ -212,7 +212,7 @@ private:
 	}
 
 	bool _transform_track_optimize_key(const TKey<TransformKey> &t0, const TKey<TransformKey> &t1, const TKey<TransformKey> &t2, float p_alowed_linear_err, float p_alowed_angular_err, float p_max_optimizable_angle, const Vector3 &p_norm);
-	void _transform_track_optimize(int p_idx, float p_allowed_err = 0.05, float p_alowed_angular_err = 0.01, float p_max_optimizable_angle = Math_PI * 0.125);
+	void _transform_track_optimize(int p_idx, float p_allowed_linear_err = 0.05, float p_allowed_angular_err = 0.01, float p_max_optimizable_angle = Math_PI * 0.125);
 
 protected:
 	bool _set(const StringName &p_name, const Variant &p_value);
diff --git a/scene/resources/color_ramp.h b/scene/resources/color_ramp.h
index d7ec20b324..d9f14205bb 100644
--- a/scene/resources/color_ramp.h
+++ b/scene/resources/color_ramp.h
@@ -60,7 +60,7 @@ public:
 	void add_point(float p_offset, const Color &p_color);
 	void remove_point(int p_index);
 
-	void set_points(Vector<Point> &points);
+	void set_points(Vector<Point> &p_points);
 	Vector<Point> &get_points();
 
 	void set_offset(int pos, const float offset);
@@ -69,10 +69,10 @@ public:
 	void set_color(int pos, const Color &color);
 	Color get_color(int pos) const;
 
-	void set_offsets(const Vector<float> &offsets);
+	void set_offsets(const Vector<float> &p_offsets);
 	Vector<float> get_offsets() const;
 
-	void set_colors(const Vector<Color> &colors);
+	void set_colors(const Vector<Color> &p_colors);
 	Vector<Color> get_colors() const;
 
 	_FORCE_INLINE_ Color get_color_at_offset(float p_offset) {
diff --git a/scene/resources/curve.h b/scene/resources/curve.h
index 2815c12c4b..e302f1e0af 100644
--- a/scene/resources/curve.h
+++ b/scene/resources/curve.h
@@ -174,7 +174,7 @@ public:
 
 	void bake();
 	int get_bake_resolution() const { return _bake_resolution; }
-	void set_bake_resolution(int p_interval);
+	void set_bake_resolution(int p_resolution);
 	real_t interpolate_baked(real_t offset);
 
 protected:
@@ -242,7 +242,7 @@ public:
 	Vector2 interpolate(int p_index, float p_offset) const;
 	Vector2 interpolatef(real_t p_findex) const;
 
-	void set_bake_interval(float p_distance);
+	void set_bake_interval(float p_tolerance);
 	float get_bake_interval() const;
 
 	float get_baked_length() const;
@@ -309,7 +309,7 @@ public:
 	Vector3 interpolate(int p_index, float p_offset) const;
 	Vector3 interpolatef(real_t p_findex) const;
 
-	void set_bake_interval(float p_distance);
+	void set_bake_interval(float p_tolerance);
 	float get_bake_interval() const;
 
 	float get_baked_length() const;
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index d1dff13774..03288e45bf 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -203,7 +203,7 @@ static Ref<StyleBox> make_empty_stylebox(float p_margin_left = -1, float p_margi
 	return style;
 }
 
-void fill_default_theme(Ref<Theme> &t, const Ref<Font> &default_font, const Ref<Font> &large_font, Ref<Texture> &default_icon, Ref<StyleBox> &default_style, float p_scale) {
+void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const Ref<Font> &large_font, Ref<Texture> &default_icon, Ref<StyleBox> &default_style, float p_scale) {
 
 	scale = p_scale;
 
@@ -223,7 +223,7 @@ void fill_default_theme(Ref<Theme> &t, const Ref<Font> &default_font, const Ref<
 
 	// Panel
 
-	t->set_stylebox("panel", "Panel", make_stylebox(panel_bg_png, 0, 0, 0, 0));
+	theme->set_stylebox("panel", "Panel", make_stylebox(panel_bg_png, 0, 0, 0, 0));
 
 	// Focus
 
@@ -240,63 +240,63 @@ void fill_default_theme(Ref<Theme> &t, const Ref<Font> &default_font, const Ref<
 	Ref<StyleBox> sb_button_disabled = sb_expand(make_stylebox(button_disabled_png, 4, 4, 4, 4, 6, 2, 6, 2), 2, 2, 2, 2);
 	Ref<StyleBox> sb_button_focus = sb_expand(make_stylebox(button_focus_png, 4, 4, 4, 4, 6, 2, 6, 2), 2, 2, 2, 2);
 
-	t->set_stylebox("normal", "Button", sb_button_normal);
-	t->set_stylebox("pressed", "Button", sb_button_pressed);
-	t->set_stylebox("hover", "Button", sb_button_hover);
-	t->set_stylebox("disabled", "Button", sb_button_disabled);
-	t->set_stylebox("focus", "Button", sb_button_focus);
+	theme->set_stylebox("normal", "Button", sb_button_normal);
+	theme->set_stylebox("pressed", "Button", sb_button_pressed);
+	theme->set_stylebox("hover", "Button", sb_button_hover);
+	theme->set_stylebox("disabled", "Button", sb_button_disabled);
+	theme->set_stylebox("focus", "Button", sb_button_focus);
 
-	t->set_font("font", "Button", default_font);
+	theme->set_font("font", "Button", default_font);
 
-	t->set_color("font_color", "Button", control_font_color);
-	t->set_color("font_color_pressed", "Button", control_font_color_pressed);
-	t->set_color("font_color_hover", "Button", control_font_color_hover);
-	t->set_color("font_color_disabled", "Button", control_font_color_disabled);
+	theme->set_color("font_color", "Button", control_font_color);
+	theme->set_color("font_color_pressed", "Button", control_font_color_pressed);
+	theme->set_color("font_color_hover", "Button", control_font_color_hover);
+	theme->set_color("font_color_disabled", "Button", control_font_color_disabled);
 
-	t->set_constant("hseparation", "Button", 2 * scale);
+	theme->set_constant("hseparation", "Button", 2 * scale);
 
 	// LinkButton
 
-	t->set_font("font", "LinkButton", default_font);
+	theme->set_font("font", "LinkButton", default_font);
 
-	t->set_color("font_color", "LinkButton", control_font_color);
-	t->set_color("font_color_pressed", "LinkButton", control_font_color_pressed);
-	t->set_color("font_color_hover", "LinkButton", control_font_color_hover);
+	theme->set_color("font_color", "LinkButton", control_font_color);
+	theme->set_color("font_color_pressed", "LinkButton", control_font_color_pressed);
+	theme->set_color("font_color_hover", "LinkButton", control_font_color_hover);
 
-	t->set_constant("underline_spacing", "LinkButton", 2 * scale);
+	theme->set_constant("underline_spacing", "LinkButton", 2 * scale);
 
 	// ColorPickerButton
 
-	t->set_stylebox("normal", "ColorPickerButton", sb_button_normal);
-	t->set_stylebox("pressed", "ColorPickerButton", sb_button_pressed);
-	t->set_stylebox("hover", "ColorPickerButton", sb_button_hover);
-	t->set_stylebox("disabled", "ColorPickerButton", sb_button_disabled);
-	t->set_stylebox("focus", "ColorPickerButton", sb_button_focus);
+	theme->set_stylebox("normal", "ColorPickerButton", sb_button_normal);
+	theme->set_stylebox("pressed", "ColorPickerButton", sb_button_pressed);
+	theme->set_stylebox("hover", "ColorPickerButton", sb_button_hover);
+	theme->set_stylebox("disabled", "ColorPickerButton", sb_button_disabled);
+	theme->set_stylebox("focus", "ColorPickerButton", sb_button_focus);
 
-	t->set_font("font", "ColorPickerButton", default_font);
+	theme->set_font("font", "ColorPickerButton", default_font);
 
-	t->set_color("font_color", "ColorPickerButton", Color(1, 1, 1, 1));
-	t->set_color("font_color_pressed", "ColorPickerButton", Color(0.8, 0.8, 0.8, 1));
-	t->set_color("font_color_hover", "ColorPickerButton", Color(1, 1, 1, 1));
-	t->set_color("font_color_disabled", "ColorPickerButton", Color(0.9, 0.9, 0.9, 0.3));
+	theme->set_color("font_color", "ColorPickerButton", Color(1, 1, 1, 1));
+	theme->set_color("font_color_pressed", "ColorPickerButton", Color(0.8, 0.8, 0.8, 1));
+	theme->set_color("font_color_hover", "ColorPickerButton", Color(1, 1, 1, 1));
+	theme->set_color("font_color_disabled", "ColorPickerButton", Color(0.9, 0.9, 0.9, 0.3));
 
-	t->set_constant("hseparation", "ColorPickerButton", 2 * scale);
+	theme->set_constant("hseparation", "ColorPickerButton", 2 * scale);
 
 	// ToolButton
 
-	t->set_stylebox("normal", "ToolButton", make_empty_stylebox(6, 4, 6, 4));
-	t->set_stylebox("pressed", "ToolButton", make_stylebox(button_pressed_png, 4, 4, 4, 4, 6, 4, 6, 4));
-	t->set_stylebox("hover", "ToolButton", make_stylebox(button_normal_png, 4, 4, 4, 4, 6, 4, 6, 4));
-	t->set_stylebox("disabled", "ToolButton", make_empty_stylebox(6, 4, 6, 4));
-	t->set_stylebox("focus", "ToolButton", focus);
-	t->set_font("font", "ToolButton", default_font);
+	theme->set_stylebox("normal", "ToolButton", make_empty_stylebox(6, 4, 6, 4));
+	theme->set_stylebox("pressed", "ToolButton", make_stylebox(button_pressed_png, 4, 4, 4, 4, 6, 4, 6, 4));
+	theme->set_stylebox("hover", "ToolButton", make_stylebox(button_normal_png, 4, 4, 4, 4, 6, 4, 6, 4));
+	theme->set_stylebox("disabled", "ToolButton", make_empty_stylebox(6, 4, 6, 4));
+	theme->set_stylebox("focus", "ToolButton", focus);
+	theme->set_font("font", "ToolButton", default_font);
 
-	t->set_color("font_color", "ToolButton", control_font_color);
-	t->set_color("font_color_pressed", "ToolButton", control_font_color_pressed);
-	t->set_color("font_color_hover", "ToolButton", control_font_color_hover);
-	t->set_color("font_color_disabled", "ToolButton", Color(0.9, 0.95, 1, 0.3));
+	theme->set_color("font_color", "ToolButton", control_font_color);
+	theme->set_color("font_color_pressed", "ToolButton", control_font_color_pressed);
+	theme->set_color("font_color_hover", "ToolButton", control_font_color_hover);
+	theme->set_color("font_color_disabled", "ToolButton", Color(0.9, 0.95, 1, 0.3));
 
-	t->set_constant("hseparation", "ToolButton", 3);
+	theme->set_constant("hseparation", "ToolButton", 3);
 
 	// OptionButton
 
@@ -306,44 +306,44 @@ void fill_default_theme(Ref<Theme> &t, const Ref<Font> &default_font, const Ref<
 	Ref<StyleBox> sb_optbutton_disabled = sb_expand(make_stylebox(option_button_disabled_png, 4, 4, 21, 4, 6, 2, 21, 2), 2, 2, 2, 2);
 	Ref<StyleBox> sb_optbutton_focus = sb_expand(make_stylebox(button_focus_png, 4, 4, 4, 4, 6, 2, 6, 2), 2, 2, 2, 2);
 
-	t->set_stylebox("normal", "OptionButton", sb_optbutton_normal);
-	t->set_stylebox("pressed", "OptionButton", sb_optbutton_pressed);
-	t->set_stylebox("hover", "OptionButton", sb_optbutton_hover);
-	t->set_stylebox("disabled", "OptionButton", sb_optbutton_disabled);
-	t->set_stylebox("focus", "OptionButton", sb_button_focus);
+	theme->set_stylebox("normal", "OptionButton", sb_optbutton_normal);
+	theme->set_stylebox("pressed", "OptionButton", sb_optbutton_pressed);
+	theme->set_stylebox("hover", "OptionButton", sb_optbutton_hover);
+	theme->set_stylebox("disabled", "OptionButton", sb_optbutton_disabled);
+	theme->set_stylebox("focus", "OptionButton", sb_button_focus);
 
-	t->set_icon("arrow", "OptionButton", make_icon(option_arrow_png));
+	theme->set_icon("arrow", "OptionButton", make_icon(option_arrow_png));
 
-	t->set_font("font", "OptionButton", default_font);
+	theme->set_font("font", "OptionButton", default_font);
 
-	t->set_color("font_color", "OptionButton", control_font_color);
-	t->set_color("font_color_pressed", "OptionButton", control_font_color_pressed);
-	t->set_color("font_color_hover", "OptionButton", control_font_color_hover);
-	t->set_color("font_color_disabled", "OptionButton", control_font_color_disabled);
+	theme->set_color("font_color", "OptionButton", control_font_color);
+	theme->set_color("font_color_pressed", "OptionButton", control_font_color_pressed);
+	theme->set_color("font_color_hover", "OptionButton", control_font_color_hover);
+	theme->set_color("font_color_disabled", "OptionButton", control_font_color_disabled);
 
-	t->set_constant("hseparation", "OptionButton", 2 * scale);
-	t->set_constant("arrow_margin", "OptionButton", 2 * scale);
+	theme->set_constant("hseparation", "OptionButton", 2 * scale);
+	theme->set_constant("arrow_margin", "OptionButton", 2 * scale);
 
 	// MenuButton
 
-	t->set_stylebox("normal", "MenuButton", sb_button_normal);
-	t->set_stylebox("pressed", "MenuButton", sb_button_pressed);
-	t->set_stylebox("hover", "MenuButton", sb_button_pressed);
-	t->set_stylebox("disabled", "MenuButton", make_empty_stylebox(0, 0, 0, 0));
-	t->set_stylebox("focus", "MenuButton", sb_button_focus);
+	theme->set_stylebox("normal", "MenuButton", sb_button_normal);
+	theme->set_stylebox("pressed", "MenuButton", sb_button_pressed);
+	theme->set_stylebox("hover", "MenuButton", sb_button_pressed);
+	theme->set_stylebox("disabled", "MenuButton", make_empty_stylebox(0, 0, 0, 0));
+	theme->set_stylebox("focus", "MenuButton", sb_button_focus);
 
-	t->set_font("font", "MenuButton", default_font);
+	theme->set_font("font", "MenuButton", default_font);
 
-	t->set_color("font_color", "MenuButton", control_font_color);
-	t->set_color("font_color_pressed", "MenuButton", control_font_color_pressed);
-	t->set_color("font_color_hover", "MenuButton", control_font_color_hover);
-	t->set_color("font_color_disabled", "MenuButton", Color(1, 1, 1, 0.3));
+	theme->set_color("font_color", "MenuButton", control_font_color);
+	theme->set_color("font_color_pressed", "MenuButton", control_font_color_pressed);
+	theme->set_color("font_color_hover", "MenuButton", control_font_color_hover);
+	theme->set_color("font_color_disabled", "MenuButton", Color(1, 1, 1, 0.3));
 
-	t->set_constant("hseparation", "MenuButton", 3 * scale);
+	theme->set_constant("hseparation", "MenuButton", 3 * scale);
 
 	// ButtonGroup
 
-	t->set_stylebox("panel", "ButtonGroup", memnew(StyleBoxEmpty));
+	theme->set_stylebox("panel", "ButtonGroup", memnew(StyleBoxEmpty));
 
 	// CheckBox
 
@@ -358,26 +358,26 @@ void fill_default_theme(Ref<Theme> &t, const Ref<Font> &default_font, const Ref<
 	cbx_focus->set_default_margin(MARGIN_TOP, 4 * scale);
 	cbx_focus->set_default_margin(MARGIN_BOTTOM, 5 * scale);
 
-	t->set_stylebox("normal", "CheckBox", cbx_empty);
-	t->set_stylebox("pressed", "CheckBox", cbx_empty);
-	t->set_stylebox("disabled", "CheckBox", cbx_empty);
-	t->set_stylebox("hover", "CheckBox", cbx_empty);
-	t->set_stylebox("focus", "CheckBox", cbx_focus);
+	theme->set_stylebox("normal", "CheckBox", cbx_empty);
+	theme->set_stylebox("pressed", "CheckBox", cbx_empty);
+	theme->set_stylebox("disabled", "CheckBox", cbx_empty);
+	theme->set_stylebox("hover", "CheckBox", cbx_empty);
+	theme->set_stylebox("focus", "CheckBox", cbx_focus);
 
-	t->set_icon("checked", "CheckBox", make_icon(checked_png));
-	t->set_icon("unchecked", "CheckBox", make_icon(unchecked_png));
-	t->set_icon("radio_checked", "CheckBox", make_icon(radio_checked_png));
-	t->set_icon("radio_unchecked", "CheckBox", make_icon(radio_unchecked_png));
+	theme->set_icon("checked", "CheckBox", make_icon(checked_png));
+	theme->set_icon("unchecked", "CheckBox", make_icon(unchecked_png));
+	theme->set_icon("radio_checked", "CheckBox", make_icon(radio_checked_png));
+	theme->set_icon("radio_unchecked", "CheckBox", make_icon(radio_unchecked_png));
 
-	t->set_font("font", "CheckBox", default_font);
+	theme->set_font("font", "CheckBox", default_font);
 
-	t->set_color("font_color", "CheckBox", control_font_color);
-	t->set_color("font_color_pressed", "CheckBox", control_font_color_pressed);
-	t->set_color("font_color_hover", "CheckBox", control_font_color_hover);
-	t->set_color("font_color_disabled", "CheckBox", control_font_color_disabled);
+	theme->set_color("font_color", "CheckBox", control_font_color);
+	theme->set_color("font_color_pressed", "CheckBox", control_font_color_pressed);
+	theme->set_color("font_color_hover", "CheckBox", control_font_color_hover);
+	theme->set_color("font_color_disabled", "CheckBox", control_font_color_disabled);
 
-	t->set_constant("hseparation", "CheckBox", 4 * scale);
-	t->set_constant("check_vadjust", "CheckBox", 0 * scale);
+	theme->set_constant("hseparation", "CheckBox", 4 * scale);
+	theme->set_constant("check_vadjust", "CheckBox", 0 * scale);
 
 	// CheckButton
 
@@ -387,172 +387,172 @@ void fill_default_theme(Ref<Theme> &t, const Ref<Font> &default_font, const Ref<
 	cb_empty->set_default_margin(MARGIN_TOP, 4 * scale);
 	cb_empty->set_default_margin(MARGIN_BOTTOM, 4 * scale);
 
-	t->set_stylebox("normal", "CheckButton", cb_empty);
-	t->set_stylebox("pressed", "CheckButton", cb_empty);
-	t->set_stylebox("disabled", "CheckButton", cb_empty);
-	t->set_stylebox("hover", "CheckButton", cb_empty);
-	t->set_stylebox("focus", "CheckButton", focus);
+	theme->set_stylebox("normal", "CheckButton", cb_empty);
+	theme->set_stylebox("pressed", "CheckButton", cb_empty);
+	theme->set_stylebox("disabled", "CheckButton", cb_empty);
+	theme->set_stylebox("hover", "CheckButton", cb_empty);
+	theme->set_stylebox("focus", "CheckButton", focus);
 
-	t->set_icon("on", "CheckButton", make_icon(toggle_on_png));
-	t->set_icon("off", "CheckButton", make_icon(toggle_off_png));
+	theme->set_icon("on", "CheckButton", make_icon(toggle_on_png));
+	theme->set_icon("off", "CheckButton", make_icon(toggle_off_png));
 
-	t->set_font("font", "CheckButton", default_font);
+	theme->set_font("font", "CheckButton", default_font);
 
-	t->set_color("font_color", "CheckButton", control_font_color);
-	t->set_color("font_color_pressed", "CheckButton", control_font_color_pressed);
-	t->set_color("font_color_hover", "CheckButton", control_font_color_hover);
-	t->set_color("font_color_disabled", "CheckButton", control_font_color_disabled);
+	theme->set_color("font_color", "CheckButton", control_font_color);
+	theme->set_color("font_color_pressed", "CheckButton", control_font_color_pressed);
+	theme->set_color("font_color_hover", "CheckButton", control_font_color_hover);
+	theme->set_color("font_color_disabled", "CheckButton", control_font_color_disabled);
 
-	t->set_constant("hseparation", "CheckButton", 4 * scale);
-	t->set_constant("check_vadjust", "CheckButton", 0 * scale);
+	theme->set_constant("hseparation", "CheckButton", 4 * scale);
+	theme->set_constant("check_vadjust", "CheckButton", 0 * scale);
 
 	// Label
 
-	t->set_font("font", "Label", default_font);
+	theme->set_font("font", "Label", default_font);
 
-	t->set_color("font_color", "Label", Color(1, 1, 1));
-	t->set_color("font_color_shadow", "Label", Color(0, 0, 0, 0));
+	theme->set_color("font_color", "Label", Color(1, 1, 1));
+	theme->set_color("font_color_shadow", "Label", Color(0, 0, 0, 0));
 
-	t->set_constant("shadow_offset_x", "Label", 1 * scale);
-	t->set_constant("shadow_offset_y", "Label", 1 * scale);
-	t->set_constant("shadow_as_outline", "Label", 0 * scale);
-	t->set_constant("line_spacing", "Label", 3 * scale);
+	theme->set_constant("shadow_offset_x", "Label", 1 * scale);
+	theme->set_constant("shadow_offset_y", "Label", 1 * scale);
+	theme->set_constant("shadow_as_outline", "Label", 0 * scale);
+	theme->set_constant("line_spacing", "Label", 3 * scale);
 
 	// LineEdit
 
-	t->set_stylebox("normal", "LineEdit", make_stylebox(line_edit_png, 5, 5, 5, 5));
-	t->set_stylebox("focus", "LineEdit", focus);
-	t->set_stylebox("read_only", "LineEdit", make_stylebox(line_edit_disabled_png, 6, 6, 6, 6));
+	theme->set_stylebox("normal", "LineEdit", make_stylebox(line_edit_png, 5, 5, 5, 5));
+	theme->set_stylebox("focus", "LineEdit", focus);
+	theme->set_stylebox("read_only", "LineEdit", make_stylebox(line_edit_disabled_png, 6, 6, 6, 6));
 
-	t->set_font("font", "LineEdit", default_font);
+	theme->set_font("font", "LineEdit", default_font);
 
-	t->set_color("font_color", "LineEdit", control_font_color);
-	t->set_color("font_color_selected", "LineEdit", Color(0, 0, 0));
-	t->set_color("cursor_color", "LineEdit", control_font_color_hover);
-	t->set_color("selection_color", "LineEdit", font_color_selection);
+	theme->set_color("font_color", "LineEdit", control_font_color);
+	theme->set_color("font_color_selected", "LineEdit", Color(0, 0, 0));
+	theme->set_color("cursor_color", "LineEdit", control_font_color_hover);
+	theme->set_color("selection_color", "LineEdit", font_color_selection);
 
-	t->set_constant("minimum_spaces", "LineEdit", 12 * scale);
+	theme->set_constant("minimum_spaces", "LineEdit", 12 * scale);
 
 	// ProgressBar
 
-	t->set_stylebox("bg", "ProgressBar", make_stylebox(progress_bar_png, 4, 4, 4, 4, 0, 0, 0, 0));
-	t->set_stylebox("fg", "ProgressBar", make_stylebox(progress_fill_png, 6, 6, 6, 6, 2, 1, 2, 1));
+	theme->set_stylebox("bg", "ProgressBar", make_stylebox(progress_bar_png, 4, 4, 4, 4, 0, 0, 0, 0));
+	theme->set_stylebox("fg", "ProgressBar", make_stylebox(progress_fill_png, 6, 6, 6, 6, 2, 1, 2, 1));
 
-	t->set_font("font", "ProgressBar", default_font);
+	theme->set_font("font", "ProgressBar", default_font);
 
-	t->set_color("font_color", "ProgressBar", control_font_color_hover);
-	t->set_color("font_color_shadow", "ProgressBar", Color(0, 0, 0));
+	theme->set_color("font_color", "ProgressBar", control_font_color_hover);
+	theme->set_color("font_color_shadow", "ProgressBar", Color(0, 0, 0));
 
 	// TextEdit
 
-	t->set_stylebox("normal", "TextEdit", make_stylebox(tree_bg_png, 3, 3, 3, 3));
-	t->set_stylebox("focus", "TextEdit", focus);
-	t->set_stylebox("completion", "TextEdit", make_stylebox(tree_bg_png, 3, 3, 3, 3));
-
-	t->set_icon("tab", "TextEdit", make_icon(tab_png));
-
-	t->set_font("font", "TextEdit", default_font);
-
-	t->set_color("background_color", "TextEdit", Color(0, 0, 0, 0));
-	t->set_color("completion_background_color", "TextEdit", Color::html("2C2A32"));
-	t->set_color("completion_selected_color", "TextEdit", Color::html("434244"));
-	t->set_color("completion_existing_color", "TextEdit", Color::html("21dfdfdf"));
-	t->set_color("completion_scroll_color", "TextEdit", control_font_color_pressed);
-	t->set_color("completion_font_color", "TextEdit", Color::html("aaaaaa"));
-	t->set_color("font_color", "TextEdit", control_font_color);
-	t->set_color("font_color_selected", "TextEdit", Color(0, 0, 0));
-	t->set_color("selection_color", "TextEdit", font_color_selection);
-	t->set_color("mark_color", "TextEdit", Color(1.0, 0.4, 0.4, 0.4));
-	t->set_color("breakpoint_color", "TextEdit", Color(0.8, 0.8, 0.4, 0.2));
-	t->set_color("current_line_color", "TextEdit", Color(0.25, 0.25, 0.26, 0.8));
-	t->set_color("caret_color", "TextEdit", control_font_color);
-	t->set_color("caret_background_color", "TextEdit", Color::html("000000"));
-	t->set_color("symbol_color", "TextEdit", control_font_color_hover);
-	t->set_color("brace_mismatch_color", "TextEdit", Color(1, 0.2, 0.2));
-	t->set_color("line_number_color", "TextEdit", Color::html("66aaaaaa"));
-	t->set_color("function_color", "TextEdit", Color::html("66a2ce"));
-	t->set_color("member_variable_color", "TextEdit", Color::html("e64e59"));
-	t->set_color("number_color", "TextEdit", Color::html("EB9532"));
-	t->set_color("word_highlighted_color", "TextEdit", Color(0.8, 0.9, 0.9, 0.15));
-
-	t->set_constant("completion_lines", "TextEdit", 7);
-	t->set_constant("completion_max_width", "TextEdit", 50);
-	t->set_constant("completion_scroll_width", "TextEdit", 3);
-	t->set_constant("line_spacing", "TextEdit", 4 * scale);
+	theme->set_stylebox("normal", "TextEdit", make_stylebox(tree_bg_png, 3, 3, 3, 3));
+	theme->set_stylebox("focus", "TextEdit", focus);
+	theme->set_stylebox("completion", "TextEdit", make_stylebox(tree_bg_png, 3, 3, 3, 3));
+
+	theme->set_icon("tab", "TextEdit", make_icon(tab_png));
+
+	theme->set_font("font", "TextEdit", default_font);
+
+	theme->set_color("background_color", "TextEdit", Color(0, 0, 0, 0));
+	theme->set_color("completion_background_color", "TextEdit", Color::html("2C2A32"));
+	theme->set_color("completion_selected_color", "TextEdit", Color::html("434244"));
+	theme->set_color("completion_existing_color", "TextEdit", Color::html("21dfdfdf"));
+	theme->set_color("completion_scroll_color", "TextEdit", control_font_color_pressed);
+	theme->set_color("completion_font_color", "TextEdit", Color::html("aaaaaa"));
+	theme->set_color("font_color", "TextEdit", control_font_color);
+	theme->set_color("font_color_selected", "TextEdit", Color(0, 0, 0));
+	theme->set_color("selection_color", "TextEdit", font_color_selection);
+	theme->set_color("mark_color", "TextEdit", Color(1.0, 0.4, 0.4, 0.4));
+	theme->set_color("breakpoint_color", "TextEdit", Color(0.8, 0.8, 0.4, 0.2));
+	theme->set_color("current_line_color", "TextEdit", Color(0.25, 0.25, 0.26, 0.8));
+	theme->set_color("caret_color", "TextEdit", control_font_color);
+	theme->set_color("caret_background_color", "TextEdit", Color::html("000000"));
+	theme->set_color("symbol_color", "TextEdit", control_font_color_hover);
+	theme->set_color("brace_mismatch_color", "TextEdit", Color(1, 0.2, 0.2));
+	theme->set_color("line_number_color", "TextEdit", Color::html("66aaaaaa"));
+	theme->set_color("function_color", "TextEdit", Color::html("66a2ce"));
+	theme->set_color("member_variable_color", "TextEdit", Color::html("e64e59"));
+	theme->set_color("number_color", "TextEdit", Color::html("EB9532"));
+	theme->set_color("word_highlighted_color", "TextEdit", Color(0.8, 0.9, 0.9, 0.15));
+
+	theme->set_constant("completion_lines", "TextEdit", 7);
+	theme->set_constant("completion_max_width", "TextEdit", 50);
+	theme->set_constant("completion_scroll_width", "TextEdit", 3);
+	theme->set_constant("line_spacing", "TextEdit", 4 * scale);
 
 	Ref<Texture> empty_icon = memnew(ImageTexture);
 
 	// HScrollBar
 
-	t->set_stylebox("scroll", "HScrollBar", make_stylebox(scroll_bg_png, 5, 5, 5, 5, 0, 0, 0, 0));
-	t->set_stylebox("scroll_focus", "HScrollBar", make_stylebox(scroll_bg_png, 5, 5, 5, 5, 0, 0, 0, 0));
-	t->set_stylebox("grabber", "HScrollBar", make_stylebox(scroll_grabber_png, 5, 5, 5, 5, 2, 2, 2, 2));
-	t->set_stylebox("grabber_highlight", "HScrollBar", make_stylebox(scroll_grabber_hl_png, 5, 5, 5, 5, 2, 2, 2, 2));
-	t->set_stylebox("grabber_pressed", "HScrollBar", make_stylebox(scroll_grabber_pressed_png, 5, 5, 5, 5, 2, 2, 2, 2));
+	theme->set_stylebox("scroll", "HScrollBar", make_stylebox(scroll_bg_png, 5, 5, 5, 5, 0, 0, 0, 0));
+	theme->set_stylebox("scroll_focus", "HScrollBar", make_stylebox(scroll_bg_png, 5, 5, 5, 5, 0, 0, 0, 0));
+	theme->set_stylebox("grabber", "HScrollBar", make_stylebox(scroll_grabber_png, 5, 5, 5, 5, 2, 2, 2, 2));
+	theme->set_stylebox("grabber_highlight", "HScrollBar", make_stylebox(scroll_grabber_hl_png, 5, 5, 5, 5, 2, 2, 2, 2));
+	theme->set_stylebox("grabber_pressed", "HScrollBar", make_stylebox(scroll_grabber_pressed_png, 5, 5, 5, 5, 2, 2, 2, 2));
 
-	t->set_icon("increment", "HScrollBar", empty_icon);
-	t->set_icon("increment_highlight", "HScrollBar", empty_icon);
-	t->set_icon("decrement", "HScrollBar", empty_icon);
-	t->set_icon("decrement_highlight", "HScrollBar", empty_icon);
+	theme->set_icon("increment", "HScrollBar", empty_icon);
+	theme->set_icon("increment_highlight", "HScrollBar", empty_icon);
+	theme->set_icon("decrement", "HScrollBar", empty_icon);
+	theme->set_icon("decrement_highlight", "HScrollBar", empty_icon);
 
 	// VScrollBar
 
-	t->set_stylebox("scroll", "VScrollBar", make_stylebox(scroll_bg_png, 5, 5, 5, 5, 0, 0, 0, 0));
-	t->set_stylebox("scroll_focus", "VScrollBar", make_stylebox(scroll_bg_png, 5, 5, 5, 5, 0, 0, 0, 0));
-	t->set_stylebox("grabber", "VScrollBar", make_stylebox(scroll_grabber_png, 5, 5, 5, 5, 2, 2, 2, 2));
-	t->set_stylebox("grabber_highlight", "VScrollBar", make_stylebox(scroll_grabber_hl_png, 5, 5, 5, 5, 2, 2, 2, 2));
-	t->set_stylebox("grabber_pressed", "VScrollBar", make_stylebox(scroll_grabber_pressed_png, 5, 5, 5, 5, 2, 2, 2, 2));
+	theme->set_stylebox("scroll", "VScrollBar", make_stylebox(scroll_bg_png, 5, 5, 5, 5, 0, 0, 0, 0));
+	theme->set_stylebox("scroll_focus", "VScrollBar", make_stylebox(scroll_bg_png, 5, 5, 5, 5, 0, 0, 0, 0));
+	theme->set_stylebox("grabber", "VScrollBar", make_stylebox(scroll_grabber_png, 5, 5, 5, 5, 2, 2, 2, 2));
+	theme->set_stylebox("grabber_highlight", "VScrollBar", make_stylebox(scroll_grabber_hl_png, 5, 5, 5, 5, 2, 2, 2, 2));
+	theme->set_stylebox("grabber_pressed", "VScrollBar", make_stylebox(scroll_grabber_pressed_png, 5, 5, 5, 5, 2, 2, 2, 2));
 
-	t->set_icon("increment", "VScrollBar", empty_icon);
-	t->set_icon("increment_highlight", "VScrollBar", empty_icon);
-	t->set_icon("decrement", "VScrollBar", empty_icon);
-	t->set_icon("decrement_highlight", "VScrollBar", empty_icon);
+	theme->set_icon("increment", "VScrollBar", empty_icon);
+	theme->set_icon("increment_highlight", "VScrollBar", empty_icon);
+	theme->set_icon("decrement", "VScrollBar", empty_icon);
+	theme->set_icon("decrement_highlight", "VScrollBar", empty_icon);
 
 	// HSlider
 
-	t->set_stylebox("slider", "HSlider", make_stylebox(hslider_bg_png, 4, 4, 4, 4));
-	t->set_stylebox("grabber_highlight", "HSlider", make_stylebox(hslider_grabber_hl_png, 6, 6, 6, 6));
-	t->set_stylebox("grabber_disabled", "HSlider", make_stylebox(hslider_grabber_disabled_png, 6, 6, 6, 6));
-	t->set_stylebox("focus", "HSlider", focus);
+	theme->set_stylebox("slider", "HSlider", make_stylebox(hslider_bg_png, 4, 4, 4, 4));
+	theme->set_stylebox("grabber_highlight", "HSlider", make_stylebox(hslider_grabber_hl_png, 6, 6, 6, 6));
+	theme->set_stylebox("grabber_disabled", "HSlider", make_stylebox(hslider_grabber_disabled_png, 6, 6, 6, 6));
+	theme->set_stylebox("focus", "HSlider", focus);
 
-	t->set_icon("grabber", "HSlider", make_icon(hslider_grabber_png));
-	t->set_icon("grabber_highlight", "HSlider", make_icon(hslider_grabber_hl_png));
-	t->set_icon("grabber_disabled", "HSlider", make_icon(hslider_grabber_disabled_png));
-	t->set_icon("tick", "HSlider", make_icon(hslider_tick_png));
+	theme->set_icon("grabber", "HSlider", make_icon(hslider_grabber_png));
+	theme->set_icon("grabber_highlight", "HSlider", make_icon(hslider_grabber_hl_png));
+	theme->set_icon("grabber_disabled", "HSlider", make_icon(hslider_grabber_disabled_png));
+	theme->set_icon("tick", "HSlider", make_icon(hslider_tick_png));
 
 	// VSlider
 
-	t->set_stylebox("slider", "VSlider", make_stylebox(vslider_bg_png, 4, 4, 4, 4));
-	t->set_stylebox("grabber_highlight", "VSlider", make_stylebox(vslider_grabber_hl_png, 6, 6, 6, 6));
-	t->set_stylebox("grabber_disabled", "VSlider", make_stylebox(vslider_grabber_disabled_png, 6, 6, 6, 6));
-	t->set_stylebox("focus", "HSlider", focus);
+	theme->set_stylebox("slider", "VSlider", make_stylebox(vslider_bg_png, 4, 4, 4, 4));
+	theme->set_stylebox("grabber_highlight", "VSlider", make_stylebox(vslider_grabber_hl_png, 6, 6, 6, 6));
+	theme->set_stylebox("grabber_disabled", "VSlider", make_stylebox(vslider_grabber_disabled_png, 6, 6, 6, 6));
+	theme->set_stylebox("focus", "HSlider", focus);
 
-	t->set_icon("grabber", "VSlider", make_icon(vslider_grabber_png));
-	t->set_icon("grabber_highlight", "VSlider", make_icon(vslider_grabber_hl_png));
-	t->set_icon("grabber_disabled", "VSlider", make_icon(vslider_grabber_disabled_png));
-	t->set_icon("tick", "VSlider", make_icon(vslider_tick_png));
+	theme->set_icon("grabber", "VSlider", make_icon(vslider_grabber_png));
+	theme->set_icon("grabber_highlight", "VSlider", make_icon(vslider_grabber_hl_png));
+	theme->set_icon("grabber_disabled", "VSlider", make_icon(vslider_grabber_disabled_png));
+	theme->set_icon("tick", "VSlider", make_icon(vslider_tick_png));
 
 	// SpinBox
 
-	t->set_icon("updown", "SpinBox", make_icon(spinbox_updown_png));
+	theme->set_icon("updown", "SpinBox", make_icon(spinbox_updown_png));
 
 	// WindowDialog
 
-	t->set_stylebox("panel", "WindowDialog", sb_expand(make_stylebox(popup_window_png, 10, 26, 10, 8), 8, 24, 8, 6));
-	t->set_constant("scaleborder_size", "WindowDialog", 4 * scale);
+	theme->set_stylebox("panel", "WindowDialog", sb_expand(make_stylebox(popup_window_png, 10, 26, 10, 8), 8, 24, 8, 6));
+	theme->set_constant("scaleborder_size", "WindowDialog", 4 * scale);
 
-	t->set_font("title_font", "WindowDialog", large_font);
-	t->set_color("title_color", "WindowDialog", Color(0, 0, 0));
-	t->set_constant("title_height", "WindowDialog", 20 * scale);
+	theme->set_font("title_font", "WindowDialog", large_font);
+	theme->set_color("title_color", "WindowDialog", Color(0, 0, 0));
+	theme->set_constant("title_height", "WindowDialog", 20 * scale);
 
-	t->set_icon("close", "WindowDialog", make_icon(close_png));
-	t->set_icon("close_highlight", "WindowDialog", make_icon(close_hl_png));
-	t->set_constant("close_h_ofs", "WindowDialog", 18 * scale);
-	t->set_constant("close_v_ofs", "WindowDialog", 18 * scale);
+	theme->set_icon("close", "WindowDialog", make_icon(close_png));
+	theme->set_icon("close_highlight", "WindowDialog", make_icon(close_hl_png));
+	theme->set_constant("close_h_ofs", "WindowDialog", 18 * scale);
+	theme->set_constant("close_v_ofs", "WindowDialog", 18 * scale);
 
 	// File Dialog
 
-	t->set_icon("reload", "FileDialog", make_icon(icon_reload_png));
+	theme->set_icon("reload", "FileDialog", make_icon(icon_reload_png));
 
 	// Popup
 
@@ -563,28 +563,28 @@ void fill_default_theme(Ref<Theme> &t, const Ref<Font> &default_font, const Ref<
 		selected->set_expand_margin_size(Margin(i), 2 * scale);
 	}
 
-	t->set_stylebox("panel", "PopupPanel", style_pp);
+	theme->set_stylebox("panel", "PopupPanel", style_pp);
 
 	// PopupMenu
 
-	t->set_stylebox("panel", "PopupMenu", make_stylebox(popup_bg_png, 4, 4, 4, 4, 10, 10, 10, 10));
-	t->set_stylebox("panel_disabled", "PopupMenu", make_stylebox(popup_bg_disabled_png, 4, 4, 4, 4));
-	t->set_stylebox("hover", "PopupMenu", selected);
-	t->set_stylebox("separator", "PopupMenu", make_stylebox(vseparator_png, 3, 3, 3, 3));
+	theme->set_stylebox("panel", "PopupMenu", make_stylebox(popup_bg_png, 4, 4, 4, 4, 10, 10, 10, 10));
+	theme->set_stylebox("panel_disabled", "PopupMenu", make_stylebox(popup_bg_disabled_png, 4, 4, 4, 4));
+	theme->set_stylebox("hover", "PopupMenu", selected);
+	theme->set_stylebox("separator", "PopupMenu", make_stylebox(vseparator_png, 3, 3, 3, 3));
 
-	t->set_icon("checked", "PopupMenu", make_icon(checked_png));
-	t->set_icon("unchecked", "PopupMenu", make_icon(unchecked_png));
-	t->set_icon("submenu", "PopupMenu", make_icon(submenu_png));
+	theme->set_icon("checked", "PopupMenu", make_icon(checked_png));
+	theme->set_icon("unchecked", "PopupMenu", make_icon(unchecked_png));
+	theme->set_icon("submenu", "PopupMenu", make_icon(submenu_png));
 
-	t->set_font("font", "PopupMenu", default_font);
+	theme->set_font("font", "PopupMenu", default_font);
 
-	t->set_color("font_color", "PopupMenu", control_font_color);
-	t->set_color("font_color_accel", "PopupMenu", Color(0.7, 0.7, 0.7, 0.8));
-	t->set_color("font_color_disabled", "PopupMenu", Color(0.4, 0.4, 0.4, 0.8));
-	t->set_color("font_color_hover", "PopupMenu", control_font_color);
+	theme->set_color("font_color", "PopupMenu", control_font_color);
+	theme->set_color("font_color_accel", "PopupMenu", Color(0.7, 0.7, 0.7, 0.8));
+	theme->set_color("font_color_disabled", "PopupMenu", Color(0.4, 0.4, 0.4, 0.8));
+	theme->set_color("font_color_hover", "PopupMenu", control_font_color);
 
-	t->set_constant("hseparation", "PopupMenu", 4 * scale);
-	t->set_constant("vseparation", "PopupMenu", 4 * scale);
+	theme->set_constant("hseparation", "PopupMenu", 4 * scale);
+	theme->set_constant("vseparation", "PopupMenu", 4 * scale);
 
 	// GraphNode
 
@@ -599,90 +599,90 @@ void fill_default_theme(Ref<Theme> &t, const Ref<Font> &default_font, const Ref<
 
 	//graphsb->set_expand_margin_size(MARGIN_LEFT,10);
 	//graphsb->set_expand_margin_size(MARGIN_RIGHT,10);
-	t->set_stylebox("frame", "GraphNode", graphsb);
-	t->set_stylebox("selectedframe", "GraphNode", graphsbselected);
-	t->set_stylebox("defaultframe", "GraphNode", graphsbdefault);
-	t->set_stylebox("defaultfocus", "GraphNode", graphsbdeffocus);
-	t->set_stylebox("comment", "GraphNode", graphsbcomment);
-	t->set_stylebox("commentfocus", "GraphNode", graphsbcommentselected);
-	t->set_stylebox("breakpoint", "GraphNode", graph_bpoint);
-	t->set_stylebox("position", "GraphNode", graph_position);
-	t->set_constant("separation", "GraphNode", 1 * scale);
-	t->set_icon("port", "GraphNode", make_icon(graph_port_png));
-	t->set_icon("close", "GraphNode", make_icon(graph_node_close_png));
-	t->set_icon("resizer", "GraphNode", make_icon(window_resizer_png));
-	t->set_font("title_font", "GraphNode", default_font);
-	t->set_color("title_color", "GraphNode", Color(0, 0, 0, 1));
-	t->set_constant("title_offset", "GraphNode", 20 * scale);
-	t->set_constant("close_offset", "GraphNode", 18 * scale);
-	t->set_constant("port_offset", "GraphNode", 3 * scale);
+	theme->set_stylebox("frame", "GraphNode", graphsb);
+	theme->set_stylebox("selectedframe", "GraphNode", graphsbselected);
+	theme->set_stylebox("defaultframe", "GraphNode", graphsbdefault);
+	theme->set_stylebox("defaultfocus", "GraphNode", graphsbdeffocus);
+	theme->set_stylebox("comment", "GraphNode", graphsbcomment);
+	theme->set_stylebox("commentfocus", "GraphNode", graphsbcommentselected);
+	theme->set_stylebox("breakpoint", "GraphNode", graph_bpoint);
+	theme->set_stylebox("position", "GraphNode", graph_position);
+	theme->set_constant("separation", "GraphNode", 1 * scale);
+	theme->set_icon("port", "GraphNode", make_icon(graph_port_png));
+	theme->set_icon("close", "GraphNode", make_icon(graph_node_close_png));
+	theme->set_icon("resizer", "GraphNode", make_icon(window_resizer_png));
+	theme->set_font("title_font", "GraphNode", default_font);
+	theme->set_color("title_color", "GraphNode", Color(0, 0, 0, 1));
+	theme->set_constant("title_offset", "GraphNode", 20 * scale);
+	theme->set_constant("close_offset", "GraphNode", 18 * scale);
+	theme->set_constant("port_offset", "GraphNode", 3 * scale);
 
 	// Tree
 
 	Ref<StyleBoxTexture> tree_selected = make_stylebox(selection_png, 4, 4, 4, 4, 8, 0, 8, 0);
 	Ref<StyleBoxTexture> tree_selected_oof = make_stylebox(selection_oof_png, 4, 4, 4, 4, 8, 0, 8, 0);
 
-	t->set_stylebox("bg", "Tree", make_stylebox(tree_bg_png, 4, 4, 4, 5));
-	t->set_stylebox("bg_focus", "Tree", focus);
-	t->set_stylebox("selected", "Tree", tree_selected_oof);
-	t->set_stylebox("selected_focus", "Tree", tree_selected);
-	t->set_stylebox("cursor", "Tree", focus);
-	t->set_stylebox("cursor_unfocused", "Tree", focus);
-	t->set_stylebox("button_pressed", "Tree", make_stylebox(button_pressed_png, 4, 4, 4, 4));
-	t->set_stylebox("title_button_normal", "Tree", make_stylebox(tree_title_png, 4, 4, 4, 4));
-	t->set_stylebox("title_button_pressed", "Tree", make_stylebox(tree_title_pressed_png, 4, 4, 4, 4));
-	t->set_stylebox("title_button_hover", "Tree", make_stylebox(tree_title_png, 4, 4, 4, 4));
-	t->set_stylebox("custom_button", "Tree", sb_button_normal);
-	t->set_stylebox("custom_button_pressed", "Tree", sb_button_pressed);
-	t->set_stylebox("custom_button_hover", "Tree", sb_button_hover);
-
-	t->set_icon("checked", "Tree", make_icon(checked_png));
-	t->set_icon("unchecked", "Tree", make_icon(unchecked_png));
-	t->set_icon("updown", "Tree", make_icon(updown_png));
-	t->set_icon("select_arrow", "Tree", make_icon(dropdown_png));
-	t->set_icon("arrow", "Tree", make_icon(arrow_down_png));
-	t->set_icon("arrow_collapsed", "Tree", make_icon(arrow_right_png));
-
-	t->set_font("title_button_font", "Tree", default_font);
-	t->set_font("font", "Tree", default_font);
-
-	t->set_color("title_button_color", "Tree", control_font_color);
-	t->set_color("font_color", "Tree", control_font_color_low);
-	t->set_color("font_color_selected", "Tree", control_font_color_pressed);
-	t->set_color("selection_color", "Tree", Color(0.1, 0.1, 1, 0.8));
-	t->set_color("cursor_color", "Tree", Color(0, 0, 0));
-	t->set_color("guide_color", "Tree", Color(0, 0, 0, 0.1));
-	t->set_color("drop_position_color", "Tree", Color(1, 0.3, 0.2));
-	t->set_color("relationship_line_color", "Tree", Color::html("464646"));
-	t->set_color("custom_button_font_highlight", "Tree", control_font_color_hover);
-
-	t->set_constant("hseparation", "Tree", 4 * scale);
-	t->set_constant("vseparation", "Tree", 4 * scale);
-	t->set_constant("guide_width", "Tree", 2 * scale);
-	t->set_constant("item_margin", "Tree", 12 * scale);
-	t->set_constant("button_margin", "Tree", 4 * scale);
-	t->set_constant("draw_relationship_lines", "Tree", 0);
-	t->set_constant("scroll_border", "Tree", 4);
-	t->set_constant("scroll_speed", "Tree", 12);
+	theme->set_stylebox("bg", "Tree", make_stylebox(tree_bg_png, 4, 4, 4, 5));
+	theme->set_stylebox("bg_focus", "Tree", focus);
+	theme->set_stylebox("selected", "Tree", tree_selected_oof);
+	theme->set_stylebox("selected_focus", "Tree", tree_selected);
+	theme->set_stylebox("cursor", "Tree", focus);
+	theme->set_stylebox("cursor_unfocused", "Tree", focus);
+	theme->set_stylebox("button_pressed", "Tree", make_stylebox(button_pressed_png, 4, 4, 4, 4));
+	theme->set_stylebox("title_button_normal", "Tree", make_stylebox(tree_title_png, 4, 4, 4, 4));
+	theme->set_stylebox("title_button_pressed", "Tree", make_stylebox(tree_title_pressed_png, 4, 4, 4, 4));
+	theme->set_stylebox("title_button_hover", "Tree", make_stylebox(tree_title_png, 4, 4, 4, 4));
+	theme->set_stylebox("custom_button", "Tree", sb_button_normal);
+	theme->set_stylebox("custom_button_pressed", "Tree", sb_button_pressed);
+	theme->set_stylebox("custom_button_hover", "Tree", sb_button_hover);
+
+	theme->set_icon("checked", "Tree", make_icon(checked_png));
+	theme->set_icon("unchecked", "Tree", make_icon(unchecked_png));
+	theme->set_icon("updown", "Tree", make_icon(updown_png));
+	theme->set_icon("select_arrow", "Tree", make_icon(dropdown_png));
+	theme->set_icon("arrow", "Tree", make_icon(arrow_down_png));
+	theme->set_icon("arrow_collapsed", "Tree", make_icon(arrow_right_png));
+
+	theme->set_font("title_button_font", "Tree", default_font);
+	theme->set_font("font", "Tree", default_font);
+
+	theme->set_color("title_button_color", "Tree", control_font_color);
+	theme->set_color("font_color", "Tree", control_font_color_low);
+	theme->set_color("font_color_selected", "Tree", control_font_color_pressed);
+	theme->set_color("selection_color", "Tree", Color(0.1, 0.1, 1, 0.8));
+	theme->set_color("cursor_color", "Tree", Color(0, 0, 0));
+	theme->set_color("guide_color", "Tree", Color(0, 0, 0, 0.1));
+	theme->set_color("drop_position_color", "Tree", Color(1, 0.3, 0.2));
+	theme->set_color("relationship_line_color", "Tree", Color::html("464646"));
+	theme->set_color("custom_button_font_highlight", "Tree", control_font_color_hover);
+
+	theme->set_constant("hseparation", "Tree", 4 * scale);
+	theme->set_constant("vseparation", "Tree", 4 * scale);
+	theme->set_constant("guide_width", "Tree", 2 * scale);
+	theme->set_constant("item_margin", "Tree", 12 * scale);
+	theme->set_constant("button_margin", "Tree", 4 * scale);
+	theme->set_constant("draw_relationship_lines", "Tree", 0);
+	theme->set_constant("scroll_border", "Tree", 4);
+	theme->set_constant("scroll_speed", "Tree", 12);
 
 	// ItemList
 	Ref<StyleBoxTexture> item_selected = make_stylebox(selection_png, 4, 4, 4, 4, 8, 2, 8, 2);
 	Ref<StyleBoxTexture> item_selected_oof = make_stylebox(selection_oof_png, 4, 4, 4, 4, 8, 2, 8, 2);
 
-	t->set_stylebox("bg", "ItemList", make_stylebox(tree_bg_png, 4, 4, 4, 5));
-	t->set_stylebox("bg_focus", "ItemList", focus);
-	t->set_constant("hseparation", "ItemList", 4);
-	t->set_constant("vseparation", "ItemList", 2);
-	t->set_constant("icon_margin", "ItemList", 4);
-	t->set_constant("line_separation", "ItemList", 2 * scale);
-	t->set_font("font", "ItemList", default_font);
-	t->set_color("font_color", "ItemList", control_font_color_lower);
-	t->set_color("font_color_selected", "ItemList", control_font_color_pressed);
-	t->set_color("guide_color", "ItemList", Color(0, 0, 0, 0.1));
-	t->set_stylebox("selected", "ItemList", item_selected_oof);
-	t->set_stylebox("selected_focus", "ItemList", item_selected);
-	t->set_stylebox("cursor", "ItemList", focus);
-	t->set_stylebox("cursor_unfocused", "ItemList", focus);
+	theme->set_stylebox("bg", "ItemList", make_stylebox(tree_bg_png, 4, 4, 4, 5));
+	theme->set_stylebox("bg_focus", "ItemList", focus);
+	theme->set_constant("hseparation", "ItemList", 4);
+	theme->set_constant("vseparation", "ItemList", 2);
+	theme->set_constant("icon_margin", "ItemList", 4);
+	theme->set_constant("line_separation", "ItemList", 2 * scale);
+	theme->set_font("font", "ItemList", default_font);
+	theme->set_color("font_color", "ItemList", control_font_color_lower);
+	theme->set_color("font_color_selected", "ItemList", control_font_color_pressed);
+	theme->set_color("guide_color", "ItemList", Color(0, 0, 0, 0.1));
+	theme->set_stylebox("selected", "ItemList", item_selected_oof);
+	theme->set_stylebox("selected_focus", "ItemList", item_selected);
+	theme->set_stylebox("cursor", "ItemList", focus);
+	theme->set_stylebox("cursor_unfocused", "ItemList", focus);
 
 	// TabContainer
 
@@ -691,88 +691,88 @@ void fill_default_theme(Ref<Theme> &t, const Ref<Font> &default_font, const Ref<
 	tc_sb->set_expand_margin_size(MARGIN_TOP, 2 * scale);
 	tc_sb->set_default_margin(MARGIN_TOP, 8 * scale);
 
-	t->set_stylebox("tab_fg", "TabContainer", sb_expand(make_stylebox(tab_current_png, 4, 4, 4, 1, 16, 4, 16, 4), 2, 2, 2, 2));
-	t->set_stylebox("tab_bg", "TabContainer", sb_expand(make_stylebox(tab_behind_png, 5, 5, 5, 1, 16, 6, 16, 4), 3, 0, 3, 3));
-	t->set_stylebox("panel", "TabContainer", tc_sb);
+	theme->set_stylebox("tab_fg", "TabContainer", sb_expand(make_stylebox(tab_current_png, 4, 4, 4, 1, 16, 4, 16, 4), 2, 2, 2, 2));
+	theme->set_stylebox("tab_bg", "TabContainer", sb_expand(make_stylebox(tab_behind_png, 5, 5, 5, 1, 16, 6, 16, 4), 3, 0, 3, 3));
+	theme->set_stylebox("panel", "TabContainer", tc_sb);
 
-	t->set_icon("increment", "TabContainer", make_icon(scroll_button_right_png));
-	t->set_icon("increment_highlight", "TabContainer", make_icon(scroll_button_right_hl_png));
-	t->set_icon("decrement", "TabContainer", make_icon(scroll_button_left_png));
-	t->set_icon("decrement_highlight", "TabContainer", make_icon(scroll_button_left_hl_png));
-	t->set_icon("menu", "TabContainer", make_icon(tab_menu_png));
-	t->set_icon("menu_highlight", "TabContainer", make_icon(tab_menu_hl_png));
+	theme->set_icon("increment", "TabContainer", make_icon(scroll_button_right_png));
+	theme->set_icon("increment_highlight", "TabContainer", make_icon(scroll_button_right_hl_png));
+	theme->set_icon("decrement", "TabContainer", make_icon(scroll_button_left_png));
+	theme->set_icon("decrement_highlight", "TabContainer", make_icon(scroll_button_left_hl_png));
+	theme->set_icon("menu", "TabContainer", make_icon(tab_menu_png));
+	theme->set_icon("menu_highlight", "TabContainer", make_icon(tab_menu_hl_png));
 
-	t->set_font("font", "TabContainer", default_font);
+	theme->set_font("font", "TabContainer", default_font);
 
-	t->set_color("font_color_fg", "TabContainer", control_font_color_hover);
-	t->set_color("font_color_bg", "TabContainer", control_font_color_low);
-	t->set_color("font_color_disabled", "TabContainer", control_font_color_disabled);
+	theme->set_color("font_color_fg", "TabContainer", control_font_color_hover);
+	theme->set_color("font_color_bg", "TabContainer", control_font_color_low);
+	theme->set_color("font_color_disabled", "TabContainer", control_font_color_disabled);
 
-	t->set_constant("side_margin", "TabContainer", 8 * scale);
-	t->set_constant("top_margin", "TabContainer", 24 * scale);
-	t->set_constant("label_valign_fg", "TabContainer", 0 * scale);
-	t->set_constant("label_valign_bg", "TabContainer", 2 * scale);
-	t->set_constant("hseparation", "TabContainer", 4 * scale);
+	theme->set_constant("side_margin", "TabContainer", 8 * scale);
+	theme->set_constant("top_margin", "TabContainer", 24 * scale);
+	theme->set_constant("label_valign_fg", "TabContainer", 0 * scale);
+	theme->set_constant("label_valign_bg", "TabContainer", 2 * scale);
+	theme->set_constant("hseparation", "TabContainer", 4 * scale);
 
 	// Tabs
 
-	t->set_stylebox("tab_fg", "Tabs", sb_expand(make_stylebox(tab_current_png, 4, 3, 4, 1, 16, 3, 16, 2), 2, 2, 2, 2));
-	t->set_stylebox("tab_bg", "Tabs", sb_expand(make_stylebox(tab_behind_png, 5, 4, 5, 1, 16, 5, 16, 2), 3, 3, 3, 3));
-	t->set_stylebox("panel", "Tabs", tc_sb);
-	t->set_stylebox("button_pressed", "Tabs", make_stylebox(button_pressed_png, 4, 4, 4, 4));
-	t->set_stylebox("button", "Tabs", make_stylebox(button_normal_png, 4, 4, 4, 4));
+	theme->set_stylebox("tab_fg", "Tabs", sb_expand(make_stylebox(tab_current_png, 4, 3, 4, 1, 16, 3, 16, 2), 2, 2, 2, 2));
+	theme->set_stylebox("tab_bg", "Tabs", sb_expand(make_stylebox(tab_behind_png, 5, 4, 5, 1, 16, 5, 16, 2), 3, 3, 3, 3));
+	theme->set_stylebox("panel", "Tabs", tc_sb);
+	theme->set_stylebox("button_pressed", "Tabs", make_stylebox(button_pressed_png, 4, 4, 4, 4));
+	theme->set_stylebox("button", "Tabs", make_stylebox(button_normal_png, 4, 4, 4, 4));
 
-	t->set_icon("increment", "Tabs", make_icon(scroll_button_right_png));
-	t->set_icon("increment_highlight", "Tabs", make_icon(scroll_button_right_hl_png));
-	t->set_icon("decrement", "Tabs", make_icon(scroll_button_left_png));
-	t->set_icon("decrement_highlight", "Tabs", make_icon(scroll_button_left_hl_png));
-	t->set_icon("close", "Tabs", make_icon(tab_close_png));
+	theme->set_icon("increment", "Tabs", make_icon(scroll_button_right_png));
+	theme->set_icon("increment_highlight", "Tabs", make_icon(scroll_button_right_hl_png));
+	theme->set_icon("decrement", "Tabs", make_icon(scroll_button_left_png));
+	theme->set_icon("decrement_highlight", "Tabs", make_icon(scroll_button_left_hl_png));
+	theme->set_icon("close", "Tabs", make_icon(tab_close_png));
 
-	t->set_font("font", "Tabs", default_font);
+	theme->set_font("font", "Tabs", default_font);
 
-	t->set_color("font_color_fg", "Tabs", control_font_color_hover);
-	t->set_color("font_color_bg", "Tabs", control_font_color_low);
-	t->set_color("font_color_disabled", "Tabs", control_font_color_disabled);
+	theme->set_color("font_color_fg", "Tabs", control_font_color_hover);
+	theme->set_color("font_color_bg", "Tabs", control_font_color_low);
+	theme->set_color("font_color_disabled", "Tabs", control_font_color_disabled);
 
-	t->set_constant("top_margin", "Tabs", 24 * scale);
-	t->set_constant("label_valign_fg", "Tabs", 0 * scale);
-	t->set_constant("label_valign_bg", "Tabs", 2 * scale);
-	t->set_constant("hseparation", "Tabs", 4 * scale);
+	theme->set_constant("top_margin", "Tabs", 24 * scale);
+	theme->set_constant("label_valign_fg", "Tabs", 0 * scale);
+	theme->set_constant("label_valign_bg", "Tabs", 2 * scale);
+	theme->set_constant("hseparation", "Tabs", 4 * scale);
 
 	// Separators
 
-	t->set_stylebox("separator", "HSeparator", make_stylebox(vseparator_png, 3, 3, 3, 3));
-	t->set_stylebox("separator", "VSeparator", make_stylebox(hseparator_png, 3, 3, 3, 3));
+	theme->set_stylebox("separator", "HSeparator", make_stylebox(vseparator_png, 3, 3, 3, 3));
+	theme->set_stylebox("separator", "VSeparator", make_stylebox(hseparator_png, 3, 3, 3, 3));
 
-	t->set_icon("close", "Icons", make_icon(icon_close_png));
-	t->set_font("normal", "Fonts", default_font);
-	t->set_font("large", "Fonts", large_font);
+	theme->set_icon("close", "Icons", make_icon(icon_close_png));
+	theme->set_font("normal", "Fonts", default_font);
+	theme->set_font("large", "Fonts", large_font);
 
-	t->set_constant("separation", "HSeparator", 4 * scale);
-	t->set_constant("separation", "VSeparator", 4 * scale);
+	theme->set_constant("separation", "HSeparator", 4 * scale);
+	theme->set_constant("separation", "VSeparator", 4 * scale);
 
 	// Dialogs
 
-	t->set_constant("margin", "Dialogs", 8 * scale);
-	t->set_constant("button_margin", "Dialogs", 32 * scale);
+	theme->set_constant("margin", "Dialogs", 8 * scale);
+	theme->set_constant("button_margin", "Dialogs", 32 * scale);
 
 	// FileDialog
 
-	t->set_icon("folder", "FileDialog", make_icon(icon_folder_png));
-	t->set_color("files_disabled", "FileDialog", Color(0, 0, 0, 0.7));
+	theme->set_icon("folder", "FileDialog", make_icon(icon_folder_png));
+	theme->set_color("files_disabled", "FileDialog", Color(0, 0, 0, 0.7));
 
 	// colorPicker
 
-	t->set_constant("margin", "ColorPicker", 4 * scale);
-	t->set_constant("sv_width", "ColorPicker", 256 * scale);
-	t->set_constant("sv_height", "ColorPicker", 256 * scale);
-	t->set_constant("h_width", "ColorPicker", 30 * scale);
-	t->set_constant("label_width", "ColorPicker", 10 * scale);
+	theme->set_constant("margin", "ColorPicker", 4 * scale);
+	theme->set_constant("sv_width", "ColorPicker", 256 * scale);
+	theme->set_constant("sv_height", "ColorPicker", 256 * scale);
+	theme->set_constant("h_width", "ColorPicker", 30 * scale);
+	theme->set_constant("label_width", "ColorPicker", 10 * scale);
 
-	t->set_icon("screen_picker", "ColorPicker", make_icon(icon_color_pick_png));
-	t->set_icon("add_preset", "ColorPicker", make_icon(icon_add_png));
-	t->set_icon("color_hue", "ColorPicker", make_icon(color_picker_hue_png));
-	t->set_icon("color_sample", "ColorPicker", make_icon(color_picker_sample_png));
+	theme->set_icon("screen_picker", "ColorPicker", make_icon(icon_color_pick_png));
+	theme->set_icon("add_preset", "ColorPicker", make_icon(icon_add_png));
+	theme->set_icon("color_hue", "ColorPicker", make_icon(color_picker_hue_png));
+	theme->set_icon("color_sample", "ColorPicker", make_icon(color_picker_sample_png));
 
 	// TooltipPanel
 
@@ -780,111 +780,111 @@ void fill_default_theme(Ref<Theme> &t, const Ref<Font> &default_font, const Ref<
 	for (int i = 0; i < 4; i++)
 		style_tt->set_expand_margin_size((Margin)i, 4 * scale);
 
-	t->set_stylebox("panel", "TooltipPanel", style_tt);
+	theme->set_stylebox("panel", "TooltipPanel", style_tt);
 
-	t->set_font("font", "TooltipLabel", default_font);
+	theme->set_font("font", "TooltipLabel", default_font);
 
-	t->set_color("font_color", "TooltipLabel", Color(0, 0, 0));
-	t->set_color("font_color_shadow", "TooltipLabel", Color(0, 0, 0, 0.1));
+	theme->set_color("font_color", "TooltipLabel", Color(0, 0, 0));
+	theme->set_color("font_color_shadow", "TooltipLabel", Color(0, 0, 0, 0.1));
 
-	t->set_constant("shadow_offset_x", "TooltipLabel", 1);
-	t->set_constant("shadow_offset_y", "TooltipLabel", 1);
+	theme->set_constant("shadow_offset_x", "TooltipLabel", 1);
+	theme->set_constant("shadow_offset_y", "TooltipLabel", 1);
 
 	// RichTextLabel
 
-	t->set_stylebox("focus", "RichTextLabel", focus);
+	theme->set_stylebox("focus", "RichTextLabel", focus);
 
-	t->set_font("normal_font", "RichTextLabel", default_font);
-	t->set_font("bold_font", "RichTextLabel", default_font);
-	t->set_font("italics_font", "RichTextLabel", default_font);
-	t->set_font("bold_italics_font", "RichTextLabel", default_font);
-	t->set_font("mono_font", "RichTextLabel", default_font);
+	theme->set_font("normal_font", "RichTextLabel", default_font);
+	theme->set_font("bold_font", "RichTextLabel", default_font);
+	theme->set_font("italics_font", "RichTextLabel", default_font);
+	theme->set_font("bold_italics_font", "RichTextLabel", default_font);
+	theme->set_font("mono_font", "RichTextLabel", default_font);
 
-	t->set_color("default_color", "RichTextLabel", control_font_color);
-	t->set_color("font_color_selected", "RichTextLabel", font_color_selection);
-	t->set_color("selection_color", "RichTextLabel", Color(0.1, 0.1, 1, 0.8));
+	theme->set_color("default_color", "RichTextLabel", control_font_color);
+	theme->set_color("font_color_selected", "RichTextLabel", font_color_selection);
+	theme->set_color("selection_color", "RichTextLabel", Color(0.1, 0.1, 1, 0.8));
 
-	t->set_constant("line_separation", "RichTextLabel", 1 * scale);
-	t->set_constant("table_hseparation", "RichTextLabel", 3 * scale);
-	t->set_constant("table_vseparation", "RichTextLabel", 3 * scale);
+	theme->set_constant("line_separation", "RichTextLabel", 1 * scale);
+	theme->set_constant("table_hseparation", "RichTextLabel", 3 * scale);
+	theme->set_constant("table_vseparation", "RichTextLabel", 3 * scale);
 
 	// Containers
 
-	t->set_stylebox("bg", "VSplitContainer", make_stylebox(vsplit_bg_png, 1, 1, 1, 1));
-	t->set_stylebox("bg", "HSplitContainer", make_stylebox(hsplit_bg_png, 1, 1, 1, 1));
-
-	t->set_icon("grabber", "VSplitContainer", make_icon(vsplitter_png));
-	t->set_icon("grabber", "HSplitContainer", make_icon(hsplitter_png));
-
-	t->set_constant("separation", "HBoxContainer", 4 * scale);
-	t->set_constant("separation", "VBoxContainer", 4 * scale);
-	t->set_constant("margin_left", "MarginContainer", 8 * scale);
-	t->set_constant("margin_top", "MarginContainer", 0 * scale);
-	t->set_constant("margin_right", "MarginContainer", 0 * scale);
-	t->set_constant("margin_bottom", "MarginContainer", 0 * scale);
-	t->set_constant("hseparation", "GridContainer", 4 * scale);
-	t->set_constant("vseparation", "GridContainer", 4 * scale);
-	t->set_constant("separation", "HSplitContainer", 12 * scale);
-	t->set_constant("separation", "VSplitContainer", 12 * scale);
-	t->set_constant("autohide", "HSplitContainer", 1 * scale);
-	t->set_constant("autohide", "VSplitContainer", 1 * scale);
+	theme->set_stylebox("bg", "VSplitContainer", make_stylebox(vsplit_bg_png, 1, 1, 1, 1));
+	theme->set_stylebox("bg", "HSplitContainer", make_stylebox(hsplit_bg_png, 1, 1, 1, 1));
+
+	theme->set_icon("grabber", "VSplitContainer", make_icon(vsplitter_png));
+	theme->set_icon("grabber", "HSplitContainer", make_icon(hsplitter_png));
+
+	theme->set_constant("separation", "HBoxContainer", 4 * scale);
+	theme->set_constant("separation", "VBoxContainer", 4 * scale);
+	theme->set_constant("margin_left", "MarginContainer", 8 * scale);
+	theme->set_constant("margin_top", "MarginContainer", 0 * scale);
+	theme->set_constant("margin_right", "MarginContainer", 0 * scale);
+	theme->set_constant("margin_bottom", "MarginContainer", 0 * scale);
+	theme->set_constant("hseparation", "GridContainer", 4 * scale);
+	theme->set_constant("vseparation", "GridContainer", 4 * scale);
+	theme->set_constant("separation", "HSplitContainer", 12 * scale);
+	theme->set_constant("separation", "VSplitContainer", 12 * scale);
+	theme->set_constant("autohide", "HSplitContainer", 1 * scale);
+	theme->set_constant("autohide", "VSplitContainer", 1 * scale);
 
 	// HButtonArray
-	t->set_stylebox("normal", "HButtonArray", sb_button_normal);
-	t->set_stylebox("selected", "HButtonArray", sb_button_pressed);
-	t->set_stylebox("hover", "HButtonArray", sb_button_hover);
+	theme->set_stylebox("normal", "HButtonArray", sb_button_normal);
+	theme->set_stylebox("selected", "HButtonArray", sb_button_pressed);
+	theme->set_stylebox("hover", "HButtonArray", sb_button_hover);
 
-	t->set_font("font", "HButtonArray", default_font);
-	t->set_font("font_selected", "HButtonArray", default_font);
+	theme->set_font("font", "HButtonArray", default_font);
+	theme->set_font("font_selected", "HButtonArray", default_font);
 
-	t->set_color("font_color", "HButtonArray", control_font_color_low);
-	t->set_color("font_color_selected", "HButtonArray", control_font_color_hover);
+	theme->set_color("font_color", "HButtonArray", control_font_color_low);
+	theme->set_color("font_color_selected", "HButtonArray", control_font_color_hover);
 
-	t->set_constant("icon_separator", "HButtonArray", 2 * scale);
-	t->set_constant("button_separator", "HButtonArray", 4 * scale);
+	theme->set_constant("icon_separator", "HButtonArray", 2 * scale);
+	theme->set_constant("button_separator", "HButtonArray", 4 * scale);
 
-	t->set_stylebox("focus", "HButtonArray", focus);
+	theme->set_stylebox("focus", "HButtonArray", focus);
 
 	// VButtonArray
 
-	t->set_stylebox("normal", "VButtonArray", sb_button_normal);
-	t->set_stylebox("selected", "VButtonArray", sb_button_pressed);
-	t->set_stylebox("hover", "VButtonArray", sb_button_hover);
+	theme->set_stylebox("normal", "VButtonArray", sb_button_normal);
+	theme->set_stylebox("selected", "VButtonArray", sb_button_pressed);
+	theme->set_stylebox("hover", "VButtonArray", sb_button_hover);
 
-	t->set_font("font", "VButtonArray", default_font);
-	t->set_font("font_selected", "VButtonArray", default_font);
+	theme->set_font("font", "VButtonArray", default_font);
+	theme->set_font("font_selected", "VButtonArray", default_font);
 
-	t->set_color("font_color", "VButtonArray", control_font_color_low);
-	t->set_color("font_color_selected", "VButtonArray", control_font_color_hover);
+	theme->set_color("font_color", "VButtonArray", control_font_color_low);
+	theme->set_color("font_color_selected", "VButtonArray", control_font_color_hover);
 
-	t->set_constant("icon_separator", "VButtonArray", 2 * scale);
-	t->set_constant("button_separator", "VButtonArray", 4 * scale);
+	theme->set_constant("icon_separator", "VButtonArray", 2 * scale);
+	theme->set_constant("button_separator", "VButtonArray", 4 * scale);
 
-	t->set_stylebox("focus", "VButtonArray", focus);
+	theme->set_stylebox("focus", "VButtonArray", focus);
 
 	// ReferenceRect
 
 	Ref<StyleBoxTexture> ttnc = make_stylebox(full_panel_bg_png, 8, 8, 8, 8);
 	ttnc->set_draw_center(false);
 
-	t->set_stylebox("border", "ReferenceRect", make_stylebox(reference_border_png, 4, 4, 4, 4));
-	t->set_stylebox("panelnc", "Panel", ttnc);
-	t->set_stylebox("panelf", "Panel", tc_sb);
+	theme->set_stylebox("border", "ReferenceRect", make_stylebox(reference_border_png, 4, 4, 4, 4));
+	theme->set_stylebox("panelnc", "Panel", ttnc);
+	theme->set_stylebox("panelf", "Panel", tc_sb);
 
 	Ref<StyleBoxTexture> sb_pc = make_stylebox(tab_container_bg_png, 4, 4, 4, 4, 7, 7, 7, 7);
-	t->set_stylebox("panel", "PanelContainer", sb_pc);
-
-	t->set_icon("minus", "GraphEdit", make_icon(icon_zoom_less_png));
-	t->set_icon("reset", "GraphEdit", make_icon(icon_zoom_reset_png));
-	t->set_icon("more", "GraphEdit", make_icon(icon_zoom_more_png));
-	t->set_icon("snap", "GraphEdit", make_icon(icon_snap_png));
-	t->set_stylebox("bg", "GraphEdit", make_stylebox(tree_bg_png, 4, 4, 4, 5));
-	t->set_color("grid_minor", "GraphEdit", Color(1, 1, 1, 0.05));
-	t->set_color("grid_major", "GraphEdit", Color(1, 1, 1, 0.2));
-	t->set_constant("bezier_len_pos", "GraphEdit", 80 * scale);
-	t->set_constant("bezier_len_neg", "GraphEdit", 160 * scale);
-
-	t->set_icon("logo", "Icons", make_icon(logo_png));
+	theme->set_stylebox("panel", "PanelContainer", sb_pc);
+
+	theme->set_icon("minus", "GraphEdit", make_icon(icon_zoom_less_png));
+	theme->set_icon("reset", "GraphEdit", make_icon(icon_zoom_reset_png));
+	theme->set_icon("more", "GraphEdit", make_icon(icon_zoom_more_png));
+	theme->set_icon("snap", "GraphEdit", make_icon(icon_snap_png));
+	theme->set_stylebox("bg", "GraphEdit", make_stylebox(tree_bg_png, 4, 4, 4, 5));
+	theme->set_color("grid_minor", "GraphEdit", Color(1, 1, 1, 0.05));
+	theme->set_color("grid_major", "GraphEdit", Color(1, 1, 1, 0.2));
+	theme->set_constant("bezier_len_pos", "GraphEdit", 80 * scale);
+	theme->set_constant("bezier_len_neg", "GraphEdit", 160 * scale);
+
+	theme->set_icon("logo", "Icons", make_icon(logo_png));
 
 	// Theme
 
diff --git a/scene/resources/dynamic_font.cpp b/scene/resources/dynamic_font.cpp
index 23bf6be68c..fc0d80a9b7 100644
--- a/scene/resources/dynamic_font.cpp
+++ b/scene/resources/dynamic_font.cpp
@@ -43,10 +43,10 @@ bool DynamicFontData::CacheID::operator<(CacheID right) const {
 	return false;
 }
 
-Ref<DynamicFontAtSize> DynamicFontData::_get_dynamic_font_at_size(CacheID p_id) {
+Ref<DynamicFontAtSize> DynamicFontData::_get_dynamic_font_at_size(CacheID p_cache_id) {
 
-	if (size_cache.has(p_id)) {
-		return Ref<DynamicFontAtSize>(size_cache[p_id]);
+	if (size_cache.has(p_cache_id)) {
+		return Ref<DynamicFontAtSize>(size_cache[p_cache_id]);
 	}
 
 	Ref<DynamicFontAtSize> dfas;
@@ -55,8 +55,8 @@ Ref<DynamicFontAtSize> DynamicFontData::_get_dynamic_font_at_size(CacheID p_id)
 
 	dfas->font = Ref<DynamicFontData>(this);
 
-	size_cache[p_id] = dfas.ptr();
-	dfas->id = p_id;
+	size_cache[p_cache_id] = dfas.ptr();
+	dfas->id = p_cache_id;
 	dfas->_load();
 
 	return dfas;
diff --git a/scene/resources/dynamic_font.h b/scene/resources/dynamic_font.h
index 7c94def5aa..9024761b96 100644
--- a/scene/resources/dynamic_font.h
+++ b/scene/resources/dynamic_font.h
@@ -72,7 +72,7 @@ private:
 
 	friend class DynamicFont;
 
-	Ref<DynamicFontAtSize> _get_dynamic_font_at_size(CacheID p_cache);
+	Ref<DynamicFontAtSize> _get_dynamic_font_at_size(CacheID p_cache_id);
 
 protected:
 	static void _bind_methods();
diff --git a/scene/resources/environment.h b/scene/resources/environment.h
index a7c0e2a03d..3a6906aa27 100644
--- a/scene/resources/environment.h
+++ b/scene/resources/environment.h
@@ -224,10 +224,10 @@ public:
 	void set_ssr_max_steps(int p_steps);
 	int get_ssr_max_steps() const;
 
-	void set_ssr_fade_in(float p_transition);
+	void set_ssr_fade_in(float p_fade_in);
 	float get_ssr_fade_in() const;
 
-	void set_ssr_fade_out(float p_transition);
+	void set_ssr_fade_out(float p_fade_out);
 	float get_ssr_fade_out() const;
 
 	void set_ssr_depth_tolerance(float p_depth_tolerance);
diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp
index d1431176d6..035e514eac 100644
--- a/scene/resources/font.cpp
+++ b/scene/resources/font.cpp
@@ -179,14 +179,14 @@ Vector<Variant> BitmapFont::_get_textures() const {
 	return rtextures;
 }
 
-Error BitmapFont::create_from_fnt(const String &p_string) {
+Error BitmapFont::create_from_fnt(const String &p_file) {
 	//fnt format used by angelcode bmfont
 	//http://www.angelcode.com/products/bmfont/
 
-	FileAccess *f = FileAccess::open(p_string, FileAccess::READ);
+	FileAccess *f = FileAccess::open(p_file, FileAccess::READ);
 
 	if (!f) {
-		ERR_EXPLAIN("Can't open font: " + p_string);
+		ERR_EXPLAIN("Can't open font: " + p_file);
 		ERR_FAIL_V(ERR_FILE_NOT_FOUND);
 	}
 
@@ -255,7 +255,7 @@ Error BitmapFont::create_from_fnt(const String &p_string) {
 			if (keys.has("file")) {
 
 				String file = keys["file"];
-				file = p_string.get_base_dir() + "/" + file;
+				file = p_file.get_base_dir() + "/" + file;
 				Ref<Texture> tex = ResourceLoader::load(file);
 				if (tex.is_null()) {
 					ERR_PRINT("Can't load font texture!");
diff --git a/scene/resources/material.h b/scene/resources/material.h
index 25628e272a..140b2142c9 100644
--- a/scene/resources/material.h
+++ b/scene/resources/material.h
@@ -431,7 +431,7 @@ public:
 	void set_depth_deep_parallax_max_layers(int p_layer);
 	int get_depth_deep_parallax_max_layers() const;
 
-	void set_subsurface_scattering_strength(float p_strength);
+	void set_subsurface_scattering_strength(float p_subsurface_scattering_strength);
 	float get_subsurface_scattering_strength() const;
 
 	void set_refraction(float p_refraction);
diff --git a/scene/resources/mesh.h b/scene/resources/mesh.h
index e40ef99237..ad3c10b6bc 100644
--- a/scene/resources/mesh.h
+++ b/scene/resources/mesh.h
@@ -187,7 +187,7 @@ public:
 	int get_surface_count() const;
 	void surface_remove(int p_idx);
 
-	void surface_set_custom_aabb(int p_surface, const Rect3 &p_aabb); //only recognized by driver
+	void surface_set_custom_aabb(int p_idx, const Rect3 &p_aabb); //only recognized by driver
 
 	int surface_get_array_len(int p_idx) const;
 	int surface_get_array_index_len(int p_idx) const;
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp
index ce1d6f311f..169c956546 100644
--- a/scene/resources/packed_scene.cpp
+++ b/scene/resources/packed_scene.cpp
@@ -1127,26 +1127,26 @@ bool SceneState::is_connection(int p_node, const StringName &p_signal, int p_to_
 	return false;
 }
 
-void SceneState::set_bundled_scene(const Dictionary &d) {
+void SceneState::set_bundled_scene(const Dictionary &p_dictionary) {
 
-	ERR_FAIL_COND(!d.has("names"));
-	ERR_FAIL_COND(!d.has("variants"));
-	ERR_FAIL_COND(!d.has("node_count"));
-	ERR_FAIL_COND(!d.has("nodes"));
-	ERR_FAIL_COND(!d.has("conn_count"));
-	ERR_FAIL_COND(!d.has("conns"));
-	//ERR_FAIL_COND( !d.has("path"));
+	ERR_FAIL_COND(!p_dictionary.has("names"));
+	ERR_FAIL_COND(!p_dictionary.has("variants"));
+	ERR_FAIL_COND(!p_dictionary.has("node_count"));
+	ERR_FAIL_COND(!p_dictionary.has("nodes"));
+	ERR_FAIL_COND(!p_dictionary.has("conn_count"));
+	ERR_FAIL_COND(!p_dictionary.has("conns"));
+	//ERR_FAIL_COND( !p_dictionary.has("path"));
 
 	int version = 1;
-	if (d.has("version"))
-		version = d["version"];
+	if (p_dictionary.has("version"))
+		version = p_dictionary["version"];
 
 	if (version > PACK_VERSION) {
 		ERR_EXPLAIN("Save format version too new!");
 		ERR_FAIL();
 	}
 
-	PoolVector<String> snames = d["names"];
+	PoolVector<String> snames = p_dictionary["names"];
 	if (snames.size()) {
 
 		int namecount = snames.size();
@@ -1156,7 +1156,7 @@ void SceneState::set_bundled_scene(const Dictionary &d) {
 			names[i] = r[i];
 	}
 
-	Array svariants = d["variants"];
+	Array svariants = p_dictionary["variants"];
 
 	if (svariants.size()) {
 		int varcount = svariants.size();
@@ -1170,10 +1170,10 @@ void SceneState::set_bundled_scene(const Dictionary &d) {
 		variants.clear();
 	}
 
-	nodes.resize(d["node_count"]);
+	nodes.resize(p_dictionary["node_count"]);
 	int nc = nodes.size();
 	if (nc) {
-		PoolVector<int> snodes = d["nodes"];
+		PoolVector<int> snodes = p_dictionary["nodes"];
 		PoolVector<int>::Read r = snodes.read();
 		int idx = 0;
 		for (int i = 0; i < nc; i++) {
@@ -1197,12 +1197,12 @@ void SceneState::set_bundled_scene(const Dictionary &d) {
 		}
 	}
 
-	connections.resize(d["conn_count"]);
+	connections.resize(p_dictionary["conn_count"]);
 	int cc = connections.size();
 
 	if (cc) {
 
-		PoolVector<int> sconns = d["conns"];
+		PoolVector<int> sconns = p_dictionary["conns"];
 		PoolVector<int>::Read r = sconns.read();
 		int idx = 0;
 		for (int i = 0; i < cc; i++) {
@@ -1222,8 +1222,8 @@ void SceneState::set_bundled_scene(const Dictionary &d) {
 	}
 
 	Array np;
-	if (d.has("node_paths")) {
-		np = d["node_paths"];
+	if (p_dictionary.has("node_paths")) {
+		np = p_dictionary["node_paths"];
 	}
 	node_paths.resize(np.size());
 	for (int i = 0; i < np.size(); i++) {
@@ -1231,12 +1231,12 @@ void SceneState::set_bundled_scene(const Dictionary &d) {
 	}
 
 	Array ei;
-	if (d.has("editable_instances")) {
-		ei = d["editable_instances"];
+	if (p_dictionary.has("editable_instances")) {
+		ei = p_dictionary["editable_instances"];
 	}
 
-	if (d.has("base_scene")) {
-		base_scene_idx = d["base_scene"];
+	if (p_dictionary.has("base_scene")) {
+		base_scene_idx = p_dictionary["base_scene"];
 	}
 
 	editable_instances.resize(ei.size());
@@ -1244,7 +1244,7 @@ void SceneState::set_bundled_scene(const Dictionary &d) {
 		editable_instances[i] = ei[i];
 	}
 
-	//path=d["path"];
+	//path=p_dictionary["path"];
 }
 
 Dictionary SceneState::get_bundled_scene() const {
@@ -1696,9 +1696,9 @@ SceneState::SceneState() {
 
 ////////////////
 
-void PackedScene::_set_bundled_scene(const Dictionary &d) {
+void PackedScene::_set_bundled_scene(const Dictionary &p_scene) {
 
-	state->set_bundled_scene(d);
+	state->set_bundled_scene(p_scene);
 }
 
 Dictionary PackedScene::_get_bundled_scene() const {
diff --git a/scene/resources/primitive_meshes.cpp b/scene/resources/primitive_meshes.cpp
index 065e7a84dd..6a3ddde02a 100644
--- a/scene/resources/primitive_meshes.cpp
+++ b/scene/resources/primitive_meshes.cpp
@@ -618,8 +618,8 @@ Vector3 CubeMesh::get_size() const {
 	return size;
 }
 
-void CubeMesh::set_subdivide_width(const int p_subdivide) {
-	subdivide_w = p_subdivide > 0 ? p_subdivide : 0;
+void CubeMesh::set_subdivide_width(const int p_divisions) {
+	subdivide_w = p_divisions > 0 ? p_divisions : 0;
 	_request_update();
 }
 
@@ -627,8 +627,8 @@ int CubeMesh::get_subdivide_width() const {
 	return subdivide_w;
 }
 
-void CubeMesh::set_subdivide_height(const int p_subdivide) {
-	subdivide_h = p_subdivide > 0 ? p_subdivide : 0;
+void CubeMesh::set_subdivide_height(const int p_divisions) {
+	subdivide_h = p_divisions > 0 ? p_divisions : 0;
 	_request_update();
 }
 
@@ -636,8 +636,8 @@ int CubeMesh::get_subdivide_height() const {
 	return subdivide_h;
 }
 
-void CubeMesh::set_subdivide_depth(const int p_subdivide) {
-	subdivide_d = p_subdivide > 0 ? p_subdivide : 0;
+void CubeMesh::set_subdivide_depth(const int p_divisions) {
+	subdivide_d = p_divisions > 0 ? p_divisions : 0;
 	_request_update();
 }
 
@@ -957,8 +957,8 @@ Size2 PlaneMesh::get_size() const {
 	return size;
 }
 
-void PlaneMesh::set_subdivide_width(const int p_subdivide) {
-	subdivide_w = p_subdivide > 0 ? p_subdivide : 0;
+void PlaneMesh::set_subdivide_width(const int p_divisions) {
+	subdivide_w = p_divisions > 0 ? p_divisions : 0;
 	_request_update();
 }
 
@@ -966,8 +966,8 @@ int PlaneMesh::get_subdivide_width() const {
 	return subdivide_w;
 }
 
-void PlaneMesh::set_subdivide_depth(const int p_subdivide) {
-	subdivide_d = p_subdivide > 0 ? p_subdivide : 0;
+void PlaneMesh::set_subdivide_depth(const int p_divisions) {
+	subdivide_d = p_divisions > 0 ? p_divisions : 0;
 	_request_update();
 }
 
diff --git a/scene/resources/room.h b/scene/resources/room.h
index 1bcdec5eb0..ba5c0eee1c 100644
--- a/scene/resources/room.h
+++ b/scene/resources/room.h
@@ -50,7 +50,7 @@ protected:
 public:
 	virtual RID get_rid() const;
 
-	void set_geometry_hint(const PoolVector<Face3> &geometry_hint);
+	void set_geometry_hint(const PoolVector<Face3> &p_geometry_hint);
 	PoolVector<Face3> get_geometry_hint() const;
 
 	RoomBounds();
diff --git a/scene/resources/scene_format_text.cpp b/scene/resources/scene_format_text.cpp
index 03a862b744..49cd030a9a 100644
--- a/scene/resources/scene_format_text.cpp
+++ b/scene/resources/scene_format_text.cpp
@@ -621,9 +621,9 @@ ResourceInteractiveLoaderText::~ResourceInteractiveLoaderText() {
 	memdelete(f);
 }
 
-void ResourceInteractiveLoaderText::get_dependencies(FileAccess *f, List<String> *p_dependencies, bool p_add_types) {
+void ResourceInteractiveLoaderText::get_dependencies(FileAccess *p_f, List<String> *p_dependencies, bool p_add_types) {
 
-	open(f);
+	open(p_f);
 	ignore_resource_parsing = true;
 	ERR_FAIL_COND(error != OK);
 
diff --git a/scene/resources/shape_2d.h b/scene/resources/shape_2d.h
index a752b8dbe2..c020fb9141 100644
--- a/scene/resources/shape_2d.h
+++ b/scene/resources/shape_2d.h
@@ -47,10 +47,10 @@ public:
 	void set_custom_solver_bias(real_t p_bias);
 	real_t get_custom_solver_bias() const;
 
-	bool collide_with_motion(const Transform2D &p_local_xform, const Vector2 &p_local_motion, const Ref<Shape2D> &p_shape, const Transform2D &p_shape_xform, const Vector2 &p_p_shape_motion);
+	bool collide_with_motion(const Transform2D &p_local_xform, const Vector2 &p_local_motion, const Ref<Shape2D> &p_shape, const Transform2D &p_shape_xform, const Vector2 &p_shape_motion);
 	bool collide(const Transform2D &p_local_xform, const Ref<Shape2D> &p_shape, const Transform2D &p_shape_xform);
 
-	Variant collide_with_motion_and_get_contacts(const Transform2D &p_local_xform, const Vector2 &p_local_motion, const Ref<Shape2D> &p_shape, const Transform2D &p_shape_xform, const Vector2 &p_p_shape_motion);
+	Variant collide_with_motion_and_get_contacts(const Transform2D &p_local_xform, const Vector2 &p_local_motion, const Ref<Shape2D> &p_shape, const Transform2D &p_shape_xform, const Vector2 &p_shape_motion);
 	Variant collide_and_get_contacts(const Transform2D &p_local_xform, const Ref<Shape2D> &p_shape, const Transform2D &p_shape_xform);
 
 	virtual void draw(const RID &p_to_rid, const Color &p_color) {}
diff --git a/scene/resources/surface_tool.cpp b/scene/resources/surface_tool.cpp
index a3c683f857..9320676016 100644
--- a/scene/resources/surface_tool.cpp
+++ b/scene/resources/surface_tool.cpp
@@ -33,36 +33,36 @@
 #define _VERTEX_SNAP 0.0001
 #define EQ_VERTEX_DIST 0.00001
 
-bool SurfaceTool::Vertex::operator==(const Vertex &p_b) const {
+bool SurfaceTool::Vertex::operator==(const Vertex &p_vertex) const {
 
-	if (vertex != p_b.vertex)
+	if (vertex != p_vertex.vertex)
 		return false;
 
-	if (uv != p_b.uv)
+	if (uv != p_vertex.uv)
 		return false;
 
-	if (uv2 != p_b.uv2)
+	if (uv2 != p_vertex.uv2)
 		return false;
 
-	if (normal != p_b.normal)
+	if (normal != p_vertex.normal)
 		return false;
 
-	if (binormal != p_b.binormal)
+	if (binormal != p_vertex.binormal)
 		return false;
 
-	if (color != p_b.color)
+	if (color != p_vertex.color)
 		return false;
 
-	if (bones.size() != p_b.bones.size())
+	if (bones.size() != p_vertex.bones.size())
 		return false;
 
 	for (int i = 0; i < bones.size(); i++) {
-		if (bones[i] != p_b.bones[i])
+		if (bones[i] != p_vertex.bones[i])
 			return false;
 	}
 
 	for (int i = 0; i < weights.size(); i++) {
-		if (weights[i] != p_b.weights[i])
+		if (weights[i] != p_vertex.weights[i])
 			return false;
 	}
 
diff --git a/scene/resources/surface_tool.h b/scene/resources/surface_tool.h
index d02e170b02..fcc94753ca 100644
--- a/scene/resources/surface_tool.h
+++ b/scene/resources/surface_tool.h
@@ -102,8 +102,8 @@ public:
 	void add_normal(const Vector3 &p_normal);
 	void add_tangent(const Plane &p_tangent);
 	void add_uv(const Vector2 &p_uv);
-	void add_uv2(const Vector2 &p_uv);
-	void add_bones(const Vector<int> &p_indices);
+	void add_uv2(const Vector2 &p_uv2);
+	void add_bones(const Vector<int> &p_bones);
 	void add_weights(const Vector<float> &p_weights);
 	void add_smooth_group(bool p_smooth);
 
diff --git a/scene/resources/theme.h b/scene/resources/theme.h
index 1dfea7f421..5744c142d4 100644
--- a/scene/resources/theme.h
+++ b/scene/resources/theme.h
@@ -143,8 +143,8 @@ public:
 	static void set_default(const Ref<Theme> &p_default);
 
 	static void set_default_icon(const Ref<Texture> &p_icon);
-	static void set_default_style(const Ref<StyleBox> &p_default_style);
-	static void set_default_font(const Ref<Font> &p_default_font);
+	static void set_default_style(const Ref<StyleBox> &p_style);
+	static void set_default_font(const Ref<Font> &p_font);
 
 	void set_default_theme_font(const Ref<Font> &p_default_font);
 	Ref<Font> get_default_theme_font() const;
@@ -159,7 +159,7 @@ public:
 	Ref<Shader> get_shader(const StringName &p_name, const StringName &p_type) const;
 	bool has_shader(const StringName &p_name, const StringName &p_type) const;
 	void clear_shader(const StringName &p_name, const StringName &p_type);
-	void get_shader_list(const StringName &p_name, List<StringName> *p_list) const;
+	void get_shader_list(const StringName &p_type, List<StringName> *p_list) const;
 
 	void set_stylebox(const StringName &p_name, const StringName &p_type, const Ref<StyleBox> &p_style);
 	Ref<StyleBox> get_stylebox(const StringName &p_name, const StringName &p_type) const;
diff --git a/scene/resources/tile_set.h b/scene/resources/tile_set.h
index 99c506390c..7d7855811f 100644
--- a/scene/resources/tile_set.h
+++ b/scene/resources/tile_set.h
@@ -105,7 +105,7 @@ public:
 	void tile_set_shape(int p_id, int p_shape_id, const Ref<Shape2D> &p_shape);
 	Ref<Shape2D> tile_get_shape(int p_id, int p_shape_id) const;
 
-	void tile_set_shape_transform(int p_id, int p_shape_id, const Transform2D &p_transform);
+	void tile_set_shape_transform(int p_id, int p_shape_id, const Transform2D &p_offset);
 	Transform2D tile_get_shape_transform(int p_id, int p_shape_id) const;
 
 	void tile_set_shape_one_way(int p_id, int p_shape_id, bool p_one_way);
@@ -121,7 +121,7 @@ public:
 	void tile_set_material(int p_id, const Ref<ShaderMaterial> &p_material);
 	Ref<ShaderMaterial> tile_get_material(int p_id) const;
 
-	void tile_set_modulate(int p_id, const Color &p_color);
+	void tile_set_modulate(int p_id, const Color &p_modulate);
 	Color tile_get_modulate(int p_id) const;
 
 	void tile_set_occluder_offset(int p_id, const Vector2 &p_offset);