29 files changed, 307 insertions, 265 deletions

diff --git a/client/game.gd b/client/game.gd
index d89988ff..8fa4a2cc 100644
--- a/client/game.gd
+++ b/client/game.gd
@@ -67,10 +67,12 @@ var spectating_mode: SpectatingMode = SpectatingMode.CENTER
 
 @onready var mp: Multiplayer = $Multiplayer
 @onready var map: Map = $Map
-@onready var lobby: Lobby = $"../Lobby"
-@onready var overlay: Overlay = $"../Overlay"
-@onready var popup_message: PopupMessage = $"../PopupMessage"
-@onready var pinned_items: PinnedItemMessages = $"../PinnedItemMessages"
+# TODO move all of this somewhere else
+@onready var overlay_lobby: Lobby = $"../Overlays/Lobby"
+@onready var overlay_score: Overlay = $"../Overlays/Score"
+@onready var overlay_popup_message: PopupMessage = $"../Overlays/PopupMessage"
+@onready var overlay_pinned_messages: PinnedItemMessages = $"../Overlays/PinnedMessages"
+@onready var overlay_announce_title: AnnounceTitle = $"../Overlays/AnnounceTitle"
 @onready var menu: GameMenu = $".."
 @onready var follow_camera: FollowCamera = $FollowCamera
 
@@ -127,7 +129,7 @@ func handle_packet(p):
 				return
 			if player.is_customer and player.current_item_message != null:
 				tutorial_queue.erase(player.current_item_message)
-			pinned_items.clear_item(p.id)
+			overlay_pinned_messages.clear_item(p.id)
 			if p.id == my_player_id:
 				set_join_state(JoinState.SPECTATING)
 				follow_camera.target = $Center
@@ -221,7 +223,7 @@ func handle_packet(p):
 					ingredients.append_array(parsed_item.contents)
 					
 					if pinned:
-						pinned_items.pin_item(item_name, timeout_initial, timeout_remaining, p.player)
+						overlay_pinned_messages.pin_item(item_name, timeout_initial, timeout_remaining, p.player)
 					
 					var player: Player = players[p.player]
 					player.item_message(item_name, timeout_initial, timeout_remaining)
@@ -263,12 +265,12 @@ func handle_packet(p):
 				if player.is_customer and player.current_item_message != null:
 					tutorial_queue.erase(player.current_item_message)
 				player.clear_message()
-				pinned_items.clear_item(p.player)
+				overlay_pinned_messages.clear_item(p.player)
 		"effect":
 			players[p.player].effect_message(p.name)
 		"set_ingame":
 			in_lobby = p.lobby
-			overlay.set_ingame(p.state, p.lobby)
+			overlay_score.set_ingame(p.state, p.lobby)
 			follow_camera.set_ingame(p.state, p.lobby)
 			
 			if p.state:
@@ -281,16 +283,16 @@ func handle_packet(p):
 				map.autobake = false
 				await get_parent()._menu_exit()
 			
-			lobby.visible = in_lobby
-			if in_lobby: lobby.select_map(0)
-			if lobby and join_state == JoinState.SPECTATING:
+			overlay_lobby.visible = in_lobby
+			if in_lobby: overlay_lobby.select_map(0)
+			if overlay_lobby and join_state == JoinState.SPECTATING:
 				if in_lobby:
 					toggle_join()
 				elif not is_replay:
 					menu.submenu("res://gui/menus/ingame/ingame.tscn")
 		"score":
 			if p.time_remaining != null:
-				overlay.update(p.demands_failed, p.demands_completed, p.points, p.time_remaining)
+				overlay_score.update(p.demands_failed, p.demands_completed, p.points, p.time_remaining)
 		"tutorial_ended":
 			if p.player != my_player_id: return
 			
@@ -321,14 +323,14 @@ func handle_packet(p):
 				"score":
 					menu.submenu("res://gui/menus/rating/rating.tscn", [p.data.stars, p.data.points])
 				"announce_start":
-					overlay.announce_start()
+					overlay_announce_title.announce_start()
 		"server_message":
 			var mstr := get_message_str(p.message)
 			if p.error:
-				popup_message.display_server_msg(tr("c.error.server").format([mstr]))
+				overlay_popup_message.display_server_msg(tr("c.error.server").format([mstr]))
 				push_error(tr("c.error.server").format([mstr]))
 			else:
-				popup_message.display_server_msg(mstr)
+				overlay_popup_message.display_server_msg(mstr)
 		"server_hint":
 			if p.player != my_player_id: return
 			
