Make default_theme.tres the project theme

Remove default_theme as theme for GameMenu
	Usable as a result of Godot 4.0.1 update

Move theme resources to theme directory
Move theme_assets to theme/assets
	For better theme organization

Remove scene/node specific theme overrides
Use theme_type_variation for nodes in MainMenu, OptionsMenu, CreditsMenu
	Decreases coupling of theme values in scenes and the scene tree

Assign theme resources to MainMenu, OptionsMenu, and CreditsMenu
	Separates general default theme values and scene specific theme values
	Reduces the specificity and verbosity of theme type variation names

Rename MainMenu/Panel/VBox/Margin2 to BottomMargin
	For better clarity of Margin's purpose

Add newline to end of CreditsMenu.gd

5 files changed, 35 insertions, 43 deletions

diff --git a/game/src/CreditsMenu/CreditsMenu.gd b/game/src/CreditsMenu/CreditsMenu.gd
index be992ef..52c1711 100644
--- a/game/src/CreditsMenu/CreditsMenu.gd
+++ b/game/src/CreditsMenu/CreditsMenu.gd
@@ -123,4 +123,4 @@ func _ready():
 # * UI-38
 # * UIFUN-37
 func _on_back_button_pressed() -> void:
-	back_button_pressed.emit()
\ No newline at end of file
+	back_button_pressed.emit()
diff --git a/game/src/CreditsMenu/CreditsMenu.tscn b/game/src/CreditsMenu/CreditsMenu.tscn
index 8a81823..d2819d7 100644
--- a/game/src/CreditsMenu/CreditsMenu.tscn
+++ b/game/src/CreditsMenu/CreditsMenu.tscn
@@ -1,5 +1,6 @@
-[gd_scene load_steps=2 format=3 uid="uid://c8knthxkwj1uj"]
+[gd_scene load_steps=3 format=3 uid="uid://c8knthxkwj1uj"]
 
+[ext_resource type="Theme" uid="uid://stfxt4hpsify" path="res://theme/credits_menu.tres" id="1_7y4l8"]
 [ext_resource type="Script" path="res://src/CreditsMenu/CreditsMenu.gd" id="1_csd7i"]
 
 [node name="CreditsMenu" type="Control" node_paths=PackedStringArray("credits_list")]
@@ -10,11 +11,12 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
+theme = ExtResource("1_7y4l8")
 script = ExtResource("1_csd7i")
 core_credits_path = "res://common/credits.csv"
-label_variants_project = &"Label_ProjectCredits"
-label_variants_role = &"Label_RoleCredits"
-label_variants_person = &"Label_PersonCredits"
+label_variants_project = &"ProjectLabel"
+label_variants_role = &"RoleLabel"
+label_variants_person = &"PersonLabel"
 credits_list = NodePath("Scroll/CreditsList")
 
 [node name="ControlMargin" type="MarginContainer" parent="."]
@@ -22,10 +24,7 @@ layout_mode = 2
 anchor_right = 1.0
 anchor_bottom = 0.071
 offset_bottom = -0.120003
-theme_override_constants/margin_left = 20
-theme_override_constants/margin_top = 10
-theme_override_constants/margin_right = 20
-theme_override_constants/margin_bottom = 10
+theme_type_variation = &"BackButtonsMargin"
 
 [node name="BackButton" type="Button" parent="ControlMargin"]
 editor_description = "UI-38"
diff --git a/game/src/GameMenu.tscn b/game/src/GameMenu.tscn
index ab892df..752b1be 100644
--- a/game/src/GameMenu.tscn
+++ b/game/src/GameMenu.tscn
@@ -1,8 +1,7 @@
-[gd_scene load_steps=8 format=3 uid="uid://o4u142w4qkln"]
+[gd_scene load_steps=7 format=3 uid="uid://o4u142w4qkln"]
 
 [ext_resource type="Script" path="res://src/GameMenu.gd" id="1_cafwe"]
-[ext_resource type="Theme" uid="uid://cr4lh0vraucx7" path="res://default_theme.tres" id="1_q3b4c"]
-[ext_resource type="PackedScene" uid="uid://dvoin538iby54" path="res://src/MainMenu/MainMenu.tscn" id="2_2jbkh"]
+[ext_resource type="PackedScene" uid="uid://c5nyjkpsx14h1" path="res://src/MainMenu/MainMenu.tscn" id="2_2jbkh"]
 [ext_resource type="PackedScene" uid="uid://cnbfxjy1m6wja" path="res://src/OptionMenu/OptionsMenu.tscn" id="3_111lv"]
 [ext_resource type="PackedScene" uid="uid://c8knthxkwj1uj" path="res://src/CreditsMenu/CreditsMenu.tscn" id="4_n0hoo"]
 [ext_resource type="PackedScene" uid="uid://crhkgngfnxf4y" path="res://src/LobbyMenu/LobbyMenu.tscn" id="4_nofk1"]
