6 files changed, 10 insertions, 38 deletions
diff --git a/client/gui/menus/chat.gd b/client/gui/menus/chat.gd
index 150b0e7e..aae76f82 100644
--- a/client/gui/menus/chat.gd
+++ b/client/gui/menus/chat.gd
@@ -16,7 +16,7 @@
 extends Menu
 class_name ChatOpen
 
-const CHAT_MESSAGE_SCENE = preload("res://menu/communicate/chat/chat_message.tscn")
+const CHAT_MESSAGE_SCENE = preload("res://gui/components/message/chat_message.tscn")
 
 @onready var messages_container: VBoxContainer = $PanelContainer/MarginContainer/VBoxContainer/ScrollContainerCustom/Messages
 @onready var scroll_container: ScrollContainerCustom = $PanelContainer/MarginContainer/VBoxContainer/ScrollContainerCustom
diff --git a/client/gui/menus/chat.tscn b/client/gui/menus/chat.tscn
index 626038f4..5b046191 100644
--- a/client/gui/menus/chat.tscn
+++ b/client/gui/menus/chat.tscn
@@ -15,7 +15,6 @@ offset_right = 296.0
 grow_vertical = 2
 script = ExtResource("1_gntkb")
 support_anim = false
-auto_anim = null
 
 [node name="PanelContainer" type="PanelContainer" parent="."]
 material = ExtResource("2_1au48")
diff --git a/client/gui/menus/game.gd b/client/gui/menus/game.gd
index a4916b92..a46cc93b 100644
--- a/client/gui/menus/game.gd
+++ b/client/gui/menus/game.gd
@@ -18,16 +18,14 @@ class_name GameMenu
 
 @onready var game: Game = $Game
 @onready var debug_label: RichTextLabel = $Debug
-@onready var overlay: Overlay = $Overlay
-@onready var popup_message: PopupMessage = $PopupMessage
-@onready var chat_preview: ChatPreview = $ChatPreview
-@onready var pinned_items: PinnedItemMessages = $PinnedItemMessages
+@onready var popup_message: PopupMessage = $Overlays/PopupMessage
+@onready var chat_preview: ChatPreview = $Overlays/ChatPreview
+@onready var pinned_items: PinnedItemMessages = $Overlays/PinnedItemMessages
 
 func _ready():
 	get_tree().get_root().go_back_requested.connect(open_ingame_menu)
 	super()
 	transition.set_loading_text(tr("c.menu.game.connecting"))
-	Settings.hook_changed_init("ui.hide_overlays", false, apply_hide_overlays)
 
 func _input(_event):
 	if Input.is_action_just_pressed("ui_menu"):
@@ -39,9 +37,6 @@ func _input(_event):
 		await submenu("res://gui/menus/chat.tscn")
 		chat_preview.visible = true
 	
-	if Input.is_action_just_pressed("toggle_overlay"):
-		Global.set_setting("ui.hide_overlays", not Global.get_setting("ui.hide_overlays"))
-
 func _menu_cover(state):
 	game.follow_camera.disable_input_menu = state
 	game.follow_camera.update_disable_input()
@@ -56,9 +51,3 @@ func open_ingame_menu():
 	if popup != null: return
 	Sound.play_click()
 	submenu("res://gui/menus/ingame.tscn")
-
-func apply_hide_overlays(v: bool):
-	overlay.visible = v
-	pinned_items.visible = v
-	chat_preview.visible = v
-	popup_message.visible = false
diff --git a/client/gui/menus/game.tscn b/client/gui/menus/game.tscn
index 56df81d6..cd6b0987 100644
--- a/client/gui/menus/game.tscn
+++ b/client/gui/menus/game.tscn
@@ -1,12 +1,8 @@
-[gd_scene load_steps=8 format=3 uid="uid://bbjwoxs71fnsk"]
+[gd_scene load_steps=4 format=3 uid="uid://bbjwoxs71fnsk"]
 
 [ext_resource type="Script" uid="uid://bmno0s2du3ie6" path="res://gui/menus/game.gd" id="1_cdpsh"]
 [ext_resource type="PackedScene" uid="uid://c6krh36hoqfg8" path="res://game.tscn" id="2_uojcy"]