@@ -338,15 +340,15 @@ func handle_packet(p):
 			if position_ == null:
 				# Global hint message
 				if message == null:
-					popup_message.clear_server_msg()
+					overlay_popup_message.clear_server_msg()
 				else:
-					popup_message.display_server_msg(get_message_str(message), false)
+					overlay_popup_message.display_server_msg(get_message_str(message), false)
 			else:
 				# Positional hint message
 				if message == null:
-					popup_message.clear_server_msg(position_)
+					overlay_popup_message.clear_server_msg(position_)
 				else:
-					popup_message.display_server_msg_positional(get_message_str(message), position_, false)
+					overlay_popup_message.display_server_msg_positional(get_message_str(message), position_, false)
 		"environment":
 			$Environment.update(p.effects)
 		"redirect":
@@ -357,7 +359,7 @@ func handle_packet(p):
 			if is_replay and OS.has_feature("movie"):
 				menu.exit()
 		"pause":
-			overlay.timer.paused = p.state
+			overlay_score.timer.paused = p.state
 			Global.game_paused = p.state
 		
 		_: push_error("Unrecognized packet type: %s" % p.type)
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
diff --git a/client/gui/overlays/ingame/announce_title.gd b/client/gui/overlays/announce_title.gd
index 227e184f..66d5434b 100644
--- a/client/gui/overlays/ingame/announce_title.gd
+++ b/client/gui/overlays/announce_title.gd
@@ -14,6 +14,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 extends Control
+class_name AnnounceTitle
 
 @onready var init_delay: Timer = $InitialDelay
 @onready var prep_timer: Timer = $PreperationTimer
