Merge pull request #72 from Spartan322/enhance/theming

17 files changed, 229 insertions, 149 deletions

diff --git a/game/project.godot b/game/project.godot
index 323bf41..ae9822c 100644
--- a/game/project.godot
+++ b/game/project.godot
@@ -40,6 +40,10 @@ window/stretch/aspect="ignore"
 
 enabled=PackedStringArray("res://addons/keychain/plugin.cfg")
 
+[gui]
+
+theme/custom="res://theme/default_theme.tres"
+
 [internationalization]
 
 locale/translation_remaps={}
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"
diff --git a/game/theme_assets/main_menu_background.png b/game/theme/assets/main_menu_background.png
index 7d64b9f..7d64b9f 100644
--- a/game/theme_assets/main_menu_background.png
+++ b/game/theme/assets/main_menu_background.png
diff --git a/game/theme_assets/main_menu_background.png.import b/game/theme/assets/main_menu_background.png.import
index 271c7a7..965fff2 100644
--- a/game/theme_assets/main_menu_background.png.import
+++ b/game/theme/assets/main_menu_background.png.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dapuqgpjs56bs"
-path="res://.godot/imported/main_menu_background.png-c4fc744a964a06c84b08c83d86c1109c.ctex"
+path="res://.godot/imported/main_menu_background.png-d397f96448c7ec02ba7a3775a5bc8e5d.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://theme_assets/main_menu_background.png"
-dest_files=["res://.godot/imported/main_menu_background.png-c4fc744a964a06c84b08c83d86c1109c.ctex"]
+source_file="res://theme/assets/main_menu_background.png"
+dest_files=["res://.godot/imported/main_menu_background.png-d397f96448c7ec02ba7a3775a5bc8e5d.ctex"]
 
 [params]
 
diff --git a/game/theme_assets/main_menu_border_paper.png b/game/theme/assets/main_menu_border_paper.png
index 0693ce5..0693ce5 100644
--- a/game/theme_assets/main_menu_border_paper.png
+++ b/game/theme/assets/main_menu_border_paper.png
diff --git a/game/theme_assets/main_menu_border_paper.png.import b/game/theme/assets/main_menu_border_paper.png.import
index d01f7b1..b833b97 100644
--- a/game/theme_assets/main_menu_border_paper.png.import
+++ b/game/theme/assets/main_menu_border_paper.png.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://q25s41oavuxw"
-path="res://.godot/imported/main_menu_border_paper.png-a42b85887a8e3c9c1d1136c72c94fdc0.ctex"
+path="res://.godot/imported/main_menu_border_paper.png-c8549470cf4010a1002e278047308eb5.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://theme_assets/main_menu_border_paper.png"
-dest_files=["res://.godot/imported/main_menu_border_paper.png-a42b85887a8e3c9c1d1136c72c94fdc0.ctex"]
+source_file="res://theme/assets/main_menu_border_paper.png"
+dest_files=["res://.godot/imported/main_menu_border_paper.png-c8549470cf4010a1002e278047308eb5.ctex"]
 
 [params]
 
diff --git a/game/theme_assets/main_menu_button.png b/game/theme/assets/main_menu_button.png
index b84c8a3..b84c8a3 100644
--- a/game/theme_assets/main_menu_button.png
+++ b/game/theme/assets/main_menu_button.png
diff --git a/game/theme_assets/main_menu_button.png.import b/game/theme/assets/main_menu_button.png.import
index 745b2e1..8f2dcfd 100644
--- a/game/theme_assets/main_menu_button.png.import
+++ b/game/theme/assets/main_menu_button.png.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://c0p34i3d3b0pw"
-path="res://.godot/imported/main_menu_button.png-c10c48e0a8cab217f3c5b89e1e5b8b32.ctex"
+path="res://.godot/imported/main_menu_button.png-364b1e885596ca0f849f184a08457deb.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://theme_assets/main_menu_button.png"
-dest_files=["res://.godot/imported/main_menu_button.png-c10c48e0a8cab217f3c5b89e1e5b8b32.ctex"]
+source_file="res://theme/assets/main_menu_button.png"
+dest_files=["res://.godot/imported/main_menu_button.png-364b1e885596ca0f849f184a08457deb.ctex"]
 
 [params]
 