@@ -15,7 +14,6 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-theme = ExtResource("1_q3b4c")
 script = ExtResource("1_cafwe")
 _main_menu = NodePath("MainMenu")
 _options_menu = NodePath("OptionsMenu")
diff --git a/game/src/MainMenu/MainMenu.tscn b/game/src/MainMenu/MainMenu.tscn
index 4fc95d8..0fcae05 100644
--- a/game/src/MainMenu/MainMenu.tscn
+++ b/game/src/MainMenu/MainMenu.tscn
@@ -1,6 +1,6 @@
-[gd_scene load_steps=4 format=3 uid="uid://dvoin538iby54"]
+[gd_scene load_steps=4 format=3 uid="uid://c5nyjkpsx14h1"]
 
-[ext_resource type="Theme" uid="uid://cr4lh0vraucx7" path="res://default_theme.tres" id="1_dfm41"]
+[ext_resource type="Theme" uid="uid://dx1s0qdvtcb6l" path="res://theme/main_menu.tres" id="1_1yri4"]
 [ext_resource type="Script" path="res://src/MainMenu/MainMenu.gd" id="2_nm1fq"]
 [ext_resource type="PackedScene" uid="uid://b7oncobnacxmt" path="res://src/LocaleButton.tscn" id="3_amonp"]
 
@@ -12,10 +12,10 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-theme = ExtResource("1_dfm41")
+theme = ExtResource("1_1yri4")
 script = ExtResource("2_nm1fq")
 _new_game_button = NodePath("Panel/VBox/Margin/ButtonList/NewGameButton")
-_checksum_label = NodePath("Panel/VBox/Margin2/VersionChecksumBox/ChecksumLabel")
+_checksum_label = NodePath("Panel/VBox/BottomMargin/VersionChecksumBox/ChecksumLabel")
 
 [node name="Panel" type="PanelContainer" parent="."]
 layout_mode = 1
@@ -24,7 +24,7 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-theme_type_variation = &"Panel_MainMenu"
+theme_type_variation = &"BackgroundPanel"
 
 [node name="VBox" type="VBoxContainer" parent="Panel"]
 layout_mode = 2
@@ -33,7 +33,7 @@ layout_mode = 2
 layout_mode = 2
 size_flags_vertical = 6
 size_flags_stretch_ratio = 1.5
-theme_override_font_sizes/font_size = 90
+theme_type_variation = &"TitleLabel"
 text = "OpenVic2"
 horizontal_alignment = 1
 vertical_alignment = 1
@@ -50,7 +50,7 @@ theme_type_variation = &"HBox_MainMenu_ButtonList"
 theme_override_constants/separation = 18
 alignment = 1
 
-[node name="NewGameButton" type="Button" parent="Panel/VBox/Margin/ButtonList" node_paths=PackedStringArray("shortcut_context")]
+[node name="NewGameButton" type="Button" parent="Panel/VBox/Margin/ButtonList"]
 editor_description = "UI-26"
 layout_mode = 2
 size_flags_horizontal = 3
@@ -59,8 +59,7 @@ focus_neighbor_top = NodePath("../ExitButton")
 focus_neighbor_right = NodePath("../ContinueButton")
 focus_next = NodePath("../ContinueButton")
 focus_previous = NodePath("../ExitButton")
-shortcut_context = NodePath("")
-theme_type_variation = &"Button_MainMenu"
+theme_type_variation = &"TitleButton"
 text = "New Game"
 clip_text = true
 
@@ -71,7 +70,7 @@ focus_neighbor_left = NodePath("../NewGameButton")
 focus_neighbor_right = NodePath("../MultiplayerButton")
 focus_next = NodePath("../MultiplayerButton")
 focus_previous = NodePath("../NewGameButton")
-theme_type_variation = &"Button_MainMenu"
+theme_type_variation = &"TitleButton"
 disabled = true
 text = "Continue"
 clip_text = true
@@ -84,7 +83,7 @@ focus_neighbor_left = NodePath("../ContinueButton")
 focus_neighbor_right = NodePath("../OptionsButton")
 focus_next = NodePath("../OptionsButton")
 focus_previous = NodePath("../ContinueButton")
-theme_type_variation = &"Button_MainMenu"
+theme_type_variation = &"TitleButton"
 text = "Multiplayer"
 clip_text = true
 
@@ -96,7 +95,7 @@ focus_neighbor_left = NodePath("../MultiplayerButton")
 focus_neighbor_right = NodePath("../CreditsButton")
 focus_next = NodePath("../CreditsButton")
 focus_previous = NodePath("../MultiplayerButton")
-theme_type_variation = &"Button_MainMenu"
+theme_type_variation = &"TitleButton"
 text = "Options"
 clip_text = true
 