diff --git a/client/gui/overlays/ingame/announce_title.gd.uid b/client/gui/overlays/announce_title.gd.uid
index e57b9722..e57b9722 100644
--- a/client/gui/overlays/ingame/announce_title.gd.uid
+++ b/client/gui/overlays/announce_title.gd.uid
diff --git a/client/gui/overlays/ingame/score.tscn b/client/gui/overlays/announce_title.tscn
index 497275f5..79ec11e8 100644
--- a/client/gui/overlays/ingame/score.tscn
+++ b/client/gui/overlays/announce_title.tscn
@@ -1,16 +1,10 @@
-[gd_scene load_steps=14 format=3 uid="uid://bpikve6wlsjfl"]
+[gd_scene load_steps=10 format=3 uid="uid://c7pykhpdhgs64"]
 
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="1_4kujw"]
-[ext_resource type="Script" uid="uid://mcgg3q0l03dx" path="res://gui/overlays/ingame/score.gd" id="2_kbjds"]
-[ext_resource type="Texture2D" uid="uid://chxkwohi56cxx" path="res://gui/resources/shaders/paper.tres" id="3_oum5g"]
-[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://gui/resources/fonts/font-sansita-swashed.woff2" id="3_u54fv"]
-[ext_resource type="Script" uid="uid://ci08whhm2ej1m" path="res://gui/overlays/ingame/announce_title.gd" id="5_874f2"]
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_04ujj"]
-bg_color = Color(0, 0, 0, 0)
+[ext_resource type="Script" uid="uid://ci08whhm2ej1m" path="res://gui/overlays/announce_title.gd" id="1_6bcyw"]
+[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://gui/resources/fonts/font-sansita-swashed.woff2" id="2_037n2"]
 
 [sub_resource type="FontVariation" id="FontVariation_8f216"]
-base_font = ExtResource("3_u54fv")
+base_font = ExtResource("2_037n2")
 variation_embolden = 0.5
 
 [sub_resource type="Animation" id="Animation_owy7i"]
@@ -326,188 +320,13 @@ _data = {
 &"fade_out_quick": SubResource("Animation_deqe4")
 }
 
-[node name="Overlay" type="PanelContainer"]
-layout_direction = 2
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-mouse_filter = 2
-theme = ExtResource("1_4kujw")
-theme_override_styles/panel = SubResource("StyleBoxFlat_04ujj")
-script = ExtResource("2_kbjds")
-
-[node name="Timer" type="Timer" parent="."]
-wait_time = 30.0
-
-[node name="Score" type="Control" parent="."]
-layout_mode = 2
-size_flags_horizontal = 8
-size_flags_vertical = 0
-
-[node name="Paper" type="TextureRect" parent="Score"]
-layout_mode = 1
-anchors_preset = 8
-anchor_left = 0.5
-anchor_top = 0.5
-anchor_right = 0.5
-anchor_bottom = 0.5
-offset_left = -242.0
-offset_top = -327.0
-offset_right = 270.0
-offset_bottom = 185.0
-grow_horizontal = 2
-grow_vertical = 2
-rotation = 0.0610865
-texture = ExtResource("3_oum5g")
-
-[node name="Margin" type="MarginContainer" parent="Score/Paper"]
-layout_mode = 1
-anchors_preset = 2
-anchor_top = 1.0
-anchor_bottom = 1.0
-offset_top = -142.0
-offset_right = 258.0
-grow_vertical = 0
-theme_override_constants/margin_left = 10
-theme_override_constants/margin_bottom = 10
-
-[node name="Lines" type="VBoxContainer" parent="Score/Paper/Margin"]
-layout_direction = 1
-layout_mode = 2
-size_flags_horizontal = 0
-size_flags_vertical = 8
-
-[node name="Line1" type="HBoxContainer" parent="Score/Paper/Margin/Lines"]
-layout_mode = 2
-
-[node name="Label" type="Label" parent="Score/Paper/Margin/Lines/Line1"]
-layout_mode = 2
-theme_override_colors/font_color = Color(0, 0, 0, 1)
-theme_override_fonts/font = ExtResource("3_u54fv")
-theme_override_font_sizes/font_size = 25
-text = "c.score.completed"
-
-[node name="Spacer" type="Control" parent="Score/Paper/Margin/Lines/Line1"]
-layout_mode = 2
-size_flags_horizontal = 3
-
-[node name="Completed" type="Label" parent="Score/Paper/Margin/Lines/Line1"]
-auto_translate_mode = 2
-custom_minimum_size = Vector2(100, 0)
-layout_mode = 2
-theme_override_colors/font_color = Color(0, 0.278431, 0, 1)
-theme_override_fonts/font = ExtResource("3_u54fv")
-theme_override_font_sizes/font_size = 35
-text = "0"
-horizontal_alignment = 1
-
-[node name="Line2" type="HBoxContainer" parent="Score/Paper/Margin/Lines"]
-layout_mode = 2
-
-[node name="Label" type="Label" parent="Score/Paper/Margin/Lines/Line2"]
-layout_mode = 2
-theme_override_colors/font_color = Color(0, 0, 0, 1)
-theme_override_fonts/font = ExtResource("3_u54fv")
-theme_override_font_sizes/font_size = 25
-text = "c.score.failed"
-
-[node name="Spacer" type="Control" parent="Score/Paper/Margin/Lines/Line2"]
-layout_mode = 2
-size_flags_horizontal = 3
-
-[node name="Failed" type="Label" parent="Score/Paper/Margin/Lines/Line2"]
-auto_translate_mode = 2
-custom_minimum_size = Vector2(100, 0)
-layout_mode = 2
-theme_override_colors/font_color = Color(0.505882, 0, 0, 1)
-theme_override_fonts/font = ExtResource("3_u54fv")
-theme_override_font_sizes/font_size = 35
-text = "0"
-horizontal_alignment = 1
-
-[node name="Line3" type="HBoxContainer" parent="Score/Paper/Margin/Lines"]
-layout_mode = 2
-
-[node name="Label" type="Label" parent="Score/Paper/Margin/Lines/Line3"]
-layout_mode = 2
-theme_override_colors/font_color = Color(0, 0, 0, 1)
-theme_override_fonts/font = ExtResource("3_u54fv")
-theme_override_font_sizes/font_size = 35
-text = "c.score.points"
-
-[node name="Spacer" type="Control" parent="Score/Paper/Margin/Lines/Line3"]
-layout_mode = 2
-size_flags_horizontal = 3
-
-[node name="Points" type="Label" parent="Score/Paper/Margin/Lines/Line3"]
-auto_translate_mode = 2
-custom_minimum_size = Vector2(100, 0)
-layout_mode = 2
-theme_override_colors/font_color = Color(0, 0, 0, 1)
-theme_override_fonts/font = ExtResource("3_u54fv")
-theme_override_font_sizes/font_size = 45
-text = "0"
-horizontal_alignment = 1
-
-[node name="Time" type="Control" parent="."]
-layout_mode = 2
-size_flags_horizontal = 8
-size_flags_vertical = 8
-
-[node name="Paper" type="TextureRect" parent="Time"]
-layout_mode = 1
-anchors_preset = 8
-anchor_left = 0.5
-anchor_top = 0.5
-anchor_right = 0.5
-anchor_bottom = 0.5
-offset_left = -206.0
-offset_top = -119.0
-offset_right = 306.0
-offset_bottom = 393.0
-grow_horizontal = 2
-grow_vertical = 2
-rotation = 0.0610865
-texture = ExtResource("3_oum5g")
-
-[node name="Line" type="HBoxContainer" parent="Time/Paper"]
-layout_mode = 0
-
-[node name="Seconds" type="Label" parent="Time/Paper/Line"]
-auto_translate_mode = 2
-custom_minimum_size = Vector2(100, 0)
-layout_mode = 2
-theme_override_colors/font_color = Color(0, 0, 0, 1)
-theme_override_fonts/font = ExtResource("3_u54fv")
-theme_override_font_sizes/font_size = 45
-text = "300"
-horizontal_alignment = 2
-
-[node name="Point" type="Label" parent="Time/Paper/Line"]
-auto_translate_mode = 2
-layout_mode = 2
-theme_override_colors/font_color = Color(0, 0, 0, 1)
-theme_override_fonts/font = ExtResource("3_u54fv")
-theme_override_font_sizes/font_size = 45
-text = "."
-horizontal_alignment = 1
-
-[node name="Decimals" type="Label" parent="Time/Paper/Line"]
-auto_translate_mode = 2
-layout_mode = 2
-theme_override_colors/font_color = Color(0, 0, 0, 1)
-theme_override_fonts/font = ExtResource("3_u54fv")
-theme_override_font_sizes/font_size = 45
-text = "00"
-
-[node name="Announcement" type="Control" parent="."]
+[node name="AnnounceTitle" type="Control"]
 visible = false
-layout_mode = 2
-script = ExtResource("5_874f2")
+layout_mode = 3
+anchors_preset = 0
+script = ExtResource("1_6bcyw")
 
-[node name="Center" type="Control" parent="Announcement"]
+[node name="Center" type="Control" parent="."]
 layout_mode = 1
 anchors_preset = 8
 anchor_left = 0.5
@@ -517,11 +336,11 @@ anchor_bottom = 0.5
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="Node2D" type="Node2D" parent="Announcement/Center"]
+[node name="Node2D" type="Node2D" parent="Center"]
 modulate = Color(1, 1, 1, 0)
 scale = Vector2(1e-05, 1e-05)
 
-[node name="Label" type="Label" parent="Announcement/Center/Node2D"]
+[node name="Label" type="Label" parent="Center/Node2D"]
 anchors_preset = 8
 anchor_left = 0.5
 anchor_top = 0.5
@@ -542,14 +361,14 @@ text = "GO!"
 horizontal_alignment = 1
 vertical_alignment = 1
 
-[node name="AnimationPlayer" type="AnimationPlayer" parent="Announcement"]
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 libraries = {
 &"": SubResource("AnimationLibrary_deqe4")
 }
 
-[node name="PreperationTimer" type="Timer" parent="Announcement"]
+[node name="PreperationTimer" type="Timer" parent="."]
 one_shot = true
 
-[node name="InitialDelay" type="Timer" parent="Announcement"]
+[node name="InitialDelay" type="Timer" parent="."]
 wait_time = 0.5
 one_shot = true
diff --git a/client/gui/overlays/ingame/chat.gd b/client/gui/overlays/chat.gd
index 673dc979..676337a6 100644
--- a/client/gui/overlays/ingame/chat.gd
+++ b/client/gui/overlays/chat.gd
@@ -18,7 +18,7 @@ class_name ChatPreview
 
 const CHAT_MESSAGE_SCENE = preload("res://gui/components/message/chat_message.tscn")
 
-@onready var game: Game = $"../Game"
+@onready var game: Game = $"../../Game" # TODO
 @onready var messages_container: VBoxContainer = $MarginContainer/ScrollContainer/PanelContainer/Messages
 
 func _ready():
diff --git a/client/gui/overlays/ingame/chat.gd.uid b/client/gui/overlays/chat.gd.uid
index 7a372630..7a372630 100644
--- a/client/gui/overlays/ingame/chat.gd.uid
+++ b/client/gui/overlays/chat.gd.uid
diff --git a/client/gui/overlays/ingame/chat.tscn b/client/gui/overlays/chat.tscn
index f5b1060c..068d0ee4 100644
--- a/client/gui/overlays/ingame/chat.tscn
+++ b/client/gui/overlays/chat.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=5 format=3 uid="uid://xcxbmynn8mhi"]
 
 [ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="1_lmy51"]