diff --git a/game/theme_assets/main_menu_button_normal.stylebox b/game/theme/assets/main_menu_button_normal.stylebox
index 563b302..563b302 100644
--- a/game/theme_assets/main_menu_button_normal.stylebox
+++ b/game/theme/assets/main_menu_button_normal.stylebox
diff --git a/game/theme/credits_menu.tres b/game/theme/credits_menu.tres
new file mode 100644
index 0000000..c07f1b6
--- /dev/null
+++ b/game/theme/credits_menu.tres
@@ -0,0 +1,17 @@
+[gd_resource type="Theme" format=3 uid="uid://stfxt4hpsify"]
+
+[resource]
+BackButtonsMargin/base_type = &"MarginContainer"
+BackButtonsMargin/constants/margin_bottom = 10
+BackButtonsMargin/constants/margin_left = 20
+BackButtonsMargin/constants/margin_right = 20
+BackButtonsMargin/constants/margin_top = 10
+PersonLabel/base_type = &"Label"
+PersonLabel/constants/line_spacing = 10
+PersonLabel/font_sizes/font_size = 20
+ProjectLabel/base_type = &"Label"
+ProjectLabel/constants/line_spacing = 20
+ProjectLabel/font_sizes/font_size = 50
+RoleLabel/base_type = &"Label"
+RoleLabel/constants/line_spacing = 10
+RoleLabel/font_sizes/font_size = 30
diff --git a/game/theme/default_theme.tres b/game/theme/default_theme.tres
new file mode 100644
index 0000000..6104472
--- /dev/null
+++ b/game/theme/default_theme.tres
@@ -0,0 +1,3 @@
+[gd_resource type="Theme" format=3 uid="uid://b48ymrsp1q8sf"]
+
+[resource]
diff --git a/game/default_theme.tres b/game/theme/main_menu.tres
index 0f9119b..5bf8c9a 100644
--- a/game/default_theme.tres
+++ b/game/theme/main_menu.tres
@@ -1,20 +1,72 @@
-[gd_resource type="Theme" load_steps=18 format=3 uid="uid://cr4lh0vraucx7"]
+[gd_resource type="Theme" load_steps=18 format=3 uid="uid://dx1s0qdvtcb6l"]
 
