Merge pull request #47544 from pycbouh/control-expose-theme-type

2 files changed, 371 insertions, 360 deletions

diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp
index e8b203417e..786a96501a 100644
--- a/scene/resources/theme.cpp
+++ b/scene/resources/theme.cpp
@@ -36,11 +36,11 @@ void Theme::_emit_theme_changed() {
 	emit_changed();
 }
 
-Vector<String> Theme::_get_icon_list(const String &p_node_type) const {
+Vector<String> Theme::_get_icon_list(const String &p_theme_type) const {
 	Vector<String> ilret;
 	List<StringName> il;
 
-	get_icon_list(p_node_type, &il);
+	get_icon_list(p_theme_type, &il);
 	ilret.resize(il.size());
 
 	int i = 0;
@@ -66,11 +66,11 @@ Vector<String> Theme::_get_icon_type_list() const {
 	return ilret;
 }
 
-Vector<String> Theme::_get_stylebox_list(const String &p_node_type) const {
+Vector<String> Theme::_get_stylebox_list(const String &p_theme_type) const {
 	Vector<String> ilret;
 	List<StringName> il;
 
-	get_stylebox_list(p_node_type, &il);
+	get_stylebox_list(p_theme_type, &il);
 	ilret.resize(il.size());
 
 	int i = 0;
@@ -96,11 +96,11 @@ Vector<String> Theme::_get_stylebox_type_list() const {
 	return ilret;
 }
 
-Vector<String> Theme::_get_font_list(const String &p_node_type) const {
+Vector<String> Theme::_get_font_list(const String &p_theme_type) const {
 	Vector<String> ilret;
 	List<StringName> il;
 
-	get_font_list(p_node_type, &il);
+	get_font_list(p_theme_type, &il);
 	ilret.resize(il.size());
 
 	int i = 0;
@@ -126,11 +126,11 @@ Vector<String> Theme::_get_font_type_list() const {
 	return ilret;
 }
 
-Vector<String> Theme::_get_font_size_list(const String &p_node_type) const {
+Vector<String> Theme::_get_font_size_list(const String &p_theme_type) const {
 	Vector<String> ilret;
 	List<StringName> il;
 
-	get_font_size_list(p_node_type, &il);
+	get_font_size_list(p_theme_type, &il);
 	ilret.resize(il.size());
 
 	int i = 0;
@@ -156,11 +156,11 @@ Vector<String> Theme::_get_font_size_type_list() const {
 	return ilret;
 }
 
-Vector<String> Theme::_get_color_list(const String &p_node_type) const {
+Vector<String> Theme::_get_color_list(const String &p_theme_type) const {
 	Vector<String> ilret;
 	List<StringName> il;
 
-	get_color_list(p_node_type, &il);
+	get_color_list(p_theme_type, &il);
 	ilret.resize(il.size());
 
 	int i = 0;
@@ -186,11 +186,11 @@ Vector<String> Theme::_get_color_type_list() const {
 	return ilret;
 }
 
-Vector<String> Theme::_get_constant_list(const String &p_node_type) const {
+Vector<String> Theme::_get_constant_list(const String &p_theme_type) const {
 	Vector<String> ilret;
 	List<StringName> il;
 
-	get_constant_list(p_node_type, &il);
+	get_constant_list(p_theme_type, &il);
 	ilret.resize(il.size());
 
 	int i = 0;
@@ -216,20 +216,20 @@ Vector<String> Theme::_get_constant_type_list() const {
 	return ilret;
 }
 
-Vector<String> Theme::_get_theme_item_list(DataType p_data_type, const String &p_node_type) const {
+Vector<String> Theme::_get_theme_item_list(DataType p_data_type, const String &p_theme_type) const {
 	switch (p_data_type) {
 		case DATA_TYPE_COLOR:
-			return _get_color_list(p_node_type);
+			return _get_color_list(p_theme_type);
 		case DATA_TYPE_CONSTANT:
-			return _get_constant_list(p_node_type);
+			return _get_constant_list(p_theme_type);
 		case DATA_TYPE_FONT:
-			return _get_font_list(p_node_type);
+			return _get_font_list(p_theme_type);
 		case DATA_TYPE_FONT_SIZE:
-			return _get_font_size_list(p_node_type);
+			return _get_font_size_list(p_theme_type);
 		case DATA_TYPE_ICON:
-			return _get_icon_list(p_node_type);
+			return _get_icon_list(p_theme_type);
 		case DATA_TYPE_STYLEBOX:
-			return _get_stylebox_list(p_node_type);
+			return _get_stylebox_list(p_theme_type);
 		case DATA_TYPE_MAX:
 			break; // Can't happen, but silences warning.
 	}
@@ -278,19 +278,19 @@ bool Theme::_set(const StringName &p_name, const Variant &p_value) {
 
 	if (sname.find("/") != -1) {
 		String type = sname.get_slicec('/', 1);
-		String node_type = sname.get_slicec('/', 0);
+		String theme_type = sname.get_slicec('/', 0);
 		String name = sname.get_slicec('/', 2);
 
 		if (type == "icons") {
-			set_icon(name, node_type, p_value);
+			set_icon(name, theme_type, p_value);
 		} else if (type == "styles") {
-			set_stylebox(name, node_type, p_value);
+			set_stylebox(name, theme_type, p_value);
 		} else if (type == "fonts") {
-			set_font(name, node_type, p_value);
+			set_font(name, theme_type, p_value);
 		} else if (type == "colors") {
-			set_color(name, node_type, p_value);
+			set_color(name, theme_type, p_value);
 		} else if (type == "constants") {
-			set_constant(name, node_type, p_value);
+			set_constant(name, theme_type, p_value);
 		} else {
 			return false;
 		}
@@ -306,31 +306,31 @@ bool Theme::_get(const StringName &p_name, Variant &r_ret) const {
 
 	if (sname.find("/") != -1) {
 		String type = sname.get_slicec('/', 1);
-		String node_type = sname.get_slicec('/', 0);
+		String theme_type = sname.get_slicec('/', 0);
 		String name = sname.get_slicec('/', 2);
 
 		if (type == "icons") {
-			if (!has_icon(name, node_type)) {
+			if (!has_icon(name, theme_type)) {
 				r_ret = Ref<Texture2D>();
 			} else {
-				r_ret = get_icon(name, node_type);
+				r_ret = get_icon(name, theme_type);
 			}
 		} else if (type == "styles") {
-			if (!has_stylebox(name, node_type)) {
+			if (!has_stylebox(name, theme_type)) {
 				r_ret = Ref<StyleBox>();
 			} else {
-				r_ret = get_stylebox(name, node_type);
+				r_ret = get_stylebox(name, theme_type);
 			}
 		} else if (type == "fonts") {
-			if (!has_font(name, node_type)) {
+			if (!has_font(name, theme_type)) {
 				r_ret = Ref<Font>();
 			} else {
-				r_ret = get_font(name, node_type);
+				r_ret = get_font(name, theme_type);
 			}
 		} else if (type == "colors") {
-			r_ret = get_color(name, node_type);
+			r_ret = get_color(name, theme_type);
 		} else if (type == "constants") {
-			r_ret = get_constant(name, node_type);
+			r_ret = get_constant(name, theme_type);
 		} else {
 			return false;
 		}
@@ -477,17 +477,17 @@ void Theme::set_default_font_size(int p_font_size) {
 	default_font_size = p_font_size;
 }
 
-void Theme::set_icon(const StringName &p_name, const StringName &p_node_type, const Ref<Texture2D> &p_icon) {
-	bool new_value = !icon_map.has(p_node_type) || !icon_map[p_node_type].has(p_name);
+void Theme::set_icon(const StringName &p_name, const StringName &p_theme_type, const Ref<Texture2D> &p_icon) {
+	bool new_value = !icon_map.has(p_theme_type) || !icon_map[p_theme_type].has(p_name);
 
-	if (icon_map[p_node_type].has(p_name) && icon_map[p_node_type][p_name].is_valid()) {
-		icon_map[p_node_type][p_name]->disconnect("changed", callable_mp(this, &Theme::_emit_theme_changed));
+	if (icon_map[p_theme_type].has(p_name) && icon_map[p_theme_type][p_name].is_valid()) {
+		icon_map[p_theme_type][p_name]->disconnect("changed", callable_mp(this, &Theme::_emit_theme_changed));
 	}
 
-	icon_map[p_node_type][p_name] = p_icon;
+	icon_map[p_theme_type][p_name] = p_icon;
 
 	if (p_icon.is_valid()) {
-		icon_map[p_node_type][p_name]->connect("changed", callable_mp(this, &Theme::_emit_theme_changed), varray(), CONNECT_REFERENCE_COUNTED);
+		icon_map[p_theme_type][p_name]->connect("changed", callable_mp(this, &Theme::_emit_theme_changed), varray(), CONNECT_REFERENCE_COUNTED);
 	}
 
 	if (new_value) {
@@ -496,64 +496,64 @@ void Theme::set_icon(const StringName &p_name, const StringName &p_node_type, co
 	}
 }
 
-Ref<Texture2D> Theme::get_icon(const StringName &p_name, const StringName &p_node_type) const {
-	if (icon_map.has(p_node_type) && icon_map[p_node_type].has(p_name) && icon_map[p_node_type][p_name].is_valid()) {
-		return icon_map[p_node_type][p_name];
+Ref<Texture2D> Theme::get_icon(const StringName &p_name, const StringName &p_theme_type) const {
+	if (icon_map.has(p_theme_type) && icon_map[p_theme_type].has(p_name) && icon_map[p_theme_type][p_name].is_valid()) {
+		return icon_map[p_theme_type][p_name];
 	} else {
 		return default_icon;
 	}
 }
 
-bool Theme::has_icon(const StringName &p_name, const StringName &p_node_type) const {
-	return (icon_map.has(p_node_type) && icon_map[p_node_type].has(p_name) && icon_map[p_node_type][p_name].is_valid());
+bool Theme::has_icon(const StringName &p_name, const StringName &p_theme_type) const {
+	return (icon_map.has(p_theme_type) && icon_map[p_theme_type].has(p_name) && icon_map[p_theme_type][p_name].is_valid());
 }
 
-bool Theme::has_icon_nocheck(const StringName &p_name, const StringName &p_node_type) const {
-	return (icon_map.has(p_node_type) && icon_map[p_node_type].has(p_name));
+bool Theme::has_icon_nocheck(const StringName &p_name, const StringName &p_theme_type) const {
+	return (icon_map.has(p_theme_type) && icon_map[p_theme_type].has(p_name));
 }
 
-void Theme::rename_icon(const StringName &p_old_name, const StringName &p_name, const StringName &p_node_type) {
-	ERR_FAIL_COND_MSG(!icon_map.has(p_node_type), "Cannot rename the icon '" + String(p_old_name) + "' because the node type '" + String(p_node_type) + "' does not exist.");
-	ERR_FAIL_COND_MSG(icon_map[p_node_type].has(p_name), "Cannot rename the icon '" + String(p_old_name) + "' because the new name '" + String(p_name) + "' already exists.");
-	ERR_FAIL_COND_MSG(!icon_map[p_node_type].has(p_old_name), "Cannot rename the icon '" + String(p_old_name) + "' because it does not exist.");
+void Theme::rename_icon(const StringName &p_old_name, const StringName &p_name, const StringName &p_theme_type) {
+	ERR_FAIL_COND_MSG(!icon_map.has(p_theme_type), "Cannot rename the icon '" + String(p_old_name) + "' because the node type '" + String(p_theme_type) + "' does not exist.");
+	ERR_FAIL_COND_MSG(icon_map[p_theme_type].has(p_name), "Cannot rename the icon '" + String(p_old_name) + "' because the new name '" + String(p_name) + "' already exists.");
+	ERR_FAIL_COND_MSG(!icon_map[p_theme_type].has(p_old_name), "Cannot rename the icon '" + String(p_old_name) + "' because it does not exist.");
 
-	icon_map[p_node_type][p_name] = icon_map[p_node_type][p_old_name];
-	icon_map[p_node_type].erase(p_old_name);
+	icon_map[p_theme_type][p_name] = icon_map[p_theme_type][p_old_name];
+	icon_map[p_theme_type].erase(p_old_name);
 
 	notify_property_list_changed();
 	emit_changed();
 }
 
-void Theme::clear_icon(const StringName &p_name, const StringName &p_node_type) {
-	ERR_FAIL_COND_MSG(!icon_map.has(p_node_type), "Cannot clear the icon '" + String(p_name) + "' because the node type '" + String(p_node_type) + "' does not exist.");
-	ERR_FAIL_COND_MSG(!icon_map[p_node_type].has(p_name), "Cannot clear the icon '" + String(p_name) + "' because it does not exist.");
+void Theme::clear_icon(const StringName &p_name, const StringName &p_theme_type) {
+	ERR_FAIL_COND_MSG(!icon_map.has(p_theme_type), "Cannot clear the icon '" + String(p_name) + "' because the node type '" + String(p_theme_type) + "' does not exist.");
+	ERR_FAIL_COND_MSG(!icon_map[p_theme_type].has(p_name), "Cannot clear the icon '" + String(p_name) + "' because it does not exist.");
 
-	if (icon_map[p_node_type][p_name].is_valid()) {
-		icon_map[p_node_type][p_name]->disconnect("changed", callable_mp(this, &Theme::_emit_theme_changed));
+	if (icon_map[p_theme_type][p_name].is_valid()) {
+		icon_map[p_theme_type][p_name]->disconnect("changed", callable_mp(this, &Theme::_emit_theme_changed));
 	}
 
-	icon_map[p_node_type].erase(p_name);
+	icon_map[p_theme_type].erase(p_name);
 
 	notify_property_list_changed();
 	emit_changed();
 }
 
-void Theme::get_icon_list(StringName p_node_type, List<StringName> *p_list) const {
+void Theme::get_icon_list(StringName p_theme_type, List<StringName> *p_list) const {
 	ERR_FAIL_NULL(p_list);
 
-	if (!icon_map.has(p_node_type)) {
+	if (!icon_map.has(p_theme_type)) {
 		return;
 	}
 
 	const StringName *key = nullptr;
 
-	while ((key = icon_map[p_node_type].next(key))) {
+	while ((key = icon_map[p_theme_type].next(key))) {
 		p_list->push_back(*key);
 	}
 }
 
-void Theme::add_icon_type(const StringName &p_node_type) {
-	icon_map[p_node_type] = HashMap<StringName, Ref<Texture2D>>();
+void Theme::add_icon_type(const StringName &p_theme_type) {
+	icon_map[p_theme_type] = HashMap<StringName, Ref<Texture2D>>();
 }
 
 void Theme::get_icon_type_list(List<StringName> *p_list) const {
@@ -565,17 +565,17 @@ void Theme::get_icon_type_list(List<StringName> *p_list) const {
 	}
 }
 
-void Theme::set_stylebox(const StringName &p_name, const StringName &p_node_type, const Ref<StyleBox> &p_style) {
-	bool new_value = !style_map.has(p_node_type) || !style_map[p_node_type].has(p_name);
+void Theme::set_stylebox(const StringName &p_name, const StringName &p_theme_type, const Ref<StyleBox> &p_style) {
+	bool new_value = !style_map.has(p_theme_type) || !style_map[p_theme_type].has(p_name);
 
-	if (style_map[p_node_type].has(p_name) && style_map[p_node_type][p_name].is_valid()) {
-		style_map[p_node_type][p_name]->disconnect("changed", callable_mp(this, &Theme::_emit_theme_changed));
+	if (style_map[p_theme_type].has(p_name) && style_map[p_theme_type][p_name].is_valid()) {
+		style_map[p_theme_type][p_name]->disconnect("changed", callable_mp(this, &Theme::_emit_theme_changed));
 	}
 
-	style_map[p_node_type][p_name] = p_style;
+	style_map[p_theme_type][p_name] = p_style;
 
 	if (p_style.is_valid()) {
-		style_map[p_node_type][p_name]->connect("changed", callable_mp(this, &Theme::_emit_theme_changed), varray(), CONNECT_REFERENCE_COUNTED);
+		style_map[p_theme_type][p_name]->connect("changed", callable_mp(this, &Theme::_emit_theme_changed), varray(), CONNECT_REFERENCE_COUNTED);
 	}
 
 	if (new_value) {
@@ -584,64 +584,64 @@ void Theme::set_stylebox(const StringName &p_name, const StringName &p_node_type
 	emit_changed();
 }
 
-Ref<StyleBox> Theme::get_stylebox(const StringName &p_name, const StringName &p_node_type) const {
-	if (style_map.has(p_node_type) && style_map[p_node_type].has(p_name) && style_map[p_node_type][p_name].is_valid()) {
-		return style_map[p_node_type][p_name];
+Ref<StyleBox> Theme::get_stylebox(const StringName &p_name, const StringName &p_theme_type) const {
+	if (style_map.has(p_theme_type) && style_map[p_theme_type].has(p_name) && style_map[p_theme_type][p_name].is_valid()) {
+		return style_map[p_theme_type][p_name];
 	} else {
 		return default_style;
 	}
 }
 
-bool Theme::has_stylebox(const StringName &p_name, const StringName &p_node_type) const {
-	return (style_map.has(p_node_type) && style_map[p_node_type].has(p_name) && style_map[p_node_type][p_name].is_valid());
+bool Theme::has_stylebox(const StringName &p_name, const StringName &p_theme_type) const {
+	return (style_map.has(p_theme_type) && style_map[p_theme_type].has(p_name) && style_map[p_theme_type][p_name].is_valid());
 }
 
-bool Theme::has_stylebox_nocheck(const StringName &p_name, const StringName &p_node_type) const {
-	return (style_map.has(p_node_type) && style_map[p_node_type].has(p_name));
+bool Theme::has_stylebox_nocheck(const StringName &p_name, const StringName &p_theme_type) const {
+	return (style_map.has(p_theme_type) && style_map[p_theme_type].has(p_name));
 }
 
-void Theme::rename_stylebox(const StringName &p_old_name, const StringName &p_name, const StringName &p_node_type) {
-	ERR_FAIL_COND_MSG(!style_map.has(p_node_type), "Cannot rename the stylebox '" + String(p_old_name) + "' because the node type '" + String(p_node_type) + "' does not exist.");
-	ERR_FAIL_COND_MSG(style_map[p_node_type].has(p_name), "Cannot rename the stylebox '" + String(p_old_name) + "' because the new name '" + String(p_name) + "' already exists.");
-	ERR_FAIL_COND_MSG(!style_map[p_node_type].has(p_old_name), "Cannot rename the stylebox '" + String(p_old_name) + "' because it does not exist.");
+void Theme::rename_stylebox(const StringName &p_old_name, const StringName &p_name, const StringName &p_theme_type) {
+	ERR_FAIL_COND_MSG(!style_map.has(p_theme_type), "Cannot rename the stylebox '" + String(p_old_name) + "' because the node type '" + String(p_theme_type) + "' does not exist.");
+	ERR_FAIL_COND_MSG(style_map[p_theme_type].has(p_name), "Cannot rename the stylebox '" + String(p_old_name) + "' because the new name '" + String(p_name) + "' already exists.");
+	ERR_FAIL_COND_MSG(!style_map[p_theme_type].has(p_old_name), "Cannot rename the stylebox '" + String(p_old_name) + "' because it does not exist.");
 
-	style_map[p_node_type][p_name] = style_map[p_node_type][p_old_name];
-	style_map[p_node_type].erase(p_old_name);
+	style_map[p_theme_type][p_name] = style_map[p_theme_type][p_old_name];
+	style_map[p_theme_type].erase(p_old_name);
 
 	notify_property_list_changed();
 	emit_changed();
 }
 
-void Theme::clear_stylebox(const StringName &p_name, const StringName &p_node_type) {
-	ERR_FAIL_COND_MSG(!style_map.has(p_node_type), "Cannot clear the stylebox '" + String(p_name) + "' because the node type '" + String(p_node_type) + "' does not exist.");
-	ERR_FAIL_COND_MSG(!style_map[p_node_type].has(p_name), "Cannot clear the stylebox '" + String(p_name) + "' because it does not exist.");
+void Theme::clear_stylebox(const StringName &p_name, const StringName &p_theme_type) {
+	ERR_FAIL_COND_MSG(!style_map.has(p_theme_type), "Cannot clear the stylebox '" + String(p_name) + "' because the node type '" + String(p_theme_type) + "' does not exist.");
+	ERR_FAIL_COND_MSG(!style_map[p_theme_type].has(p_name), "Cannot clear the stylebox '" + String(p_name) + "' because it does not exist.");
 
-	if (style_map[p_node_type][p_name].is_valid()) {
-		style_map[p_node_type][p_name]->disconnect("changed", callable_mp(this, &Theme::_emit_theme_changed));
+	if (style_map[p_theme_type][p_name].is_valid()) {
+		style_map[p_theme_type][p_name]->disconnect("changed", callable_mp(this, &Theme::_emit_theme_changed));
 	}
 
-	style_map[p_node_type].erase(p_name);
+	style_map[p_theme_type].erase(p_name);
 
 	notify_property_list_changed();
 	emit_changed();
 }
 
-void Theme::get_stylebox_list(StringName p_node_type, List<StringName> *p_list) const {
+void Theme::get_stylebox_list(StringName p_theme_type, List<StringName> *p_list) const {
 	ERR_FAIL_NULL(p_list);
 
-	if (!style_map.has(p_node_type)) {
+	if (!style_map.has(p_theme_type)) {
 		return;
 	}
 
 	const StringName *key = nullptr;
 
-	while ((key = style_map[p_node_type].next(key))) {
+	while ((key = style_map[p_theme_type].next(key))) {
 		p_list->push_back(*key);
 	}
 }
 
-void Theme::add_stylebox_type(const StringName &p_node_type) {
-	style_map[p_node_type] = HashMap<StringName, Ref<StyleBox>>();
+void Theme::add_stylebox_type(const StringName &p_theme_type) {
+	style_map[p_theme_type] = HashMap<StringName, Ref<StyleBox>>();
 }
 
 void Theme::get_stylebox_type_list(List<StringName> *p_list) const {
@@ -653,17 +653,17 @@ void Theme::get_stylebox_type_list(List<StringName> *p_list) const {
 	}
 }
 
-void Theme::set_font(const StringName &p_name, const StringName &p_node_type, const Ref<Font> &p_font) {
-	bool new_value = !font_map.has(p_node_type) || !font_map[p_node_type].has(p_name);
+void Theme::set_font(const StringName &p_name, const StringName &p_theme_type, const Ref<Font> &p_font) {
+	bool new_value = !font_map.has(p_theme_type) || !font_map[p_theme_type].has(p_name);
 
-	if (font_map[p_node_type][p_name].is_valid()) {
-		font_map[p_node_type][p_name]->disconnect("changed", callable_mp(this, &Theme::_emit_theme_changed));
+	if (font_map[p_theme_type][p_name].is_valid()) {
+		font_map[p_theme_type][p_name]->disconnect("changed", callable_mp(this, &Theme::_emit_theme_changed));
 	}
 
-	font_map[p_node_type][p_name] = p_font;
+	font_map[p_theme_type][p_name] = p_font;
 
 	if (p_font.is_valid()) {
-		font_map[p_node_type][p_name]->connect("changed", callable_mp(this, &Theme::_emit_theme_changed), varray(), CONNECT_REFERENCE_COUNTED);
+		font_map[p_theme_type][p_name]->connect("changed", callable_mp(this, &Theme::_emit_theme_changed), varray(), CONNECT_REFERENCE_COUNTED);
 	}
 
 	if (new_value) {
@@ -672,9 +672,9 @@ void Theme::set_font(const StringName &p_name, const StringName &p_node_type, co
 	}
 }
 
-Ref<Font> Theme::get_font(const StringName &p_name, const StringName &p_node_type) const {
-	if (font_map.has(p_node_type) && font_map[p_node_type].has(p_name) && font_map[p_node_type][p_name].is_valid()) {
-		return font_map[p_node_type][p_name];
+Ref<Font> Theme::get_font(const StringName &p_name, const StringName &p_theme_type) const {
+	if (font_map.has(p_theme_type) && font_map[p_theme_type].has(p_name) && font_map[p_theme_type][p_name].is_valid()) {
+		return font_map[p_theme_type][p_name];
 	} else if (default_theme_font.is_valid()) {
 		return default_theme_font;
 	} else {
@@ -682,55 +682,55 @@ Ref<Font> Theme::get_font(const StringName &p_name, const StringName &p_node_typ
 	}
 }
 
-bool Theme::has_font(const StringName &p_name, const StringName &p_node_type) const {
-	return ((font_map.has(p_node_type) && font_map[p_node_type].has(p_name) && font_map[p_node_type][p_name].is_valid()) || default_theme_font.is_valid());
+bool Theme::has_font(const StringName &p_name, const StringName &p_theme_type) const {
+	return ((font_map.has(p_theme_type) && font_map[p_theme_type].has(p_name) && font_map[p_theme_type][p_name].is_valid()) || default_theme_font.is_valid());
 }
 
-bool Theme::has_font_nocheck(const StringName &p_name, const StringName &p_node_type) const {
-	return (font_map.has(p_node_type) && font_map[p_node_type].has(p_name));
+bool Theme::has_font_nocheck(const StringName &p_name, const StringName &p_theme_type) const {
+	return (font_map.has(p_theme_type) && font_map[p_theme_type].has(p_name));
 }
 
-void Theme::rename_font(const StringName &p_old_name, const StringName &p_name, const StringName &p_node_type) {
-	ERR_FAIL_COND_MSG(!font_map.has(p_node_type), "Cannot rename the font '" + String(p_old_name) + "' because the node type '" + String(p_node_type) + "' does not exist.");
-	ERR_FAIL_COND_MSG(font_map[p_node_type].has(p_name), "Cannot rename the font '" + String(p_old_name) + "' because the new name '" + String(p_name) + "' already exists.");
-	ERR_FAIL_COND_MSG(!font_map[p_node_type].has(p_old_name), "Cannot rename the font '" + String(p_old_name) + "' because it does not exist.");
+void Theme::rename_font(const StringName &p_old_name, const StringName &p_name, const StringName &p_theme_type) {
+	ERR_FAIL_COND_MSG(!font_map.has(p_theme_type), "Cannot rename the font '" + String(p_old_name) + "' because the node type '" + String(p_theme_type) + "' does not exist.");
+	ERR_FAIL_COND_MSG(font_map[p_theme_type].has(p_name), "Cannot rename the font '" + String(p_old_name) + "' because the new name '" + String(p_name) + "' already exists.");
+	ERR_FAIL_COND_MSG(!font_map[p_theme_type].has(p_old_name), "Cannot rename the font '" + String(p_old_name) + "' because it does not exist.");
 
-	font_map[p_node_type][p_name] = font_map[p_node_type][p_old_name];
-	font_map[p_node_type].erase(p_old_name);
+	font_map[p_theme_type][p_name] = font_map[p_theme_type][p_old_name];
+	font_map[p_theme_type].erase(p_old_name);
 
 	notify_property_list_changed();
 	emit_changed();
 }
 
-void Theme::clear_font(const StringName &p_name, const StringName &p_node_type) {
-	ERR_FAIL_COND_MSG(!font_map.has(p_node_type), "Cannot clear the font '" + String(p_name) + "' because the node type '" + String(p_node_type) + "' does not exist.");
-	ERR_FAIL_COND_MSG(!font_map[p_node_type].has(p_name), "Cannot clear the font '" + String(p_name) + "' because it does not exist.");
+void Theme::clear_font(const StringName &p_name, const StringName &p_theme_type) {
+	ERR_FAIL_COND_MSG(!font_map.has(p_theme_type), "Cannot clear the font '" + String(p_name) + "' because the node type '" + String(p_theme_type) + "' does not exist.");
+	ERR_FAIL_COND_MSG(!font_map[p_theme_type].has(p_name), "Cannot clear the font '" + String(p_name) + "' because it does not exist.");
 
-	if (font_map[p_node_type][p_name].is_valid()) {
-		font_map[p_node_type][p_name]->disconnect("changed", callable_mp(this, &Theme::_emit_theme_changed));
+	if (font_map[p_theme_type][p_name].is_valid()) {
+		font_map[p_theme_type][p_name]->disconnect("changed", callable_mp(this, &Theme::_emit_theme_changed));
 	}
 
-	font_map[p_node_type].erase(p_name);
+	font_map[p_theme_type].erase(p_name);
 	notify_property_list_changed();
 	emit_changed();
 }
 
-void Theme::get_font_list(StringName p_node_type, List<StringName> *p_list) const {
+void Theme::get_font_list(StringName p_theme_type, List<StringName> *p_list) const {
 	ERR_FAIL_NULL(p_list);
 
-	if (!font_map.has(p_node_type)) {
+	if (!font_map.has(p_theme_type)) {
 		return;
 	}
 
 	const StringName *key = nullptr;
 
-	while ((key = font_map[p_node_type].next(key))) {
+	while ((key = font_map[p_theme_type].next(key))) {
 		p_list->push_back(*key);
 	}
 }
 
-void Theme::add_font_type(const StringName &p_node_type) {
-	font_map[p_node_type] = HashMap<StringName, Ref<Font>>();
+void Theme::add_font_type(const StringName &p_theme_type) {
+	font_map[p_theme_type] = HashMap<StringName, Ref<Font>>();
 }
 
 void Theme::get_font_type_list(List<StringName> *p_list) const {
@@ -742,10 +742,10 @@ void Theme::get_font_type_list(List<StringName> *p_list) const {
 	}
 }
 
-void Theme::set_font_size(const StringName &p_name, const StringName &p_node_type, int p_font_size) {
-	bool new_value = !font_size_map.has(p_node_type) || !font_size_map[p_node_type].has(p_name);
+void Theme::set_font_size(const StringName &p_name, const StringName &p_theme_type, int p_font_size) {
+	bool new_value = !font_size_map.has(p_theme_type) || !font_size_map[p_theme_type].has(p_name);
 
-	font_size_map[p_node_type][p_name] = p_font_size;
+	font_size_map[p_theme_type][p_name] = p_font_size;
 
 	if (new_value) {
 		notify_property_list_changed();
@@ -753,9 +753,9 @@ void Theme::set_font_size(const StringName &p_name, const StringName &p_node_typ
 	}
 }
 
-int Theme::get_font_size(const StringName &p_name, const StringName &p_node_type) const {
-	if (font_size_map.has(p_node_type) && font_size_map[p_node_type].has(p_name) && (font_size_map[p_node_type][p_name] > 0)) {
-		return font_size_map[p_node_type][p_name];
+int Theme::get_font_size(const StringName &p_name, const StringName &p_theme_type) const {
+	if (font_size_map.has(p_theme_type) && font_size_map[p_theme_type].has(p_name) && (font_size_map[p_theme_type][p_name] > 0)) {
+		return font_size_map[p_theme_type][p_name];
 	} else if (default_theme_font_size > 0) {
 		return default_theme_font_size;
 	} else {
@@ -763,51 +763,51 @@ int Theme::get_font_size(const StringName &p_name, const StringName &p_node_type
 	}
 }
 
-bool Theme::has_font_size(const StringName &p_name, const StringName &p_node_type) const {
-	return ((font_size_map.has(p_node_type) && font_size_map[p_node_type].has(p_name) && (font_size_map[p_node_type][p_name] > 0)) || (default_theme_font_size > 0));
+bool Theme::has_font_size(const StringName &p_name, const StringName &p_theme_type) const {
+	return ((font_size_map.has(p_theme_type) && font_size_map[p_theme_type].has(p_name) && (font_size_map[p_theme_type][p_name] > 0)) || (default_theme_font_size > 0));
 }
 
-bool Theme::has_font_size_nocheck(const StringName &p_name, const StringName &p_node_type) const {
-	return (font_size_map.has(p_node_type) && font_size_map[p_node_type].has(p_name));
+bool Theme::has_font_size_nocheck(const StringName &p_name, const StringName &p_theme_type) const {
+	return (font_size_map.has(p_theme_type) && font_size_map[p_theme_type].has(p_name));
 }
 
-void Theme::rename_font_size(const StringName &p_old_name, const StringName &p_name, const StringName &p_node_type) {
-	ERR_FAIL_COND_MSG(!font_size_map.has(p_node_type), "Cannot rename the font size '" + String(p_old_name) + "' because the node type '" + String(p_node_type) + "' does not exist.");
-	ERR_FAIL_COND_MSG(font_size_map[p_node_type].has(p_name), "Cannot rename the font size '" + String(p_old_name) + "' because the new name '" + String(p_name) + "' already exists.");
-	ERR_FAIL_COND_MSG(!font_size_map[p_node_type].has(p_old_name), "Cannot rename the font size '" + String(p_old_name) + "' because it does not exist.");
+void Theme::rename_font_size(const StringName &p_old_name, const StringName &p_name, const StringName &p_theme_type) {
+	ERR_FAIL_COND_MSG(!font_size_map.has(p_theme_type), "Cannot rename the font size '" + String(p_old_name) + "' because the node type '" + String(p_theme_type) + "' does not exist.");
+	ERR_FAIL_COND_MSG(font_size_map[p_theme_type].has(p_name), "Cannot rename the font size '" + String(p_old_name) + "' because the new name '" + String(p_name) + "' already exists.");
+	ERR_FAIL_COND_MSG(!font_size_map[p_theme_type].has(p_old_name), "Cannot rename the font size '" + String(p_old_name) + "' because it does not exist.");
 
-	font_size_map[p_node_type][p_name] = font_size_map[p_node_type][p_old_name];
-	font_size_map[p_node_type].erase(p_old_name);
+	font_size_map[p_theme_type][p_name] = font_size_map[p_theme_type][p_old_name];
+	font_size_map[p_theme_type].erase(p_old_name);
 
 	notify_property_list_changed();
 	emit_changed();
 }
 
-void Theme::clear_font_size(const StringName &p_name, const StringName &p_node_type) {
-	ERR_FAIL_COND_MSG(!font_size_map.has(p_node_type), "Cannot clear the font size '" + String(p_name) + "' because the node type '" + String(p_node_type) + "' does not exist.");
-	ERR_FAIL_COND_MSG(!font_size_map[p_node_type].has(p_name), "Cannot clear the font size '" + String(p_name) + "' because it does not exist.");
+void Theme::clear_font_size(const StringName &p_name, const StringName &p_theme_type) {
+	ERR_FAIL_COND_MSG(!font_size_map.has(p_theme_type), "Cannot clear the font size '" + String(p_name) + "' because the node type '" + String(p_theme_type) + "' does not exist.");
+	ERR_FAIL_COND_MSG(!font_size_map[p_theme_type].has(p_name), "Cannot clear the font size '" + String(p_name) + "' because it does not exist.");
 
-	font_size_map[p_node_type].erase(p_name);
+	font_size_map[p_theme_type].erase(p_name);
 	notify_property_list_changed();
 	emit_changed();
 }
 
-void Theme::get_font_size_list(StringName p_node_type, List<StringName> *p_list) const {
+void Theme::get_font_size_list(StringName p_theme_type, List<StringName> *p_list) const {
 	ERR_FAIL_NULL(p_list);
 
-	if (!font_size_map.has(p_node_type)) {
+	if (!font_size_map.has(p_theme_type)) {
 		return;
 	}
 
 	const StringName *key = nullptr;
 
-	while ((key = font_size_map[p_node_type].next(key))) {
+	while ((key = font_size_map[p_theme_type].next(key))) {
 		p_list->push_back(*key);
 	}
 }
 
-void Theme::add_font_size_type(const StringName &p_node_type) {
-	font_size_map[p_node_type] = HashMap<StringName, int>();
+void Theme::add_font_size_type(const StringName &p_theme_type) {
+	font_size_map[p_theme_type] = HashMap<StringName, int>();
 }
 
 void Theme::get_font_size_type_list(List<StringName> *p_list) const {
@@ -819,10 +819,10 @@ void Theme::get_font_size_type_list(List<StringName> *p_list) const {
 	}
 }
 
-void Theme::set_color(const StringName &p_name, const StringName &p_node_type, const Color &p_color) {
-	bool new_value = !color_map.has(p_node_type) || !color_map[p_node_type].has(p_name);
+void Theme::set_color(const StringName &p_name, const StringName &p_theme_type, const Color &p_color) {
+	bool new_value = !color_map.has(p_theme_type) || !color_map[p_theme_type].has(p_name);
 
-	color_map[p_node_type][p_name] = p_color;
+	color_map[p_theme_type][p_name] = p_color;
 
 	if (new_value) {
 		notify_property_list_changed();
@@ -830,59 +830,59 @@ void Theme::set_color(const StringName &p_name, const StringName &p_node_type, c
 	}
 }
 
-Color Theme::get_color(const StringName &p_name, const StringName &p_node_type) const {
-	if (color_map.has(p_node_type) && color_map[p_node_type].has(p_name)) {
-		return color_map[p_node_type][p_name];
+Color Theme::get_color(const StringName &p_name, const StringName &p_theme_type) const {
+	if (color_map.has(p_theme_type) && color_map[p_theme_type].has(p_name)) {
+		return color_map[p_theme_type][p_name];
 	} else {
 		return Color();
 	}
 }
 
-bool Theme::has_color(const StringName &p_name, const StringName &p_node_type) const {
-	return (color_map.has(p_node_type) && color_map[p_node_type].has(p_name));
+bool Theme::has_color(const StringName &p_name, const StringName &p_theme_type) const {
+	return (color_map.has(p_theme_type) && color_map[p_theme_type].has(p_name));
 }
 
-bool Theme::has_color_nocheck(const StringName &p_name, const StringName &p_node_type) const {
-	return (color_map.has(p_node_type) && color_map[p_node_type].has(p_name));
+bool Theme::has_color_nocheck(const StringName &p_name, const StringName &p_theme_type) const {
+	return (color_map.has(p_theme_type) && color_map[p_theme_type].has(p_name));
 }
 
-void Theme::rename_color(const StringName &p_old_name, const StringName &p_name, const StringName &p_node_type) {
-	ERR_FAIL_COND_MSG(!color_map.has(p_node_type), "Cannot rename the color '" + String(p_old_name) + "' because the node type '" + String(p_node_type) + "' does not exist.");
-	ERR_FAIL_COND_MSG(color_map[p_node_type].has(p_name), "Cannot rename the color '" + String(p_old_name) + "' because the new name '" + String(p_name) + "' already exists.");
-	ERR_FAIL_COND_MSG(!color_map[p_node_type].has(p_old_name), "Cannot rename the color '" + String(p_old_name) + "' because it does not exist.");
+void Theme::rename_color(const StringName &p_old_name, const StringName &p_name, const StringName &p_theme_type) {
+	ERR_FAIL_COND_MSG(!color_map.has(p_theme_type), "Cannot rename the color '" + String(p_old_name) + "' because the node type '" + String(p_theme_type) + "' does not exist.");
+	ERR_FAIL_COND_MSG(color_map[p_theme_type].has(p_name), "Cannot rename the color '" + String(p_old_name) + "' because the new name '" + String(p_name) + "' already exists.");
+	ERR_FAIL_COND_MSG(!color_map[p_theme_type].has(p_old_name), "Cannot rename the color '" + String(p_old_name) + "' because it does not exist.");
 
-	color_map[p_node_type][p_name] = color_map[p_node_type][p_old_name];
-	color_map[p_node_type].erase(p_old_name);
+	color_map[p_theme_type][p_name] = color_map[p_theme_type][p_old_name];
+	color_map[p_theme_type].erase(p_old_name);
 
 	notify_property_list_changed();
 	emit_changed();
 }
 
-void Theme::clear_color(const StringName &p_name, const StringName &p_node_type) {
-	ERR_FAIL_COND_MSG(!color_map.has(p_node_type), "Cannot clear the color '" + String(p_name) + "' because the node type '" + String(p_node_type) + "' does not exist.");
-	ERR_FAIL_COND_MSG(!color_map[p_node_type].has(p_name), "Cannot clear the color '" + String(p_name) + "' because it does not exist.");
+void Theme::clear_color(const StringName &p_name, const StringName &p_theme_type) {
+	ERR_FAIL_COND_MSG(!color_map.has(p_theme_type), "Cannot clear the color '" + String(p_name) + "' because the node type '" + String(p_theme_type) + "' does not exist.");
+	ERR_FAIL_COND_MSG(!color_map[p_theme_type].has(p_name), "Cannot clear the color '" + String(p_name) + "' because it does not exist.");
 
-	color_map[p_node_type].erase(p_name);
+	color_map[p_theme_type].erase(p_name);
 	notify_property_list_changed();
 	emit_changed();
 }
 
-void Theme::get_color_list(StringName p_node_type, List<StringName> *p_list) const {
+void Theme::get_color_list(StringName p_theme_type, List<StringName> *p_list) const {
 	ERR_FAIL_NULL(p_list);
 
-	if (!color_map.has(p_node_type)) {
+	if (!color_map.has(p_theme_type)) {
 		return;
 	}
 
 	const StringName *key = nullptr;
 
-	while ((key = color_map[p_node_type].next(key))) {
+	while ((key = color_map[p_theme_type].next(key))) {
 		p_list->push_back(*key);
 	}
 }
 
-void Theme::add_color_type(const StringName &p_node_type) {
-	color_map[p_node_type] = HashMap<StringName, Color>();
+void Theme::add_color_type(const StringName &p_theme_type) {
+	color_map[p_theme_type] = HashMap<StringName, Color>();
 }
 
 void Theme::get_color_type_list(List<StringName> *p_list) const {
@@ -894,9 +894,9 @@ void Theme::get_color_type_list(List<StringName> *p_list) const {
 	}
 }
 
-void Theme::set_constant(const StringName &p_name, const StringName &p_node_type, int p_constant) {
-	bool new_value = !constant_map.has(p_node_type) || !constant_map[p_node_type].has(p_name);
-	constant_map[p_node_type][p_name] = p_constant;
+void Theme::set_constant(const StringName &p_name, const StringName &p_theme_type, int p_constant) {
+	bool new_value = !constant_map.has(p_theme_type) || !constant_map[p_theme_type].has(p_name);
+	constant_map[p_theme_type][p_name] = p_constant;
 
 	if (new_value) {
 		notify_property_list_changed();
@@ -904,59 +904,59 @@ void Theme::set_constant(const StringName &p_name, const StringName &p_node_type
 	}
 }
 
-int Theme::get_constant(const StringName &p_name, const StringName &p_node_type) const {
-	if (constant_map.has(p_node_type) && constant_map[p_node_type].has(p_name)) {
-		return constant_map[p_node_type][p_name];
+int Theme::get_constant(const StringName &p_name, const StringName &p_theme_type) const {
+	if (constant_map.has(p_theme_type) && constant_map[p_theme_type].has(p_name)) {
+		return constant_map[p_theme_type][p_name];
 	} else {
 		return 0;
 	}
 }
 
-bool Theme::has_constant(const StringName &p_name, const StringName &p_node_type) const {
-	return (constant_map.has(p_node_type) && constant_map[p_node_type].has(p_name));
+bool Theme::has_constant(const StringName &p_name, const StringName &p_theme_type) const {
+	return (constant_map.has(p_theme_type) && constant_map[p_theme_type].has(p_name));
 }
 
-bool Theme::has_constant_nocheck(const StringName &p_name, const StringName &p_node_type) const {
-	return (constant_map.has(p_node_type) && constant_map[p_node_type].has(p_name));
+bool Theme::has_constant_nocheck(const StringName &p_name, const StringName &p_theme_type) const {
+	return (constant_map.has(p_theme_type) && constant_map[p_theme_type].has(p_name));
 }
 
-void Theme::rename_constant(const StringName &p_old_name, const StringName &p_name, const StringName &p_node_type) {
-	ERR_FAIL_COND_MSG(!constant_map.has(p_node_type), "Cannot rename the constant '" + String(p_old_name) + "' because the node type '" + String(p_node_type) + "' does not exist.");
-	ERR_FAIL_COND_MSG(constant_map[p_node_type].has(p_name), "Cannot rename the constant '" + String(p_old_name) + "' because the new name '" + String(p_name) + "' already exists.");
-	ERR_FAIL_COND_MSG(!constant_map[p_node_type].has(p_old_name), "Cannot rename the constant '" + String(p_old_name) + "' because it does not exist.");
+void Theme::rename_constant(const StringName &p_old_name, const StringName &p_name, const StringName &p_theme_type) {
+	ERR_FAIL_COND_MSG(!constant_map.has(p_theme_type), "Cannot rename the constant '" + String(p_old_name) + "' because the node type '" + String(p_theme_type) + "' does not exist.");
+	ERR_FAIL_COND_MSG(constant_map[p_theme_type].has(p_name), "Cannot rename the constant '" + String(p_old_name) + "' because the new name '" + String(p_name) + "' already exists.");
+	ERR_FAIL_COND_MSG(!constant_map[p_theme_type].has(p_old_name), "Cannot rename the constant '" + String(p_old_name) + "' because it does not exist.");
 
-	constant_map[p_node_type][p_name] = constant_map[p_node_type][p_old_name];
-	constant_map[p_node_type].erase(p_old_name);
+	constant_map[p_theme_type][p_name] = constant_map[p_theme_type][p_old_name];
+	constant_map[p_theme_type].erase(p_old_name);
 
 	notify_property_list_changed();
 	emit_changed();
 }
 
-void Theme::clear_constant(const StringName &p_name, const StringName &p_node_type) {
-	ERR_FAIL_COND_MSG(!constant_map.has(p_node_type), "Cannot clear the constant '" + String(p_name) + "' because the node type '" + String(p_node_type) + "' does not exist.");
-	ERR_FAIL_COND_MSG(!constant_map[p_node_type].has(p_name), "Cannot clear the constant '" + String(p_name) + "' because it does not exist.");
+void Theme::clear_constant(const StringName &p_name, const StringName &p_theme_type) {
+	ERR_FAIL_COND_MSG(!constant_map.has(p_theme_type), "Cannot clear the constant '" + String(p_name) + "' because the node type '" + String(p_theme_type) + "' does not exist.");
+	ERR_FAIL_COND_MSG(!constant_map[p_theme_type].has(p_name), "Cannot clear the constant '" + String(p_name) + "' because it does not exist.");
 
-	constant_map[p_node_type].erase(p_name);
+	constant_map[p_theme_type].erase(p_name);
 	notify_property_list_changed();
 	emit_changed();
 }
 
-void Theme::get_constant_list(StringName p_node_type, List<StringName> *p_list) const {
+void Theme::get_constant_list(StringName p_theme_type, List<StringName> *p_list) const {
 	ERR_FAIL_NULL(p_list);
 
-	if (!constant_map.has(p_node_type)) {
+	if (!constant_map.has(p_theme_type)) {
 		return;
 	}
 
 	const StringName *key = nullptr;
 
-	while ((key = constant_map[p_node_type].next(key))) {
+	while ((key = constant_map[p_theme_type].next(key))) {
 		p_list->push_back(*key);
 	}
 }
 
-void Theme::add_constant_type(const StringName &p_node_type) {
-	constant_map[p_node_type] = HashMap<StringName, int>();
+void Theme::add_constant_type(const StringName &p_theme_type) {
+	constant_map[p_theme_type] = HashMap<StringName, int>();
 }
 
 void Theme::get_constant_type_list(List<StringName> *p_list) const {
@@ -968,63 +968,63 @@ void Theme::get_constant_type_list(List<StringName> *p_list) const {
 	}
 }
 
-void Theme::set_theme_item(DataType p_data_type, const StringName &p_name, const StringName &p_node_type, const Variant &p_value) {
+void Theme::set_theme_item(DataType p_data_type, const StringName &p_name, const StringName &p_theme_type, const Variant &p_value) {
 	switch (p_data_type) {
 		case DATA_TYPE_COLOR: {
 			ERR_FAIL_COND_MSG(p_value.get_type() != Variant::COLOR, "Theme item's data type (Color) does not match Variant's type (" + Variant::get_type_name(p_value.get_type()) + ").");
 
 			Color color_value = p_value;
-			set_color(p_name, p_node_type, color_value);
+			set_color(p_name, p_theme_type, color_value);
 		} break;
 		case DATA_TYPE_CONSTANT: {
 			ERR_FAIL_COND_MSG(p_value.get_type() != Variant::INT, "Theme item's data type (int) does not match Variant's type (" + Variant::get_type_name(p_value.get_type()) + ").");
 
 			int constant_value = p_value;
-			set_constant(p_name, p_node_type, constant_value);
+			set_constant(p_name, p_theme_type, constant_value);
 		} break;
 		case DATA_TYPE_FONT: {
 			ERR_FAIL_COND_MSG(p_value.get_type() != Variant::OBJECT, "Theme item's data type (Object) does not match Variant's type (" + Variant::get_type_name(p_value.get_type()) + ").");
 
 			Ref<Font> font_value = Object::cast_to<Font>(p_value.get_validated_object());
-			set_font(p_name, p_node_type, font_value);
+			set_font(p_name, p_theme_type, font_value);
 		} break;
 		case DATA_TYPE_FONT_SIZE: {
 			ERR_FAIL_COND_MSG(p_value.get_type() != Variant::INT, "Theme item's data type (int) does not match Variant's type (" + Variant::get_type_name(p_value.get_type()) + ").");
 
 			int font_size_value = p_value;
-			set_font_size(p_name, p_node_type, font_size_value);
+			set_font_size(p_name, p_theme_type, font_size_value);
 		} break;
 		case DATA_TYPE_ICON: {
 			ERR_FAIL_COND_MSG(p_value.get_type() != Variant::OBJECT, "Theme item's data type (Object) does not match Variant's type (" + Variant::get_type_name(p_value.get_type()) + ").");
 
 			Ref<Texture2D> icon_value = Object::cast_to<Texture2D>(p_value.get_validated_object());
-			set_icon(p_name, p_node_type, icon_value);
+			set_icon(p_name, p_theme_type, icon_value);
 		} break;
 		case DATA_TYPE_STYLEBOX: {
 			ERR_FAIL_COND_MSG(p_value.get_type() != Variant::OBJECT, "Theme item's data type (Object) does not match Variant's type (" + Variant::get_type_name(p_value.get_type()) + ").");
 
 			Ref<StyleBox> stylebox_value = Object::cast_to<StyleBox>(p_value.get_validated_object());
-			set_stylebox(p_name, p_node_type, stylebox_value);
+			set_stylebox(p_name, p_theme_type, stylebox_value);
 		} break;
 		case DATA_TYPE_MAX:
 			break; // Can't happen, but silences warning.
 	}
 }
 
-Variant Theme::get_theme_item(DataType p_data_type, const StringName &p_name, const StringName &p_node_type) const {
+Variant Theme::get_theme_item(DataType p_data_type, const StringName &p_name, const StringName &p_theme_type) const {
 	switch (p_data_type) {
 		case DATA_TYPE_COLOR:
-			return get_color(p_name, p_node_type);
+			return get_color(p_name, p_theme_type);
 		case DATA_TYPE_CONSTANT:
-			return get_constant(p_name, p_node_type);
+			return get_constant(p_name, p_theme_type);
 		case DATA_TYPE_FONT:
-			return get_font(p_name, p_node_type);
+			return get_font(p_name, p_theme_type);
 		case DATA_TYPE_FONT_SIZE:
-			return get_font_size(p_name, p_node_type);
+			return get_font_size(p_name, p_theme_type);
 		case DATA_TYPE_ICON:
-			return get_icon(p_name, p_node_type);
+			return get_icon(p_name, p_theme_type);
 		case DATA_TYPE_STYLEBOX:
-			return get_stylebox(p_name, p_node_type);
+			return get_stylebox(p_name, p_theme_type);
 		case DATA_TYPE_MAX:
 			break; // Can't happen, but silences warning.
 	}
@@ -1032,20 +1032,20 @@ Variant Theme::get_theme_item(DataType p_data_type, const StringName &p_name, co
 	return Variant();
 }
 
-bool Theme::has_theme_item(DataType p_data_type, const StringName &p_name, const StringName &p_node_type) const {
+bool Theme::has_theme_item(DataType p_data_type, const StringName &p_name, const StringName &p_theme_type) const {
 	switch (p_data_type) {
 		case DATA_TYPE_COLOR:
-			return has_color(p_name, p_node_type);
+			return has_color(p_name, p_theme_type);
 		case DATA_TYPE_CONSTANT:
-			return has_constant(p_name, p_node_type);
+			return has_constant(p_name, p_theme_type);
 		case DATA_TYPE_FONT:
-			return has_font(p_name, p_node_type);
+			return has_font(p_name, p_theme_type);
 		case DATA_TYPE_FONT_SIZE:
-			return has_font_size(p_name, p_node_type);
+			return has_font_size(p_name, p_theme_type);
 		case DATA_TYPE_ICON:
-			return has_icon(p_name, p_node_type);
+			return has_icon(p_name, p_theme_type);
 		case DATA_TYPE_STYLEBOX:
-			return has_stylebox(p_name, p_node_type);
+			return has_stylebox(p_name, p_theme_type);
 		case DATA_TYPE_MAX:
 			break; // Can't happen, but silences warning.
 	}
@@ -1053,20 +1053,20 @@ bool Theme::has_theme_item(DataType p_data_type, const StringName &p_name, const
 	return false;
 }
 
-bool Theme::has_theme_item_nocheck(DataType p_data_type, const StringName &p_name, const StringName &p_node_type) const {
+bool Theme::has_theme_item_nocheck(DataType p_data_type, const StringName &p_name, const StringName &p_theme_type) const {
 	switch (p_data_type) {
 		case DATA_TYPE_COLOR:
-			return has_color_nocheck(p_name, p_node_type);
+			return has_color_nocheck(p_name, p_theme_type);
 		case DATA_TYPE_CONSTANT:
-			return has_constant_nocheck(p_name, p_node_type);
+			return has_constant_nocheck(p_name, p_theme_type);
 		case DATA_TYPE_FONT:
-			return has_font_nocheck(p_name, p_node_type);
+			return has_font_nocheck(p_name, p_theme_type);
 		case DATA_TYPE_FONT_SIZE:
-			return has_font_size_nocheck(p_name, p_node_type);
+			return has_font_size_nocheck(p_name, p_theme_type);
 		case DATA_TYPE_ICON:
-			return has_icon_nocheck(p_name, p_node_type);
+			return has_icon_nocheck(p_name, p_theme_type);
 		case DATA_TYPE_STYLEBOX:
-			return has_stylebox_nocheck(p_name, p_node_type);
+			return has_stylebox_nocheck(p_name, p_theme_type);
 		case DATA_TYPE_MAX:
 			break; // Can't happen, but silences warning.
 	}
@@ -1074,100 +1074,100 @@ bool Theme::has_theme_item_nocheck(DataType p_data_type, const StringName &p_nam
 	return false;
 }
 
-void Theme::rename_theme_item(DataType p_data_type, const StringName &p_old_name, const StringName &p_name, const StringName &p_node_type) {
+void Theme::rename_theme_item(DataType p_data_type, const StringName &p_old_name, const StringName &p_name, const StringName &p_theme_type) {
 	switch (p_data_type) {
 		case DATA_TYPE_COLOR:
-			rename_color(p_old_name, p_name, p_node_type);
+			rename_color(p_old_name, p_name, p_theme_type);
 			break;
 		case DATA_TYPE_CONSTANT:
-			rename_constant(p_old_name, p_name, p_node_type);
+			rename_constant(p_old_name, p_name, p_theme_type);
 			break;
 		case DATA_TYPE_FONT:
-			rename_font(p_old_name, p_name, p_node_type);
+			rename_font(p_old_name, p_name, p_theme_type);
 			break;
 		case DATA_TYPE_FONT_SIZE:
-			rename_font_size(p_old_name, p_name, p_node_type);
+			rename_font_size(p_old_name, p_name, p_theme_type);
 			break;
 		case DATA_TYPE_ICON:
-			rename_icon(p_old_name, p_name, p_node_type);
+			rename_icon(p_old_name, p_name, p_theme_type);
 			break;
 		case DATA_TYPE_STYLEBOX:
-			rename_stylebox(p_old_name, p_name, p_node_type);
+			rename_stylebox(p_old_name, p_name, p_theme_type);
 			break;
 		case DATA_TYPE_MAX:
 			break; // Can't happen, but silences warning.
 	}
 }
 
-void Theme::clear_theme_item(DataType p_data_type, const StringName &p_name, const StringName &p_node_type) {
+void Theme::clear_theme_item(DataType p_data_type, const StringName &p_name, const StringName &p_theme_type) {
 	switch (p_data_type) {
 		case DATA_TYPE_COLOR:
-			clear_color(p_name, p_node_type);
+			clear_color(p_name, p_theme_type);
 			break;
 		case DATA_TYPE_CONSTANT:
-			clear_constant(p_name, p_node_type);
+			clear_constant(p_name, p_theme_type);
 			break;
 		case DATA_TYPE_FONT:
-			clear_font(p_name, p_node_type);
+			clear_font(p_name, p_theme_type);
 			break;
 		case DATA_TYPE_FONT_SIZE:
-			clear_font_size(p_name, p_node_type);
+			clear_font_size(p_name, p_theme_type);
 			break;
 		case DATA_TYPE_ICON:
-			clear_icon(p_name, p_node_type);
+			clear_icon(p_name, p_theme_type);
 			break;
 		case DATA_TYPE_STYLEBOX:
-			clear_stylebox(p_name, p_node_type);
+			clear_stylebox(p_name, p_theme_type);
 			break;
 		case DATA_TYPE_MAX:
 			break; // Can't happen, but silences warning.
 	}
 }
 
-void Theme::get_theme_item_list(DataType p_data_type, StringName p_node_type, List<StringName> *p_list) const {
+void Theme::get_theme_item_list(DataType p_data_type, StringName p_theme_type, List<StringName> *p_list) const {
 	switch (p_data_type) {
 		case DATA_TYPE_COLOR:
-			get_color_list(p_node_type, p_list);
+			get_color_list(p_theme_type, p_list);
 			break;
 		case DATA_TYPE_CONSTANT:
-			get_constant_list(p_node_type, p_list);
+			get_constant_list(p_theme_type, p_list);
 			break;
 		case DATA_TYPE_FONT:
-			get_font_list(p_node_type, p_list);
+			get_font_list(p_theme_type, p_list);
 			break;
 		case DATA_TYPE_FONT_SIZE:
-			get_font_size_list(p_node_type, p_list);
+			get_font_size_list(p_theme_type, p_list);
 			break;
 		case DATA_TYPE_ICON:
-			get_icon_list(p_node_type, p_list);
+			get_icon_list(p_theme_type, p_list);
 			break;
 		case DATA_TYPE_STYLEBOX:
-			get_stylebox_list(p_node_type, p_list);
+			get_stylebox_list(p_theme_type, p_list);
 			break;
 		case DATA_TYPE_MAX:
 			break; // Can't happen, but silences warning.
 	}
 }
 
-void Theme::add_theme_item_type(DataType p_data_type, const StringName &p_node_type) {
+void Theme::add_theme_item_type(DataType p_data_type, const StringName &p_theme_type) {
 	switch (p_data_type) {
 		case DATA_TYPE_COLOR:
-			add_color_type(p_node_type);
+			add_color_type(p_theme_type);
 			break;
 		case DATA_TYPE_CONSTANT:
-			add_constant_type(p_node_type);
+			add_constant_type(p_theme_type);
 			break;
 		case DATA_TYPE_FONT:
-			add_font_type(p_node_type);
+			add_font_type(p_theme_type);
 			break;
 		case DATA_TYPE_FONT_SIZE:
-			add_font_size_type(p_node_type);
+			add_font_size_type(p_theme_type);
 			break;
 		case DATA_TYPE_ICON:
-			add_icon_type(p_node_type);
+			add_icon_type(p_theme_type);
 			break;
 		case DATA_TYPE_STYLEBOX:
-			add_stylebox_type(p_node_type);
+			add_stylebox_type(p_theme_type);
 			break;
 		case DATA_TYPE_MAX:
 			break; // Can't happen, but silences warning.
@@ -1340,56 +1340,66 @@ void Theme::get_type_list(List<StringName> *p_list) const {
 	}
 }
 
+void Theme::get_type_dependencies(const StringName &p_theme_type, List<StringName> *p_list) {
+	ERR_FAIL_NULL(p_list);
+
+	StringName class_name = p_theme_type;
+	while (class_name != StringName()) {
+		p_list->push_back(class_name);
+		class_name = ClassDB::get_parent_class_nocheck(class_name);
+	}
+}
+
 void Theme::reset_state() {
 	clear();
 }
 void Theme::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("set_icon", "name", "node_type", "texture"), &Theme::set_icon);
-	ClassDB::bind_method(D_METHOD("get_icon", "name", "node_type"), &Theme::get_icon);
-	ClassDB::bind_method(D_METHOD("has_icon", "name", "node_type"), &Theme::has_icon);
-	ClassDB::bind_method(D_METHOD("rename_icon", "old_name", "name", "node_type"), &Theme::rename_icon);
-	ClassDB::bind_method(D_METHOD("clear_icon", "name", "node_type"), &Theme::clear_icon);
-	ClassDB::bind_method(D_METHOD("get_icon_list", "node_type"), &Theme::_get_icon_list);
+	ClassDB::bind_method(D_METHOD("set_icon", "name", "theme_type", "texture"), &Theme::set_icon);
+	ClassDB::bind_method(D_METHOD("get_icon", "name", "theme_type"), &Theme::get_icon);
+	ClassDB::bind_method(D_METHOD("has_icon", "name", "theme_type"), &Theme::has_icon);
+	ClassDB::bind_method(D_METHOD("rename_icon", "old_name", "name", "theme_type"), &Theme::rename_icon);
+	ClassDB::bind_method(D_METHOD("clear_icon", "name", "theme_type"), &Theme::clear_icon);
+	ClassDB::bind_method(D_METHOD("get_icon_list", "theme_type"), &Theme::_get_icon_list);
 	ClassDB::bind_method(D_METHOD("get_icon_type_list"), &Theme::_get_icon_type_list);
 
-	ClassDB::bind_method(D_METHOD("set_stylebox", "name", "node_type", "texture"), &Theme::set_stylebox);
-	ClassDB::bind_method(D_METHOD("get_stylebox", "name", "node_type"), &Theme::get_stylebox);
-	ClassDB::bind_method(D_METHOD("has_stylebox", "name", "node_type"), &Theme::has_stylebox);
-	ClassDB::bind_method(D_METHOD("rename_stylebox", "old_name", "name", "node_type"), &Theme::rename_stylebox);
-	ClassDB::bind_method(D_METHOD("clear_stylebox", "name", "node_type"), &Theme::clear_stylebox);
-	ClassDB::bind_method(D_METHOD("get_stylebox_list", "node_type"), &Theme::_get_stylebox_list);
+	ClassDB::bind_method(D_METHOD("set_stylebox", "name", "theme_type", "texture"), &Theme::set_stylebox);
+	ClassDB::bind_method(D_METHOD("get_stylebox", "name", "theme_type"), &Theme::get_stylebox);
+	ClassDB::bind_method(D_METHOD("has_stylebox", "name", "theme_type"), &Theme::has_stylebox);
+	ClassDB::bind_method(D_METHOD("rename_stylebox", "old_name", "name", "theme_type"), &Theme::rename_stylebox);
+	ClassDB::bind_method(D_METHOD("clear_stylebox", "name", "theme_type"), &Theme::clear_stylebox);
+	ClassDB::bind_method(D_METHOD("get_stylebox_list", "theme_type"), &Theme::_get_stylebox_list);
 	ClassDB::bind_method(D_METHOD("get_stylebox_type_list"), &Theme::_get_stylebox_type_list);
 
-	ClassDB::bind_method(D_METHOD("set_font", "name", "node_type", "font"), &Theme::set_font);
-	ClassDB::bind_method(D_METHOD("get_font", "name", "node_type"), &Theme::get_font);
-	ClassDB::bind_method(D_METHOD("has_font", "name", "node_type"), &Theme::has_font);
-	ClassDB::bind_method(D_METHOD("rename_font", "old_name", "name", "node_type"), &Theme::rename_font);
-	ClassDB::bind_method(D_METHOD("clear_font", "name", "node_type"), &Theme::clear_font);
-	ClassDB::bind_method(D_METHOD("get_font_list", "node_type"), &Theme::_get_font_list);
+	ClassDB::bind_method(D_METHOD("set_font", "name", "theme_type", "font"), &Theme::set_font);
+	ClassDB::bind_method(D_METHOD("get_font", "name", "theme_type"), &Theme::get_font);
+	ClassDB::bind_method(D_METHOD("has_font", "name", "theme_type"), &Theme::has_font);
+	ClassDB::bind_method(D_METHOD("rename_font", "old_name", "name", "theme_type"), &Theme::rename_font);
+	ClassDB::bind_method(D_METHOD("clear_font", "name", "theme_type"), &Theme::clear_font);
+	ClassDB::bind_method(D_METHOD("get_font_list", "theme_type"), &Theme::_get_font_list);
 	ClassDB::bind_method(D_METHOD("get_font_type_list"), &Theme::_get_font_type_list);
 
-	ClassDB::bind_method(D_METHOD("set_font_size", "name", "node_type", "font_size"), &Theme::set_font_size);
-	ClassDB::bind_method(D_METHOD("get_font_size", "name", "node_type"), &Theme::get_font_size);
-	ClassDB::bind_method(D_METHOD("has_font_size", "name", "node_type"), &Theme::has_font_size);
-	ClassDB::bind_method(D_METHOD("rename_font_size", "old_name", "name", "node_type"), &Theme::rename_font_size);
-	ClassDB::bind_method(D_METHOD("clear_font_size", "name", "node_type"), &Theme::clear_font_size);
-	ClassDB::bind_method(D_METHOD("get_font_size_list", "node_type"), &Theme::_get_font_size_list);
+	ClassDB::bind_method(D_METHOD("set_font_size", "name", "theme_type", "font_size"), &Theme::set_font_size);
+	ClassDB::bind_method(D_METHOD("get_font_size", "name", "theme_type"), &Theme::get_font_size);
+	ClassDB::bind_method(D_METHOD("has_font_size", "name", "theme_type"), &Theme::has_font_size);
+	ClassDB::bind_method(D_METHOD("rename_font_size", "old_name", "name", "theme_type"), &Theme::rename_font_size);
+	ClassDB::bind_method(D_METHOD("clear_font_size", "name", "theme_type"), &Theme::clear_font_size);
+	ClassDB::bind_method(D_METHOD("get_font_size_list", "theme_type"), &Theme::_get_font_size_list);
 	ClassDB::bind_method(D_METHOD("get_font_size_type_list"), &Theme::_get_font_size_type_list);
 
-	ClassDB::bind_method(D_METHOD("set_color", "name", "node_type", "color"), &Theme::set_color);
-	ClassDB::bind_method(D_METHOD("get_color", "name", "node_type"), &Theme::get_color);
-	ClassDB::bind_method(D_METHOD("has_color", "name", "node_type"), &Theme::has_color);
-	ClassDB::bind_method(D_METHOD("rename_color", "old_name", "name", "node_type"), &Theme::rename_color);
-	ClassDB::bind_method(D_METHOD("clear_color", "name", "node_type"), &Theme::clear_color);
-	ClassDB::bind_method(D_METHOD("get_color_list", "node_type"), &Theme::_get_color_list);
+	ClassDB::bind_method(D_METHOD("set_color", "name", "theme_type", "color"), &Theme::set_color);
+	ClassDB::bind_method(D_METHOD("get_color", "name", "theme_type"), &Theme::get_color);
+	ClassDB::bind_method(D_METHOD("has_color", "name", "theme_type"), &Theme::has_color);
+	ClassDB::bind_method(D_METHOD("rename_color", "old_name", "name", "theme_type"), &Theme::rename_color);
+	ClassDB::bind_method(D_METHOD("clear_color", "name", "theme_type"), &Theme::clear_color);
+	ClassDB::bind_method(D_METHOD("get_color_list", "theme_type"), &Theme::_get_color_list);
 	ClassDB::bind_method(D_METHOD("get_color_type_list"), &Theme::_get_color_type_list);
 
-	ClassDB::bind_method(D_METHOD("set_constant", "name", "node_type", "constant"), &Theme::set_constant);
-	ClassDB::bind_method(D_METHOD("get_constant", "name", "node_type"), &Theme::get_constant);
-	ClassDB::bind_method(D_METHOD("has_constant", "name", "node_type"), &Theme::has_constant);
-	ClassDB::bind_method(D_METHOD("rename_constant", "old_name", "name", "node_type"), &Theme::rename_constant);
-	ClassDB::bind_method(D_METHOD("clear_constant", "name", "node_type"), &Theme::clear_constant);
-	ClassDB::bind_method(D_METHOD("get_constant_list", "node_type"), &Theme::_get_constant_list);
+	ClassDB::bind_method(D_METHOD("set_constant", "name", "theme_type", "constant"), &Theme::set_constant);
+	ClassDB::bind_method(D_METHOD("get_constant", "name", "theme_type"), &Theme::get_constant);
+	ClassDB::bind_method(D_METHOD("has_constant", "name", "theme_type"), &Theme::has_constant);
+	ClassDB::bind_method(D_METHOD("rename_constant", "old_name", "name", "theme_type"), &Theme::rename_constant);
+	ClassDB::bind_method(D_METHOD("clear_constant", "name", "theme_type"), &Theme::clear_constant);
+	ClassDB::bind_method(D_METHOD("get_constant_list", "theme_type"), &Theme::_get_constant_list);
 	ClassDB::bind_method(D_METHOD("get_constant_type_list"), &Theme::_get_constant_type_list);
 
 	ClassDB::bind_method(D_METHOD("clear"), &Theme::clear);
@@ -1400,12 +1410,12 @@ void Theme::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_default_font_size", "font_size"), &Theme::set_default_theme_font_size);
 	ClassDB::bind_method(D_METHOD("get_default_font_size"), &Theme::get_default_theme_font_size);
 
-	ClassDB::bind_method(D_METHOD("set_theme_item", "data_type", "name", "node_type", "value"), &Theme::set_theme_item);
-	ClassDB::bind_method(D_METHOD("get_theme_item", "data_type", "name", "node_type"), &Theme::get_theme_item);
-	ClassDB::bind_method(D_METHOD("has_theme_item", "data_type", "name", "node_type"), &Theme::has_theme_item);
-	ClassDB::bind_method(D_METHOD("rename_theme_item", "data_type", "old_name", "name", "node_type"), &Theme::rename_theme_item);
-	ClassDB::bind_method(D_METHOD("clear_theme_item", "data_type", "name", "node_type"), &Theme::clear_theme_item);
-	ClassDB::bind_method(D_METHOD("get_theme_item_list", "data_type", "node_type"), &Theme::_get_theme_item_list);
+	ClassDB::bind_method(D_METHOD("set_theme_item", "data_type", "name", "theme_type", "value"), &Theme::set_theme_item);
+	ClassDB::bind_method(D_METHOD("get_theme_item", "data_type", "name", "theme_type"), &Theme::get_theme_item);
+	ClassDB::bind_method(D_METHOD("has_theme_item", "data_type", "name", "theme_type"), &Theme::has_theme_item);
+	ClassDB::bind_method(D_METHOD("rename_theme_item", "data_type", "old_name", "name", "theme_type"), &Theme::rename_theme_item);
+	ClassDB::bind_method(D_METHOD("clear_theme_item", "data_type", "name", "theme_type"), &Theme::clear_theme_item);
+	ClassDB::bind_method(D_METHOD("get_theme_item_list", "data_type", "theme_type"), &Theme::_get_theme_item_list);
 	ClassDB::bind_method(D_METHOD("get_theme_item_type_list", "data_type"), &Theme::_get_theme_item_type_list);
 
 	ClassDB::bind_method(D_METHOD("get_type_list"), &Theme::_get_type_list);
diff --git a/scene/resources/theme.h b/scene/resources/theme.h
index 7e887b6343..4de1f065e1 100644
--- a/scene/resources/theme.h
+++ b/scene/resources/theme.h
@@ -62,20 +62,20 @@ private:
 	HashMap<StringName, HashMap<StringName, Color>> color_map;
 	HashMap<StringName, HashMap<StringName, int>> constant_map;
 
-	Vector<String> _get_icon_list(const String &p_node_type) const;
+	Vector<String> _get_icon_list(const String &p_theme_type) const;
 	Vector<String> _get_icon_type_list() const;
-	Vector<String> _get_stylebox_list(const String &p_node_type) const;
+	Vector<String> _get_stylebox_list(const String &p_theme_type) const;
 	Vector<String> _get_stylebox_type_list() const;
-	Vector<String> _get_font_list(const String &p_node_type) const;
+	Vector<String> _get_font_list(const String &p_theme_type) const;
 	Vector<String> _get_font_type_list() const;
-	Vector<String> _get_font_size_list(const String &p_node_type) const;
+	Vector<String> _get_font_size_list(const String &p_theme_type) const;
 	Vector<String> _get_font_size_type_list() const;
-	Vector<String> _get_color_list(const String &p_node_type) const;
+	Vector<String> _get_color_list(const String &p_theme_type) const;
 	Vector<String> _get_color_type_list() const;
-	Vector<String> _get_constant_list(const String &p_node_type) const;
+	Vector<String> _get_constant_list(const String &p_theme_type) const;
 	Vector<String> _get_constant_type_list() const;
 
-	Vector<String> _get_theme_item_list(DataType p_data_type, const String &p_node_type) const;
+	Vector<String> _get_theme_item_list(DataType p_data_type, const String &p_theme_type) const;
 	Vector<String> _get_theme_item_type_list(DataType p_data_type) const;
 	Vector<String> _get_type_list() const;
 
@@ -116,77 +116,78 @@ public:
 	void set_default_theme_font_size(int p_font_size);
 	int get_default_theme_font_size() const;
 
-	void set_icon(const StringName &p_name, const StringName &p_node_type, const Ref<Texture2D> &p_icon);
-	Ref<Texture2D> get_icon(const StringName &p_name, const StringName &p_node_type) const;
-	bool has_icon(const StringName &p_name, const StringName &p_node_type) const;
-	bool has_icon_nocheck(const StringName &p_name, const StringName &p_node_type) const;
-	void rename_icon(const StringName &p_old_name, const StringName &p_name, const StringName &p_node_type);
-	void clear_icon(const StringName &p_name, const StringName &p_node_type);
-	void get_icon_list(StringName p_node_type, List<StringName> *p_list) const;
-	void add_icon_type(const StringName &p_node_type);
+	void set_icon(const StringName &p_name, const StringName &p_theme_type, const Ref<Texture2D> &p_icon);
+	Ref<Texture2D> get_icon(const StringName &p_name, const StringName &p_theme_type) const;
+	bool has_icon(const StringName &p_name, const StringName &p_theme_type) const;
+	bool has_icon_nocheck(const StringName &p_name, const StringName &p_theme_type) const;
+	void rename_icon(const StringName &p_old_name, const StringName &p_name, const StringName &p_theme_type);
+	void clear_icon(const StringName &p_name, const StringName &p_theme_type);
+	void get_icon_list(StringName p_theme_type, List<StringName> *p_list) const;
+	void add_icon_type(const StringName &p_theme_type);
 	void get_icon_type_list(List<StringName> *p_list) const;
 
-	void set_stylebox(const StringName &p_name, const StringName &p_node_type, const Ref<StyleBox> &p_style);
-	Ref<StyleBox> get_stylebox(const StringName &p_name, const StringName &p_node_type) const;
-	bool has_stylebox(const StringName &p_name, const StringName &p_node_type) const;
-	bool has_stylebox_nocheck(const StringName &p_name, const StringName &p_node_type) const;
-	void rename_stylebox(const StringName &p_old_name, const StringName &p_name, const StringName &p_node_type);
-	void clear_stylebox(const StringName &p_name, const StringName &p_node_type);
-	void get_stylebox_list(StringName p_node_type, List<StringName> *p_list) const;
-	void add_stylebox_type(const StringName &p_node_type);
+	void set_stylebox(const StringName &p_name, const StringName &p_theme_type, const Ref<StyleBox> &p_style);
+	Ref<StyleBox> get_stylebox(const StringName &p_name, const StringName &p_theme_type) const;
+	bool has_stylebox(const StringName &p_name, const StringName &p_theme_type) const;
+	bool has_stylebox_nocheck(const StringName &p_name, const StringName &p_theme_type) const;
+	void rename_stylebox(const StringName &p_old_name, const StringName &p_name, const StringName &p_theme_type);
+	void clear_stylebox(const StringName &p_name, const StringName &p_theme_type);
+	void get_stylebox_list(StringName p_theme_type, List<StringName> *p_list) const;
+	void add_stylebox_type(const StringName &p_theme_type);
 	void get_stylebox_type_list(List<StringName> *p_list) const;
 
-	void set_font(const StringName &p_name, const StringName &p_node_type, const Ref<Font> &p_font);
-	Ref<Font> get_font(const StringName &p_name, const StringName &p_node_type) const;
-	bool has_font(const StringName &p_name, const StringName &p_node_type) const;
-	bool has_font_nocheck(const StringName &p_name, const StringName &p_node_type) const;
-	void rename_font(const StringName &p_old_name, const StringName &p_name, const StringName &p_node_type);
-	void clear_font(const StringName &p_name, const StringName &p_node_type);
-	void get_font_list(StringName p_node_type, List<StringName> *p_list) const;
-	void add_font_type(const StringName &p_node_type);
+	void set_font(const StringName &p_name, const StringName &p_theme_type, const Ref<Font> &p_font);
+	Ref<Font> get_font(const StringName &p_name, const StringName &p_theme_type) const;
+	bool has_font(const StringName &p_name, const StringName &p_theme_type) const;
+	bool has_font_nocheck(const StringName &p_name, const StringName &p_theme_type) const;
+	void rename_font(const StringName &p_old_name, const StringName &p_name, const StringName &p_theme_type);
+	void clear_font(const StringName &p_name, const StringName &p_theme_type);
+	void get_font_list(StringName p_theme_type, List<StringName> *p_list) const;
+	void add_font_type(const StringName &p_theme_type);
 	void get_font_type_list(List<StringName> *p_list) const;
 
-	void set_font_size(const StringName &p_name, const StringName &p_node_type, int p_font_size);
-	int get_font_size(const StringName &p_name, const StringName &p_node_type) const;
-	bool has_font_size(const StringName &p_name, const StringName &p_node_type) const;
-	bool has_font_size_nocheck(const StringName &p_name, const StringName &p_node_type) const;
-	void rename_font_size(const StringName &p_old_name, const StringName &p_name, const StringName &p_node_type);
-	void clear_font_size(const StringName &p_name, const StringName &p_node_type);
-	void get_font_size_list(StringName p_node_type, List<StringName> *p_list) const;
-	void add_font_size_type(const StringName &p_node_type);
+	void set_font_size(const StringName &p_name, const StringName &p_theme_type, int p_font_size);
+	int get_font_size(const StringName &p_name, const StringName &p_theme_type) const;
+	bool has_font_size(const StringName &p_name, const StringName &p_theme_type) const;
+	bool has_font_size_nocheck(const StringName &p_name, const StringName &p_theme_type) const;
+	void rename_font_size(const StringName &p_old_name, const StringName &p_name, const StringName &p_theme_type);
+	void clear_font_size(const StringName &p_name, const StringName &p_theme_type);
+	void get_font_size_list(StringName p_theme_type, List<StringName> *p_list) const;
+	void add_font_size_type(const StringName &p_theme_type);
 	void get_font_size_type_list(List<StringName> *p_list) const;
 
-	void set_color(const StringName &p_name, const StringName &p_node_type, const Color &p_color);
-	Color get_color(const StringName &p_name, const StringName &p_node_type) const;
-	bool has_color(const StringName &p_name, const StringName &p_node_type) const;
-	bool has_color_nocheck(const StringName &p_name, const StringName &p_node_type) const;
-	void rename_color(const StringName &p_old_name, const StringName &p_name, const StringName &p_node_type);
-	void clear_color(const StringName &p_name, const StringName &p_node_type);
-	void get_color_list(StringName p_node_type, List<StringName> *p_list) const;
-	void add_color_type(const StringName &p_node_type);
+	void set_color(const StringName &p_name, const StringName &p_theme_type, const Color &p_color);
+	Color get_color(const StringName &p_name, const StringName &p_theme_type) const;
+	bool has_color(const StringName &p_name, const StringName &p_theme_type) const;
+	bool has_color_nocheck(const StringName &p_name, const StringName &p_theme_type) const;
+	void rename_color(const StringName &p_old_name, const StringName &p_name, const StringName &p_theme_type);
+	void clear_color(const StringName &p_name, const StringName &p_theme_type);
+	void get_color_list(StringName p_theme_type, List<StringName> *p_list) const;
+	void add_color_type(const StringName &p_theme_type);
 	void get_color_type_list(List<StringName> *p_list) const;
 
-	void set_constant(const StringName &p_name, const StringName &p_node_type, int p_constant);
-	int get_constant(const StringName &p_name, const StringName &p_node_type) const;
-	bool has_constant(const StringName &p_name, const StringName &p_node_type) const;
-	bool has_constant_nocheck(const StringName &p_name, const StringName &p_node_type) const;
-	void rename_constant(const StringName &p_old_name, const StringName &p_name, const StringName &p_node_type);
-	void clear_constant(const StringName &p_name, const StringName &p_node_type);
-	void get_constant_list(StringName p_node_type, List<StringName> *p_list) const;
-	void add_constant_type(const StringName &p_node_type);
+	void set_constant(const StringName &p_name, const StringName &p_theme_type, int p_constant);
+	int get_constant(const StringName &p_name, const StringName &p_theme_type) const;
+	bool has_constant(const StringName &p_name, const StringName &p_theme_type) const;
+	bool has_constant_nocheck(const StringName &p_name, const StringName &p_theme_type) const;
+	void rename_constant(const StringName &p_old_name, const StringName &p_name, const StringName &p_theme_type);
+	void clear_constant(const StringName &p_name, const StringName &p_theme_type);
+	void get_constant_list(StringName p_theme_type, List<StringName> *p_list) const;
+	void add_constant_type(const StringName &p_theme_type);
 	void get_constant_type_list(List<StringName> *p_list) const;
 
-	void set_theme_item(DataType p_data_type, const StringName &p_name, const StringName &p_node_type, const Variant &p_value);
-	Variant get_theme_item(DataType p_data_type, const StringName &p_name, const StringName &p_node_type) const;
-	bool has_theme_item(DataType p_data_type, const StringName &p_name, const StringName &p_node_type) const;
-	bool has_theme_item_nocheck(DataType p_data_type, const StringName &p_name, const StringName &p_node_type) const;
-	void rename_theme_item(DataType p_data_type, const StringName &p_old_name, const StringName &p_name, const StringName &p_node_type);
-	void clear_theme_item(DataType p_data_type, const StringName &p_name, const StringName &p_node_type);
-	void get_theme_item_list(DataType p_data_type, StringName p_node_type, List<StringName> *p_list) const;
-	void add_theme_item_type(DataType p_data_type, const StringName &p_node_type);
+	void set_theme_item(DataType p_data_type, const StringName &p_name, const StringName &p_theme_type, const Variant &p_value);
+	Variant get_theme_item(DataType p_data_type, const StringName &p_name, const StringName &p_theme_type) const;
+	bool has_theme_item(DataType p_data_type, const StringName &p_name, const StringName &p_theme_type) const;
+	bool has_theme_item_nocheck(DataType p_data_type, const StringName &p_name, const StringName &p_theme_type) const;
+	void rename_theme_item(DataType p_data_type, const StringName &p_old_name, const StringName &p_name, const StringName &p_theme_type);
+	void clear_theme_item(DataType p_data_type, const StringName &p_name, const StringName &p_theme_type);
+	void get_theme_item_list(DataType p_data_type, StringName p_theme_type, List<StringName> *p_list) const;
+	void add_theme_item_type(DataType p_data_type, const StringName &p_theme_type);
 	void get_theme_item_type_list(DataType p_data_type, List<StringName> *p_list) const;
 
 	void get_type_list(List<StringName> *p_list) const;
+	static void get_type_dependencies(const StringName &p_theme_type, List<StringName> *p_list);
 
 	void copy_default_theme();
 	void copy_theme(const Ref<Theme> &p_other);