-[ext_resource type="Script" uid="uid://bgt04y4ncl1fv" path="res://gui/overlays/ingame/chat.gd" id="2_3543w"]
+[ext_resource type="Script" uid="uid://bgt04y4ncl1fv" path="res://gui/overlays/chat.gd" id="2_3543w"]
 [ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://gui/resources/materials/dark_blur_material.tres" id="3_15i2y"]
 [ext_resource type="Script" uid="uid://cmncjc06kadpe" path="res://gui/components/blur_setup.gd" id="4_3rmhr"]
 
diff --git a/client/gui/overlays/lobby/lobby.gd b/client/gui/overlays/lobby/lobby.gd
index 3971dbb3..431cec2d 100644
--- a/client/gui/overlays/lobby/lobby.gd
+++ b/client/gui/overlays/lobby/lobby.gd
@@ -29,7 +29,7 @@ var bot_reset_buttons := {}
 var bot_inc_buttons := {}
 var bot_dec_buttons := {}
 
-@onready var game: Game = $"../Game"
+@onready var game: Game = $"../../Game" # TODO
 @onready var player_container = $PlayerList/VBoxContainer/Players
 
 @onready var map_name_label = $Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer/Map/Name
diff --git a/client/gui/overlays/overlays.gd b/client/gui/overlays/overlays.gd
new file mode 100644
index 00000000..2ffdd372
--- /dev/null
+++ b/client/gui/overlays/overlays.gd
@@ -0,0 +1,24 @@
+# Hurry Curry! - a game about cooking
+# Copyright (C) 2025 Hurry Curry! contributors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, version 3 of the License only.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+extends Control
+class_name Overlays
+
+func _ready():
+	Settings.hook_changed_init("ui.hide_overlays", false, func (v): visible = v)
+
+func _input(_event):
+	if Input.is_action_just_pressed("toggle_overlay"):
+		Global.set_setting("ui.hide_overlays", not Global.get_setting("ui.hide_overlays"))
diff --git a/client/gui/overlays/overlays.gd.uid b/client/gui/overlays/overlays.gd.uid
new file mode 100644
index 00000000..5f61ed5d
--- /dev/null
+++ b/client/gui/overlays/overlays.gd.uid
@@ -0,0 +1 @@
+uid://bkvtm1jlme6jf
diff --git a/client/gui/overlays/overlays.tscn b/client/gui/overlays/overlays.tscn
new file mode 100644
index 00000000..67f1082f
--- /dev/null
+++ b/client/gui/overlays/overlays.tscn
@@ -0,0 +1,41 @@
+[gd_scene load_steps=8 format=3 uid="uid://cr26jennm5c0c"]
+
+[ext_resource type="Script" uid="uid://bkvtm1jlme6jf" path="res://gui/overlays/overlays.gd" id="1_dcvak"]
+[ext_resource type="PackedScene" uid="uid://xcxbmynn8mhi" path="res://gui/overlays/chat.tscn" id="1_n4uhr"]
+[ext_resource type="PackedScene" uid="uid://bpikve6wlsjfl" path="res://gui/overlays/score.tscn" id="2_whygm"]
+[ext_resource type="PackedScene" uid="uid://dcrr1rwdwbkq8" path="res://gui/overlays/pinned_messages.tscn" id="3_dcvak"]
+[ext_resource type="PackedScene" uid="uid://bc50la65ntifb" path="res://gui/overlays/lobby/lobby.tscn" id="4_jwd7s"]
+[ext_resource type="PackedScene" uid="uid://c7pykhpdhgs64" path="res://gui/overlays/announce_title.tscn" id="5_whygm"]
+[ext_resource type="PackedScene" uid="uid://b21nrnkygiyjt" path="res://gui/overlays/popup_message/popup_message.tscn" id="7_jwd7s"]
+
+[node name="Overlays" type="Control"]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_dcvak")
+
+[node name="ChatPreview" parent="." instance=ExtResource("1_n4uhr")]
+layout_mode = 1
+
+[node name="Score" parent="." instance=ExtResource("2_whygm")]
+layout_mode = 1
+
+[node name="PinnedMessages" parent="." instance=ExtResource("3_dcvak")]
+layout_mode = 1
+
+[node name="Lobby" parent="." instance=ExtResource("4_jwd7s")]
+layout_mode = 1
+
+[node name="AnnounceTitle" parent="." instance=ExtResource("5_whygm")]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="PopupMessage" parent="." instance=ExtResource("7_jwd7s")]
+layout_mode = 1
diff --git a/client/gui/components/message/popup_message/pinned_item_messages.gd b/client/gui/overlays/pinned_messages.gd
index fe82f904..fe82f904 100644
--- a/client/gui/components/message/popup_message/pinned_item_messages.gd
+++ b/client/gui/overlays/pinned_messages.gd
diff --git a/client/gui/components/message/popup_message/pinned_item_messages.gd.uid b/client/gui/overlays/pinned_messages.gd.uid
index 2325c656..2325c656 100644
--- a/client/gui/components/message/popup_message/pinned_item_messages.gd.uid
+++ b/client/gui/overlays/pinned_messages.gd.uid
diff --git a/client/gui/components/message/popup_message/pinned_item_messages.tscn b/client/gui/overlays/pinned_messages.tscn
index 30f27809..318c9b85 100644
--- a/client/gui/components/message/popup_message/pinned_item_messages.tscn
+++ b/client/gui/overlays/pinned_messages.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://dcrr1rwdwbkq8"]
 
