diff --git a/2d/platformer/gui/theme.tres b/2d/platformer/gui/theme.tres
index 4bae7a5d..d7dc2ac6 100644
--- a/2d/platformer/gui/theme.tres
+++ b/2d/platformer/gui/theme.tres
@@ -70,7 +70,7 @@ Button/colors/font_color_hover = Color(0.88, 0.8845, 0.8965, 1)
 Button/colors/font_color_pressed = Color(0.411765, 0.611765, 0.909804, 1)
 Button/colors/icon_color_hover = Color(1.15, 1.15, 1.15, 1)
 Button/colors/icon_color_pressed = Color(0.4715, 0.7015, 1.0465, 1)
-Button/constants/hseparation = 2
+Button/constants/h_separation = 2
 Button/fonts/font = ExtResource("1_f0sjs")
 Button/styles/disabled = SubResource("1")
 Button/styles/focus = SubResource("2")
diff --git a/2d/role_playing_game/theme/theme.tres b/2d/role_playing_game/theme/theme.tres
index c1a95adf..364b3ac6 100644
--- a/2d/role_playing_game/theme/theme.tres
+++ b/2d/role_playing_game/theme/theme.tres
@@ -69,7 +69,7 @@ Button/colors/font_focus_color = Color(0.564706, 0.231373, 0.0705882, 1)
 Button/colors/font_hover_color = Color(0.984314, 0.490196, 0.25098, 1)
 Button/colors/font_hover_pressed_color = Color(0.984314, 0.490196, 0.25098, 1)
 Button/colors/font_pressed_color = Color(0.984314, 0.490196, 0.25098, 1)
-Button/constants/hseparation = 2
+Button/constants/h_separation = 2
 Button/fonts/font = ExtResource("1")
 Button/styles/disabled = null
 Button/styles/focus = SubResource("1")
@@ -77,31 +77,28 @@ Button/styles/hover = SubResource("2")
 Button/styles/normal = SubResource("3")
 Button/styles/pressed = SubResource("4")
 Label/colors/font_color = Color(0.184314, 0.419608, 0.533333, 1)
-Label/colors/font_color_shadow = Color(1, 0.596078, 0, 0)
+Label/colors/font_shadow_color = Color(1, 0.596078, 0, 0)
 Label/constants/line_spacing = 3
-Label/constants/shadow_as_outline = 0
 Label/constants/shadow_offset_x = 0
 Label/constants/shadow_offset_y = 4
+Label/constants/shadow_outline_size = 0
 Label/fonts/font = ExtResource("4")
 Label/styles/normal = null
 Panel/styles/panel = SubResource("5")
-Panel/styles/panelf = null
-Panel/styles/panelnc = null
 PanelContainer/styles/panel = SubResource("5")
 ProgressBar/colors/font_color = Color(0.941176, 0.941176, 0.941176, 1)
-ProgressBar/colors/font_color_shadow = Color(0, 0, 0, 1)
 ProgressBar/fonts/font = ExtResource("4")
 ProgressBar/styles/bg = SubResource("6")
 ProgressBar/styles/fg = ExtResource("7")
 RichTextLabel/colors/default_color = Color(0.184314, 0.419608, 0.533333, 1)
-RichTextLabel/colors/font_color_selected = Color(0.49, 0.49, 0.49, 1)
-RichTextLabel/colors/font_color_shadow = Color(0, 0, 0, 0)
+RichTextLabel/colors/font_selected_color = Color(0.49, 0.49, 0.49, 1)
+RichTextLabel/colors/font_shadow_color = Color(0, 0, 0, 0)
 RichTextLabel/colors/selection_color = Color(0.1, 0.1, 1, 0.8)
 RichTextLabel/constants/line_separation = 1
-RichTextLabel/constants/shadow_as_outline = 0
 RichTextLabel/constants/shadow_offset_x = 1
 RichTextLabel/constants/shadow_offset_y = 1
-RichTextLabel/constants/table_hseparation = 3
+RichTextLabel/constants/shadow_outline_size = 0
+RichTextLabel/constants/table_h_separation = 3
 RichTextLabel/constants/table_vseparation = 3
 RichTextLabel/styles/focus = null
 RichTextLabel/styles/normal = null
diff --git a/gui/theming_override/test.tscn b/gui/theming_override/test.tscn
index 0381356e..cea5a243 100644
--- a/gui/theming_override/test.tscn
+++ b/gui/theming_override/test.tscn
@@ -37,7 +37,7 @@ Button/colors/font_color = Color(0.88, 0.88, 0.88, 1)
 Button/colors/font_color_disabled = Color(0.9, 0.9, 0.9, 0.2)
 Button/colors/font_color_hover = Color(0.94, 0.94, 0.94, 1)
 Button/colors/font_color_pressed = Color(1, 1, 1, 1)
-Button/constants/hseparation = 2
+Button/constants/h_separation = 2
 Button/fonts/font = null
 Button/styles/disabled = null
 Button/styles/focus = SubResource("1")