@@ -108,7 +107,7 @@ focus_neighbor_left = NodePath("../OptionsButton")
 focus_neighbor_right = NodePath("../ExitButton")
 focus_next = NodePath("../ExitButton")
 focus_previous = NodePath("../OptionsButton")
-theme_type_variation = &"Button_MainMenu"
+theme_type_variation = &"TitleButton"
 text = "Credits"
 clip_text = true
 
@@ -120,7 +119,7 @@ focus_neighbor_left = NodePath("../OptionsButton")
 focus_neighbor_right = NodePath("../NewGameButton")
 focus_next = NodePath("../NewGameButton")
 focus_previous = NodePath("../OptionsButton")
-theme_type_variation = &"Button_MainMenu"
+theme_type_variation = &"TitleButton"
 text = "Exit"
 clip_text = true
 
@@ -129,31 +128,30 @@ layout_mode = 2
 size_flags_vertical = 3
 size_flags_stretch_ratio = 0.35
 
-[node name="Margin2" type="MarginContainer" parent="Panel/VBox"]
+[node name="BottomMargin" type="MarginContainer" parent="Panel/VBox"]
 layout_mode = 2
-theme_override_constants/margin_left = 50
-theme_override_constants/margin_right = 50
-theme_override_constants/margin_bottom = 10
+theme_type_variation = &"BottomMargin"
 
-[node name="VersionChecksumBox" type="HBoxContainer" parent="Panel/VBox/Margin2"]
+[node name="VersionChecksumBox" type="HBoxContainer" parent="Panel/VBox/BottomMargin"]
 editor_description = "UI-31"
 layout_mode = 2
 
-[node name="VersionLabel" type="Label" parent="Panel/VBox/Margin2/VersionChecksumBox"]
+[node name="VersionLabel" type="Label" parent="Panel/VBox/BottomMargin/VersionChecksumBox"]
 layout_mode = 2
 tooltip_text = "OpenVic2 v0.01 \"Primum Mobile\""
 mouse_filter = 1
+theme_type_variation = &"VersionLabel"
 text = "v0.01"
 
-[node name="ChecksumLabel" type="Label" parent="Panel/VBox/Margin2/VersionChecksumBox"]
+[node name="ChecksumLabel" type="Label" parent="Panel/VBox/BottomMargin/VersionChecksumBox"]
 editor_description = "UI-111"
 layout_mode = 2
 tooltip_text = "Checksum 00000000"
 mouse_filter = 1
-theme_type_variation = &"Label_Checksum"
+theme_type_variation = &"ChecksumLabel"
 text = "(0000)"
 
-[node name="LocaleButton" parent="Panel/VBox/Margin2" instance=ExtResource("3_amonp")]
+[node name="LocaleButton" parent="Panel/VBox/BottomMargin" instance=ExtResource("3_amonp")]
 layout_mode = 2
 size_flags_horizontal = 8
 alignment = 0
diff --git a/game/src/OptionMenu/OptionsMenu.tscn b/game/src/OptionMenu/OptionsMenu.tscn
index 1ff2022..3156e33 100644
--- a/game/src/OptionMenu/OptionsMenu.tscn
+++ b/game/src/OptionMenu/OptionsMenu.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=8 format=3 uid="uid://cnbfxjy1m6wja"]
 
+[ext_resource type="Theme" uid="uid://fbxssqcg1s0m" path="res://theme/options_menu.tres" id="1_0up1d"]
 [ext_resource type="Script" path="res://src/OptionMenu/OptionsMenu.gd" id="1_tlein"]
-[ext_resource type="Theme" uid="uid://cr4lh0vraucx7" path="res://default_theme.tres" id="2_8cfng"]
 [ext_resource type="PackedScene" uid="uid://bq3awxxjn1tuw" path="res://src/OptionMenu/VideoTab.tscn" id="2_ji8xr"]
 [ext_resource type="PackedScene" uid="uid://cbtgwpx2wxi33" path="res://src/OptionMenu/SoundTab.tscn" id="3_4w35t"]
 [ext_resource type="PackedScene" uid="uid://duwjal7sd7p6w" path="res://src/OptionMenu/GeneralTab.tscn" id="3_6gvf6"]
@@ -15,16 +15,13 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-theme = ExtResource("2_8cfng")
-theme_type_variation = &"Panel_MainMenu"
+theme = ExtResource("1_0up1d")
+theme_type_variation = &"BackgroundPanel"
 script = ExtResource("1_tlein")
 
 [node name="Margin" type="MarginContainer" parent="."]
 layout_mode = 2
-theme_override_constants/margin_left = 180
-theme_override_constants/margin_top = 150
-theme_override_constants/margin_right = 180
-theme_override_constants/margin_bottom = 150
+theme_type_variation = &"TabMargin"
 
 [node name="Tab" type="TabContainer" parent="Margin"]
 editor_description = "UI-45"