-[ext_resource type="Script" uid="uid://c0k6f1wkynbkd" path="res://gui/components/message/popup_message/pinned_item_messages.gd" id="1_q0jkk"]
+[ext_resource type="Script" uid="uid://c0k6f1wkynbkd" path="res://gui/overlays/pinned_messages.gd" id="1_q0jkk"]
 
 [node name="PinnedItemMessages" type="Control"]
 layout_mode = 3
diff --git a/client/gui/components/message/popup_message/popup_message.gd b/client/gui/overlays/popup_message/popup_message.gd
index ae474914..d577465b 100644
--- a/client/gui/components/message/popup_message/popup_message.gd
+++ b/client/gui/overlays/popup_message/popup_message.gd
@@ -16,7 +16,7 @@
 extends Control
 class_name PopupMessage
 
-const SERVER_MESSAGE_SCENE = preload("res://gui/components/message/popup_message/server_message.tscn")
+const SERVER_MESSAGE_SCENE = preload("res://gui/overlays/popup_message/server_message.tscn")
 
 var is_ingame := false
 var is_joined := false
@@ -36,7 +36,7 @@ var positional_messages = {}
 @onready var reset_timer = $Timers/Reset
 @onready var join_while_running_timer = $Timers/JoinWhileRunning
 
-@onready var game: Game = $"../Game"
+@onready var game: Game = $"../../Game" # TODO
 
 func _ready():
 	game.join_state_updated.connect(func(state: Game.JoinState):
diff --git a/client/gui/components/message/popup_message/popup_message.gd.uid b/client/gui/overlays/popup_message/popup_message.gd.uid
index d9aa95c5..d9aa95c5 100644
--- a/client/gui/components/message/popup_message/popup_message.gd.uid
+++ b/client/gui/overlays/popup_message/popup_message.gd.uid
diff --git a/client/gui/components/message/popup_message/popup_message.tscn b/client/gui/overlays/popup_message/popup_message.tscn
index 0f1bfcec..15d56c40 100644
--- a/client/gui/components/message/popup_message/popup_message.tscn
+++ b/client/gui/overlays/popup_message/popup_message.tscn
@@ -1,9 +1,9 @@
 [gd_scene load_steps=12 format=3 uid="uid://b21nrnkygiyjt"]
 
 [ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="1_a1566"]
-[ext_resource type="Script" uid="uid://c2cx41lrgf5b0" path="res://gui/components/message/popup_message/popup_message.gd" id="2_sbew6"]
+[ext_resource type="Script" uid="uid://c2cx41lrgf5b0" path="res://gui/overlays/popup_message/popup_message.gd" id="2_sbew6"]
 [ext_resource type="Shader" uid="uid://cwldxegcj55if" path="res://gui/resources/shaders/blur_mix.gdshader" id="3_2vnom"]
-[ext_resource type="PackedScene" uid="uid://dq61p3a8og2b6" path="res://gui/components/message/popup_message/server_message.tscn" id="3_m3rok"]
+[ext_resource type="PackedScene" uid="uid://dq61p3a8og2b6" path="res://gui/overlays/popup_message/server_message.tscn" id="3_m3rok"]
 [ext_resource type="Script" uid="uid://cmncjc06kadpe" path="res://gui/components/blur_setup.gd" id="4_pvwmw"]
 [ext_resource type="FontFile" uid="uid://bk704sc5gkrb3" path="res://gui/resources/fonts/font-azaret-mono.woff2" id="4_wsrnf"]
 [ext_resource type="Texture2D" uid="uid://b2uv5rf0enikf" path="res://gui/resources/icons/hint.svg" id="5_2dxsd"]
diff --git a/client/gui/components/message/popup_message/server_message.gd b/client/gui/overlays/popup_message/server_message.gd
index a0688dc5..a0688dc5 100644
--- a/client/gui/components/message/popup_message/server_message.gd
+++ b/client/gui/overlays/popup_message/server_message.gd
diff --git a/client/gui/components/message/popup_message/server_message.gd.uid b/client/gui/overlays/popup_message/server_message.gd.uid
index 775979e0..775979e0 100644
--- a/client/gui/components/message/popup_message/server_message.gd.uid
+++ b/client/gui/overlays/popup_message/server_message.gd.uid
diff --git a/client/gui/components/message/popup_message/server_message.tscn b/client/gui/overlays/popup_message/server_message.tscn
index fd128666..f3297cd4 100644
--- a/client/gui/components/message/popup_message/server_message.tscn
+++ b/client/gui/overlays/popup_message/server_message.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=8 format=3 uid="uid://dq61p3a8og2b6"]
 
 [ext_resource type="Shader" uid="uid://cwldxegcj55if" path="res://gui/resources/shaders/blur_mix.gdshader" id="1_qv8ew"]