-[ext_resource type="Texture2D" uid="uid://c0p34i3d3b0pw" path="res://theme_assets/main_menu_button.png" id="1_dwmy4"]
-[ext_resource type="StyleBox" uid="uid://4ypja147f4mb" path="res://theme_assets/main_menu_button_normal.stylebox" id="2_8nk80"]
-[ext_resource type="Script" path="res://src/Utility/StyleBoxWithSound.gd" id="3_0667r"]
-[ext_resource type="AudioStream" uid="uid://bsldcs3l8s7ug" path="res://addons/kenney_ui_audio/click3.wav" id="4_3ej5v"]
-[ext_resource type="Script" path="res://src/Utility/StyleBoxCombinedTexture.gd" id="5_lricc"]
-[ext_resource type="Script" path="res://src/Utility/TextureSetting.gd" id="6_oq58n"]
-[ext_resource type="Texture2D" uid="uid://dapuqgpjs56bs" path="res://theme_assets/main_menu_background.png" id="7_ioley"]
-[ext_resource type="Texture2D" uid="uid://q25s41oavuxw" path="res://theme_assets/main_menu_border_paper.png" id="8_pqg86"]
+[ext_resource type="Script" path="res://src/Utility/StyleBoxCombinedTexture.gd" id="1_axke7"]
+[ext_resource type="Script" path="res://src/Utility/TextureSetting.gd" id="2_7bwl2"]
+[ext_resource type="Texture2D" uid="uid://dapuqgpjs56bs" path="res://theme/assets/main_menu_background.png" id="3_cpatd"]
+[ext_resource type="Texture2D" uid="uid://q25s41oavuxw" path="res://theme/assets/main_menu_border_paper.png" id="4_sl60o"]
+[ext_resource type="Texture2D" uid="uid://c0p34i3d3b0pw" path="res://theme/assets/main_menu_button.png" id="5_xj7ql"]
+[ext_resource type="StyleBox" uid="uid://4ypja147f4mb" path="res://theme/assets/main_menu_button_normal.stylebox" id="6_ibm8p"]
+[ext_resource type="Script" path="res://src/Utility/StyleBoxWithSound.gd" id="7_qo00e"]
+[ext_resource type="AudioStream" uid="uid://bsldcs3l8s7ug" path="res://addons/kenney_ui_audio/click3.wav" id="8_etuft"]
+
+[sub_resource type="Resource" id="Resource_hxpog"]
+script = ExtResource("2_7bwl2")
+texture = ExtResource("3_cpatd")
+draw_center = true
+texture_margin_left = 0.0
+texture_margin_top = 0.0
+texture_margin_right = 0.0
+texture_margin_bottom = 0.0
+expand_margin_left = 0.0
+expand_margin_top = 0.0
+expand_margin_right = 0.0
+expand_margin_bottom = 0.0
+axis_stretch_horizontal = 0
+axis_stretch_vertical = 0
+region_rect = Rect2(0, 0, 0, 0)
+modulate_color = Color(1, 1, 1, 1)
+content_margin_left = -1.0
+content_margin_top = -1.0
+content_margin_right = -1.0
+content_margin_bottom = -1.0
+
+[sub_resource type="Resource" id="Resource_c0k5l"]
+script = ExtResource("2_7bwl2")
+texture = ExtResource("4_sl60o")
+draw_center = true
+texture_margin_left = 0.0
+texture_margin_top = 0.0
+texture_margin_right = 0.0
+texture_margin_bottom = 0.0
+expand_margin_left = 0.0
+expand_margin_top = 0.0
+expand_margin_right = 0.0
+expand_margin_bottom = 0.0
+axis_stretch_horizontal = 0
+axis_stretch_vertical = 0
+region_rect = Rect2(0, 0, 0, 0)
+modulate_color = Color(1, 1, 1, 1)
+content_margin_left = -1.0
+content_margin_top = -1.0
+content_margin_right = -1.0
+content_margin_bottom = -1.0
+
+[sub_resource type="StyleBox" id="StyleBox_odacv"]
+resource_local_to_scene = false
+resource_name = ""
+content_margin_left = -1.0
+content_margin_top = -1.0
+content_margin_right = -1.0
+content_margin_bottom = -1.0
+script = ExtResource("1_axke7")
+texture_settings = Array[ExtResource("2_7bwl2")]([SubResource("Resource_hxpog"), SubResource("Resource_c0k5l")])
 
 [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_dd2b8"]
 content_margin_left = 20.0
 content_margin_top = 10.0
 content_margin_right = 20.0
 content_margin_bottom = 14.0
-texture = ExtResource("1_dwmy4")
+texture = ExtResource("5_xj7ql")
 modulate_color = Color(0.817521, 0.817521, 0.817521, 0.784314)
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2txce"]
@@ -57,93 +109,38 @@ content_margin_left = -1.0
 content_margin_top = -1.0
 content_margin_right = -1.0
 content_margin_bottom = -1.0
-script = ExtResource("3_0667r")
+script = ExtResource("7_qo00e")
 style_box = SubResource("StyleBoxTexture_l2rw3")
-sound = ExtResource("4_3ej5v")
-
-[sub_resource type="Resource" id="Resource_hxpog"]
-script = ExtResource("6_oq58n")
-texture = ExtResource("7_ioley")
-draw_center = true
-texture_margin_left = 0.0
-texture_margin_top = 0.0
-texture_margin_right = 0.0
-texture_margin_bottom = 0.0
-expand_margin_left = 0.0
-expand_margin_top = 0.0
-expand_margin_right = 0.0
-expand_margin_bottom = 0.0
-axis_stretch_horizontal = 0
-axis_stretch_vertical = 0
-region_rect = Rect2(0, 0, 0, 0)
-modulate_color = Color(1, 1, 1, 1)
-content_margin_left = -1.0
-content_margin_top = -1.0
-content_margin_right = -1.0
-content_margin_bottom = -1.0
-
-[sub_resource type="Resource" id="Resource_c0k5l"]
-script = ExtResource("6_oq58n")
-texture = ExtResource("8_pqg86")
-draw_center = true
-texture_margin_left = 0.0
-texture_margin_top = 0.0
-texture_margin_right = 0.0
-texture_margin_bottom = 0.0
-expand_margin_left = 0.0
-expand_margin_top = 0.0
-expand_margin_right = 0.0
-expand_margin_bottom = 0.0
-axis_stretch_horizontal = 0
-axis_stretch_vertical = 0
-region_rect = Rect2(0, 0, 0, 0)
-modulate_color = Color(1, 1, 1, 1)
-content_margin_left = -1.0
-content_margin_top = -1.0
-content_margin_right = -1.0
-content_margin_bottom = -1.0
-
-[sub_resource type="StyleBox" id="StyleBox_rvlty"]
-resource_local_to_scene = false
-resource_name = ""
-content_margin_left = -1.0
-content_margin_top = -1.0
-content_margin_right = -1.0
-content_margin_bottom = -1.0
-script = ExtResource("5_lricc")
-texture_settings = Array[ExtResource("6_oq58n")]([SubResource("Resource_hxpog"), SubResource("Resource_c0k5l")])
+sound = ExtResource("8_etuft")
 
 [resource]
-Button_MainMenu/base_type = &"Button"
-Button_MainMenu/colors/font_color = Color(0.87451, 0.87451, 0.87451, 1)
-Button_MainMenu/colors/font_disabled_color = Color(0.875, 0.875, 0.875, 0.5)
-Button_MainMenu/colors/font_focus_color = Color(0.95, 0.95, 0.95, 1)
-Button_MainMenu/colors/font_hover_color = Color(0.95, 0.95, 0.95, 1)
-Button_MainMenu/colors/font_hover_pressed_color = Color(1, 1, 1, 1)
-Button_MainMenu/colors/font_outline_color = Color(1, 1, 1, 1)
-Button_MainMenu/colors/font_pressed_color = Color(1, 1, 1, 1)
-Button_MainMenu/colors/icon_disabled_color = Color(1, 1, 1, 0.4)
-Button_MainMenu/colors/icon_focus_color = Color(1, 1, 1, 1)
-Button_MainMenu/colors/icon_hover_color = Color(1, 1, 1, 1)
-Button_MainMenu/colors/icon_hover_pressed_color = Color(1, 1, 1, 1)
-Button_MainMenu/colors/icon_normal_color = Color(1, 1, 1, 1)
-Button_MainMenu/colors/icon_pressed_color = Color(1, 1, 1, 1)
-Button_MainMenu/font_sizes/font_size = 16
-Button_MainMenu/styles/disabled = SubResource("StyleBoxTexture_dd2b8")
-Button_MainMenu/styles/focus = SubResource("StyleBoxFlat_2txce")
-Button_MainMenu/styles/hover = SubResource("StyleBoxTexture_3efxh")
-Button_MainMenu/styles/normal = ExtResource("2_8nk80")
-Button_MainMenu/styles/pressed = SubResource("StyleBox_uuspe")
-Label_Checksum/base_type = &"Label"
-Label_Checksum/colors/font_color = Color(0.247059, 0.392157, 1, 1)
-Label_PersonCredits/base_type = &"Label"
-Label_PersonCredits/constants/line_spacing = 10
-Label_PersonCredits/font_sizes/font_size = 20
-Label_ProjectCredits/base_type = &"Label"
-Label_ProjectCredits/constants/line_spacing = 20
-Label_ProjectCredits/font_sizes/font_size = 50
-Label_RoleCredits/base_type = &"Label"
-Label_RoleCredits/constants/line_spacing = 10
-Label_RoleCredits/font_sizes/font_size = 30
-Panel_MainMenu/base_type = &"Panel"
-Panel_MainMenu/styles/panel = SubResource("StyleBox_rvlty")
+BackgroundPanel/base_type = &"PanelContainer"
+BackgroundPanel/styles/panel = SubResource("StyleBox_odacv")
+BottomMargin/base_type = &"MarginContainer"
+BottomMargin/constants/margin_bottom = 10
+BottomMargin/constants/margin_left = 50
+BottomMargin/constants/margin_right = 50
+ChecksumLabel/base_type = &"Label"
+ChecksumLabel/colors/font_color = Color(0.247059, 0.392157, 1, 1)
+TitleButton/base_type = &"Button"
+TitleButton/colors/font_color = Color(0.87451, 0.87451, 0.87451, 1)
+TitleButton/colors/font_disabled_color = Color(0.875, 0.875, 0.875, 0.5)
+TitleButton/colors/font_focus_color = Color(0.95, 0.95, 0.95, 1)
+TitleButton/colors/font_hover_color = Color(0.95, 0.95, 0.95, 1)
+TitleButton/colors/font_hover_pressed_color = Color(1, 1, 1, 1)
+TitleButton/colors/font_outline_color = Color(1, 1, 1, 1)
+TitleButton/colors/font_pressed_color = Color(1, 1, 1, 1)
+TitleButton/colors/icon_disabled_color = Color(1, 1, 1, 0.4)
+TitleButton/colors/icon_focus_color = Color(1, 1, 1, 1)
+TitleButton/colors/icon_hover_color = Color(1, 1, 1, 1)
+TitleButton/colors/icon_hover_pressed_color = Color(1, 1, 1, 1)
+TitleButton/colors/icon_normal_color = Color(1, 1, 1, 1)
+TitleButton/colors/icon_pressed_color = Color(1, 1, 1, 1)
+TitleButton/font_sizes/font_size = 16
+TitleButton/styles/disabled = SubResource("StyleBoxTexture_dd2b8")
+TitleButton/styles/focus = SubResource("StyleBoxFlat_2txce")
+TitleButton/styles/hover = SubResource("StyleBoxTexture_3efxh")
+TitleButton/styles/normal = ExtResource("6_ibm8p")
+TitleButton/styles/pressed = SubResource("StyleBox_uuspe")
+TitleLabel/base_type = &"Label"
+TitleLabel/font_sizes/font_size = 90
diff --git a/game/theme/options_menu.tres b/game/theme/options_menu.tres
new file mode 100644
index 0000000..04bcb96
--- /dev/null
+++ b/game/theme/options_menu.tres
@@ -0,0 +1,67 @@
+[gd_resource type="Theme" load_steps=8 format=3 uid="uid://fbxssqcg1s0m"]
+
+[ext_resource type="Script" path="res://src/Utility/StyleBoxCombinedTexture.gd" id="1_6eqg5"]
+[ext_resource type="Script" path="res://src/Utility/TextureSetting.gd" id="2_d0e1t"]
+[ext_resource type="Texture2D" uid="uid://dapuqgpjs56bs" path="res://theme/assets/main_menu_background.png" id="3_t863y"]
+[ext_resource type="Texture2D" uid="uid://q25s41oavuxw" path="res://theme/assets/main_menu_border_paper.png" id="4_ljte1"]
+
+[sub_resource type="Resource" id="Resource_hxpog"]
+script = ExtResource("2_d0e1t")
+texture = ExtResource("3_t863y")
+draw_center = true
+texture_margin_left = 0.0
+texture_margin_top = 0.0
+texture_margin_right = 0.0
+texture_margin_bottom = 0.0
+expand_margin_left = 0.0
+expand_margin_top = 0.0
+expand_margin_right = 0.0
+expand_margin_bottom = 0.0
+axis_stretch_horizontal = 0
+axis_stretch_vertical = 0
+region_rect = Rect2(0, 0, 0, 0)
+modulate_color = Color(1, 1, 1, 1)
+content_margin_left = -1.0
+content_margin_top = -1.0
+content_margin_right = -1.0
+content_margin_bottom = -1.0
+
+[sub_resource type="Resource" id="Resource_c0k5l"]
+script = ExtResource("2_d0e1t")
+texture = ExtResource("4_ljte1")
+draw_center = true
+texture_margin_left = 0.0
+texture_margin_top = 0.0
+texture_margin_right = 0.0
+texture_margin_bottom = 0.0
+expand_margin_left = 0.0
+expand_margin_top = 0.0
+expand_margin_right = 0.0
+expand_margin_bottom = 0.0
+axis_stretch_horizontal = 0
+axis_stretch_vertical = 0
+region_rect = Rect2(0, 0, 0, 0)
+modulate_color = Color(1, 1, 1, 1)
+content_margin_left = -1.0
+content_margin_top = -1.0
+content_margin_right = -1.0
+content_margin_bottom = -1.0
+
+[sub_resource type="StyleBox" id="StyleBox_lm8by"]
+resource_local_to_scene = false
+resource_name = ""
+content_margin_left = -1.0
+content_margin_top = -1.0
+content_margin_right = -1.0
+content_margin_bottom = -1.0
+script = ExtResource("1_6eqg5")
+texture_settings = Array[ExtResource("2_d0e1t")]([SubResource("Resource_hxpog"), SubResource("Resource_c0k5l")])
+
+[resource]
+BackgroundPanel/base_type = &"PanelContainer"
+BackgroundPanel/styles/panel = SubResource("StyleBox_lm8by")
+TabMargin/base_type = &"MarginContainer"
+TabMargin/constants/margin_bottom = 150
+TabMargin/constants/margin_left = 180
+TabMargin/constants/margin_right = 180
+TabMargin/constants/margin_top = 150