-[ext_resource type="PackedScene" uid="uid://bpikve6wlsjfl" path="res://gui/overlays/ingame/score.tscn" id="3_i0ytb"]
-[ext_resource type="PackedScene" uid="uid://bc50la65ntifb" path="res://gui/overlays/lobby/lobby.tscn" id="3_udxby"]
-[ext_resource type="PackedScene" uid="uid://b21nrnkygiyjt" path="res://gui/components/message/popup_message/popup_message.tscn" id="5_n1wy0"]
-[ext_resource type="PackedScene" uid="uid://xcxbmynn8mhi" path="res://gui/overlays/ingame/chat.tscn" id="6_dh5lr"]
-[ext_resource type="PackedScene" uid="uid://dcrr1rwdwbkq8" path="res://gui/components/message/popup_message/pinned_item_messages.tscn" id="7_lf2li"]
+[ext_resource type="PackedScene" uid="uid://cr26jennm5c0c" path="res://gui/overlays/overlays.tscn" id="3_eaud4"]
 
 [node name="GameMenu" type="Control"]
 layout_mode = 3
@@ -20,19 +16,7 @@ auto_anim = false
 
 [node name="Game" parent="." instance=ExtResource("2_uojcy")]
 
-[node name="Overlay" parent="." instance=ExtResource("3_i0ytb")]
-layout_mode = 1
-
-[node name="Lobby" parent="." instance=ExtResource("3_udxby")]
-layout_mode = 1
-
-[node name="PinnedItemMessages" parent="." instance=ExtResource("7_lf2li")]
-layout_mode = 1
-
-[node name="ChatPreview" parent="." instance=ExtResource("6_dh5lr")]
-layout_mode = 1
-
-[node name="PopupMessage" parent="." instance=ExtResource("5_n1wy0")]
+[node name="Overlays" parent="." instance=ExtResource("3_eaud4")]
 layout_mode = 1
 
 [node name="Debug" type="RichTextLabel" parent="."]
diff --git a/client/gui/menus/popup_large.gd b/client/gui/menus/popup_large.gd
index 909ee4c0..772a8373 100644
--- a/client/gui/menus/popup_large.gd
+++ b/client/gui/menus/popup_large.gd
@@ -15,7 +15,7 @@
 #
 extends Menu
 
-@onready var label = $OuterMargin/Panel/InnerMargin/Vert/ScrollContainer/CreditsText
+@onready var label = $OuterMargin/Panel/InnerMargin/Vert/ScrollContainer/Text
 
 func _ready():
 	super()
diff --git a/client/gui/menus/popup_large.tscn b/client/gui/menus/popup_large.tscn
index 993dde9d..bcbafe1b 100644
--- a/client/gui/menus/popup_large.tscn
+++ b/client/gui/menus/popup_large.tscn
@@ -7,7 +7,7 @@
 [ext_resource type="Script" uid="uid://cmncjc06kadpe" path="res://gui/components/blur_setup.gd" id="5_63jf0"]
 [ext_resource type="Script" uid="uid://bd7bylb2t2m0" path="res://gui/components/touch_scroll_container.gd" id="6_smk7v"]
 
-[node name="CreditsMenu" type="Control"]
+[node name="PopupLarge" type="Control"]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
@@ -52,7 +52,7 @@ layout_mode = 2
 size_flags_vertical = 3
 script = ExtResource("6_smk7v")
 
-[node name="CreditsText" type="RichTextLabel" parent="OuterMargin/Panel/InnerMargin/Vert/ScrollContainer"]
+[node name="Text" type="RichTextLabel" parent="OuterMargin/Panel/InnerMargin/Vert/ScrollContainer"]
 auto_translate_mode = 2
 layout_mode = 2
 size_flags_horizontal = 3