-[ext_resource type="Script" uid="uid://dfgwh7x7sqc21" path="res://gui/components/message/popup_message/server_message.gd" id="2_csqo8"]
+[ext_resource type="Script" uid="uid://dfgwh7x7sqc21" path="res://gui/overlays/popup_message/server_message.gd" id="2_csqo8"]
 [ext_resource type="FontFile" uid="uid://bk704sc5gkrb3" path="res://gui/resources/fonts/font-azaret-mono.woff2" id="3_dw20j"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_q3bbd"]
diff --git a/client/gui/overlays/ingame/score.gd b/client/gui/overlays/score.gd
index d4e2e3d3..8c8e4d1e 100644
--- a/client/gui/overlays/ingame/score.gd
+++ b/client/gui/overlays/score.gd
@@ -56,9 +56,6 @@ func set_ingame(_state: bool, lobby: bool):
 	else:
 		show()
 
-func announce_start():
-	announcement.announce_start()
-
 func _process(delta):
 	failed_label.scale = G.interpolate(failed_label.scale, Vector2(1, 1), delta * 4.)
 	completed_label.scale = G.interpolate(completed_label.scale, Vector2(1, 1), delta * 4.)
diff --git a/client/gui/overlays/ingame/score.gd.uid b/client/gui/overlays/score.gd.uid
index ff13fb53..ff13fb53 100644
--- a/client/gui/overlays/ingame/score.gd.uid
+++ b/client/gui/overlays/score.gd.uid
diff --git a/client/gui/overlays/score.tscn b/client/gui/overlays/score.tscn
new file mode 100644
index 00000000..3f0d3034
--- /dev/null
+++ b/client/gui/overlays/score.tscn
@@ -0,0 +1,185 @@
+[gd_scene load_steps=6 format=3 uid="uid://bpikve6wlsjfl"]
+
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="1_4kujw"]
+[ext_resource type="Script" uid="uid://mcgg3q0l03dx" path="res://gui/overlays/score.gd" id="2_kbjds"]
+[ext_resource type="Texture2D" uid="uid://chxkwohi56cxx" path="res://gui/resources/shaders/paper.tres" id="3_oum5g"]
+[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://gui/resources/fonts/font-sansita-swashed.woff2" id="3_u54fv"]
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_04ujj"]
+bg_color = Color(0, 0, 0, 0)
+
+[node name="ScoreOverlay" type="PanelContainer"]
+layout_direction = 2
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
+theme = ExtResource("1_4kujw")
+theme_override_styles/panel = SubResource("StyleBoxFlat_04ujj")
+script = ExtResource("2_kbjds")
+
+[node name="Timer" type="Timer" parent="."]
+wait_time = 30.0
+
+[node name="Score" type="Control" parent="."]
+layout_mode = 2
+size_flags_horizontal = 8
+size_flags_vertical = 0
+
+[node name="Paper" type="TextureRect" parent="Score"]
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -242.0
+offset_top = -327.0
+offset_right = 270.0
+offset_bottom = 185.0
+grow_horizontal = 2
+grow_vertical = 2
+rotation = 0.0610865
+texture = ExtResource("3_oum5g")
+
+[node name="Margin" type="MarginContainer" parent="Score/Paper"]
+layout_mode = 1
+anchors_preset = 2
+anchor_top = 1.0
+anchor_bottom = 1.0
+offset_top = -142.0
+offset_right = 258.0
+grow_vertical = 0
+theme_override_constants/margin_left = 10
+theme_override_constants/margin_bottom = 10
+
+[node name="Lines" type="VBoxContainer" parent="Score/Paper/Margin"]
+layout_direction = 1
+layout_mode = 2
+size_flags_horizontal = 0
+size_flags_vertical = 8
+
+[node name="Line1" type="HBoxContainer" parent="Score/Paper/Margin/Lines"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="Score/Paper/Margin/Lines/Line1"]
+layout_mode = 2
+theme_override_colors/font_color = Color(0, 0, 0, 1)
+theme_override_fonts/font = ExtResource("3_u54fv")
+theme_override_font_sizes/font_size = 25
+text = "c.score.completed"
+
+[node name="Spacer" type="Control" parent="Score/Paper/Margin/Lines/Line1"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="Completed" type="Label" parent="Score/Paper/Margin/Lines/Line1"]
+auto_translate_mode = 2
+custom_minimum_size = Vector2(100, 0)
+layout_mode = 2
+theme_override_colors/font_color = Color(0, 0.278431, 0, 1)
+theme_override_fonts/font = ExtResource("3_u54fv")
+theme_override_font_sizes/font_size = 35
+text = "0"
+horizontal_alignment = 1
+
+[node name="Line2" type="HBoxContainer" parent="Score/Paper/Margin/Lines"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="Score/Paper/Margin/Lines/Line2"]
+layout_mode = 2
+theme_override_colors/font_color = Color(0, 0, 0, 1)
+theme_override_fonts/font = ExtResource("3_u54fv")
+theme_override_font_sizes/font_size = 25
+text = "c.score.failed"
+
+[node name="Spacer" type="Control" parent="Score/Paper/Margin/Lines/Line2"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="Failed" type="Label" parent="Score/Paper/Margin/Lines/Line2"]
+auto_translate_mode = 2
+custom_minimum_size = Vector2(100, 0)
+layout_mode = 2
+theme_override_colors/font_color = Color(0.505882, 0, 0, 1)
+theme_override_fonts/font = ExtResource("3_u54fv")
+theme_override_font_sizes/font_size = 35
+text = "0"
+horizontal_alignment = 1
+
+[node name="Line3" type="HBoxContainer" parent="Score/Paper/Margin/Lines"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="Score/Paper/Margin/Lines/Line3"]
+layout_mode = 2
+theme_override_colors/font_color = Color(0, 0, 0, 1)
+theme_override_fonts/font = ExtResource("3_u54fv")
+theme_override_font_sizes/font_size = 35
+text = "c.score.points"
+
+[node name="Spacer" type="Control" parent="Score/Paper/Margin/Lines/Line3"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="Points" type="Label" parent="Score/Paper/Margin/Lines/Line3"]
+auto_translate_mode = 2
+custom_minimum_size = Vector2(100, 0)
+layout_mode = 2
+theme_override_colors/font_color = Color(0, 0, 0, 1)
+theme_override_fonts/font = ExtResource("3_u54fv")
+theme_override_font_sizes/font_size = 45
+text = "0"
+horizontal_alignment = 1
+
+[node name="Time" type="Control" parent="."]
+layout_mode = 2
+size_flags_horizontal = 8
+size_flags_vertical = 8
+
+[node name="Paper" type="TextureRect" parent="Time"]
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -206.0
+offset_top = -119.0
+offset_right = 306.0
+offset_bottom = 393.0
+grow_horizontal = 2
+grow_vertical = 2
+rotation = 0.0610865
+texture = ExtResource("3_oum5g")
+
+[node name="Line" type="HBoxContainer" parent="Time/Paper"]
+layout_mode = 0
+
+[node name="Seconds" type="Label" parent="Time/Paper/Line"]
+auto_translate_mode = 2
+custom_minimum_size = Vector2(100, 0)
+layout_mode = 2
+theme_override_colors/font_color = Color(0, 0, 0, 1)
+theme_override_fonts/font = ExtResource("3_u54fv")
+theme_override_font_sizes/font_size = 45
+text = "300"
+horizontal_alignment = 2
+
+[node name="Point" type="Label" parent="Time/Paper/Line"]
+auto_translate_mode = 2
+layout_mode = 2
+theme_override_colors/font_color = Color(0, 0, 0, 1)
+theme_override_fonts/font = ExtResource("3_u54fv")
+theme_override_font_sizes/font_size = 45
+text = "."
+horizontal_alignment = 1
+
+[node name="Decimals" type="Label" parent="Time/Paper/Line"]
+auto_translate_mode = 2
+layout_mode = 2
+theme_override_colors/font_color = Color(0, 0, 0, 1)
+theme_override_fonts/font = ExtResource("3_u54fv")
+theme_override_font_sizes/font_size = 45
+text = "00"